diff options
Diffstat (limited to 'pkgs/applications')
755 files changed, 19402 insertions, 8217 deletions
diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix new file mode 100644 index 0000000000000..b3ad00bf63a8a --- /dev/null +++ b/pkgs/applications/audio/ChowKick/default.nix @@ -0,0 +1,106 @@ +{ alsa-lib +, at-spi2-core +, brotli +, cmake +, curl +, dbus +, libepoxy +, fetchFromGitHub +, freeglut +, freetype +, gtk2-x11 +, lib +, libGL +, libXcursor +, libXdmcp +, libXext +, libXinerama +, libXrandr +, libXtst +, libdatrie +, libjack2 +, libpsl +, libselinux +, libsepol +, libsysprof-capture +, libthai +, libxkbcommon +, lv2 +, pcre +, pkg-config +, python3 +, sqlite +, stdenv +, util-linuxMinimal +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "ChowKick"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Chowdhury-DSP"; + repo = pname; + rev = "v${version}"; + sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + alsa-lib + at-spi2-core + brotli + curl + dbus + libepoxy + freeglut + freetype + gtk2-x11 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + lv2 + pcre + python3 + sqlite + util-linuxMinimal + webkitgtk + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin + cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/Chowdhury-DSP/ChowKick"; + description = "Kick synthesizer based on old-school drum machine circuits"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix new file mode 100644 index 0000000000000..e912c7fa49a42 --- /dev/null +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }: + +stdenv.mkDerivation rec { + pname = "aether-lv2"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Dougal-s"; + repo = "aether"; + rev = "v${version}"; + sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lv2 libX11 libGL libGLU mesa + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r aether.lv2 $out/lib/lv2 + ''; + + meta = with lib; { + homepage = "https://dougal-s.github.io/Aether/"; + description = "An algorithmic reverb LV2 based on Cloudseed"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index e445132ee3c07..5a1be2eaf0c3c 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.10.1"; + version = "3.12.3"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "103jhajqwryiaf52qqgshajcnsxsz4l8gn3sz6bxs7k0yq5x1knr"; + sha256 = "sha256-y2DH8SjSZ8hV6DAC4uDw5Wn7O0oj/WIhIr4BE/+jUxM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 566024881b4a6..0832bb1dd9644 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -32,7 +32,7 @@ , linuxHeaders , at-spi2-core , dbus -, epoxy +, libepoxy , libXdmcp , libXtst , libpthreadstubs @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ at-spi2-core dbus - epoxy + libepoxy libXdmcp libXtst libpthreadstubs diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index b1808ed90f119..51dda20cc3a13 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,30 +1,34 @@ -{lib, stdenv, fetchurl, gettext, ncurses +{ lib +, stdenv +, fetchurl +, gettext +, ncurses , gtkGUI ? false -, pkg-config ? null -, gtk2 ? null}: - -assert gtkGUI -> pkg-config != null && gtk2 != null; +, pkg-config +, gtk2 +}: stdenv.mkDerivation rec { - name = "aumix-2.9.1"; + pname = "aumix"; + version = "2.9.1"; + src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/${name}.tar.bz2"; + url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkg-config gtk2] else []); + ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; - meta = { + meta = with lib; { description = "Audio mixer for X and the console"; longDescription = '' Aumix adjusts an audio mixer from X, the console, a terminal, the command line or a script. ''; homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 591c14c1adfad..b2cce97bbc46a 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -30,13 +30,9 @@ mkDerivation rec { postConfigure = "make qmake_all"; - # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin - # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper - # (see https://github.com/NixOS/nixpkgs/issues/102044) postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app - wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker ''; diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index c3c33267f65db..e8d2ada387830 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -106,7 +106,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://github.com/awwbees/BespokeSynth"; - license = licenses.gpl3Plus; + license = with licenses; [ + gpl3Plus + + # This package is unfree and not distributable due to the license of VST2. + # see #145607 + unfree + ]; maintainers = with maintainers; [ astro ]; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 447bc7d6635d2..aa9290d9477fc 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.0.1"; + version = "4.0.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-yhCAKlbLjyBywkSYY1aqbUGFlAHBLR8g8xPDIqoUIZk="; + sha256 = "sha256-NAiwHLYhTAQH6xZw5u8bM7MOILcMclQMKtJc7MGJb+Q="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 62bf32eb71d0c..72f13bdb09bfb 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -3,7 +3,7 @@ , coreutils , libjack2 , fetchpatch -, fetchzip +, fetchFromGitHub , jack_capture , pkg-config , pulseaudioFull @@ -20,9 +20,11 @@ mkDerivation rec { version = "0.9.1"; pname = "cadence"; - src = fetchzip { - url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"; - sha256 = "07z8grnnpkd0nf3y3r6qjlk1jlzrbhdrp9mnhrhhmws54p1bhl20"; + src = fetchFromGitHub { + owner = "falkTX"; + repo = "Cadence"; + rev = "v${version}"; + sha256 = "sha256-QFC4wiVF8wphhrammxtc+VMZJpXY5OGHs6DNa21+6B8="; }; patches = [ @@ -39,11 +41,11 @@ mkDerivation rec { ]; postPatch = '' - libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); - substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso - substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ - "${lib.makeBinPath[pulseaudioFull]}/pulseaudio" - substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso + libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); + substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso + substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ + "${lib.makeBinPath[pulseaudioFull]}/pulseaudio" + substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso ''; nativeBuildInputs = [ @@ -54,10 +56,12 @@ mkDerivation rec { qtbase jack_capture pulseaudioFull - ((python3.withPackages (ps: with ps; [ - pyqt5 - dbus-python - ]))) + ( + (python3.withPackages (ps: with ps; [ + pyqt5 + dbus-python + ])) + ) ]; makeFlags = [ @@ -68,31 +72,37 @@ mkDerivation rec { dontWrapQtApps = true; # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise. - preFixup = let - outRef = placeholder "out"; - prefix = "${outRef}/share/cadence/src"; - scriptAndSource = lib.mapAttrs' (script: source: - lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source) - ) { - "cadence" = "cadence.py"; - "claudia" = "claudia.py"; - "catarina" = "catarina.py"; - "catia" = "catia.py"; - "cadence-jacksettings" = "jacksettings.py"; - "cadence-aloop-daemon" = "cadence_aloop_daemon.py"; - "cadence-logs" = "logs.py"; - "cadence-render" = "render.py"; - "claudia-launcher" = "claudia_launcher.py"; - "cadence-session-start" = "cadence_session_start.py"; - }; - in lib.mapAttrsToList (script: source: '' - rm -f ${script} - makeQtWrapper ${source} ${script} \ - --prefix PATH : "${lib.makeBinPath [ - jack_capture # cadence-render - pulseaudioFull # cadence, cadence-session-start - ]}" - '') scriptAndSource; + preFixup = + let + outRef = placeholder "out"; + prefix = "${outRef}/share/cadence/src"; + scriptAndSource = lib.mapAttrs' + (script: source: + lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source) + ) + { + "cadence" = "cadence.py"; + "claudia" = "claudia.py"; + "catarina" = "catarina.py"; + "catia" = "catia.py"; + "cadence-jacksettings" = "jacksettings.py"; + "cadence-aloop-daemon" = "cadence_aloop_daemon.py"; + "cadence-logs" = "logs.py"; + "cadence-render" = "render.py"; + "claudia-launcher" = "claudia_launcher.py"; + "cadence-session-start" = "cadence_session_start.py"; + }; + in + lib.mapAttrsToList + (script: source: '' + rm -f ${script} + makeQtWrapper ${source} ${script} \ + --prefix PATH : "${lib.makeBinPath [ + jack_capture # cadence-render + pulseaudioFull # cadence, cadence-session-start + ]}" + '') + scriptAndSource; meta = { homepage = "https://github.com/falkTX/Cadence/"; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 0cc1ccd2aca5f..e7cd257f257e8 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config + glib ]; buildInputs = [ diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 36686655f3696..10ff66de77ed4 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,6 +35,15 @@ stdenv.mkDerivation rec { 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 + # rm -f *.o core *~ *.out + # gcc -O2 -fsigned-char -g -O2 -fpic -c scan_devices.c + # gcc -fpic -shared -o libcdda_interface.so.0.10.2 ... scan_devices.o ... + # scan_devices.o: file not recognized: file format not recognized + enableParallelBuilding = false; + meta = with lib; { homepage = "https://xiph.org/paranoia"; description = "A tool and library for reading digital audio from CDs"; diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index ebcd09ca6adf1..ff9dca961aea6 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, -util-linux, python3Packages, libnotify }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, rofi +, mpc_cli +, perl +, util-linux +, python3Packages +, libnotify +}: stdenv.mkDerivation { - name = "clerk-2016-10-14"; + pname = "clerk"; + version = "unstable-2016-10-14"; src = fetchFromGitHub { owner = "carnager"; @@ -26,8 +36,8 @@ stdenv.mkDerivation { meta = with lib; { description = "An MPD client built on top of rofi"; - homepage = "https://github.com/carnager/clerk"; - license = licenses.mit; + homepage = "https://github.com/carnager/clerk"; + license = licenses.mit; maintainers = with maintainers; [ anderspapitto ]; }; } diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 47db220164859..108be8726c50e 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , alsa-lib , audiofile @@ -28,6 +29,16 @@ stdenv.mkDerivation rec { sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"; }; + patches = [ + # Pull patch pending upstream inclusion for ncurses-6.3: + # https://sourceforge.net/p/ecasound/bugs/54/ + (fetchpatch { + name = "ncursdes-6.3.patch"; + url = "https://sourceforge.net/p/ecasound/bugs/54/attachment/0001-ecasignalview.cpp-always-use-s-style-format-for-prin.patch"; + sha256 = "1x1gsjzd43lh19mhpmwrbq269h56s8bxgyv0yfi5yf0sqjf9vaq0"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 44d5a0aa15aac..e0f7822bcd716 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { "--with-mbrola=${if mbrolaSupport then "yes" else "no"}" ]; + # Current release lacks dependencies on local espeak-ng: + # cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: ../src/espeak-ng --compile=yue && cd .. + # bash: line 1: ../src/espeak-ng: No such file or directory + # Should be fixed in next release: https://github.com/espeak-ng/espeak-ng/pull/1029 + enableParallelBuilding = false; + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 675f31b478ce3..e5579175bbb78 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation rec { - name = "espeak-1.48.04"; + pname = "espeak"; + version = "1.48.04"; src = fetchurl { - url = "mirror://sourceforge/espeak/${name}-source.zip"; + url = "mirror://sourceforge/espeak/espeak-${version}-source.zip"; sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 0b9fa3dfbe547..2240a85611641 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { - name = "espeakedit-1.48.03"; + pname = "espeakedit"; + version = "1.48.03"; src = fetchurl { - url = "mirror://sourceforge/espeak/${name}.zip"; + url = "mirror://sourceforge/espeak/espeakedit-${version}.zip"; sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index c1d351fa53e16..0309031cf7858 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.30.5"; + version = "2.37.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm"; + sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8dd43ead5914d..f9dbd3f80f0c4 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.33.1"; + version = "2.37.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; + sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 1a6471397de6c..ad57b6a690ff0 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,36 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake +{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake , alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices -, version ? "2" }: -let - versionMap = { - "1" = { - fluidsynthVersion = "1.1.11"; - sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; - }; - "2" = { - fluidsynthVersion = "2.0.6"; - sha256 = "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a"; - }; - }; -in - -with versionMap.${version}; - -stdenv.mkDerivation { - name = "fluidsynth-${fluidsynthVersion}"; - version = fluidsynthVersion; +stdenv.mkDerivation rec { + pname = "fluidsynth"; + version = "2.2.3"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; - rev = "v${fluidsynthVersion}"; - inherit sha256; + rev = "v${version}"; + sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3"; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] ++ lib.optionals stdenv.isLinux [ alsa-lib ] diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index f7abeb2a91e83..abb13b021c047 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { - version = "git-2015-05-21"; + version = "unstable-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { owner = "sampov2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + license = with licenses; [ bsd3 lgpl21 mpl11 ]; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 113894a9357d9..71bb0f6f05c8f 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://essej.net/freqtweak/; + homepage = "http://essej.net/freqtweak/"; description = "Realtime audio frequency spectral manipulation"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 1187dd1ba26e5..8c37e8901a333 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,7 +1,24 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which -, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, intltool +, libtool +, pkg-config +, which +, docbook_xml_dtd_45 +, docbook_xsl +, gtkmm2 +, pangomm_2_42 +, libgig +, libsndfile +, libxslt }: +let + gtkmm2_with_pango242 = gtkmm2.override { pangomm = pangomm_2_42; }; +in stdenv.mkDerivation rec { pname = "gigedit"; version = "1.1.1"; @@ -15,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ]; - buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; + buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2_with_pango242 libgig libsndfile libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index c539a316422a5..d281ec11c7d16 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,6 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, - freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, - epoxy, at-spi2-core, dbus, curl, fftwFloat }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, lv2 +, alsa-lib +, libjack2 +, freetype +, libX11 +, gtk3 +, pcre +, libpthreadstubs +, libXdmcp +, libxkbcommon +, libepoxy +, at-spi2-core +, dbus +, curl +, fftwFloat +}: let pname = "HybridReverb2"; @@ -10,11 +28,13 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + inherit pname version; - impulseDB = fetchzip { - url = "https://github.com/${owner}/${pname}-impulse-response-database/archive/v${DBversion}.zip"; - sha256 = "1hlfxbbkahm1k2sk3c3n2mjaz7k80ky3r55xil8nfbvbv0qan89z"; + impulseDB = fetchFromGitHub { + inherit owner; + repo = "HybridReverb2-impulse-response-database"; + rev = "v${DBversion}"; + sha256 = "sha256-PyGrMNhrL2cRjb2UPPwEaJ6vZBV2sDG1mKFCNdfqjsI="; }; src = fetchFromGitHub { @@ -26,8 +46,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre - libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; + buildInputs = [ + lv2 + alsa-lib + libjack2 + freetype + libX11 + gtk3 + pcre + libpthreadstubs + libXdmcp + libxkbcommon + libepoxy + at-spi2-core + dbus + curl + fftwFloat + ]; cmakeFlags = [ "-DHybridReverb2_AdvancedJackStandalone=ON" diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index ad3566571b0c5..aa1821657867a 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,19 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, cmake -, alsa-lib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, alsa-lib +, boost +, glib +, lash +, libjack2 +, libarchive +, libsndfile +, lrdf +, qt4 }: stdenv.mkDerivation rec { version = "0.9.7"; pname = "hydrogen"; - src = fetchurl { - url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; - sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; + src = fetchFromGitHub { + owner = "hydrogen-music"; + repo = "hydrogen"; + rev = version; + sha256 = "sha256-6ycNUcumtAEl/6XbIpW6JglGv4nNOdMrOJ1nvJg3z/c="; }; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - alsa-lib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + alsa-lib + boost + glib + lash + libjack2 + libarchive + libsndfile + lrdf + qt4 ]; meta = with lib; { diff --git a/pkgs/applications/audio/jconvolver/default.nix b/pkgs/applications/audio/jconvolver/default.nix new file mode 100644 index 0000000000000..5294ae5f13a18 --- /dev/null +++ b/pkgs/applications/audio/jconvolver/default.nix @@ -0,0 +1,114 @@ +{ lib, stdenv, fetchurl, flac, unzip, fftwFloat, hybridreverb2, libclthreads, libjack2, libsndfile, zita-convolver }: + +stdenv.mkDerivation rec { + pname = "jconvolver"; + version = "1.1.0"; + + src = fetchurl { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; + sha256 = "03fq1rk5wyn32w0aaa9vqijnw9x9i0i7sv4nhsf949bk5lvi2nmc"; + }; + + reverbs = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jconvolver-reverbs.tar.bz2"; + sha256 = "127aj211xfqp37c94d9cn0mmwzbjkj3f6br5gr67ckqirvsdkndi"; + }; + weird = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/weird.wav"; + sha256 = "14xchdikx5k8zlgwglrqi168vki3n3rwhn73dkbj5qwh2ndrlyrc"; + }; + + porihall-sf = fetchurl { + url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/sndfld.zip"; + sha256 = "0z1kmdin3vcy6wmnym9jlfh8hwvci9404hff02cb98iw2slxid42"; + }; + porihall-bd = fetchurl { + url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/bin_dfeq.zip"; + sha256 = "03m2brfxs851sag4z7kd71h6anv6hj34zcambwib0v1byg8vyplp"; + }; + porihall-c = fetchurl { + url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/cardioid.zip"; + sha256 = "0ilbfvb2kvg5z6zi0mf2k4n0vgpir3iz5fa53xw92c07fs0cx36w"; + }; + + spacenet-hm2 = fetchurl { + url = "https://webfiles.york.ac.uk/OPENAIR/IRs/hamilton-mausoleum/b-format/hm2_000_bformat_48k.wav"; + sha256 = "1icnzfzq3mccbmnvmvh22mw8g8dci4i9h7lgrpmycj58v3gnb1p5"; + }; + spacenet-lyd3 = fetchurl { + url = "https://webfiles.york.ac.uk/OPENAIR/IRs/st-andrews-church/b-format/lyd3_000_bformat_48k.wav"; + sha256 = "144cc0i91q5i72lwbxydx3nvxrd12j7clxjhwa2b8sf69ypz58wd"; + }; + spacenet-mh3 = fetchurl { + url = "https://webfiles.york.ac.uk/OPENAIR/IRs/maes-howe/b-format/mh3_000_bformat_48k.wav"; + sha256 = "1c6v9jlm88l1sx2383yivycdrs9jqfsfx8cpbkjg19v2x1dfns0b"; + }; + spacenet-minster1 = fetchurl { + url = "https://webfiles.york.ac.uk/OPENAIR/IRs/york-minster/b-format/minster1_bformat_48k.wav"; + sha256 = "1cs26pawjkv6qvwhfirfvzh21xvnmx8yh7f4xcr79cxv5c6hhnrw"; + }; + + nativeBuildInputs = [ flac unzip ]; + + buildInputs = [ + fftwFloat + hybridreverb2 + libclthreads + libjack2 + libsndfile + zita-convolver + ]; + + outputs = [ "bin" "out" "doc" ]; + + preConfigure = '' + cd source + ''; + + makeFlags = [ + "PREFIX=$(bin)" + ]; + + postInstall = '' + mkdir -p $doc/share/doc/jconvolver + cp -r ../[A-Z]* $doc/share/doc/jconvolver/ + + mkdir -p $out/share/jconvolver + cp -r ../config-files $out/share/jconvolver/ + cd $out/share/jconvolver + for conf in */*.conf */*/*.conf; do + if grep -q /audio/ $conf; then + substituteInPlace $conf --replace /audio/ $out/share/jconvolver/ + fi + done + substituteInPlace config-files/xtalk-cancel/EYCv2-44.conf --replace /cd "#/cd" + ln -s ${weird} config-files/weird.wav + + tar xf ${reverbs} + cd reverbs + unzip -d porihall ${porihall-sf} s1_r4_sf.wav + unzip -d porihall ${porihall-bd} s1_r3_bd.wav + unzip -d porihall ${porihall-c} s1_r3_c.wav + + mkdir spacenet + ln -s ${spacenet-hm2} spacenet/HM2_000_WXYZ_48k.amb + ln -s ${spacenet-lyd3} spacenet/Lyd3_000_WXYZ_48k.amb + ln -s ${spacenet-mh3} spacenet/MH3_000_WXYZ_48k.amb + ln -s ${spacenet-minster1} spacenet/Minster1_000_WXYZ_48k.amb + + mkdir -p hybridreverb-database/large_concert_hall/music/8m + for flac in ${hybridreverb2}/share/HybridReverb2/RIR_Database/large_concert_hall/music/8m/*.flac; do + flac --output-prefix=hybridreverb-database/large_concert_hall/music/8m/ -d $flac + done + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A JACK client and audio file convolver with reverb samples"; + homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 6e5cc0d519164..655fc6a9608ca 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of LADSPA and LV2 plugins for guitar sound processing"; - homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; + homepage = "https://github.com/olegkapitonov/Kapitonov-Plugins-Pack"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index fe8e9f323a57f..491a18bba3eaa 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkg-config -, perlPackages }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, automake +, fftw +, ladspaH +, libxml2 +, pkg-config +, perlPackages +}: stdenv.mkDerivation rec { pname = "swh-plugins"; version = "0.4.17"; - - src = fetchurl { - url = "https://github.com/swh/ladspa/archive/v${version}.tar.gz"; - sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; + src = fetchFromGitHub { + owner = "swh"; + repo = "ladspa"; + rev = "v${version}"; + sha256 = "sha256-eOtIhNcuItREUShI8JRlBVKfMfovpdfIYu+m37v4KLE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; + buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' patchShebangs . diff --git a/pkgs/applications/audio/libopenmpt/default.nix b/pkgs/applications/audio/libopenmpt/default.nix index ef5c080133b08..b2b5ebecd7e23 100644 --- a/pkgs/applications/audio/libopenmpt/default.nix +++ b/pkgs/applications/audio/libopenmpt/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, fetchpatch, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 7b7d811f57313..64d59516f87f1 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -15,24 +15,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0"; - cargoBuildFlags = with lib; [ - "--no-default-features" - "--features" - (concatStringsSep "," (filter (x: x != "") [ - (optionalString withRodio "rodio-backend") - (optionalString withALSA "alsa-backend") - (optionalString withPulseAudio "pulseaudio-backend") - (optionalString withPortAudio "portaudio-backend") - - ])) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withRodio "rodio-backend" + ++ lib.optional withALSA "alsa-backend" + ++ lib.optional withPulseAudio "pulseaudio-backend" + ++ lib.optional withPortAudio "portaudio-backend"; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 0213dc4af6daf..a50e5dcd66908 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.4"; + version = "6.5"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XR5xmQYVbBR6QWt/+PLeGqg0t4xl35MPrQNaPsmgAYA="; + sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 518c54dc48aa4..bbd0e07a64a46 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -53,13 +53,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - sha256 = "18sx4l3zzbn5142xfv5bp0crdd615a5728fkprqacnx3zpa144x6"; + sha256 = "sha256-6M1qaRyRYWTIKqclewuD+RUVDdxVbBHcfpw2qYgO6BA="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -117,7 +117,7 @@ mkDerivation rec { # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall - # see https://github.com/mixxxdj/mixxx/blob/2.3.0/CMakeLists.txt#L1381-L1392 + # see https://github.com/mixxxdj/mixxx/blob/2.3.1/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" ]; diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index fc5a2e9b03509..578cecf09b097 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -1,27 +1,26 @@ -{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz"; + sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA="; }; - cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv"; + cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0="; nativeBuildInputs = [ installShellFiles ]; preFixup = '' completions=($releaseDir/build/mmtc-*/out/completions) - installShellCompletion ''${completions[0]}/mmtc.{bash,fish} - installShellCompletion --zsh ''${completions[0]}/_mmtc + installShellCompletion $completions/mmtc.{bash,fish} --zsh $completions/_mmtc ''; - GEN_COMPLETIONS = "1"; + GEN_COMPLETIONS = 1; meta = with lib; { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 7c9f2acfd8445..7e2b2bf6cfbda 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation { - pname = "mod-distortion-git"; - version = "2016-08-19"; + pname = "mod-distortion"; + version = "unstable-2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index d7dd5f102dbd8..0d65fe813ec19 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { pname = "mp3blaster"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/stragulus/mp3blaster/pull/8 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch"; + sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1"; + }) + ]; + buildInputs = [ ncurses libvorbis diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index e355cfb86de0c..3676697f16e8b 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "1zx129zl6bjb0j3f81yx2641nsj6ck04q5f0v0g8f08xgdwsyv3b"; + sha256 = "1a5nhlbgi3ahnkcq16c2vgiaghgswy5lxg64pcrlbqssg1pj5gma"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 191612700f415..93a9ce2585444 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -36,7 +36,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/${mainProgram}.app $out/Applications/ - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} ''; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d37cec15ffcb1..29a244f19d7aa 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -5,13 +5,6 @@ , withMPRIS ? false, dbus ? null }: -let - features = [ "cursive/pancurses-backend" ] - ++ lib.optional withALSA "alsa_backend" - ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend" - ++ lib.optional withMPRIS "mpris"; -in rustPlatform.buildRustPackage rec { pname = "ncspot"; version = "0.9.0"; @@ -25,8 +18,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0"; - cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] @@ -36,6 +27,13 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPortAudio portaudio ++ lib.optional withMPRIS dbus; + buildNoDefaultFeatures = true; + buildFeatures = [ "cursive/pancurses-backend" ] + ++ lib.optional withALSA "alsa_backend" + ++ lib.optional withPulseAudio "pulseaudio_backend" + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMPRIS "mpris"; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch new file mode 100644 index 0000000000000..7fc21c11ff7c3 --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch @@ -0,0 +1,2007 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..41d41a5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2001 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" ++ ++[[package]] ++name = "async-channel" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-executor" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++dependencies = [ ++ "async-task", ++ "concurrent-queue", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++ "slab", ++] ++ ++[[package]] ++name = "async-global-executor" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" ++dependencies = [ ++ "async-channel", ++ "async-executor", ++ "async-io", ++ "async-mutex", ++ "blocking", ++ "futures-lite", ++ "num_cpus", ++ "once_cell", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" ++dependencies = [ ++ "concurrent-queue", ++ "futures-lite", ++ "libc", ++ "log", ++ "once_cell", ++ "parking", ++ "polling", ++ "slab", ++ "socket2", ++ "waker-fn", ++ "winapi", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-mutex" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-std" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" ++dependencies = [ ++ "async-channel", ++ "async-global-executor", ++ "async-io", ++ "async-lock", ++ "crossbeam-utils", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-lite", ++ "gloo-timers", ++ "kv-log-macro", ++ "log", ++ "memchr", ++ "num_cpus", ++ "once_cell", ++ "pin-project-lite", ++ "pin-utils", ++ "slab", ++ "wasm-bindgen-futures", ++] ++ ++[[package]] ++name = "async-task" ++version = "4.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" ++ ++[[package]] ++name = "atk" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" ++dependencies = [ ++ "atk-sys", ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "atk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "atomic-waker" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bincode" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "blocking" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" ++dependencies = [ ++ "async-channel", ++ "async-task", ++ "atomic-waker", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" ++ ++[[package]] ++name = "bytes" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++ ++[[package]] ++name = "cache-padded" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" ++ ++[[package]] ++name = "cairo-rs" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" ++dependencies = [ ++ "bitflags", ++ "cairo-sys-rs", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "thiserror", ++] ++ ++[[package]] ++name = "cairo-sys-rs" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "castaway" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed247d1586918e46f2bbe0f13b06498db8dab5a8c1093f156652e9f2e0a73fc3" ++ ++[[package]] ++name = "cc" ++version = "1.0.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi", ++] ++ ++[[package]] ++name = "concurrent-queue" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++dependencies = [ ++ "cache-padded", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" ++dependencies = [ ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877cc2f9b8367e32b6dabb9d581557e651cb3aa693a37f8679091bbf42687d5d" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.50+curl-7.79.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4856b76919dd599f31236bb18db5f5bd36e2ce131e64f857ca5c259665b76171" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi", ++] ++ ++[[package]] ++name = "custom_error" ++version = "1.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" ++ ++[[package]] ++name = "dbus" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "3.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "4.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "event-listener" ++version = "2.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" ++ ++[[package]] ++name = "fastrand" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fragile" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" ++ ++[[package]] ++name = "futures" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" ++ ++[[package]] ++name = "futures-lite" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" ++dependencies = [ ++ "autocfg", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" ++dependencies = [ ++ "autocfg", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project-lite", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "gdk" ++version = "0.13.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" ++dependencies = [ ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "gdk-pixbuf", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango", ++] ++ ++[[package]] ++name = "gdk-pixbuf" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" ++dependencies = [ ++ "gdk-pixbuf-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gdk-pixbuf-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" ++dependencies = [ ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gdk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" ++dependencies = [ ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "pkg-config", ++ "system-deps", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "gio" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" ++dependencies = [ ++ "bitflags", ++ "futures", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-util", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "thiserror", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++ "winapi", ++] ++ ++[[package]] ++name = "glib" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-task", ++ "futures-util", ++ "glib-macros", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "glib-macros" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" ++dependencies = [ ++ "anyhow", ++ "heck", ++ "itertools", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" ++dependencies = [ ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gloo-timers" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "muldiv", ++ "num-rational 0.3.2", ++ "once_cell", ++ "paste", ++ "pretty-hex", ++ "thiserror", ++] ++ ++[[package]] ++name = "gstreamer-base" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-base-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-player" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34edf65e48e0d29c18101d77a2e004488a61f81a852a75e19d9c73e03d35cb77" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-player-sys", ++ "gstreamer-sys", ++ "gstreamer-video", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-player-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53aaf79503e691a32266670bc631edb6c52bdb854984da76a0ce2756f49584a2" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-video" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "gstreamer-video-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gtk" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" ++dependencies = [ ++ "atk", ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "cc", ++ "gdk", ++ "gdk-pixbuf", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gtk-sys", ++ "libc", ++ "once_cell", ++ "pango", ++ "pango-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "gtk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" ++dependencies = [ ++ "atk-sys", ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "system-deps", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "http" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "isahc" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40ef5402b1791c9fc479ef9871601a2f10e4cc0f14414a5c9c6e043fb51e5a56" ++dependencies = [ ++ "async-channel", ++ "castaway", ++ "chrono", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", ++ "mime", ++ "once_cell", ++ "polling", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kv-log-macro" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.107" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" ++ ++[[package]] ++name = "libdbus-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.7+1.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if", ++ "value-bag", ++] ++ ++[[package]] ++name = "loggerv" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60d8de15ae71e760bce7f05447f85f73624fe0d3b1e4c5a63ba5d4cb0748d374" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "log", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++ ++[[package]] ++name = "memchr" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mp4ameta" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "619f6fe86b8690efad1c53d2cc8b9c1af2a5f8b93247e0ba05ece1b7639b4e66" ++dependencies = [ ++ "lazy_static", ++ "mp4ameta_proc", ++] ++ ++[[package]] ++name = "mp4ameta_proc" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4975ce203cd69e96a89f803d87b7b53d1950a6e93668a666d177c28aebd15c8a" ++ ++[[package]] ++name = "mpris-player" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" ++dependencies = [ ++ "dbus", ++ "glib", ++] ++ ++[[package]] ++name = "muldiv" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" ++ ++[[package]] ++name = "netease-cloud-music-gtk" ++version = "1.2.2" ++dependencies = [ ++ "async-std", ++ "base64", ++ "bincode", ++ "cairo-rs", ++ "chrono", ++ "custom_error", ++ "dirs 4.0.0", ++ "fragile", ++ "futures", ++ "gdk", ++ "gdk-pixbuf", ++ "gio", ++ "glib", ++ "gstreamer", ++ "gstreamer-player", ++ "gtk", ++ "hex", ++ "isahc", ++ "lazy_static", ++ "log", ++ "loggerv", ++ "mp4ameta", ++ "mpris-player", ++ "num", ++ "openssl", ++ "pango", ++ "rand", ++ "regex", ++ "serde", ++ "serde_json", ++ "urlqstring", ++ "xdg", ++] ++ ++[[package]] ++name = "num" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" ++dependencies = [ ++ "num-bigint", ++ "num-complex", ++ "num-integer", ++ "num-iter", ++ "num-rational 0.4.0", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" ++dependencies = [ ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-iter" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" ++dependencies = [ ++ "autocfg", ++ "num-bigint", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++ ++[[package]] ++name = "openssl" ++version = "0.10.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "pango" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "pango-sys", ++] ++ ++[[package]] ++name = "pango-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "paste" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++ ++[[package]] ++name = "polling" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "log", ++ "wepoll-ffi", ++ "winapi", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" ++ ++[[package]] ++name = "pretty-hex" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" ++ ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++] ++ ++[[package]] ++name = "regex" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" ++ ++[[package]] ++name = "sluice" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" ++dependencies = [ ++ "async-channel", ++ "futures-core", ++ "futures-io", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "strum" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" ++ ++[[package]] ++name = "strum_macros" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" ++dependencies = [ ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "system-deps" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" ++dependencies = [ ++ "heck", ++ "pkg-config", ++ "strum", ++ "strum_macros", ++ "thiserror", ++ "toml", ++ "version-compare", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tracing" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" ++dependencies = [ ++ "cfg-if", ++ "log", ++ "pin-project-lite", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "url" ++version = "2.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "urlqstring" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25ef3473a06a065718d8ec7cd7acc6a35fc20f836dee7661ad3b64ea3cc2e0cc" ++ ++[[package]] ++name = "value-bag" ++version = "1.0.0-alpha.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" ++dependencies = [ ++ "ctor", ++ "version_check", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version-compare" ++version = "0.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" ++dependencies = [ ++ "cfg-if", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "wepoll-ffi" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xdg" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" ++dependencies = [ ++ "dirs 3.0.2", ++] diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix new file mode 100644 index 0000000000000..76e1bc3923a84 --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, glib +, gtk3 +, curl +, dbus +, openssl +, gst_all_1 +, pkg-config +, rustPlatform +, wrapGAppsHook +, fetchurl +, fetchFromGitHub +, makeDesktopItem +}: +rustPlatform.buildRustPackage rec { + pname = "netease-cloud-music-gtk"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "gmg137"; + repo = "netease-cloud-music-gtk"; + rev = version; + sha256 = "sha256-42MaylfG5LY+TiYHWQMoh9CiVLShKXSBpMrxdWhujow="; + }; + cargoSha256 = "sha256-A9wIcESdaJwLY4g/QlOxMU5PBB9wjvIzaXBSqeiRJBM="; + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ + glib + gtk3 + dbus + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + curl + dbus + openssl + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + install -D netease-cloud-music-gtk.desktop $out/share/applications/netease-cloud-music-gtk.desktop + install -D icons/netease-cloud-music-gtk.svg $out/share/icons/hicolor/scalable/apps/netease-cloud-music-gtk.svg + ''; + + meta = with lib; { + description = "netease-cloud-music-gtk is a Rust + GTK based netease cloud music player"; + homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh new file mode 100755 index 0000000000000..75b04d1e77ca8 --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils ripgrep git cargo + +# Ref: https://github.com/NixOS/nixpkgs/blob/nixos-21.05/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh + +set -eu -vx + +here=$PWD +version=$(cat default.nix | rg '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) + +git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout" +cd "$checkout" + +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index edfb194836464..b5e820e83459b 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -1,20 +1,38 @@ -{ lib, stdenv, fetchurl, cmake -, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch -, qtbase, qtdeclarative, qtquickcontrols2 +{ lib +, stdenv +, fetchurl +, cmake +, alsa-lib +, fftwSinglePrec +, libjack2 +, libpulseaudio +, libvorbis +, soundtouch +, qtbase +, qtdeclarative +, qtquickcontrols2 }: stdenv.mkDerivation rec { - name = "nootka-1.7.0-beta1"; + pname = "nootka"; + version = "1.7.0-beta1"; src = fetchurl { - url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2"; sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch - qtbase qtdeclarative qtquickcontrols2 + alsa-lib + fftwSinglePrec + libjack2 + libpulseaudio + libvorbis + soundtouch + qtbase + qtdeclarative + qtquickcontrols2 ]; dontWrapQtApps = true; diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 4bad496033735..420055884b453 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, fetchgit, ncurses, portmidi }: stdenv.mkDerivation { pname = "orca-c"; - - version = "git-2021-02-13"; + version = "unstable-2021-02-13"; src = fetchgit { url = "https://git.sr.ht/~rabbits/orca"; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 64e403001a3d2..31ccb212cd51f 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,6 @@ { fetchurl -, lib, stdenv +, lib +, stdenv , meson , ninja , gettext @@ -11,10 +12,11 @@ }: stdenv.mkDerivation rec { - name = "paprefs-1.1"; + pname = "paprefs"; + version = "1.1"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz"; sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; }; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 33df06e77e4cb..b5cf068d5691e 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw=="; + sha512 = "JVzfWlrX21KHw4tSrGpCYqqoWFudnyFG4YnHKsnIUtxLDkjyQA8N2/OrDIR+SlK/b0RRs9KZ4lbqQMX8PXUHsg=="; }; 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/32"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/35"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 75a706cff1eda..ac7f4206dbeb8 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.1.53"; + version = "6.1.55"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-4GOVrKVHl/Cj0PNx+rcLESn5fbyIsnzaheMOFLlEVMU="; + sha256 = "sha256-PQVbrohIlmzKcG/8TzOBgyQWWaMH88voMNWAqEfyUWI="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 606f80d1e41ed..e5a97aee86cda 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.36"; + version = "1.37"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-QyhBoWCkj7iYXAFsyVH6+XH2P/MQEXZQfAcUDu4Rtco="; + sha256 = "sha256-r9H+qF542j2qjmOEjJLAtnMU7SkJBJB8nH39zhkZu9M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index ffc2d72891dc8..71c574490f0a0 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.5.0"; + version = "0.5.0.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-sN3O8m+ib6Chb/RXTFbNWW6PnrolCHpmC/avRX93AH4="; + sha256 = "10v310smm0df233wlh1kqv8i36lsg1m36v0flrhs2202k50d69ri"; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix new file mode 100644 index 0000000000000..9d4118a439158 --- /dev/null +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -0,0 +1,118 @@ +{ coreutils +, fetchurl +, gawk +, gnused +, jdk8 +, lib +, makeDesktopItem +, makeWrapper +, stdenv +, writeScript +, writeTextFile +, recommendedUdevRules ? true +}: + +stdenv.mkDerivation rec { + pname = "roomeqwizard"; + version = "5.20.4"; + + src = fetchurl { + url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; + sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8"; + }; + + dontUnpack = true; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "REW"; + genericName = "Software for audio measurements"; + categories = "AudioVideo;"; + }; + + responseFile = writeTextFile { + name = "response.varfile"; + text = '' + createDesktopLinkAction$Boolean=false + executeLauncherAction$Boolean=false + mem$Integer=1 + opengl$Boolean=false + sys.adminRights$Boolean=false + sys.installationDir=INSTALLDIR + sys.languageId=en + sys.programGroupDisabled$Boolean=true + ''; + }; + + udevRules = '' + # MiniDSP UMIK-1 calibrated USB microphone + SUBSYSTEM=="usb", ATTR{idVendor}=="2752", ATTR{idProduct}=="0007", TAG+="uaccess" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + runHook preBuild + + # set JDK path in installer + sed -E 's|^#\s*(INSTALL4J_JAVA_HOME_OVERRIDE=)|\1${jdk8}|' $src > installer + chmod +x installer + + sed -e "s|INSTALLDIR|$out/share/roomeqwizard|" $responseFile > response.varfile + + export HOME=$PWD + + ./installer -q -varfile response.varfile + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib/udev/rules.d $out/share/icons/hicolor/256x256/apps + makeWrapper $out/share/roomeqwizard/roomeqwizard $out/bin/roomeqwizard \ + --set INSTALL4J_JAVA_HOME_OVERRIDE ${jdk8} \ + --prefix PATH : ${lib.makeBinPath [ coreutils gnused gawk ]} + + cp -r "$desktopItem/share/applications" $out/share/ + cp $out/share/roomeqwizard/.install4j/s_*.png "$out/share/icons/hicolor/256x256/apps/${pname}.png" + + ${lib.optionalString recommendedUdevRules ''echo "$udevRules" > $out/lib/udev/rules.d/90-roomeqwizard.rules''} + + runHook postInstall + ''; + + passthru.updateScript = writeScript "${pname}-update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts nixpkgs-fmt coreutils perl + + set -euo pipefail + + perlexpr='if (/current version.{1,10}v(\d+)\.(\d+)\.(\d+)/i) { print "$1.$2.$3"; break; }' + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestVersion="$(curl -sS https://www.roomeqwizard.com/index.html | perl -ne "$perlexpr")" + + if [ ! "$oldVersion" = "$latestVersion" ]; then + update-source-version ${pname} "$latestVersion" --version-key=version --print-changes + nixpkgs-fmt "pkgs/applications/audio/roomeqwizard/default.nix" + else + echo "${pname} is already up-to-date" + fi + ''; + + meta = with lib; { + homepage = "https://www.roomeqwizard.com/"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ zaninime ]; + description = "Room Acoustics Software"; + longDescription = '' + REW is free software for room acoustic measurement, loudspeaker + measurement and audio device measurement. + ''; + }; +} diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 0299f66191ede..d2b6ba07d2ebc 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,7 +1,10 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, pulseaudioSupport ? false, libpulseaudio , nixosTests }: +assert pulseaudioSupport -> libpulseaudio != null; + let dependency = { name, version, sha256 }: @@ -50,7 +53,7 @@ stdenv.mkDerivation rec { boost17x alsa-lib asio avahi flac libogg libvorbis aixlog popl soxr - ]; + ] ++ lib.optional pulseaudioSupport libpulseaudio; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index c25276ff6e195..f38bd678d9ef8 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.68.632.g2b11de83"; + version = "1.1.72.439.gc253025e"; # 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 = "53"; + rev = "56"; 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 = "ed991691c99fe97ed9ff5d0f5cc9a8883c176fa3b3054293c37d545abbb895c6260afdf1c8c0828d62c36ea7ab384e166b6151effb4614c93e4fa712319a08a3"; + sha512 = "b2bd3d49a18dfebaa4660f9c39d11d57fb80a4ef15ec7b7973e3cc07be74f74aebd2d8c66360d79fe778244c533ed02f9dfca4085f99aae0e5faae7c003ba4ef"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index e9de6cb3cf783..dacf91e562290 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -20,12 +20,6 @@ rustPackages.rustPlatform.buildRustPackage rec { cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z"; - cargoBuildFlags = [ - "--no-default-features" - "--features" - "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}" - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] @@ -34,6 +28,13 @@ rustPackages.rustPlatform.buildRustPackage rec { ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withALSA "alsa_backend" + ++ lib.optional withPulseAudio "pulseaudio_backend" + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMpris "dbus_mpris" + ++ lib.optional withKeyring "dbus_keyring"; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 5c9250b45e03a..3f7e1e038f8ee 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.13"; + version = "0.11.16"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NzbQtRcsRVppyuG1UuS3IidSnniUOavf5YoAf/kcZqw="; + sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; }; nativeBuildInputs = [ @@ -57,19 +57,26 @@ python3Packages.buildPythonApplication rec { ++ lib.optional serverSupport bottle ; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov-on-fail/d" setup.cfg + ''; + # hook for gobject-introspection doesn't like strictDeps # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - # Use the test suite provided by the upstream project. checkInputs = with python3Packages; [ pytest - pytest-cov ]; - checkPhase = "${xvfb-run}/bin/xvfb-run pytest"; - # Also run the python import check for sanity - pythonImportsCheck = [ "sublime_music" ]; + checkPhase = '' + ${xvfb-run}/bin/xvfb-run pytest + ''; + + pythonImportsCheck = [ + "sublime_music" + ]; postInstall = '' install -Dm444 sublime-music.desktop -t $out/share/applications diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix new file mode 100644 index 0000000000000..6445723d7781c --- /dev/null +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "surge-XT"; + version = "unstable-2021-11-07"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = "surge"; + rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5"; + sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ]; + + installPhase = '' + cd .. + cmake --build build --config Release --target install + ''; + + doInstallCheck = false; + + meta = with lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index f2b71c1ce291b..338877d2be21f 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fftwSinglePrec, libxslt, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "swh-lv2"; version = "1.0.16"; - src = fetchurl { - url = "https://github.com/swh/lv2/archive/v${version}.tar.gz"; - sha256 = "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w"; + src = fetchFromGitHub { + owner = "swh"; + repo = "lv2"; + rev = "v${version}"; + sha256 = "sha256-v6aJUWDbBZEmz0v6+cSCi/KhOYNUeK/MJLUSgzi39ng="; }; patchPhase = '' diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/applications/audio/tagutil/default.nix index 802cd00087a8a..e5076188301a5 100644 --- a/pkgs/applications/audio/tagutil/default.nix +++ b/pkgs/applications/audio/tagutil/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { zlib ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-o aslr" "" + ''; + meta = with lib; { description = "Scriptable music files tags tool and editor"; homepage = "https://github.com/kaworu/tagutil"; diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix new file mode 100644 index 0000000000000..fbf13c1748ff4 --- /dev/null +++ b/pkgs/applications/audio/tenacity/default.nix @@ -0,0 +1,148 @@ +{ stdenv +, lib +, fetchFromSourcehut +, cmake +, wxGTK +, pkg-config +, python3 +, gettext +, glib +, file +, lame +, libvorbis +, libmad +, libjack2 +, lv2 +, lilv +, makeWrapper +, serd +, sord +, sqlite +, sratom +, suil +, alsa-lib +, libsndfile +, soxr +, flac +, twolame +, expat +, libid3tag +, libopus +, ffmpeg +, soundtouch +, pcre +, portaudio +, linuxHeaders +, at-spi2-core +, dbus +, libepoxy +, libXdmcp +, libXtst +, libpthreadstubs +, libselinux +, libsepol +, libxkbcommon +, util-linux +}: + +stdenv.mkDerivation rec { + pname = "tenacity"; + version = "unstable-2021-10-18"; + + src = fetchFromSourcehut { + owner = "~tenacity"; + repo = "tenacity"; + rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4"; + sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4"; + }; + + postPatch = '' + touch src/RevisionIdent.h + + substituteInPlace src/FileNames.cpp \ + --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + ''; + + postFixup = '' + rm $out/tenacity + wrapProgram "$out/bin/tenacity" \ + --suffix AUDACITY_PATH : "$out/share/tenacity" \ + --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ + --prefix LD_LIBRARY_PATH : "$out/lib/tenacity" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; + + # tenacity only looks for ffmpeg at runtime, so we need to link it in manually + NIX_LDFLAGS = toString [ + "-lavcodec" + "-lavdevice" + "-lavfilter" + "-lavformat" + "-lavresample" + "-lavutil" + "-lpostproc" + "-lswresample" + "-lswscale" + ]; + + nativeBuildInputs = [ + cmake + gettext + makeWrapper + pkg-config + python3 + ] ++ lib.optionals stdenv.isLinux [ + linuxHeaders + ]; + + buildInputs = [ + alsa-lib + expat + ffmpeg + file + flac + glib + lame + libid3tag + libjack2 + libmad + libopus + libsndfile + libvorbis + lilv + lv2 + pcre + portaudio + serd + sord + soundtouch + soxr + sqlite + sratom + suil + twolame + wxGTK + wxGTK.gtk + ] ++ lib.optionals stdenv.isLinux [ + at-spi2-core + dbus + libepoxy + libXdmcp + libXtst + libpthreadstubs + libxkbcommon + libselinux + libsepol + util-linux + ]; + + meta = with lib; { + description = "Sound editor with graphical UI"; + homepage = "https://tenacityaudio.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ irenes lheckemann ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 54ed7a977f398..1c0d51ed88be2 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://tonelib.net/"; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 2eef1f7bd6098..41539503e0203 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -1,12 +1,18 @@ -{ stdenv -, dpkg -, lib -, autoPatchelfHook +{ lib +, stdenv , fetchurl -, webkitgtk -, libjack2 +, autoPatchelfHook +, dpkg , alsa-lib +, freetype +, libglvnd , curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 +, webkitgtk }: stdenv.mkDerivation rec { @@ -18,36 +24,40 @@ stdenv.mkDerivation rec { sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c="; }; - buildInputs = [ + nativeBuildInputs = [ + autoPatchelfHook dpkg - webkitgtk - libjack2 - alsa-lib ]; - nativeBuildInputs = [ - autoPatchelfHook + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + webkitgtk + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 ]; - unpackPhase = '' - mkdir -p $TMP/ $out/ - dpkg -x $src $TMP - ''; + unpackCmd = "dpkg -x $curSrc source"; installPhase = '' - cp -R $TMP/usr/* $out/ - mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom + mv usr $out + substituteInPlace $out/share/applications/ToneLib-Zoom.desktop --replace /usr/ $out/ ''; - runtimeDependencies = [ - (lib.getLib curl) - ]; - meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index a576898128ec6..5cc3c1099995f 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libmpdclient , ncurses @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; + patches = [ + # Pull fix pending upstream inclusion for ncurses-6.3: + # https://github.com/boysetsfrog/vimpc/pull/100 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b.patch"; + sha256 = "01p858jjxm0bf8hnk1z8h45j8c1y9i995mafa6ff3vg9vlak61pv"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmpdclient ncurses pcre taglib curl ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index a2fea468de9d7..3d6f3aef9e1bc 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -88,5 +88,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; + mainProgram = "com.github.needleandthread.vocal"; }; } diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index f4ef7f6d8a578..1820ed2def1cb 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "wavegain-1.3.1"; + pname = "wavegain"; + version = "1.3.1"; + src = fetchFromGitHub { owner = "MestreLion"; repo = "wavegain"; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index d66c161664f3b..a7a8f054172cd 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -42,7 +42,7 @@ in python3.pkgs.buildPythonApplication rec { mutagen pycdio pygobject3 - ruamel_yaml + ruamel-yaml discid pillow ]; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 31ef68714f6a5..d698ef68da5c4 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-avldrums"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; rev = "v${version}"; - sha256 = "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws"; + sha256 = "sha256-L9rLSHHQIM6PqZ397TIxR6O1N9GKAQtDfWCofV5R85E="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 557802a8a0fba..70353e2497f1a 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 = "20210714"; + version = "20211016"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-X389bA+cf3N5eJpAlpDn/CJQ6xM4qzrBQ47fYPIyIHk="; + sha256 = "sha256-Z2lXaJweOPB9hWOuy2cx1P9/CAJ+IMc7JtPDKAg2boU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 777ac79a22da0..a07bfa60b0545 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "02blg0iqich4vx5z1ahj6avkh83yqszdiq83p9jd5qwm0i4llqjq"; + sha256 = "sha256-zlANfFuEXQdXlSu4CuXNyChiuV7wkumaOJqgthl6Y9Q="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix new file mode 100644 index 0000000000000..480684525b110 --- /dev/null +++ b/pkgs/applications/audio/zrythm/default.nix @@ -0,0 +1,169 @@ +{ stdenv +, lib +, fetchFromGitHub +, SDL2 +, alsa-lib +, libaudec +, bash +, bash-completion +, breeze-icons +, carla +, chromaprint +, cmake +, curl +, dconf +, libepoxy +, ffmpeg +, fftw +, fftwFloat +, flex +, glib +, gtk3 +, gtksourceview3 +, guile +, graphviz +, help2man +, json-glib +, jq +, libbacktrace +, libcyaml +, libgtop +, libjack2 +, libpulseaudio +, libsamplerate +, libsndfile +, libsoundio +, libxml2 +, libyaml +, lilv +, lv2 +, meson +, ninja +, pandoc +, pcre +, pcre2 +, pkg-config +, python3 +, reproc +, rtaudio +, rtmidi +, rubberband +, serd +, sord +, sratom +, texi2html +, wrapGAppsHook +, xdg-utils +, xxHash +, vamp-plugin-sdk +, zstd +}: + +stdenv.mkDerivation rec { + pname = "zrythm"; + version = "1.0.0-alpha.26.0.13"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dkXlkJ+qlfxV9Bv2UvZZa2iRVm8tgpK4JxkWL2Jeq48="; + }; + + nativeBuildInputs = [ + help2man + jq + libaudec + libxml2 + meson + ninja + pandoc + pkg-config + python3 + python3.pkgs.sphinx + texi2html + wrapGAppsHook + cmake + ]; + + buildInputs = [ + SDL2 + alsa-lib + bash-completion + carla + chromaprint + curl + dconf + libepoxy + ffmpeg + fftw + fftwFloat + flex + breeze-icons + glib + gtk3 + gtksourceview3 + graphviz + guile + json-glib + libbacktrace + libcyaml + libgtop + libjack2 + libpulseaudio + libsamplerate + libsndfile + libsoundio + libyaml + lilv + lv2 + pcre + pcre2 + reproc + rtaudio + rtmidi + rubberband + serd + sord + sratom + vamp-plugin-sdk + xdg-utils + xxHash + zstd + ]; + + mesonFlags = [ + "-Denable_ffmpeg=true" + "-Denable_rtmidi=true" + "-Denable_rtaudio=true" + "-Denable_sdl=true" + "-Dmanpage=true" + # "-Duser_manual=true" # needs sphinx-intl + "-Dlsp_dsp=disabled" + "-Db_lto=false" + ]; + + NIX_LDFLAGS = '' + -lfftw3_threads -lfftw3f_threads + ''; + + postPatch = '' + chmod +x scripts/meson-post-install.sh + patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \ + scripts/meson-post-install.sh tools/check_have_unlimited_memlock.sh + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + ) + ''; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "Highly automated and intuitive digital audio workstation"; + maintainers = with maintainers; [ tshaynik magnetophon ]; + platforms = platforms.linux; + license = licenses.agpl3Plus; + }; +} diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 4b3cbb171bd0e..e738a0fbcbe54 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -89,6 +89,19 @@ in stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cxxtest ]; + # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 + checkPhase = let + # Tests fail on aarch64 + disabledTests = lib.optionals stdenv.isAarch64 [ + "MessageTest" + "UnisonTest" + ]; + in '' + runHook preCheck + ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' + runHook postCheck + ''; + # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index d16fc0f85c55a..816646ab6f121 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: -stdenv.mkDerivation { - name = "areca-7.5"; +stdenv.mkDerivation rec { + pname = "areca"; + version = "7.5"; src = fetchurl { - url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + url = "mirror://sourceforge/project/areca/areca-stable/areca-${version}/areca-${version}-src.tar.gz"; sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; }; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 7a808d2c72e9a..ee64b7907aa02 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config -, withGui ? true, webkitgtk, Cocoa, WebKit +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, makeWrapper +, webkitgtk +, zenity +, Cocoa +, Security +, WebKit +, withGui ? true }: rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.5"; + version = "0.6.9"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "1g95yvkvlj78bqrk3p2xbhrmg1hrlgbyr1a4s7vg45y60zys2c2j"; + sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh"; }; - cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj"; - - cargoBuildFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; - - cargoTestFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; + cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045"; checkFlags = [ # these want internet access, disable them @@ -27,10 +31,21 @@ rustPlatform.buildRustPackage rec { "--skip=dns::client::tests::test_udp_client" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = lib.optional stdenv.isDarwin Security + ++ lib.optional (withGui && stdenv.isLinux) webkitgtk ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; + buildNoDefaultFeatures = true; + buildFeatures = [ + "doh" + ] ++ lib.optional withGui "webgui"; + + postInstall = lib.optionalString (withGui && stdenv.isLinux) '' + wrapProgram $out/bin/alfis \ + --prefix PATH : ${lib.makeBinPath [ zenity ]} + ''; + meta = with lib; { description = "Alternative Free Identity System"; homepage = "https://alfis.name"; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index eea836ac62d35..803e27969e7ae 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -1,41 +1,83 @@ -{ lib, stdenv -, fetchFromGitHub -, pkg-config +{ lib +, stdenv +, fetchurl , autoreconfHook -, db5 -, openssl +, pkg-config +, util-linux +, hexdump +, autoSignDarwinBinariesHook +, wrapQtAppsHook ? null , boost -, zlib -, miniupnpc , libevent -, protobuf -, util-linux +, miniupnpc +, zeromq +, zlib +, db48 +, sqlite +, qrencode +, qtbase ? null +, qttools ? null +, python3 +, nixosTests +, withGui +, withWallet ? true }: +with lib; stdenv.mkDerivation rec { - pname = "bitcoind-knots"; - version = "0.20.0"; - versionDate = "20200614"; - - src = fetchFromGitHub { - owner = "bitcoinknots"; - repo = "bitcoin"; - rev = "v${version}.knots${versionDate}"; - sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; + pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; + version = "22.0.knots20211108"; + + src = fetchurl { + url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz"; + sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i"; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl db5 openssl util-linux - protobuf boost zlib miniupnpc libevent ]; + nativeBuildInputs = + [ autoreconfHook pkg-config ] + ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ optionals withGui [ wrapQtAppsHook ]; + + buildInputs = [ boost libevent miniupnpc zeromq zlib ] + ++ optionals withWallet [ db48 sqlite ] + ++ optionals withGui [ qrencode qtbase qttools ]; + + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + ] ++ optionals (!doCheck) [ + "--disable-tests" + "--disable-gui-tests" + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + checkInputs = [ python3 ]; - configureFlags = [ "--with-incompatible-bdb" - "--with-boost-libdir=${boost.out}/lib" ]; + doCheck = true; + + checkFlags = + [ "LC_ALL=en_US.UTF-8" ] + # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. + # See also https://github.com/NixOS/nixpkgs/issues/24256 + ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + + enableParallelBuilding = true; + + passthru.tests = { + smoke-test = nixosTests.bitcoind-knots; + }; - meta = with lib; { - description = "An enhanced Bitcoin node software"; + meta = { + description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; + maintainers = with maintainers; [ prusnak mmahut ]; license = licenses.mit; - maintainers = [ maintainers.mmahut ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7a0237ed2b15a..e1a0dd207a0af 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -5,6 +5,7 @@ , pkg-config , util-linux , hexdump +, autoSignDarwinBinariesHook , wrapQtAppsHook ? null , boost , libevent @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { [ autoreconfHook pkg-config ] ++ optionals stdenv.isLinux [ util-linux ] ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -77,7 +79,7 @@ stdenv.mkDerivation rec { doCheck = true; checkFlags = - [ "LC_ALL=C.UTF-8" ] + [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 23a0e47916092..0d9da9b3cedc6 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.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-gJvUW/U+O83Q0VDo6a5VkWx2RuofMNs/mPn/hnM2XiE="; + sha256 = "sha256-IBdQlVZx7Bt4y7B7FvHJihHUWO15a89hs+SGwcobDqY="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 2cb07e9954fc7..c3406494aeb44 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.13"; - sha256 = "16nhahb6bnjwhw3wh044zfkqpb5k40kyhdazs2h6y4phjhm5hq2r"; + version = "1.2.14"; + sha256 = "0avb0jlisx1nv0ary2nc82aamn95qmrrqshwbk8szzjqgvxzv4k2"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; @@ -46,11 +46,6 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; - version = "1.2.6"; - sha256 = "09p2ks1qgy6jnpcfwgdnxvldyyadwnh3mwmq9z89vvzmmgs19xkk"; - }) - (fetchNuGet { - name = "BTCPayServer.Lightning.Common"; version = "1.2.7"; sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; }) @@ -61,8 +56,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.9"; - sha256 = "1zyr58kwdyb02dfgxza73fqvzcjlf59msllmf06anl9im4pqcjx6"; + version = "1.2.10"; + sha256 = "10m8kw7598l9ap6y17znvm43cz5ca6qxbrh105knyb6hfzpsyqwp"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 39f2e3cb0edc6..b576cd2373ceb 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 = "unstable-2021-07-12"; + version = "1.1.7"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "974d6e5f1440f68c48492122ca33828a98864dfc"; - sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja"; + rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; + sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 83d9cee9ec6c5..207b42e5584ee 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,21 +6,21 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE="; + sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; }; postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem + cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem ''; nativeBuildInputs = [ @@ -46,7 +46,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography - dnspython + dnspythonchia fasteners keyrings-cryptfile pyyaml diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 0cec96b7a6ee5..df7eace3284d8 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -16,15 +16,15 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.Mako p.mrkd ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "9271e9e89d60332b66afedbf8d6eab2a4a488782ab400ee1f60667d73c5a9a96"; + sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; }; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; @@ -39,11 +39,9 @@ stdenv.mkDerivation rec { devtools/sql-rewrite.py ''; - configurePhase = '' - ./configure --prefix=$out --disable-developer --disable-valgrind - ''; + configureFlags = [ "--disable-developer" "--disable-valgrind" ]; - makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + makeFlags = [ "VERSION=v${version}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 84b2a2f736a16..ace5ec94c639c 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -3,33 +3,33 @@ , rustPlatform , fetchFromGitHub , llvmPackages -, rocksdb +, rocksdb_6_23 , Security }: +let + rocksdb = rocksdb_6_23; +in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss="; + hash = "sha256-sTQ/dX1uXJkEmrNZ47qjBlrexO50y0NGNhw71rHc9bw="; }; - cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI=="; + cargoHash = "sha256-1ZQt8LaqgxNxFfgCVCK0GVwbcVfX3v9iz7tHvzgyI0g="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 - # # link rocksdb dynamically - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index a1ce67abf9ae1..eb44dc219b667 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.34.3"; + version = "2.35.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "07r7gfn44c4bdcq9rgs6v4frrl2g004lh9lcsrj6rbqy6949r9j2"; + hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/applications/blockchains/lightwalletd/default.nix index 0c95dde0f15b7..be66fee50e7d9 100644 --- a/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/pkgs/applications/blockchains/lightwalletd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lightwalletd"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; rev = "v${version}"; - sha256 = "0dwam3fhc4caga7kjg6cc06sz47g4ii7n3sa4j2ac4aiy21hsbjk"; + sha256 = "sha256-3cjXQXJqdmAMc+APybAKbpBhTy8Pk/QyBygSa8pGGAs="; }; vendorSha256 = null; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 62dcac327f781..f9cef2898bfcc 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,23 +1,23 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ] +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: buildGoModule rec { pname = "lnd"; - version = "0.13.3-beta"; + version = "0.14.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "05ai8nyrc8likq5n7i9klfi9550ki8sqklv8axjvi6ql8v9bzk61"; + sha256 = "0pf84l46cfhbmbzjdkpmqp494wqix8715zawm537mm94k3q25bis"; }; - vendorSha256 = "0xf8395g6hifbqwbgapllx38y0759xp374sja7j1wk8sdj5ngql5"; + vendorSha256 = "1481zscd9lrnzxsaxkpaaa8fjazmfynhim13f8lj2yd9d21j5d31"; - subPackages = ["cmd/lncli" "cmd/lnd"]; + subPackages = [ "cmd/lncli" "cmd/lnd" ]; preBuild = let buildVars = { diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 39f35f211f903..79ab37c7adb5d 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ systemd ] ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; - cargoBuildFlags = [ "--features final" ]; + buildFeatures = [ "final" ]; # Fix tests by preventing them from writing to /homeless-shelter. preCheck = '' diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index d5838a4f4f281..c9fb1a458692b 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , autoreconfHook , boost , db48 -, fetchurl +, fetchFromGitHub , libevent , miniupnpc , openssl @@ -19,9 +20,11 @@ stdenv.mkDerivation rec { pname = "particl-core"; version = "0.19.2.14"; - src = fetchurl { - url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "sha256-UMU3384r4RGVl0/7OPwdDva09vhQr+9Lqb1oD/PTva8="; + src = fetchFromGitHub { + owner = "particl"; + repo = "particl-core"; + rev = "v${version}"; + sha256 = "sha256-gJLEMfEvQ35xjKt8iN/FXi2T/GBMSS7eUqOC8XHKPBg="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -41,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Privacy-Focused Marketplace & Decentralized Application Platform"; - longDescription= '' + longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. RPC daemon and CLI client only. ''; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index a64ab5249a535..9b88861d0ea67 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.12"; + version = "0.9.12-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1d1ppj8djqm97k18cbdvbgv9a5vhvxdgjiqair0bmxc44hwapl65"; + sha256 = "sha256-+HATcxdIDQGDIQBF08yy/eKBcS10Hp7C0nZFVsYFNwQ="; }; - cargoSha256 = "09kcacz836sm1zsi08mmf4ca5vbqc0lwwaam9p4vi0v4kd45axx9"; + cargoSha256 = "sha256-1qg4ZnSORRVI7eCVMrR7lY3tzo7KJt+dC2RBXqbKrig="; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh index 79bc88ca8996e..764bf2106ef9d 100755 --- a/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt +#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixpkgs-fmt set -euo pipefail # Run this script to generate deps.nix @@ -95,4 +95,4 @@ echo $DEPS_FOOTER >&6 exec 6>&- -nixfmt "$deps_file" +nixpkgs-fmt "$deps_file" diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 47ee3f9bfe599..d558fa8715371 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,17 +1,14 @@ { fetchurl }: let nugetUrlBase = "https://www.nuget.org/api/v2/package"; - fetchNuGet = { name, version, sha256 }: - fetchurl { - inherit sha256; - url = "${nugetUrlBase}/${name}/${version}"; - }; -in [ + fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${name}/${version}"; }; +in +[ (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { name = "microsoft.aspnetcore.jsonpatch"; @@ -95,8 +92,8 @@ in [ }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { name = "microsoft.netcore.dotnetapphost"; diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 62c7c3b3da47b..d36715bd30661 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Desktop GUI for Whirlpool by Samourai-Wallet"; - homepage = https://www.samouraiwallet.com/whirlpool; + homepage = "https://www.samouraiwallet.com/whirlpool"; license = licenses.unlicense; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index f595e211dc2b1..ea7fc13757472 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter -, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs +, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { dbus gtk3 pcre - epoxy + libepoxy libgee libX11 lightdm diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 029501c7787a1..c75aba9d2615f 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -19,12 +19,19 @@ in mkDerivation { patches = [ ./sddm-ignore-config-mtime.patch + ./sddm-default-session.patch # Load `/etc/profile` for `environment.variables` with zsh default shell. # See: https://github.com/sddm/sddm/pull/1382 (fetchpatch { url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch"; sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58="; }) + # Fix build with Qt 5.15.3 + # See: https://github.com/sddm/sddm/pull/1325 + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch"; + sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4"; + }) ]; postPatch = diff --git a/pkgs/applications/display-managers/sddm/sddm-default-session.patch b/pkgs/applications/display-managers/sddm/sddm-default-session.patch new file mode 100644 index 0000000000000..455ebbd415770 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/sddm-default-session.patch @@ -0,0 +1,71 @@ +diff --git a/src/common/Configuration.h b/src/common/Configuration.h +index cf44a62..7bb9c03 100644 +--- a/src/common/Configuration.h ++++ b/src/common/Configuration.h +@@ -44,6 +44,7 @@ namespace SDDM { + "NOTE: Currently ignored if autologin is enabled.")); + Entry(InputMethod, QString, QStringLiteral("qtvirtualkeyboard"), _S("Input method module")); + Entry(Namespaces, QStringList, QStringList(), _S("Comma-separated list of Linux namespaces for user session to enter")); ++ Entry(DefaultSession, QString, QString(), _S("System-wide default session")); + // Name Entries (but it's a regular class again) + Section(Theme, + Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path")); +diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp +index 1953c76..54fe2f2 100644 +--- a/src/greeter/SessionModel.cpp ++++ b/src/greeter/SessionModel.cpp +@@ -43,6 +43,7 @@ namespace SDDM { + beginResetModel(); + populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); + populate(Session::X11Session, mainConfig.X11.SessionDir.get()); ++ selectDefaultSession(); + endResetModel(); + + // refresh everytime a file is changed, added or removed +@@ -52,6 +53,7 @@ namespace SDDM { + d->sessions.clear(); + populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); + populate(Session::X11Session, mainConfig.X11.SessionDir.get()); ++ selectDefaultSession(); + endResetModel(); + }); + watcher->addPath(mainConfig.Wayland.SessionDir.get()); +@@ -149,11 +151,25 @@ namespace SDDM { + else + delete si; + } ++ } ++ ++ void SessionModel::selectDefaultSession() { ++ d->lastIndex = 0; ++ + // find out index of the last session + for (int i = 0; i < d->sessions.size(); ++i) { + if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) { + d->lastIndex = i; +- break; ++ return; ++ } ++ } ++ ++ // Otherwise, fallback to system-wide default session. ++ auto defaultSession = mainConfig.DefaultSession.get(); ++ for (int i = 0; i < d->sessions.size(); ++i) { ++ if (QFileInfo(d->sessions.at(i)->fileName()).fileName() == defaultSession) { ++ d->lastIndex = i; ++ return; + } + } + } +diff --git a/src/greeter/SessionModel.h b/src/greeter/SessionModel.h +index 2e2efa9..a93315c 100644 +--- a/src/greeter/SessionModel.h ++++ b/src/greeter/SessionModel.h +@@ -58,6 +58,7 @@ namespace SDDM { + SessionModelPrivate *d { nullptr }; + + void populate(Session::Type type, const QString &path); ++ void selectDefaultSession(); + }; + } + diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index b9d350cbd438d..8472a91c596fe 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }: stdenv.mkDerivation rec { pname = "aewan"; @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817"; }; + patches = [ + # Pull patch pending upstream inclusion: + # https://sourceforge.net/p/aewan/bugs/13/ + (fetchpatch { + url = "https://sourceforge.net/p/aewan/bugs/13/attachment/aewan-cvs-ncurses-6.3.patch"; + sha256 = "0pgpk1l3d6d5y37lvvavipwnmv9gmpfdy21jkz6baxhlkgf43r4p"; + # patch is in CVS diff format, add 'a/' prefix + extraPrefix = ""; + }) + ]; + buildInputs = [ zlib ncurses ]; meta = { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 600902f75b107..5a94abf2f7dd2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,8 +13,8 @@ let sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg"; }; betaVersion = { - version = "2021.1.1.15"; # "Android Studio Bumblebee (2021.1.1) Beta 2" - sha256Hash = "sha256-J+Jw9F8pEE0SMWka//jADOiQ+GSOeRf5GBfp0RDtwqA="; + version = "2021.1.1.16"; # "Android Studio Bumblebee (2021.1.1) Beta 3" + sha256Hash = "pgmBWzq/5RHJTc41kzB43tbsjvrWx9BJ7UKsR8AO0V4="; }; latestVersion = { # canary & dev version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3" diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 3a5436d4f32df..1919e6b6947d5 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome +{ lib +, stdenv +, fetchurl +, intltool +, wrapGAppsHook +, pkg-config +, gtk +, libxml2 +, enchant +, gucharmap +, python3 +, gnome }: stdenv.mkDerivation rec { - name = "bluefish-2.2.12"; + pname = "bluefish"; + version = "2.2.12"; src = fetchurl { - url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; + url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 - enchant gucharmap python3 ]; + buildInputs = [ + gnome.adwaita-icon-theme + gtk + libxml2 + enchant + gucharmap + python3 + ]; meta = with lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = "http://bluefish.openoffice.nl/"; license = licenses.gpl3Plus; - maintainers = [maintainers.vbgl]; + maintainers = with maintainers; [ vbgl ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f3075d085c457..f840218d850c8 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -34,7 +34,7 @@ let inherit (spec) owner rev sha256; } ) - (builtins.fromJSON (builtins.readFile ./deps.json)); + (lib.importJSON ./deps.json); in stdenv.mkDerivation rec { pname = "cudatext"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 46a9b6c477aec..337479b16bc6c 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -639,4 +639,99 @@ rec { }; }; + ivyde = buildEclipsePlugin rec { + name = "ivyde-${version}"; + version = "2.2.0.final-201311091524-RELEASE"; + + srcFeature = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.feature_${version}.jar"; + sha1 = "c8fb6c4aab32db13db0bd81c1a148032667fff31"; + }; + + srcPlugin = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse_${version}.jar"; + sha1 = "0c80c2e228a07f18efab1c56ea026448eda70c06"; + }; + + meta = with lib; { + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; + description = "A plugin which integrates Apache Ivy's dependency management"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.r3dl3g ]; + }; + }; + + ivyderv = buildEclipsePlugin rec { + name = "ivyderv-${version}"; + version = "2.2.0.final-201311091524-RELEASE"; + + srcFeature = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_${version}.jar"; + sha1 = "fb1941eaa2c0de54259de01b0da6d5a6b4a2cab1"; + }; + + srcPlugin = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse.resolvevisualizer_${version}.jar"; + sha1 = "225e0c8ccb010d622c159560638578c2fc51a67e"; + }; + + meta = with lib; { + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; + description = "A graph viewer of the resolved dependencies."; + longDescription = '' + Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since + it requires additional plugins to be installed (Zest). + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.r3dl3g ]; + }; + }; + + ivy = buildEclipsePlugin rec { + name = "ivy-${version}"; + version = "2.5.0.final_20191020104435"; + + srcFeature = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar"; + sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133"; + }; + + srcPlugin = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar"; + sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5"; + }; + + meta = with lib; { + homepage = "https://ant.apache.org/ivy/index.html"; + description = "A popular dependency manager focusing on flexibility and simplicity"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.r3dl3g ]; + }; + }; + + ivyant = buildEclipsePlugin rec { + name = "ivyant-${version}"; + version = "2.5.0.final_20191020104435"; + + srcFeature = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar"; + sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133"; + }; + + srcPlugin = fetchurl { + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar"; + sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5"; + }; + + meta = with lib; { + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; + description = "Ant Tasks integrated into Eclipse's Ant runtime"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.r3dl3g ]; + }; + }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index f63598a7c5e24..eb288ff8b2a8d 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,19 +1,22 @@ { fetchurl, fetchpatch, lib, stdenv, ncurses }: -stdenv.mkDerivation { - name = "elvis-2.2_0"; +stdenv.mkDerivation rec { + pname = "elvis"; + version = "2.2_0"; src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz"; + url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; }; buildInputs = [ ncurses ]; - patches = [ (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; + }) + ]; postPatch = '' substituteInPlace configure \ diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix index 18dcef129cc21..31106654ae6c7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix @@ -1,10 +1,11 @@ { lib, fetchurl, stdenv, emacs, python }: stdenv.mkDerivation rec { - name = "cedet-1.1"; + pname = "cedet"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/cedet/${name}.tar.gz"; + url = "mirror://sourceforge/cedet/cedet-${version}.tar.gz"; sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 13e82ba3cf150..d2b870bb82d63 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -444,6 +444,21 @@ license = lib.licenses.free; }; }) {}; + capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "capf-autosuggest"; + ename = "capf-autosuggest"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/capf-autosuggest-0.2.tar"; + sha256 = "0a3bkf3c1gwv9m4rq9kvgw48y5av4arnymnm64yija55ygrnm88b"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html"; + license = lib.licenses.free; + }; + }) {}; caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "caps-lock"; @@ -1101,10 +1116,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.6"; + version = "0.8.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; - sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar"; + sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn"; }; packageRequires = [ emacs seq ]; meta = { @@ -1161,10 +1176,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211024"; + version = "20211101"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211024.tar"; - sha256 = "165mscb1kpgd3db92vklglnaph60rvrr8wm3hpkhrbyac100ryji"; + url = "https://elpa.gnu.org/packages/eev-20211101.tar"; + sha256 = "0sxbf116msfv6ly1dqga2sz2zpqr78nzp3v44qy7rps2887incmr"; }; packageRequires = [ emacs ]; meta = { @@ -1275,6 +1290,41 @@ license = lib.licenses.free; }; }) {}; + embark = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "embark"; + ename = "embark"; + version = "0.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-0.13.tar"; + sha256 = "04x3cfikfvzr2xl1zh6kj0q31160kmh1vrzyrla3n6f8z5qch63x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark.html"; + license = lib.licenses.free; + }; + }) {}; + embark-consult = callPackage ({ consult + , elpaBuild + , emacs + , embark + , fetchurl + , lib }: + elpaBuild { + pname = "embark-consult"; + ename = "embark-consult"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-consult-0.2.tar"; + sha256 = "0f1022yk6d88glrrawa8cl6yd5n44p8wnbfwn0f8z6j1n8wxq37z"; + }; + packageRequires = [ consult emacs embark ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark-consult.html"; + license = lib.licenses.free; + }; + }) {}; emms = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -1284,10 +1334,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.7"; + version = "7.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.7.tar"; - sha256 = "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h"; + url = "https://elpa.gnu.org/packages/emms-7.8.tar"; + sha256 = "1nlb9rrdlbcqghph30r9i9m1brbdha818czbms0zhzdisxb0smi0"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1424,10 +1474,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.24.tar"; - sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s"; + url = "https://elpa.gnu.org/packages/exwm-0.25.tar"; + sha256 = "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"; }; packageRequires = [ xelb ]; meta = { @@ -1499,10 +1549,10 @@ elpaBuild { pname = "flymake-proselint"; ename = "flymake-proselint"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.2.tar"; - sha256 = "0v43d2cszrq8lzshm17x6aiqbkzwz5kj8x5sznc3nip9gaqsrfv1"; + url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.3.tar"; + sha256 = "1384m52zkrlkkkyxg1zimp7dwrxhx8wbvw5ga5vg78yl6cqx9kbc"; }; packageRequires = [ emacs ]; meta = { @@ -2013,10 +2063,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.2.tar"; - sha256 = "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar"; + sha256 = "0b498qzaydjrhplx4d7zcrs883dlrhfiz812sv4m3pmhfwifcchh"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -3005,10 +3055,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.7"; + version = "0.4.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.7.tar"; - sha256 = "0y5milfjf45bi7gj7brl2lhyla8nsj3dc1a4nfq1wx3zw8arlc50"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.12.tar"; + sha256 = "0xkzx5narbry0kbamzxv1hjgsal98cj9rp3ck25xg2ywb6nspwcw"; }; packageRequires = [ emacs ]; meta = { @@ -3050,10 +3100,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.4.tar"; - sha256 = "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"; + url = "https://elpa.gnu.org/packages/posframe-1.1.0.tar"; + sha256 = "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg"; }; packageRequires = [ emacs ]; meta = { @@ -3651,10 +3701,10 @@ elpaBuild { pname = "sketch-mode"; ename = "sketch-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sketch-mode-1.0.3.tar"; - sha256 = "17xa8754zp07izgd3b9hywlwd1jrbzyc5y1rrhin7w6r0pyvqs51"; + url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar"; + sha256 = "1gv03ykr40laf52hm8p0glfsy895jghkp5a8q599zwg5wpz3zdc9"; }; packageRequires = []; meta = { @@ -4045,10 +4095,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.1.3"; + version = "2.5.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.1.3.tar"; - sha256 = "1qcwdavfrbw8yyfy5rbzbcfyqavqbz13jncahkqlgwbkqvmgh7y5"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.4.tar"; + sha256 = "0mk9r9hj43klah7mwldg4bw7fxcqvrbwv1gj6g90zdfsflqy7nh9"; }; packageRequires = [ emacs ]; meta = { @@ -4090,10 +4140,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.6.tar"; - sha256 = "11n2551kvfjrqyk0x78bz6pirnfs126cbchiv1pchqwyk8z8c9ks"; + url = "https://elpa.gnu.org/packages/transient-0.3.7.tar"; + sha256 = "0x4xjbaw98dma7232bzw53rbq9q70vms6lvvramng7vfaz0mcy2a"; }; packageRequires = [ emacs ]; meta = { @@ -4219,10 +4269,10 @@ elpaBuild { pname = "vc-backup"; ename = "vc-backup"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-backup-1.0.0.tar"; - sha256 = "0vcrbb4s1rzar9q882kfcslycxvycp61923sg82i29b7yd0yrgdr"; + url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar"; + sha256 = "1ipkymndxymbayrgr3jz27p64bkjf1nq9h4w3afpzkpqzw237ak5"; }; packageRequires = []; meta = { @@ -4337,6 +4387,26 @@ license = lib.licenses.free; }; }) {}; + vertico-posframe = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , posframe + , vertico }: + elpaBuild { + pname = "vertico-posframe"; + ename = "vertico-posframe"; + version = "0.3.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vertico-posframe-0.3.10.tar"; + sha256 = "1bksipfi92adlmnk2rdw33c2g6qhw8hplcg67xhc299svqlkd0j2"; + }; + packageRequires = [ emacs posframe vertico ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vertico-posframe.html"; + license = lib.licenses.free; + }; + }) {}; vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vigenere"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index b7f861a4cd7aa..60fac91839a1e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -36,14 +36,16 @@ self: let inherit (self) emacs; }; + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + generateElpa = lib.makeOverridable ({ generated ? ./elpa-generated.nix }: let imported = import generated { callPackage = pkgs: args: self.callPackage pkgs (args // { - # Use custom elpa url fetcher with fallback/uncompress - fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + inherit fetchurl; }); }; @@ -69,12 +71,7 @@ self: let dontUnpack = false; srcs = [ super.ada-mode.src - # ada-mode needs a specific version of wisi, check NEWS or ada-mode's - # package-requires to find the version to use. - (pkgs.fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz"; - sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as"; - }) + self.wisi.src ]; sourceRoot = "ada-mode-${self.ada-mode.version}"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 0cf2eae0d6546..90f13e870c735 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -282,10 +282,10 @@ elpaBuild { pname = "flymake-kondor"; ename = "flymake-kondor"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.2.tar"; - sha256 = "17mmn9mj4zl5f7byairkgxz6s2mrq73q3219s73c0b2g0g846krn"; + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar"; + sha256 = "07k8b3wayp1h4hir98zs5srjjsnh6w0h9pzn4vnq9s2jr355509n"; }; packageRequires = [ emacs ]; meta = { @@ -387,10 +387,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.17.tar"; - sha256 = "0g4982rfxjp08qi6nxz73lsbdwf388fx511394yw4s7ml6v1m4kd"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.18.tar"; + sha256 = "1jnqra7gysscn0gb1ap56rbjlrnhsmma7q4yfiy3zxsz8m69xhqf"; }; packageRequires = [ emacs geiser ]; meta = { @@ -975,10 +975,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.0.tar"; - sha256 = "0ch3hf954iy5hh5zyjjg68szdk5icppmi8nbap27wfwgvhvyfa67"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.1.tar"; + sha256 = "1rybjnaycvjgqp8g8lkjzgvnwd4565cbx88qlnxfrlqd5161r1k3"; }; packageRequires = [ emacs ]; meta = { @@ -1099,10 +1099,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; - sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.2.tar"; + sha256 = "0rkri1414f2w2bw76dwnmylcdca6x9bkdvlq1aznz76ac259klji"; }; packageRequires = [ emacs seq ]; meta = { 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 5b0ef0fa8e48d..9467f6c7aba78 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -213,11 +213,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20211002, - 1952 + 20211103, + 1551 ], - "commit": "ea9d91be117056f1e49479c94d034e8c6f8df5a0", - "sha256": "0z0ilyq0h1ic62gk3gwfiagp8hv4vl2z663fhxwl9g5r94rc3pxi" + "commit": "b868ef7065039899628a2846dd1274233e07a310", + "sha256": "1a8rr7ni9x4n21lysfhczf0j0nqi9xd17s39lfpxmpp10s36mrxf" }, "stable": { "version": [ @@ -1148,8 +1148,8 @@ "auto-complete", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -1948,35 +1948,23 @@ } }, { - "ename": "agda2-mode", - "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c", - "sha256": "0vbi64fri02ziy68dvpq1y946w4n4mla8gh1cmldqq8x24l8ssdg", + "ename": "agda-editor-tactics", + "commit": "1806c594f0ae0d7eb8be7e4baf4bf66af32c3d46", + "sha256": "11lfpa1hdbrnbrrhpqmi3lzx28wbfnw4j29rywwcjlcb6a0ax50v", "fetcher": "github", - "repo": "agda/agda", + "repo": "alhassy/next-700-module-systems", "unstable": { "version": [ - 20210903, - 1114 - ], - "deps": [ - "annotation", - "eri" - ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" - }, - "stable": { - "version": [ - 2, - 6, - 2 + 20211024, + 2357 ], "deps": [ - "annotation", - "eri" + "dash", + "org", + "s" ], - "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", - "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" + "commit": "c401c0c1ec0ad38bb5ee1636504e0e531b9e34b9", + "sha256": "0y5dp3i97w96dy5p5yk4gxs4db9n260sn1q2vp1j6afi30mn2mb9" } }, { @@ -2344,8 +2332,8 @@ "deps": [ "flycheck" ], - "commit": "135be1a851a1110dffe8bb349183b73a49a1f090", - "sha256": "09j59s5agyvngk5z75dl129gdzlq2kn11qlgc9798fy1gx11cahw" + "commit": "1bcc7c68abcd6471604c9b7fe7f85b0878bbd435", + "sha256": "10kpdra8m015xsh7w25v18zd62csayji0p5jqgif20bw6g8g20a7" }, "stable": { "version": [ @@ -2452,11 +2440,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20211021, - 1244 + 20211108, + 7 ], - "commit": "b7002b5aa152b56a2a852c3aae2f2e1a0e963277", - "sha256": "0srh30xciwb6dsw5rixz5ikc1z7jx3987zd4gnc1b7aj01826n8k" + "commit": "483dba65e897071c156cefec937edcf51aa333db", + "sha256": "01v0pyfz49a74d7vqg8nhq9jpbyqbywcpk3ajc59d9fwg7wmzjvq" }, "stable": { "version": [ @@ -2969,6 +2957,21 @@ } }, { + "ename": "ancient-one-dark-theme", + "commit": "df6184184228dfdb0b0e4a770c30c67d05a9bf94", + "sha256": "064yiab7ll7nwls7p8cyh8glmzr4msmdhl4vvvy45ll5diyfbkfa", + "fetcher": "github", + "repo": "holodata/ancient-one-dark-emacs", + "unstable": { + "version": [ + 20211030, + 1358 + ], + "commit": "9f814c5e8bcabb5f65563b057ae9ad8458b90408", + "sha256": "0jy2pxcsj06klrc02q9nsm626nj229zg5y9gn7xyixszjjbvmlyj" + } + }, + { "ename": "android-env", "commit": "570ad0e94736d9fd16f3909bcfa928a9153ea703", "sha256": "1gfxrfg42rn2rzh5fr4w6h8ngczhl56jghfgrffz9x8wcxxmqgpr", @@ -3246,8 +3249,8 @@ 20200914, 644 ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" + "commit": "6cb77e1a216098d6a4e273f6750dbf4445953272", + "sha256": "1rj04f9q7fn88ifznqqi3p7anv0m827mz2w2bwb4s09kdn03nf6p" }, "stable": { "version": [ @@ -3294,14 +3297,14 @@ "repo": "rejeep/ansi.el", "unstable": { "version": [ - 20211023, - 529 + 20211104, + 1420 ], "deps": [ "cl-lib" ], - "commit": "6e5455af7fa5d7b21bdb383e36190cb9d996ec35", - "sha256": "026bbdqnwcivgkhff6wp71vwi0wk2kn85idad7jmdsabdgzl9hmr" + "commit": "2367fba7b3b2340364a30cd6de7f3eb6bb9898a3", + "sha256": "1n7h6l4icm6lks3zpvd83j1fzrnspw19rmz7c96vy7pdh1y4v3p3" }, "stable": { "version": [ @@ -3380,26 +3383,20 @@ "repo": "zellio/ansible-vault-mode", "unstable": { "version": [ - 20211016, - 2350 - ], - "deps": [ - "seq" + 20211027, + 1528 ], - "commit": "71c783384de8f2db05453db0dd3ff0cd256d6ea9", - "sha256": "0f3k1lzf0cw19vrs85dsl0zw2m7zjd7p7hgxajl8y4n2438ksnvr" + "commit": "5deca2fdb640fa70e614e66ee37e1d6739d39ba4", + "sha256": "169vfz5xz58f9avb74vzpdk1k0wj4ylc26c15ggl0y19acqx4hdw" }, "stable": { "version": [ 0, - 4, - 2 - ], - "deps": [ - "seq" + 5, + 1 ], - "commit": "6bfc1fb7caa10c613561142b748482befde48900", - "sha256": "0f3k1lzf0cw19vrs85dsl0zw2m7zjd7p7hgxajl8y4n2438ksnvr" + "commit": "4fc188a9817cb4c7e0f19b6f1ae720c902f7ebe9", + "sha256": "169vfz5xz58f9avb74vzpdk1k0wj4ylc26c15ggl0y19acqx4hdw" } }, { @@ -3568,8 +3565,8 @@ 20211023, 1831 ], - "commit": "8b326a38fa1bf3b9675b251c78eb9456245aeef9", - "sha256": "07qcvn607x3mmrp8mc3wkxczj1mkhd0lb8674qx84j0yl7idv1dm" + "commit": "c55c6468526100ba0da00bff05cfb17cdf8839cf", + "sha256": "1wmq1fwzfj10c445gyh7silrzi3d911fc8knc967g7hspw4kna3w" }, "stable": { "version": [ @@ -3604,11 +3601,11 @@ "repo": "raxod502/apheleia", "unstable": { "version": [ - 20211025, - 128 + 20211116, + 132 ], - "commit": "1bf7db7477db4ca93740a5ebc5ad3c0dc3777273", - "sha256": "1nc0w5l53kq4z6qy6qwzkwp8cb8n0328i9jakdzhpg2lllmapz66" + "commit": "8e0605cc29732ec889b7318dd57921bf3f5ba06c", + "sha256": "1ffhnpz2zv4s4wl4a31c9xz9srx6h50q0ya7lacmj15vw9ffwd4z" }, "stable": { "version": [ @@ -3765,11 +3762,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210809, - 1934 + 20211113, + 1913 ], - "commit": "e84255cf485004b6b2cb37ce9e0be62fd6512f8b", - "sha256": "06rcf08f8qm068ck2mxqbg03vkr0hf5nnsbzpwmn7i6qqw23x6jd" + "commit": "b934a5a17cac02137c1bfe81935638ab85dbaec9", + "sha256": "1wbvxvv7fydv9p148xxyivsvjh000z4ndfwfpbir4hv0l83xghrw" }, "stable": { "version": [ @@ -3911,14 +3908,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20210907, - 1455 + 20211112, + 1223 ], "deps": [ "spinner" ], - "commit": "6d2d1122924370ffa17ce337e3b02ecab79d861b", - "sha256": "039h4hkl7n9ypdwi8zqs10fcbvwh5c2qmlz86x66xlp0wamg827r" + "commit": "3bc47bd7f75a7ccae409236dab43208ce8d41d51", + "sha256": "1jsifn9gfpb2rwhz9fr6r4qsmyydfd6rmz87iy7884nrnxkmdsci" } }, { @@ -5017,29 +5014,29 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20210210, - 1744 + 20211101, + 1155 ], - "commit": "62c936d502f35d168b9e59a66c994d74a62ad2cf", - "sha256": "07ilprnidpg8wn28h8ra9ml6pxaixg734ybya0gj1ac6sc3ky52s" + "commit": "2a19931b275dc3c70c4bb16a3c60046800ba631a", + "sha256": "00f0n6pz0qi2fandcgj8skgj169bwxrda62vkrf0frwpavwpmkml" } }, { "ename": "auto-highlight-symbol", - "commit": "96293eb591e5f436efe8e9dc131d29ede292d2c3", - "sha256": "0n8acv58jkbqj00pi7d4g3nryvgvy52z0xg874jfh73d2f17dcdl", + "commit": "be4b46eddfa1dd39381913d1d56e9ba1d1a1f9ad", + "sha256": "1bkf4n0vg2ramz8n6qr44swdyp93d14qvm1gidpmgpaffdxsf8rl", "fetcher": "github", - "repo": "jcs-elpa/auto-highlight-symbol", + "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20211006, - 603 + 20211116, + 1242 ], "deps": [ "ht" ], - "commit": "1a54a61fda6206c5e0fa843d16635133241292ba", - "sha256": "0b90i17rvdszdbmm4snzx6z5xgj705ahy0b0brfqs0b9m9s1iy13" + "commit": "0a16afcb10d8b3cf0e21002a6dff74f3b417c7c5", + "sha256": "13z0p702qxnz2xfrdw3himzgkwl3sqhcskqw8awmz67fqglw71zf" }, "stable": { "version": [ @@ -5061,11 +5058,11 @@ "repo": "mattfidler/auto-indent-mode.el", "unstable": { "version": [ - 20191112, - 1418 + 20211029, + 11 ], - "commit": "ebb1ee5ca24f3040c34b9455502a0e94f19903d0", - "sha256": "19p73jws7iddgs14cnfz9lb5ggyicqk08pasf66fkcvyhzydnwkm" + "commit": "664006b67329a8e27330541547f8c2187dab947c", + "sha256": "07nf07xzc30jnyr9s8vp561vgq64610gdhlwzkbanvnkmj20v9li" }, "stable": { "version": [ @@ -5122,14 +5119,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20211025, - 1352 + 20211108, + 2025 ], "deps": [ "dash" ], - "commit": "610576ed3adb6e732bc9288d1f9ec18e2ddef345", - "sha256": "0rgdrdsffr4d6lqpxfq8j8r35q1z38ba1985nnnci13lf53ibnvj" + "commit": "ad95435fefe2bb501d1d787b08272f9c1b7df488", + "sha256": "00456kxd1zb5lcwkm211mhdgkl0b01pp4fbkl1ryvdnhddn83ipv" }, "stable": { "version": [ @@ -5601,8 +5598,8 @@ "avy", "embark" ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -5812,11 +5809,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20210714, - 1912 + 20211116, + 2200 ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -6381,11 +6378,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20211006, - 855 + 20211031, + 1941 ], - "commit": "41745212f75b4deafb27fc790df1a74ae344df84", - "sha256": "12h7sndahwpyqc1sr2dgf3wz5g6hizb908iw3rfyhxjgss2yai3b" + "commit": "cdb2643dba39fe2bd64ba3b190b94d1ef1d83b18", + "sha256": "0ln06dprnivx9zxm6n23ppyx7x4kbn0f85pxwvkq32aq7wnqz82m" } }, { @@ -6813,11 +6810,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20210713, - 1426 + 20211108, + 2015 ], - "commit": "7f328a886ba4dd01993d269eee01c8ee3d0ddf52", - "sha256": "1xfap2db1ncfdnv8d3vdn8gxgkzamz8vz9jsyn0jiminhy0hb2na" + "commit": "3148a17b5920bba8ec4f81b717b99acde5fd5b74", + "sha256": "097xgcmp6a22hqyyfxqyxiq8p4kwq0gql4gcbmjhm9dd8qpf3s8b" } }, { @@ -7068,36 +7065,6 @@ } }, { - "ename": "bibtex-actions", - "commit": "a6050cc5f04343c5a0e3992d223eca3b50acec7c", - "sha256": "1yfrs54gb38877322rmg6p7lqy91km33vil867qgbyj016ss4x7s", - "fetcher": "github", - "repo": "bdarcus/bibtex-actions", - "unstable": { - "version": [ - 20211025, - 1224 - ], - "deps": [ - "bibtex-completion", - "parsebib" - ], - "commit": "c170aa4381b093892efe14ffc8da6d726d305088", - "sha256": "1qn6h5qfia6wxzy7qnrcxxadjp4wsvbnlmca0sv6f2sxxbphf835" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "bibtex-completion" - ], - "commit": "c18b1ad05168597a3cbaee67775d15d2ebb737f4", - "sha256": "0x45wq2nw753dz6694li3f0zmjm0rljmrr5rvj2qrhgqldlwn6zn" - } - }, - { "ename": "bibtex-completion", "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f", @@ -7316,14 +7283,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20210131, - 1227 + 20211030, + 511 ], "deps": [ "seq" ], - "commit": "52f1c11b01a5f7e7a470a73dec4c3335dea4124b", - "sha256": "00kjjr28bvimbdhg016n0g6ws1lix87c1bic1xb3nk0bvnbkpwfp" + "commit": "8cefdf0959f0da33250044cf4890b69cfdcf0c5b", + "sha256": "0q4cz07s8qzkvnym7ab2l111dk88nfigpf0r3x0jcxx2qivs52s4" }, "stable": { "version": [ @@ -7543,6 +7510,36 @@ } }, { + "ename": "blamer", + "commit": "412fea9e0564929310918096bae95636ba885a7c", + "sha256": "1p7g9c0621nsj2vn6janywghhllv5j8i4lpqv06vxmqy6pydl0xw", + "fetcher": "github", + "repo": "Artawower/blamer.el", + "unstable": { + "version": [ + 20211114, + 2013 + ], + "deps": [ + "a" + ], + "commit": "8855eeb6ef6aa323361498714d06365e0db83488", + "sha256": "04wy05pa9xzvrk33xnfvfk8hy127q7nlgn9kbcd4mm7ql4ywf8gp" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "deps": [ + "a" + ], + "commit": "8855eeb6ef6aa323361498714d06365e0db83488", + "sha256": "04wy05pa9xzvrk33xnfvfk8hy127q7nlgn9kbcd4mm7ql4ywf8gp" + } + }, + { "ename": "blgrep", "commit": "e78ed9dc4a7ff57524e79213973157ab364ae14d", "sha256": "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm", @@ -8025,15 +8022,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20211001, - 2148 + 20211111, + 2352 ], "deps": [ "epkg", "magit" ], - "commit": "069859e8857d70ca0cc755466ffdd35c18780607", - "sha256": "0ca5gmj437zxmzcvxfnbwpsdxblss9fv3689v9q6dqpy0p9vz0wq" + "commit": "2ffcfd4481710e5b6d45a07a99da2561fe1c9d3e", + "sha256": "1nfrvln6s09krabzgsw1hqxs5rp95137dcaqk0pfj9y320awa1gb" }, "stable": { "version": [ @@ -8250,8 +8247,8 @@ 20200321, 2126 ], - "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965", - "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr" + "commit": "71c555c2e254629c365e6fc44c2fc4d5b6d0ae8b", + "sha256": "03f0ipzmmpv64kk9dim8nihai3mz2ys7v2qvhywpd3a52nnmlqv4" }, "stable": { "version": [ @@ -8374,11 +8371,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211018, - 2212 + 20211112, + 1713 ], - "commit": "5ec10f0614978c376df95ed9da05f2227cd7cd62", - "sha256": "1gz69g9kz90yriwlyarfd632k19q65sb0r4as25ykq8m67cr5cm9" + "commit": "f9bba56199e861bc405703286ac3378bda496898", + "sha256": "12j7ad1fs93a9d5s9ki99321lbky1kpsz0b84xj0yld08zvhwixb" } }, { @@ -8640,8 +8637,8 @@ "ht", "s" ], - "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", - "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" + "commit": "a2bc0252eae7a787219627512d5d54984b97e1a2", + "sha256": "0scqddzijg02dggyj7v59f30irp9hw68sc075wa0i039f4ab8kh4" }, "stable": { "version": [ @@ -9820,8 +9817,8 @@ 20210707, 2310 ], - "commit": "a47240bf428b1de2e16eba28cb1eb355f1e00a80", - "sha256": "1mz6jf8l8i6m7my0kxpfmsna0wzh5brwiwslb4rbmbp8q1lisbk0" + "commit": "5ecc98425417732e7124460c7d938c0994958c1f", + "sha256": "10g0jap8rq0bbxqq61vvn2zklmhz94d883mr18gq1f926l3ni9z2" }, "stable": { "version": [ @@ -9980,8 +9977,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20211001, - 1042 + 20211103, + 1654 ], "deps": [ "ansi", @@ -9992,8 +9989,8 @@ "s", "shut-up" ], - "commit": "fe66b65944be8e03359ffe6f06618ecab8232f6b", - "sha256": "0mw6adyvjf4x5d83iy1gf5v36nr4dm09806ybgfkfvivsd348k97" + "commit": "467979414c85bb2ce83f5c6ab9f95721164e9efa", + "sha256": "0jccv6aprs4fq2m7b2hdxp0dgkjkwjfmlh5ywbl5pacms3c3l82l" }, "stable": { "version": [ @@ -10190,16 +10187,16 @@ 20210501, 820 ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { "ename": "ccls", - "commit": "be27a4022d58860917a659fce2b7d7791fbea4e2", - "sha256": "0kiv0n6pdpa75wjcimpwccwbjbhga4gjnphjrkpj4qz5qv42rbnm", + "commit": "5bd4c12f9c8ea96e29d684c4121ea4e10ba5e775", + "sha256": "1h0l6y4iky4ry36mfw6k8fddn0nyibcnhh6hhprjn7zmhyd32f5l", "fetcher": "github", - "repo": "MaskRay/emacs-ccls", + "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ 20200820, @@ -10239,8 +10236,8 @@ 20200904, 1431 ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { @@ -10509,8 +10506,8 @@ 20171115, 2108 ], - "commit": "da01eaa8153cd9b5a3da151f23a30c351e9cf7b9", - "sha256": "09nkkx9xc2ygn6s8lsa46d2cmh32wybf1b8y62nxc62m4scyz05n" + "commit": "be17316bf94dcfd0e725383041f5f059d85d8846", + "sha256": "0jf9ss3nj1v5qn02g9vhcsxp4rdrhx9s5ajd9md641av9p8c6rkm" }, "stable": { "version": [ @@ -11300,8 +11297,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211021, - 545 + 20211108, + 621 ], "deps": [ "clojure-mode", @@ -11312,8 +11309,8 @@ "sesman", "spinner" ], - "commit": "6a17686799b7ef97bc15fa041016421e5c875bfb", - "sha256": "1ifq42bdikz9p8038yyrm9k07bg6h7ddsiw8zlrsawbk5vc3xy72" + "commit": "a30d2e5ee2052dbc06e24c2494747ebd60f0cd03", + "sha256": "1dsx3f752hkj18b2bwyjnl37xfb4cqhh8mxl5gjp5dc9nk6i2ccv" }, "stable": { "version": [ @@ -11575,6 +11572,38 @@ } }, { + "ename": "citar", + "commit": "b2aa35ca3930920d61e50dd75394f70ccd1c737b", + "sha256": "0x66iwimvrihyxs5h816f2k2f2wgdn1kmiahvh5nfff6kx1xdplj", + "fetcher": "github", + "repo": "bdarcus/citar", + "unstable": { + "version": [ + 20211117, + 312 + ], + "deps": [ + "org", + "parsebib", + "s" + ], + "commit": "26c83fb42e0daece49cc98bebca0e81ea7c0232b", + "sha256": "0ch6wja4s6mdcfhxkdjfx82k519wq41v4rirsggczpkrzx7j5ql3" + }, + "stable": { + "version": [ + 0, + 8 + ], + "deps": [ + "bibtex-completion", + "parsebib" + ], + "commit": "2dcf0c450a80609294edcb89d55f352e763d0570", + "sha256": "1jrfcfr976c9nb2vpfrh6yhck5gm34wcjzbk0m6gq2xg3qfv2g6p" + } + }, + { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", "sha256": "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq", @@ -11582,8 +11611,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211014, - 1115 + 20211111, + 1008 ], "deps": [ "dash", @@ -11594,8 +11623,8 @@ "s", "string-inflection" ], - "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", - "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" + "commit": "2857f9bb819d0d0a6e6ed91cc38b165e506bfc2e", + "sha256": "11qm0mg0spwmqrl8d4pwjp0byn5b2askjcbs1yl1rpmlki97hb6m" }, "stable": { "version": [ @@ -12014,8 +12043,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20211025, - 1151 + 20211117, + 1008 ], "deps": [ "cider", @@ -12028,14 +12057,14 @@ "seq", "yasnippet" ], - "commit": "4b7312be8e8e629f9de6e64b0fb809e78a39f832", - "sha256": "1jxch7apckzajpnpfk5k79pmyxw0drj87s0f18ajmd4syimnaxra" + "commit": "af1bde5cb0ca5679927f70eb21e7a95a33791e51", + "sha256": "1a962xav2pzbdx2zfaf53hqj8a5nz1im1773b7b1d9s7vp4lc991" }, "stable": { "version": [ 3, - 0, - 0 + 2, + 2 ], "deps": [ "cider", @@ -12048,8 +12077,8 @@ "seq", "yasnippet" ], - "commit": "b1503962c90f1c88a4f32b8d32cf87c48437c158", - "sha256": "0i759k6qm752lmdsxrgp0bh3akl01as8k8q6x1a7cpdh6yddwajs" + "commit": "e0d83c845014a24c2604a08f9c9931c63ea809c4", + "sha256": "1iyivn7x5bcnp4g7k0k2b0jdcph84pbldlk83qqfzix6h4sp1k1f" } }, { @@ -12276,11 +12305,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210821, - 2010 + 20211114, + 757 ], - "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", - "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" + "commit": "08986ac32972830bb191496ea680fba1d6cd5fe2", + "sha256": "1y6zr7ijpyl1kf15108b5mkicf76ha2v8wq8lsk02xglgmjb7f5l" }, "stable": { "version": [ @@ -12300,14 +12329,14 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210322, - 704 + 20211110, + 1015 ], "deps": [ "clojure-mode" ], - "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", - "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" + "commit": "08986ac32972830bb191496ea680fba1d6cd5fe2", + "sha256": "1y6zr7ijpyl1kf15108b5mkicf76ha2v8wq8lsk02xglgmjb7f5l" }, "stable": { "version": [ @@ -12609,8 +12638,8 @@ 20210104, 1831 ], - "commit": "0ce50dd78f68b697e1ab29d52d733b87c5bfb67d", - "sha256": "0rifl9lqnkylcv2nqf6qwahicyv34wss9fqmw3xlgkkghk56c5w0" + "commit": "d2e10c4d8dd7dc32ae775a6382c5277308639271", + "sha256": "1jcw34vbfhs6mv4a9sl9gnqyf3g4fsnrcpdzkyx872c6awdg36dl" }, "stable": { "version": [ @@ -12618,10 +12647,10 @@ 22, 0, -1, - 1 + 3 ], - "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", - "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" + "commit": "fed67fa40d7b6e34ee7c8565694bd54af61aed73", + "sha256": "0ddnqjbkmj40119w071vhchprcljdm1k9n3aps5vsa6srdpxa0dh" } }, { @@ -12689,11 +12718,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20200824, - 240 + 20211112, + 808 ], - "commit": "b967605d571d827c1cb041c174fb363985758729", - "sha256": "1h4c6czj7zr1p8b0233rxmczkaf7hh72869lijsvkvx9xmq9pk8w" + "commit": "4dad44ed3619c40ba406bcf45d37fdec3ce0db8e", + "sha256": "037k5d4ikb3bqa1gqipzkx92ml8fajgalz0r375y7hlvasr2zvzx" }, "stable": { "version": [ @@ -13290,11 +13319,11 @@ "repo": "matthewbauer/comint-hyperlink", "unstable": { "version": [ - 20191104, - 2224 + 20211026, + 100 ], - "commit": "a7878825788ff6b9d6b8a5adf0214a028bad895e", - "sha256": "19fww5aciqx4h67hpmzf564n0ygzg69v1sk1qjyhbs27pq5zrjmq" + "commit": "905f2db1f95950899301b9f71faed9e9362cf5dc", + "sha256": "1d5a0c33zdziz1yw2nv65qyi122zz7b5y9vgsx6kfz7xj32sc8s5" }, "stable": { "version": [ @@ -13562,11 +13591,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20211024, - 2305 + 20211112, + 2354 ], - "commit": "811beeade86669e20da35efed5b00de6a5e305ab", - "sha256": "0v5y92c328x3fn2z4hxiwv0qgjp85r4g28wp6b5cph8azfvzgnk9" + "commit": "eb9be0bff7c323c720198dcd539ee05fa2485cd3", + "sha256": "09xzxyk81rwpgc05g8w0nl36lax6x6z94hrnjivn72c7zdwq58i2" }, "stable": { "version": [ @@ -13704,8 +13733,8 @@ "axiom-environment", "company" ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -14116,30 +14145,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20211017, - 1548 + 20211104, + 1200 ], "deps": [ "company", "ht", "s" ], - "commit": "80c84e3071e1aca9c058c4b5061b72fb9536a697", - "sha256": "0bgaikvn0z1j2xh4g3q7rh655kjgfwnbv5v2kmk38kvwn4mgahz7" + "commit": "44ef04f5f21285d68bd419f4f153e192777d9991", + "sha256": "1gca3i7ylk28wx7wa722ismy6irya96k8qf1zjh851sn2m7bkfin" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], "deps": [ "company", "ht", "s" ], - "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", - "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" + "commit": "7067175ebf56c5110edf1475b03e2e242a00e66b", + "sha256": "1sfzj5qbpc1j1blg6rq5lmimgy1yfwyg7ixgp7psf53nq0cbq9jd" } }, { @@ -14798,15 +14827,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20210419, - 607 + 20211103, + 232 ], "deps": [ "company", "posframe" ], - "commit": "c7a820a35ff132aaec53c81e05afc829de39eb68", - "sha256": "0fyc7c4r4jfa5y0x9lfcqlx0qazg1d4il5p0bdw4hdcpjd2h26ys" + "commit": "e104c0d0ee8db4a5fc852b3fc951e52989ee8755", + "sha256": "05q2v2faa7ydx242208wxir8fkkrr34n773fllkkp9m228hc5mv7" }, "stable": { "version": [ @@ -14837,8 +14866,8 @@ "company", "prescient" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -14880,15 +14909,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20210515, - 2212 + 20211115, + 1335 ], "deps": [ "company", "pos-tip" ], - "commit": "530b29380f0f95ae338cbe089693d786e6f53d86", - "sha256": "0w2xj9k50j96x81l767ah1m17pcjsbfk91mndm4w25p30kd1g8j4" + "commit": "3ca2708b4e5190205aca01d65fe1b391963a53f9", + "sha256": "120kvdrzbxs7idrqwz8rz59ic3ymq1b586l0qi27y7bdy2pg6njw" }, "stable": { "version": [ @@ -15026,8 +15055,8 @@ "company", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -15092,8 +15121,8 @@ "company", "solidity-mode" ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -15791,19 +15820,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211024, - 1830 + 20211117, + 855 ], - "commit": "ae2761ead41a2e8bae011cee0f57830d6bf423b5", - "sha256": "1ff582cpl3w61n3mv5s7cz4mjlzkza5cn83lllp232zd7bnw68h6" + "commit": "69bc425c59414ece0a49dfa8e3f2d9759a13748c", + "sha256": "066a3gf1hgzc4n7r06m1x3kyp98sabs8kf25dhlg9wgl2l6gccf0" }, "stable": { "version": [ 0, - 12 + 13 ], - "commit": "ebb62563127a4b9442148372f897efb7baef61d2", - "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" + "commit": "c2fed383c9c555ed017200a22efad0a9734725b0", + "sha256": "0ik5j4i4vb9hz629cjwnzhimskpv0fc8wca37z4ak0q1d898ayph" } }, { @@ -15947,16 +15976,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20210930, - 1225 + 20211104, + 1506 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "b9aa9617f174a304040ae75d35483fa8d4ade5d7", - "sha256": "0px09bvi8x5b7h4w3mdffj1fnl7nk51xybpxz7n8v8i7v1w3547z" + "commit": "aaa9a31bc82259d743186c53d8b01f043c6fec13", + "sha256": "1d4l930gwfp2syxkm129lxbvrwcqv3rz2qzb3m18v6aklk0si2db" }, "stable": { "version": [ @@ -15980,15 +16009,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210909, - 101 + 20211114, + 557 ], "deps": [ "consult", "notmuch" ], - "commit": "015642e88a48b1e3b4791a5badd8dbdfe6a6037e", - "sha256": "1nbyd21n3dfdikr2dv7bcb2rg2sar22dmirrlkd5bz0qniaqim4n" + "commit": "5e62b4da80c5361a656f459fc2fd3ec65d5d9bf1", + "sha256": "1krap35x6r3gfh0hk9vq7z471m21j2dyljaf5ppx85yhfanhpxp2" }, "stable": { "version": [ @@ -16030,14 +16059,25 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210807, - 1613 + 20211113, + 1958 ], "deps": [ "consult" ], - "commit": "fe7a09b99d1497a30e11a2f86b6415adde00788a", - "sha256": "1bqmr686ncn46fbbq000mpbqrhf76sc9npbyg85053rhnwjdkk84" + "commit": "42dea1d40fedf7894e2515b4566a783b7b85486a", + "sha256": "0nzch4x58vgvmcjr6p622lkzms2gvjfdgpvi6bbj5qdzkln5q23a" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "consult" + ], + "commit": "1b21fa157ba40fcfeecd0a10c5c82ecfb87aee53", + "sha256": "0bfvxzvyppkqfdj4cm5haqgkd72wrh5l7x8ldnpycapqyjpv9pip" } }, { @@ -16048,15 +16088,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210620, - 1953 + 20211114, + 2258 ], "deps": [ "consult", "espotify" ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -16175,14 +16215,14 @@ "repo": "liuyinz/emacs-conventional-changelog", "unstable": { "version": [ - 20211019, - 1205 + 20211103, + 1242 ], "deps": [ "transient" ], - "commit": "7087ef60c3301e23b284f5e578a9717b9bb8b740", - "sha256": "0p1jlw550fvh0xhvr5b2z39vnbk6q6nbn6sgh1k97ar62pgwcgc3" + "commit": "9db9dcfdff2ff8cf6a88e938646cb26ce0f61774", + "sha256": "1qm6v88mz6bxz0yg2yw5xfiz5jjnz3i9vwaa3irnywzs6prw7pa4" }, "stable": { "version": [ @@ -16508,8 +16548,8 @@ "deps": [ "counsel" ], - "commit": "3321bf78231e443cb98520dbb30a6c49e004c6a7", - "sha256": "08xqga2qnn6y5zq7r2xd1mcg6zjzaiiaw2damp4djcjd2fsm4zl1" + "commit": "72b31889581f20f4037c0361f5259ff3633bc128", + "sha256": "0crnrp5gd055gpxj4qiiwlik8llqhs5dyixfa8r8mzaxanv6bdg9" } }, { @@ -16540,15 +16580,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20210310, - 452 + 20211115, + 1755 ], "deps": [ "cl-lib", "counsel" ], - "commit": "f7647b4195b9b4e97f1ee1acede6054ae38df630", - "sha256": "06xvyf9cnyq9zlp7rkq0a0h85yk967icifhg1pfhsz17za97yg94" + "commit": "8e9c0515fc952452eee786d8ebb43d48ea86c9f8", + "sha256": "18wncb713slsynm3amqs8ibpzfab819nn6r6yzl6yxsliahi2xil" }, "stable": { "version": [ @@ -17035,16 +17075,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20210330, - 44 + 20211026, + 308 ], "deps": [ "elquery", "f", "s" ], - "commit": "62a4650f97eddebf6cd04b662a69b15ba72472c1", - "sha256": "01l38yfgzh4apvj9ipl50b5shf6vnyqdciklpbajciynz118p19q" + "commit": "58cf3d5fd2d71084083a293b0fc7ce947aadaf26", + "sha256": "0lbsc5dz810gcvpapqa0x9b0wpd9fb1sb4qj32ypfbc3ywklzd38" } }, { @@ -17616,20 +17656,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210826, - 421 + 20211115, + 2134 ], - "commit": "c0c7602368f7b3933584e7790394a4d509bd1c50", - "sha256": "1nkaaggdh9bzisq4dx6mi2lbajymq9l6dp83gsphf94xcn3q5g2s" + "commit": "515b866704252fc862144d9ff677fba75488e445", + "sha256": "0xadchhbfikw2vac6kqkmdjjixhybxqqf99cpl089cga9sjc7i5p" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "723a4ab2581b11f84d23f421faa06103864d2bc8", - "sha256": "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g" + "commit": "515b866704252fc862144d9ff677fba75488e445", + "sha256": "0xadchhbfikw2vac6kqkmdjjixhybxqqf99cpl089cga9sjc7i5p" } }, { @@ -18309,11 +18349,11 @@ "repo": "cython/cython", "unstable": { "version": [ - 20190111, - 2150 + 20211111, + 1407 ], - "commit": "1461e514c00056eef58c7c18262012b1510ba692", - "sha256": "0835zi21kp4xlf21lyzwy64lns0p4pka49z30fpzfwdgbdcmmhmd" + "commit": "2b1e743b9c736ec41e92b197eb709db0427558b4", + "sha256": "0x6nbir7pk8w4265qywqxjdvrrkyvkp8z066z29zljwcry1wk1ml" }, "stable": { "version": [ @@ -18520,8 +18560,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211020, - 1757 + 20211110, + 1129 ], "deps": [ "bui", @@ -18533,8 +18573,8 @@ "posframe", "s" ], - "commit": "a18f29e3d1a3a945ec5dfc7dea98927ecb022c34", - "sha256": "037xly2c3jd33a3gnkrfp7lammrgarl5kknp5zvqs35278xpsdng" + "commit": "c19da4d347114d19fd9cd77af3650bcec7d81b15", + "sha256": "1pmzrb9c8z3jhwfjygdlkarc9ssaldvqx4vi48j6yg8av99p5z03" }, "stable": { "version": [ @@ -18887,8 +18927,8 @@ 20210928, 656 ], - "commit": "77eff49a054e08a474608237f0faae13acb4489b", - "sha256": "00xqgjwihd1r625mba788l0270bd9is8g211rsln91wmfv7gnifk" + "commit": "a19868f2fb8f7fc4132b4e9bfac5cdd65f245181", + "sha256": "1gmcnj3ldhqy417wv2lqfh53pg8glfz28bgd26sx5nbw7w5lhd9r" }, "stable": { "version": [ @@ -19228,8 +19268,8 @@ "ccc", "cdb" ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { @@ -19271,16 +19311,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210830, - 656 + 20211107, + 445 ], "deps": [ "dash", "s", "spinner" ], - "commit": "4ec21e644ef482a913c64f068ec8d602eedac1c6", - "sha256": "1ipjdwnf6c9qdwg4klkf6g06jj4lgap75ms5yq6a0gg2075d84jk" + "commit": "97663c41624526c4ceaf82fb6a0137ab2081affe", + "sha256": "1rkskf8byl5fnnlahvppawfjj7zc41sag4gwxdb2r3j77g5d5ahq" }, "stable": { "version": [ @@ -19477,11 +19517,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20211007, - 309 + 20211104, + 52 ], - "commit": "1985fc92c62c0a1e660639f78518a42d055045fa", - "sha256": "12ink0pj2mpyf0g6q0smypirw9rvjlg0rr7zj7xw8k6jfhlhlf0l" + "commit": "dbb6c6c5350ba76b12bd69a584b0634a8262a76f", + "sha256": "1yjc4g50r0jghf5a0qipfzys6krgz5vqizm3hlq4lh29hvkazc6i" } }, { @@ -19916,8 +19956,8 @@ 20211002, 1657 ], - "commit": "206d06512cd9934644fa9ea3e17b5e78d01b7e64", - "sha256": "1d51lnwvy53zhq99m6bdm4sp2ykhnwcijc8gpxjqy3c8vnzdbjyk" + "commit": "e1b4b0258289d442e349f67f175f05be6f4347d4", + "sha256": "0yqmaa12sdci6wy95fany03rcqsm9avrjldzrypa9xv5a2ayi48f" } }, { @@ -20145,14 +20185,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210928, - 139 + 20211106, + 2353 ], "deps": [ "cl-lib" ], - "commit": "6b7ca8c310ec1c1a83990c8d1c013c68f61d9d51", - "sha256": "1iigna8p76v57hahw3qcsnkd86gqspfb738c74vj5chb1wgb48dw" + "commit": "6fa3af0843093f44e028584a93eef091ec7e79d2", + "sha256": "0fg7mdcjjnibqi8f7zj2pig35kcq4gqfi4jvg4hvw9fcncdv0yln" }, "stable": { "version": [ @@ -20348,6 +20388,37 @@ } }, { + "ename": "dilbert", + "commit": "7fb785715c05adaa7551b27f4eaca2b704bf1a86", + "sha256": "1bsz4qmjy9hvpgrxpbz94v2yv0xvh1v8fik1pldv72bl4jkvifvl", + "fetcher": "github", + "repo": "DaniruKun/dilbert-el", + "unstable": { + "version": [ + 20211114, + 1009 + ], + "deps": [ + "dash", + "enlive" + ], + "commit": "bd8c11ccc512ca60906a8b0e4bca2081ba4aab7b", + "sha256": "110ynzqsnkv6sdnbk475h6qyrvj4w1dk577hpr1p7pk7bif4waxd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "enlive" + ], + "commit": "e660def51721f80b7d21eeab60e9a719be5106f7", + "sha256": "0gim8imb9cw16sr76hydjp1rjw2cczslnh4h2gvq3jsmpk2hdvma" + } + }, + { "ename": "dim", "commit": "3a740ab40cab3a1890f56df808f41a2d541aa77c", "sha256": "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52", @@ -21186,20 +21257,20 @@ "repo": "crocket/dired-single", "unstable": { "version": [ - 20211017, - 1240 + 20211101, + 2319 ], - "commit": "f760aa94ea3f87845dd2325287d05447322a60bc", - "sha256": "1l7gh1pi24f6dllzpw72r5hd0iafgrhp4hzn29s35054xhhkkvqp" + "commit": "b254f9b7bfc96a5eab5760a56811f2872d2c590a", + "sha256": "1w243yq5m6zd6yvcsnvxf8162fd6i0l5izqj11mji7jzyqxl1ih3" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "27120d6a079541e994105e3f969032d3ae7edaa4", - "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn" + "commit": "b254f9b7bfc96a5eab5760a56811f2872d2c590a", + "sha256": "1w243yq5m6zd6yvcsnvxf8162fd6i0l5izqj11mji7jzyqxl1ih3" } }, { @@ -21791,14 +21862,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20210312, - 1850 + 20211117, + 954 ], "deps": [ "cl-lib" ], - "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", - "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" + "commit": "9ad8b231812af17c2f7655057a8e0dece96a7d7f", + "sha256": "1l3js4rqwqjlk5b13fsr3nk6n3yzlnscya4jsc1j8dr19i5nbxcf" }, "stable": { "version": [ @@ -21828,8 +21899,8 @@ "dix", "evil" ], - "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", - "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" + "commit": "9ad8b231812af17c2f7655057a8e0dece96a7d7f", + "sha256": "1l3js4rqwqjlk5b13fsr3nk6n3yzlnscya4jsc1j8dr19i5nbxcf" }, "stable": { "version": [ @@ -22154,8 +22225,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211017, - 1058 + 20211105, + 138 ], "deps": [ "dash", @@ -22165,8 +22236,8 @@ "tablist", "transient" ], - "commit": "3382dbb8bd8f4f80291faeae6abbb48e673fcc04", - "sha256": "0iggpym4p5x600d3afqza125s9sifjjy9n6cc6kjw8kdr7h4m827" + "commit": "8d64cf4f84d7da5f839a8248fdddfb635a63f803", + "sha256": "1ivyvgh24nadhiv9ffqxckwln8vc9c2l0bvrvrd53yf0w8i345yz" }, "stable": { "version": [ @@ -22527,30 +22598,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211024, - 1720 + 20211111, + 834 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "25e81e77cd7481de4c666d4070ae038e4970c767", - "sha256": "1xrhfrnpzj3c3vrqzw8wsrbpgnvl849ad4fzpqid1vvzl6xzq2ww" + "commit": "36fed6d1a1614f72d425073d7c9e1529f622fe7a", + "sha256": "0g56jvpsz8mdjpg7rifn89p7k2iw4rl1rvj8xv5323x9hl6772dx" }, "stable": { "version": [ 3, 2, - 0 + 1 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "d514f43679513819b37333a64a44523f239150b6", - "sha256": "1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0" + "commit": "b59802efba1215bb861621deba0030cfda2796ed", + "sha256": "1ji15n2rdp7bjg5iq9im6c4m12k24kqp85i3n1m9npihrb4arh54" } }, { @@ -22580,14 +22651,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20211011, - 1314 + 20211114, + 1641 ], "deps": [ "cl-lib" ], - "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", - "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" + "commit": "96edc0ceb864b7d72218e58c8e9272cd96e5712c", + "sha256": "0qkpwlg5h3ysmf6aywz49a9gkl4xszxzdkcfpqc3n0i2bvcmf6vk" }, "stable": { "version": [ @@ -22831,11 +22902,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210922, - 1038 + 20211108, + 749 ], - "commit": "943faeda66931dd275fe83d858945bd07abacc5a", - "sha256": "01k8i4g0vv7m2jgjmj3y2n1821965r4m1j3fra5v30pnljjl7zjb" + "commit": "8c38b293af039041e8914894d86122403eec5bcf", + "sha256": "15h2zkrhlhhc7qkyydpbm2xdgbx3vwy1jj78rq3vycwb37v52kci" }, "stable": { "version": [ @@ -23243,8 +23314,8 @@ 20210909, 1010 ], - "commit": "530621843764e7a5a4630144102374e8d16b2ff6", - "sha256": "1d9g6g682f4hgybsq29qmxihg8ynkzchvgvfl8ss0rqxs8r7j4bj" + "commit": "05653b996b18032a4e80ab71827e7a15601a69d6", + "sha256": "1l2803hd9gr5mjzpfz21fgwcyy55zj0rdafwdmy1hcdy9g1d3cg8" }, "stable": { "version": [ @@ -23480,8 +23551,8 @@ 20210924, 2026 ], - "commit": "76142cf100d9e611024638a761e62bd82af156cd", - "sha256": "1fsydk7pld2xpmmp1jnm8b3y7zdynibwicgmsfxpk11915y4fh6r" + "commit": "dc9013117bdcdc1b12feebcc58eaf129a6ad3a73", + "sha256": "0z5r0wybpm74hlcbisavn90i31vh3jsalhk0frihfclfgbqd24d9" }, "stable": { "version": [ @@ -24009,26 +24080,25 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20211021, - 2257 + 20211112, + 2206 ], "deps": [ "parsebib" ], - "commit": "c11ffdff2377620a4c0567ac6272dbc2b29672d9", - "sha256": "080r21khhxk9823vpbmig5q2n2ch3pn2bc54470bc2pzlp7fbbpd" + "commit": "b2f9c0a354044449a49501cc405cdb090e19dda0", + "sha256": "0f56rmpwj71lgqyb5gx9mnb2gz9s7bnmf7fyiwc0f541jrrgcfcl" }, "stable": { "version": [ 2, - 32, - 2 + 33 ], "deps": [ "parsebib" ], - "commit": "831ffcca35601e169c0778035688c5d17d138b58", - "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" + "commit": "84c7234c4901207fa0520af96922c2b8e407ff4c", + "sha256": "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc" } }, { @@ -24141,7 +24211,7 @@ "version": [ 0, 6, - 17 + 18 ], "deps": [ "ansi", @@ -24151,8 +24221,8 @@ "f", "s" ], - "commit": "3a77ba9f1064c2bca47b401974c009e65727c46e", - "sha256": "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn" + "commit": "d173cdf487bc2c62305e2232db96290bc021950f", + "sha256": "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1" } }, { @@ -24788,14 +24858,11 @@ "repo": "ROCKTAKEY/egalgo", "unstable": { "version": [ - 20190706, - 1611 - ], - "deps": [ - "dash" + 20211105, + 1657 ], - "commit": "e683b16ed4265ddb46efcc8cbf9503301cc39e22", - "sha256": "12nsbqrk7clr642kmbaa9xqgx7j2r6as6grx5qmghnp7kjfy1d7l" + "commit": "a56a86591351d53ca2add7c651757bfb0064fb22", + "sha256": "1xcd1kwrdclncln1fgg3ikdja8j96jfp0a9r9r7x2h05npb3881q" }, "stable": { "version": [ @@ -24881,8 +24948,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20211009, - 1931 + 20211116, + 823 ], "deps": [ "eldoc", @@ -24891,8 +24958,8 @@ "project", "xref" ], - "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", - "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" + "commit": "55c13a91378cdd7822c99bbbf340ea76b1f0bf38", + "sha256": "01861nbwkgx88ndhqcb2dcy9mzsk7za61ngbw02mxlg3ninl15ic" }, "stable": { "version": [ @@ -24926,8 +24993,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "3d3b977b0fc36dbde0e2a66adf6f93b829e4fce4", - "sha256": "07nn95a2mv2f8llhq9xaxiy5lr2b6j5mjy5bgq2c7idkhrkdqdnp" + "commit": "0ba09a8124cee35cf81f55b4db9144efeb00a92f", + "sha256": "1y11q6zbmdfwswgy205f0iqsd5c4075zsf135vsnc7bpmmkpgcvw" }, "stable": { "version": [ @@ -25003,11 +25070,11 @@ "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20211023, - 2001 + 20211027, + 617 ], - "commit": "83ed534e78f5b9f4b32c0c8b3d636174afbdd5dd", - "sha256": "1i0prbvzz2m0596gxws6fj8wf7nrwqpnhcxqg0542ij0mk9j81xm" + "commit": "5bb04501a7f5bb3f5be33b8b96742f1ac9839a8d", + "sha256": "0w3xc2yhdrhcb5fjy1h877y14k1iidcqc548qnxjyzal8l0z5nw1" }, "stable": { "version": [ @@ -25042,8 +25109,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20211012, - 347 + 20211107, + 1724 ], "deps": [ "anaphora", @@ -25054,8 +25121,8 @@ "websocket", "with-editor" ], - "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", - "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" + "commit": "1e42a2b26c2b113884170a94229c2743978e2dec", + "sha256": "0fvsbhv65z6vjw41s4yrk2j71cm7rw9yljlizrv55gazrpd5g6i8" }, "stable": { "version": [ @@ -25203,8 +25270,8 @@ 20210613, 1418 ], - "commit": "b5a5a405d04f61ec9c5fcb19357a50a4b9e36a25", - "sha256": "1w6ps78saxdvx64a2y1vvzn11mvb6bw9657zfin0yibh2s91hqrk" + "commit": "960f3fb962c35d3196bab20b2a3f6d6228119277", + "sha256": "1d1lkcnjjdca73frn611gz9rck73mn2kxq207lh2ykww3wkaa0pa" }, "stable": { "version": [ @@ -25553,20 +25620,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211024, - 1829 + 20211113, + 1804 ], - "commit": "f42b01907ff9f40bcc2cfe04808ad9477314f83c", - "sha256": "1rsld1hi19vx7r60i8rr2ih1bvsq5bck0fk5jr8yfxa4afgn0xlv" + "commit": "70aa39c6c6ed696b7f1505c1c9bf4b2556179a27", + "sha256": "01y3jyjisxngaj0wyib5s37839m7q4azkchaa381mwx0l5nv5k5d" }, "stable": { "version": [ 0, - 9, - 3 + 10 ], - "commit": "95fedcc075afba7306341e55122b8aa6108d412e", - "sha256": "0qmyx74hikkirv31x65gybr9n7ignxlyx61xkz5qmjk8pgdmkn3r" + "commit": "012f5ae33166987b4a541b0df2d39e3770ade228", + "sha256": "1y1gc37vn8k1yhp6b069sg8hdh1bn22icdqn4b28c2k5iiw9g7gi" } }, { @@ -25688,11 +25754,11 @@ "repo": "it-is-wednesday/eldoc-toml", "unstable": { "version": [ - 20211024, - 2247 + 20211026, + 1122 ], - "commit": "60f1de70942e163034ef093c61f50f29820c3c04", - "sha256": "1qkcin1b6b41m69gmhj5q4g2lnzfh2w237f87s5zfpkid0mzw7k9" + "commit": "61106be3c3f3a5b293c3f285eec8c6f400142b6d", + "sha256": "079vxv575v4qhdc05jn0ba17f8451nqmdpvh6x4wbg5vdchrqvyp" } }, { @@ -25733,14 +25799,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20210906, - 1235 + 20211114, + 1153 ], "deps": [ "dash" ], - "commit": "14def81d88bf4344a335e68007324e3f3ef5c435", - "sha256": "1p4kpxq8fvdcs5za79c4pzw1g8108kyfl9rcybs0g75fjxk1f2jb" + "commit": "1c51e88d5719e7b0dd022a4704c46b24e0c91348", + "sha256": "1zzy3y5vkdlb7wb3b4fgvm61zn3dj9n0ldi3153qvrgwn6w8m648" }, "stable": { "version": [ @@ -25998,8 +26064,8 @@ "cl-lib", "elfeed" ], - "commit": "5e17d4280f5f8019c3f8962a710c9b3e633f41ff", - "sha256": "0kv6svwg1h0wcj7z89xs20a9wns7v67af9m9rir3m8f47iyy70gr" + "commit": "c88bb246a40c2f8ec2cb36bc16690d1ed43f8b14", + "sha256": "0aq1rp46dr2hdkzm8aapb1xlcbdpa0nbrgb8b5avkihmyx7nkwkb" }, "stable": { "version": [ @@ -26376,8 +26442,8 @@ 20211013, 1408 ], - "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", - "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" + "commit": "7373e91e859c3ddc66457723d531cfab821160a3", + "sha256": "0g1krxgm3x8mj959yin1k8khqhgdr70cymvn78kb0w286079xkmn" }, "stable": { "version": [ @@ -26880,8 +26946,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20201011, - 1950 + 20211101, + 1023 ], "deps": [ "cl-lib", @@ -26889,8 +26955,8 @@ "f", "trinary" ], - "commit": "ac0ab88abca1215cac60f8a986dadf3011b444bb", - "sha256": "0g712vmiabia8aqvdw15i4416dgvy73flsijb6x8mq6bbxw6mmrc" + "commit": "22bb5bd15e3f4fc2a9f10b998626fec18fd3a1a0", + "sha256": "1cccxhni2xk5zc0rf807himgdh8aj0m247q0y1xngc9amjms9hqj" } }, { @@ -27148,8 +27214,8 @@ "deps": [ "cl-lib" ], - "commit": "da88fa2d04e37397c519e8b1181163f06a350e2f", - "sha256": "02g42xccwbhgq0wf4v2sd3khyvvsvigixxjb2rdqw70h4j1k8mya" + "commit": "ed03b9396da9ef16e498a2d33a51ec5596021b0e", + "sha256": "003pfp9mksl6w446c5njwi6kmlvm2m7pncilj075r9zdpra4a30z" } }, { @@ -27473,11 +27539,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211022, - 4 + 20211116, + 2111 ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -27496,15 +27562,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211012, - 1921 + 20211116, + 2111 ], "deps": [ "consult", "embark" ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "edfd0a842a75ad25115f95f56b0c8a9351d3e248", + "sha256": "1mq84aiak2fwxbxacf9wzk223dri6z918vqdgs3vy0amvn1ys2ji" }, "stable": { "version": [ @@ -27671,29 +27737,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20211019, - 2004 + 20211101, + 1746 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "0657a1facdf39464a0049e2abaec850da5057854", - "sha256": "0cfacz95430xq3zsk7dz1463yc7xk2gqj5byj3537jp4vyhr947g" + "commit": "777c904c9d6c8dfff3ed21c5e4a24a6432f8ee52", + "sha256": "0kg312x6ka4nxpbwsfyhg8n4a2yqi0wcfxgbj17sfcs9d3ssijs8" }, "stable": { "version": [ 7, - 7 + 8 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "bc0d2ec1ba99409421d3f75aae315e10b5014b31", - "sha256": "13jwf5dxhj1ch2l4klxjy1h1by70lhx99bsjdx23pvr6di0srnj9" + "commit": "4529ea69dd86c5e88d7fb7d568a5258b20988042", + "sha256": "1hyxcpv020dhm15fvdq2jgdqzsn2ara8156dpz4c93g8kj614crx" } }, { @@ -28428,8 +28494,8 @@ "deps": [ "closql" ], - "commit": "d8a26b55c2e2dc3edb0e8da7ea6ea4f9024564d5", - "sha256": "1fz2k04iaz6r6jp4jw81gszqxz11x7v3nvm690scbgyim5big66s" + "commit": "8fa633c278241df577200c6c94102a0fa07bf8a5", + "sha256": "0h3f3xa5chm3vcahk97fx87l468d33myvpyd9blq26a7js568y7q" }, "stable": { "version": [ @@ -29022,14 +29088,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20211022, - 2302 + 20211105, + 1531 ], "deps": [ "cl-lib" ], - "commit": "5692fc1f1e8d7f81706bf9d9df9ce371deb9486b", - "sha256": "0ac3i547r8kg9hb2xb0khmgnsvnz79lag4mk5ia608zhiyfzpqs6" + "commit": "df8d4253c44aee607308826093222188c4732099", + "sha256": "1rss0k7yvgbi326x2zjhbx9a5m80a58w1vj86c9ykrd0n4wj2nk0" }, "stable": { "version": [ @@ -29076,8 +29142,8 @@ 20200914, 644 ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" + "commit": "6cb77e1a216098d6a4e273f6750dbf4445953272", + "sha256": "1rj04f9q7fn88ifznqqi3p7anv0m827mz2w2bwb4s09kdn03nf6p" }, "stable": { "version": [ @@ -29097,20 +29163,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20210315, - 1640 + 20211112, + 1232 ], - "commit": "1d768922b984287892afb1d950ec83a3031c5f7d", - "sha256": "039v8iqx3pyvrc66lmvvdpf8w2s975hm4s1w6j0bm6h5ca9aqr0q" + "commit": "abe8285f0b4c594d610f72df6890f6851b89f248", + "sha256": "1fw0chd6qmv1m06762l3lhbmd23l34g0dyvri7ql3bam0z9jjakq" }, "stable": { "version": [ 24, 1, - 2 + 5 ], - "commit": "0706178dea1c62d8d63c33c86bbf473dcaef89d5", - "sha256": "0kkrng9822vkgw8l7vqglrrmhpq9pqrm7x8786s1bjl31bxd8i9z" + "commit": "9e23eca89170fcdf22441ed65f05ef891096f318", + "sha256": "1gd5nac4d56wp5qqkaicdcjf3n63wbbqg4m08s26gxfbjqkfh8ri" } }, { @@ -29538,25 +29604,25 @@ "repo": "xuchunyang/eshell-did-you-mean", "unstable": { "version": [ - 20150915, - 1952 + 20211104, + 237 ], "deps": [ "cl-lib" ], - "commit": "7cb6ef8e2274d0a50a9e114d412307a6543533d5", - "sha256": "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg" + "commit": "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d", + "sha256": "158g8b4crm0gf5pilfxf89hdsb22gr1wbrjyx9gf45bmcll3i9vf" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "7cb6ef8e2274d0a50a9e114d412307a6543533d5", - "sha256": "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg" + "commit": "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d", + "sha256": "158g8b4crm0gf5pilfxf89hdsb22gr1wbrjyx9gf45bmcll3i9vf" } }, { @@ -29625,6 +29691,25 @@ } }, { + "ename": "eshell-info-banner", + "commit": "d602d153819e37a155ca9c4edf0271f478bd4200", + "sha256": "11xvlqxnxc0z5968mnmgqmpg3jn9l7x24w1qmwg9pkvr72ynh7vd", + "fetcher": "github", + "repo": "Phundrak/eshell-info-banner.el", + "unstable": { + "version": [ + 20211115, + 914 + ], + "deps": [ + "f", + "s" + ], + "commit": "312f1e3da3f42a82b99228491427a429ee379648", + "sha256": "07xwph4mnmyd80apn6r1m8alxh2vy1d0y1jacb0ghqjbs01qg47q" + } + }, + { "ename": "eshell-outline", "commit": "950b9323c19b145bbf07a9a8f780880a2593831c", "sha256": "1k510vsfsnhp86y2587zbc0cmaf735sp802d6qk7bgdllljl18hd", @@ -29750,8 +29835,8 @@ "deps": [ "vterm" ], - "commit": "a33073e9e8a56632c76cdd227574107185ae2cf7", - "sha256": "18m04xzrqlhrbpb3w3jqwrihvq1i9vx9301sn9h9qrxby7m3pxcp" + "commit": "f2212dbfa51aa4b67efda55304b2b3811e8e0625", + "sha256": "02q1iyh77m7vg9cip7c9wzpiggnsbhhicfs5rqzpc5d7n70gbk2p" } }, { @@ -29864,11 +29949,11 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210405, - 1808 + 20211114, + 2251 ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -29980,11 +30065,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211011, - 2049 + 20211113, + 1429 ], - "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", - "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" + "commit": "aaa82f24c9f44fd7e39b7d918a7819eefbbb40a7", + "sha256": "0hxa8mm2i8xr98yw9b93m8fv3xmfb3kmydgkzai0svpi6wwn9kw2" }, "stable": { "version": [ @@ -30148,27 +30233,27 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211009, - 55 + 20211103, + 1525 ], "deps": [ "csv-mode", "ess" ], - "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", - "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" + "commit": "060ea424d7781d652ae385a48384848b6ded0105", + "sha256": "1nwdf2i47j1m1vhy8ng02xbrmr15gm97fmnd5z4yb29gj2kb69fv" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "csv-mode", "ess" ], - "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", - "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" + "commit": "fddf070b51dbcbf7fa060a9998e676e8d0c15e1d", + "sha256": "1zhlinkfzybkk0gbr1pskvx69wk566r6a5dxgpjjry247hq76ci2" } }, { @@ -30575,15 +30660,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211021, - 2104 + 20211116, + 2102 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "17c635f6e1f538bf4b2c3c276ddd9d4d165a52fb", - "sha256": "1yd7kmhk0v235h4nlynfs29ljx7ca6i7s7h8wj5krk5b8sv51x27" + "commit": "c28e42126c4ae349e2d77c80b38feb68bc1b5b78", + "sha256": "00z3gmcn12nb32nczplxb68kfmmdrv0fg6f376ip6iwygjgn4cqc" }, "stable": { "version": [ @@ -30777,15 +30862,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211024, - 1417 + 20211114, + 702 ], "deps": [ "annalist", "evil" ], - "commit": "1d296af2ec45e98b93048148d5468b05385b1ff6", - "sha256": "1c2xv3486dcrlv2vnl901f9vs3d3krzxpmfnw2h3598fdkv1z60f" + "commit": "652d74acfb5789eacef36660c4ffc68905c8d741", + "sha256": "0pqm6pp6h8v5jy36cgm70kkjjgj38xdyq0irhnyqmaf5hdvrbvkh" }, "stable": { "version": [ @@ -31444,16 +31529,16 @@ "repo": "hlissner/evil-multiedit", "unstable": { "version": [ - 20211023, - 1906 + 20211114, + 1644 ], "deps": [ "cl-lib", "evil", "iedit" ], - "commit": "50179bfb269b35d248a77105f7feb7bbc87fd302", - "sha256": "113q1j90rdnqiwca1d2jkmksh8bm1cf8klj6pm2gimida8s9vfmb" + "commit": "e17078ff801c3cfc125bbe432a5fa24bd2958b67", + "sha256": "0x4fdjfvpx2nbca7jr1y0gjipg4rwf6cjmzf91j46vzslcvhqv4n" }, "stable": { "version": [ @@ -31575,14 +31660,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20201222, - 2023 + 20211112, + 108 ], "deps": [ "evil" ], - "commit": "80ef38fb378541937f6ddfe836809e76eda1e355", - "sha256": "19028laqnsl0h5nii7ykfh39srg94zhydhj1rcv52fs9nlg6c6dq" + "commit": "c3ec94bc2fb79127826ea85509247f082bc394aa", + "sha256": "15fvw5zq97q18nr5vshkf4qp9di0sb8fklyhgwmhyh254zfdlghf" }, "stable": { "version": [ @@ -31912,15 +31997,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20210713, - 1456 + 20211114, + 1647 ], "deps": [ "cl-lib", "evil" ], - "commit": "1a28d718c835a21591a170af78a03a366cd60c0d", - "sha256": "1dm73xmlhznh9yc22ifb238yyad09011nryc91n6glla347896p0" + "commit": "a79177df406a79b4ffa25743c752f21363bba1cc", + "sha256": "0pz2s0g0859zhyryvn1glngw1aq7a04x9rydl1l89h50hf5avmvj" }, "stable": { "version": [ @@ -32012,8 +32097,8 @@ "deps": [ "evil" ], - "commit": "3bd73794ee5a760118042584ef74e2b6fb2a1e06", - "sha256": "125yxpd2cmhwvcb0p9z5dc6ydk4w2a9vblkn9hayh6myj9jwjy9f" + "commit": "282a975bda83310d20a2c536ac3cf95d2bf188a5", + "sha256": "0f9y5dwjkjv768s63bypp6nb51kklhkq58ixgzfs59r423y8l1nl" }, "stable": { "version": [ @@ -32103,8 +32188,8 @@ "deps": [ "evil" ], - "commit": "17c635f6e1f538bf4b2c3c276ddd9d4d165a52fb", - "sha256": "1yd7kmhk0v235h4nlynfs29ljx7ca6i7s7h8wj5krk5b8sv51x27" + "commit": "c28e42126c4ae349e2d77c80b38feb68bc1b5b78", + "sha256": "00z3gmcn12nb32nczplxb68kfmmdrv0fg6f376ip6iwygjgn4cqc" }, "stable": { "version": [ @@ -32258,14 +32343,25 @@ "repo": "emacsorphanage/evil-textobj-line", "unstable": { "version": [ - 20150729, - 1522 + 20211101, + 1429 ], "deps": [ "evil" ], - "commit": "3d401b6831bdbeec967ec8e64177a8950251e812", - "sha256": "1vnk27bizzi321mdq3k39zxv8w20ifxbhxabiy685nyk89cq3mbj" + "commit": "9eaf9a5485c2b5c05e16552b34632ca520cd681d", + "sha256": "1w98gc1sqik8ab35a1hg5853dwar98a8qd94lxpq4ckabpgypins" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "evil" + ], + "commit": "9eaf9a5485c2b5c05e16552b34632ca520cd681d", + "sha256": "1w98gc1sqik8ab35a1hg5853dwar98a8qd94lxpq4ckabpgypins" } }, { @@ -32295,15 +32391,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211022, - 1336 + 20211105, + 1632 ], "deps": [ "evil", "tree-sitter" ], - "commit": "a573121b2a053b8a3682a2e1ab86bee0337da2e7", - "sha256": "000dkma3cj38als7pyv4c4338bs1l6m4rfdmh6afi09r9m78vnan" + "commit": "b35565ab6c8e380227048256885bb7aa7e7fd72c", + "sha256": "17rbxqvrq9c8j34mycbjkzrd6cjpamldj6h8k1hyzm2ld97w6gqm" } }, { @@ -32325,6 +32421,28 @@ } }, { + "ename": "evil-tree-edit", + "commit": "43726f8e4c4f7f673ca892ec17329471dba77b3e", + "sha256": "126jkiy9jganamn9xv2d357mxipgbz9skpvygwb7lkhnvkz263dg", + "fetcher": "github", + "repo": "ethan-leba/tree-edit", + "unstable": { + "version": [ + 20211114, + 2308 + ], + "deps": [ + "avy", + "evil", + "s", + "tree-edit", + "tree-sitter" + ], + "commit": "6fd445dbeb158d05d785965077cc594aeeb73a61", + "sha256": "0h1zjdqxynxxlqdc9yxhmkjwarx4vn9anasv9i68fcmmnq7c0aw9" + } + }, + { "ename": "evil-tutor", "commit": "4b7bfffdc34e181893b8cf4d1cc091f6c3f91126", "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn", @@ -32724,8 +32842,8 @@ "deps": [ "cl-lib" ], - "commit": "0a07f5489c66f76249e6207362614b595b80c230", - "sha256": "081p104ma9b7nzhs42y6zn8r8vz5dp7kz6vp79xdyl42w9dqinww" + "commit": "3a8d97c096c2c5714b667130fd8a80d5622ee067", + "sha256": "1fdfg9zblk82546fhmha84lz45g4nrgmqqq39jsr601axalfkl7q" }, "stable": { "version": [ @@ -32791,10 +32909,10 @@ }, { "ename": "exotica-theme", - "commit": "744e4cf9105c9eaafe2b49ca1f8d7d6b9c5be4a6", - "sha256": "0gkidf8jcv3j3cqhjkjcxg6hv0m8kspycffn9dvjxqn912n6ljks", + "commit": "c3543d83fa2e0ed2b8b313f3c9e7a2c6f42b5085", + "sha256": "0jf18siqbwilx9v0mlm6v5k03c1v9jm4xdlk183bnrad09rdw6qh", "fetcher": "github", - "repo": "zenobharat/exotica-theme", + "repo": "zenobht/exotica-theme", "unstable": { "version": [ 20180212, @@ -33545,14 +33663,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211020, - 653 + 20211030, + 1408 ], "deps": [ "s" ], - "commit": "b76b60564929137d3cb0bf61ae5818381a36f467", - "sha256": "151mih9zp0ndh8jzzz43vqh7zqwdc8c6gn3ni3hb77rgqj11gvg9" + "commit": "2e37cc1d19f0f6f710932610639e4fd206884770", + "sha256": "0j0mqlx5xv1m1ik61q82lj6y030226k7isswd5plbq2v5z1d8b76" } }, { @@ -33724,6 +33842,28 @@ } }, { + "ename": "fb2-reader", + "commit": "5142d1146d359070e56eeaa5a20dabfc46803ec6", + "sha256": "1gznaxn1p7gzg0s161agx0x4p1v6kqql907k2vj6bxv3j4dqi94z", + "fetcher": "github", + "repo": "jumper047/fb2-reader", + "unstable": { + "version": [ + 20211116, + 2053 + ], + "deps": [ + "async", + "dash", + "f", + "s", + "visual-fill-column" + ], + "commit": "b93dfcacbe3ea1147642ee4e1dab2e2c36c4f6a3", + "sha256": "1c5i2w59kgs1pbhyxa0m0bny50kra2xlziydzpvryyddix94k4ld" + } + }, + { "ename": "fcitx", "commit": "e8c40f09d9397b3ca32a7ed37203f490497dc984", "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx", @@ -33892,20 +34032,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20211021, - 1908 + 20211110, + 1728 ], - "commit": "8c0b2904a9d1bb93552eb4dbc83539bd1f0300ae", - "sha256": "1bhypfb21in3zmc8vpiami4lp381lw591dbmaisgml2glvcbsa62" + "commit": "2900e3c2d5554b115a0a3b181e74a27c76489f4d", + "sha256": "14in4r89aqx6gq8qlia2bgprr73ldj7nlyvz61np2zqn7kfw1nfq" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00", - "sha256": "03z3f60qsn6k9wg1km49ad4xlwp82114r5pzibnxly2n0vmmdsyb" + "commit": "815f4c9433fa389bf10ddcf1da6f280e512912ff", + "sha256": "0v9a6psnlbh9cyibp95k2frix29ma6b69cgivmh8z4nrp0ycywc7" } }, { @@ -34042,15 +34182,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211008, - 2353 + 20211115, + 506 ], "deps": [ "dash", "helm" ], - "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", - "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" + "commit": "4f97329cdc628d2b9424114a981d046daab50d61", + "sha256": "06hdllrg2xca7qq6m6f4xnjlb06ljn6lk7zypviy20qv7vmxa87s" } }, { @@ -34355,8 +34495,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20211015, - 937 + 20211107, + 1925 ], "deps": [ "async", @@ -34367,8 +34507,8 @@ "s", "transient" ], - "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", - "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" + "commit": "f1b280cfbcbbb0729a83d763f08e25ccdb4c399d", + "sha256": "0x8aysl2s0ixl72qbz924b59advxp3f6ifmwf41rn11rnqjdmlr0" }, "stable": { "version": [ @@ -35157,14 +35297,14 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20191115, - 659 + 20211101, + 146 ], "deps": [ "cl-lib" ], - "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255", - "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv" + "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", + "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" }, "stable": { "version": [ @@ -35194,8 +35334,8 @@ "cl-lib", "flx" ], - "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255", - "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv" + "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", + "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" }, "stable": { "version": [ @@ -36235,16 +36375,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20210814, - 1627 + 20211027, + 1357 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "509641db723adff48781cfaef391f87e19d043a4", - "sha256": "1gqd21w8n2b4yfdi46qn0q01csglw5gr1f7l8maldxff10l11fyg" + "commit": "cb086c996db0837e774a5dc9edca9592e2e8f9a8", + "sha256": "08njaf2fxfiww5c967qrz18zq3sazdlwdvg66nbxkyzhyhgy6r3b" }, "stable": { "version": [ @@ -36622,8 +36762,8 @@ "flycheck", "keg" ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -36663,14 +36803,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20210715, - 946 + 20211107, + 1001 ], "deps": [ "flycheck" ], - "commit": "4fcf88d131fd0e149a7f1c787c07f4e03ea24fe8", - "sha256": "0p1fmxgbpfh3bihpdaqd2dfsgi3s9x17nhb8439livfrjhqdhfhd" + "commit": "b6d0b1515418e5821241ac04143a12997c3bb240", + "sha256": "1klwi2ssjnjc5cirq201wl643w8cb32r42nmjhvxv4dgad14i659" }, "stable": { "version": [ @@ -37427,8 +37567,8 @@ "flycheck", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -38388,11 +38528,11 @@ "repo": "turbo-cafe/flymake-kondor", "unstable": { "version": [ - 20211023, - 739 + 20211026, + 501 ], - "commit": "470228acfaed703198bbb04198461ef9a44821b0", - "sha256": "0jdff6wmkw3v19nidyiiw87wl90kxg7r7j85bq1cg9l5pppxnhfy" + "commit": "784e57f36812a37e323409b90b935ef3c6920a22", + "sha256": "1vcl1q07faqqmrryyia36hbgf78g3cs51pbi0bx41yzz779ribvk" }, "stable": { "version": [ @@ -38964,8 +39104,8 @@ 20210724, 1042 ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -38992,8 +39132,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39024,8 +39164,8 @@ "flyspell-correct", "helm" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39056,8 +39196,8 @@ "flyspell-correct", "ivy" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39088,8 +39228,8 @@ "flyspell-correct", "popup" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39473,6 +39613,40 @@ } }, { + "ename": "fontsloth", + "commit": "f9c704d7509531a89ace039565152b5336a3f25a", + "sha256": "1kkcx9rycpcknyw1423d6k4dnbcpvkj3adzvgxl6a8h60q3i17v6", + "fetcher": "github", + "repo": "jollm/fontsloth", + "unstable": { + "version": [ + 20211102, + 511 + ], + "deps": [ + "f", + "logito", + "pcache" + ], + "commit": "e43c7ed8302841aefe45f2e6bf35f84d854868f5", + "sha256": "1r3rn65gmnj964wisjagknz46kqhnpma5byw7gyzl69s8gfaifg0" + }, + "stable": { + "version": [ + 0, + 15, + 3 + ], + "deps": [ + "f", + "logito", + "pcache" + ], + "commit": "8ce1802b356962296a492d90cc9ae62e06c7ae43", + "sha256": "106ry9gqp10fpf24zsh9aar3qr3q6lg1l7wj38sfc73saq71mi17" + } + }, + { "ename": "forecast", "commit": "a7ea18a56370348715dec91f75adc162c800dd10", "sha256": "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn", @@ -39561,8 +39735,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211020, - 1748 + 20211111, + 2038 ], "deps": [ "closql", @@ -39575,8 +39749,8 @@ "transient", "yaml" ], - "commit": "72b29bd7bc4172705b55bdd2a5070202ec154069", - "sha256": "054flhapx770f9fg9l0ipbgmdwzxwprkz74v571cn67prrp7j35j" + "commit": "41efa674cff0b447efbc103494fd61ec9b9156ae", + "sha256": "0baaq8bf07aq80ll1q86q9dzzgkpn6j5jl1c1dssc04awg69kjsb" }, "stable": { "version": [ @@ -39776,14 +39950,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211017, - 1118 + 20211105, + 1510 ], "deps": [ "seq" ], - "commit": "984475e2b9432bbba505c567a705804d69936b31", - "sha256": "0q4pgdw8l4iwfakdmmx122gidhgp7q5nfjwcdpjyd3rm3bqmyra7" + "commit": "e3e4509e95019b5a56fb6596cafad0a78ebf2c79", + "sha256": "199carn2y5kxqsmxwrjcgvq4ih5xk74k09akb7milnxhys0zhnlk" }, "stable": { "version": [ @@ -40017,14 +40191,14 @@ "repo": "Fuco1/free-keys", "unstable": { "version": [ - 20160726, - 2050 + 20211116, + 1501 ], "deps": [ "cl-lib" ], - "commit": "edfd69dc369b2647447b7c28c7c1163b1ddf45b4", - "sha256": "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc" + "commit": "7348ce68192871b8a69b687ec124d9f816d493ca", + "sha256": "0f99vykxvvcsdqs03ig5kyd3vdrclk8mcryn7b310ysg840ksrw8" }, "stable": { "version": [ @@ -40326,14 +40500,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20211020, - 1758 + 20211115, + 1418 ], "deps": [ "s" ], - "commit": "3d3b977b0fc36dbde0e2a66adf6f93b829e4fce4", - "sha256": "07nn95a2mv2f8llhq9xaxiy5lr2b6j5mjy5bgq2c7idkhrkdqdnp" + "commit": "0ba09a8124cee35cf81f55b4db9144efeb00a92f", + "sha256": "1y11q6zbmdfwswgy205f0iqsd5c4075zsf135vsnc7bpmmkpgcvw" }, "stable": { "version": [ @@ -40399,8 +40573,8 @@ "deps": [ "cl-lib" ], - "commit": "cefe1975e5e278533e891f846b9e7773965093cc", - "sha256": "0cwchcvbdq4h6z1yll920439a3ii3kn6dz71xd7fk3k991zpncy5" + "commit": "8515fe960b5b0bfce158ad91e9141f07a2c5fcc4", + "sha256": "19ch4ndc0pcw6ggv49wpdkq42pw7m86g973g7qrv4mgf95aprbi0" }, "stable": { "version": [ @@ -41164,25 +41338,25 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20210508, - 1838 + 20211029, + 1512 ], "deps": [ "geiser" ], - "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", - "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" + "commit": "1c5affdf1354220b49ab08b5a7665ebf61080863", + "sha256": "0gndf0w8dbv54bzc04svp2ck8wypa7i3b8kpixf6rkg91l79xpci" }, "stable": { "version": [ 0, - 17 + 18 ], "deps": [ "geiser" ], - "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", - "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" + "commit": "1c5affdf1354220b49ab08b5a7665ebf61080863", + "sha256": "0gndf0w8dbv54bzc04svp2ck8wypa7i3b8kpixf6rkg91l79xpci" } }, { @@ -41333,15 +41507,15 @@ "url": "https://alexschroeder.ch/cgit/gemini-write", "unstable": { "version": [ - 20211009, - 2110 + 20211114, + 1032 ], "deps": [ "elpher", "gemini-mode" ], - "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", - "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + "commit": "2a7d07d0ce4c5b8750f3ff1182ad94ee616734c8", + "sha256": "0jp16la1v4l8mdnxsia9w11a33s5jxs9rdgwp2snxq3h40wyv0is" } }, { @@ -41477,11 +41651,11 @@ "repo": "matsuyoshi30/germanium-el", "unstable": { "version": [ - 20210912, - 1407 + 20211101, + 1453 ], - "commit": "22e7aac319f45b45c884d504f060f27b2dae159f", - "sha256": "010sn05dpscj8nikr8hgvyybqdya6597kvh9a0ck1a4papqncbvm" + "commit": "1f28da73dd767b1cf5afe2230a0fd81bfbb1bb6f", + "sha256": "1v1ig4pf5ydb4b1fnjv9awdr2kfwzv1vbgqgkqhbswasxzzz4vgm" } }, { @@ -41501,8 +41675,8 @@ "magit", "s" ], - "commit": "ba1e4423ed08abc2f427afd60216dc586a931075", - "sha256": "09bfjahnxhbablrjrwkc4mm1sfxxk1nkl4ws2dy8dz55dqhjyiic" + "commit": "3de210e2bcf9a7ce9a2a448cd910ffe477de8432", + "sha256": "1aaaff18crz86f1mpjkwc6vfjdayjnv4imqrl8qnqfccbmkb5z4w" } }, { @@ -41760,15 +41934,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20211001, - 2224 + 20211106, + 2042 ], "deps": [ "let-alist", "treepy" ], - "commit": "192eff9da2c0f61813f3bc9c00913985c1804180", - "sha256": "1bc5z63ylb0ir5v9qngyl50svmlfd6hx9lv1ladwywncdpsslls8" + "commit": "4d6a4b2bc1d88b993c09c1cb47b575a08eb264ea", + "sha256": "1sdwpn917p92bh8cljl70zzxrwdy368p0w1ynsfp4x9xdkgc068f" }, "stable": { "version": [ @@ -42134,8 +42308,8 @@ "transient", "with-editor" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -42763,11 +42937,14 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210825, - 1440 + 20211031, + 120 ], - "commit": "cd1186fb6ca7728c1cf2478ad3878a6401c65246", - "sha256": "0zfnqsw3918rfcfapzgfalrd5w6rhy01ym6ykdswrlv38zd9kjk6" + "deps": [ + "graphql" + ], + "commit": "a40c122e6768578254641fc0f24a8437ee70fac9", + "sha256": "1n7h5sw6b6907w2ry9d1knmda86s8iy9bim75ggyy6qcy06w0jdh" }, "stable": { "version": [ @@ -42845,8 +43022,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211011, - 1933 + 20211029, + 243 ], "deps": [ "a", @@ -42855,8 +43032,8 @@ "ghub", "s" ], - "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", - "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" + "commit": "725fbc7b385228f53a7ddc46a92c1276bab4aea8", + "sha256": "1261p65wlpl9s5xqq1jfnkj7hrn27a4bn85rxc3allqdl5hc63hd" } }, { @@ -44031,8 +44208,8 @@ "cl-lib", "go-mode" ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44124,11 +44301,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20210509, - 2353 + 20211113, + 705 ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44247,8 +44424,8 @@ "deps": [ "go-mode" ], - "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", - "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" + "commit": "5bd8efab64352dccf31dbc99c4fc96d3b985ef27", + "sha256": "0j430sd72pkh00773yqrg1jllli9yccdf645yxrxsf3n3k95s603" }, "stable": { "version": [ @@ -44367,16 +44544,16 @@ 20211025, 443 ], - "commit": "5bc52d326a7168e22a61542f9b48a053d14aca87", - "sha256": "1bvfd07daiqw7sf11bvrx0g19869hd4sgjnifrhvq17xrpwv4cdf" + "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", + "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", - "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" + "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", + "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" } }, { @@ -44450,11 +44627,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20211017, - 1732 + 20211031, + 1513 ], - "commit": "6023ca87b28fa05ebad320c8b9c5887c6dd0f51b", - "sha256": "15bqjmwfdqp2np6fln6xjyw59c5iddvzsyga0lvb8raa753cdh2k" + "commit": "36139cb1898c763be08167c74b5c5d05efada9e5", + "sha256": "06r5zpp4k4flv9slkpgxfy9m9c7b5kyix2si30bdka3fq4c1jwl5" }, "stable": { "version": [ @@ -44595,11 +44772,11 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210820, - 633 + 20211101, + 942 ], - "commit": "bd369750d3aeb7e210c1c033569a53d0fda898c9", - "sha256": "0dkqipsbl7sl6j6asqv7y0md2kxx91n1k4hms7d4jbj4shka7hnz" + "commit": "a7ffd5c0e5935cebd545a0570f64949077f71ee3", + "sha256": "0f1zs3fjz5yc25qjka5g60018554ssdbp4j7xj275pmzrc78915w" }, "stable": { "version": [ @@ -44747,24 +44924,6 @@ } }, { - "ename": "gopher", - "commit": "8c01e1c5009e8a4fefe5169c8e97ead53f8f6621", - "sha256": "01b1mr8nn5yrq65y067slc7mvxigansbim0nha41ckyrkh8mw4fs", - "fetcher": "github", - "repo": "msnyder-info/gopher.el", - "unstable": { - "version": [ - 20190512, - 1351 - ], - "deps": [ - "w3m" - ], - "commit": "6f4accac226698b22e8388e41ad5723b12553dde", - "sha256": "02093q9dwbqjyq47j05cmxmw12690f4qqpwsj7qnqz15m9n4b6xc" - } - }, - { "ename": "gore-mode", "commit": "de09fcf14f778efe4247a93fb887b77050258f39", "sha256": "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3", @@ -44997,8 +45156,8 @@ "magit-popup", "s" ], - "commit": "d99e99542ffe1e054b2da68fac48ee5ce2bd4987", - "sha256": "0p4y8j6x086wr6w13l7z1vbzq5aza2hw2hlazsjs6n4c60p9bnbp" + "commit": "7f4153164fcd6588e2245ca3f5b4aee7737f4367", + "sha256": "1wrmw1y6qp3s36s30v4dncn68mf5biykpwpf5sk3h7sh0ifgk8yv" }, "stable": { "version": [ @@ -45224,16 +45383,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20210219, - 1713 + 20211027, + 1359 ], "deps": [ "request", "s", "websocket" ], - "commit": "e0ae37f23a34ff0b7959963314410f30d75dddb1", - "sha256": "0pjvlamld25rbphpnwjyvfscmk7im6qvj9cgy8gd8d7hlzch49cv" + "commit": "38d5c0384e90d577c4c657110fe4ef2d76b6146a", + "sha256": "0dxds8w213ad4czw5mrrb8a2i41jwsvrphy797lln5j7h404gs07" }, "stable": { "version": [ @@ -45414,8 +45573,8 @@ 20210912, 1544 ], - "commit": "1912bd08f558e4609f4dd30ba91181b6ce7f69d9", - "sha256": "0938cb40i5gs8sqksn2k1zpjm1g9a989dm7fb80dzm71r32y596n" + "commit": "80e9ac8020f7a4a8a963136698eb97a9fca28f7d", + "sha256": "1m4glbijclbhhzq8apvfyslfv1lgn3hy3wcfiynrpkxnxszygnyx" } }, { @@ -45779,20 +45938,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211116, + 850 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "7b63aa731bf7df528bb7d680ca3efe42ab4ead38", + "sha256": "0l60w8r5586af740vkcr11xj8ganws0hgbv4n7rn11mksr5idzwz" }, "stable": { "version": [ 1, - 20, + 21, 0 ], - "commit": "e7f0fca4bfd4815e5ed794f13f89b1e28ce57d26", - "sha256": "15h1h5gg369h2dm9yp97ac6l5qajm7f9c0s2cgpymv21gyx2ikr5" + "commit": "1225a06dcb10c600ab9c44fd3d7df25bcd74d704", + "sha256": "0b5dgy3la3jzfxvj4fsdjphqvymvs6zx8dsibvld5ydkj3cx4pfw" } }, { @@ -46144,11 +46303,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20211023, - 1734 + 20211029, + 2148 ], - "commit": "567539b97d1e8fe4b59e5383d24d48b32de1f927", - "sha256": "0a51mkfavx0cm9v4sdkl53rvxiz3sv00p2v3byinym3ijsccmhj1" + "commit": "397379a3e032f31e98a57f5eb2187a0607c6bd7a", + "sha256": "0qmknrb4h20cp4ldzkiwnvgggr3pg1qjbkql0wz9vg4h90bf3gfh" } }, { @@ -46824,68 +46983,6 @@ } }, { - "ename": "hasky-extensions", - "commit": "e3f73e3df8476fa231d04211866671dd74911603", - "sha256": "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15", - "fetcher": "github", - "repo": "hasky-mode/hasky-extensions", - "unstable": { - "version": [ - 20190204, - 2016 - ], - "deps": [ - "avy-menu" - ], - "commit": "4a0d1d9beb3be8ff4a1857eb920c916734dcc8e1", - "sha256": "1sp07lqvxxcl625qr9ka7idvci3j0p77ll90pwzykr5cs7r3lzl2" - }, - "stable": { - "version": [ - 0, - 2, - 0 - ], - "deps": [ - "avy-menu" - ], - "commit": "65bf7bc3967cbda23789d6c505daf73eed9a43aa", - "sha256": "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7" - } - }, - { - "ename": "hasky-stack", - "commit": "c3faf544872478c3bccf2fe7dc51d406031e4d80", - "sha256": "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8", - "fetcher": "github", - "repo": "hasky-mode/hasky-stack", - "unstable": { - "version": [ - 20190304, - 2248 - ], - "deps": [ - "f", - "magit-popup" - ], - "commit": "9ef133ed831a95a2b9990a46a3c57f1918d0274f", - "sha256": "08h795hplyy7d0yqxvdfx3ylb7gkjplyriyq0w9dsv6ggvmc5hhl" - }, - "stable": { - "version": [ - 0, - 9, - 0 - ], - "deps": [ - "f", - "magit-popup" - ], - "commit": "a3176aece9a9ab0a36ae795965f83f4c1fa243bf", - "sha256": "1j9cvy95wnmssg68y7hcjr0fh117ix1ypa0k7rxqn84na7hyhdpl" - } - }, - { "ename": "hass", "commit": "d9f55bfa87d6fbaeafe713f8862369ea013a0c67", "sha256": "1jmxngfjad8vqd6abgqhf2a8x3vysxfhwk4qs0c327qfazmd7vq3", @@ -47103,30 +47200,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211023, - 428 + 20211116, + 1616 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "a030335d3f5d108ef2c79e9bf0a4d2437c9cd026", - "sha256": "02ikh0mrrym5yzg6y76mjik00makprh9n09bhcs27xhsb8izmk2y" + "commit": "ab2592262f4f62498f3261993eb249bb4c60c8ba", + "sha256": "0d5accmbidapgxj9fbrn5cdcfy3i0993sxrafnj2x8cb8px1lrg4" }, "stable": { "version": [ 3, 8, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", - "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" + "commit": "52dcf9e27c1a10be058efa0cf790510bbfeb89e7", + "sha256": "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k" } }, { @@ -48011,26 +48108,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211017, - 530 + 20211114, + 1507 ], "deps": [ "async" ], - "commit": "a030335d3f5d108ef2c79e9bf0a4d2437c9cd026", - "sha256": "02ikh0mrrym5yzg6y76mjik00makprh9n09bhcs27xhsb8izmk2y" + "commit": "ab2592262f4f62498f3261993eb249bb4c60c8ba", + "sha256": "0d5accmbidapgxj9fbrn5cdcfy3i0993sxrafnj2x8cb8px1lrg4" }, "stable": { "version": [ 3, 8, - 0 + 1 ], "deps": [ "async" ], - "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", - "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" + "commit": "52dcf9e27c1a10be058efa0cf790510bbfeb89e7", + "sha256": "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k" } }, { @@ -50398,15 +50495,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20210412, - 1147 + 20211103, + 236 ], "deps": [ "helm", "posframe" ], - "commit": "2412e5b3c584c7683982a7e9cfa10a67427f2567", - "sha256": "0k4lmgvrxm4lswafc3fb8aab3ax0gnkkq64vg3vmiry85kih2cqb" + "commit": "87461b52b6f3f378c63642a33f584d4a4ba28351", + "sha256": "1hmf1l6hmir0kvpl5h0wk4l17nmk0lfi659lvg89jc1sm18v2xv9" } }, { @@ -50877,8 +50974,8 @@ "helm", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -52104,11 +52201,11 @@ "repo": "hlissner/emacs-hide-mode-line", "unstable": { "version": [ - 20190922, - 115 + 20211112, + 1400 ], - "commit": "88888825b5b27b300683e662fa3be88d954b1cea", - "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp" + "commit": "bc5d293576c5e08c29e694078b96a5ed85631942", + "sha256": "12mfhg0r3gvy59ijy44vsircn251nmisp04k9vvgd2yhykpsr1j6" }, "stable": { "version": [ @@ -52775,11 +52872,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20211007, - 309 + 20211029, + 602 ], - "commit": "2c6a47cc37b0dfcd8489e4fe36c379f0a47d451d", - "sha256": "15jxlzbxkpyfd6mr7jhs6vfxizdwsr5bi2g6xplndndmwdqq8x49" + "commit": "0593a1a77db28503025d5c1850e6a99551c3bcbd", + "sha256": "1rkxm6ak1zaqzp6q6mqpng0k4qjnsshkwydfxfm63xfsgr4vwhwv" } }, { @@ -52826,11 +52923,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20211006, - 1402 + 20211025, + 2138 ], - "commit": "e8be12a44ee659d73cf934530adc58ab9a48e9dd", - "sha256": "10bs34jjnza2lf8q32dki54wpyyy815k5a35n2r76xnimayrcy5p" + "commit": "121f24c12c6711f65157259d90cbe88a53c10336", + "sha256": "0mwhqhf84kf76wrqz6l9rp4majfl7dnxs1dg49qls32lv44ihs2x" } }, { @@ -53944,14 +54041,14 @@ "repo": "zzkt/i-ching", "unstable": { "version": [ - 20210222, - 1519 + 20211112, + 1528 ], "deps": [ "request" ], - "commit": "51a3180ed07ae9f8b7ff3f2b822d998495864a07", - "sha256": "1rrykszzcyvrmks2clrpdq5kdldcqp38wc908bhq2b4qw7w3d7sw" + "commit": "39fd7daf1efd761336616c870cc5b8871422d95e", + "sha256": "18b9n5w36zdsaxc63nhsry2i1s28a4y21sc6cj7rawvd8zyxargv" } }, { @@ -54788,15 +54885,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20210728, - 846 + 20211103, + 1521 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "3cc9361b4c0ca88fd3ba218633ea1edeae18d6fe", - "sha256": "04zj69lwjcwz0dmmwz84lfr3w0cdca94pv69ldvik4qh685cd0n9" + "commit": "2e4b5c6a979b04d9383c44423388f6cb0988f14f", + "sha256": "0bl6wz05m325h2y4in7fv280p73a2iv2k52jg7qp26aggmpfrjxa" }, "stable": { "version": [ @@ -54834,11 +54931,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210812, - 735 + 20211116, + 11 ], - "commit": "2f504c966e7f640dcd6ecbf40a6a1a05ea286de0", - "sha256": "08lgv18584ksgkz0r39vc6xfjid93v0z3wbds38iynaayimr3p68" + "commit": "012de2e8d8519e850a790f8a2c71a5b08358c29c", + "sha256": "00b1hmr8p6fwydppql75cqkcqbnc89271b7h1kydgnwm7pcg177w" }, "stable": { "version": [ @@ -55655,14 +55752,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210811, - 645 + 20211027, + 1611 ], "deps": [ "clojure-mode" ], - "commit": "38e7dc1829646b93473c31d704bda0dee6644a38", - "sha256": "1g2dacwf8dnm289y7cpy3vpdyp6qndwg52nvgdxzsbg9xx7wdz72" + "commit": "765653dc23dc2a2c1520a1e24332ab9d4b49dd47", + "sha256": "1hbylg5nsix65a85bibwgzcyjkf19rjvdkg04p9hnvsgh59x2d5l" }, "stable": { "version": [ @@ -56106,11 +56203,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20211007, - 357 + 20211101, + 558 ], - "commit": "d82680ab7a7531a1c9369e65f2714285e43c6688", - "sha256": "0n1vh8rpn9zkwpnwm03rmz6xmcqicj9wzc0q6jbfg1ndc6yz29rw" + "commit": "1ca71416869e7515a9c2587b35f21a11921686f3", + "sha256": "0pl2hpcy9165np17gwa9qhqxb43kwm0z746pxcga7rfg6apy6krc" } }, { @@ -57386,8 +57483,8 @@ "migemo", "nadvice" ], - "commit": "a2ce15abe6a30fae63ed457ab25a80455704f28e", - "sha256": "18j3h2ndrw92gpbd9q5ji6q8qrwqmzw2xw8yds8f0fd8aybkw8zz" + "commit": "b91f341d1b70175baf989f0c6eee6573bf781a27", + "sha256": "0svvh14zhym9ssc0dc7wyr1pw0rhiirn2s7a0xk43wl2r0c36cgj" }, "stable": { "version": [ @@ -57503,15 +57600,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210922, - 24 + 20211103, + 233 ], "deps": [ "ivy", "posframe" ], - "commit": "b4a522b7f81d49e7664f90a4f9ff1c2def08a3a9", - "sha256": "05rd1kylq0114mnw0rfj2k15pir9shgy19n1ih86i85h718z2z80" + "commit": "5d9420252ca855d6d206f1f8ef5993a6be3c618f", + "sha256": "1yan9h12208dalzgpffqxnzv8b0hwzhzna01gnzb9wmkcfi3fpmh" }, "stable": { "version": [ @@ -57542,8 +57639,8 @@ "ivy", "prescient" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -57634,8 +57731,8 @@ "ivy", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -57701,8 +57798,8 @@ "espotify", "ivy" ], - "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", - "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" + "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", + "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" } }, { @@ -58683,11 +58780,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210512, - 2301 + 20211027, + 1852 ], - "commit": "c5cc024a06684b91da9bb05fecf681426596af5e", - "sha256": "1qkkqqq4r5j10s4q17r2r4ryim0gpknr5h512jj9yk52a77q1g7d" + "commit": "647cae28087529d18367f895d7ef689c7f64c6bd", + "sha256": "086h53mmdjx30093zazwylx3fg7jvbcjy63q4ph63ybizsbiy5lg" } }, { @@ -59053,14 +59150,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210906, - 2337 + 20211105, + 1214 ], "deps": [ "cl-lib" ], - "commit": "e6a9059fc823a17496e1a5114652d92a9071a78f", - "sha256": "16i0i0dz6yk24ny66irlfh9xjllp7a78ccx95mrlpqcxsjkcqv62" + "commit": "d2636f95ebe4d423dc9b4311aff248c7688271c5", + "sha256": "1p293jhzsqzn4kljz1nl87jg1aq35jzqzs31ryfi8dn8iicwyd85" }, "stable": { "version": [ @@ -59268,6 +59365,36 @@ } }, { + "ename": "json-par", + "commit": "db033df8bb4e12f8ba39accc42f285d8037268c5", + "sha256": "1d4jl6pllvsa5b132c9ygr5x5c7n49gz15w70fgdbkzm1gh17n7r", + "fetcher": "github", + "repo": "taku0/json-par", + "unstable": { + "version": [ + 20211106, + 535 + ], + "deps": [ + "json-mode" + ], + "commit": "45902f2f36d4a90662caaaca6612b762ccb5b34e", + "sha256": "1p46pylidl035bhxv73867iw206ddriziplcv347rqj39drknlix" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "deps": [ + "json-mode" + ], + "commit": "85a5288bea5c579b2bfdd7be16bdfc18a58b3a26", + "sha256": "0fbrgxd2n45smq7im6qas6nnzrxv3397rxp1snx7pk58vz4v980h" + } + }, + { "ename": "json-process-client", "commit": "a681f977631344190e2a35d9ac2cbb9a42402272", "sha256": "0nf0lna15ymcn8wniz24ixxwr1qaznic9nym1q16ifwl72qryj79", @@ -59572,8 +59699,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210818, - 310 + 20211110, + 1407 ], "deps": [ "dash", @@ -59582,8 +59709,8 @@ "spinner", "vterm" ], - "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", - "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" + "commit": "55458e9c8fbeebb33ffeb291d40c529f2b006c8d", + "sha256": "0b9khsza4zfxdi03i5gx6s1g0f27qg71vmj4f4gcqkgdhfxxy4yb" }, "stable": { "version": [ @@ -59763,8 +59890,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20210422, - 1451 + 20211116, + 150 ], "deps": [ "cl-lib", @@ -59772,8 +59899,8 @@ "websocket", "zmq" ], - "commit": "1f0612eb936d36abab0f27b09cca691e81fc6e74", - "sha256": "1mpch20iahijlgwg8bjpjg7bm9hd2wyskqbknafw8jkwyj7dvng2" + "commit": "f178c1c7b8d9a0c0b77e38dc03524db3d2c8288a", + "sha256": "1vmg6bq8w9aw5r9plnvslvhq1ykj5m5srz67qn9jbn54lx7qq08p" }, "stable": { "version": [ @@ -60305,20 +60432,20 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20210110, - 630 + 20211030, + 948 ], - "commit": "515343a7667b2bf4253309449f65a6eb94933df7", - "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" + "commit": "be190a86fd82337fe5280c1833f92d1f9997bced", + "sha256": "1z252qqv55yzjz5w2cq1vpcwdnzwkm1hldc9a5i9qv1dkp73nkkd" }, "stable": { "version": [ 0, 0, - 4 + 5 ], - "commit": "cd07542fddf080927eae927afdcf62be1b087503", - "sha256": "1syz5yds6b59dws6f8b6az2ng7czwnq34izlc9y25c8ng94bynm5" + "commit": "f432bb60f9f3bd027025140d723906dcabeefaef", + "sha256": "0wrzbcd070l8yjqxg7mmglc3kfgy420y3wnykky198y83xsv3qy2" } }, { @@ -60329,11 +60456,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211023, - 1823 + 20211105, + 316 ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -60347,8 +60474,8 @@ 20200601, 333 ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", + "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" } }, { @@ -60615,14 +60742,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20210125, - 823 + 20211027, + 1933 ], "deps": [ "cl-lib" ], - "commit": "0b282e19ac3d23b9a74f656b137b9eebeb2aaa39", - "sha256": "0ni03xnakai9ncq07gwzqy4walgijd04bnxslk3b4xnnk60i8m2h" + "commit": "20e5ab2a8bfdf9b44c813c6abd96b478f822ddef", + "sha256": "1acflsq0yh3sj607g2yasdbwacyzdh27hmgplybxc3zg464gldj1" }, "stable": { "version": [ @@ -60807,20 +60934,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20211003, - 1150 + 20211114, + 1233 ], - "commit": "c6f2adfd7211c747d443bf85618833820078ca4b", - "sha256": "0f76a9zr76azhb8rkzs24afscnx0sdypmha1z03cidn4mcz00sdb" + "commit": "313f74b17580c2a55f5c068e1bda17821b50c31e", + "sha256": "0m4448qvlh06n26l8l8hax4ir08mbai17mdi6inzvch7b09p0gpl" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "c6f2adfd7211c747d443bf85618833820078ca4b", - "sha256": "0f76a9zr76azhb8rkzs24afscnx0sdypmha1z03cidn4mcz00sdb" + "commit": "313f74b17580c2a55f5c068e1bda17821b50c31e", + "sha256": "0m4448qvlh06n26l8l8hax4ir08mbai17mdi6inzvch7b09p0gpl" } }, { @@ -61009,8 +61136,8 @@ 20210318, 2106 ], - "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", - "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" + "commit": "74057b9fcf7cbe3ec2f17c86e7a3da93b40e372b", + "sha256": "18n1xpcs8z7pmc2k35c343qsjai0rgyc1jgsc35j9z2xqzq6mpji" }, "stable": { "version": [ @@ -61375,8 +61502,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210914, - 1158 + 20211114, + 420 ], "deps": [ "dash", @@ -61385,8 +61512,8 @@ "transient", "with-editor" ], - "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", - "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" + "commit": "4b740d88c6dcb091d701f74ddcf53e3732999ac9", + "sha256": "1l5rbgagdi6gfp8prj01pcgh4k3k90aijrrq5b8nkqppxiq85kh7" }, "stable": { "version": [ @@ -61420,8 +61547,8 @@ "evil", "kubernetes" ], - "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", - "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" + "commit": "4b740d88c6dcb091d701f74ddcf53e3732999ac9", + "sha256": "1l5rbgagdi6gfp8prj01pcgh4k3k90aijrrq5b8nkqppxiq85kh7" }, "stable": { "version": [ @@ -61571,16 +61698,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210826, - 1017 + 20211103, + 1633 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "a992e92bf80f5d9e401f916a9e74acce05af4a8e", - "sha256": "0di6p1wapm714vd8d85d1wwzlh68ikfjw3qpjninbmjrzw2bwqp4" + "commit": "397bde14a67e91cb95ca6b2d5a5d5025cae243c3", + "sha256": "1kjda08zpzwvmk17f4654zvxildg1dyfxm10n6py0mfc0ldp8rf3" }, "stable": { "version": [ @@ -61696,16 +61823,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20211008, - 1231 + 20211116, + 1414 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", - "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" + "commit": "dcb95cd0605cad14fe491903b40a13fad61e382d", + "sha256": "0lw9rydgfr6rf5579ac1jvz0449m52swhp0ad16wlxlrfi0k4iiw" } }, { @@ -62212,11 +62339,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210611, - 1550 + 20211115, + 1551 ], - "commit": "0ccc52bb85592d09499a09768a61ecfeccbfdf1e", - "sha256": "0nwma6cvvlfyjxkrzi724brkx5s6k64n994nbwp7zaz6rqs1xmfd" + "commit": "7d8f768db5077bdb9f595cbf841018fc600ecf77", + "sha256": "15f0q4dlybqb3k17sgaj9vp42mgvrh72mqzs5sh49lxi000bdhkh" }, "stable": { "version": [ @@ -62336,14 +62463,14 @@ "repo": "conao3/leaf-tree.el", "unstable": { "version": [ - 20210503, - 531 + 20211105, + 19 ], "deps": [ "imenu-list" ], - "commit": "8126baf45c881fd4a692c2d74f9cc2eb15170401", - "sha256": "1vb5id0y9002yabkxijfi0l8vbibbd863kq4qk3gqax9dgbld481" + "commit": "89c3b8842df067bba67663d309f43aa311acdccd", + "sha256": "0him39wsl65nmml9as8gfrix707xjxwvjkwmrgxc9qfjwcxvbvsj" }, "stable": { "version": [ @@ -62766,8 +62893,8 @@ 20210729, 1808 ], - "commit": "25c8d839cf78332c15b5762024ccb5f7c90b7a11", - "sha256": "14x4a6dw9ywzl16f4blg7bmb0rvvik5jjldilshjdxf4zpvy80fd" + "commit": "a49235c918d626f5053344604cb1c464960762af", + "sha256": "1b4k80bm2p7sqh33dx72qag7056nlxqv9s8czql2qfvi8vlnwzz0" } }, { @@ -62800,8 +62927,8 @@ 20210603, 1241 ], - "commit": "f39ec6a9b93f09e1a49ee84405d1e03e04adc7cf", - "sha256": "0ri06q30z699amw7a94a14ccf83zx547przviqw0wla3l2xaw26j" + "commit": "3d2483d6a46552eaa832f8e6df5dc1162e58fc79", + "sha256": "1vpif0g45xh16sqqsjh9hin61kzc2la79pmrxl3rmw2jvpg6pzym" }, "stable": { "version": [ @@ -63063,20 +63190,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20211011, - 954 + 20211116, + 1344 ], - "commit": "1f5f7e81f37d14c18b303d6d2b5cc489761298e7", - "sha256": "0db5ssmwx9rni11hmm4bv2ykvfk6vc25lkd0wbhl6ixxf51iijzq" + "commit": "f5d298df9bb9acf9a1fc734c75a8f033f3eae3e5", + "sha256": "1lg6r78f7c4d4dzkpv3260p9j32f7rc51v4c5bajkblq379yn98r" }, "stable": { "version": [ 0, - 27, + 29, 0 ], - "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", - "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" + "commit": "e1bcb971b9f964bc927c9d12fcf377a1878c459f", + "sha256": "1lg6r78f7c4d4dzkpv3260p9j32f7rc51v4c5bajkblq379yn98r" } }, { @@ -63087,16 +63214,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20211021, - 1653 + 20211116, + 614 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "efc88f21cd206b7ded3d10a0159a5a4196db86ae", - "sha256": "1nbp91vwh5pd3dk35h6j2mhknnpkz899lczab5zxqkzl52rcg7qz" + "commit": "41783a2ecd76c2d02ad87295bb8719eda1ee4ed3", + "sha256": "1v8x2kf0w5vwl4myiwraq5b1nyfx0b0fgwpzvb9bnjjdj2nsk36p" }, "stable": { "version": [ @@ -63613,20 +63740,20 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20211023, - 1842 + 20211106, + 2151 ], - "commit": "cdc4ee6df5033824582648974d20ac442f2d61da", - "sha256": "0ip3fbd2byjhhwlyapqm96w6q2275k6vpfxl0nlms9v2f4mfnvg2" + "commit": "5ae4f8bcfad02eee81a18c15c921637bb4269c13", + "sha256": "04lxz74v8axkn0ahgaan0bxkxyxcfp7ny2kxx9sxm0yg77c26gzl" }, "stable": { "version": [ 0, 9, - 1 + 3 ], - "commit": "4c442c18ed5e4865393e72ffff16de9919b54456", - "sha256": "07h55vsfmpf4r1dggjn4a0xxpxahbj1amyfywbf21wx59p17aja8" + "commit": "f9271f641f82cca9cdf8dd5737dc6dcf77aa5a1d", + "sha256": "1mmph8q1ff3bvsfggff74k7zadn020imyj63p1g1swp5a3bs6yyq" } }, { @@ -63757,14 +63884,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20210528, - 815 + 20211101, + 948 ], "deps": [ "s" ], - "commit": "18d523d5b6a8cecc3e93c550d2ceab2d1035de02", - "sha256": "1d8dlb2xsqk88lac7f9n0y8ridkn6gfl5pb6sr2n66v9mq75j6rq" + "commit": "ba7d22140a165b0fdd900a8d04916115ca6ab8ff", + "sha256": "1bdybw44pmhfpikdv1kg2sx88546xyncks5a4b2s0ak4p66r82k3" } }, { @@ -63901,20 +64028,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20211023, - 2036 + 20211112, + 1745 ], - "commit": "3191fbb9954815bdef0af5a3d469b4f820d5a233", - "sha256": "01mg0ahqxgj1igxv2x4z8ind4k7jv0b4yg2i90nsgzgrkg2kd2f8" + "commit": "61e043c705dc8804ee7c6f78ed3f374b325d5917", + "sha256": "0hj36x4aall7phvd9mi58scmzr42xc0zzs8jh16nq3i2xd8p0rqd" }, "stable": { "version": [ 4, - 4, + 5, 0 ], - "commit": "26d51013e75ddedd5eb8600a0a3dd035319f9d3f", - "sha256": "10p4ijx4l56ikb10416bmdwfxbcyqfa29kk1nf48gibxyvdlwdby" + "commit": "660dd193cdb51979145a548f495ab02917bc4613", + "sha256": "10qcggakqv4fm96mjz72x7rrvgphizdnd4n03gm3hhvc2yw3qma9" } }, { @@ -64535,15 +64662,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20211021, - 57 + 20211101, + 2351 ], "deps": [ "map", "seq" ], - "commit": "49efa7e59deaa2a0385e420b18df905a2328f9c4", - "sha256": "02qd7cg1g3812vflrxsrg9hd7yh60cyknn16l6cffn0iax2v2mdn" + "commit": "d95cf6dea7addd020d1ccacc25527f181b3eaa63", + "sha256": "1jxmnfyxak6c11glsx0j912bhv4y4ly0zbyjl37dfn78vb3yr7y5" }, "stable": { "version": [ @@ -64574,8 +64701,8 @@ "dash", "loopy" ], - "commit": "49efa7e59deaa2a0385e420b18df905a2328f9c4", - "sha256": "02qd7cg1g3812vflrxsrg9hd7yh60cyknn16l6cffn0iax2v2mdn" + "commit": "d95cf6dea7addd020d1ccacc25527f181b3eaa63", + "sha256": "1jxmnfyxak6c11glsx0j912bhv4y4ly0zbyjl37dfn78vb3yr7y5" }, "stable": { "version": [ @@ -64655,8 +64782,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20211009, - 2036 + 20211113, + 1440 ], "deps": [ "dap-mode", @@ -64666,8 +64793,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", - "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" + "commit": "9c3ba0a27e8ad3b7fa16c553d8a1815db82b8638", + "sha256": "13f6a9fkhasdzh4y5rix8j151csj1x6y2qlld6lvbxgpln19zwz2" }, "stable": { "version": [ @@ -64854,8 +64981,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20211017, - 1826 + 20211114, + 1305 ], "deps": [ "dap-mode", @@ -64867,8 +64994,8 @@ "request", "treemacs" ], - "commit": "2b789750b272c85e838b9fc4e3d4f1d2eff34b5b", - "sha256": "1sqv15mbv9f6pw995jrmw3wqr16pkrkm83vgabc0wi7j3dkz1cx7" + "commit": "3246272b43659ce3020e6f47cd3eea17432b389a", + "sha256": "0kz2bhnijar7dkyqydfq66xp8isf90paaqy0kwzjrb9ss0bglsba" }, "stable": { "version": [ @@ -65043,8 +65170,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210914, - 1821 + 20211112, + 1442 ], "deps": [ "dap-mode", @@ -65056,8 +65183,8 @@ "scala-mode", "treemacs" ], - "commit": "695291761b2a3db734c3f53bb7fc4acfe0a5eb94", - "sha256": "0kg51yjrjrmsz78aj3ahbk2knrn8ccz4ccs894p8li6vz3gxm2fh" + "commit": "38dda2c22db66547d99e3cfa6b7e76c42e7c6b5a", + "sha256": "0p2pz6272h2rbb1si9psb4rh92mahlcr58slkm2mwqjwwbi5hfjl" }, "stable": { "version": [ @@ -65087,8 +65214,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211023, - 2009 + 20211115, + 807 ], "deps": [ "dash", @@ -65098,8 +65225,8 @@ "markdown-mode", "spinner" ], - "commit": "6157b3dde2c56f734a0789225240c521acdf2c7c", - "sha256": "0p4lab475h0s4269zyg0ggnvx3mgqw6xix05a5nyf3jc441cfdjq" + "commit": "a7effcc79114e91e74f06ef3a7e078bafba05c2a", + "sha256": "09kjprvbdcv6h27fi24bfg0yl37djmfkic3a3ymfzl2r52gfkchv" }, "stable": { "version": [ @@ -65246,16 +65373,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20210513, - 1022 + 20211103, + 619 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "72fd57643d2e8eccb9a55058ec0c89bdc04dba7d", - "sha256": "1p90d85bm51fjxy4q3fxjc4xj2vzabyi9db1bjl2j0q9pr2yphsz" + "commit": "d428dbcf1802fbe147271c8dc74b073bd9cd7403", + "sha256": "0y31dajhd6jfla4h137k78clvwsfj1pdmgd61ni83yl6ackpvm8c" } }, { @@ -65367,14 +65494,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20211003, - 305 + 20211117, + 321 ], "deps": [ "lsp-mode" ], - "commit": "8b45d5ab6ad41f881ef52983d6906193736e6f41", - "sha256": "07ggss18zvmxv7r2x3m5x07c994sjwq0bfjjq50j7kfnd53bmb4h" + "commit": "bee8bf1f6707362ace02563b4dfc481e7452f936", + "sha256": "0rvwp8859p0byypy83mw42akjvv54ifx0gd3f4vb9vvp879rmsfi" }, "stable": { "version": [ @@ -65433,16 +65560,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211009, - 1545 + 20211101, + 131 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", - "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" + "commit": "dd4c181a22d19a28236c442cf6c9cd4bbd6d85f8", + "sha256": "1awvnv29ca3whfg48icwqhgdfijrags61cmq9dn6mn0w849b6k4m" }, "stable": { "version": [ @@ -65953,8 +66080,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20211019, - 1404 + 20211115, + 1701 ], "deps": [ "dash", @@ -65963,8 +66090,8 @@ "transient", "with-editor" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -66036,6 +66163,24 @@ } }, { + "ename": "magit-commit-mark", + "commit": "2d6e8cd768a8d119f1ac3407f9d5793b084e8f1d", + "sha256": "0dvw9plzhm3yql719xi2n4j1v9q31g67jnwx5n5pzjk90v2rzqxm", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-magit-commit-mark", + "unstable": { + "version": [ + 20211101, + 948 + ], + "deps": [ + "magit" + ], + "commit": "3debd2bdf20b78e108d309be606db01bb2cb4810", + "sha256": "0pmggb980an5nxjq5jkxfvib9akqyd4k9j80ljpbayhiypda93a2" + } + }, + { "ename": "magit-delta", "commit": "6e045d09ceec253bbd033b561ab077d897e9b6b2", "sha256": "0r7g8p7g348cfz31q0mgxxa591n8clwpaack487ycc1nzsqbj726", @@ -66311,8 +66456,8 @@ "libgit", "magit" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -66479,8 +66624,8 @@ "deps": [ "dash" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "9413847c1a085899d8de6f8d978bd7265f65e5d8", + "sha256": "0b39813iyxgq0ai6hz4hpf9f4wix1lhcp6z5p1cm6y6hd8dyg486" }, "stable": { "version": [ @@ -67275,11 +67420,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211016, - 117 + 20211114, + 1401 ], - "commit": "86ac625169041cdc706c5e39cae0bf314c042473", - "sha256": "1i38nxhqp9j3hrc0a23gjqds2v04vswzysw378linb7fyhylz7vv" + "commit": "8b24ffc91222f8a61f8f2aa3c3662198c7d74de9", + "sha256": "0kpa0h53jk01x786s8lw7ibcrb78h9ndah9i7lvr6jx0r6v30vkq" }, "stable": { "version": [ @@ -67910,20 +68055,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20211013, - 611 + 20211029, + 2220 ], - "commit": "f6b608db585231eee231d5473edcf4183bb678fe", - "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" + "commit": "670d31edc0938c49c77d80543c6b2a955edadf85", + "sha256": "0sdiwgkhqnxq3pva9cyvcjyc69qvpxc91785p1z3rgvb9z3bshjj" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "f6b608db585231eee231d5473edcf4183bb678fe", - "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" + "commit": "670d31edc0938c49c77d80543c6b2a955edadf85", + "sha256": "0sdiwgkhqnxq3pva9cyvcjyc69qvpxc91785p1z3rgvb9z3bshjj" } }, { @@ -68311,16 +68456,16 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20211024, - 1408 + 20211116, + 1952 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "26c4aa2797b4ce1b24aa83e06d0b82d94e4cea15", - "sha256": "0m7xpg719n6zsbh82k1i7f2p9nd54avxywrypla3wk3kvjfdc1z3" + "commit": "f1c81c35141e6c669a36b5ebcc04ead8cf7d7364", + "sha256": "1353qfvind0xwdl7ig2hb36236bdfv242kij5lwy7z6kqg1d6z0s" } }, { @@ -68334,8 +68479,8 @@ 20210720, 950 ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68364,8 +68509,8 @@ "auto-complete", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68398,8 +68543,8 @@ "company", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68461,8 +68606,8 @@ "iedit", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "a5c440c12758a7dd7d698b843e05aa4eb6d4e721", + "sha256": "1czqd9g6f346a96klrsb31xscy23r2ix6xfx9ks6h0fkxyw7prqa" }, "stable": { "version": [ @@ -68714,14 +68859,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20210207, - 1100 + 20211026, + 1347 ], "deps": [ "seq" ], - "commit": "e0ddd7a17da899fa85b1d49f1260042f8caa0612", - "sha256": "0k9lk2z8rnc2pa4wb2afj9byfryqlnw5hg1vs3bx6f0hs8rwa8yh" + "commit": "115f6de4a01b9e10936b7e6d1fdadd3770bae391", + "sha256": "11jdk260j9axi4f852vzgzqfb0kpl3hry02wfbhba3qp5bff2j7m" } }, { @@ -68819,8 +68964,8 @@ 20210131, 2152 ], - "commit": "b46db59948c9e0d47b613931fd62fac0c4a75388", - "sha256": "1jgxp9zcnjnyk4wg4h50glmf18x5hwy8p97d530rycbvv4kpxnh3" + "commit": "0652273fe1bfbeb165715613e00583b96ed07c2d", + "sha256": "1qr1zg0ppl6xlg91a21j4dlbysglwyjs8x139b2gyf95xlfkxpkw" }, "stable": { "version": [ @@ -68846,8 +68991,8 @@ "deps": [ "calfw" ], - "commit": "1cd9cbc7f8cfe40833d1af726644ae45a3d07dc0", - "sha256": "1cm7y1nfbl8625rpk5i9zcmp9p6rzqdzxy9wcjs8yrdfsc0biq3q" + "commit": "67f9596dcd43b7ece3ab6e7a6ce8dc18a4851fe8", + "sha256": "01is2x9yfijxz0w7h7nrygkk0dkxnz0a3p3w38kvariqis8vbhl0" }, "stable": { "version": [ @@ -69222,20 +69367,20 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20211022, - 2311 + 20211110, + 142 ], - "commit": "3cc45f82cb50a4c895fe5df2ed69e07481ea131b", - "sha256": "0pl0lyzwb2ngqbh6kkx4kr6im19kqmnkpybss353947vl2njlbd6" + "commit": "fca3ba548dccc6e553affca8068c9aecb6a9a789", + "sha256": "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "1be68e8571336672d6cbec86246d1bf7844976be", - "sha256": "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8" + "commit": "fca3ba548dccc6e553affca8068c9aecb6a9a789", + "sha256": "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw" } }, { @@ -69336,11 +69481,11 @@ "repo": "hlissner/emacs-mips-mode", "unstable": { "version": [ - 20180502, - 1457 + 20211114, + 1645 ], - "commit": "75152fc78baa762af4f83602f6cb3c8b9bcebca3", - "sha256": "1bk1jfqwwrq3jr6zasyjaz16rjjqbihrn7kakgfk3szv6grvsd7p" + "commit": "5676174bea9a5780ddd33d2d8111b8678dfa4e99", + "sha256": "0nlxhchcy3swmyfzdd8qmdzq05a4lzlgs1psnsvfjbbi9w8g8w5v" }, "stable": { "version": [ @@ -69825,15 +69970,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20211015, - 335 + 20211101, + 1001 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", - "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" + "commit": "8ebebe77304aa8170f7af809e7564c79d3bd45da", + "sha256": "00ixkd1586xv7707a1gpshml221wmnv92d3dyk1fzzxvws39zvdg" } }, { @@ -69883,11 +70028,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211023, - 1952 + 20211114, + 1209 ], - "commit": "45b92cf80505db759b38316ea32a877517c78b21", - "sha256": "13kvsvsc19asmp31ncfj53jdm7kfamdawrqxar9ndzx4a65i60wp" + "commit": "a70c6d0f752859c6de2c175dd9b71a66bf28ed97", + "sha256": "05l919641qn2dm6b328i6ymb2xgc42jbvpdvnwypi9brydnz7zm9" }, "stable": { "version": [ @@ -70143,11 +70288,11 @@ "repo": "caffo/monotropic-theme", "unstable": { "version": [ - 20181015, - 1230 + 20211116, + 1328 ], - "commit": "36df566aa8225e303f6c9d90c00740dd678a415e", - "sha256": "05n8s3719f6yrh4fi5xyzzlhpsgpbc60mmfmzycxlb4sinq9bfks" + "commit": "f32a04b5bfee9cbcce4b223f17228d1142a28211", + "sha256": "0kfgj6h3jvivbssh27fi4nyqfqrbj6das79i6syywwqf200h29rl" } }, { @@ -70230,11 +70375,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20211024, - 2312 + 20211031, + 1815 ], - "commit": "78dd308a079115267e9e31f3d5e774d1f3d6399f", - "sha256": "1y9vrwhzwmb5apgdx3qfqwxgf3wza51cxpjkf1f9m4x5pwmrlzpw" + "commit": "5ce7cc070ff5a295b1cc4b15b94698447f9596ae", + "sha256": "0yrxdxd3iv6vmym8fwp1d1r3bliid5my3a9720pdbhd887i6m4bx" }, "stable": { "version": [ @@ -70518,8 +70663,8 @@ 20210306, 1053 ], - "commit": "d0d8a87c1ef19b7bd1d2c040e4ef38951b07fbd0", - "sha256": "0xzjfrn0m8mc6k8vrggrf50x0ssbb9yq9c5qnval8gk8v78rpyl5" + "commit": "3dc692847d53e209ef9010791c3ab5ac06fd979b", + "sha256": "0pcf2vnq38jdnsg8vz92pqsx7qd0r9x8jv5kfqk9br153vsh6xgd" }, "stable": { "version": [ @@ -70992,14 +71137,14 @@ "repo": "wavexx/mu4e-jump-to-list.el", "unstable": { "version": [ - 20200913, - 1558 + 20211030, + 2307 ], "deps": [ "cl-lib" ], - "commit": "a9a3a1d371451d12e0ec24e456c7d90ccacd9cdd", - "sha256": "0yq7ky2yk2j6i2p5bzh06ipbj2ab70bi6hvq7hf4jqvr2i94mlwb" + "commit": "4d362a668be4ae624ee96bf7806b25505b4bdf5c", + "sha256": "0jqnmzaa2vf4gxy9yzrvhijm3s4zaip4qxgxjlb240fr9ray6rgf" } }, { @@ -71078,11 +71223,11 @@ "repo": "wavexx/mu4e-query-fragments.el", "unstable": { "version": [ - 20200913, - 1558 + 20211030, + 2307 ], - "commit": "6a81d43fcbdc51c2fc47d88f4fd8f25d8f906b79", - "sha256": "0sdjkxb7f31bsi1vj6vn2aw1lwq026sz782ys92zprncjp2mkizp" + "commit": "8d93ede3772353e2dbc307de03e06e37ea6a0b6c", + "sha256": "0pl9hiwl5snpw9cfga0v9ypw83mz4nw6754whd4f37fs9xc6df31" } }, { @@ -71199,14 +71344,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20210923, - 233 + 20211113, + 2119 ], "deps": [ "dash" ], - "commit": "03ae81739e44b70903dcdaae86a5ccaecc73eb9b", - "sha256": "1qvlf7f1wjlai25a09fnir3gsida3zpnr8vfvv687lxvngf7r53r" + "commit": "360e44b200d07da379c906856d37613d0f06a9ae", + "sha256": "0z2b26qr712j4745wlnqisc53fhh2gh088j6024b00n006fr1lzq" } }, { @@ -71392,14 +71537,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20210323, - 1128 + 20211112, + 2223 ], "deps": [ "cl-lib" ], - "commit": "588daf8c520f4545323e36b8900f02693ddcf5d3", - "sha256": "0yinp3148sa72ckmaycgfy7sw3pccz6h5bl7kiz5j54hfk66hsxk" + "commit": "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274", + "sha256": "14yayh8hmv00f27kgz5y57z035ccv94cmsgqpyl15p1vnwiq2if3" }, "stable": { "version": [ @@ -71440,14 +71585,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20211016, - 958 + 20211027, + 1833 ], "deps": [ "cl-lib" ], - "commit": "8b1c9874dfa65917d1bc6044bc210cd0001723cc", - "sha256": "1mi5f90nicmhsm0wxqwn1rliq3cb9hihxqw7scp9zd2ajrai37n4" + "commit": "910f4c929e1d9c1844ddc467f72eef2e03aa3f97", + "sha256": "13lmhp2vm953s4phqdd119kp7s3p0kb3kqz4z6g3ga6m6py3gq3i" }, "stable": { "version": [ @@ -72494,14 +72639,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20211002, - 1453 + 20211030, + 1339 ], "deps": [ "request" ], - "commit": "58962d7e04a8cc62f0792b15050fdc5a0c3d20c7", - "sha256": "0kc26kvsyv2f65pjl33lc0cmjvcnnjyf6vvfpbjxy771c0a44ism" + "commit": "d821e0359883ae5ccc12a1cb0f684909cbde98a3", + "sha256": "0p595lfwzzmjzxx4mdzp47bab07ypxkk3jk3yzvd1dcf2lgd0h9k" }, "stable": { "version": [ @@ -72857,8 +73002,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20191219, - 847 + 20211102, + 917 ], "deps": [ "commenter", @@ -72866,8 +73011,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "d832d6b1fb5e69fedcdddf442d62251dd0f1f489", - "sha256": "0m0khxcnq6whhxvblqyxrz21xfnpfjg4c8dn4x4i080dhmnmbzka" + "commit": "744e076f0bea1c5ddc49f92397d9aa98ffa7eff8", + "sha256": "0jjrjsks3q8qpipxcqdkm8pi3pjnkcxcydspbf0rkvy3x6i5mwkv" }, "stable": { "version": [ @@ -72893,11 +73038,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20211014, - 1848 + 20211115, + 430 ], - "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", - "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" + "commit": "fe8ebe24cecb0181f49446de0a0faf3cd7630747", + "sha256": "1c7y0b880572sxjqqsqf521yhb1jfhl4i7sm4nfysa85bnn6k5n2" } }, { @@ -72911,8 +73056,8 @@ 20181024, 1439 ], - "commit": "0cd88287a4cd77d11c92c7a9b44bb15fb787a1ee", - "sha256": "0c93b83zc1x22bq04fnka497qi0v4bs57nvsz9gbanqxng4b4gf7" + "commit": "e5935b63757f3a788bc56d2c7afd9e390daf2f07", + "sha256": "0arrxdpf4mcbr3mhl5955xiyw8772r571hvamacdln3cz044lr3p" }, "stable": { "version": [ @@ -73010,14 +73155,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20211019, - 1523 + 20211109, + 1805 ], "deps": [ "magit-section" ], - "commit": "1ac42cd103ba11c37e8566e240a2272966e6f813", - "sha256": "11s98jjqkk7pfmqb4a99ilvp6w3m8vqr1df65lpwjirlyf2lvw2y" + "commit": "e7bf2e4cc49e7a12265714dfaf5e286bfbc1e87f", + "sha256": "0ym70i1jndm12av9jzq5qq3vr2d5cjh5q95vq22whiah0svbbpxy" }, "stable": { "version": [ @@ -73142,15 +73287,15 @@ "repo": "hlissner/emacs-nlinum-hl", "unstable": { "version": [ - 20190301, - 2117 + 20211112, + 1241 ], "deps": [ "cl-lib", "nlinum" ], - "commit": "dc6b365a58e06c7d637a76a31c71a40b20da8b56", - "sha256": "1fvvyc77iggil9mzy8hd4vx8xw96bkfx6pmlb9ami428qp8r45g7" + "commit": "22f8d75ecdaab67e0d6d0d2da4766358456ca4f5", + "sha256": "18gpanlv7cfjzbd952a987ac3i9wn5ss7myvxz798al3jrivv9dv" }, "stable": { "version": [ @@ -73213,16 +73358,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210921, - 1131 + 20211031, + 1221 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "4e584d4da81c400de145dbb7a58e63819cbaf340", - "sha256": "0z5bww7cmlri2hn3fz3yad0scbsnhhddi21f50cmhdghgn1iaw41" + "commit": "34d82e2c2e4c190b85e751dd3f295daa264baa55", + "sha256": "1ivmybr94rwrdgxp5d761yy8hnhcdwmiqkhxnyk1bbbyd0a1kxj4" } }, { @@ -73248,8 +73393,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20210912, - 236 + 20211116, + 1718 ], "deps": [ "anaphora", @@ -73259,8 +73404,8 @@ "s", "virtualenvwrapper" ], - "commit": "cb22a8480e9688f16f3764953cebebe64df31ccf", - "sha256": "0qpy3xymzryncbiz4cay4bzmmarbs575dgh3db2iibaffwb4qb0x" + "commit": "7347ad1f3db7351c2e7f9a06d2ca8873130dbbfb", + "sha256": "178sq7rsghqhmhjdxixrybls00g7mp6wbmsx9lzg8c0ywpr9n332" } }, { @@ -73306,14 +73451,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210825, - 356 + 20211110, + 1900 ], "deps": [ "cl-lib" ], - "commit": "dcc96cbf5f018a91d406926d3b69715847ef665a", - "sha256": "1c6nq2sykbsjy30zakfpny503644bbwgb4pxhfsd4wywj5yyzw66" + "commit": "4a7bcaf077d049931120255edf476f34ced8c73d", + "sha256": "0p8jm5fms4krij7ydhrj2jwayyx6979bdq2w7v88ybk6b0md9yw1" }, "stable": { "version": [ @@ -73611,11 +73756,11 @@ "repo": "MetroWind/notink-theme", "unstable": { "version": [ - 20210816, - 2337 + 20211109, + 2122 ], - "commit": "ede878ee06d4f94b5819ed3ccffe121823fbcf44", - "sha256": "0iyxdbdgv1d3hflndfrbp3zbafa2zn3kpwj2lp32rm9sh3bcp79c" + "commit": "fa26294a43431ac7b42931c44c10e22813fe1ce3", + "sha256": "0wnkjncgdhak3j34b3rmnz0n06f4yx35khajjzlzyh91j2f14j6m" } }, { @@ -73626,19 +73771,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20211019, - 1143 + 20211030, + 1819 ], - "commit": "93104f0d9de4fa2919896a55dfdd207bbaf22589", - "sha256": "0dvxz3djl50cwz9j4sm95z269ypmkmh0n0365l7jhsqy91lbp7q3" + "commit": "fc3c79dd37d4bae938a5d0a1d7773bea48dd09b4", + "sha256": "02bv1fvbww9gk3phpd7ifzxfzjxm17k7ssd3ddizr6yvmkpsz7h0" }, "stable": { "version": [ 0, - 34 + 34, + 1 ], - "commit": "f25e48e0234a050cab38306a066605a0f8bd3d12", - "sha256": "08k7slmq894fiwkfc5bfqjckfdj8lb1b07cmmz6g5yr87yyjkmll" + "commit": "6858c365956ba26b42721093707e5a57ca8a6b93", + "sha256": "1bzcnly2xhyfw35k277i8qmw2gdy35jvkriwcyv9y3g7aicbqcc7" } }, { @@ -73966,37 +74112,6 @@ } }, { - "ename": "nroam", - "commit": "55bc37011ae1754549b910be84fa25ca28a8e6fe", - "sha256": "0g6d4nhj08hr6b6aiy1mlszz1k90vk3bw4kgnwzxmlmv43qxbcx4", - "fetcher": "github", - "repo": "NicolasPetton/nroam", - "unstable": { - "version": [ - 20210325, - 2015 - ], - "deps": [ - "org", - "org-roam" - ], - "commit": "9a76f16d3fdd49a1733e5f2777036f1f83068a40", - "sha256": "1lf56iq7iy545q8pcq4scvk8ialkw8nxc7gn97jyihpkxfhq7fi3" - }, - "stable": { - "version": [ - 0, - 9, - 0 - ], - "deps": [ - "org-roam" - ], - "commit": "c150603a25445d65b7b08d658793a6019fd763ea", - "sha256": "0qip0vhyvif5az7zph1m41gwamz84v01ay9qzicydzbizhzp4n5i" - } - }, - { "ename": "ns-auto-titlebar", "commit": "d22ebb5ef16df0c56d6031cb1c7f312dca514482", "sha256": "1wk4y2jwl65z18cv57m8zkcg31wp9by74z2zvccxzl7mwlhy7kqg", @@ -74432,8 +74547,8 @@ "deps": [ "axiom-environment" ], - "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", - "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" + "commit": "3266c5b2e4865337da86043b53a4e6609dbc8308", + "sha256": "11k53vvw5df66f54mh3zkghspmi7zsgls3mlkfvl19hz2z1pyhwq" } }, { @@ -74905,8 +75020,8 @@ "deps": [ "julia-vterm" ], - "commit": "3e7ff901687c320869c5e17e3273185af68e8cd6", - "sha256": "0i155p3k2xf0p00xazqjw4llylb13svgad9a9m6as6lcvrvc0zsp" + "commit": "e04ee53d67cbd715c2d84fe5bc367526edfadc74", + "sha256": "18866agjrkx2gv38zr14mhf3rlvjdjvn3i8hxg12lrbv6q4rn8aq" }, "stable": { "version": [ @@ -75074,6 +75189,24 @@ } }, { + "ename": "ob-php", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp", + "fetcher": "github", + "repo": "stardiviner/ob-php", + "unstable": { + "version": [ + 20211109, + 146 + ], + "deps": [ + "org" + ], + "commit": "3699808eb1ba56268ccc2e366151183e91e8c711", + "sha256": "0m0qgssa0rxh7apcxr7lz0wi5vsrgnsysjw0zj2mk6fz1drg02dw" + } + }, + { "ename": "ob-prolog", "commit": "fb87868cd74325f0a4a38c5542c264501000951d", "sha256": "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s", @@ -75098,6 +75231,24 @@ } }, { + "ename": "ob-redis", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm", + "fetcher": "github", + "repo": "stardiviner/ob-redis", + "unstable": { + "version": [ + 20210527, + 1336 + ], + "deps": [ + "org" + ], + "commit": "ad31bf482a081b9c595a02ee6053c1426e3d8faf", + "sha256": "1w8wbiwzi8b3gm376yyynvc833skkvgylmrn803pnqsa1ij77jni" + } + }, + { "ename": "ob-restclient", "commit": "28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d", "sha256": "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk", @@ -75180,6 +75331,25 @@ } }, { + "ename": "ob-smiles", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb", + "fetcher": "github", + "repo": "stardiviner/ob-smiles", + "unstable": { + "version": [ + 20210527, + 1401 + ], + "deps": [ + "org", + "smiles-mode" + ], + "commit": "9f1fed213eb194924ab7d12b9d6e1074578a791c", + "sha256": "1x0rq9l9j3khp47q2j9bnyhhj2xrs4zggw9p8rmmai165drh1i9r" + } + }, + { "ename": "ob-sml", "commit": "d1b0fbe1198fa624771c2f61249db502de57942a", "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn", @@ -75209,6 +75379,38 @@ } }, { + "ename": "ob-spice", + "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", + "sha256": "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2", + "fetcher": "github", + "repo": "stardiviner/ob-spice", + "unstable": { + "version": [ + 20210527, + 1355 + ], + "deps": [ + "org", + "spice-mode" + ], + "commit": "3c77144ecb059411441730bb47f6d5892b62d13d", + "sha256": "00cnym62hp0masikr3ndk2a0mpafjw0cjx0xavcq486w2xi7r8rm" + }, + "stable": { + "version": [ + 0, + 4, + 2 + ], + "deps": [ + "org", + "spice-mode" + ], + "commit": "790faa67b0c57ca76e8814a1fa60b4dd774412c0", + "sha256": "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d" + } + }, + { "ename": "ob-sql-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk", @@ -75505,8 +75707,8 @@ 20210923, 1348 ], - "commit": "15a6b28440320942e65a769e64bf3eb63cbc20eb", - "sha256": "1x16rk29lhrb9rv6jbvdpc4swmyc31ixi8i7prnbslrfgrzw2f70" + "commit": "f2f50d6fb0371b85bde2eda15c440b68d46059ac", + "sha256": "01ac3k1kq6hy2n332775jlh2rg1pmqs8gvkx4qskxmpga87753m7" }, "stable": { "version": [ @@ -75699,26 +75901,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20211015, - 1032 + 20211029, + 611 ], "deps": [ "org-re-reveal" ], - "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", - "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" + "commit": "44eb766df39b722a26cabebec44bb359bcca1e49", + "sha256": "12mdp7pxb4nga1pp17d3kawb55kjdnjc1fg8lavyq4ydznyzn225" }, "stable": { "version": [ - 3, - 25, + 4, + 0, 0 ], "deps": [ "org-re-reveal" ], - "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", - "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" + "commit": "c26ddb39288b60ba96f970fa20ef810aa4d0f418", + "sha256": "12mdp7pxb4nga1pp17d3kawb55kjdnjc1fg8lavyq4ydznyzn225" } }, { @@ -75855,20 +76057,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210902, - 1202 + 20211030, + 838 ], - "commit": "95479d5178fc5017060c963a45de0d2095c00e0f", - "sha256": "0bliylh02lcga84jysf1jr80bgrn8m7cy4n047fr06cjqdqr4sp4" + "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", + "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "bfb221845c2e26f923ab80fdcd8f80b70b6adee1", - "sha256": "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z" + "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", + "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" } }, { @@ -76608,26 +76810,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210816, - 2047 + 20211108, + 751 ], "deps": [ + "dash", + "promise", "request" ], - "commit": "4e70c6869181f020c6989f91f5e916e085ba73df", - "sha256": "12iwllz9mbcv7q652v4bc1wkaml065wr7gvqm08kjds8hmc6f1pl" + "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", + "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ + "dash", + "promise", "request" ], - "commit": "c86394d5fd8933d1b6cafbc1dbc36bf61bcc871e", - "sha256": "0jg00hw5k6n7jf19vz1gf9599ad7skm399ng115hpywhas9ly01i" + "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", + "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" } }, { @@ -76706,14 +76912,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20211010, - 958 + 20211115, + 543 ], "deps": [ "async" ], - "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", - "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" + "commit": "ad3c332f062b5830e88b2ab13287a096ae434657", + "sha256": "05yrw59zrzxj1p8n65sk6mvy7jzik812mp9i2nsimwhlhn3si1pj" }, "stable": { "version": [ @@ -77856,16 +78062,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210820, - 519 + 20211110, + 1423 ], "deps": [ "dash", "org", "s" ], - "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", - "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" + "commit": "399020d435d296014f92fa5f632d7481ee002661", + "sha256": "01q8w49dh9fpr2sc70p92cxjm66fnrrgnk4ba321aq9dlfmly2zg" }, "stable": { "version": [ @@ -77883,6 +78089,35 @@ } }, { + "ename": "org-inline-anim", + "commit": "340b9cfda110987a9306cc579dc7c2b53eeb605e", + "sha256": "1z245pws6y6z0gw7zwnljllg03jn2payv95fnriswymb86cdsdj0", + "fetcher": "github", + "repo": "shg/org-inline-anim.el", + "unstable": { + "version": [ + 20211101, + 413 + ], + "deps": [ + "org" + ], + "commit": "ea7feb924c991f3a2cdc4a70fb176eaceae87938", + "sha256": "1ai7zgx4sr7lzxnbkgj0dzd326dj18dzf0nqm12bza7bqbnck2dv" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "org" + ], + "commit": "1808574ff04ed66b7382247f3f13815fae2a4929", + "sha256": "1h1ha5njzv2ibp11dbka8lqx6d3q4hqjz11vzi4yi4x4ksiczqrc" + } + }, + { "ename": "org-inline-pdf", "commit": "d069aa75232fff5d8b5db485f037191181d8c4b6", "sha256": "00f8gd34lsp96j20s6sax4hjwqsnrz4647xdchzxav7cpqjmky8m", @@ -77939,16 +78174,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20211002, - 344 + 20211114, + 1616 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "24f2d83bc2f6a2b88b084090f877814e36dcf4da", - "sha256": "0f5bij9gvgv8954v80xymvgnwf2ayxg7q4khmfd2djc5sbhj9ch3" + "commit": "01e6a7c17e210dac0608154dd69d637e9733498d", + "sha256": "19nljq73gnhjk7zz8y5wgap8j41jd7zifjcmfddrj27kmprw2h5z" }, "stable": { "version": [ @@ -78347,20 +78582,20 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20210408, - 1259 + 20211029, + 1147 ], - "commit": "229461b92ff89fd96cd7730df9fd589a8b0ef949", - "sha256": "1gl63m7h7zisjqljlckcqr0f16zkadfw9jr9h54kypm51alpjzkm" + "commit": "454d317bf772a616cb76cf2212f111c7977016a2", + "sha256": "1bib2ch2grb7qlyhc7aq82ca1i16nqi8h84nfvlwgx45al8r3k4l" }, "stable": { "version": [ 0, - 4, - 4 + 6, + 1 ], - "commit": "1b19fb0f77dbd519a29997642954dc33fe12b810", - "sha256": "1g4hszrmvx41iz6i2m4nr2qhl098gklqg384ir3r1nfw7y5ll29l" + "commit": "454d317bf772a616cb76cf2212f111c7977016a2", + "sha256": "1bib2ch2grb7qlyhc7aq82ca1i16nqi8h84nfvlwgx45al8r3k4l" } }, { @@ -79097,16 +79332,16 @@ "repo": "oer/org-re-reveal-citeproc", "unstable": { "version": [ - 20211024, - 831 + 20211028, + 1328 ], "deps": [ "citeproc", "org", "org-re-reveal" ], - "commit": "f1f5a00fc8570234a8d421868b170aa9819c792a", - "sha256": "0vxyqbh69l82xascygg0b4k915nq8dz4q77j03fr28xfmv550w5y" + "commit": "faa9ea387917b20bd1499ad90199ff3d417c00c2", + "sha256": "09yvfp4nh3g2jfs4v8jx70y6vyahypwvfjwrcqg5z0sqssbmxhnc" }, "stable": { "version": [ @@ -79131,15 +79366,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20210104, - 1650 + 20211029, + 551 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "f406e5fc1ae2b1e6f5f85b43932e71381f214e6b", - "sha256": "08j3a503fipx45735zp94q8d41xl890ba2bf5fm4pzvrpf5k4pwy" + "commit": "ea9661864d5fbef87b12b78f516c13a40c683f24", + "sha256": "1vaszb0n5p48mrf5hzci2yyh51b32ws1fk6r4q0gky41ixz243v8" }, "stable": { "version": [ @@ -79241,10 +79476,11 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20211024, - 2329 + 20211110, + 1229 ], "deps": [ + "avy", "bibtex-completion", "citeproc", "dash", @@ -79254,8 +79490,8 @@ "parsebib", "s" ], - "commit": "dec2acedecdd1253e8e02b7a4aaeb98cda37b5d4", - "sha256": "1q3n08qxry4digpzf4n6gl2bymdg52kxna412acwrpjhbk1q1ca5" + "commit": "c87b4155cd2f60ca3a9bed2e6e366c1fa47aec33", + "sha256": "1idshb4g1d7ghdwwfyglvqqdjbdi3lrigkgq2rsbhrv7lpxcb8vn" }, "stable": { "version": [ @@ -79288,15 +79524,15 @@ "repo": "alezost/org-ref-prettify.el", "unstable": { "version": [ - 20210920, - 634 + 20211111, + 742 ], "deps": [ "bibtex-completion", "org-ref" ], - "commit": "29e05416f102ceca50ac8b118a19a16f9fe7eb2f", - "sha256": "1215hrinfggvwz89i15lhpqraa3rhafnqx8iwvfzb0p9fyqfgwg5" + "commit": "0cecd7b2611bd9d282876ab46d490ce3e635ba86", + "sha256": "0jhspfp2mm69q7p1n986pal88ywm5zm9a6f2q073slnpiv4qwvz2" } }, { @@ -79402,8 +79638,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211022, - 815 + 20211114, + 913 ], "deps": [ "dash", @@ -79413,8 +79649,8 @@ "magit-section", "org" ], - "commit": "2c75b194d8f75a8edaec77d503a47d1bf0c58f24", - "sha256": "1ykpi5sbipm15y6bfr143vq4xpap0fl6d5w69ll42j2v5lwjh8x8" + "commit": "d93423d4e11da95bcf177b2bc3c74cb1d1acf807", + "sha256": "1az6i7031ff63gxz3wfdg00w1b57r10j12a6s5w3vgchsz896skm" }, "stable": { "version": [ @@ -79442,16 +79678,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20211001, - 1038 + 20211117, + 1225 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "ed35826fdefda8b5a3f7156c19e892e5e2984ea4", - "sha256": "135g8grk7dh0mcn76d7h35larm9z38dqjajs4kclzxkvsrmmfhxb" + "commit": "f399b85f5c38bd52f6eb41da18fccfb971a04fe1", + "sha256": "1da5yv204qvnw5rrczyi5k2982a03l9lygkqh4nbpknm8i7nhrbv" }, "stable": { "version": [ @@ -79469,6 +79705,44 @@ } }, { + "ename": "org-roam-timestamps", + "commit": "5141a8f5505427e8d5cb898015587972c2eb2f34", + "sha256": "060sjq9icpabdvi5dz0im7acdc8k21iprhpa6mga6zynpqhshsjs", + "fetcher": "github", + "repo": "ThomasFKJorna/org-roam-timestamps", + "unstable": { + "version": [ + 20211108, + 943 + ], + "deps": [ + "org-roam" + ], + "commit": "f4de72c09cd2cace275ede19c39a56b68ca56b83", + "sha256": "050jnyqdnx4l946hl9cw08l4sk8z70c2063z08m4qh2sxrdh3nzw" + } + }, + { + "ename": "org-roam-ui", + "commit": "eb639f7da134200de36c7f82431c200a5d01344b", + "sha256": "15i68kxmhl7iv10f4abamm4yg9qp5mafwinvv88clpa62yiv62i5", + "fetcher": "github", + "repo": "org-roam/org-roam-ui", + "unstable": { + "version": [ + 20211117, + 1208 + ], + "deps": [ + "org-roam", + "simple-httpd", + "websocket" + ], + "commit": "2b167cd03f29714267057e4c0b437a4d6a01b299", + "sha256": "0k6i69afzswqvg4zl6b4m5gl7rrrr15yli2kn0g8nlfg0z2ay6dm" + } + }, + { "ename": "org-rtm", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6", @@ -80009,15 +80283,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210729, - 929 + 20210904, + 1643 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "69e7dcb50278ff0d7b220cda9562d4fe7e4db0ec", - "sha256": "0wyqjzb2ph7092ghrnq0gxaf4r57mvcm0007kqpzqvknc3byd38d" + "commit": "bdf438847e05f1f9c08c69e93c3d5e717b589074", + "sha256": "09k7zmdcyy5mymij4a2wq6s6r60njkxrmiybbwvln322wl0ldgsh" } }, { @@ -80137,14 +80411,14 @@ "repo": "Fuco1/org-timeline", "unstable": { "version": [ - 20210210, - 2306 + 20211110, + 1952 ], "deps": [ "dash" ], - "commit": "af1b44e18048278a116da89faf138310f09c74c6", - "sha256": "05gp5hqfwx668a0qvpx1wn8957qgn6g9jhrhiwgscnnxch2dp0c0" + "commit": "2b300abc8adc9955418fa2334f55e0610bff79f5", + "sha256": "09girkfkddn5xl5h6ji2hmsp2asip14cqrp8l9k9dpyhc4r9qp7g" }, "stable": { "version": [ @@ -80514,16 +80788,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210802, - 1435 + 20211112, + 1600 ], "deps": [ "dash", "org", "s" ], - "commit": "bced50755c45047565a3ab395c3b5e59ab15cc8e", - "sha256": "155gxp0ysfwgiykw0zjzrm86pd9f2nz5whlcjm51apqd0439jjv9" + "commit": "729445496d94ea0050706007391817ef84dc0226", + "sha256": "0xa545wbh7kjbpry74x2bkw6rs9dshlajb5i17zc6v8zf400ds4r" }, "stable": { "version": [ @@ -81291,11 +81565,11 @@ "repo": "raghavgautam/osx-lib", "unstable": { "version": [ - 20191121, - 1440 + 20211113, + 1849 ], - "commit": "01cba80ccc20412759f87b8f7531580bb04ec9c1", - "sha256": "0izkifcxk6cp9y4xcmpkhpd2vv1rqapxxa74ks12a55sflyxx36f" + "commit": "06744dae53b4ade99b0cd733823e1c8f6b0aa2c4", + "sha256": "0rfb9nh5xvfqpnk8k0hxaiv7ywzzzn8dpx3gxx6d2jn25glwp8ql" } }, { @@ -81963,8 +82237,8 @@ "deps": [ "org" ], - "commit": "14723c3cb93abec61a8bd35c6e4162754f902a6a", - "sha256": "1dlf5iw32lc3lwrh5ssl2cisgd31s688s50z9w37pslqx2mi1nl2" + "commit": "3442d8cf1f60f28cf28daaca06f524dd660681f8", + "sha256": "123zg67bribf86i98rzvha1fyh72a12bkjrcgn06vph5vm5m08q1" }, "stable": { "version": [ @@ -82215,23 +82489,22 @@ }, { "ename": "ox-pandoc", - "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38", - "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc", + "commit": "864fce840ab2ebad3e1d5952b14a33019da3732b", + "sha256": "08xv4dp0ycchqfwr8syvf54r0575nivvy2x80h723plrq3faddvi", "fetcher": "github", - "repo": "kawabata/ox-pandoc", + "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20180510, - 1338 + 20211009, + 1414 ], "deps": [ - "cl-lib", "dash", "ht", "org" ], - "commit": "aa37dc7e94213d4ebedb85c384c1ba35007da18e", - "sha256": "0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz" + "commit": "e76324ecf1b9be6353bf22ff5e13652ea2714674", + "sha256": "1x1klhj4570mzcnrdlj56qs9hi41nvdmghgj6ddwg6n0lm2kglys" }, "stable": { "version": [ @@ -82317,14 +82590,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20211025, - 1424 + 20211114, + 1307 ], "deps": [ "org" ], - "commit": "a995a9cf4ca578939cc36ea229d5c28ca6a3fd1e", - "sha256": "0i6byp5bhlcfidhp5b7ddlm9xnw5rjfnkxvw3gqbwfhgzfdb2jc4" + "commit": "2adca68b2be22bcc05d5136b571472667ffab4fd", + "sha256": "1x0ksafnq2fsqg7vls2qdhnk189bfk3184303whircbs0rgiz6md" } }, { @@ -82798,15 +83071,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210528, - 2348 + 20211107, + 1614 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "786d8b5f382ee5f254a783378e904305cc41367f", + "sha256": "19mrzb2ligkz8gyihlrqvb3wbzmsqkpn58kfcnx6dldvk4s2ykdn" }, "stable": { "version": [ @@ -82835,8 +83108,8 @@ "deps": [ "package-lint" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "786d8b5f382ee5f254a783378e904305cc41367f", + "sha256": "19mrzb2ligkz8gyihlrqvb3wbzmsqkpn58kfcnx6dldvk4s2ykdn" }, "stable": { "version": [ @@ -84362,15 +84635,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20211004, - 514 + 20211110, + 513 ], "deps": [ "let-alist", "tablist" ], - "commit": "f68899cf0646255ca763f1144f7a9520e7cd46db", - "sha256": "13f0c0a9cyhc2snshjqw8dl0hdnhb89fba6ffcv7avb2cwnxdpk7" + "commit": "a8847b75d3487d60e27762816bdbdd23b6dc1c11", + "sha256": "1dv244rxlgb56fzx1d1w9ngdjdrc7bgssshvkrfkxbwy69i803b3" }, "stable": { "version": [ @@ -84779,14 +85052,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210920, - 345 + 20211103, + 522 ], "deps": [ "cl-lib" ], - "commit": "ca6f778a3f1995600fc3d369bc636888812c80cc", - "sha256": "0y1yyp1amvr6v8nji19m7yvksw0pai8ajs73v2345dcdz51flpfc" + "commit": "54dc30840c8019f387ccdb84bbab06ca2cf8f296", + "sha256": "1d2jmxfb6a93d9h4m7w482f3dbhhn2s6wiynzwxjl8af1l19f5aa" }, "stable": { "version": [ @@ -85242,8 +85515,8 @@ 20210808, 1745 ], - "commit": "535aec81739e8e766e0420fda616efc8846f2911", - "sha256": "1z4fds5priq8dsr8gm845ykk8blghm5kz5sspnpzclgk3prwkx26" + "commit": "d66b4986117f621c143bc295205619e036f291d5", + "sha256": "0jj0xmmb65shi8x5l32c0piin4dbiz94fsixzcn13x6ljsv8kd21" }, "stable": { "version": [ @@ -87115,6 +87388,40 @@ } }, { + "ename": "pomm", + "commit": "01cad9c9e0b9277160fbb7a5139157a1573ae641", + "sha256": "1jdinqimn7ybcwb61dwvpv9hizjkrbp0c59kh2nppw4m1lyw9ar6", + "fetcher": "github", + "repo": "SqrtMinusOne/pomm.el", + "unstable": { + "version": [ + 20211110, + 1040 + ], + "deps": [ + "alert", + "seq", + "transient" + ], + "commit": "62832704ba72613af8dbe0a6bf6d4daa89a21e12", + "sha256": "06if507c163fia28zzax735r7mwlpa5vi0mmgddyn3vxsirnh4qw" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "alert", + "seq", + "transient" + ], + "commit": "62832704ba72613af8dbe0a6bf6d4daa89a21e12", + "sha256": "06if507c163fia28zzax735r7mwlpa5vi0mmgddyn3vxsirnh4qw" + } + }, + { "ename": "pomodoro", "commit": "0b5c2c50eb87952d01c1b338b7d3e4b3a4546555", "sha256": "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8", @@ -87273,11 +87580,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211011, - 435 + 20211116, + 624 ], - "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", - "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" + "commit": "4d58a6dbba5d488ff9ac9318e202d84da505e691", + "sha256": "0l4y8f6j6sfr91rqcdv0lx6bgzskpsamd4w4fb7lp6qghmm8iyvk" }, "stable": { "version": [ @@ -87541,11 +87848,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20211025, - 1411 + 20211110, + 40 ], - "commit": "70ba4e77c114d980c0d87ed1f6b201188a3f8954", - "sha256": "048gykchqwfcxnkd3n8f8s1grqg6p2c4wfpj1lfa411k0r9xj8pf" + "commit": "66b16a20a7b43f19c27487c475799200ad81b3bd", + "sha256": "06n9zwbz6hk3k49hw9xjnizaadvgl2s5aqmaaijzfxxm0h0gqh43" }, "stable": { "version": [ @@ -87824,11 +88131,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210724, - 1756 + 20211031, + 1908 ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -87954,16 +88261,16 @@ "url": "https://gitee.com/shaqxu/prettify-math.git", "unstable": { "version": [ - 20211024, - 419 + 20211107, + 38 ], "deps": [ "dash", "jsonrpc", "s" ], - "commit": "cd5d24d96cf63a2eaea16d5bd616f14d10eac325", - "sha256": "16nbp2766yz8bcfakwghgypka8xf9vxq3m5pxwm8jjv2hb5bjcy9" + "commit": "b766824d60e95720e28917b648e4957d7923370b", + "sha256": "0rq75pzbklgk0bq6ah7xrsb2czq1vryfvavvi81iqpp89nik2nrh" } }, { @@ -88385,8 +88692,8 @@ 20211013, 1954 ], - "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", - "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" + "commit": "69d44e5495185587ee8577f8b9d616063d6bd7f8", + "sha256": "1rv5zgbg003zhhjvikyv92pwjgl191ja14sba7hncs0pk580v075" } }, { @@ -88507,11 +88814,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210930, - 1757 + 20211116, + 700 ], - "commit": "7f64570d3e6829d767d340c8584f3e4f3472ee81", - "sha256": "1a5a2xmnic27swm85rz44iymvym7jagwis25a3mzn9d5spsqaagy" + "commit": "31069dc31469e0d5cddb53126a2993432a22399b", + "sha256": "1l86gm0kkszkyi4srknc7vjn589x2pkqdcralw44zwhppx7fcy35" }, "stable": { "version": [ @@ -88772,16 +89079,15 @@ "repo": "waymondo/projector.el", "unstable": { "version": [ - 20210421, - 1728 + 20211112, + 1514 ], "deps": [ "alert", - "cl-lib", - "projectile" + "cl-lib" ], - "commit": "7bbee0ef70817d52339119d4517dbbcbab930de6", - "sha256": "0zmng37fl8df1d3i66fbkjssv0x0hq74x68p1j01gb8sfayw4dgf" + "commit": "1d0f2d307591ea50888d31dcae7e463e2ada1316", + "sha256": "0psmb4bsnm9wws8g3v2n78hkih6b80lzbv5v52640v94w74hfdp5" } }, { @@ -88914,11 +89220,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20211013, - 1911 + 20211109, + 1442 ], - "commit": "fd04605af1b07684da522c32d83ac346050926bb", - "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" + "commit": "2145c23f44a0951a14240d3b85a1a3d08aade9bb", + "sha256": "0pilv79a9mqgv2j7915b2lbl3ir1hhaj7xjysliwn6h7rb4b1csg" }, "stable": { "version": [ @@ -89021,17 +89327,17 @@ 20211013, 1726 ], - "commit": "0707f2e7f556c8396d6027d0533ec3a56d1061db", - "sha256": "0nna3s41hgysa8p4x65nswpxs1fdk5k41gn8vsf0gmaidm6fnh05" + "commit": "edc8a3182811cc39272549ff894793e1fff4aaab", + "sha256": "08yfcnra0c9jx3fkicxl558vzll7cnx5qn847lxqsjv4f1ms37m1" }, "stable": { "version": [ 3, 19, - 0 + 1 ], - "commit": "17b30e96476be70b8773b2b807bab857fd3ceb39", - "sha256": "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g" + "commit": "7c40b2df1fdf6f414c1c18c789715a9c948a0725", + "sha256": "1swpq2lkkgz5pwq6q3jn6xgkbaiq9dy20rvmrlghdp0fkfg2a011" } }, { @@ -89334,14 +89640,14 @@ "repo": "hlissner/emacs-pug-mode", "unstable": { "version": [ - 20210503, - 147 + 20211114, + 1645 ], "deps": [ "cl-lib" ], - "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", - "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" + "commit": "73f8c2f95eba695f701df20c8436f49abadebdc1", + "sha256": "0kjjwyxdbaaagjd0zmav2xj4075c8qcs33x29zpyqfxwj4410gp3" }, "stable": { "version": [ @@ -89927,15 +90233,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20211020, - 612 + 20211117, + 158 ], "deps": [ "async", "xr" ], - "commit": "d110c46907e3e9b78106498c86193786e49b2897", - "sha256": "0ipz8pqqavzfmafbixakd82l4571jc0k9ay5idp3l7kmh4c6z3rd" + "commit": "a66e999435d9697a0d732576addf3c182fd363f7", + "sha256": "06pfpi2z48jhqanwlnq5d55xsnpmqhhrk64x15x7h01haf0wqy64" }, "stable": { "version": [ @@ -90087,6 +90393,21 @@ } }, { + "ename": "pyinspect", + "commit": "da9396dfd85cbef7e92e8aa9db75cd5fc7a2372c", + "sha256": "0hmrnf52yb2yi9j23kj7w4l4nknx3hl9d08ryhd3k7caakxnmwmy", + "fetcher": "github", + "repo": "it-is-wednesday/pyinspect.el", + "unstable": { + "version": [ + 20211102, + 1415 + ], + "commit": "36cf624236c8b4cce852dd52b64d058d4d4a32fd", + "sha256": "0g2k9fgjvcq2jc3j2k2x2v1vghaf0hyarzvdby5vzycsp7jlzcjm" + } + }, + { "ename": "pylint", "commit": "a073c91d6f4d31b82f6bfee785044c4e3ae96d3f", "sha256": "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx", @@ -90097,8 +90418,8 @@ 20210411, 1931 ], - "commit": "b6ca3b9d6f7ad42accdf90044628521bd711d1ec", - "sha256": "09y452zk3bk57piqdnyzb7nkp1h540h1sb2rl6cr9rhjwfk60zch" + "commit": "b91cc8dbb47ce622b73c766b3a53da270bdb24e9", + "sha256": "0w7bc2lcrr4axs9s8mgymjy8gwdafc3dl4fl9amaqfbph0xm0arl" }, "stable": { "version": [ @@ -90341,6 +90662,29 @@ } }, { + "ename": "python-insert-docstring", + "commit": "520c410e04bc7c60bd8d2a4d5507ed0be0720030", + "sha256": "1hh95nhrpggmpqapkpnwgn7sdzvyfxr64smz6p2v2sn3q7lkrkqk", + "fetcher": "github", + "repo": "macurovc/insert-docstring", + "unstable": { + "version": [ + 20211101, + 1653 + ], + "commit": "4d729f5b574ffa3fce41ccbeee7b8bdb9d005174", + "sha256": "0gn12bm3w7819j67bnh1m3jkqqb37pdmkagbcwqp4mc74zbpf01m" + }, + "stable": { + "version": [ + 2, + 0 + ], + "commit": "4d729f5b574ffa3fce41ccbeee7b8bdb9d005174", + "sha256": "0gn12bm3w7819j67bnh1m3jkqqb37pdmkagbcwqp4mc74zbpf01m" + } + }, + { "ename": "python-isort", "commit": "8b359787b5f0113793714fd9710fde831e7afee3", "sha256": "0svkcb68r3x1ajhrhhlnj71v33qp3pliv3if1mww19x970r69lmy", @@ -90402,8 +90746,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20210219, - 1947 + 20211111, + 1912 ], "deps": [ "dash", @@ -90411,24 +90755,23 @@ "s", "transient" ], - "commit": "31ae5e0e6813de8d889103f7b8dde252b04b1ae4", - "sha256": "1kf62adlm5nf7r3qar8h1cx11xxrz95bfqii62i9xqdi3i8z7b2l" + "commit": "e77469fcb727f1b63f0d921ed15b1631a6bd0cae", + "sha256": "1dgk8s4wdjckaiv20gnlj3p6xbxp8g9i7q26lmmzbf40ri2qq7hk" }, "stable": { "version": [ 3, - 0, + 2, 0 ], "deps": [ "dash", - "dash-functional", "projectile", "s", "transient" ], - "commit": "10ad9afc840ac2d9d5616abf4bd92ab8fee2ce48", - "sha256": "1lc5qlsznzw8hdcdwjwn8fcgfmqjvb1wplsr2gaxwvm8rbw22g1l" + "commit": "02cf74617cf54d85bd58c75b8fe64b6f8ea36aba", + "sha256": "1l7lyni2vjzgqsnysf4dgww0adhhsfmjc07dn1l65m9jjsr99x2g" } }, { @@ -90597,8 +90940,8 @@ 20211010, 1334 ], - "commit": "fea4e6101f320a95f2a375a5c805911a788f20aa", - "sha256": "1dsigkg9zkymazgs24hjnn0f5ywvlxja2ycvqq13q0sb26qsh688" + "commit": "a2c51cd1d54d507ec1902bc5c7bc888fe5a23c8d", + "sha256": "0zikg9gbcdzjlm6kdg71i28zxic4k22iijfvf7x4dvx5pc8pw8f6" }, "stable": { "version": [ @@ -91022,11 +91365,31 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211024, - 1323 + 20211114, + 1656 + ], + "commit": "6f94ac6e67c3ee00454e8b7e6d96ab5e9614cdb8", + "sha256": "01d2jkg32c7gsh39gil0kjh615fw125dl4nqilfcg23zfc8wlaf2" + } + }, + { + "ename": "rails-i18n", + "commit": "4be03fa1fece3bd2a77c1aed929ae3475ab602dd", + "sha256": "0jzj1l63yavwn0jxvm92hfxk1m2kyb6sf7kbn2k9v5lkq0iqpl3f", + "fetcher": "github", + "repo": "otavioschwanck/rails-i18n.el", + "unstable": { + "version": [ + 20211026, + 1404 + ], + "deps": [ + "dash", + "projectile", + "yaml" ], - "commit": "5b6ac3ff995004bc055c1d33cc65a02558a10599", - "sha256": "1r5g9y573hrpgdqypaks3wmf322ff5pilfv2dm01ck9fkiy7rqy1" + "commit": "5d7a3e46d801668f53efc4c974b5f46b2cd28a0c", + "sha256": "1r4x4j5d0i4v27mj0cdx6s3qs3vk9v6blxmgnldmbv2ychyxzrnr" } }, { @@ -91045,6 +91408,25 @@ } }, { + "ename": "rails-routes", + "commit": "46ceb4276966bee63c91ee02d3cd66fdfdb7a312", + "sha256": "0wgs6jp9rkchdjri924r81rrk13z6midhi4x8bd9hjph138j95jz", + "fetcher": "github", + "repo": "otavioschwanck/rails-routes.el", + "unstable": { + "version": [ + 20211108, + 347 + ], + "deps": [ + "inflections", + "projectile" + ], + "commit": "b1326e9f4ede6b3da0fada29697fa7f797d7576d", + "sha256": "017fcrnjhqp591q8j51b67qbb6idimy7w3mvlkshbj3pmxl0hzb2" + } + }, + { "ename": "railscasts-reloaded-theme", "commit": "9817851bd06cbae30fb8f429401f1bbc0dc7be09", "sha256": "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz", @@ -91139,14 +91521,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20210803, - 922 + 20211114, + 905 ], "deps": [ "flycheck" ], - "commit": "57fe85c0f03917f6867833636a5617cbfa663a29", - "sha256": "1y97a876gsva2pr75b4psfs8hd26vd2drfsbfg79hazcqvr51c5j" + "commit": "aaaec8e20b3bde3a567baa501623c451f796a46a", + "sha256": "1mrq585wq4c23jv6fvphh03y4s8wjrh02dhd0l2369axl6bdslz7" } }, { @@ -91442,20 +91824,20 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20211019, - 1454 + 20211026, + 2318 ], - "commit": "339ac47fe2448e1d391c9f415c9f701ff999a4b0", - "sha256": "13idz1cvynj9y27mahayn33whr05sffa6yfbyzrzj0xk5gb3qrd0" + "commit": "351c4006ddacc2f66e6ff8c79d981613e9a8bd22", + "sha256": "1ycjw62wlnkbbanqrz6my6xrfffcs9rnf27ihvmwni5k2carv9p0" }, "stable": { "version": [ 0, 4, - 4 + 5 ], - "commit": "339ac47fe2448e1d391c9f415c9f701ff999a4b0", - "sha256": "13idz1cvynj9y27mahayn33whr05sffa6yfbyzrzj0xk5gb3qrd0" + "commit": "bbab9900c7b8cb406da662e4f99064e1a2de729e", + "sha256": "0cr32q67ap87b4acbglay0mx9mmpdm7h9byx2q21ad5p5ra1y17w" } }, { @@ -91718,16 +92100,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210522, - 2151 + 20211107, + 2210 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "7a70b27614c488be274898d0141ec82feb3a8d5a", - "sha256": "116f94sslg1cd5cy5w25ygazdwrrlh85pfib7692a180vk6kz8g6" + "commit": "978b455d7da4dc41995192bfabc32092622651dd", + "sha256": "00kjkc8fpvcjapnrk2fmnxspn9p3z9b3niyrqnyzif3kzmdsqz1i" }, "stable": { "version": [ @@ -92178,11 +92560,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20211006, - 1406 + 20211108, + 2240 ], - "commit": "8b794d194799468443252d9a54489b5beb01eb76", - "sha256": "0712jasmpmphdr8xxdw03dz8p99js9wdc8lrcda3n5hq3g6i1yyp" + "commit": "9d64b65855464bd92ccecf93c19db8b1fc12d7a3", + "sha256": "1fixdmrpa9jbjmpqf201420lpg6wcgngzddz7h5c4j68gw1a7jd0" } }, { @@ -92262,6 +92644,30 @@ } }, { + "ename": "recur", + "commit": "c59ae78dc09225b8def8757d52c52988708638fa", + "sha256": "0xss7rd8n4wwbn2ryb3anh5nxwz6zby834mgbqblsvll4dcfkdxz", + "fetcher": "github", + "repo": "ROCKTAKEY/recur", + "unstable": { + "version": [ + 20211108, + 219 + ], + "commit": "627d88f2695336245527fcc77f5728575ecf742b", + "sha256": "1di685jq65g7f8s8j6lflqj6mkp05hpi10y1vfnqh1xln2pijapc" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "46d213633d5325113e857b1c212f2b2937cf29d5", + "sha256": "1p9phplk6pa6qdvgpbrya5b6jn7hbbbcs565f6jlswd26vjc087v" + } + }, + { "ename": "recursion-indicator", "commit": "2c8ad93fcf71be990ab1b97c4fbe7526ce66ca69", "sha256": "1nnbzl3a32hk721j37x3s865036j2m48xy13sdh8cxfhd6q4jwbv", @@ -92980,11 +93386,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210816, - 200 + 20211107, + 1907 ], - "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", - "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" + "commit": "3336eaa97de923f74b90dda3e35985e122d40805", + "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" }, "stable": { "version": [ @@ -93011,8 +93417,8 @@ "deferred", "request" ], - "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", - "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" + "commit": "3336eaa97de923f74b90dda3e35985e122d40805", + "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" }, "stable": { "version": [ @@ -93158,8 +93564,8 @@ 20210923, 2234 ], - "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", - "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" + "commit": "f59a7f5abf366145a2c9c1e9f0a2184139d2adce", + "sha256": "0war99vbim62l010gxq3l68ac5w13gs5lh24yn1rpnq2jfp4jn3r" } }, { @@ -93177,8 +93583,8 @@ "helm", "restclient" ], - "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", - "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" + "commit": "f59a7f5abf366145a2c9c1e9f0a2184139d2adce", + "sha256": "0war99vbim62l010gxq3l68ac5w13gs5lh24yn1rpnq2jfp4jn3r" } }, { @@ -93434,15 +93840,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210912, - 1227 + 20211113, + 1958 ], "deps": [ "transient", "wgrep" ], - "commit": "fa7293df75e1a3f2fb26add6bc96058000e6fbe3", - "sha256": "0a9xhfs1knxxqilpbpw3li8vipg248nqhpqq5d6sqqn7gfz4zmjb" + "commit": "47bda7ee2f3c14082f9dd468063d45667a9d5256", + "sha256": "0m1ykfx2yfhqbzv1ppj2p2dbi7c3kck7p1k7s8z6c955wnday5xc" }, "stable": { "version": [ @@ -94097,8 +94503,8 @@ 20210313, 1541 ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -94123,8 +94529,8 @@ "deps": [ "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -94610,20 +95016,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20211022, - 1728 + 20211116, + 2008 ], - "commit": "6e1004490f385d9410e53160204c0760b76b2230", - "sha256": "0b94l19grb2w5lmz908sqhv6qmmjg9516hjqcs69n2rk8khxcq18" + "commit": "aadd1dd8f0780692aea1637569aeadfa8f78fd5a", + "sha256": "18qqwm05rhbw6bbkg6iifh2xhjww1psah32d7dzjjyc42kswj2ab" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "d0c1ffa68d0ba0af0b35b761d2d73a2c1b4fc7a3", - "sha256": "08gz7wq1las3bqqs8qhmhmncax4j6kjnyxpfzslby3b1dkclc7ig" + "commit": "d2b4cde98b660efd746d8853cf8ac04e4570e047", + "sha256": "1chb3a97cwf1pkxn8cm3wc35gfh9k55l7khg7pklmx36isr3csjv" } }, { @@ -94657,8 +95063,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20211018, - 1934 + 20211112, + 1404 ], "deps": [ "dash", @@ -94672,8 +95078,28 @@ "spinner", "xterm-color" ], - "commit": "d76d4128db2287ed5ff067634aac94970d99f438", - "sha256": "078g4ig74y4sy6ki07pkw8n2qivdv6ijwf72i55imw01scpm0k5x" + "commit": "28b9b6a69ba67e9715b7feb6b3ed56e00ac08acb", + "sha256": "0q2695hwrjw3jzy4wg96ma5z8f7ijw08ssvmkbcn57a77wh1xk6v" + }, + "stable": { + "version": [ + 2, + 1 + ], + "deps": [ + "dash", + "f", + "let-alist", + "markdown-mode", + "project", + "rust-mode", + "s", + "seq", + "spinner", + "xterm-color" + ], + "commit": "814775bc7c0ca2cf9041b6d012bf656df7eb554b", + "sha256": "0nklqpd24s83ng34xrm4rp80sbylajikj6svz1c6j721pz9crxg9" } }, { @@ -95162,8 +95588,8 @@ 20200830, 301 ], - "commit": "5532563a6707187a990409fd5deca3e01a220d24", - "sha256": "02664kfad9ahh8b3nlkp7fipkbn0ljryx2j2yx93kbaxi8lbq5zm" + "commit": "fc669b449c836d66dc9d542dad766e568952c986", + "sha256": "1i9aak2k8zzj2i1wj7xhi750rn8c4wsmcp95w3zabprwxwr790hh" } }, { @@ -95546,11 +95972,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20211022, - 523 + 20211104, + 259 ], - "commit": "d8582732d1eb03c7f6bba62f39ba66af365dde2c", - "sha256": "19w6hlwm92mp45hrskp324m6qfhqvnpbphgdgkkikdr9n7c8wfg8" + "commit": "8962f5f8a79c9178a577732ddfbb333a101bc7fc", + "sha256": "157affz6jsar9gnj5nj8ks8zl3dyrwzq4j1g0njvcs4vpz5zf4p9" } }, { @@ -95561,11 +95987,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20211006, - 1416 + 20211104, + 51 ], - "commit": "a2d6996a36ee2d3d4d4426d1bea60b6717ded10d", - "sha256": "0ixjwi3m0dmsivdqfm1bcs7rbp1cw0fhw4hgj4ym49p1acjhha5f" + "commit": "0cf26a15bb6278c4273ee53f6a8d7d790792fc29", + "sha256": "0ns1mxbfw5s7mimzqwxbi2sbbs6w60gi7z3l5hmxiv1qwdl0a8p7" } }, { @@ -96020,8 +96446,8 @@ "prescient", "selectrum" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -96198,15 +96624,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210930, - 1319 + 20211116, + 326 ], "deps": [ "dash", "edit-indirect" ], - "commit": "62c037e2ab1bfcce79ea3316b2fb70ffff291b3d", - "sha256": "0a82mds1l7hnfkifirjq6mp2cdfdfkaxvz6dw4i8sqzygw1dn7dl" + "commit": "0a2dc1a22955fdd065f04dfdd5242f1b61b4a303", + "sha256": "1j1yd9d5hb5ryv0yx02lga0drgyfhkqwli5zrkrhili8h43g522d" }, "stable": { "version": [ @@ -96936,8 +97362,8 @@ 20211024, 2053 ], - "commit": "18875b02c43cf88738d25d9fa114aa7c3d905ed3", - "sha256": "1maz3adpkh1w0sxivy4fmhvh9a8giv91mbs23kxbc6zgjwnq0q0v" + "commit": "232a52eb5d7a9c3ca9f5983140578ddd86ba33a1", + "sha256": "0cz6d2msa3dxabbrd9vsm49s4g4f1a1cqi2bmzi96l327kbkzbqy" } }, { @@ -96987,6 +97413,30 @@ } }, { + "ename": "shenshou", + "commit": "8c4760dcd5eeb18604676989e460cfe84af1c39a", + "sha256": "0c7livcm6srj6ll9ibk0im6fxfjk74yi9x2mv5x02d2fzbqmy7m4", + "fetcher": "github", + "repo": "redguardtoo/shenshou", + "unstable": { + "version": [ + 20211103, + 1010 + ], + "commit": "5b9a400cafbf4778cdb4ab26f7718f8cb0c84705", + "sha256": "143b5np4d8vmpdyw1pzxl6xgh6pzfp0phhli0j4wsly83ivcf7w2" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "8e12d366ca371fc259294485047a431a7c610605", + "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j" + } + }, + { "ename": "shfmt", "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan", @@ -97065,11 +97515,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210924, - 445 + 20211029, + 150 ], - "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", - "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" + "commit": "cb3b873063304ce5e1a5fd386c5f8c933964cd55", + "sha256": "19ly819cg5nnjcsr3aqk21hriyv2v8v64xfmyvk1j5p668y6mqkm" } }, { @@ -98157,15 +98607,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20211021, - 807 + 20211108, + 2224 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "1378aa718781ec6d359845f0116e12865261b2ca", - "sha256": "0h0bqmvwnddqj0b18kcmn990mmngpnq118h28w28lzr65aa33m2r" + "commit": "9005cdaac4c0adaa8e26ee5285c7b155762c0ce5", + "sha256": "18xywimwhfnqbsr4x9bs8v78qkc287ka3by022aqgpfasr1bi7ff" }, "stable": { "version": [ @@ -98397,11 +98847,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210729, - 1613 + 20211114, + 1021 ], - "commit": "540a8c5b9a04af0a6907e07cb070f1fed8a76f48", - "sha256": "13m15gcsqmagxmjvn28kd5rhh0ly7d4p4malhg5m7cbbms4svv68" + "commit": "8b1b968651c6d1a8699d16c3a03d0d1e83ecca3d", + "sha256": "10yx6mhfdd79nl3qz5bj275i400hnnr5r951h84xif0hclhr1bxn" }, "stable": { "version": [ @@ -98905,15 +99355,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210904, - 1621 + 20211101, + 1101 ], "deps": [ "cl-lib", "dash" ], - "commit": "2834c66c4f09778d0c57e99886c329188eed591a", - "sha256": "0zy5jamid6qkx8rml9ccqv85f2sr10j1rp3j77acggkf6zf3c096" + "commit": "f59a40d54f35299007c396bd667ce3e9ec4714e3", + "sha256": "0n0c2knva2c6ajdhqglr2yzhr53sgqr4bscsd1lwmwajgb0iyrw3" }, "stable": { "version": [ @@ -99631,14 +100081,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210927, - 1622 + 20211114, + 1644 ], "deps": [ "cl-lib" ], - "commit": "46408f4a105e216c3c2d88659b8b28601d37d80e", - "sha256": "0wq5ckwx3wv4c4l8f9hz3ak6v5wy4lg5yh8xlsgn1h1x6yf8afpp" + "commit": "87c2efd11b4b71e000d8a464eb694852e22aa0e7", + "sha256": "058cflb2199yb2qpzhf5hckz4cknsxqpglmz4nvnfv6k2xbnijpb" }, "stable": { "version": [ @@ -99661,11 +100111,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210827, - 859 + 20211114, + 807 ], - "commit": "874694ed8569ae98959262cfb0c66a6528a60367", - "sha256": "1j6728229rrpamh4nn2v5mmlbb111i6ar7zh0g9d922k7vqr2nam" + "commit": "f34a171ff0e39549972edf533120f0b556f0b5ad", + "sha256": "07zxrf4xbh85d4sfxch6mcjgd6ga4a079k5fwqdm72pmi07659hf" }, "stable": { "version": [ @@ -99697,8 +100147,8 @@ "flycheck", "solidity-mode" ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -99722,11 +100172,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20211004, - 1910 + 20211112, + 1959 ], - "commit": "9c77b390eab999e5e54dc5c1068f57201e6628bf", - "sha256": "0i6kjvd82bq3djh4makf4czdbmg3sb5q74wbdfhdyikx6kkzfj0m" + "commit": "bac439dbd2097664df45e9fac0ce57e23462c14c", + "sha256": "1vs64gwm6zn47fl4nvaizkwh8zwnqh764yqcmggyz4awsxsxg6ym" }, "stable": { "version": [ @@ -100473,11 +100923,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211025, - 312 + 20211108, + 203 ], - "commit": "74079bfbc37cddbd4161f883503bb190d885ae1e", - "sha256": "1k9jlhfgvgshhq4kiy87wg4fra70gmm95ws27bmqah8fld719jj8" + "commit": "570ccd84edddb60e6fc0f6bde5a9fb9b07ed2aa0", + "sha256": "0n9b3b8lgr9g4xc5md11agbpr1b7ahpdxphnwy473vw1fzgnj1fl" } }, { @@ -101065,11 +101515,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210902, - 626 + 20211116, + 1936 ], - "commit": "021239f0e2bcc60257b72916db9cdd110588ec28", - "sha256": "0v79z2d9l824j6chsviffdsfb4m9w93kgwcwdaksdb5rsfmryigp" + "commit": "8874e933643b91d9c545fd4ca3f0ea986561da31", + "sha256": "1s0ivhg6rbk5k9yzy8gy589ybba7dnc9cksz4wwsgcsm931sx9fz" }, "stable": { "version": [ @@ -101493,16 +101943,16 @@ 20200606, 1308 ], - "commit": "ef629fd74c5d963f5b68507179896169a34a078e", - "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" + "commit": "d5bef96e847b50bd436725fa3b102f0c41b56bae", + "sha256": "1x2fyh6xyd1xzyhk1pk5x23j3if11rm8zpl75izkc3y6vw37haa3" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "05900351a9ec7b774931a2a59c15c9f0b6d443f6", - "sha256": "18gb1f9ndi64f5zyxrgy9wfjgbn0s12wv6b3817xnj61crhvqwd0" + "commit": "262b2fc5b533f6f609c43a6f543c9d0d185b8f55", + "sha256": "0g0jnry8y858dl3z5w4zd02s0lq9qvha848xb8i1xpsx8xh8plf9" } }, { @@ -102221,20 +102671,18 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20200830, - 1107 + 20211108, + 1333 ], - "commit": "5b209ff7b7d3dcd09b623915aba1e137c875fa0e", - "sha256": "0ym0rfyrnj4f6c6nhz0yfvl1n1fsdb2n20gksw4blqg94ccafqh1" + "commit": "56927306d8046f2ba38b8cadabde47c5b6851262", + "sha256": "03y5hh2al8m75bdjxwa052nqa3iryp08dkhvmaaa9b0i2fq233z5" }, "stable": { "version": [ - 2020, - 8, - 30 + 2021 ], - "commit": "99fd77d25fc12c0a9f1fc75f0b83b31774d493bd", - "sha256": "12b2534cz9qqc923cf4nj76gmx3l19wrqmha077rlgl5pqlgqh6b" + "commit": "56927306d8046f2ba38b8cadabde47c5b6851262", + "sha256": "03y5hh2al8m75bdjxwa052nqa3iryp08dkhvmaaa9b0i2fq233z5" } }, { @@ -102454,26 +102902,25 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20210501, - 2201 + 20211109, + 1601 ], "deps": [ "dash" ], - "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", - "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + "commit": "d84adab82ca5f84847702671dd60c0377c82ccd9", + "sha256": "1xqlflk0k1zcsblydsx583mrh5zxpjbah8h1jb1lrfzwrbx0m627" }, "stable": { "version": [ 0, - 2, - 4 + 3 ], "deps": [ "dash" ], - "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", - "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + "commit": "d84adab82ca5f84847702671dd60c0377c82ccd9", + "sha256": "1xqlflk0k1zcsblydsx583mrh5zxpjbah8h1jb1lrfzwrbx0m627" } }, { @@ -102567,14 +103014,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20211017, - 542 + 20211031, + 543 ], "deps": [ "seq" ], - "commit": "e24626440ce350596f4c1676f6644437a0500bbd", - "sha256": "09pr8v78nz8nza9l4g87i0xfnp84rmjm2kq1ff6g4a6nisdxyfxm" + "commit": "4777c409ba0cd0d02b9a8397ba810e449b5ac213", + "sha256": "0dmrshlkhavzlfxhm2fi37x7rf1h203iiamdqvqb7dqq0axah5r7" }, "stable": { "version": [ @@ -102906,8 +103353,8 @@ "hydra", "multiple-cursors" ], - "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", - "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" + "commit": "5675976cad4cbeee30f43e6c4b28c2e5904575a5", + "sha256": "06cl7njizn68vml21lsl3p66wpcdcw6ah49jqjvwzjkzivrds3m5" } }, { @@ -102947,11 +103394,11 @@ "repo": "lassik/emacs-symbolist", "unstable": { "version": [ - 20210503, - 1220 + 20211107, + 1615 ], - "commit": "f600e07fe06c19b67f917a8839bbcd6c78f1fbd4", - "sha256": "02x71kdnkhyzscc2bxayv55qfanqy0hm7rckq4mqhxbryjz7qcab" + "commit": "92b712734941a45da7d47fd61b95e4013ff53481", + "sha256": "0033qxn1zx90lws6a8ibg7xx5xxpiwzr08fj86k5w84nj6nvwras" } }, { @@ -102988,8 +103435,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20211016, - 51 + 20211115, + 2045 ], "deps": [ "evil", @@ -103001,8 +103448,8 @@ "seq", "undo-tree" ], - "commit": "6dab41cf72fb5f25e0de30fde64fee960944a604", - "sha256": "1p8x7q1hf3bbblm43b4w3kns8ns6zjsz008x7pgvinqwi78a6nfs" + "commit": "ce33a7858481da2a1a07558b0932b19328d3449b", + "sha256": "017a6bmacfcwqy7x89pzpgkqpipl8i5hbp429cqpw7xdhjwgc2in" }, "stable": { "version": [ @@ -103650,11 +104097,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20210726, - 1827 + 20211027, + 1900 ], - "commit": "f35b97823f27e8d0f378bbd18b79a61f9e34cc55", - "sha256": "097zvklc90dy90p62fbk5khnysijzmb6knvzyi8m6wba2g32v4mh" + "commit": "2d271a2733463f3be711c31da036236b53f6224e", + "sha256": "0n4n3ln5n3ygkb2pa9ag8pwqqs7a9lkzzb0j04b0rphjhmsn5hbr" }, "stable": { "version": [ @@ -103865,15 +104312,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211024, - 712 + 20211116, + 1246 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "a8ae6b54f047426778b4c72d315c45603c0eb24a", - "sha256": "1l6hzrr363l44g54idamcra3rn3wmlkfc545v8lq0rj3gnnpzkd6" + "commit": "9bc087dab6d2503da41881132664f5c0c979f4b6", + "sha256": "1s3p9ndwiv08wh30i9rgdm2lz3a4xj9in2y4rrhywq4gnd5zbz7d" }, "stable": { "version": [ @@ -104657,11 +105104,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20211001, - 830 + 20211031, + 947 ], - "commit": "f73b0e63072463c91a75a292fa21d39a9f06b81c", - "sha256": "08m24ap72y461zpackcdprh48vivvd75jz85pw0ad51ysvxq0z08" + "commit": "d400c2692373c14d7cf773e7ae587cbe9c7d1e13", + "sha256": "1wbx74pc0lzb51gs43zhs66jid4kyaavcgckx37m5m05k17kdv97" } }, { @@ -104971,18 +105418,18 @@ 20200212, 1903 ], - "commit": "e5e1e1c5506c1bd2c83a3296cacbbb89a045cf36", - "sha256": "0glraqhqvvhml8by829cvj5rs9qd674drz0i6jgcqr4kyvvwzw89" + "commit": "c0cc1a6b7273feb1049206f58da5f469e28b56a9", + "sha256": "0pkwa42r33l30ddnmy8hkflwirf3xnv4fi5a6zxsm3ibi7z649fm" }, "stable": { "version": [ 2021, - 10, - 25, + 11, + 15, 0 ], - "commit": "adb281261e173ad5fa8d04db5bc52b221313f6f8", - "sha256": "1k7y24qkvcicmdw1f54ii777yy2qw5czzbyy4rb4aisfq8iygp45" + "commit": "7f44dce741f17712a5671b09f495059bd1f68d09", + "sha256": "1jldrq95cb2g27my88k98c8p33kbk04l0rc8vpwlyyxr602cx7k9" } }, { @@ -105038,8 +105485,8 @@ "deps": [ "haskell-mode" ], - "commit": "15794a97222d45036749bc7ab3a82e81fed12e87", - "sha256": "181ixq71pldpivf5qkfyrgpjx1cw5smaagcpayjrdawwrkpfkrm9" + "commit": "be7c02a4df03d695c8f8dca80817a736905ecf47", + "sha256": "1lh92rzafapx6yi7r24yzrxgv2v6wqvzg62j0pd3zqa6s499v4k9" }, "stable": { "version": [ @@ -105287,19 +105734,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20211018, - 2351 + 20211115, + 2323 ], - "commit": "653923cd419616dc1486abb919581a99e6d32539", - "sha256": "17y7rdb4bn9f44j5k8ixp1cbxn6prh67h4xim8hnypy7q2v4rl10" + "commit": "2934363d32ba6e817e789d5ecf5e68a51cfc0e8d", + "sha256": "001h23yhqys90dpqka4m3zcdnwbfxvjii5lxmj67shblslx5f4sl" }, "stable": { "version": [ 1, - 6 + 8 ], - "commit": "acb033ab8e3f4ab7899daa7a7fc0d67187b0554e", - "sha256": "1mnhymvwcb3dqzpbsa2z70w90zdqrmlwczgf1ql41c2fxw7wzaqa" + "commit": "3da96d529c09dc1000de425f937380895ab9efa6", + "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" } }, { @@ -105892,14 +106339,14 @@ "repo": "trueroad/tr-emacs-ime-module", "unstable": { "version": [ - 20210202, - 1057 + 20211114, + 440 ], "deps": [ "w32-ime" ], - "commit": "92591f7c0b94f8b1875f1078d1ba3be40848f0b8", - "sha256": "0r5cmj8ih8n7m37fqwyymmd0swyxr6g124cw9cz24ri0dyiwi73k" + "commit": "c35be849f2cf5470e9d9cc40ff54e285e5170e93", + "sha256": "0sy33f8c9l0189qhm8q2whb6yrsir52fqqq3wh54qkbqc8vvg7py" }, "stable": { "version": [ @@ -106065,26 +106512,26 @@ }, { "ename": "transient", - "commit": "331370880770a0332c35a499ea3044820afb9967", - "sha256": "1splwjaf4w9cgmld5c4q7l4kgma8k4ydlgflq14dfpb5pnxcn0rc", + "commit": "cdd8115e3ab3df5f74a21dbf63d89ee11b4f1c17", + "sha256": "04xkdspn475dlch5fcw21phhdhshxlbyznjbi0l7qk8snm130qpv", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20211023, - 2151 + 20211105, + 100 ], - "commit": "9e60c46f0728beca42e368d55de03e9c7ec62ddc", - "sha256": "0r33qf56rdlvf79cxkgymcv5l868xkbhz5smpsa5qms39rs97mna" + "commit": "349116159f707a474926b47e5f6b6240e8997a4d", + "sha256": "1yzjdr9rdxax8gcd0k978v9akb1wk2ff14wfigiaqkvqs3sd8zxy" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", - "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" + "commit": "74cba5a418ff1b1661494fc2970c330ecdbb4b22", + "sha256": "0c7wbd0j0b802bzdpdkrx2q7wm7b9s56rk554dnadkpywhmdiqwn" } }, { @@ -106308,6 +106755,29 @@ } }, { + "ename": "tree-edit", + "commit": "43726f8e4c4f7f673ca892ec17329471dba77b3e", + "sha256": "0537g2m5k3hwdisbag9724nkzx97x45ry602gjpqr9dzywd30g65", + "fetcher": "github", + "repo": "ethan-leba/tree-edit", + "unstable": { + "version": [ + 20211116, + 1613 + ], + "deps": [ + "dash", + "reazon", + "s", + "tree-sitter", + "tree-sitter-langs", + "tsc" + ], + "commit": "6fd445dbeb158d05d785965077cc594aeeb73a61", + "sha256": "0h1zjdqxynxxlqdc9yxhmkjwarx4vn9anasv9i68fcmmnq7c0aw9" + } + }, + { "ename": "tree-mode", "commit": "84f836338818946a6bb31d35d6ae959571128ed5", "sha256": "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b", @@ -106455,8 +106925,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211019, - 1654 + 20211115, + 2031 ], "deps": [ "ace-window", @@ -106468,14 +106938,14 @@ "pfuture", "s" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "ace-window", @@ -106487,8 +106957,8 @@ "pfuture", "s" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106499,28 +106969,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211107, + 1818 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106538,21 +107008,21 @@ "evil", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "evil", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106569,20 +107039,20 @@ "deps": [ "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106601,22 +107071,22 @@ "pfuture", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106635,22 +107105,22 @@ "persp-mode", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106669,22 +107139,22 @@ "perspective", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106702,21 +107172,21 @@ "projectile", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "d00cc19cab8df4fec7ed6608e00bd16fe797369a", + "sha256": "167jn29vqx5q5nd2ja9bi1srz623zmq7jpd79al0s98ngnw8hpr7" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "projectile", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -107442,24 +107912,6 @@ } }, { - "ename": "typoscript-mode", - "commit": "701de09cb97cbfa49a3a81aaeb9577817566efa2", - "sha256": "18i2wwbn8vj5dbgxp2ds29n12v8ldvxjd1zb6h1g9lfh8iyrnjmx", - "fetcher": "github", - "repo": "ksjogo/typoscript-mode", - "unstable": { - "version": [ - 20170126, - 912 - ], - "deps": [ - "use-package" - ], - "commit": "44e7567e921573c4f33c537b827f71fb1f565c32", - "sha256": "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8" - } - }, - { "ename": "ubuntu-theme", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2", @@ -107774,11 +108226,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20211007, - 306 + 20211030, + 612 ], - "commit": "71c474e29f6ad726386604a5058761892951782e", - "sha256": "1rwcr0d1nrkvssiyf2s7zicp3did8y4x5p0vmvg8n0d3vqsh3d3v" + "commit": "ab8bc10e424bccc847800c31ab41888db789d55d", + "sha256": "1vdaysc328gwqi57fp4cfbl96g76m8wc2qr53wgb3l89m9kx5sgg" } }, { @@ -109390,20 +109842,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210809, - 2140 + 20211103, + 1927 ], - "commit": "6f5b454782d5c2ce9d86616c3d015935d3d5dd6b", - "sha256": "172520apwczyp6c0apga1bz2vbfzy60jdyiq09sjk34533fymcg4" + "commit": "6250360b3b06f590dd37885f3c33a451a3eab5d3", + "sha256": "07xdl2ng435iy9zqrq1wgrmwygarc91kqmz6ck1ngvn4mh86ndxk" }, "stable": { "version": [ 2, - 14, + 15, 0 ], - "commit": "0d7f7d36f6ae8130a9bd40845f156a3e3b30eb49", - "sha256": "1bpfxfgq5q022rx592wkigj5chq8ihry8lgrni4rsqbbmbrc1h4b" + "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", + "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" } }, { @@ -109470,20 +109922,19 @@ "repo": "mihaiolteanu/versuri", "unstable": { "version": [ - 20200316, - 852 + 20211104, + 1301 ], "deps": [ "anaphora", "dash", "esqlite", "esxml", - "ivy", "request", "s" ], - "commit": "41e20583d1080beeeda0e36d1b2e6d74b9c57920", - "sha256": "0fgc1rai9gp6lwl0rxr9400vi420py0c0b8nv9wzl12ph80yhwj7" + "commit": "c8ea562304194f3379ed8f9c6a785ce8ee72898e", + "sha256": "1ak5f6g9sqd2dwplipnacg6kknkpf1j6df5am0hqcmlsk052d12s" } }, { @@ -109787,11 +110238,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20210928, - 758 + 20211103, + 209 ], - "commit": "24271e081be3bb9ebcb41e27e1dad9623a837205", - "sha256": "1np4mbw1fry8ja74vy3hjs9fx301c7k8zq3h4a9i7jbnkvzh9iyi" + "commit": "4effa95c7d6243fc5696597f488653f9d2a5d4a6", + "sha256": "164yiiqqxk2fpjk65y72fr71j05b1330zmvbaxh0w3ww2axkjz68" } }, { @@ -109881,17 +110332,17 @@ }, { "ename": "visual-fill-column", - "commit": "c7628c805840c4687686d0b9dc5007342864721e", - "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5", - "fetcher": "github", - "repo": "joostkremers/visual-fill-column", + "commit": "39ada1dc39158e956a1251cd41cfa2259b51da21", + "sha256": "1bbly6sd77cnxl1c4n24039cgfwn0mcq6l3jgyh8z7bk6lnsjfw2", + "fetcher": "git", + "url": "https://codeberg.org/joostkremers/visual-fill-column", "unstable": { "version": [ - 20211014, - 2141 + 20211110, + 2317 ], - "commit": "2df643827a4fd82b732ea93042916c61078d4206", - "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" + "commit": "ae4edc225acea12a035c0586185847306ecb06ef", + "sha256": "18qac66mpvgmp1pw0lvarjngwh9cx75an44n1pg2msbxkkm98zkj" }, "stable": { "version": [ @@ -110321,8 +110772,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20210715, - 907 + 20211116, + 1109 ], "deps": [ "bind-key", @@ -110331,8 +110782,8 @@ "s", "versuri" ], - "commit": "b327a5224ab45f6689ce635878301e54ca753b3b", - "sha256": "1sq2nmmw8ga4jhkgb3a0mkps7v8ma1jrrz8c1vbypfn1b3amvj3b" + "commit": "ddfd4be99b46ddc042139028980ad8dd616b7d45", + "sha256": "10wjzx8vq8k16dwcjppnr28pkiilxl2ak78h60h68flakmdzibmg" }, "stable": { "version": [ @@ -110358,16 +110809,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20211023, - 1716 + 20211115, + 1433 ], "deps": [ "org", "org-roam", "s" ], - "commit": "d6792e95c499a2ee85b0d8b11295b61777a46038", - "sha256": "08h26ki2j5nx5rxhgi6vxmxwpisg8d9vg8jsmcczlql2sfmsh8mj" + "commit": "0c16e1c1adb45e8aaa32f06edc604e18d39179eb", + "sha256": "1217gni713nc5y37wfspnc5b790chri96an4hzv1jra33lazn49y" }, "stable": { "version": [ @@ -110453,11 +110904,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20211009, - 252 + 20211025, + 2324 ], - "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", - "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" + "commit": "cb3b873063304ce5e1a5fd386c5f8c933964cd55", + "sha256": "19ly819cg5nnjcsr3aqk21hriyv2v8v64xfmyvk1j5p668y6mqkm" } }, { @@ -110530,11 +110981,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20210818, - 1556 + 20211104, + 1455 ], - "commit": "8dfe67c1581a0f3688c572dfdb5f8f71d3f874a0", - "sha256": "1rpl2hj1413kcxvxl27jycjl40js8cybf2qrhvjfwfhxncpwacxv" + "commit": "0f94ac2dd4fa125fc5f152700779edce75a6b03b", + "sha256": "1iqmd763gik32blrc8ki9rikm3k5iksm0xg12rffmilawc2vn480" } }, { @@ -110545,11 +110996,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20210903, - 1619 + 20211116, + 2049 ], - "commit": "627e94389fe754da9802a8c93e4a3d1a1831967b", - "sha256": "0i0a9imkpz0aq4r340vd2li22m1wnv7p83s4bcaihl1z8axfa611" + "commit": "b2a62fb74f2fdfd00fd56ff8343651fa0a079f50", + "sha256": "0j47xxch74j09xxi2v2m42cyzcfa6zbvb6wpyjk9dif6pjn1q3n8" } }, { @@ -110587,8 +111038,8 @@ "org", "transient" ], - "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", - "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" + "commit": "0cb9c2fef6e611b4389f7df7fcccc17744053e9b", + "sha256": "1fv4bn6c04kv39jv25r09pvxc5hz5gwwbj16fhxs5930rf77ikqb" }, "stable": { "version": [ @@ -110678,16 +111129,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20211008, - 1118 + 20211115, + 1206 ], "deps": [ "apel", "flim", "semi" ], - "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", - "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" + "commit": "aef23d6e50b7e29ff4ff11d288f36f6ba03f29ac", + "sha256": "06rj754ygv0455hkyb62ihqk844jx6cx18n5vixjmcws6hvpi9al" } }, { @@ -111620,11 +112071,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20210429, - 805 + 20211104, + 812 ], - "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", - "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" + "commit": "f22244202fdac5064d5eff95c6f35ae887b01142", + "sha256": "0zv80aarrqlgnp7icvmm9yxlpc9qpdzn73lfrvrpry1rmv301wfp" }, "stable": { "version": [ @@ -112193,11 +112644,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211015, - 1917 + 20211028, + 2105 ], - "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", - "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" + "commit": "cfe70f43c551852125bc139df467e28e1b6087df", + "sha256": "0i38y7kw0fpb1ii8bfiidh5xkinldzzz1c0i33zvwym76a28birb" }, "stable": { "version": [ @@ -113033,8 +113484,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210630, - 740 + 20211102, + 1607 ], "deps": [ "aio", @@ -113044,8 +113495,8 @@ "f", "s" ], - "commit": "95b0b37cf5bb6474f054056b0dad9402c700c5b7", - "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" + "commit": "61f4fe7b5cc2549ea7363635307279becac53ea7", + "sha256": "188p1lk7d6gbnshikb7qf646ljpcrsdssr0k9jd1vgga8iz22k0d" } }, { @@ -113498,6 +113949,21 @@ } }, { + "ename": "xwiki-mode", + "commit": "3288cf8d5b62e01c64ce9ab572275df5ab58a27f", + "sha256": "0ykgs5hnil5837x59x31xjf86l8l5fi9bf8jg71bmq61qvhxfkvi", + "fetcher": "github", + "repo": "ackerleytng/xwiki-mode", + "unstable": { + "version": [ + 20211112, + 511 + ], + "commit": "580e65296ca0ffb20270610ef16bfeb8850fc7c8", + "sha256": "0izsj9krl4lhm33w9hh6gjihns4lrgaf40qiiif43n05jha7fj0z" + } + }, + { "ename": "xwwp", "commit": "83c34ae5023410cc31f93255275d6465b6152a10", "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1", @@ -113999,25 +114465,25 @@ "repo": "mineo/yatemplate", "unstable": { "version": [ - 20200625, - 1336 + 20211115, + 1208 ], "deps": [ "yasnippet" ], - "commit": "399564fc1afa100aa6049ac6de11fb065882d230", - "sha256": "0gvysijv659z843r692wzfjz5p8j2dr79m8fzcnajnrpim9jf2j8" + "commit": "275745ce1482edc08efb0b7807bc86d832bcc734", + "sha256": "1dkxzvsmz193nwybi3wi00k0wwhkbpnj4yi7gxdrgix6kxbpjd9i" }, "stable": { "version": [ - 4, + 5, 0 ], "deps": [ "yasnippet" ], - "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", - "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" + "commit": "275745ce1482edc08efb0b7807bc86d832bcc734", + "sha256": "1dkxzvsmz193nwybi3wi00k0wwhkbpnj4yi7gxdrgix6kxbpjd9i" } }, { @@ -114261,11 +114727,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210713, - 455 + 20211031, + 456 ], - "commit": "06a6bcfc58d1f1cd8815c674c9fcbbf193bba0a9", - "sha256": "0mp68h924hfj86rya0kvk16w82lvllmiryz8ry70ngcfmwdh930v" + "commit": "787bb0a13c6e1b28e904e1b7f18564d5e97c9c93", + "sha256": "1yf6nnvzx7pv7qfx1wln9ksanapnf5b0chyrdhzy9wyjfx00hclz" }, "stable": { "version": [ @@ -114383,14 +114849,14 @@ "repo": "zv/z3-mode", "unstable": { "version": [ - 20151120, - 2255 + 20211116, + 138 ], "deps": [ "flycheck" ], - "commit": "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1", - "sha256": "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z" + "commit": "0356cbe1e1e2b780ba0ddb4aaa055fa246a67931", + "sha256": "0jlnxxzh9p7285m16w33l5529iglg5cihs6gqwnb6y34wpzwyar6" } }, { @@ -114533,10 +114999,10 @@ }, { "ename": "zeno-theme", - "commit": "8aef13a70809ee1fc00f0e8c2853936380b22422", - "sha256": "1hq3yx0l6v2wwgmmsq5c7h5chbila9flpvsr1a9fpq09lbq2yq7g", + "commit": "e6f007367d181005ebd1a4d73085d73e807d3583", + "sha256": "01kp0j27q9v62d45ail65al9zzfxpx7d7bj6gdzilbmwk3k7lxq5", "fetcher": "github", - "repo": "zenobharat/zeno-theme", + "repo": "zenobht/zeno-theme", "unstable": { "version": [ 20181027, @@ -114640,14 +115106,14 @@ "repo": "NicolasPetton/zerodark-theme", "unstable": { "version": [ - 20210216, - 1640 + 20211115, + 841 ], "deps": [ "all-the-icons" ], - "commit": "ee49ea9e875d7a3da63386880ca3a9e10b1051e5", - "sha256": "06q1v0fkxyxadrpgy28gh85j19vi4ars2xrbbm1bz28xrcbnps04" + "commit": "b463528704f6eb00684c0ee003fbd8e42901cde0", + "sha256": "1ajgz5mbvzv92p1g3k6p94v11z3xyj5w81fpfiwhlvh30imx6z9q" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix index 61749a89fde44..71f9981f461a9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix @@ -1,27 +1,29 @@ -{stdenv, fetchurl, emacs}: +{ stdenv, fetchurl, emacs, lib }: -stdenv.mkDerivation { - name = "session-management-for-emacs-2.2a"; +stdenv.mkDerivation rec { + pname = "session-management-for-emacs"; + version = "2.2a"; src = fetchurl { - url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; + url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; - buildInputs = [emacs]; + buildInputs = [ emacs ]; installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = with lib; { /* installation: add to your ~/.emacs - (require 'session) - (add-hook 'after-init-hook 'session-initialize) + (require 'session) + (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; homepage = "http://emacs-session.sourceforge.net/"; - license = "GPL"; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix index 1e1fffe9adbc2..eaa7d8b577934 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix @@ -6,13 +6,13 @@ trivialBuild rec { pname = "sunrise-commander"; - version = "0.pre+unstable=2021-07-22"; + version = "0.pre+unstable=2021-09-27"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "7662f635c372224e2356d745185db1e718fb7ee4"; - hash = "sha256-NYUqJ2rDidVchX2B0+ApNbQeZFxxCnKRYXb6Ia+NzLI="; + rev = "16e6df7e86c7a383fb4400fae94af32baf9cb24e"; + hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; buildInputs = [ diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 4f78267dbe5da..05841bb1bac2d 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: stdenv.mkDerivation rec { - name = "fte-0.50.02"; + pname = "fte"; + version = "0.50.02"; nativeBuildInputs = [ unzip ]; buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index a46124daab2a9..c0c8e2a57b363 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "helix-editor"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lScMHZ/pLcHkuvv8kSKnYK5AFVxyhOUMFdsu3nlDVD0="; + sha256 = "sha256-NoVg/8oJIgMQtxlCSjrLnYCG8shigYqZzWAQwmiqxgA="; }; - cargoSha256 = "sha256-N5vlPoYyksHEZsyia8u8qtoEBY6qsXqO9CRBFaTQmiw="; + cargoSha256 = "sha256-kqPI8WpGpr0VL7CbBTSsjKl3xqJrv/6Qjr6UFnIgaVo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index a1b90b83d589b..9adce387f4077 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -23,6 +23,22 @@ stdenv.mkDerivation rec { url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch"; sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) + + # Fix pending upstream inclusion for gcc10 -fno-common compatibility: + # https://github.com/LonnyGomes/hexcurse/pull/28 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/LonnyGomes/hexcurse/commit/9cf7c9dcd012656df949d06f2986b57db3a72bdc.patch"; + sha256 = "1awsyxys4pd3gkkgyckgjg3njgqy07223kcmnpfdkidh2xb0s360"; + }) + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/LonnyGomes/hexcurse/pull/40 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch"; + sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y"; + }) ]; meta = with lib; { diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 3992fc5c2ec47..4d8835c29c5f1 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -17,7 +17,7 @@ let loName = toLower product; + ".vmoptions"; in -with stdenv; lib.makeOverridable mkDerivation rec { +with stdenv; lib.makeOverridable mkDerivation (rec { inherit name src; meta = args.meta // { inherit mainProgram; }; @@ -94,4 +94,4 @@ with stdenv; lib.makeOverridable mkDerivation rec { } // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; -} +}) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 05ee956e46799..4c65ddcc8f670 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.2.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1n0yrk05xv4pard82b6z349ksiw8k75s9525pnpa2ny1ay1klhdg"; /* updated by script */ + sha256 = "03x7yz8jz5r4pblm7cvph39zppa33lalvkpzmgvr3wjq0chqmh65"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,13 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ versionMajorMinor = "2021.2"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1yawjc5xwga1mmlsl3068ml532941mq08i9ji3dhj1nwdkyav2jz"; /* updated by script */ + sha256 = "011prnpab72kfgkwq0ms27qqnjamh33h023gb01fxvqwwzcmp6sk"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -334,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0s9kk3n5ac6lvqi2yw9gvvm45865jchiwyrs8pq2dgdkgaligrjv"; /* updated by script */ + sha256 = "0m98qhkgwnmqkay8sclfyig2xcqvpva74l2kdira3r5sbszmxvcr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -347,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0mgmmf926n3ipr8fxn6f9hsa5vkil8yrw5qlixi8nwnx7chmkp56"; /* updated by script */ + sha256 = "0zp72ag9jqhq0sv4x5n43d6g9y2yzkxa4pkflc7gd5rpg555cqr7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1a3vlqza9nbc4a2qxrzdckmq003zx1db9dy7wx462amc8sbh6v92"; /* updated by script */ + sha256 = "0d79x1jz4ymd6cc1n4s3y3n8lb6gw4g0yj6d4qzjlr5c9snx3zdf"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 140bf04c9f365..7a57e21710950 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, - boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, + boost, libepoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtksourceview3 at-spi2-core pcre - epoxy + libepoxy boost libXdmcp cmake diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 1e7d38086b79c..e8c2760973a65 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2021.10.28"; + version = "2021.11.08"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "sha256-ph0063EHyFa7arXvCVD+tGhs8ShyCDYkFVd1w6MZ5Z8="; + sha256 = "sha256-lMGMt0H1G8EN/7zSVSvU1yU4BYPnSF1vWmozLdrRTQk="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index 5ff2a03441def..cf9a65c43f2b3 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -33,7 +33,7 @@ let deprecations = lib.mapAttrs (old: info: throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." - ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + ) (lib.importJSON ./deprecated.json); in mapAliases ({ diff --git a/pkgs/applications/editors/kakoune/plugins/update-shell.nix b/pkgs/applications/editors/kakoune/plugins/update-shell.nix new file mode 100644 index 0000000000000..ca83f09c7154b --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/update-shell.nix @@ -0,0 +1,15 @@ +{ pkgs ? import ../../../../.. { } }: + +with pkgs; +let + pyEnv = python3.withPackages (ps: [ ps.GitPython ]); +in + +mkShell { + packages = [ + bash + pyEnv + nix + nix-prefetch-scripts + ]; +} diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 40a28d9afe2c3..9f5f64f9e5b33 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3 +#!nix-shell update-shell.nix -i python3 # format: # $ nix run nixpkgs.python3Packages.black -c black update.py diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 6819c4337f4c7..686113452eb81 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -22,10 +22,11 @@ }: mkDerivation rec { - name = "kile-2.9.93"; + pname = "kile"; + version = "2.9.93"; src = fetchurl { - url = "mirror://sourceforge/kile/${name}.tar.bz2"; + url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; }; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index cf4a752b1bd07..ee22c591ad776 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.2.1"; + version = "6.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9"; + sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; }; dontBuild = true; diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix new file mode 100644 index 0000000000000..18fbf566876c1 --- /dev/null +++ b/pkgs/applications/editors/libresprite/default.nix @@ -0,0 +1,111 @@ +{ lib +, stdenv +, fetchFromGitHub + +, cmake +, pkg-config +, ninja +, gtest + +, curl +, freetype +, giflib +, libjpeg +, libpng +, libwebp +, pixman +, tinyxml +, zlib +, SDL2 +, SDL2_image +, lua +, AppKit +, Cocoa +, Foundation + +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "libresprite"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "LibreSprite"; + repo = "LibreSprite"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ninja + gtest + ]; + + buildInputs = [ + curl + freetype + giflib + libjpeg + libpng + libwebp + pixman + tinyxml + zlib + SDL2 + SDL2_image + lua + # no v8 due to missing libplatform and libbase + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + ]; + + cmakeFlags = [ + "-DWITH_DESKTOP_INTEGRATION=ON" + "-DWITH_WEBP_SUPPORT=ON" + ]; + + hardeningDisable = lib.optional stdenv.isDarwin "format"; + + # Install mime icons. Note that the mimetype is still "x-aseprite" + postInstall = '' + src="$out/share/libresprite/data/icons" + for size in 16 32 48 64; do + dst="$out"/share/icons/hicolor/"$size"x"$size" + install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png + done + ''; + + passthru.tests = { + libresprite-can-open-png = nixosTests.libresprite; + }; + + meta = with lib; { + homepage = "https://libresprite.github.io/"; + description = "Animated sprite editor & pixel art tool, fork of Aseprite"; + license = licenses.gpl2Only; + longDescription = + ''LibreSprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + ''; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/LibreSprite/LibreSprite/issues/308 + broken = stdenv.isDarwin && stdenv.isAarch64; + }; +} diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix new file mode 100644 index 0000000000000..3b38004eddbac --- /dev/null +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -0,0 +1,65 @@ +{ agg +, fetchFromGitHub +, fetchpatch +, Foundation +, freetype +, lib +, lua5_2 +, meson +, ninja +, pcre2 +, pkg-config +, reproc +, SDL2 +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "lite-xl"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "lite-xl"; + repo = "lite-xl"; + rev = "v${version}"; + sha256 = "sha256-+RbmT6H/5Ldhv3qOClxMjCSGMudbkGtkjo2SpGqExao="; + }; + + patches = [ + # Fixes compatibility with Lua5.2, remove patch when PR merged + # https://github.com/lite-xl/lite-xl/pull/435 + (fetchpatch { + name = "0001-replace-unpack-with-table.unpack.patch"; + url = "https://github.com/lite-xl/lite-xl/commit/30ccde896d1ffe37cbd8990e9b8aaef275e18935.patch"; + sha256 = "sha256-IAe3jIyD3OtZtu1V7MtPR4QzFKvU/aV/nLQ4U9nHyIQ="; + }) + # Lets meson fallback to the system reproc if available. + # remove patch when 2.0.2 is proposed. + (fetchpatch { + name = "0002-use-dependency-fallbacks-use-system-reproc-if-available.patch"; + url = "https://github.com/lite-xl/lite-xl/commit/973acb787aacb0164b2f4ae6fe335d250ba80a7b.patch"; + sha256 = "sha256-GmgATsRlj1FePmw3+AoWEMZIo2eujHYewKQCx583qbU="; + }) + ]; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ + agg + freetype + lua5_2 + pcre2 + reproc + SDL2 + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; + + meta = with lib; { + description = "A lightweight text editor written in Lua"; + homepage = "https://github.com/lite-xl/lite-xl"; + license = licenses.mit; + maintainers = with maintainers; [ boppyt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 6b93153ec041d..2f75fb34cd183 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir "$out"/Applications mv app/mindforger.app "$out"/Applications/ - wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger ''; meta = with lib; { diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 8655235f2927f..6a55e7c8e3968 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, lua, ncurses, pkg-config -, unibilium, xsel, gperf +, unibilium, gperf , libvterm-neovim , tree-sitter , glibcLocales ? null, procps ? null @@ -113,10 +113,6 @@ in substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = lib.optionalString stdenv.isLinux '' - sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim - ''; - # export PATH=$PWD/build/bin:${PATH} shellHook='' export VIMRUNTIME=$PWD/runtime diff --git a/pkgs/applications/editors/oni2/common.nix b/pkgs/applications/editors/oni2/common.nix new file mode 100644 index 0000000000000..e049c3ae64167 --- /dev/null +++ b/pkgs/applications/editors/oni2/common.nix @@ -0,0 +1,252 @@ +{ lib, stdenv, nodePackages +# Fetch dependencies +, fetchFromGitHub, gitMinimal, curlMinimal, cacert, yarn, unzip, xorg, nodejs +, ripgrep, fontconfig, libGL, libGLU, ncurses, acl, harfbuzz, libjpeg, expat +, icu58, libpng +# Build +, jq, perl, makeWrapper, bash, which, nasm, python2, gn, ninja, cmake, clang +, fixup_yarn_lock, callPackage }: + +{ variant, version, rev, sha256, fetchDepsSha256, license }: + +let + source = fetchFromGitHub { + repo = variant; + owner = "onivim"; + inherit rev sha256; + }; + + fetchDeps = stdenv.mkDerivation { + name = "oni2-fetch-deps"; + + unpackPhase = '' + cp ${source}/{release,package}.json ./ + cp -r ${source}/{release.esy.lock,node,extensions} ./ + chmod -R +w node extensions + ''; + + nativeBuildInputs = [ + jq + nodePackages.esy + gitMinimal + curlMinimal + cacert + python2 + perl + unzip + yarn + ]; + + buildPhase = '' + export ESY__PREFIX=$NIX_BUILD_TOP/esy + export ESY__GLOBAL_PATH=PATH + + esy '@release' install + + ln -s $NIX_BUILD_TOP/esy/source/i/ $NIX_BUILD_TOP/source + + cd $NIX_BUILD_TOP/source + cd $(ls | grep "^esy_skia") + + # Prefetch esy_skia pinned dependencies + # angle2, dng_sdk, piex and sfntly are unique and need to be fetched + # zlib and webp used here seem to be outdated, so it's impossible to link esy_skia against upstream zlib and webp + cat DEPS | grep -E '{|}|angle2|dng_sdk|piex|sfntly|zlib|webp' > DEPS-upd + mv DEPS{-upd,} + python tools/git-sync-deps + # Patch esy_skia builder to use nixpkgs ninja, gn tools and icu, expat and libpng libraries. + cd esy + patch build.sh ${./esy_skia_use_nixpkgs.patch} + + cd $NIX_BUILD_TOP/source + cd $(ls | grep '^revery' | grep -v '__s__') + jq '.esy.build |= "bash -c \"\(.)\""' package.json > package-upd.json + mv package{-upd,}.json + + # Delete esy_cmake and ninja dependencies (they are brought from Nixpkgs) + # Removing them from release.esy.lock is hard because it reports corruption + for d in "revery__s__esy_cmake" "ninja"; do + cd $NIX_BUILD_TOP/source + cd $(ls | grep $d) + rm -rf * + done + + rm -rf $(find $NIX_BUILD_TOP/esy -name .git) + ''; + + installPhase = '' + mkdir $out + cp -r $NIX_BUILD_TOP/esy $out/ + ''; + + dontPatchShebangs = true; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = fetchDepsSha256; + }; +in stdenv.mkDerivation (rec { + pname = "oni2"; + inherit version; + + nativeBuildInputs = [ + clang + makeWrapper + nodePackages.esy + bash + perl + which + nasm + python2 + gn + ninja + cmake + jq + yarn + fixup_yarn_lock + ]; + + buildInputs = [ + nodejs + ripgrep + fontconfig + libGL + libGLU + ncurses + acl + harfbuzz + libjpeg + expat + icu58 + libpng + ] ++ (with xorg; [ + libX11 + libXext + libXi + libXxf86vm + libXrandr + libXinerama + libXcursor + libICE + libSM + libXt + libxkbfile + ]); + + unpackPhase = '' + cp -r ${source}/* ./ + cp -r ${fetchDeps}/esy ./ + + chmod -R +w esy node/ extensions/ + chmod +w assets/configuration + ''; + + hardeningDisable = [ "fortify" ]; + + node = (callPackage ./node.nix { }).offline_cache; + extensions = (callPackage ./extensions.nix { }).offline_cache; + + configurePhase = '' + runHook preConfigure + + # Esy by default erases the entire environment, so the builder makes a wrapper over bash to automatically re-export it + mkdir wrapped-bash + echo "#!${bash}/bin/bash" > wrapped-bash/bash + export | sed 's/PATH="/PATH="$PATH:/' >> wrapped-bash/bash + echo "exec ${bash}/bin/bash \"\$@\"" >> wrapped-bash/bash + chmod +x wrapped-bash/bash + + # Use custom builder for Oni2 to provide necessary environment to it + echo 'declare -x NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lharfbuzz -ljpeg -lpthread -lpng -lexpat"' > build.sh + echo $(jq -r '.esy.build' package.json) >> build.sh + jq '.esy.build |= "bash build.sh"' package.json > package-upd.json + mv package{-upd,}.json + + export PATH="$NIX_BUILD_TOP/wrapped-bash:$PATH" + patchShebangs $NIX_BUILD_TOP/esy/source + + echo "" > assets/configuration/setup.json # it will be set at installation phase. + + substituteInPlace src/gen_buildinfo/generator.re --replace "git rev-parse --short HEAD" "echo '${version}'" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # Required by yarn + export HOME=$(mktemp -d) + + # Install pinned yarn packages + yarnInstall() { + # Remove `resolutions` section from package.json + jq 'del(.resolutions)' $3/package.json > $3/package-upd.json + cp $3/package{-upd,}.json + + # Copy custom yarn.lock to match updated package.json, do fixup + cp $2 $3/yarn.lock + fixup_yarn_lock $3/yarn.lock + + # Make yarn install prefetched dependencies + yarn config --offline set yarn-offline-mirror $1 + # Set explicit node install directory for node-gyp. + npm_config_nodedir=${nodejs} yarn install --frozen-lockfile --offline --no-progress --non-interactive --cwd $3 + } + yarnInstall ${node} ${./node.lock} node + yarnInstall ${extensions} ${./extensions.lock} extensions + + export ESY__PREFIX="$NIX_BUILD_TOP/esy" + esy '@release' install # should do nothing + + export ESY__GLOBAL_PATH=PATH + # Create link to bin directory, currently empty + esy '@release' sh -c "ln -s \$cur__bin result" + # Finish building Oni2 + esy '@release' x Oni2 --help + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + + cp -Lr ./result $out/bin + cp -r ./node $out/ + cp -r ./extensions $out/ + + chmod +w $out/bin + chmod +x $out/bin/Oni2 $out/bin/Oni2_editor + # Unset LANG and XMODIFIERS. See https://github.com/onivim/oni2/issues/3772 + # Unset SDL_VIDEODRIVER because Wayland is not supported. See https://github.com/onivim/oni2/issues/3438 + mv $out/bin/Oni2{,_unwrapped} + makeWrapper $out/bin/Oni2{_unwrapped,} --unset LANG --unset XMODIFIERS --unset SDL_VIDEODRIVER + mv $out/bin/Oni2_editor{,_unwrapped} + makeWrapper $out/bin/Oni2_editor{_unwrapped,} --unset LANG --unset XMODIFIERS --unset SDL_VIDEODRIVER + + rm -f $out/bin/setup.json + jq -n "{node: \"${nodejs}/bin/node\", nodeScript: \"$out/node\", bundledExtensions: \"$out/extensions\", rg: \"${ripgrep}/bin/rg\"}" > $out/bin/setup.json + + mkdir -p $out/share/applications $out/share/pixmaps + cp ${source}/scripts/linux/Onivim2.desktop $out/share/applications + cp ${source}/assets/images/icon512.png $out/share/pixmaps/Onivim2.png + + runHook postInstall + ''; + + meta = with lib; { + description = "Native, lightweight modal code editor"; + longDescription = '' + Onivim 2 is a reimagination of the Oni editor. Onivim 2 aims to bring the speed of Sublime, the language integration of VSCode, and the modal editing experience of Vim together, in a single package. + ''; + homepage = "https://v2.onivim.io/"; + inherit license; + maintainers = with maintainers; [ gardspirito ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +}) + diff --git a/pkgs/applications/editors/oni2/default.nix b/pkgs/applications/editors/oni2/default.nix new file mode 100644 index 0000000000000..6721cf24d96be --- /dev/null +++ b/pkgs/applications/editors/oni2/default.nix @@ -0,0 +1,16 @@ +{ callPackage }: + +let mkOni2 = callPackage ./common.nix { }; +in mkOni2 rec { + variant = "oni2"; + license = { + fullName = "Outrun Labs End User License Agreement"; + url = "https://github.com/onivim/oni2/blob/master/Outrun-Labs-EULA-v1.1.md"; + free = false; + }; + version = "0.5.7"; + rev = "v${version}"; + sha256 = "NlN0Ntdwtx5XLjd1ltUzv/bjmJQR5eyRqtmicppP6YU="; + fetchDepsSha256 = "k7G6jPJfxCCSuSucPfiXljCVJhmjl/BxWMCEjv2tfhA="; +} + diff --git a/pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch b/pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch new file mode 100644 index 0000000000000..50a1802816c08 --- /dev/null +++ b/pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch @@ -0,0 +1,13 @@ +diff --git a/build-or.sh b/build.sh +index be0bc6f..fddc9cb 100644 +--- a/build-or.sh ++++ b/build.sh +@@ -50,6 +50,6 @@ else + echo "llvm toolset-7.0 does not need to be manually activated" + fi + +- bin/gn gen $cur__target_dir/out/Static --script-executable="$PYTHON_BINARY" "--args=cc=\"$CC\" cxx=\"$CXX\" skia_use_system_libjpeg_turbo=true esy_skia_enable_svg=true is_debug=false extra_cflags=[\"-I${ESY_LIBJPEG_TURBO_PREFIX}/include\"] extra_ldflags=[\"-L${ESY_LIBJPEG_TURBO_PREFIX}/lib\", \"-ljpeg\" ]" || exit -1 +- ninja.exe -C $cur__target_dir/out/Static || exit -1 ++ gn gen $cur__target_dir/out/Static --script-executable="$PYTHON_BINARY" "--args=cc=\"$CC\" cxx=\"$CXX\" skia_use_system_libjpeg_turbo=true skia_use_system_expat=true skia_use_system_icu=true skia_use_system_libpng=true esy_skia_enable_svg=true is_debug=false extra_cflags=[\"-I${ESY_LIBJPEG_TURBO_PREFIX}/include\"] extra_ldflags=[\"-L${ESY_LIBJPEG_TURBO_PREFIX}/lib\", \"-ljpeg\" ]" || exit -1 ++ ninja -C $cur__target_dir/out/Static || exit -1 + fi diff --git a/pkgs/applications/editors/oni2/extensions.lock b/pkgs/applications/editors/oni2/extensions.lock new file mode 100644 index 0000000000000..2e757cdf94642 --- /dev/null +++ b/pkgs/applications/editors/oni2/extensions.lock @@ -0,0 +1,497 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@emmetio/css-parser@ramya-rao-a/css-parser#vscode": + version "0.4.0" + resolved "https://codeload.github.com/ramya-rao-a/css-parser/tar.gz/370c480ac103bd17c7bcfb34bf5d577dc40d3660" + dependencies: + "@emmetio/stream-reader" "^2.2.0" + "@emmetio/stream-reader-utils" "^0.1.0" + +"@emmetio/extract-abbreviation@0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c" + integrity sha512-Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw== + +"@emmetio/html-matcher@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@emmetio/html-matcher/-/html-matcher-0.3.3.tgz#0bbdadc0882e185950f03737dc6dbf8f7bd90728" + integrity sha1-C72twIguGFlQ8Dc33G2/j3vZByg= + dependencies: + "@emmetio/stream-reader" "^2.0.0" + "@emmetio/stream-reader-utils" "^0.1.0" + +"@emmetio/math-expression@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@emmetio/math-expression/-/math-expression-0.1.1.tgz#1ff2c7f05800f64c57ca89038ee18bce9f5776dc" + integrity sha1-H/LH8FgA9kxXyokDjuGLzp9Xdtw= + dependencies: + "@emmetio/stream-reader" "^2.0.1" + "@emmetio/stream-reader-utils" "^0.1.0" + +"@emmetio/stream-reader-utils@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz#244cb02c77ec2e74f78a9bd318218abc9c500a61" + integrity sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= + +"@emmetio/stream-reader@^2.0.0", "@emmetio/stream-reader@^2.0.1", "@emmetio/stream-reader@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz#46cffea119a0a003312a21c2d9b5628cb5fcd442" + integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI= + +agent-base@4, agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + +applicationinsights@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5" + integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg== + dependencies: + diagnostic-channel "0.2.0" + diagnostic-channel-publishers "0.2.1" + zone.js "0.7.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +byline@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" + integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= + +commander@^2.19.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commandpost@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.4.0.tgz#89218012089dfc9b67a337ba162f15c88e0f1048" + integrity sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +diagnostic-channel-publishers@0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3" + integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM= + +diagnostic-channel@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17" + integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc= + dependencies: + semver "^5.3.0" + +editorconfig@^0.15.0: + version "0.15.3" + resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" + integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== + dependencies: + commander "^2.19.0" + lru-cache "^4.1.5" + semver "^5.6.0" + sigmund "^1.0.1" + +entities@~2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" + integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== + +es6-promise@^4.0.3: + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== + +es6-promisify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + dependencies: + es6-promise "^4.0.3" + +file-type@^7.2.0: + version "7.7.1" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-7.7.1.tgz#91c2f5edb8ce70688b9b68a90d931bbb6cb21f65" + integrity sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +highlight.js@10.1.2: + version "10.1.2" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c" + integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA== + +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + +https-proxy-agent@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + +iconv-lite-umd@0.6.8: + version "0.6.8" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0" + integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A== + +image-size@^0.5.2: + version "0.5.5" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +jschardet@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823" + integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw== + +jsonc-parser@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e" + integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g== + +jsonc-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== + +linkify-it@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" + integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== + dependencies: + uc.micro "^1.0.1" + +lru-cache@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +markdown-it-front-matter@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/markdown-it-front-matter/-/markdown-it-front-matter-0.2.3.tgz#d6fa0f4b362e02086dd4ce8219fadf3f4c9cfa37" + integrity sha512-s9+rcClLmZsZc3YL8Awjg/YO/VdphlE20LJ9Bx5a8RAFLI5a1vq6Mll8kOzG6w/wy8yhFLBupaa6Mfd60GATkA== + +markdown-it@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc" + integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg== + dependencies: + argparse "^1.0.7" + entities "~2.0.0" + linkify-it "^2.0.0" + mdurl "^1.0.1" + uc.micro "^1.0.5" + +mdurl@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +request-light@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.4.0.tgz#c6b91ef00b18cb0de75d2127e55b3a2c9f7f90f9" + integrity sha512-fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.4" + vscode-nls "^4.1.2" + +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +semver@5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" + integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw== + +semver@^5.3.0, semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +sigmund@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +typescript-formatter@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/typescript-formatter/-/typescript-formatter-7.1.0.tgz#dd1b5547de211065221f765263e15f18c84c66b8" + integrity sha512-XgPUSZ3beF7Xx2ZIEngIonWpDTS0XzWqV0vjtcm6nOPONug4WFXQYjbvulCzY2T0+knceZn5CFQjVUShNkIdLA== + dependencies: + commandpost "^1.0.0" + editorconfig "^0.15.0" + +typescript-vscode-sh-plugin@^0.6.14: + version "0.6.14" + resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.14.tgz#a81031b502f6346a26ea49ce082438c3e353bb38" + integrity sha512-AkNlRBbI6K7gk29O92qthNSvc6jjmNQ6isVXoYxkFwPa8D04tIv2SOPd+sd+mNpso4tNdL2gy7nVtrd5yFqvlA== + +typescript@^4.2.0-dev.20201119: + version "4.2.0-dev.20201228" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201228.tgz#be099aa540d4a8faf4e05deb4af43dae602ef326" + integrity sha512-Up2tlZYsgRxJg9UG9nA9Bj2/s2Jf/n8rJJUt9nT6kyGKyJ+U63BaDOybQ4gAdNeSR4uOX0nAzgjaUZD64dVOKA== + +uc.micro@^1.0.1, uc.micro@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" + integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== + +vscode-css-languageservice@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz#a7c5edf3057e707601ca18fa3728784a298513b4" + integrity sha512-jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw== + dependencies: + vscode-languageserver-textdocument "^1.0.1" + vscode-languageserver-types "3.16.0-next.2" + vscode-nls "^5.0.0" + vscode-uri "^2.1.2" + +vscode-emmet-helper@^1.2.17: + version "1.2.17" + resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.17.tgz#f0c6bfcebc4285d081fb2618e6e5b9a08c567afa" + integrity sha512-X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow== + dependencies: + "@emmetio/extract-abbreviation" "0.1.6" + jsonc-parser "^1.0.0" + vscode-languageserver-types "^3.6.0-next.1" + +vscode-extension-telemetry@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b" + integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA== + dependencies: + applicationinsights "1.0.8" + +vscode-html-languageservice@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz#e92269a04097d87bd23431e3a4e491a27b5447b9" + integrity sha512-aLWIoWkvb5HYTVE0kI9/u3P0ZAJGrYOSAAE6L0wqB9radKRtbJNrF9+BjSUFyCgBdNBE/GFExo35LoknQDJrfw== + dependencies: + vscode-languageserver-textdocument "^1.0.1" + vscode-languageserver-types "3.16.0-next.2" + vscode-nls "^5.0.0" + vscode-uri "^2.1.2" + +vscode-json-languageservice@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz#ad574b36c4346bd7830f1d34b5a5213d3af8d232" + integrity sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA== + dependencies: + jsonc-parser "^3.0.0" + vscode-languageserver-textdocument "^1.0.1" + vscode-languageserver-types "3.16.0-next.2" + vscode-nls "^5.0.0" + vscode-uri "^2.1.2" + +vscode-jsonrpc@6.0.0-next.2: + version "6.0.0-next.2" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f" + integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw== + +vscode-languageclient@7.0.0-next.5.1: + version "7.0.0-next.5.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0-next.5.1.tgz#ed93f14e4c2cdccedf15002c7bf8ef9cb638f36c" + integrity sha512-OONvbk3IFpubwF8/Y5uPQaq5J5CEskpeET3SfK4iGlv5OUK+44JawH/SEW5wXuEPpfdMLEMZLuGLU5v5d7N7PQ== + dependencies: + semver "^6.3.0" + vscode-languageserver-protocol "3.16.0-next.4" + +vscode-languageserver-protocol@3.16.0-next.4: + version "3.16.0-next.4" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f" + integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ== + dependencies: + vscode-jsonrpc "6.0.0-next.2" + vscode-languageserver-types "3.16.0-next.2" + +vscode-languageserver-textdocument@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f" + integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA== + +vscode-languageserver-types@3.16.0-next.2: + version "3.16.0-next.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083" + integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q== + +vscode-languageserver-types@^3.6.0-next.1: + version "3.16.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" + integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== + +vscode-languageserver@7.0.0-next.3: + version "7.0.0-next.3" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz#3833bd09259a4a085baeba90783f1e4d06d81095" + integrity sha512-qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg== + dependencies: + vscode-languageserver-protocol "3.16.0-next.4" + +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== + +vscode-nls@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" + integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== + +vscode-uri@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c" + integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== + +which@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +zone.js@0.7.6: + version "0.7.6" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009" + integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk= diff --git a/pkgs/applications/editors/oni2/extensions.nix b/pkgs/applications/editors/oni2/extensions.nix new file mode 100644 index 0000000000000..08c8f207f4b14 --- /dev/null +++ b/pkgs/applications/editors/oni2/extensions.nix @@ -0,0 +1,629 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "370c480ac103bd17c7bcfb34bf5d577dc40d3660"; + path = fetchurl { + name = "370c480ac103bd17c7bcfb34bf5d577dc40d3660"; + url = "https://codeload.github.com/ramya-rao-a/css-parser/tar.gz/370c480ac103bd17c7bcfb34bf5d577dc40d3660"; + sha1 = "d35990e1b627e7654e67ec4ae98a91a5e72706a7"; + }; + } + { + name = "_emmetio_extract_abbreviation___extract_abbreviation_0.1.6.tgz"; + path = fetchurl { + name = "_emmetio_extract_abbreviation___extract_abbreviation_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz"; + sha1 = "e4a9856c1057f0aff7d443b8536477c243abe28c"; + }; + } + { + name = "_emmetio_html_matcher___html_matcher_0.3.3.tgz"; + path = fetchurl { + name = "_emmetio_html_matcher___html_matcher_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/@emmetio/html-matcher/-/html-matcher-0.3.3.tgz"; + sha1 = "0bbdadc0882e185950f03737dc6dbf8f7bd90728"; + }; + } + { + name = "_emmetio_math_expression___math_expression_0.1.1.tgz"; + path = fetchurl { + name = "_emmetio_math_expression___math_expression_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@emmetio/math-expression/-/math-expression-0.1.1.tgz"; + sha1 = "1ff2c7f05800f64c57ca89038ee18bce9f5776dc"; + }; + } + { + name = "_emmetio_stream_reader_utils___stream_reader_utils_0.1.0.tgz"; + path = fetchurl { + name = "_emmetio_stream_reader_utils___stream_reader_utils_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz"; + sha1 = "244cb02c77ec2e74f78a9bd318218abc9c500a61"; + }; + } + { + name = "_emmetio_stream_reader___stream_reader_2.2.0.tgz"; + path = fetchurl { + name = "_emmetio_stream_reader___stream_reader_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz"; + sha1 = "46cffea119a0a003312a21c2d9b5628cb5fcd442"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "applicationinsights___applicationinsights_1.0.8.tgz"; + path = fetchurl { + name = "applicationinsights___applicationinsights_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz"; + sha1 = "db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "byline___byline_5.0.0.tgz"; + path = fetchurl { + name = "byline___byline_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commandpost___commandpost_1.4.0.tgz"; + path = fetchurl { + name = "commandpost___commandpost_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/commandpost/-/commandpost-1.4.0.tgz"; + sha1 = "89218012089dfc9b67a337ba162f15c88e0f1048"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.7.tgz"; + path = fetchurl { + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; + }; + } + { + name = "diagnostic_channel_publishers___diagnostic_channel_publishers_0.2.1.tgz"; + path = fetchurl { + name = "diagnostic_channel_publishers___diagnostic_channel_publishers_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz"; + sha1 = "8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"; + }; + } + { + name = "diagnostic_channel___diagnostic_channel_0.2.0.tgz"; + path = fetchurl { + name = "diagnostic_channel___diagnostic_channel_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz"; + sha1 = "cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"; + }; + } + { + name = "editorconfig___editorconfig_0.15.3.tgz"; + path = fetchurl { + name = "editorconfig___editorconfig_0.15.3.tgz"; + url = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz"; + sha1 = "bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"; + }; + } + { + name = "entities___entities_2.0.3.tgz"; + path = fetchurl { + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "file_type___file_type_7.7.1.tgz"; + path = fetchurl { + name = "file_type___file_type_7.7.1.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-7.7.1.tgz"; + sha1 = "91c2f5edb8ce70688b9b68a90d931bbb6cb21f65"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "highlight.js___highlight.js_10.1.2.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_10.1.2.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz"; + sha1 = "c20db951ba1c22c055010648dfffd7b2a968e00c"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } + { + name = "iconv_lite_umd___iconv_lite_umd_0.6.8.tgz"; + path = fetchurl { + name = "iconv_lite_umd___iconv_lite_umd_0.6.8.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz"; + sha1 = "5ad310ec126b260621471a2d586f7f37b9958ec0"; + }; + } + { + name = "image_size___image_size_0.5.5.tgz"; + path = fetchurl { + name = "image_size___image_size_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz"; + sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "jschardet___jschardet_2.2.1.tgz"; + path = fetchurl { + name = "jschardet___jschardet_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz"; + sha1 = "03b0264669a90c7a5c436a68c5a7d4e4cb0c9823"; + }; + } + { + name = "jsonc_parser___jsonc_parser_1.0.3.tgz"; + path = fetchurl { + name = "jsonc_parser___jsonc_parser_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz"; + sha1 = "1d53d7160e401a783dbceabaad82473f80e6ad7e"; + }; + } + { + name = "jsonc_parser___jsonc_parser_3.0.0.tgz"; + path = fetchurl { + name = "jsonc_parser___jsonc_parser_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz"; + sha1 = "abdd785701c7e7eaca8a9ec8cf070ca51a745a22"; + }; + } + { + name = "linkify_it___linkify_it_2.2.0.tgz"; + path = fetchurl { + name = "linkify_it___linkify_it_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz"; + sha1 = "e3b54697e78bf915c70a38acd78fd09e0058b1cf"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "markdown_it_front_matter___markdown_it_front_matter_0.2.3.tgz"; + path = fetchurl { + name = "markdown_it_front_matter___markdown_it_front_matter_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-front-matter/-/markdown-it-front-matter-0.2.3.tgz"; + sha1 = "d6fa0f4b362e02086dd4ce8219fadf3f4c9cfa37"; + }; + } + { + name = "markdown_it___markdown_it_10.0.0.tgz"; + path = fetchurl { + name = "markdown_it___markdown_it_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz"; + sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc"; + }; + } + { + name = "mdurl___mdurl_1.0.1.tgz"; + path = fetchurl { + name = "mdurl___mdurl_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "request_light___request_light_0.4.0.tgz"; + path = fetchurl { + name = "request_light___request_light_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/request-light/-/request-light-0.4.0.tgz"; + sha1 = "c6b91ef00b18cb0de75d2127e55b3a2c9f7f90f9"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "semver___semver_5.5.1.tgz"; + path = fetchurl { + name = "semver___semver_5.5.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz"; + sha1 = "7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "sigmund___sigmund_1.0.1.tgz"; + path = fetchurl { + name = "sigmund___sigmund_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "typescript_formatter___typescript_formatter_7.1.0.tgz"; + path = fetchurl { + name = "typescript_formatter___typescript_formatter_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/typescript-formatter/-/typescript-formatter-7.1.0.tgz"; + sha1 = "dd1b5547de211065221f765263e15f18c84c66b8"; + }; + } + { + name = "typescript_vscode_sh_plugin___typescript_vscode_sh_plugin_0.6.14.tgz"; + path = fetchurl { + name = "typescript_vscode_sh_plugin___typescript_vscode_sh_plugin_0.6.14.tgz"; + url = "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.14.tgz"; + sha1 = "a81031b502f6346a26ea49ce082438c3e353bb38"; + }; + } + { + name = "typescript___typescript_4.2.0_dev.20201228.tgz"; + path = fetchurl { + name = "typescript___typescript_4.2.0_dev.20201228.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201228.tgz"; + sha1 = "be099aa540d4a8faf4e05deb4af43dae602ef326"; + }; + } + { + name = "uc.micro___uc.micro_1.0.6.tgz"; + path = fetchurl { + name = "uc.micro___uc.micro_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz"; + sha1 = "9c411a802a409a91fc6cf74081baba34b24499ac"; + }; + } + { + name = "vscode_css_languageservice___vscode_css_languageservice_4.4.0.tgz"; + path = fetchurl { + name = "vscode_css_languageservice___vscode_css_languageservice_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz"; + sha1 = "a7c5edf3057e707601ca18fa3728784a298513b4"; + }; + } + { + name = "vscode_emmet_helper___vscode_emmet_helper_1.2.17.tgz"; + path = fetchurl { + name = "vscode_emmet_helper___vscode_emmet_helper_1.2.17.tgz"; + url = "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.17.tgz"; + sha1 = "f0c6bfcebc4285d081fb2618e6e5b9a08c567afa"; + }; + } + { + name = "vscode_extension_telemetry___vscode_extension_telemetry_0.1.1.tgz"; + path = fetchurl { + name = "vscode_extension_telemetry___vscode_extension_telemetry_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz"; + sha1 = "91387e06b33400c57abd48979b0e790415ae110b"; + }; + } + { + name = "vscode_html_languageservice___vscode_html_languageservice_3.2.0.tgz"; + path = fetchurl { + name = "vscode_html_languageservice___vscode_html_languageservice_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz"; + sha1 = "e92269a04097d87bd23431e3a4e491a27b5447b9"; + }; + } + { + name = "vscode_json_languageservice___vscode_json_languageservice_3.11.0.tgz"; + path = fetchurl { + name = "vscode_json_languageservice___vscode_json_languageservice_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz"; + sha1 = "ad574b36c4346bd7830f1d34b5a5213d3af8d232"; + }; + } + { + name = "vscode_jsonrpc___vscode_jsonrpc_6.0.0_next.2.tgz"; + path = fetchurl { + name = "vscode_jsonrpc___vscode_jsonrpc_6.0.0_next.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz"; + sha1 = "3d73f86d812304cb91b9fb1efee40ec60b09ed7f"; + }; + } + { + name = "vscode_languageclient___vscode_languageclient_7.0.0_next.5.1.tgz"; + path = fetchurl { + name = "vscode_languageclient___vscode_languageclient_7.0.0_next.5.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0-next.5.1.tgz"; + sha1 = "ed93f14e4c2cdccedf15002c7bf8ef9cb638f36c"; + }; + } + { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.16.0_next.4.tgz"; + path = fetchurl { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.16.0_next.4.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz"; + sha1 = "8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"; + }; + } + { + name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz"; + sha1 = "178168e87efad6171b372add1dea34f53e5d330f"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; + sha1 = "940bd15c992295a65eae8ab6b8568a1e8daa3083"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"; + sha1 = "ecf393fc121ec6974b2da3efb3155644c514e247"; + }; + } + { + name = "vscode_languageserver___vscode_languageserver_7.0.0_next.3.tgz"; + path = fetchurl { + name = "vscode_languageserver___vscode_languageserver_7.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz"; + sha1 = "3833bd09259a4a085baeba90783f1e4d06d81095"; + }; + } + { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + path = fetchurl { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz"; + sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"; + }; + } + { + name = "vscode_nls___vscode_nls_5.0.0.tgz"; + path = fetchurl { + name = "vscode_nls___vscode_nls_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz"; + sha1 = "99f0da0bd9ea7cda44e565a74c54b1f2bc257840"; + }; + } + { + name = "vscode_uri___vscode_uri_2.1.2.tgz"; + path = fetchurl { + name = "vscode_uri___vscode_uri_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz"; + sha1 = "c8d40de93eb57af31f3c715dd650e2ca2c096f1c"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "zone.js___zone.js_0.7.6.tgz"; + path = fetchurl { + name = "zone.js___zone.js_0.7.6.tgz"; + url = "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz"; + sha1 = "fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"; + }; + } + ]; +} diff --git a/pkgs/applications/editors/oni2/node.lock b/pkgs/applications/editors/oni2/node.lock new file mode 100644 index 0000000000000..59f8e0ae5e621 --- /dev/null +++ b/pkgs/applications/editors/oni2/node.lock @@ -0,0 +1,376 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@onivim/request-light@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@onivim/request-light/-/request-light-0.4.1.tgz#13082e5d8a5664b73116d85d4805fb386aa44f61" + integrity sha512-C3gamHhT0aPZWpHK/7bVCgFa0RhkuRGZrM4Bl3yTdtaZd4kbjIVOmPiOz6hgNpqZm0YwSXv1+q8LhDuZF9+oXg== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.4" + vscode-nls "^4.1.2" + +"@onivim/vscode-exthost@1.57.1001": + version "1.57.1001" + resolved "https://registry.yarnpkg.com/@onivim/vscode-exthost/-/vscode-exthost-1.57.1001.tgz#f4642d8c077fc0ecae9dd266fa9a1dc72d84916d" + integrity sha512-17aJk0H24CJRAWcxFN0dR3sNsU1THdHS20GlXwzYA26ahEjtzSDqWDhphzEUVLL8jZW1sy/NFrR5FydwEZP6dg== + dependencies: + graceful-fs "4.2.6" + iconv-lite-umd "0.6.8" + minimist "^1.2.5" + native-watchdog "1.3.0" + node-pty "0.11.0-beta7" + spdlog "^0.13.0" + vscode-proxy-agent "^0.11.0" + vscode-regexpp "^3.1.0" + +"@tootallnate/once@1", "@tootallnate/once@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/node@^11.9.5": + version "11.15.54" + resolved "https://registry.yarnpkg.com/@types/node/-/node-11.15.54.tgz#59ed60e7b0d56905a654292e8d73275034eb6283" + integrity sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g== + +agent-base@4, agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + +agent-base@6, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +data-uri-to-buffer@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" + integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== + +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + +debug@4, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +es6-promise@^4.0.3: + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== + +es6-promisify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + dependencies: + es6-promise "^4.0.3" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +file-uri-to-path@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" + integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +ftp@^0.3.10: + version "0.3.10" + resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" + integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0= + dependencies: + readable-stream "1.1.x" + xregexp "2.0.0" + +get-uri@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c" + integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg== + dependencies: + "@tootallnate/once" "1" + data-uri-to-buffer "3" + debug "4" + file-uri-to-path "2" + fs-extra "^8.1.0" + ftp "^0.3.10" + +graceful-fs@4.2.6: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +https-proxy-agent@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +iconv-lite-umd@0.6.8: + version "0.6.8" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0" + integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A== + +inherits@~2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2, ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nan@^2.14.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + +native-watchdog@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.3.0.tgz#88cee94c9dc766b85c8506eda14c8bd8c9618e27" + integrity sha512-WOjGRNGkYZ5MXsntcvCYrKtSYMaewlbCFplbcUVo9bE80LPVt8TAVFHYWB8+a6fWCGYheq21+Wtt6CJrUaCJhw== + +node-addon-api@^3.0.2: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-pty@0.11.0-beta7: + version "0.11.0-beta7" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta7.tgz#aed0888b5032d96c54d8473455e6adfae3bbebbe" + integrity sha512-uApPGLglZRiHQcUMWakbZOrBo8HVWvhzIqNnrWvBGJOvc6m/S5lCdbbg93BURyJqHFmBS0GV+4hwiMNDuGRbSA== + dependencies: + nan "^2.14.0" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +readable-stream@1.1.x: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +smart-buffer@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" + integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== + dependencies: + agent-base "6" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + +spdlog@^0.13.0: + version "0.13.6" + resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.13.6.tgz#26b2e13d46cbf8f2334c12ba2a8cc82de5a28f02" + integrity sha512-iGqDoA88G3Rv3lkbVQglTulp3nv12FzND6LDC7cOZ+OoFvWnXVb3+Ebhed60oZ6+IWWGwDtjXK6ympwr7C1XmQ== + dependencies: + bindings "^1.5.0" + mkdirp "^0.5.5" + nan "^2.14.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +sudo-prompt@^9.0.0: + version "9.2.1" + resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd" + integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw== + +typescript@^3.3.3333: + version "3.9.10" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" + integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== + +vscode-proxy-agent@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.11.0.tgz#9dc8d2bb9d448f1e33bb1caef97a741289660f2f" + integrity sha512-Y5mHjDGq/OKOvKG0IwCYfj25cvQ2cLEil8ce8n55IZHRAP9RF3e1sKU4ZUNDB8X2NIpKwyltrWpK9tFFE/kc3g== + dependencies: + "@tootallnate/once" "^1.1.2" + agent-base "^6.0.2" + debug "^4.3.1" + get-uri "^3.0.2" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + socks-proxy-agent "^5.0.0" + optionalDependencies: + vscode-windows-ca-certs "^0.3.0" + +vscode-regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f" + integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg== + +vscode-windows-ca-certs@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.3.0.tgz#324e1f8ba842bbf048a39e7c0ee8fe655e9adfcc" + integrity sha512-CYrpCEKmAFQJoZNReOrelNL+VKyebOVRCqL9evrBlVcpWQDliliJgU5RggGS8FPGtQ3jAKLQt9frF0qlxYYPKA== + dependencies: + node-addon-api "^3.0.2" + +xregexp@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" + integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= + +yauzl@^2.5.1: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/pkgs/applications/editors/oni2/node.nix b/pkgs/applications/editors/oni2/node.nix new file mode 100644 index 0000000000000..2cf69bb732702 --- /dev/null +++ b/pkgs/applications/editors/oni2/node.nix @@ -0,0 +1,453 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_onivim_request_light___request_light_0.4.1.tgz"; + path = fetchurl { + name = "_onivim_request_light___request_light_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/@onivim/request-light/-/request-light-0.4.1.tgz"; + sha1 = "13082e5d8a5664b73116d85d4805fb386aa44f61"; + }; + } + { + name = "_onivim_vscode_exthost___vscode_exthost_1.57.1001.tgz"; + path = fetchurl { + name = "_onivim_vscode_exthost___vscode_exthost_1.57.1001.tgz"; + url = "https://registry.yarnpkg.com/@onivim/vscode-exthost/-/vscode-exthost-1.57.1001.tgz"; + sha1 = "f4642d8c077fc0ecae9dd266fa9a1dc72d84916d"; + }; + } + { + name = "_tootallnate_once___once_1.1.2.tgz"; + path = fetchurl { + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; + }; + } + { + name = "_types_node___node_11.15.54.tgz"; + path = fetchurl { + name = "_types_node___node_11.15.54.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-11.15.54.tgz"; + sha1 = "59ed60e7b0d56905a654292e8d73275034eb6283"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "data_uri_to_buffer___data_uri_to_buffer_3.0.1.tgz"; + path = fetchurl { + name = "data_uri_to_buffer___data_uri_to_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; + sha1 = "594b8973938c5bc2c33046535785341abc4f3636"; + }; + } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { + name = "debug___debug_3.2.7.tgz"; + path = fetchurl { + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; + }; + } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_2.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; + sha1 = "7b415aeba227d575851e0a5b0c640d7656403fba"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "ftp___ftp_0.3.10.tgz"; + path = fetchurl { + name = "ftp___ftp_0.3.10.tgz"; + url = "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz"; + sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; + }; + } + { + name = "get_uri___get_uri_3.0.2.tgz"; + path = fetchurl { + name = "get_uri___get_uri_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz"; + sha1 = "f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + }; + } + { + name = "iconv_lite_umd___iconv_lite_umd_0.6.8.tgz"; + path = fetchurl { + name = "iconv_lite_umd___iconv_lite_umd_0.6.8.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz"; + sha1 = "5ad310ec126b260621471a2d586f7f37b9958ec0"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "nan___nan_2.15.0.tgz"; + path = fetchurl { + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; + }; + } + { + name = "native_watchdog___native_watchdog_1.3.0.tgz"; + path = fetchurl { + name = "native_watchdog___native_watchdog_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.3.0.tgz"; + sha1 = "88cee94c9dc766b85c8506eda14c8bd8c9618e27"; + }; + } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha1 = "81325e0a2117789c0128dab65e7e38f07ceba161"; + }; + } + { + name = "node_pty___node_pty_0.11.0_beta7.tgz"; + path = fetchurl { + name = "node_pty___node_pty_0.11.0_beta7.tgz"; + url = "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta7.tgz"; + sha1 = "aed0888b5032d96c54d8473455e6adfae3bbebbe"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz"; + sha1 = "7c0f364e7b1cf4a7a437e71253bed72e9004be60"; + }; + } + { + name = "socks___socks_2.6.1.tgz"; + path = fetchurl { + name = "socks___socks_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz"; + sha1 = "989e6534a07cf337deb1b1c94aaa44296520d30e"; + }; + } + { + name = "spdlog___spdlog_0.13.6.tgz"; + path = fetchurl { + name = "spdlog___spdlog_0.13.6.tgz"; + url = "https://registry.yarnpkg.com/spdlog/-/spdlog-0.13.6.tgz"; + sha1 = "26b2e13d46cbf8f2334c12ba2a8cc82de5a28f02"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "sudo_prompt___sudo_prompt_9.2.1.tgz"; + path = fetchurl { + name = "sudo_prompt___sudo_prompt_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz"; + sha1 = "77efb84309c9ca489527a4e749f287e6bdd52afd"; + }; + } + { + name = "typescript___typescript_3.9.10.tgz"; + path = fetchurl { + name = "typescript___typescript_3.9.10.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz"; + sha1 = "70f3910ac7a51ed6bef79da7800690b19bf778b8"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + path = fetchurl { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz"; + sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"; + }; + } + { + name = "vscode_proxy_agent___vscode_proxy_agent_0.11.0.tgz"; + path = fetchurl { + name = "vscode_proxy_agent___vscode_proxy_agent_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.11.0.tgz"; + sha1 = "9dc8d2bb9d448f1e33bb1caef97a741289660f2f"; + }; + } + { + name = "vscode_regexpp___vscode_regexpp_3.1.0.tgz"; + path = fetchurl { + name = "vscode_regexpp___vscode_regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz"; + sha1 = "42d059b6fffe99bd42939c0d013f632f0cad823f"; + }; + } + { + name = "vscode_windows_ca_certs___vscode_windows_ca_certs_0.3.0.tgz"; + path = fetchurl { + name = "vscode_windows_ca_certs___vscode_windows_ca_certs_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.3.0.tgz"; + sha1 = "324e1f8ba842bbf048a39e7c0ee8fe655e9adfcc"; + }; + } + { + name = "xregexp___xregexp_2.0.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz"; + sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + ]; +} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3ccdd70c455ce..62c3a93f76b4e 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -168,8 +168,8 @@ mkDerivation rec { ''; postInstall = '' - mkdir -p $out/share/icons $out/bin - ln $out/lib/rstudio/rstudio.png $out/share/icons + mkdir -p $out/share/icons/hicolor/48x48/apps $out/bin + ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps for f in {diagnostics,rpostback,rstudio}; do ln -s $out/lib/rstudio/bin/$f $out/bin diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 7102d69513900..7f14bf8ae14be 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -1,26 +1,28 @@ { fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; + libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ]; in stdenv.mkDerivation rec { - name = "sublimetext-2.0.2"; + pname = "sublimetext"; + version = "2.0.2"; + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2" ]; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; } else fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2" ]; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; }; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index ec713d99371b7..6888cebec2d0b 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { - version = "git-2014-08-20"; + version = "unstable-2014-08-20"; pname = "supertux-editor"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; + buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index fb5cb4b8e4c10..20d25bb616ff1 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: with python3.pkgs; @@ -13,6 +13,17 @@ buildPythonApplication rec { sha256 = "13l8blq7y6p7a235x2lfiqml1bd4ba2brm3vfvs8wasjh3fvm9g5"; }; + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ (makeDesktopItem { + name = "Thonny"; + exec = "thonny"; + icon = "thonny"; + desktopName = "Thonny"; + comment = "Python IDE for beginners"; + categories = "Development;IDE"; + }) ]; + propagatedBuildInputs = with python3.pkgs; [ jedi pyserial @@ -34,6 +45,10 @@ buildPythonApplication rec { --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) ''; + postInstall = '' + install -Dm644 ./packaging/icons/thonny-48x48.png $out/share/icons/hicolor/48x48/apps/thonny.png + ''; + # Tests need a DISPLAY doCheck = false; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 89d49f5e62856..e068f7df50b4c 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.3337"; + version = "8.2.3451"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-iwSGcLeqXH0bVIXEI5OnotG88Uv8ntycisD9EcHjz/c="; + sha256 = "sha256-8OaEaFyOaL59j0EZkUY+kuR6si79H2dN09f8SnltxbQ="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d08f80fda6f5a..082979605f7b8 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 = "1yfaf9qdaf6njvj8kilmivyl0nnhdvd9hbzpf8hv3kw5rfpdvy89"; - x86_64-darwin = "10rx5aif61xipf5lcjzkidz9dhbm5gc2wf87c2j456nixaxbx0b4"; - aarch64-linux = "13h4ffdm9y9p3jnqcjvapykbm73bkjy5jaqwhsi293f9r7jfp9rf"; - aarch64-darwin = "07nmrxc25rfp5ibarhg3c14ksk2ymqmsnc55hicvvhw93g2qczby"; - armv7l-linux = "1gz1mmw2vp986l9sm7rd6hypxs70sz63sbmzyxwfqpvj973dl23q"; + x86_64-linux = "0wf8bmzag49n81kjb46kj2nkksimm8f7cf4ihpqcw8k5iwasn3j9"; + x86_64-darwin = "1s7i5087bvckg66mcb32krv12vxhaw7ii9vm3i6p72wr0sv7dddh"; + aarch64-linux = "0yzh5javinvas3zz0lliyc77vbcs1jrmxbkr7nic4snscg6wjhcd"; + aarch64-darwin = "13l6ymz7v18s7ikxbwvkwb0f5ff2j82j5pfj04yy75kq9b5gh0vx"; + armv7l-linux = "129wffj9cidk9ysjpq3p0ddn6liwkmrkxhxgz7bqzj8sdhwyq8pz"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.2"; + version = "1.62.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -57,7 +57,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica maxeaubrey ]; + maintainers = with maintainers; [ eadwu synthetica maxeaubrey bobby285271 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f014bf1fda39f..75ac5f160eae0 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1q260kjhyx8djl82275ii63z1mzypsz7rkz3pj1n2wjkwsnw276x"; - x86_64-darwin = "1scx155rm8j6dwn0i31b6ajsdxcn1n24p3k6dx248w0zyiwd5wm1"; - aarch64-linux = "1j788a0p767i65ying9pfg6rss8l7g76n2323dnmj12bhxs6cqd1"; - armv7l-linux = "1yfwmfxpilfv2h3pp698pg4wr6dnyzwg0r266xiwsw7z38jh54fk"; + x86_64-linux = "0g1c88i0nkg4hys00vhqp0i2n3kjl395fd2rimi2p49y042b5c9g"; + x86_64-darwin = "1521aqrv9zx2r5cy8h2011iz3v5lvayizlgv8j7j8qi272mmvx5k"; + aarch64-linux = "1kk0jrhqx6q325zmfg553pqmk6v9cx3a99bsh9rzvdlca94nmpj0"; + armv7l-linux = "08hy61a9pp18b1x7lnsc7b9y3bvnjmavazz7qkhp5qxl2gs802wm"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.2"; + version = "1.62.3"; pname = "vscodium"; executableName = "codium"; @@ -62,7 +62,7 @@ in homepage = "https://github.com/VSCodium/vscodium"; downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; - maintainers = with maintainers; [ synthetica turion ]; + maintainers = with maintainers; [ synthetica turion bobby285271 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index d7b0703b8d5e2..b2539e7dac5d2 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "2.8.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "1hqr4157kp110p01jygqnnzj86zxlfiq4b53j345vqpx0f80c340"; + sha256 = "sha256-VIudVgENibOz8RK0oK80U74wy592q3vKEnl3zuS7oSI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index a191943c3fd6e..dd3bde160c374 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1203"; + version = "1206"; src = fetchFromGitHub { owner = "kammerdienerb"; repo = "yed"; - rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; - sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; + rev = "6cdd99fe1359899b26d8967bd376fd5caa5451eb"; + sha256 = "0XECSolW/xPXd1v3sv9HbJMWuHGnwCOwmHoPNCUsE+w="; }; installPhase = '' diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix new file mode 100644 index 0000000000000..69acb43af8617 --- /dev/null +++ b/pkgs/applications/finance/odoo/default.nix @@ -0,0 +1,97 @@ +{ stdenv +, lib +, fetchurl +, python3 +, python3Packages +, nodePackages +, wkhtmltopdf +}: + +with python3Packages; + +buildPythonApplication rec { + pname = "odoo"; + + major = "15"; + minor = "0"; + patch = "20211029"; + + version = "${major}.${minor}.${patch}"; + + # 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"; + name = "${pname}-${version}"; + sha256 = "sha256-/E+bLBbiz7fRyTwP+0AMpqbuRkOpE4B4P6kREIB4m1Q="; + }; + + nativeBuildInputs = [ + setuptools + wheel + mock + ]; + + buildInputs = [ + wkhtmltopdf + nodePackages.rtlcss + ]; + + # needs some investigation + doCheck = false; + + makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; + + propagatedBuildInputs = [ + Babel + chardet + decorator + docutils + ebaysdk + freezegun + gevent + greenlet + html2text + idna + jinja2 + libsass + lxml + markupsafe + num2words + ofxparse + passlib + pillow + polib + psutil + psycopg2 + pydot + pyopenssl + pypdf2 + pyserial + python-dateutil + ldap + python-stdnum + pytz + pyusb + qrcode + reportlab + requests + vobject + werkzeug1 + xlrd + XlsxWriter + xlwt + zeep + ]; + + unpackPhase = '' + tar xfz $src + cd odoo* + ''; + + meta = with lib; { + description = "Open Source ERP and CRM"; + homepage = "https://www.odoo.com/"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 21b4cfa94b13c..d186d36efcf87 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -76,9 +76,6 @@ mkDerivation rec { postInstall = with stdenv; lib.optionalString isDarwin '' mkdir -p $out/Applications mv $out/Mapper.app $out/Applications - # Fixes "This application failed to start because it could not find or load the Qt - # platform plugin "cocoa"." - wrapQtApp $out/Applications/Mapper.app/Contents/MacOS/Mapper mkdir -p $out/bin ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 70b5ffcc707ce..4f62ccecbaf57 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , ninja , flex @@ -57,23 +56,16 @@ let six ]; in mkDerivation rec { - version = "3.16.10"; + version = "3.16.13"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30="; + sha256 = "13irzs89lknfxf2y7j931bh0zmqgiwifdbbzvwn8yxxr21gd68ac"; }; - patches = [ - (fetchpatch { - url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch"; - sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy"; - }) - ]; - passthru = { inherit pythonBuildInputs; inherit python3Packages; diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index d0d39e299aa2d..dd440dfffdacc 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, qtscript, qtwebengine, gdal, proj, routino, quazip }: +{ mkDerivation, lib, fetchFromGitHub, cmake, substituteAll +, qtscript, qttranslations, qtwebengine, gdal, proj, routino, quazip }: mkDerivation rec { pname = "qmapshack"; @@ -12,6 +12,14 @@ mkDerivation rec { sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx"; }; + patches = [ + # See https://github.com/NixOS/nixpkgs/issues/86054 + (substituteAll { + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; diff --git a/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch b/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch new file mode 100644 index 0000000000000..f91f4228d2ce5 --- /dev/null +++ b/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch @@ -0,0 +1,74 @@ +diff --git i/src/qmapshack/setup/CAppSetupLinux.cpp w/src/qmapshack/setup/CAppSetupLinux.cpp +index 63ea06c0..3a03b816 100644 +--- i/src/qmapshack/setup/CAppSetupLinux.cpp ++++ w/src/qmapshack/setup/CAppSetupLinux.cpp +@@ -30,7 +30,7 @@ void CAppSetupLinux::initQMapShack() + prepareGdal("", ""); + + // setup translators +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/qmapshack/translations"); + prepareTranslator(resourceDir, "qt_"); +diff --git i/src/qmapshack/setup/CAppSetupMac.cpp w/src/qmapshack/setup/CAppSetupMac.cpp +index ad9b21e9..9dca8a1e 100644 +--- i/src/qmapshack/setup/CAppSetupMac.cpp ++++ w/src/qmapshack/setup/CAppSetupMac.cpp +@@ -63,7 +63,7 @@ void CAppSetupMac::initQMapShack() + + // setup translators + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, "qmapshack_"); + + // load and apply style sheet +diff --git i/src/qmaptool/setup/CAppSetupLinux.cpp w/src/qmaptool/setup/CAppSetupLinux.cpp +index dea1c4f3..8da95574 100644 +--- i/src/qmaptool/setup/CAppSetupLinux.cpp ++++ w/src/qmaptool/setup/CAppSetupLinux.cpp +@@ -29,7 +29,7 @@ void CAppSetupLinux::initQMapTool() + prepareGdal("", ""); + + // setup translators +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/qmaptool/translations"); + prepareTranslator(resourceDir, "qt_"); +diff --git i/src/qmaptool/setup/CAppSetupMac.cpp w/src/qmaptool/setup/CAppSetupMac.cpp +index 02b27e07..fae27748 100644 +--- i/src/qmaptool/setup/CAppSetupMac.cpp ++++ w/src/qmaptool/setup/CAppSetupMac.cpp +@@ -64,7 +64,7 @@ void CAppSetupMac::initQMapTool() + + // setup translators + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, "qmaptool_"); + + migrateDirContent(defaultCachePath()); +diff --git i/src/qmt_rgb2pct/main.cpp w/src/qmt_rgb2pct/main.cpp +index 21267d03..d539cec8 100644 +--- i/src/qmt_rgb2pct/main.cpp ++++ w/src/qmt_rgb2pct/main.cpp +@@ -50,7 +50,7 @@ static void prepareTranslator(QString translationPath, QString translationPrefix + static void loadTranslations() + { + #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(Q_OS_CYGWIN) +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/" APP_STR "/translations"); + prepareTranslator(resourceDir, "qt_"); +@@ -61,7 +61,7 @@ static void loadTranslations() + // os x + static QString relTranslationDir = "Resources/translations"; // app + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, APP_STR "_"); + #endif + diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index a07cf38c0eba6..257206b4f27e8 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-13"; + version = "7.1.0-14"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-W/XqgYOlSailHQdNBYsvf2P9go9sblWayDLrQQlekro="; + sha256 = "sha256-w4h4KEfmDC/dDgtk7xgEnIYvSfPlKfsvdFhx43Tn9GA="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 430c582dd7936..efa153df155d0 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members; platforms = platforms.linux; + mainProgram = "com.github.akiraux.akira"; }; } diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 129e3e5476914..20874dd55e763 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: +{ lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: -stdenv.mkDerivation { - name = "autopano-sift-C-2.5.1"; +stdenv.mkDerivation rec { + pname = "autopano-sift-C"; + version = "2.5.1"; src = fetchurl { - url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz"; + url = "mirror://sourceforge/hugin/autopano-sift-C-${version}.tar.gz"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix index 0f53965786b9d..9555dd4c02ed7 100644 --- a/pkgs/applications/graphics/autotrace/autofig.nix +++ b/pkgs/applications/graphics/autotrace/autofig.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "autofig-0.1"; + pname = "autofig"; + version = "0.1"; src = fetchurl { url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz"; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 0a4ed515511c0..e38ca908fe079 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; - version = "unstable-2020-10-05"; + version = "unstable-2021-09-14"; src = fetchFromGitHub { owner = "pyushkevich"; repo = pname; - rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465"; - sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf"; + rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388"; + sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk4 ] + buildInputs = [ itk ] ++ lib.optional stdenv.isDarwin Cocoa; + cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; + meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; description = "Medical imaging processing tool"; @@ -22,6 +24,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; broken = stdenv.isAarch64; - # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory + # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 5c6ec804e62c8..36da9d26410ed 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,13 +1,16 @@ -{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: +{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { - name = "comical-0.8"; + pname = "comical"; + version = "0.8"; + src = fetchurl { - url = "mirror://sourceforge/comical/${name}.tar.gz"; + url = "mirror://sourceforge/comical/comical-${version}.tar.gz"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; + buildInputs = [ wxGTK util-linux zlib ]; - preBuild="makeFlags=\"prefix=$out\""; + makeFlags = [ "prefix=${placeholder "out"}" ]; patches = [ ./wxgtk-2.8.patch ]; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5bb94baf76f25..02c0fb4091100 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 = "14.5.1"; + version = "15.7.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - hash = "sha256-ZrEoeeEhHQOLm/L3KA43Ru5fruIPK35CCUsllwpPB58="; + sha256 = "3565bcceccb57daee222270164e85b696b8d261ab88b65699912da51946a1c36"; }; nativeBuildInputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://about.draw.io/"; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ darkonion0 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index f70f072aeaf79..563853f8f5a83 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "0l7m45bqx62nrwi0r4pdwxcq37s7h3nnawk9nq2zpvl9wcgnx3gc"; + sha256 = "sha256-x1C8kY9VpMg7aXgC/jRsLCeUV8uRLobgjSAQdK2/sHk="; }; - cargoSha256 = "sha256-LERV3+zwt5oVfyueGfxM7HsOha4cuWTkPyvPQwHSZqo="; + cargoSha256 = "sha256-KgQOlvKRt47lg7NteqBa2DLKkDf93JTzp9EIHn3clxY="; nativeBuildInputs = lib.optional stdenv.isLinux python3; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index c31c1407da7ed..2bb480a54f4d6 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: -stdenv.mkDerivation { - name ="openexr_viewers-2.2.1"; +stdenv.mkDerivation rec { + pname = "openexr_viewers"; + version = "2.2.1"; src = fetchurl { - url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz"; + url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz"; sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; }; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 92875bcaeee67..bcf707bcced61 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: stdenv.mkDerivation rec { pname = "f3d"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchFromGitLab { - domain = "gitlab.kitware.com"; - owner = "f3d"; + src = fetchFromGitHub { + owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "0lj20k5qyw9z85k3wsp05f7dcv7v7asrnppi8i1jm32dzxjm4siw"; + sha256 = "sha256-ToFP2Q+Oi+MEU9FEe5CNp0pD0bQUBQh34B9guajnqgI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index f2d2e267595cd..5cd574bf9b79c 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,25 +1,69 @@ -{ lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm -, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, mesa, lirc }: +{ lib +, stdenv +, fetchurl +, libjpeg +, libexif +, giflib +, libtiff +, libpng +, libwebp +, libdrm +, pkg-config +, freetype +, fontconfig +, which +, imagemagick +, curl +, sane-backends +, libXpm +, libepoxy +, poppler +, mesa +, lirc +}: stdenv.mkDerivation rec { - name = "fbida-2.14"; + pname = "fbida"; + version = "2.14"; src = fetchurl { - url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; + url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; + patches = [ + # Upstream patch to fix build on -fno-common toolchains. + (fetchurl { + name = "no-common.patch"; + url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2"; + sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi"; + }) + ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ - libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp - imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + libexif + libjpeg + libpng + giflib + freetype + fontconfig + libtiff + libwebp + imagemagick + curl + sane-backends + libdrm + libXpm + libepoxy + poppler + lirc mesa ]; makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; - patchPhase = '' + postPatch = '' sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile ''; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix new file mode 100644 index 0000000000000..18fdc2c55ac17 --- /dev/null +++ b/pkgs/applications/graphics/fiji/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk11 +, makeDesktopItem +, copyDesktopItems +, runtimeShell +}: +stdenv.mkDerivation rec { + pname = "fiji"; + version = "20201104-1356"; + + src = fetchurl { + url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz"; + sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a"; + }; + + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ]; + buildInputs = [ stdenv.cc.cc.lib ]; + + desktopItems = [ + (makeDesktopItem { + name = "fiji"; + exec = "fiji %F"; + icon = "fiji"; + mimeType = "image/*;"; + comment = "Scientific Image Analysis"; + desktopName = "Fiji Is Just ImageJ"; + genericName = "Fiji Is Just ImageJ"; + categories = "Education;Science;ImageProcessing;"; + terminal = false; + startupNotify = true; + extraEntries = '' + Version=1.0 + TryExec=fiji + X-GNOME-FullName=Fiji Is Just ImageJ + StartupWMClass=fiji-Main + ''; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,fiji,share/pixmaps} + + cp -R * $out/fiji + rm -f $out/fiji/jars/imagej-updater-*.jar + + # Disgusting hack to stop a local desktop entry being created + cat <<EOF > $out/bin/.fiji-launcher-hack + #!${runtimeShell} + exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@") + EOF + chmod +x $out/bin/.fiji-launcher-hack + + makeWrapper $out/bin/.fiji-launcher-hack $out/bin/fiji \ + --prefix PATH : ${lib.makeBinPath [ jdk11 ]} \ + --set JAVA_HOME ${jdk11.home} + + ln $out/fiji/images/icon.png $out/share/pixmaps/fiji.png + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://imagej.net/software/fiji/"; + description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; + platforms = [ "x86_64-linux" ]; + license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; + maintainers = with maintainers; [ zane ]; + }; +} diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 3db183b2531a5..70d35ed671bb7 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -17,7 +17,7 @@ , ode , openal , openssl -, racket +, racket_7_9 , sconsPackages , zlib }: @@ -42,6 +42,7 @@ let openssl zlib ]; + racket = racket_7_9; in stdenv.mkDerivation rec { pname = "fluxus"; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { ode openal openssl.dev - racket + racket_7_9 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index abcb77f9f8b2c..c8d6fc6030d6d 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -58,15 +58,16 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/calo001/fondo"; description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; - }; - - passthru.updateScript = nix-update-script { - attrPath = pname; + mainProgram = "com.github.calo001.fondo"; }; } diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index bf990c4d0ef82..d11798a9b290f 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, - libXxf86vm }: +{ lib +, stdenv +, fetchurl +, libjpeg +, libGLU +, libGL +, freeglut +, zlib +, cmake +, libX11 +, libxml2 +, libpng +, libXxf86vm +}: -stdenv.mkDerivation { - name = "freepv-0.3.0"; +stdenv.mkDerivation rec { + pname = "freepv"; + version = "0.3.0"; src = fetchurl { - url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz"; + url = "mirror://sourceforge/freepv/freepv-${version}.tar.gz"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 86550b873719c..11a9382c94c8b 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -148,6 +148,8 @@ in stdenv.mkDerivation rec { # test-eevl.c:64:36: error: initializer element is not a compile-time constant doCheck = !stdenv.isDarwin; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 1715542adce45..17d87b60fece0 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -125,6 +125,8 @@ in buildInputs = with pkgs; [ fftw ]; postPatch = '' + substituteInPlace Makefile --replace '$(GCC)' '$(CC)' + # The tarball contains a prebuilt binary. make clean ''; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 3c87e62e3d668..21ba4c662c22a 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, tk }: stdenv.mkDerivation rec { - name = "gocr-0.52"; + pname = "gocr"; + version = "0.52"; src = fetchurl { - url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${version}.tar.gz"; sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z"; }; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index b661ba562f9de..edafa5612a2d2 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: -stdenv.mkDerivation { - name = "gpicview-0.2.4"; +stdenv.mkDerivation rec { + pname = "gpicview"; + version = "0.2.4"; src = fetchurl { - url = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz"; + url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz"; sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; }; @@ -15,15 +16,16 @@ stdenv.mkDerivation { }) ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ intltool gtk2 ]; + meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "http://lxde.sourceforge.net/gpicview/"; repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 39f7a42b3b3ba..427429404a09e 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,20 +1,17 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libpng }: -assert pkg-config != null && gtk2 != null && libpng != null; -# Note that we cannot just copy gtk's png attribute, since gtk might -# not be linked against png. -# !!! assert libpng == gtk2.libpng; - -stdenv.mkDerivation { - name = "gqview-2.1.5"; +stdenv.mkDerivation rec { + pname = "gqview"; + version = "2.1.5"; src = fetchurl { - url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz"; + url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz"; sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libpng]; + + buildInputs = [ gtk2 libpng ]; hardeningDisable = [ "format" ]; @@ -25,5 +22,6 @@ stdenv.mkDerivation { homepage = "http://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 13752bfc05dbf..268e59d910b53 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "Swiss army knife of image processing"; license = lib.licenses.mit; platforms = lib.platforms.all; + mainProgram = "gm"; }; } diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix index 15042e6877ff3..0d2f19660062d 100644 --- a/pkgs/applications/graphics/hdr-plus/default.nix +++ b/pkgs/applications/graphics/hdr-plus/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + sed -i '2a #include <array>' src/InputSource.h + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ halide libpng libjpeg libtiff libraw ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a83070e5e6b62..ec2ac709f8681 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,14 +1,46 @@ -{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch -, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext -, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +{ lib +, stdenv +, cmake +, fetchurl +, gnumake +, makeWrapper +, pkg-config +, fetchpatch +, autopanosiftc +, boost +, cairo +, enblend-enfuse +, exiv2 +, fftw +, flann +, gettext +, glew +, ilmbase +, lcms2 +, lensfun +, libjpeg +, libpng +, libtiff +, libX11 +, libXi +, libXmu +, libGLU +, libGL +, openexr +, panotools +, perlPackages +, sqlite +, vigra +, wxGTK +, zlib }: stdenv.mkDerivation rec { - name = "hugin-2019.0.0"; + pname = "hugin"; + version = "2019.0.0"; src = fetchurl { - url = "mirror://sourceforge/hugin/${name}.tar.bz2"; + url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; }; @@ -21,9 +53,30 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra - wxGTK zlib + boost + cairo + exiv2 + fftw + flann + gettext + glew + ilmbase + lcms2 + lensfun + libjpeg + libpng + libtiff + libX11 + libXi + libXmu + libGLU + libGL + openexr + panotools + sqlite + vigra + wxGTK + zlib ]; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 36dad897668c4..3fce492a9932c 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 = "458"; + version = "462"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro="; + sha256 = "sha256-eHUztpnDs1kxaBlTO7BRbO3eH+On9m7aJtbNw2b9Ado="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index f9b123ddb40ba..bc608c6735ffc 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = teams.pantheon.members; platforms = platforms.linux; + mainProgram = "com.github.cassidyjames.ideogram"; }; } diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 0dbc2d5d4e144..4af139b08443c 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchurl +, glib , jre , unzip , makeWrapper , makeDesktopItem , copyDesktopItems +, wrapGAppsHook }: let @@ -21,7 +23,10 @@ in stdenv.mkDerivation rec { url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw="; }; - nativeBuildInputs = [ copyDesktopItems makeWrapper unzip ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper unzip wrapGAppsHook ]; + buildInputs = [ glib ]; + dontWrapGApps = true; + desktopItems = lib.optionals stdenv.isLinux [ (makeDesktopItem { name = "ImageJ"; @@ -47,13 +52,15 @@ in stdenv.mkDerivation rec { # Simple cp shall clear suid bits, if any. cp ij.jar $out/share/java cp -dR luts macros plugins $out/share - makeWrapper ${jre}/bin/java $out/bin/imagej \ - --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' + makeWrapper ${jre}/bin/java $out/bin/imagej \ + ''${gappsWrapperArgs[@]} \ + --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" + install -Dm644 ${icon} $out/share/icons/hicolor/128x128/apps/imagej.png substituteInPlace $out/share/applications/ImageJ.desktop \ --replace Exec=imagej Exec=$out/bin/imagej diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index c0115d95ac809..e9f415f722dc1 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -6,6 +6,7 @@ , qttools , qtscript , qtdeclarative +, qtnetworkauth , qtbase , autogen , automake @@ -17,15 +18,16 @@ , rsync , typescript }: + stdenv.mkDerivation rec { pname = "imgbrd-grabber"; + version = "7.5.1"; - version = "7.3.2"; src = fetchFromGitHub { owner = "Bionus"; repo = "imgbrd-grabber"; rev = "v${version}"; - sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k"; + sha256 = "sha256-40JCdtRhAQpz2lBGmYh2MgA9rRzHmOZx7lWW0IbfjP4="; fetchSubmodules = true; }; @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qttools + qtnetworkauth nodejs cmake wrapQtAppsHook @@ -67,6 +70,8 @@ stdenv.mkDerivation rec { # link the catch2 sources from nixpkgs ln -sf ${catch2.src} tests/src/vendor/catch + + sed "s|strict\": true|strict\": false|g" -i ./sites/tsconfig.json ''; postInstall = '' diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index efaf341b1f649..a0819a203e722 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -32,7 +32,7 @@ mkDerivation rec { openjpeg opencolorio_1 poppler curl ilmbase qtmultimedia qtx11extras quazip python3Packages.pyqt5 - ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; + ] ++ lib.optional stdenv.hostPlatform.isx86 vc; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index cc6c4f42e6402..63dbbd791450b 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.02"; + version = "1.0.04"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-JaKThw6ubutpOCsO1pVAPVxhhUTKpfYRHjBSu02nlN4="; + sha256 = "sha256-3uuYxDxlBlu3/4BhII36s+PsLJCmHDIE3fRAz6GO/js="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index c949b8e6b4d01..0cdb87a2c3194 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -1,12 +1,12 @@ { stdenv , lib -, fetchFromSourcehut +, fetchFromGitLab +, glib , meson , ninja , pkg-config -, glib , wrapGAppsHook -, epoxy +, libepoxy , gtk4 , zbar , tiffSupport ? true @@ -27,25 +27,25 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.3.0"; + version = "1.4.0"; - src = fetchFromSourcehut { - owner = "~martijnbraam"; + src = fetchFromGitLab { + owner = "postmarketOS"; repo = "megapixels"; rev = version; - sha256 = "0dagp1sh5whnnllrydk7ijjid0hmvcbdm8kkzq2g168khdfn80jm"; + sha256 = "sha256-I7eevbIg+DEY9hnvat65J4Kem1FFNZc4XzaQQaewP/4="; }; nativeBuildInputs = [ + glib meson ninja pkg-config - glib wrapGAppsHook ]; buildInputs = [ - epoxy + libepoxy gtk4 zbar ]; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK4 camera application that knows how to deal with the media request api"; - homepage = "https://sr.ht/~martijnbraam/Megapixels"; - changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; + homepage = "https://gitlab.com/postmarketOS/megapixels"; + changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 0b4b80d648ac6..afaa681437cc2 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,28 +6,30 @@ , stdenv , libX11 , libXrandr +, AppKit , withSki ? true }: rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "050c6c60il6cy0a8d3nw4z2cyp043912a7n4n44yjpmx047w7kc7"; + sha256 = "sha256-wEPt96z/odQ05hosN+GB5KLsCu8onR9WWamofJayhwU="; }; - cargoSha256 = "0wwcda2w8jg3q132cvhdgfmjc0rz93fx6fai93g5w8br98aq9qzx"; + cargoSha256 = "sha256-nwxBreouL3Z47zHSH+Y/ej7KU2/bXyMQ+Tb7R4U+yKk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ]; + buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optional stdenv.isDarwin AppKit; - cargoBuildFlags = lib.optional (!withSki) "--no-default-features"; + buildNoDefaultFeatures = !withSki; postInstall = '' installManPage man/* @@ -37,8 +39,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Screen{shot,cast} and perform ImageOps on the command line"; homepage = "https://menyoki.cli.rs/"; + changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 40b28dd8566ac..f0693cc6121fe 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, libtiff, gettext }: +{ lib, stdenv, fetchurl, libtiff, gettext }: + +stdenv.mkDerivation rec { + pname = "minidjvu"; + version = "0.8"; -stdenv.mkDerivation { - name = "minidjvu-0.8"; src = fetchurl { - url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz"; + url = "mirror://sourceforge/minidjvu/minidjvu-${version}.tar.gz"; sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"; }; @@ -11,7 +13,7 @@ stdenv.mkDerivation { sed -i s,/usr/bin/gzip,gzip, Makefile.in ''; - buildInputs = [ libtiff gettext]; + buildInputs = [ libtiff gettext ]; preInstall = '' mkdir -p $out/lib diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 219613ad0ce56..0280664279511 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -19,6 +19,7 @@ , libXau , libXdmcp , libXrandr +, libbsd , libffi , libjpeg # , librealsense @@ -88,6 +89,7 @@ stdenv.mkDerivation rec { libXau libXdmcp libXrandr + libbsd libjpeg libffi # librealsense.dev - see below diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index c7be99469b059..be079b6bdb20d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -65,8 +65,6 @@ mkDerivation rec { mv $out/bin/*.app $out/Applications rmdir $out/bin || true - wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD - mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ $out/share/openscad/{examples,color-schemes,locale,libraries,fonts,templates} diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 4acb50e200fdb..338f716e9bbda 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,8 +1,22 @@ -{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, - lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: +{ lib +, stdenv +, fetchhg +, fetchpatch +, cmake +, qt4 +, fftw +, graphicsmagick_q16 +, lcms2 +, lensfun +, pkg-config +, libjpeg +, exiv2 +, liblqr1 +}: stdenv.mkDerivation { - name = "photivo-2014-01-25"; + pname = "photivo"; + version = "2014-01-25"; src = fetchhg { url = "http://code.google.com/p/photivo/"; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 2635b2d3d8863..66804fc3110b7 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,14 +1,18 @@ -{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, - gettext }: +{ lib +, fetchFromGitHub +, buildDotnetPackage +, dotnetPackages +, gtksharp +, gettext +}: let mono-addins = dotnetPackages.MonoAddins; in buildDotnetPackage rec { - name = "pinta-1.6"; - baseName = "Pinta"; version = "1.6"; + outputFiles = [ "bin/*" ]; buildInputs = [ gtksharp mono-addins gettext ]; xBuildFiles = [ "Pinta.sln" ]; @@ -37,23 +41,25 @@ buildDotnetPackage rec { "Mono\\.Addins\\.Setup" ]; - stripVersion = name: file: let + stripVersion = name: file: + let match = ''<Reference Include="${name}([ ,][^"]*)?"''; replace = ''<Reference Include="${name}"''; - in "sed -i -re 's/${match}/${replace}/g' ${file}\n"; + in + "sed -i -re 's/${match}/${replace}/g' ${file}\n"; # Map all possible pairs of two lists map2 = f: listA: listB: concatMap (a: map (f a) listB) listA; concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB); in - concatMap2Strings stripVersion versionedNames csprojFiles - + '' - # For some reason there is no Microsoft.Common.tasks file - # in ''${mono}/lib/mono/3.5 . - substituteInPlace Pinta.Install.proj \ - --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \ - --replace "/usr/local" "$out" - ''; + concatMap2Strings stripVersion versionedNames csprojFiles + + '' + # For some reason there is no Microsoft.Common.tasks file + # in ''${mono}/lib/mono/3.5 . + substituteInPlace Pinta.Install.proj \ + --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \ + --replace "/usr/local" "$out" + ''; makeWrapperArgs = [ "--prefix MONO_GAC_PREFIX : ${gtksharp}" diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix new file mode 100644 index 0000000000000..d88be43698446 --- /dev/null +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper +, gtk3-x11 }: + +stdenv.mkDerivation rec { + pname = "pixeluvo"; + version = "1.6.0-2"; + + src = fetchurl { + url = "http://www.pixeluvo.com/downloads/${pname}_${version}_amd64.deb"; + sha256 = "sha256-QYSuD6o3kHg0DrFihYEcf9e3b8U1bu4Zf78+Akmm8yo="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + gtk3-x11 + stdenv.cc.cc + ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/pixmaps/ + + substituteInPlace $out/share/applications/pixeluvo.desktop \ + --replace '/opt/pixeluvo/pixeluvo.png' pixeluvo + + makeWrapper $out/opt/pixeluvo/bin/Pixeluvo64 $out/bin/pixeluvo \ + --prefix LD_LIBRARY_PATH : ${libPath} + + runHook postInstall + ''; + + meta = with lib; { + description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; + homepage = "http://www.pixeluvo.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index b3e555358bede..6a47760082e0f 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { - name = "qscreenshot-1.0"; + pname = "qscreenshot"; + version = "1.0"; src = fetchurl { - url = "mirror://sourceforge/qscreenshot/${name}-src.tar.gz"; + url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz"; sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; }; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index f50e87d1eddb2..442e3200e4696 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -1,13 +1,15 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , substituteAll +, wrapQtAppsHook , qmake +, qtsvg , qtx11extras , graphviz }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qvge"; version = "0.6.3"; @@ -25,15 +27,15 @@ mkDerivation rec { inherit graphviz; }); - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ wrapQtAppsHook qmake ]; - buildInputs = [ qtx11extras ]; + buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; homepage = "https://github.com/ArsMasiuk/qvge"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 9ca0a7020609c..05b018215bb1b 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: +{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49" }: stdenv.mkDerivation rec { - name = "brother-udev-rule-type1-1.0.0-1"; + pname = "brother-udev-rule-type1"; + version = "1.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb"; + url = "http://download.brother.com/welcome/dlf006654/brother-udev-rule-type1-${version}.all.deb"; sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; }; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index e394acf2b0619..007483fb5e260 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng -, libusb-compat-0_1 ? null -, gimpSupport ? false, gimp ? null +{ lib +, stdenv +, fetchurl +, sane-backends +, sane-frontends +, libX11 +, gtk2 +, pkg-config +, libpng +, libusb-compat-0_1 +, gimpSupport ? false +, gimp }: -assert gimpSupport -> gimp != null; - stdenv.mkDerivation rec { - name = "xsane-0.999"; + pname = "xsane"; + version = "0.999"; src = fetchurl { - url = "http://www.xsane.org/download/${name}.tar.gz"; + url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; }; @@ -19,14 +27,15 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) + + buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; - meta = { + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; - license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 898cc3336a55e..a0e52ab5d3032 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{ lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: -stdenv.mkDerivation { - name = "scantailor-0.9.12.1"; +stdenv.mkDerivation rec { + pname = "scantailor"; + version = "0.9.12.1"; src = fetchurl { - url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz"; + url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index c7e55be9f0410..a6430f4889b9a 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -10,6 +10,7 @@ , procps , libwnck , libappindicator-gtk3 +, xdg-utils }: let @@ -64,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "shutter"; - version = "0.99"; + version = "0.99.2"; src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; rev = "v${version}"; - sha256 = "sha256-n5M+Ggk8ulJQMWjAW+/fC8fbqiBGzsx6IXlYxvf8utA="; + sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -81,6 +82,7 @@ stdenv.mkDerivation rec { librsvg libwnck libappindicator-gtk3 + hicolor-icon-theme ] ++ perlModules; makeFlags = [ @@ -94,9 +96,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --set PERL5LIB ${perlPackages.makePerlPath perlModules} \ - --prefix PATH : ${lib.makeBinPath [ imagemagick ] } \ - --suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ - --set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE + --prefix PATH : ${lib.makeBinPath [ imagemagick xdg-utils ] } ) ''; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 6a835fb3c71a4..c82e22ae0ca83 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,15 +1,14 @@ -{ fetchurl, lib, stdenv, cmake, qt4, fftw }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }: -let - rev = "9895036d26"; -in stdenv.mkDerivation rec { - name = "smartdeblur-git-${rev}"; + pname = "smartdeblur"; + version = "unstable-2013-01-09"; - src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}"; - name = "${name}.tar.gz"; - sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + src = fetchFromGitHub { + owner = "Y-Vladimir"; + repo = "SmartDeblur"; + rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e"; + sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw="; }; preConfigure = '' @@ -21,11 +20,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; - meta = { + meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 49cf93835b100..f78220d2f401c 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers }: +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: stdenv.mkDerivation rec { pname = "tesseract"; @@ -12,6 +12,18 @@ stdenv.mkDerivation rec { sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; }; + patches = [ + # https://github.com/tesseract-ocr/tesseract/issues/3447 + (fetchpatch { + url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch"; + sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ="; + }) + (fetchpatch { + url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch"; + sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index ef8d4b5096e6b..53f658590739f 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { - name = "wings-2.2.4"; + pname = "wings"; + version = "2.2.4"; + src = fetchurl { - url = "mirror://sourceforge/wings/${name}.tar.bz2"; + url = "mirror://sourceforge/wings/wings-${version}.tar.bz2"; sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; }; @@ -24,13 +26,13 @@ stdenv.mkDerivation rec { # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' - mkdir -p $out/bin $out/lib/${name}/ebin - cp ebin/* $out/lib/${name}/ebin - cp -R textures shaders plugins $out/lib/$name + mkdir -p $out/bin $out/lib/wings-${version}/ebin + cp ebin/* $out/lib/wings-${version}/ebin + cp -R textures shaders plugins $out/lib/wings-${version} cat << EOF > $out/bin/wings #!${runtimeShell} ${erlang}/bin/erl \ - -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" + -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings ''; @@ -39,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; license = lib.licenses.tcltk; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1d10789bccaed..f4eb1b85965dc 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.08.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 869a0f6ac6709..87bc95a249413 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -22,7 +22,7 @@ mkDerivation { homepage = "https://apps.kde.org/kalarm/"; description = "Personal alarm scheduler"; license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.rittelle ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index e73f6f13ce9fc..6d407e0a50d7f 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -12,7 +12,7 @@ mkDerivation { homepage = "https://apps.kde.org/kdebugsettings/"; description = "KDE debug settings"; license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.rittelle ]; + maintainers = [ ]; broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 637ae3bc977e3..7fe3aa529fa24 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff -, gpsd, perl, fetchpatch +, gpsd, perl }: mkDerivation { @@ -18,15 +18,6 @@ mkDerivation { qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts knewstuff gpsd ]; - patches = [ - (fetchpatch { - # Backport fix to allow compilation with gpsd 3.23.1 - # Remove when marble compiles without the patch. - # See: https://invent.kde.org/education/marble/-/merge_requests/57 - url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff"; - sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo="; - }) - ]; preConfigure = '' cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include" ''; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 4f4ab4464a394..73032655fc439 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1811 +4,1811 @@ { akonadi = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz"; - sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6"; - name = "akonadi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-21.08.3.tar.xz"; + sha256 = "1yqlgzni7kj0n7k2wvi65wfz4il75j7qvmrdjw3a0ld6115j2vqs"; + name = "akonadi-21.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz"; - sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812"; - name = "akonadi-calendar-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-21.08.3.tar.xz"; + sha256 = "17pl7viz89zn43iyp6hk9q2dix1mzfxmxf08jk5wcciphabyj2sc"; + name = "akonadi-calendar-21.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz"; - sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg"; - name = "akonadi-calendar-tools-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-tools-21.08.3.tar.xz"; + sha256 = "0wc3yfb8riijmmwqbny7vpfav24w8id4s2ysbcljrvypv420ii2g"; + name = "akonadi-calendar-tools-21.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz"; - sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc"; - name = "akonadi-contacts-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-contacts-21.08.3.tar.xz"; + sha256 = "1i5mwjf8vp40mmdfkafhhbcmvdd2sihd6aa4z1wnhnbg59cjvp8i"; + name = "akonadi-contacts-21.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz"; - sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs"; - name = "akonadi-import-wizard-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-import-wizard-21.08.3.tar.xz"; + sha256 = "1splq2fgifk4mh00j4dd1lmgyc4bvz8sbsw0fznmafg76k1fvama"; + name = "akonadi-import-wizard-21.08.3.tar.xz"; }; }; akonadi-mime = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz"; - sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5"; - name = "akonadi-mime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-mime-21.08.3.tar.xz"; + sha256 = "19dbgl9940wwsiyhysh1lm5ks9xb6a5m53p9qmdr5siid9karq64"; + name = "akonadi-mime-21.08.3.tar.xz"; }; }; akonadi-notes = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz"; - sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h"; - name = "akonadi-notes-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-notes-21.08.3.tar.xz"; + sha256 = "0g1kdhj4qjl29x70dl4fl30f4r67s6ldpmqrf0xnj7zwz008r0fn"; + name = "akonadi-notes-21.08.3.tar.xz"; }; }; akonadi-search = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz"; - sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i"; - name = "akonadi-search-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-search-21.08.3.tar.xz"; + sha256 = "1fvfd1410zy9dbcjl21463wj91s5vly00l53ixaizylnjbj67lm0"; + name = "akonadi-search-21.08.3.tar.xz"; }; }; akonadiconsole = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz"; - sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk"; - name = "akonadiconsole-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadiconsole-21.08.3.tar.xz"; + sha256 = "1id1l6ifc1b8qsx16badhww33idk7c8qnn4lh3bg6mg1whmvy4k2"; + name = "akonadiconsole-21.08.3.tar.xz"; }; }; akregator = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz"; - sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm"; - name = "akregator-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akregator-21.08.3.tar.xz"; + sha256 = "1jb2vd43pn7i1b7ylhm74q0jkk3hwbjxh6nc2hqpl9c0ic20arf2"; + name = "akregator-21.08.3.tar.xz"; }; }; analitza = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz"; - sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4"; - name = "analitza-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/analitza-21.08.3.tar.xz"; + sha256 = "04g1l9q80j5rigz0667js35zjm3as0dpfkjhcm997bna1yb0d92z"; + name = "analitza-21.08.3.tar.xz"; }; }; ark = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz"; - sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0"; - name = "ark-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ark-21.08.3.tar.xz"; + sha256 = "1wrxv8csj1irrwcddkjgbcivpxi2v3nj06lvayzr32b29i85h637"; + name = "ark-21.08.3.tar.xz"; }; }; artikulate = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz"; - sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk"; - name = "artikulate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/artikulate-21.08.3.tar.xz"; + sha256 = "14g5wcw1bxxmbc9vvy07zbk2ma2cj1zbb5fdcwdf4ybaal9r43jq"; + name = "artikulate-21.08.3.tar.xz"; }; }; audiocd-kio = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz"; - sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li"; - name = "audiocd-kio-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/audiocd-kio-21.08.3.tar.xz"; + sha256 = "0fp29igj87pff8jya230j67vcz9pv7g27g4dv2pl3r6gm2kv8c9i"; + name = "audiocd-kio-21.08.3.tar.xz"; }; }; baloo-widgets = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz"; - sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd"; - name = "baloo-widgets-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/baloo-widgets-21.08.3.tar.xz"; + sha256 = "1pjlw22ivqhpd6bf50d8s9jaq6h2k0l2szwnh841qq7bwwkp9kcb"; + name = "baloo-widgets-21.08.3.tar.xz"; }; }; blinken = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz"; - sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87"; - name = "blinken-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/blinken-21.08.3.tar.xz"; + sha256 = "03s3pv61jhkx3lm5rik25fglhda9l4w43blpwh78rbdk3c3s3ijg"; + name = "blinken-21.08.3.tar.xz"; }; }; bomber = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz"; - sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338"; - name = "bomber-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/bomber-21.08.3.tar.xz"; + sha256 = "0h5iwpmpw8xnqh6xcm4zqqcp1ia5wir0ghwsbcgrz9ka59dfdh4z"; + name = "bomber-21.08.3.tar.xz"; }; }; bovo = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz"; - sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa"; - name = "bovo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/bovo-21.08.3.tar.xz"; + sha256 = "0p5pi6rnnmikhg72gagld67r022bq3nsrhls0gglx14zfj6pgln3"; + name = "bovo-21.08.3.tar.xz"; }; }; calendarsupport = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz"; - sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw"; - name = "calendarsupport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/calendarsupport-21.08.3.tar.xz"; + sha256 = "1kial8x8sw0039n2s3nl9i0wadf8xda1bv2g9kws0kp29k58lyfy"; + name = "calendarsupport-21.08.3.tar.xz"; }; }; cantor = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz"; - sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw"; - name = "cantor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/cantor-21.08.3.tar.xz"; + sha256 = "1l3z0aikrfjdpcfq6apmwla9k7dqymvysi275kpx0dqi5sfgi9lb"; + name = "cantor-21.08.3.tar.xz"; }; }; cervisia = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz"; - sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l"; - name = "cervisia-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/cervisia-21.08.3.tar.xz"; + sha256 = "0a7g3g849vf0c0222944iwqhymnxcn9qj0v85m2b0bfxgdf0fgk7"; + name = "cervisia-21.08.3.tar.xz"; }; }; dolphin = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz"; - sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf"; - name = "dolphin-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dolphin-21.08.3.tar.xz"; + sha256 = "19yrgfliqabmymrh3sx2i5129rcc14nxb86f21wd616b3pcby5rv"; + name = "dolphin-21.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz"; - sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr"; - name = "dolphin-plugins-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dolphin-plugins-21.08.3.tar.xz"; + sha256 = "098i2zydzi95i860pk6p0g0wx1bryyxanawhcis5d5h3xra66s0p"; + name = "dolphin-plugins-21.08.3.tar.xz"; }; }; dragon = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz"; - sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy"; - name = "dragon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dragon-21.08.3.tar.xz"; + sha256 = "0zfh5kmw2mvnwpcbh9i6xzzdigkglr6y0y7acw2dw6bi2cqx5cc7"; + name = "dragon-21.08.3.tar.xz"; }; }; elisa = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz"; - sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr"; - name = "elisa-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/elisa-21.08.3.tar.xz"; + sha256 = "0w3sk52ghkka305hagld5ia6z6czavbqgc0abqdz442bgnk1f1vb"; + name = "elisa-21.08.3.tar.xz"; }; }; eventviews = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz"; - sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh"; - name = "eventviews-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/eventviews-21.08.3.tar.xz"; + sha256 = "08bcw79iag71yiaf7ck27b2ja4pg18ah04rxa1c6g5fr9x6kkk46"; + name = "eventviews-21.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz"; - sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w"; - name = "ffmpegthumbs-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ffmpegthumbs-21.08.3.tar.xz"; + sha256 = "10l9592f2l63rfak3f0knvzapsaa8nyx3dl82n724359qj43m530"; + name = "ffmpegthumbs-21.08.3.tar.xz"; }; }; filelight = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz"; - sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi"; - name = "filelight-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/filelight-21.08.3.tar.xz"; + sha256 = "0j5106x93ljkcxk90cs1yvd9dw3pnr007cd4plsw5z7kgmch3zww"; + name = "filelight-21.08.3.tar.xz"; }; }; granatier = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz"; - sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv"; - name = "granatier-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/granatier-21.08.3.tar.xz"; + sha256 = "1igia7fxll361np76763nw915d90f5hklgqii9iyld8si99amy4y"; + name = "granatier-21.08.3.tar.xz"; }; }; grantlee-editor = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz"; - sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd"; - name = "grantlee-editor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/grantlee-editor-21.08.3.tar.xz"; + sha256 = "04yry04cdysh4a1y6nznxmfw2pww956xan0dnf77yjzssri9p2fq"; + name = "grantlee-editor-21.08.3.tar.xz"; }; }; grantleetheme = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz"; - sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm"; - name = "grantleetheme-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/grantleetheme-21.08.3.tar.xz"; + sha256 = "11c72jp9ywpmsc3d92cj2c9xvwmqbilsfddmlxlwnpnp2rf8q933"; + name = "grantleetheme-21.08.3.tar.xz"; }; }; gwenview = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz"; - sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0"; - name = "gwenview-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/gwenview-21.08.3.tar.xz"; + sha256 = "06hg20sygi6xfbifgi1d6s5zba5qqpm949xa7gyxi1vsq0kbvrq4"; + name = "gwenview-21.08.3.tar.xz"; }; }; incidenceeditor = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz"; - sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31"; - name = "incidenceeditor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/incidenceeditor-21.08.3.tar.xz"; + sha256 = "0p45x5qkzbfklxk22kzp9zlvl8ggdjgniq889q8hzb1s89ia1cck"; + name = "incidenceeditor-21.08.3.tar.xz"; }; }; itinerary = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz"; - sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs"; - name = "itinerary-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/itinerary-21.08.3.tar.xz"; + sha256 = "0w7kb4wvy1sfhlkikvq1ajckizf7k2bzy2wcjdz5is69rrd5cab5"; + name = "itinerary-21.08.3.tar.xz"; }; }; juk = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz"; - sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b"; - name = "juk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/juk-21.08.3.tar.xz"; + sha256 = "19g1dpvrssip8vysds3j4wa599ivapznz10p0p1254gkjyxdxdm3"; + name = "juk-21.08.3.tar.xz"; }; }; k3b = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz"; - sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz"; - name = "k3b-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/k3b-21.08.3.tar.xz"; + sha256 = "1k5xn33sggx3a7lns8y64sa3schqvg476q81rig9mylh68x8rr5y"; + name = "k3b-21.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz"; - sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp"; - name = "kaccounts-integration-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-integration-21.08.3.tar.xz"; + sha256 = "0hyaygrsdp6s96s4wa9z5l1w5w5hxwbw432zs6a2fkgq5dpa3wn4"; + name = "kaccounts-integration-21.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz"; - sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0"; - name = "kaccounts-providers-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-providers-21.08.3.tar.xz"; + sha256 = "0chajl87w3gp1a8l7h6bxf93js6jxdkx90ir82glgh45p5qhdhcr"; + name = "kaccounts-providers-21.08.3.tar.xz"; }; }; kaddressbook = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz"; - sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb"; - name = "kaddressbook-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaddressbook-21.08.3.tar.xz"; + sha256 = "1c16pcbjd5w04xbkjalvf697nqi751f4g8ldaing3k2rmdvhsqwg"; + name = "kaddressbook-21.08.3.tar.xz"; }; }; kajongg = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz"; - sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb"; - name = "kajongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kajongg-21.08.3.tar.xz"; + sha256 = "15i5vdcwm7a5amrxxbi0f4c3ls7ly1ccg88hff2wc960wwc6nvqb"; + name = "kajongg-21.08.3.tar.xz"; }; }; kalarm = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz"; - sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh"; - name = "kalarm-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalarm-21.08.3.tar.xz"; + sha256 = "0zcmaf4x9jvpyri1kirnm2rij3886z9k1vx6wxxxmx6sbllpb669"; + name = "kalarm-21.08.3.tar.xz"; }; }; kalarmcal = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz"; - sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa"; - name = "kalarmcal-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalarmcal-21.08.3.tar.xz"; + sha256 = "03zmw8pxhfmrm7xl5h2k42xyqwn4cllhrp43sv7pjbym9ya41wyk"; + name = "kalarmcal-21.08.3.tar.xz"; }; }; kalgebra = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz"; - sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w"; - name = "kalgebra-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalgebra-21.08.3.tar.xz"; + sha256 = "0w2n3nyds9069c4cj1ap2b14w8nw5dc3yb62j5y6yj9qz9ip7cdk"; + name = "kalgebra-21.08.3.tar.xz"; }; }; kalzium = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz"; - sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp"; - name = "kalzium-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalzium-21.08.3.tar.xz"; + sha256 = "0x7dn0f2bwzplzxal2wvnc3qh2qs522626ksp6ajgf16jwf7d4kl"; + name = "kalzium-21.08.3.tar.xz"; }; }; kamera = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz"; - sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy"; - name = "kamera-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kamera-21.08.3.tar.xz"; + sha256 = "1yv87rmb8k6yh5150915fsnh8rdj1d4k8zpc8k54hxa9gjw5wqm7"; + name = "kamera-21.08.3.tar.xz"; }; }; kamoso = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz"; - sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6"; - name = "kamoso-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kamoso-21.08.3.tar.xz"; + sha256 = "1k2kis36a6dlsnh85qc01yd6qnz8kwrv4hvzpkpqvvp3m4ik17wx"; + name = "kamoso-21.08.3.tar.xz"; }; }; kanagram = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz"; - sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1"; - name = "kanagram-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kanagram-21.08.3.tar.xz"; + sha256 = "1rxirjrw6dj23awv6gbypv0jlwfdh4baz86l32rx8pnmd9icg7s3"; + name = "kanagram-21.08.3.tar.xz"; }; }; kapman = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz"; - sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm"; - name = "kapman-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kapman-21.08.3.tar.xz"; + sha256 = "0v8ay2s868l7dxasq0rhy065rp9sfb4fzldcqs46lxy7jmk3ws93"; + name = "kapman-21.08.3.tar.xz"; }; }; kapptemplate = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz"; - sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5"; - name = "kapptemplate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kapptemplate-21.08.3.tar.xz"; + sha256 = "02dp4qwrv3gylri936c82imh4lv1a3vfzlphmwadyhiy7j9ic5fa"; + name = "kapptemplate-21.08.3.tar.xz"; }; }; kate = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz"; - sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z"; - name = "kate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kate-21.08.3.tar.xz"; + sha256 = "1gdz0wxkh34a2zi9vks9qw70g7dvkbvrbp6y68rjg7720sdb0gp2"; + name = "kate-21.08.3.tar.xz"; }; }; katomic = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz"; - sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb"; - name = "katomic-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/katomic-21.08.3.tar.xz"; + sha256 = "1sgrpqbv4zz22qijm00lzv1cv4rwjh7bbf4gz9xmnfmhyw0n88i1"; + name = "katomic-21.08.3.tar.xz"; }; }; kbackup = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz"; - sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya"; - name = "kbackup-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbackup-21.08.3.tar.xz"; + sha256 = "1cjb2invbc60i2lahn01kd28q3wb6s35grwglgmx2cgqqkmgl42s"; + name = "kbackup-21.08.3.tar.xz"; }; }; kblackbox = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz"; - sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd"; - name = "kblackbox-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kblackbox-21.08.3.tar.xz"; + sha256 = "1i4c5v5w42akf4b44sqrl9x4rhqgyjljr7k5i440ahch9qkf93pj"; + name = "kblackbox-21.08.3.tar.xz"; }; }; kblocks = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz"; - sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj"; - name = "kblocks-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kblocks-21.08.3.tar.xz"; + sha256 = "0326fxv1nvh37h8xhvv5x4fy3l4gbrzmwsgcwslma1hakys9dhrs"; + name = "kblocks-21.08.3.tar.xz"; }; }; kbounce = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz"; - sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix"; - name = "kbounce-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbounce-21.08.3.tar.xz"; + sha256 = "00d9m7c564qrifpaldvjk6ahclrjk1aawhypjj9sls2sisx2mip4"; + name = "kbounce-21.08.3.tar.xz"; }; }; kbreakout = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz"; - sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g"; - name = "kbreakout-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbreakout-21.08.3.tar.xz"; + sha256 = "1h3s4cr4bxi24j55anks946h7iba2wda5kbglsyfqw1ifrsq13vz"; + name = "kbreakout-21.08.3.tar.xz"; }; }; kbruch = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz"; - sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34"; - name = "kbruch-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbruch-21.08.3.tar.xz"; + sha256 = "15bfqxz4j5f5ix55fsk780p7ddrzqzmk55gmbjy796sgh8b71wcr"; + name = "kbruch-21.08.3.tar.xz"; }; }; kcachegrind = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz"; - sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv"; - name = "kcachegrind-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcachegrind-21.08.3.tar.xz"; + sha256 = "188m15y7sj17jyr9963gblgkknhgf32331kvzz4cwqzk14b9krr2"; + name = "kcachegrind-21.08.3.tar.xz"; }; }; kcalc = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz"; - sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk"; - name = "kcalc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcalc-21.08.3.tar.xz"; + sha256 = "1d7716law49cwmis4w9ij1xmi4g2wrv4mnc78xcms8kmgba5gs7v"; + name = "kcalc-21.08.3.tar.xz"; }; }; kcalutils = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz"; - sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m"; - name = "kcalutils-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcalutils-21.08.3.tar.xz"; + sha256 = "0l209pyi866mf1pr4rkq7g3pgjvyss5sqhpy9vb2b2w66w3f66ri"; + name = "kcalutils-21.08.3.tar.xz"; }; }; kcharselect = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz"; - sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr"; - name = "kcharselect-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcharselect-21.08.3.tar.xz"; + sha256 = "0fk06whwi4h43sw3adcs4b2s9ycwjamzrwr23m33c31mlpcb3i8z"; + name = "kcharselect-21.08.3.tar.xz"; }; }; kcolorchooser = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz"; - sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7"; - name = "kcolorchooser-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcolorchooser-21.08.3.tar.xz"; + sha256 = "07fvl4rfzhgz4kh9dhqkq6kf4913jv9cw9abfdb7k3pbr0r26qgz"; + name = "kcolorchooser-21.08.3.tar.xz"; }; }; kcron = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz"; - sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan"; - name = "kcron-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcron-21.08.3.tar.xz"; + sha256 = "1374agj9qc5ifm0yckq8m94gq7sjd42n4wwb59p756736asan8k5"; + name = "kcron-21.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz"; - sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c"; - name = "kde-dev-scripts-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-scripts-21.08.3.tar.xz"; + sha256 = "152n6iir4xzx1a5d5bi4lb42rgl222pi6jz0hfkchk7swfgpvdfs"; + name = "kde-dev-scripts-21.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz"; - sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l"; - name = "kde-dev-utils-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-utils-21.08.3.tar.xz"; + sha256 = "1xs4fybbqlxji2py06hxabsisfb3bkvbfb3vy9lyj2k5vnnmpkf8"; + name = "kde-dev-utils-21.08.3.tar.xz"; }; }; kdebugsettings = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz"; - sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90"; - name = "kdebugsettings-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdebugsettings-21.08.3.tar.xz"; + sha256 = "1d47igv0xg1hlxzyfg10h5g7s79yq44d3ixpr82risyrslbwvll4"; + name = "kdebugsettings-21.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz"; - sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33"; - name = "kdeconnect-kde-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdeconnect-kde-21.08.3.tar.xz"; + sha256 = "1gfsbg6rwqv3cpfxcayn3q9i99mnhjz666p9x9ih205idlrn6iij"; + name = "kdeconnect-kde-21.08.3.tar.xz"; }; }; kdeedu-data = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz"; - sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65"; - name = "kdeedu-data-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdeedu-data-21.08.3.tar.xz"; + sha256 = "15qqcl6gws6ddyv373dfql3wj2fryvr5b6d66q4l1xwc1mg6wnqs"; + name = "kdeedu-data-21.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz"; - sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32"; - name = "kdegraphics-mobipocket-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-mobipocket-21.08.3.tar.xz"; + sha256 = "1bli0ld2mymgppjsjjvkyk7ldpz787p30d7lf6lpafrf64di2bhm"; + name = "kdegraphics-mobipocket-21.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz"; - sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly"; - name = "kdegraphics-thumbnailers-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-thumbnailers-21.08.3.tar.xz"; + sha256 = "1hbjmkjymb3pi1lz43bl5clgdyy6kr928q7fniwiwmak3k1xrng5"; + name = "kdegraphics-thumbnailers-21.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz"; - sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf"; - name = "kdenetwork-filesharing-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdenetwork-filesharing-21.08.3.tar.xz"; + sha256 = "19c3my0i9xb3salf7sk870nhv797wkk83dyrczw672skwl8xcnd9"; + name = "kdenetwork-filesharing-21.08.3.tar.xz"; }; }; kdenlive = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz"; - sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz"; - name = "kdenlive-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdenlive-21.08.3.tar.xz"; + sha256 = "00ss9i9gw112vc3bjayp193qnfd3dq47bij9mv429azl20ff0y0c"; + name = "kdenlive-21.08.3.tar.xz"; }; }; kdepim-addons = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz"; - sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8"; - name = "kdepim-addons-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdepim-addons-21.08.3.tar.xz"; + sha256 = "1ham9yzmj89lp3zwxwpyh0qy7fxrlhgmhphn9crrkx9gsy77ddsf"; + name = "kdepim-addons-21.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz"; - sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9"; - name = "kdepim-runtime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdepim-runtime-21.08.3.tar.xz"; + sha256 = "1d2208pwalc6mjfnn4gfq2f2fqgxp9w3g8igx6r6l9qsgybh1msx"; + name = "kdepim-runtime-21.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz"; - sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w"; - name = "kdesdk-kioslaves-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-kioslaves-21.08.3.tar.xz"; + sha256 = "0frw2zxwckmqmffxn5gszdxz61zc0k8xpbhbiyfxsqprh3ck4a2y"; + name = "kdesdk-kioslaves-21.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz"; - sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6"; - name = "kdesdk-thumbnailers-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-thumbnailers-21.08.3.tar.xz"; + sha256 = "06s7i85g5gpknxlrq59i5w8czpaz5wl1b8kfx9flzx0x6ibm5s9q"; + name = "kdesdk-thumbnailers-21.08.3.tar.xz"; }; }; kdf = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz"; - sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv"; - name = "kdf-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdf-21.08.3.tar.xz"; + sha256 = "061xclwkhmc9m8f113hlb46dwk5zvqlmgahz13yfbvyrpj810a7k"; + name = "kdf-21.08.3.tar.xz"; }; }; kdialog = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz"; - sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94"; - name = "kdialog-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdialog-21.08.3.tar.xz"; + sha256 = "1ibqz8s8p90rxy843f1wn3jnyzrm54srhfpr4ix48amf86afj2gp"; + name = "kdialog-21.08.3.tar.xz"; }; }; kdiamond = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz"; - sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz"; - name = "kdiamond-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdiamond-21.08.3.tar.xz"; + sha256 = "1vkflwvi1wa2kd6hq647g9skxg6c7jdk9hakzfphlq2jw6daml94"; + name = "kdiamond-21.08.3.tar.xz"; }; }; keditbookmarks = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz"; - sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w"; - name = "keditbookmarks-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/keditbookmarks-21.08.3.tar.xz"; + sha256 = "0v9grm385zyxpsqjp287cz8lvrvfzkk7b4blvdr1hi66sng7nr2n"; + name = "keditbookmarks-21.08.3.tar.xz"; }; }; kfind = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz"; - sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f"; - name = "kfind-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfind-21.08.3.tar.xz"; + sha256 = "04qdxqa8gfipjm5akplxrjbnlaky2djkx8nkvcqzqfhvw5i9rxqp"; + name = "kfind-21.08.3.tar.xz"; }; }; kfloppy = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz"; - sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg"; - name = "kfloppy-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfloppy-21.08.3.tar.xz"; + sha256 = "14l53a0mrzhnfrhalr71fv0j0ksz6c1zqj8j33nayhqz386yrccx"; + name = "kfloppy-21.08.3.tar.xz"; }; }; kfourinline = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz"; - sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac"; - name = "kfourinline-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfourinline-21.08.3.tar.xz"; + sha256 = "0w2zdl0yfhwdwbnlqd4l9pdx7q9mr0xq7kw49h9wiajy1zmh8vls"; + name = "kfourinline-21.08.3.tar.xz"; }; }; kgeography = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz"; - sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64"; - name = "kgeography-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgeography-21.08.3.tar.xz"; + sha256 = "03wchz3bd4vlijywp9r2xilmhw4gc3ka54ilf2w60baazslhlnr3"; + name = "kgeography-21.08.3.tar.xz"; }; }; kget = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz"; - sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r"; - name = "kget-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kget-21.08.3.tar.xz"; + sha256 = "0zpzh7bf65kz469viff794zdwc54aq84ndafx6g07nhqs3jhnmjp"; + name = "kget-21.08.3.tar.xz"; }; }; kgoldrunner = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz"; - sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85"; - name = "kgoldrunner-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgoldrunner-21.08.3.tar.xz"; + sha256 = "0c566c83a7kdc4kvzn37q4kdmr373hfrjgmq7mvn9bji5gcaqzch"; + name = "kgoldrunner-21.08.3.tar.xz"; }; }; kgpg = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz"; - sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs"; - name = "kgpg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgpg-21.08.3.tar.xz"; + sha256 = "0q8da9mzqxg0xmclcpgjh8c744l1sm180ga6hxbasan47wwq67as"; + name = "kgpg-21.08.3.tar.xz"; }; }; khangman = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz"; - sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp"; - name = "khangman-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/khangman-21.08.3.tar.xz"; + sha256 = "1iq4njq0fa7all8zm2q585i1grmv2nfb5qnpr8xpyn13np39q8sr"; + name = "khangman-21.08.3.tar.xz"; }; }; khelpcenter = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz"; - sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y"; - name = "khelpcenter-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/khelpcenter-21.08.3.tar.xz"; + sha256 = "1pn5822yxqw62hynkf05a33gzs9xvrwwrxam024g6gs0y0v5nsfp"; + name = "khelpcenter-21.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz"; - sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76"; - name = "kidentitymanagement-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kidentitymanagement-21.08.3.tar.xz"; + sha256 = "00fhw2c7jmv0xqyd1jlrlkahszw163a7cbljn83msws8m5mrnlcb"; + name = "kidentitymanagement-21.08.3.tar.xz"; }; }; kig = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz"; - sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s"; - name = "kig-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kig-21.08.3.tar.xz"; + sha256 = "1l4zap7lm1pigyldbqy20jaqysid0r4a6y71qalxk3f565jsqfx5"; + name = "kig-21.08.3.tar.xz"; }; }; kigo = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz"; - sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47"; - name = "kigo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kigo-21.08.3.tar.xz"; + sha256 = "1cdrmlwpzbkz1mi2f72z9dh1pvkdkjn885zqqybhqbqicn3w3qch"; + name = "kigo-21.08.3.tar.xz"; }; }; killbots = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz"; - sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn"; - name = "killbots-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/killbots-21.08.3.tar.xz"; + sha256 = "1mwa46r7yvxhavprc6yjh773gjhz5ks0znsvpzambn6hk23r11p8"; + name = "killbots-21.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz"; - sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg"; - name = "kimagemapeditor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kimagemapeditor-21.08.3.tar.xz"; + sha256 = "0vzy028cgq0ai4f9rgkc32w09yz5836y280nck2wxk2dajjc5k6x"; + name = "kimagemapeditor-21.08.3.tar.xz"; }; }; kimap = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz"; - sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl"; - name = "kimap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kimap-21.08.3.tar.xz"; + sha256 = "11xwkgxm0ghbpcy6bmvkw1hlsfkdrlyyfbblv5m4s881ky7h4aim"; + name = "kimap-21.08.3.tar.xz"; }; }; kio-extras = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz"; - sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688"; - name = "kio-extras-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kio-extras-21.08.3.tar.xz"; + sha256 = "0lx0b9q68mfb96jfwsf0awcx9wn47nmnqqnk57wrbx8zx880q0j2"; + name = "kio-extras-21.08.3.tar.xz"; }; }; kio-gdrive = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz"; - sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw"; - name = "kio-gdrive-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kio-gdrive-21.08.3.tar.xz"; + sha256 = "1h781cksqq5qana80rlc0x3cfz5prl1g3il4282vf2yqihl3zgrd"; + name = "kio-gdrive-21.08.3.tar.xz"; }; }; kipi-plugins = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz"; - sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid"; - name = "kipi-plugins-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kipi-plugins-21.08.3.tar.xz"; + sha256 = "1vscmljcadz11m4jsbkkx5f8ywbyvmfxnw1g7x5ks8d8hqsrcgd0"; + name = "kipi-plugins-21.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz"; - sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd"; - name = "kirigami-gallery-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kirigami-gallery-21.08.3.tar.xz"; + sha256 = "0d2psfq5q7zjmd4k1jz0fgwi3gnhi78jn10hrwvc7f8fb6pw4rzc"; + name = "kirigami-gallery-21.08.3.tar.xz"; }; }; kiriki = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz"; - sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00"; - name = "kiriki-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kiriki-21.08.3.tar.xz"; + sha256 = "19qvbxc0dpjq0vb5kh3qsrkv1793bz5ii958a4yqfmmc8xb26v2x"; + name = "kiriki-21.08.3.tar.xz"; }; }; kiten = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz"; - sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3"; - name = "kiten-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kiten-21.08.3.tar.xz"; + sha256 = "0ly44w9y4ha5nw6lqpm5gavxc3ywqc4wh04nl7wpg0m2rm624mci"; + name = "kiten-21.08.3.tar.xz"; }; }; kitinerary = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz"; - sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi"; - name = "kitinerary-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kitinerary-21.08.3.tar.xz"; + sha256 = "066rq42g5l1rmzf5c7xg21p35ln60ir92d0sp2wg9s5li0l0azbf"; + name = "kitinerary-21.08.3.tar.xz"; }; }; kjumpingcube = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz"; - sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj"; - name = "kjumpingcube-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kjumpingcube-21.08.3.tar.xz"; + sha256 = "0iya370m6n9g6m6rzfkdsb9ypwdd0ksfddiy2g0yvjf1xdxr7im9"; + name = "kjumpingcube-21.08.3.tar.xz"; }; }; kldap = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz"; - sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g"; - name = "kldap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kldap-21.08.3.tar.xz"; + sha256 = "1jb1k5xpicsmazc6c57z203w75h8klja7jp7p8934nvj9dgqqcd1"; + name = "kldap-21.08.3.tar.xz"; }; }; kleopatra = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz"; - sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx"; - name = "kleopatra-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kleopatra-21.08.3.tar.xz"; + sha256 = "1gpn0kpxrw4jn214k5swg2frkfgp9clr99n45z3mzjdccl8zfsbi"; + name = "kleopatra-21.08.3.tar.xz"; }; }; klettres = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz"; - sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m"; - name = "klettres-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klettres-21.08.3.tar.xz"; + sha256 = "0w4fynbvnvlizz0qjkn2qcnn3xs1b0jjfmy9a01wff93a4nw2cj8"; + name = "klettres-21.08.3.tar.xz"; }; }; klickety = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz"; - sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c"; - name = "klickety-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klickety-21.08.3.tar.xz"; + sha256 = "00dl0c6si302mprdwdngxa4361qmr27ii5kvk38vrdlq0cynzgzv"; + name = "klickety-21.08.3.tar.xz"; }; }; klines = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz"; - sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6"; - name = "klines-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klines-21.08.3.tar.xz"; + sha256 = "0n3mdnwlyl0q09bz7dkb3796ki3l181085rb2r1k2mjnjwmn8zya"; + name = "klines-21.08.3.tar.xz"; }; }; kmag = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz"; - sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c"; - name = "kmag-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmag-21.08.3.tar.xz"; + sha256 = "09jvp1hhdam31qwljzpflcnm1mczsai6xlxlks6q0qi2n52cxkhb"; + name = "kmag-21.08.3.tar.xz"; }; }; kmahjongg = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz"; - sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim"; - name = "kmahjongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmahjongg-21.08.3.tar.xz"; + sha256 = "0afjg3svj1sg47xrz3fgvgkd74lvl71sy26br7jjyxjbq1ag9sin"; + name = "kmahjongg-21.08.3.tar.xz"; }; }; kmail = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz"; - sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr"; - name = "kmail-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmail-21.08.3.tar.xz"; + sha256 = "02kina7xn10f963xb7jgzrf15z6akzgl8ba4c9a7yb46ra4w2707"; + name = "kmail-21.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz"; - sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal"; - name = "kmail-account-wizard-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmail-account-wizard-21.08.3.tar.xz"; + sha256 = "1wfzbkipdhmbsj1q5c79ssij1sz57mapg1kkypw10p0nlriklz89"; + name = "kmail-account-wizard-21.08.3.tar.xz"; }; }; kmailtransport = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz"; - sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv"; - name = "kmailtransport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmailtransport-21.08.3.tar.xz"; + sha256 = "0xn4imfb4085wx5czxb3yiigslwfxwdi2dmgv7ng01wbphpg0chw"; + name = "kmailtransport-21.08.3.tar.xz"; }; }; kmbox = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz"; - sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3"; - name = "kmbox-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmbox-21.08.3.tar.xz"; + sha256 = "19dkc5l5h5x4h5nq924clc06vz5abll2ki70pc6r9py33rfjs11j"; + name = "kmbox-21.08.3.tar.xz"; }; }; kmime = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz"; - sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw"; - name = "kmime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmime-21.08.3.tar.xz"; + sha256 = "1bmgnsslhfzyix85c5p3mym6r9f2sjw5ajd5kzw9yxzyvzyc7kv6"; + name = "kmime-21.08.3.tar.xz"; }; }; kmines = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz"; - sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj"; - name = "kmines-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmines-21.08.3.tar.xz"; + sha256 = "0x2ligjxam6aaxpzl1zj5circ0ssn9ycafl3ydvhk9pz9j3c9cx1"; + name = "kmines-21.08.3.tar.xz"; }; }; kmix = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz"; - sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf"; - name = "kmix-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmix-21.08.3.tar.xz"; + sha256 = "0smfvkw8svg4fd3sf3f3l5my516jjh2n203kffkg6nr2pgscfw58"; + name = "kmix-21.08.3.tar.xz"; }; }; kmousetool = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz"; - sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1"; - name = "kmousetool-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmousetool-21.08.3.tar.xz"; + sha256 = "0fyhni1m96xh7ir7zhggszfvn7rsf5dp8l065pzvla73w7l6iqwy"; + name = "kmousetool-21.08.3.tar.xz"; }; }; kmouth = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz"; - sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr"; - name = "kmouth-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmouth-21.08.3.tar.xz"; + sha256 = "0d30r0kyq260pmbk4n9ild0zibwf1sdqwpszvi2j8y5v3gn2bg69"; + name = "kmouth-21.08.3.tar.xz"; }; }; kmplot = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz"; - sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1"; - name = "kmplot-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmplot-21.08.3.tar.xz"; + sha256 = "0az7krs0m7xly9v2aclfh4schw9hj99qmv6qmqwa1qvdhhhxd52p"; + name = "kmplot-21.08.3.tar.xz"; }; }; knavalbattle = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz"; - sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7"; - name = "knavalbattle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knavalbattle-21.08.3.tar.xz"; + sha256 = "0ydbkfi1n1j9fv0rjxpvh6nsjp20zwmb5ii47pv77z6a3rk5sqf4"; + name = "knavalbattle-21.08.3.tar.xz"; }; }; knetwalk = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz"; - sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2"; - name = "knetwalk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knetwalk-21.08.3.tar.xz"; + sha256 = "0nplhxvqiw9ap12hxyk1z247f31jqwg59d5q75jiqi1xr1gf27n2"; + name = "knetwalk-21.08.3.tar.xz"; }; }; knights = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz"; - sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1"; - name = "knights-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knights-21.08.3.tar.xz"; + sha256 = "0ajnn8jaa1h97k89qj5c7i51c2wr3zgbsiiz9bxhhmb6gwrwjqpi"; + name = "knights-21.08.3.tar.xz"; }; }; knotes = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz"; - sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv"; - name = "knotes-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knotes-21.08.3.tar.xz"; + sha256 = "0v5kg8gi2wmz4dhwg6pmq5pd6kh91ha9hg64z21p38b3nc4z07l4"; + name = "knotes-21.08.3.tar.xz"; }; }; kolf = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz"; - sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb"; - name = "kolf-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kolf-21.08.3.tar.xz"; + sha256 = "1mz30vzdcsa9nhwqmcr6kxwvi9843b876kzpmqrlrxc19ixqbyq4"; + name = "kolf-21.08.3.tar.xz"; }; }; kollision = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz"; - sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb"; - name = "kollision-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kollision-21.08.3.tar.xz"; + sha256 = "1m46xrik0ppp6nhrsx264zzy0fdvryamcj0w5m6bm0hnyj75c4rk"; + name = "kollision-21.08.3.tar.xz"; }; }; kolourpaint = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz"; - sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a"; - name = "kolourpaint-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kolourpaint-21.08.3.tar.xz"; + sha256 = "11ciijpr8aa8nd3zgxrikdnx1gk1w78h1v1nhgqn399lxn3vkchi"; + name = "kolourpaint-21.08.3.tar.xz"; }; }; kompare = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz"; - sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n"; - name = "kompare-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kompare-21.08.3.tar.xz"; + sha256 = "1988y00mb5wz9c6h4kchkyda4vas44bhiqd1zc4i0fkyl5wi5vp0"; + name = "kompare-21.08.3.tar.xz"; }; }; konqueror = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz"; - sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h"; - name = "konqueror-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konqueror-21.08.3.tar.xz"; + sha256 = "1ls9avkwcf7c9qnmxasbi933sjw9q3hnjyys5zf69v7p5hqvg0dz"; + name = "konqueror-21.08.3.tar.xz"; }; }; konquest = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz"; - sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl"; - name = "konquest-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konquest-21.08.3.tar.xz"; + sha256 = "0vsvzz47yn5wyl8zjnbfs1g97466l5ldxcc7mpg1q4y28fxb4jiv"; + name = "konquest-21.08.3.tar.xz"; }; }; konsole = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz"; - sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv"; - name = "konsole-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konsole-21.08.3.tar.xz"; + sha256 = "1w802g95s8hrlpkilxs2mh7fsg7xq3x9vzw48766kpl9ri3ppx91"; + name = "konsole-21.08.3.tar.xz"; }; }; kontact = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz"; - sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg"; - name = "kontact-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontact-21.08.3.tar.xz"; + sha256 = "0rwi34avk98m0jjbaij895ganfcz5c8l926nr399j5qnv9r6j82l"; + name = "kontact-21.08.3.tar.xz"; }; }; kontactinterface = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz"; - sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9"; - name = "kontactinterface-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontactinterface-21.08.3.tar.xz"; + sha256 = "1284f6cndf3l4il4mw1qrqvf9jmww6nmhh6fx7asw7mfc32r5zaj"; + name = "kontactinterface-21.08.3.tar.xz"; }; }; kontrast = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz"; - sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb"; - name = "kontrast-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontrast-21.08.3.tar.xz"; + sha256 = "1yy4gfckabb175apvm7fcj77nxdc2fdszz1f1zrikrss20r7dc79"; + name = "kontrast-21.08.3.tar.xz"; }; }; konversation = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz"; - sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy"; - name = "konversation-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konversation-21.08.3.tar.xz"; + sha256 = "0wfjhp6scrq9a5llr5f9fcz2k7b5jnid8m8hrp520ai4wg4ll7zv"; + name = "konversation-21.08.3.tar.xz"; }; }; kopeninghours = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz"; - sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd"; - name = "kopeninghours-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kopeninghours-21.08.3.tar.xz"; + sha256 = "090rp2qpsbsyqm4nipq398c3pkr0rx46rwmr4393wffzmnbiwcb9"; + name = "kopeninghours-21.08.3.tar.xz"; }; }; kopete = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz"; - sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1"; - name = "kopete-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kopete-21.08.3.tar.xz"; + sha256 = "105zwy4k7idkdmjjx754x7acszd4yw3y3r7lrf61f44wsm9dv2wr"; + name = "kopete-21.08.3.tar.xz"; }; }; korganizer = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz"; - sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr"; - name = "korganizer-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/korganizer-21.08.3.tar.xz"; + sha256 = "00r7abidj71yqgx4g0kd09dfnq0ilqh3kyzq47ms912gp1dkr5b9"; + name = "korganizer-21.08.3.tar.xz"; }; }; kosmindoormap = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz"; - sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb"; - name = "kosmindoormap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kosmindoormap-21.08.3.tar.xz"; + sha256 = "15qq6w14yxfprzzj3267z15zkalsb8y0igq772hwyz4v7f6xhydp"; + name = "kosmindoormap-21.08.3.tar.xz"; }; }; kpat = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz"; - sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn"; - name = "kpat-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpat-21.08.3.tar.xz"; + sha256 = "0s8k8q12hvciz2c38gn5w7miz0i97pqn4jrs69sm294nw7wh1xi4"; + name = "kpat-21.08.3.tar.xz"; }; }; kpimtextedit = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz"; - sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5"; - name = "kpimtextedit-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpimtextedit-21.08.3.tar.xz"; + sha256 = "18bjvhlvjn5a1gnzw478l15mgda4c7qba0qqk9rrbh2ryr1ksf7h"; + name = "kpimtextedit-21.08.3.tar.xz"; }; }; kpkpass = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz"; - sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk"; - name = "kpkpass-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpkpass-21.08.3.tar.xz"; + sha256 = "0l6n358gng24fqhwjmfpxfmmcw8x80di120k72zahiqplk2arcf5"; + name = "kpkpass-21.08.3.tar.xz"; }; }; kpmcore = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz"; - sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l"; - name = "kpmcore-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpmcore-21.08.3.tar.xz"; + sha256 = "0y9bpw71dn9c39rjsl44az3y2bdczrj833dvwmrwaz6jbnhxl1kj"; + name = "kpmcore-21.08.3.tar.xz"; }; }; kpublictransport = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz"; - sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs"; - name = "kpublictransport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpublictransport-21.08.3.tar.xz"; + sha256 = "06jbc0qgi5dgx9jwhdnimw1k480whbqw5x75jrx9bspv5y5br16j"; + name = "kpublictransport-21.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz"; - sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h"; - name = "kqtquickcharts-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kqtquickcharts-21.08.3.tar.xz"; + sha256 = "0kyznsq7bjzj5c091kpgn443zvkn3qbmn2b0sppj78a7b8ica5ca"; + name = "kqtquickcharts-21.08.3.tar.xz"; }; }; krdc = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz"; - sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v"; - name = "krdc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/krdc-21.08.3.tar.xz"; + sha256 = "0jcbbq9vd4f1kp76fanwnp6q4hq10w3z7ygrb8makpa0daa96vx4"; + name = "krdc-21.08.3.tar.xz"; }; }; kreversi = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz"; - sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj"; - name = "kreversi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kreversi-21.08.3.tar.xz"; + sha256 = "1ifcckbf9lr4pr9n2ggqjvv6xz747k9hk7m43y5ij0bixi6cq474"; + name = "kreversi-21.08.3.tar.xz"; }; }; krfb = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz"; - sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx"; - name = "krfb-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/krfb-21.08.3.tar.xz"; + sha256 = "17q0hpwqbwqg4xbq5lmk5g1fl5jplzpx1acyhcbx7il0j06cfcn4"; + name = "krfb-21.08.3.tar.xz"; }; }; kross-interpreters = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz"; - sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574"; - name = "kross-interpreters-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kross-interpreters-21.08.3.tar.xz"; + sha256 = "0z9lmazpw5389sgvhsjsm1219ys3fybr7hg95nrz8a334vw39nqv"; + name = "kross-interpreters-21.08.3.tar.xz"; }; }; kruler = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz"; - sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4"; - name = "kruler-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kruler-21.08.3.tar.xz"; + sha256 = "0rjxy4ipxxk91wlzhrw9mg5avz18l4p01in29l1ccfz278b97lqm"; + name = "kruler-21.08.3.tar.xz"; }; }; kshisen = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz"; - sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp"; - name = "kshisen-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kshisen-21.08.3.tar.xz"; + sha256 = "1fnd2qck51gxnw6ncq52rd1q08abh70azs0apjnh9qk0dyjk91wh"; + name = "kshisen-21.08.3.tar.xz"; }; }; ksirk = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz"; - sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21"; - name = "ksirk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksirk-21.08.3.tar.xz"; + sha256 = "03v8sghnipkpca3c71s3008m3psawinj90a7637r19h7gyvlyws7"; + name = "ksirk-21.08.3.tar.xz"; }; }; ksmtp = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz"; - sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6"; - name = "ksmtp-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksmtp-21.08.3.tar.xz"; + sha256 = "0diz01z8gczkwy8c8gvjd583w02vma7kpngzg1ax0wx640vbjq50"; + name = "ksmtp-21.08.3.tar.xz"; }; }; ksnakeduel = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz"; - sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748"; - name = "ksnakeduel-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksnakeduel-21.08.3.tar.xz"; + sha256 = "0gmcn31dg3isv5dxv01rg8w6cbfdhwsz5rpp98lrr0qx4abphva7"; + name = "ksnakeduel-21.08.3.tar.xz"; }; }; kspaceduel = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz"; - sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch"; - name = "kspaceduel-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kspaceduel-21.08.3.tar.xz"; + sha256 = "0099rc25zvbl2zg1gpmxdhnphl32bd0cxlgikyfvanigq3mx8zkd"; + name = "kspaceduel-21.08.3.tar.xz"; }; }; ksquares = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz"; - sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq"; - name = "ksquares-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksquares-21.08.3.tar.xz"; + sha256 = "1mgs9yapz8fm2nmv0zg2x9qfd0ijj518s43dqmss41zrjr0g3mv2"; + name = "ksquares-21.08.3.tar.xz"; }; }; ksudoku = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz"; - sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp"; - name = "ksudoku-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksudoku-21.08.3.tar.xz"; + sha256 = "09s91xvkbybhwdkf80d7kvjj2jvii938vf650fqicypki2vf0zyx"; + name = "ksudoku-21.08.3.tar.xz"; }; }; ksystemlog = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz"; - sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v"; - name = "ksystemlog-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksystemlog-21.08.3.tar.xz"; + sha256 = "1m20nvvvfbgzd3aay7hsb5pm1bgjngc36ixqs0hrklhrcmwjq9g6"; + name = "ksystemlog-21.08.3.tar.xz"; }; }; kteatime = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz"; - sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72"; - name = "kteatime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kteatime-21.08.3.tar.xz"; + sha256 = "175vmcbhhlan6smhagli0jpa3ik0y0wwiijigfk2srm8cyk29ymn"; + name = "kteatime-21.08.3.tar.xz"; }; }; ktimer = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz"; - sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd"; - name = "ktimer-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktimer-21.08.3.tar.xz"; + sha256 = "1nr116cxw81c2bh32l2xrzmrglk36qkzycbfcffxnm7ka4flwzbm"; + name = "ktimer-21.08.3.tar.xz"; }; }; ktnef = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz"; - sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33"; - name = "ktnef-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktnef-21.08.3.tar.xz"; + sha256 = "0vfsy894hs3538ssbqky6nfnjzhyn8yjlmvh0mb6gg69952gcvqa"; + name = "ktnef-21.08.3.tar.xz"; }; }; ktorrent = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz"; - sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m"; - name = "ktorrent-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktorrent-21.08.3.tar.xz"; + sha256 = "0y1vpfc8xsm98lrf119r5clmb6xwq2a8adb347ksyvvr4l7rdkwm"; + name = "ktorrent-21.08.3.tar.xz"; }; }; ktouch = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz"; - sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7"; - name = "ktouch-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktouch-21.08.3.tar.xz"; + sha256 = "0i0ph52k2zw6q37qam2s09msxsdxr5v8qiqwxirjab8ad7g9z0gf"; + name = "ktouch-21.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz"; - sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8"; - name = "ktp-accounts-kcm-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-accounts-kcm-21.08.3.tar.xz"; + sha256 = "1ymq8cnvvw62xd4va969imm2g62fw7fhbs8rw3wqrc2lal9d5l1g"; + name = "ktp-accounts-kcm-21.08.3.tar.xz"; }; }; ktp-approver = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz"; - sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973"; - name = "ktp-approver-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-approver-21.08.3.tar.xz"; + sha256 = "0z9kw2gamgdz425aw6li6nvv1g0b1ffil0rmjh0b0z89bbpbc6jx"; + name = "ktp-approver-21.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz"; - sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p"; - name = "ktp-auth-handler-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-auth-handler-21.08.3.tar.xz"; + sha256 = "1z89ycwpq46w82hylwq1sizd7a563g5a22jdc1chhhlwp9dqmdc2"; + name = "ktp-auth-handler-21.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz"; - sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m"; - name = "ktp-call-ui-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-call-ui-21.08.3.tar.xz"; + sha256 = "1nr064h0f4rqjka030xflhrmq0l8g87fwyi853plk7y0473fy6h2"; + name = "ktp-call-ui-21.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz"; - sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0"; - name = "ktp-common-internals-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-common-internals-21.08.3.tar.xz"; + sha256 = "0ndfdggs4j2jc93pf998r0fyj7fjnc2pz98acc1l6laq8d8aawd2"; + name = "ktp-common-internals-21.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz"; - sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl"; - name = "ktp-contact-list-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-list-21.08.3.tar.xz"; + sha256 = "0pdl3w1vj6f4nms4cs91yagfyf5ssqms0bzmcnjf53pcpyf8rhjs"; + name = "ktp-contact-list-21.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz"; - sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7"; - name = "ktp-contact-runner-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-runner-21.08.3.tar.xz"; + sha256 = "0zjw9f66rn5nc37q3q54qy8m09qlama949ksfrvyyh3qhsxp17pm"; + name = "ktp-contact-runner-21.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz"; - sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl"; - name = "ktp-desktop-applets-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-desktop-applets-21.08.3.tar.xz"; + sha256 = "1wlls0rhynfq9cfn48g31avviy067r409c5pcvasfwgzcv5hjan5"; + name = "ktp-desktop-applets-21.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz"; - sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8"; - name = "ktp-filetransfer-handler-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-filetransfer-handler-21.08.3.tar.xz"; + sha256 = "1vnwgcmn3j18spcn2dl468n2y073mk9nsc3557hid5mmg7byp8ng"; + name = "ktp-filetransfer-handler-21.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz"; - sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg"; - name = "ktp-kded-module-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-kded-module-21.08.3.tar.xz"; + sha256 = "0mgw2w812306w04w1xgv9ngd31zj0m4v9hv3cyyk2dz1hi97g9hz"; + name = "ktp-kded-module-21.08.3.tar.xz"; }; }; ktp-send-file = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz"; - sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp"; - name = "ktp-send-file-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-send-file-21.08.3.tar.xz"; + sha256 = "1c0yrir3z6p6ravizaqhdgjiwcj2cyzd61n4zcx2mrr4mfq7wr4l"; + name = "ktp-send-file-21.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz"; - sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq"; - name = "ktp-text-ui-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-text-ui-21.08.3.tar.xz"; + sha256 = "0xk9lcdp99rd1n6gg9a4ix5bdfk229y1ddf115ldjsk30ksfv0r0"; + name = "ktp-text-ui-21.08.3.tar.xz"; }; }; ktuberling = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz"; - sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49"; - name = "ktuberling-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktuberling-21.08.3.tar.xz"; + sha256 = "1i0ykflfr2q3043z5j5h1m093n103la8zbax7cacid109d0kca5g"; + name = "ktuberling-21.08.3.tar.xz"; }; }; kturtle = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz"; - sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp"; - name = "kturtle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kturtle-21.08.3.tar.xz"; + sha256 = "1fw7hgx0zxsl1l9ymjhf3k3w5999ijj8vdagnyiz01y2i2hlnvhc"; + name = "kturtle-21.08.3.tar.xz"; }; }; kubrick = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz"; - sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj"; - name = "kubrick-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kubrick-21.08.3.tar.xz"; + sha256 = "1fq2icsfbd6k4gm9w25aml2rigzami934vvkvb30222vbhs86qr4"; + name = "kubrick-21.08.3.tar.xz"; }; }; kwalletmanager = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz"; - sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz"; - name = "kwalletmanager-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwalletmanager-21.08.3.tar.xz"; + sha256 = "0cbq0md317fipd4lfqvcgan1jm5n0zyilzbrkjymbnl7cy276ajq"; + name = "kwalletmanager-21.08.3.tar.xz"; }; }; kwave = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz"; - sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl"; - name = "kwave-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwave-21.08.3.tar.xz"; + sha256 = "08qs33mi047jcqaavglgxk3i6gq4h73aygn6gj8xpcpqhq82kjl5"; + name = "kwave-21.08.3.tar.xz"; }; }; kwordquiz = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz"; - sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5"; - name = "kwordquiz-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwordquiz-21.08.3.tar.xz"; + sha256 = "066v2w8i2fvrrqb1aakscwcd6rchlm4m5pwsql0s6k59mn7wab6b"; + name = "kwordquiz-21.08.3.tar.xz"; }; }; libgravatar = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz"; - sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv"; - name = "libgravatar-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libgravatar-21.08.3.tar.xz"; + sha256 = "0ni2lgrfpx8vx9mmm43gsn1kw4jj8j52yq4ylfam89q6mhpxcnix"; + name = "libgravatar-21.08.3.tar.xz"; }; }; libkcddb = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz"; - sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq"; - name = "libkcddb-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkcddb-21.08.3.tar.xz"; + sha256 = "00wivb6viw5w1ylcsx3m9ps7j00z7fzjh2s7nap95xnprraihcmv"; + name = "libkcddb-21.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz"; - sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin"; - name = "libkcompactdisc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkcompactdisc-21.08.3.tar.xz"; + sha256 = "1rsmibz9mamqvhppnxwn2db6jmsipvjx2kj8ikpsp9bx8h421n2g"; + name = "libkcompactdisc-21.08.3.tar.xz"; }; }; libkdcraw = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz"; - sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm"; - name = "libkdcraw-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdcraw-21.08.3.tar.xz"; + sha256 = "0gm8nfc6ayg1ipba4yvhy5nzfrpdwx6l434bg9y7yqvbm3lm1g86"; + name = "libkdcraw-21.08.3.tar.xz"; }; }; libkdegames = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz"; - sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji"; - name = "libkdegames-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdegames-21.08.3.tar.xz"; + sha256 = "0ysc5g6ap207c5yq3ryiaxmvkrh6wzqzdgccdffs0lncd24g641a"; + name = "libkdegames-21.08.3.tar.xz"; }; }; libkdepim = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz"; - sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh"; - name = "libkdepim-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdepim-21.08.3.tar.xz"; + sha256 = "1776fjzd88kj2crr8lcrwxmkvjsxxyll2gy21wlbmqy4h04bi130"; + name = "libkdepim-21.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz"; - sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l"; - name = "libkeduvocdocument-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkeduvocdocument-21.08.3.tar.xz"; + sha256 = "1qyi5y5v1zp3qid58sdfpcp83rkmz2s1hsvir4f9j5ngir0czcq1"; + name = "libkeduvocdocument-21.08.3.tar.xz"; }; }; libkexiv2 = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz"; - sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa"; - name = "libkexiv2-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkexiv2-21.08.3.tar.xz"; + sha256 = "15d8d3mzp0yhj6lm5799mfncqkxnw0cvfxcgpkz0lf9askv2cq8n"; + name = "libkexiv2-21.08.3.tar.xz"; }; }; libkgapi = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz"; - sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy"; - name = "libkgapi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkgapi-21.08.3.tar.xz"; + sha256 = "101yb495k5bxq402qdvyqd0sdhzc5z3r8szymfmrlilgk35wy9rs"; + name = "libkgapi-21.08.3.tar.xz"; }; }; libkipi = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz"; - sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms"; - name = "libkipi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkipi-21.08.3.tar.xz"; + sha256 = "12qjvd7ynab33qid2d4j06z8fbfziaxdlrpq0h3ywd2drks0ykvf"; + name = "libkipi-21.08.3.tar.xz"; }; }; libkleo = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz"; - sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz"; - name = "libkleo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkleo-21.08.3.tar.xz"; + sha256 = "0ivyqmc1hv1cljbpxr5xrzyf9z96dbaa48ak54cxxpanphpialrl"; + name = "libkleo-21.08.3.tar.xz"; }; }; libkmahjongg = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz"; - sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94"; - name = "libkmahjongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkmahjongg-21.08.3.tar.xz"; + sha256 = "0rh61491dl90rrlmqmqjdj7vlrjhayhkk5i50zb6jfvrysq9axkc"; + name = "libkmahjongg-21.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz"; - sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx"; - name = "libkomparediff2-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkomparediff2-21.08.3.tar.xz"; + sha256 = "0a3980kiigc5kqkyxf4glcxvgr3f4rnc43gcx9vj9mk2qhfcsiqy"; + name = "libkomparediff2-21.08.3.tar.xz"; }; }; libksane = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz"; - sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x"; - name = "libksane-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libksane-21.08.3.tar.xz"; + sha256 = "086zrddpammihia888nrx2p18if1fyzvhs3igkxq9q2p551vk9fy"; + name = "libksane-21.08.3.tar.xz"; }; }; libksieve = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz"; - sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p"; - name = "libksieve-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libksieve-21.08.3.tar.xz"; + sha256 = "1snli2yvq2n567vgi1xs6iiqgn4zp31cid17aqpxllyw8a3xa0l7"; + name = "libksieve-21.08.3.tar.xz"; }; }; libktorrent = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz"; - sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x"; - name = "libktorrent-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libktorrent-21.08.3.tar.xz"; + sha256 = "1zjnnxhd0mv9if61rr28h35wban7sif61dmgc3wsixp4dz1xfrm6"; + name = "libktorrent-21.08.3.tar.xz"; }; }; lokalize = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz"; - sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k"; - name = "lokalize-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/lokalize-21.08.3.tar.xz"; + sha256 = "0m084mayd9b0iwm4j5cckw22ix1mc4zcwxjfk0cdapm3g2ls1rzd"; + name = "lokalize-21.08.3.tar.xz"; }; }; lskat = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz"; - sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b"; - name = "lskat-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/lskat-21.08.3.tar.xz"; + sha256 = "09l209fz82ibsxzg2f53lhbcsaq6zpwllpyklj2988xzn7h49cqg"; + name = "lskat-21.08.3.tar.xz"; }; }; mailcommon = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz"; - sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw"; - name = "mailcommon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mailcommon-21.08.3.tar.xz"; + sha256 = "0vpbp88pl462d1j9f3ww22zybrmz92zx3b5cj4gsl7gmb7ijwb19"; + name = "mailcommon-21.08.3.tar.xz"; }; }; mailimporter = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz"; - sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf"; - name = "mailimporter-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mailimporter-21.08.3.tar.xz"; + sha256 = "00vm445i5c7vjfmbfgzdj3xildqbnlzpi5i16w4c47wyg5kvpj2c"; + name = "mailimporter-21.08.3.tar.xz"; }; }; marble = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz"; - sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw"; - name = "marble-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/marble-21.08.3.tar.xz"; + sha256 = "0bapnmm2x0ihms5gd12brqb2yx7g5h4c8ky70l1czd4a8d95ha0a"; + name = "marble-21.08.3.tar.xz"; }; }; markdownpart = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz"; - sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9"; - name = "markdownpart-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/markdownpart-21.08.3.tar.xz"; + sha256 = "1cqkwvs1ssg203fkaiibcmqjm2viaq3iq880cjlkx9irh0bv9q9h"; + name = "markdownpart-21.08.3.tar.xz"; }; }; mbox-importer = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz"; - sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk"; - name = "mbox-importer-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mbox-importer-21.08.3.tar.xz"; + sha256 = "19i5a1rax3xfkcz0hv0vqq9iavggqrliwpqsqnx6zvwjzgjrvsif"; + name = "mbox-importer-21.08.3.tar.xz"; }; }; messagelib = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz"; - sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i"; - name = "messagelib-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/messagelib-21.08.3.tar.xz"; + sha256 = "0q9mligkkvbwb92ghv5g66rkn0vpbw2xfbgsdnn4jajjxsixipg7"; + name = "messagelib-21.08.3.tar.xz"; }; }; minuet = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz"; - sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx"; - name = "minuet-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/minuet-21.08.3.tar.xz"; + sha256 = "1g2chj23dw9p2lgf094mn9cd26wnhwgslwdwzwax2a23p42j7kb8"; + name = "minuet-21.08.3.tar.xz"; }; }; okular = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz"; - sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p"; - name = "okular-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/okular-21.08.3.tar.xz"; + sha256 = "00ghh7z39904d5x5sa39adkavkhl09hzib6fpwjn14f6sz925f9r"; + name = "okular-21.08.3.tar.xz"; }; }; palapeli = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz"; - sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53"; - name = "palapeli-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/palapeli-21.08.3.tar.xz"; + sha256 = "084nvavgzkmrv77rsg2zf2vykfjwwsvn2i2y24jsh63hs7i5xqhb"; + name = "palapeli-21.08.3.tar.xz"; }; }; parley = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz"; - sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b"; - name = "parley-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/parley-21.08.3.tar.xz"; + sha256 = "0wyv5qx4g0941kg870qb9rc9npdw39ggvndjk7ywaad9nkvdj73g"; + name = "parley-21.08.3.tar.xz"; }; }; partitionmanager = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz"; - sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8"; - name = "partitionmanager-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/partitionmanager-21.08.3.tar.xz"; + sha256 = "0im782ggbnkyzcczxx3mv5qi4nlqmcyhwkbf0mzh8cz56qkfvzhr"; + name = "partitionmanager-21.08.3.tar.xz"; }; }; picmi = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz"; - sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a"; - name = "picmi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/picmi-21.08.3.tar.xz"; + sha256 = "0h208sy2r2jzy7a6rmla349d8lydvfvdb2vahdfxrqql0m15s07s"; + name = "picmi-21.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz"; - sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd"; - name = "pim-data-exporter-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pim-data-exporter-21.08.3.tar.xz"; + sha256 = "0l6gkwh6pxp6px50n8i0374by3n7nv0gjkb2qy0s4hsvfz8nwlwk"; + name = "pim-data-exporter-21.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz"; - sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r"; - name = "pim-sieve-editor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pim-sieve-editor-21.08.3.tar.xz"; + sha256 = "1z01c0wsxzl69kr0cxfq23l56dgi0xfjak5qbpfd9p4b2kr095s7"; + name = "pim-sieve-editor-21.08.3.tar.xz"; }; }; pimcommon = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz"; - sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6"; - name = "pimcommon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pimcommon-21.08.3.tar.xz"; + sha256 = "1hj49spfjwqrwh7h86kw7ydcx13rknagj54mhcn60kawz639533l"; + name = "pimcommon-21.08.3.tar.xz"; }; }; poxml = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz"; - sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm"; - name = "poxml-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/poxml-21.08.3.tar.xz"; + sha256 = "0yrn2dbdhm3ap55w401ma8z64b7pgs57lzgakzkdpcf69bww9xkw"; + name = "poxml-21.08.3.tar.xz"; }; }; print-manager = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz"; - sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw"; - name = "print-manager-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/print-manager-21.08.3.tar.xz"; + sha256 = "0dmd1wp6c5f58fssnyc977d29gqcr6pmzplvq5pj97xq0i8fq15z"; + name = "print-manager-21.08.3.tar.xz"; }; }; rocs = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz"; - sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm"; - name = "rocs-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/rocs-21.08.3.tar.xz"; + sha256 = "0mdn58wbv5rhljp7ai0282h5z5j7m9yly6q9s6c8vm5kaxhbwg58"; + name = "rocs-21.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz"; - sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m"; - name = "signon-kwallet-extension-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/signon-kwallet-extension-21.08.3.tar.xz"; + sha256 = "1m3wyyndlwk4snjzz45j377hz5plx01bl69y39aw1y53rsx0baln"; + name = "signon-kwallet-extension-21.08.3.tar.xz"; }; }; skanlite = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz"; - sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8"; - name = "skanlite-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/skanlite-21.08.3.tar.xz"; + sha256 = "1llvq89vdsypbak8lmhnyfr61s72c4lra1yypxmgw0hwqvwqzyjk"; + name = "skanlite-21.08.3.tar.xz"; }; }; spectacle = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz"; - sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x"; - name = "spectacle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/spectacle-21.08.3.tar.xz"; + sha256 = "0l1p565y2d04fw9mz1ns11bwc9z5apkjd4llgdihz4qwq5j0ri5y"; + name = "spectacle-21.08.3.tar.xz"; }; }; step = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz"; - sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448"; - name = "step-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/step-21.08.3.tar.xz"; + sha256 = "1pznz6hxj1h0vcsidsyjm9zgzx4pla47yckykc3mxb9biraalhi5"; + name = "step-21.08.3.tar.xz"; }; }; svgpart = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz"; - sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v"; - name = "svgpart-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/svgpart-21.08.3.tar.xz"; + sha256 = "1zpzmhgvxlyalq4nn446k7plz5fw2pl4r7zv7q3hjrzla1wgcqx8"; + name = "svgpart-21.08.3.tar.xz"; }; }; sweeper = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz"; - sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p"; - name = "sweeper-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/sweeper-21.08.3.tar.xz"; + sha256 = "0sa8dfx26m9ry3pvqryx41w51l76r8l2xh16b783ixqln7x08z5j"; + name = "sweeper-21.08.3.tar.xz"; }; }; umbrello = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz"; - sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc"; - name = "umbrello-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/umbrello-21.08.3.tar.xz"; + sha256 = "025qds7nahm6kpi94j4blk8xpv6vh2alrbgwby20vvn3h678z26x"; + name = "umbrello-21.08.3.tar.xz"; }; }; yakuake = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz"; - sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9"; - name = "yakuake-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/yakuake-21.08.3.tar.xz"; + sha256 = "1za4vhnr495dadrarqqanavmyn1mmzm3y8jx05cpbjyqmlm353dk"; + name = "yakuake-21.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.08.1"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz"; - sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r"; - name = "zeroconf-ioslave-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/zeroconf-ioslave-21.08.3.tar.xz"; + sha256 = "1dkig267znwyw03fq6mpdb5g1xnkhr0brnvxskjm44a4d5ipbv2g"; + name = "zeroconf-ioslave-21.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index cc6b1eab5de45..bae763972d126 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,42 +1,52 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, dotnetCorePackages, jq }: - -stdenv.mkDerivation rec { - pname = "ArchiSteamFarm"; - version = "4.3.1.0"; - - src = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "1q28byshh4wkfsfdb0sfdqq9a5da9k7i4nagsfpk0fzyajvzd4lx"; +{ lib +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, libkrb5 +, zlib +, openssl +}: + +buildDotnetModule rec { + pname = "archisteamfarm"; + version = "5.1.5.3"; + + src = fetchFromGitHub { + owner = "justarchinet"; + repo = pname; + rev = version; + sha256 = "sha256-H038maKHZujmbKhbi8fxsKR/tcSPrcl9L5xnr77yyXg="; }; - nativeBuildInputs = [ unzip makeWrapper jq ]; + dotnet-runtime = dotnetCorePackages.aspnetcore_5_0; + nugetDeps = ./deps.nix; - sourceRoot = "."; + projectFile = "ArchiSteamFarm.sln"; + executables = [ "ArchiSteamFarm" ]; - installPhase = '' - dist=$out/opt/asf - mkdir -p $dist - cp -r * $dist + runtimeDeps = [ libkrb5 zlib openssl ]; - jq "del(.runtimeOptions.framework.version)" ArchiSteamFarm.runtimeconfig.json > $dist/ArchiSteamFarm.runtimeconfig.json + # Without this, it attempts to write to the store even though the `--path` flag is supplied. + patches = [ ./mutable-customdir.patch ]; - makeWrapper ${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet $out/bin/ArchiSteamFarm \ - --add-flags $dist/ArchiSteamFarm.dll \ - --add-flags "--path ~/.config/asf" \ - --run "mkdir -p ~/.config/asf" \ - --run "cd ~/.config/asf" \ - --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ - --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ - --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "ln -sf $dist/www ." + doCheck = true; + + preInstall = '' + # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. + makeWrapperArgs+=( + --add-flags "--path ~/.config/archisteamfarm" + --run "mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}" + --run "cd ~/.config/archisteamfarm" + ) ''; + passthru.updateScript = ./updater.sh; + meta = with lib; { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms; - maintainers = with maintainers; [ ]; - hydraPlatforms = []; + platforms = dotnetCorePackages.aspnetcore_5_0.meta.platforms; + maintainers = with maintainers; [ SuperSandro2000 legendofmiracles ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix new file mode 100644 index 0000000000000..6da123004397d --- /dev/null +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -0,0 +1,277 @@ +{ fetchNuGet }: [ + (fetchNuGet { name = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) + (fetchNuGet { name = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) + (fetchNuGet { name = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; }) + (fetchNuGet { name = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) + (fetchNuGet { name = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) + (fetchNuGet { name = "Humanizer.Core.af"; version = "2.11.10"; sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z"; }) + (fetchNuGet { name = "Humanizer.Core.ar"; version = "2.11.10"; sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p"; }) + (fetchNuGet { name = "Humanizer.Core.az"; version = "2.11.10"; sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9"; }) + (fetchNuGet { name = "Humanizer.Core.bg"; version = "2.11.10"; sha256 = "1b9y40gvq2kwnj5wa40f8cbywv79jkajcwknagrgr27sykpfadl2"; }) + (fetchNuGet { name = "Humanizer.Core.bn-BD"; version = "2.11.10"; sha256 = "18pn4jcp36ygcx283l3fi9bs5d7q1a384b72a10g5kl0qckn88ay"; }) + (fetchNuGet { name = "Humanizer.Core.cs"; version = "2.11.10"; sha256 = "03crw1lnzp32v2kcdmllkrsqh07r4ggw9gyc96qw7cv0nk5ch1h8"; }) + (fetchNuGet { name = "Humanizer.Core.da"; version = "2.11.10"; sha256 = "0glby12zra3y3yiq4cwq1m6wjcjl8f21v8ghi6s20r48glm8vzy9"; }) + (fetchNuGet { name = "Humanizer.Core.de"; version = "2.11.10"; sha256 = "0a35xrm1f9p74x0fkr52bw9sd54vdy9d5rnvf565yh8ww43xfk7b"; }) + (fetchNuGet { name = "Humanizer.Core.el"; version = "2.11.10"; sha256 = "0bhwwdx5vc48zikdsbrkghdhwahxxc2lkff0yaa5nxhbhasl84h8"; }) + (fetchNuGet { name = "Humanizer.Core.es"; version = "2.11.10"; sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q"; }) + (fetchNuGet { name = "Humanizer.Core.fa"; version = "2.11.10"; sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2"; }) + (fetchNuGet { name = "Humanizer.Core.fi-FI"; version = "2.11.10"; sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik"; }) + (fetchNuGet { name = "Humanizer.Core.fr"; version = "2.11.10"; sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap"; }) + (fetchNuGet { name = "Humanizer.Core.fr-BE"; version = "2.11.10"; sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; }) + (fetchNuGet { name = "Humanizer.Core.he"; version = "2.11.10"; sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29"; }) + (fetchNuGet { name = "Humanizer.Core.hr"; version = "2.11.10"; sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3"; }) + (fetchNuGet { name = "Humanizer.Core.hu"; version = "2.11.10"; sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp"; }) + (fetchNuGet { name = "Humanizer.Core.hy"; version = "2.11.10"; sha256 = "0b7vaqldn7ca3xi4gkvkhjk900kw2zwb0m0d20bg45a83zdlx79c"; }) + (fetchNuGet { name = "Humanizer.Core.id"; version = "2.11.10"; sha256 = "1yqxirknwga4j18k7ixwgqxlv20479afanhariy3c5mkwvglsr9b"; }) + (fetchNuGet { name = "Humanizer.Core.it"; version = "2.11.10"; sha256 = "1skwgj5a6kkx3pm9w4f29psch69h1knmwbkdydlmx13h452p1w4l"; }) + (fetchNuGet { name = "Humanizer.Core.ja"; version = "2.11.10"; sha256 = "1wpc3yz9v611dqbw8j5yimk8dpz0rvpnls4rmlnp1m47gavpj8x4"; }) + (fetchNuGet { name = "Humanizer.Core.ko-KR"; version = "2.11.10"; sha256 = "1df0kd7vwdc3inxfkb3wsl1aw3d6vbab99dzh08p4m04g7i2c1a9"; }) + (fetchNuGet { name = "Humanizer.Core.ku"; version = "2.11.10"; sha256 = "17b66xfgwjr0sffx0hw4c6l90h43z7ffylrs26hgav0n110q2nwg"; }) + (fetchNuGet { name = "Humanizer.Core.lv"; version = "2.11.10"; sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs"; }) + (fetchNuGet { name = "Humanizer.Core.ms-MY"; version = "2.11.10"; sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3"; }) + (fetchNuGet { name = "Humanizer.Core.mt"; version = "2.11.10"; sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p"; }) + (fetchNuGet { name = "Humanizer.Core.nb"; version = "2.11.10"; sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9"; }) + (fetchNuGet { name = "Humanizer.Core.nb-NO"; version = "2.11.10"; sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; }) + (fetchNuGet { name = "Humanizer.Core.nl"; version = "2.11.10"; sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63"; }) + (fetchNuGet { name = "Humanizer.Core.pl"; version = "2.11.10"; sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby"; }) + (fetchNuGet { name = "Humanizer.Core.pt"; version = "2.11.10"; sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd"; }) + (fetchNuGet { name = "Humanizer.Core.ro"; version = "2.11.10"; sha256 = "1jgidmqfly91v1k22gn687mfql5bz7gjzp1aapi93vq5x635qssy"; }) + (fetchNuGet { name = "Humanizer.Core.ru"; version = "2.11.10"; sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil"; }) + (fetchNuGet { name = "Humanizer.Core.sk"; version = "2.11.10"; sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5"; }) + (fetchNuGet { name = "Humanizer.Core.sl"; version = "2.11.10"; sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja"; }) + (fetchNuGet { name = "Humanizer.Core.sr"; version = "2.11.10"; sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5"; }) + (fetchNuGet { name = "Humanizer.Core.sr-Latn"; version = "2.11.10"; sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; }) + (fetchNuGet { name = "Humanizer.Core.sv"; version = "2.11.10"; sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh"; }) + (fetchNuGet { name = "Humanizer.Core.th-TH"; version = "2.11.10"; sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0"; }) + (fetchNuGet { name = "Humanizer.Core.tr"; version = "2.11.10"; sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4"; }) + (fetchNuGet { name = "Humanizer.Core.uk"; version = "2.11.10"; sha256 = "0900ilhwj8yvhyzpg1pjr7f5vrl62wp8dsnhk4c2igs20qvnv079"; }) + (fetchNuGet { name = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.11.10"; sha256 = "09b7p2m8y49j49ckrmx2difgyj6y7fm2mwca093j8psxclsykcyr"; }) + (fetchNuGet { name = "Humanizer.Core.uz-Latn-UZ"; version = "2.11.10"; sha256 = "029kvkawqhlln52vpjpvr52dhr18ylk01cgsj2z8lxnqaka0q9hk"; }) + (fetchNuGet { name = "Humanizer.Core.vi"; version = "2.11.10"; sha256 = "0q4d47plsj956ivn82qwyidfxppjr9dp13m8c66aamrvhy4q8ny5"; }) + (fetchNuGet { name = "Humanizer.Core.zh-CN"; version = "2.11.10"; sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh"; }) + (fetchNuGet { name = "Humanizer.Core.zh-Hans"; version = "2.11.10"; sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2"; }) + (fetchNuGet { name = "Humanizer.Core.zh-Hant"; version = "2.11.10"; sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj"; }) + (fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) + (fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; }) + (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { name = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { name = "MSTest.TestAdapter"; version = "2.2.4"; sha256 = "0yzdcxzaqj846y5x95wdin74bqjkifp2s7xlhqjgcg3x0m909p17"; }) + (fetchNuGet { name = "MSTest.TestFramework"; version = "2.2.4"; sha256 = "1nmkygw0k74nn1hw6rg1gdwchfad7ns5p967kxfp7bvnhj259bq0"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { name = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) + (fetchNuGet { name = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) + (fetchNuGet { name = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) + (fetchNuGet { name = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) + (fetchNuGet { name = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) + (fetchNuGet { name = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) + (fetchNuGet { name = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { name = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) + (fetchNuGet { name = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) + (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { name = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { name = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { name = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) + (fetchNuGet { name = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) + (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) + (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) + (fetchNuGet { name = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) + (fetchNuGet { name = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) + (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) + (fetchNuGet { name = "SteamKit2"; version = "2.4.0-Alpha.3"; sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.Swagger"; version = "6.2.3"; sha256 = "0g3aw1lydq1xymd1f5rrs0dhl0fpl85gffs9jsm3khfqp7js31yz"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.2.3"; sha256 = "1cza3hzxhia81rmmdx9qixbm1ikavscddknpvbkrwmljzx2qmsv7"; }) + (fetchNuGet { name = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.2.3"; sha256 = "0sbrymb73a2s9qhgm7i44ca08h4n62qfh751fwnvybmj8kb1gzsi"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) + (fetchNuGet { name = "System.Composition"; version = "5.0.1"; sha256 = "07dr25p4kbh9hlrsnrqnlr920n7p39kfs0yj9sc7072j0icmxbg7"; }) + (fetchNuGet { name = "System.Composition.AttributedModel"; version = "5.0.1"; sha256 = "1czq644gy2hfwcxkpgr7yw99r4cshyc7789slgkbc3znif81q975"; }) + (fetchNuGet { name = "System.Composition.Convention"; version = "5.0.1"; sha256 = "086l0gjjb2j50iq176mbm6lx6wvcjh9rj6xwcd483958h774gyqg"; }) + (fetchNuGet { name = "System.Composition.Hosting"; version = "5.0.1"; sha256 = "07ljg7qmx0pmck32rwci05cpnbsxpj48qmp8gp18mhqw977nycxx"; }) + (fetchNuGet { name = "System.Composition.Runtime"; version = "5.0.1"; sha256 = "01m17rgn4n63mgcwkjnp4msvdh02h0y1wa7z74afnac4k1zqg5vy"; }) + (fetchNuGet { name = "System.Composition.TypedParts"; version = "5.0.1"; sha256 = "0hjmma4bh7iwsgylcprnpmjkgp6zd6ff04gchnkq5lbapd26bx6v"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Async"; version = "5.0.0"; sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { name = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { name = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.ProtectedData"; version = "5.0.0"; sha256 = "0jq1rcj5af2ydswld8ga3dyw2yi4c63wvb986b5kqsvpkwwc8x1b"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { name = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) +] diff --git a/pkgs/applications/misc/ArchiSteamFarm/mutable-customdir.patch b/pkgs/applications/misc/ArchiSteamFarm/mutable-customdir.patch new file mode 100644 index 0000000000000..09bd43f264e91 --- /dev/null +++ b/pkgs/applications/misc/ArchiSteamFarm/mutable-customdir.patch @@ -0,0 +1,13 @@ +diff --git a/ArchiSteamFarm/IPC/ArchiKestrel.cs b/ArchiSteamFarm/IPC/ArchiKestrel.cs +index 371d305c..701eab3d 100644 +--- a/ArchiSteamFarm/IPC/ArchiKestrel.cs ++++ b/ArchiSteamFarm/IPC/ArchiKestrel.cs +@@ -76,7 +76,7 @@ internal static class ArchiKestrel { + HostBuilder builder = new(); + #endif + +- string customDirectory = Path.Combine(Directory.GetCurrentDirectory(), SharedInfo.WebsiteDirectory); ++ string customDirectory = AppContext.BaseDirectory; + string websiteDirectory = Directory.Exists(customDirectory) ? customDirectory : Path.Combine(AppContext.BaseDirectory, SharedInfo.WebsiteDirectory); + + // Set default content root diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/updater.sh new file mode 100755 index 0000000000000..399ab975fd30e --- /dev/null +++ b/pkgs/applications/misc/ArchiSteamFarm/updater.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath ./deps.nix)" + +new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../../.. +update-source-version ArchiSteamFarm "$new_version" +store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)" +src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +mkdir ./nuget_pkgs +dotnet restore ArchiSteamFarm.sln --packages ./nuget_pkgs + +nuget-to-nix ./nuget_pkgs > "$deps_file" + +trap '' + popd + rm -r "$src" +'' EXIT diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 62cba4a5b7366..de463cfd6665a 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "abook-0.6.1"; + pname = "abook"; + version = "0.6.1"; src = fetchurl { - url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; + url = "http://abook.sourceforge.net/devel/abook-${version}.tar.gz"; sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh"; }; patches = [ (fetchpatch { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; - name = "gcc5.patch"; - sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; - }) + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; + name = "gcc5.patch"; + sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 8f1b3f5ca88f0..2bce30365f08c 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,13 +1,23 @@ -{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf, gdk-pixbuf-xlib }: - -assert stdenv.hostPlatform.system == "i686-linux"; - -let version = "9.5.5"; in - -stdenv.mkDerivation { - name = "adobe-reader-${version}-1"; - +{ lib +, stdenv +, fetchurl +, libX11 +, cups +, zlib +, libxml2 +, pango +, atk +, gtk2 +, glib +, gdk-pixbuf +, gdk-pixbuf-xlib +}: + +stdenv.mkDerivation rec { + pname = "adobe-reader"; + version = "9.5.5"; + + # TODO: convert to phases builder = ./builder.sh; src = fetchurl { @@ -16,11 +26,8 @@ stdenv.mkDerivation { }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. - # We should probably remove those and use the regular Nixpkgs - # versions. - - libPath = lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; + # We should probably remove those and use the regular Nixpkgs versions. + libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; @@ -32,5 +39,6 @@ stdenv.mkDerivation { "Numerous unresolved vulnerabilities" "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" ]; + platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix index 9c99c84eabee5..3eed2a7501c3c 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/applications/misc/anup/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security, sqlite, xdg-utils}: rustPlatform.buildRustPackage rec { pname = "anup"; @@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite xdg-utils + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM="; diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index c7428387d2c85..0632f2b15a00d 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.20.9"; + version = "0.21.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8="; + sha256 = "sha256-5QsbB48g11TyfWCbR7Sz2AETEwdyG+bSJQNGRHrIueE="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index f8e709e423fd5..0643e33885d08 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "com.github.donadigo.appeditor"; }; } diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 140d6eb7d086d..d7dde2a77ff51 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - poppler pcre libxkbcommon epoxy + poppler pcre libxkbcommon libepoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index cf76eda2720cb..7fb0de24c1142 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg"; + sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp"; }; - vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; + vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i"; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9baf2d4d2f245..29a932f40d58b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,54 +1,72 @@ -{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio -, enableAlsa ? true, alsa-lib ? null -, enableLibao ? true, libao ? null -, enableLame ? config.sox.enableLame or false, lame ? null -, enableLibmad ? true, libmad ? null -, enableLibogg ? true, libogg ? null, libvorbis ? null -, enableOpusfile ? true, opusfile ? null -, enableFLAC ? true, flac ? null -, enablePNG ? true, libpng ? null -, enableLibsndfile ? true, libsndfile ? null -, enableWavpack ? true, wavpack ? null -# amrnb and amrwb are unfree, disabled by default -, enableAMR ? false, amrnb ? null, amrwb ? null -, enableLibpulseaudio ? true, libpulseaudio ? null +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, CoreAudio +, enableAlsa ? true +, alsa-lib +, enableLibao ? true +, libao +, enableLame ? config.sox.enableLame or false +, lame +, enableLibmad ? true +, libmad +, enableLibogg ? true +, libogg +, libvorbis +, enableOpusfile ? true +, opusfile +, enableFLAC ? true +, flac +, enablePNG ? true +, libpng +, enableLibsndfile ? true +, libsndfile +, enableWavpack ? true +, wavpack + # amrnb and amrwb are unfree, disabled by default +, enableAMR ? false +, amrnb +, amrwb +, enableLibpulseaudio ? stdenv.isLinux +, libpulseaudio }: -with lib; - stdenv.mkDerivation rec { - name = "sox-14.4.2"; + pname = "sox"; + version = "14.4.2"; src = fetchurl { - url = "mirror://sourceforge/sox/${name}.tar.gz"; + url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = optional enableOpusfile pkg-config; + nativeBuildInputs = lib.optional enableOpusfile pkg-config; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - optional (enableAlsa && stdenv.isLinux) alsa-lib ++ - optional enableLibao libao ++ - optional enableLame lame ++ - optional enableLibmad libmad ++ - optionals enableLibogg [ libogg libvorbis ] ++ - optional enableOpusfile opusfile ++ - optional enableFLAC flac ++ - optional enablePNG libpng ++ - optional enableLibsndfile libsndfile ++ - optional enableWavpack wavpack ++ - optionals enableAMR [ amrnb amrwb ] ++ - optional enableLibpulseaudio libpulseaudio ++ - optional (stdenv.isDarwin) CoreAudio; + lib.optional (enableAlsa && stdenv.isLinux) alsa-lib + ++ lib.optional enableLibao libao + ++ lib.optional enableLame lame + ++ lib.optional enableLibmad libmad + ++ lib.optionals enableLibogg [ libogg libvorbis ] + ++ lib.optional enableOpusfile opusfile + ++ lib.optional enableFLAC flac + ++ lib.optional enablePNG libpng + ++ lib.optional enableLibsndfile libsndfile + ++ lib.optional enableWavpack wavpack + ++ lib.optionals enableAMR [ amrnb amrwb ] + ++ lib.optional enableLibpulseaudio libpulseaudio + ++ lib.optional stdenv.isDarwin CoreAudio; - meta = { + meta = with lib; { description = "Sample Rate Converter for audio"; homepage = "http://sox.sourceforge.net/"; - maintainers = [ lib.maintainers.marcweber ]; - license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with maintainers; [ marcweber ]; + license = if enableAMR then licenses.unfree else licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 8460b4856dcce..f7c01ce464940 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.3"; + pname = "soxr"; + version = "0.1.3"; src = fetchurl { - url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; + url = "mirror://sourceforge/soxr/soxr-${version}-Source.tar.xz"; sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; }; @@ -15,18 +16,20 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; # headers are just two and very small - preConfigure = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src - '' else '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src - ''; + preConfigure = + if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src + ''; nativeBuildInputs = [ cmake ]; - meta = { + meta = with lib; { description = "An audio resampling library"; homepage = "http://soxr.sourceforge.net"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 9c8a99a593478..99cdc9ade21b4 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: -stdenv.mkDerivation { - name = "wavesurfer-1.8.5"; +stdenv.mkDerivation rec { + pname = "wavesurfer"; + version = "1.8.5"; src = fetchurl { - url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz"; + url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz"; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 6b09a2e38d8c0..10aac715b48ac 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "wavrsocvt-1.0.2.0"; + pname = "wavrsocvt"; + version = "1.0.2.0"; src = fetchurl { url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; @@ -10,23 +11,23 @@ stdenv.mkDerivation { unpackPhase = '' tar -zxf $src - ''; + ''; installPhase = '' mkdir -p $out/bin cp wavrsocvt $out/bin - ''; + ''; meta = with lib; { description = "Convert .wav files into sound files for Lego NXT brick"; longDescription = '' - wavrsocvt is a command-line utility which can be used from a - terminal window or script to convert .wav files into sound - files for the NXT brick (.rso files). It can also convert the - other direction (i.e., .rso -> .wav). It can produce RSO files - with a sample rate between 2000 and 16000 (the min/max range of - supported sample rates in the standard NXT firmware). - You can then upload these with e.g. nxt-python. + wavrsocvt is a command-line utility which can be used from a + terminal window or script to convert .wav files into sound + files for the NXT brick (.rso files). It can also convert the + other direction (i.e., .rso -> .wav). It can produce RSO files + with a sample rate between 2000 and 16000 (the min/max range of + supported sample rates in the standard NXT firmware). + You can then upload these with e.g. nxt-python. ''; homepage = "http://bricxcc.sourceforge.net/"; license = licenses.mpl11; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 61cab2b6a2a45..0a42e6f5e2cda 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: stdenv.mkDerivation { - name = "avrdudess-2.2.20140102"; + pname = "avrdudess"; + version = "2.2.20140102"; src = fetchurl { url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index fca1ad12fd1c3..f7e39396602e0 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -1,9 +1,12 @@ { stdenv , lib , fetchurl +, copyDesktopItems +, makeDesktopItem , makeWrapper , libuuid , libunwind +, libxkbcommon , icu , openssl , zlib @@ -13,23 +16,69 @@ , gnutar , atomEnv , libkrb5 +, libdrm +, mesa +, xorg }: # from justinwoo/azuredatastudio-nix # https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix +let + desktopItem = makeDesktopItem { + name = "azuredatastudio"; + desktopName = "Azure Data Studio"; + comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --unity-launch %F"; + icon = "azuredatastudio"; + startupNotify = "true"; + categories = "Utility;TextEditor;Development;IDE;"; + mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; + extraEntries = '' + StartupWMClass=azuredatastudio + Actions=new-empty-window; + Keywords=azuredatastudio; + + [Desktop Action new-empty-window] + Name=New Empty Window + Exec=azuredatastudio --no-sandbox --new-window %F + Icon=azuredatastudio + ''; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = "azuredatastudio-url-handler"; + desktopName = "Azure Data Studio - URL Handler"; + comment = "Azure Data Studio"; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --open-url %U"; + icon = "azuredatastudio"; + startupNotify = "true"; + categories = "Utility;TextEditor;Development;IDE;"; + mimeType = "x-scheme-handler/azuredatastudio;"; + extraEntries = '' + NoDisplay=true + Keywords=azuredatastudio; + ''; + }; +in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.17.1"; + version = "1.33.0"; + + desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { - url = "https://azuredatastudiobuilds.blob.core.windows.net/releases/${version}/azuredatastudio-linux-${version}.tar.gz"; - sha256 = "0px9n9vyjvyddca4x7d0zindd0dim7350vkjg5dd0506fm8dc38k"; + name = "${pname}-${version}.tar.gz"; + url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; + sha256 = "0593xs44ryfyxy0hc31hdbj706q16h58jb0qyfyncn7ngybm3423"; }; nativeBuildInputs = [ makeWrapper + copyDesktopItems ]; buildInputs = [ @@ -38,7 +87,14 @@ stdenv.mkDerivation rec { at-spi2-atk ]; - dontInstall = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png + + runHook postInstall + ''; # change this to azuredatastudio-insiders for insiders releases edition = "azuredatastudio"; @@ -60,7 +116,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/2.0.0-release.56"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.139"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath @@ -71,6 +127,10 @@ stdenv.mkDerivation rec { at-spi2-atk stdenv.cc.cc.lib libkrb5 + libdrm + libxkbcommon + mesa + xorg.libxshmfence ] ) targetPath @@ -111,5 +171,6 @@ stdenv.mkDerivation rec { description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; license = lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index b9dbcf529be12..63a04d1811563 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "11vqkzpcjiv3pq6ps022223j6skgm1d23dj18n4a5nsf53wsvvp4"; + sha256 = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 123d839341d65..d230606a3c38f 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon +{ stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon , pango, fribidi, harfbuzz, pcre, pkg-config , ncursesSupport ? true, ncurses ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8="; }; + patches = [ + # Pull upstream fix for build against ncurses-6.3 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/Cloudef/bemenu/commit/d31164db756989579468946aba62969e42c7ed28.patch"; + sha256 = "sha256-oyndQI7SaR8cK0IO5wIIxMpmakhfUzwUqLIKRbPkEdw="; + }) + ]; + nativeBuildInputs = [ pkg-config pcre ]; makeFlags = ["PREFIX=$(out)"]; diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index db287cb37e693..c86342f6e7870 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -1,16 +1,13 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: -let - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "binance"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-oXXzrRhdaWP8GcWI/Ugl8BrDWomZ+hsy5Om0+ME+zY0="; + sha256 = "sha256-UNqz/0IQ1nWANk83X7IVwvZTJayqNO5xPS6oECCgqHI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/applications/misc/bklk/default.nix index 86b596d395ecf..62aeb7c91a5f9 100644 --- a/pkgs/applications/misc/bklk/default.nix +++ b/pkgs/applications/misc/bklk/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-R3H6tv6fzQG41Y2rui0K8fdQ/+Ywnc5hqTPFjktrhF8="; }; + makeFlags = [ "CC=$$CXX" ]; + buildInputs = [ ncurses ]; installPhase = '' diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix index 19c2f3b99a4de..d9c3f5bc2a43f 100644 --- a/pkgs/applications/misc/bluetooth_battery/default.nix +++ b/pkgs/applications/misc/bluetooth_battery/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "bluetooth_battery"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "TheWeirdDev"; repo = "Bluetooth_Headset_Battery_Level"; rev = "v${version}"; - sha256 = "121pkaq9z8p2i35cqs32aygjvf82r961w0axirpmsrbmrwq2hh6g"; + sha256 = "067qfxh228cy1x95bnjp88dx4k00ajj7ay7fz5vr1gkj2yfa203s"; }; propagatedBuildInputs = [ pybluez ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a96be344b3d4d..a991d7c0d13d9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -27,21 +27,20 @@ mkDerivation rec { pname = "calibre"; - version = "5.30.0"; + version = "5.31.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "058dqqxhc3pl4is1idlnc3pz80k4r681d5aj4a26v9acp8j7zy4f"; + sha256 = "sha256-3LGEWuHms54ji9GWSyLl8cFWIRBqHY1Jf/CNPJOywrU="; }; - # https://sources.debian.org/patches/calibre/5.30.0+dfsg-1 + # https://sources.debian.org/patches/calibre/5.31.1+dfsg-1 patches = [ # allow for plugin update check, but no calibre version check (fetchpatch { - name = "0001_only_plugin_update.patch"; - url = - "https://sources.debian.org/data/main/c/calibre/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256-aGT8rJ/eQKAkmyHBWdY0ouZuWvDwtLVJU5xY6d3hY3k="; + name = "0001-only-plugin-update.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; + sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 1d5baf9f6b348..adabcdac9542d 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,29 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, - glib, gtk3, pcsclite, lua5_2, curl, readline }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, glib +, gtk3 +, pcsclite +, lua5_2 +, curl +, readline +, PCSC +, xcbuild +}: let version = "0.8.4"; in - stdenv.mkDerivation { - pname = "cardpeek"; - inherit version; +stdenv.mkDerivation { + pname = "cardpeek"; + inherit version; - src = fetchFromGitHub { - owner = "L1L1"; - repo = "cardpeek"; - rev = "cardpeek-${version}"; - sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; - }; + src = fetchFromGitHub { + owner = "L1L1"; + repo = "cardpeek"; + rev = "cardpeek-${version}"; + sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; + }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # replace xcode check and hard-coded PCSC framework path + substituteInPlace configure.ac \ + --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ + --replace 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=${PCSC}/Library/Frameworks/PCSC.framework/Headers' + ''; - enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ glib gtk3 lua5_2 curl readline ] + ++ lib.optional stdenv.isDarwin PCSC + ++ lib.optional stdenv.isLinux pcsclite; - meta = with lib; { - homepage = "https://github.com/L1L1/cardpeek"; - description = "A tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ embr ]; - }; - } + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/L1L1/cardpeek"; + description = "A tool to read the contents of ISO7816 smart cards"; + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ embr ]; + }; +} diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 9c6b1812683a0..768eb7b308e40 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: stdenv.mkDerivation { - name = "catclock-2015-10-04"; + pname = "catclock"; + version = "unstable-2015-10-04"; src = fetchFromGitHub { owner = "BarkyTheDog"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 61150d56fbbd0..5802f21a8749d 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -13,7 +13,6 @@ , sqlite , curl , libuchardet -, fmt , spdlog }: @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { sqlite curl libuchardet - fmt spdlog ]; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index 5675676d95191..fb373938d5acf 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "com.github.arshubham.cipher"; }; } diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index b28b33d56c917..38c0c103943a9 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ xorg.libxcb ]; - cargoBuildFlags = [ "--features=all" ]; + buildFeatures = [ "all" ]; postInstall = '' installShellCompletion --bash completions/bash-completion/completions/* diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index cb33aa595a466..7b25018412627 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cloak"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; description = "Command-line OTP authenticator application"; diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index a4283e5ebb934..7a1ae7a9e2f45 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "colort-unstable-2017-03-12"; + pname = "colort"; + version = "unstable-2017-03-12"; src = fetchFromGitHub { owner = "neeasade"; @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; }; - makeFlags = ["PREFIX=$(out)"]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A program for 'tinting' color values"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index dc692b67730e2..d5e2e6adf526e 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ="; + sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index be9d02bf33937..f17730cc7e955 100644 --- a/pkgs/applications/misc/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreaction"; @@ -27,8 +27,8 @@ mkDerivation rec { buildInputs = [ qtsvg qtbase - libcsys libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix new file mode 100644 index 0000000000000..56a05bc434ecf --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -0,0 +1,34 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corearchiver"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libarchive-qt + libarchive + libcprime + libcsys + ]; + + meta = with lib; { + description = "Archiver from the C Suite to create and extract archives"; + homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 9ad99e3aa06be..3ec918db7af9f 100644 --- a/pkgs/applications/misc/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corefm"; diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 6d665479764a3..719047c8de7bb 100644 --- a/pkgs/applications/misc/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coregarage"; @@ -18,9 +18,10 @@ mkDerivation rec { buildInputs = [ qtbase - libcprime libarchive libarchive-qt + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index ad1fabb25043f..fb9bcd5e8ef4e 100644 --- a/pkgs/applications/misc/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corehunt"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 1dcff1f6e8f25..224c946d1175f 100644 --- a/pkgs/applications/graphics/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreimage"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix new file mode 100644 index 0000000000000..d8df86abd8705 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libzen, libmediainfo, zlib, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreinfo"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libzen + libmediainfo + zlib + libcprime + libcsys + ]; + + meta = with lib; { + description = "A file information tool from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix new file mode 100644 index 0000000000000..3d4e6ddc30108 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corekeyboard"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + xorg.libXtst + xorg.libX11 + libcprime + libcsys + ]; + + meta = with lib; { + description = "A virtual keyboard for X11 from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix new file mode 100644 index 0000000000000..fcd1bfa4a4ff6 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepad"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A document editor from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepad"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix new file mode 100644 index 0000000000000..6410da3ba607c --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepaint"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A paint app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix new file mode 100644 index 0000000000000..bb93391c2af80 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepdf"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + poppler + libcprime + libcsys + ]; + + meta = with lib; { + description = "A PDF viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix new file mode 100644 index 0000000000000..80d3a096ffe66 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepins"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A bookmarking app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix new file mode 100644 index 0000000000000..f92d532ba4a55 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corerenamer"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A batch file renamer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix new file mode 100644 index 0000000000000..bf9f5e49aea62 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreshot"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + libcprime + libcsys + ]; + + meta = with lib; { + description = "A screen capture utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix new file mode 100644 index 0000000000000..a6d71eaa6cb62 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, lm_sensors, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestats"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + lm_sensors + libcprime + libcsys + ]; + + meta = with lib; { + description = "A system resource viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix new file mode 100644 index 0000000000000..57216f4710dad --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, kglobalaccel, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestuff"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + kglobalaccel + xorg.libXcomposite + libcprime + libcsys + ]; + + meta = with lib; { + description = "An activity viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index e358fae0716f6..c2085686aab86 100644 --- a/pkgs/applications/terminal-emulators/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -1,12 +1,13 @@ { mkDerivation , lib , fetchFromGitLab -, cmake -, ninja , qtbase , qtserialport , qtermwidget +, cmake +, ninja , libcprime +, libcsys }: mkDerivation rec { @@ -30,6 +31,7 @@ mkDerivation rec { qtserialport qtermwidget libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix new file mode 100644 index 0000000000000..af33d474e3509 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtmultimedia, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coretime"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtmultimedia + libcprime + libcsys + ]; + + meta = with lib; { + description = "A time related task manager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 8a8b0ae401091..8a8b0ae401091 100644 --- a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index eff253ffcc2e3..154f4a389948a 100644 --- a/pkgs/applications/misc/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -1,8 +1,32 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja -, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder -, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools -, bluez, networkmanager, connman, redshift, gawk -, polkit, libnotify, systemd, xdg-utils }: +{ mkDerivation +, lib +, fetchFromGitLab +, ffmpeg +, cmake +, ninja +, qtbase +, qtx11extras +, qtconnectivity +, v4l-utils +, grim +, wf-recorder +, libdbusmenu +, playerctl +, xorg +, iio-sensor-proxy +, inotify-tools +, bluez +, networkmanager +, connman +, redshift +, gawk +, polkit +, libnotify +, systemd +, xdg-utils +, libcprime +, libcsys +}: mkDerivation rec { pname = "coretoppings"; @@ -15,22 +39,21 @@ mkDerivation rec { sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; }; - nativeBuildInputs = [ - cmake - ninja - ]; - patches = [ # Fix file cannot create directory: /var/empty/share/polkit-1/actions ./0001-fix-install-phase.patch ]; + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ qtbase qtx11extras qtconnectivity libdbusmenu - libcprime ffmpeg v4l-utils grim @@ -50,6 +73,8 @@ mkDerivation rec { libnotify systemd xdg-utils + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix new file mode 100644 index 0000000000000..0a6ccaf721427 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreuniverse"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "Shows information about apps from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch new file mode 100644 index 0000000000000..b454abb188bcc --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -0,0 +1,29 @@ +From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com> +Date: Wed, 28 Jul 2021 02:26:39 +0300 +Subject: [PATCH] fix application dirs + +--- + cprime/systemxdg.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp +index f9eee66..ea0553d 100644 +--- a/cprime/systemxdg.cpp ++++ b/cprime/systemxdg.cpp +@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety + SystemXdgMime::SystemXdgMime() { + + appsDirs << QDir::home().filePath( ".local/share/applications/" ); +- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; +- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; ++ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; + }; + + DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { +-- +2.32.0 + diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix new file mode 100644 index 0000000000000..00e297bf276a5 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + patches = [ + ./0001-fix-application-dirs.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix new file mode 100644 index 0000000000000..d1dde9942e92f --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja }: + +mkDerivation rec { + pname = "libcsys"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + udisks2 + ]; + + meta = with lib; { + description = "Library for managing drive and getting system resource information in real time"; + homepage = "https://gitlab.com/cubocore/libcsys"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 148553da16212..3c74aaaded4af 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile --replace "--static" "" - '' + lib.optionalString stdenv.isi686 '' - substituteInPlace Makefile --replace "-flto" "" ''; installPhase = '' diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d8c94c88383d5..870d3cceb0ba5 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.21.2"; + version = "1.22.1"; src = fetchFromGitHub { owner = "TomWright"; - repo = pname; + repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-HHeO8mbvD+PLMKjeacjIBNEVeOYjeHjXJHhTkbMMOG4="; + sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; }; - vendorSha256 = "sha256-yP4iF3403WWgWAmBHiuOpDsIAUx4+KR8uKPfjy3qXt8="; + vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8"; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" @@ -38,6 +38,7 @@ buildGoModule rec { Comparable to jq / yq, but supports JSON, YAML, TOML and XML with zero runtime dependencies. ''; homepage = "https://github.com/TomWright/dasel"; + changelog = "https://github.com/TomWright/dasel/blob/v${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ _0x4A6F ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index f7782d0a577c4..65375172f405c 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "BPcTj2YIGyP3g4qrQlDp13lziJwSUt0Zn00CayDku9g="; + sha256 = "bLZYwf6dtbzS0sWKfQQzv4NqRQZqLkJaT24eW3YOsdQ="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 19cfa95a88e40..6a9453eb583a3 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -2,7 +2,7 @@ mkDerivation { pname = "dfilemanager"; - version = "git-2020-09-04"; + version = "unstable-2020-09-04"; src = fetchFromGitHub { owner = "probonopd"; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 649fbe55fae21..3c193d3f569a0 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -10,10 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.9"; + pname = "ding"; + version = "1.9"; src = fetchurl { - url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; + url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz"; sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 62f02ce67142b..42bc059986677 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-5.0"; + pname = "dmenu"; + version = "5.0"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; }; @@ -24,10 +25,10 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; meta = with lib; { - description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = "https://tools.suckless.org/dmenu"; - license = licenses.mit; - maintainers = with maintainers; [ pSub globin ]; - platforms = platforms.all; + description = "A generic, highly customizable, and efficient menu for the X Window System"; + homepage = "https://tools.suckless.org/dmenu"; + license = licenses.mit; + maintainers = with maintainers; [ pSub globin ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/applications/misc/downonspot/default.nix new file mode 100644 index 0000000000000..4764fc4d5e638 --- /dev/null +++ b/pkgs/applications/misc/downonspot/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, makeWrapper +, alsa-lib +, lame +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "downonspot"; + version = "unstable-2021-10-13"; + + src = fetchFromGitHub { + owner = "oSumAtrIX"; + repo = "DownOnSpot"; + rev = "9d78ea2acad4dfe653a895a1547ad0abe7c5b47a"; + sha256 = "03g99yx9sldcg3i6hvpdxyk70f09f8kfj3kh283vl09b1a2c477w"; + }; + + cargoSha256 = "0k200p6wgwb60ax1r8mjn3aq08zxpkqbfqpi3b25zi3xf83my44d"; + + # fixes: error: the option `Z` is only accepted on the nightly compiler + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + alsa-lib + lame + ]; + + meta = with lib; { + description = "A Spotify downloader written in rust"; + homepage = "https://github.com/oSumAtrIX/DownOnSpot"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 67753b6e37101..698a9b7c3b5f0 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,29 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg +, testVersion, dunst }: stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0="; + sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw"; }; - patches = [ - (fetchpatch { - # fixes double free (https://github.com/dunst-project/dunst/issues/957) - url = "https://github.com/dunst-project/dunst/commit/dc8efbbaff0e9ba881fa187a01bfe5c033fbdcf9.patch"; - sha256 = "sha256-xuODOFDP9Eqr3g8OtNnaMmTihhurfj2NLeZPr0TF4vY="; - }) - ]; - nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ @@ -47,6 +40,8 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; + passthru.tests.version = testVersion { package = dunst; }; + meta = with lib; { description = "Lightweight and customizable notification daemon"; homepage = "https://dunst-project.org/"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 87eaed9753526..3e74d04c51288 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick -, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: +, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }: stdenv.mkDerivation rec { pname = "far2l"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index c2347d5fbb8bc..c684d273bc75a 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,9 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config -, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, bzip2 +, curl +, expat +, fribidi +, libunibreak +, sqlite +, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" -, qt4, gtk2 -, AppKit, Cocoa +, qt4 +, gtk2 +, AppKit +, Cocoa }: with lib; @@ -16,7 +28,8 @@ assert uiTarget == "macosx" -> uiType == "cocoa"; # which is way to old and no longer in nixpkgs. stdenv.mkDerivation { - name = "fbreader-${uiType}-0.99.6"; + pname = "fbreader-${uiType}"; + version = "0.99.6"; src = fetchFromGitHub { owner = "geometer"; @@ -53,7 +66,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - bzip2 curl expat fribidi libunibreak sqlite zlib + bzip2 + curl + expat + fribidi + libunibreak + sqlite + zlib ] ++ optional (uiType == "qt4") qt4 ++ optional (uiType == "gtk") gtk2 @@ -68,7 +87,7 @@ stdenv.mkDerivation { homepage = "http://www.fbreader.org/"; license = licenses.gpl3; broken = stdenv.isDarwin # untested, might work - || uiType == "gtk"; # builds, but the result is unusable, hangs a lot + || uiType == "gtk"; # builds, but the result is unusable, hangs a lot platforms = platforms.unix; maintainers = [ maintainers.coroa ]; }; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 992b627808281..69050ca661f9a 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { - name = "fehlstart-9f4342d7"; + pname = "fehlstart"; + version = "unstable-2016-05-23"; src = fetchFromGitLab { owner = "fehlstart"; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index c054c36859cc1..5eafa03907711 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "sha256-77nSz3J/9TsptpSHRFYY8mZAvn+o35gro2OwQkGzEC0="; + sha256 = "sha256-P7F7PHP2EiZz6RgKbmqXRQOGG1P8TJ1emR0BEY9yBqk="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - cargoSha256 = "sha256-UukLWMd8+wq5Y0dtePH312c1Nm4ztXPsoPHPN0nUb1w="; + cargoSha256 = "sha256-QlCjAtQGITGrWNKQM39QPmv/MPZaaHfwdHjal2i1qv4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 6f6a143ae8e03..03a9f875a7933 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoconf , automake , bc @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; - src = fetchurl { - url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; - hash = "sha256-0cgaajjA+q0ClDrWXW0DFL0gXG3oQWaaLv5D5MUD5j0="; + src = fetchFromGitHub { + owner = "rdehouss"; + repo = "fme"; + rev = "v${version}"; + sha256 = "sha256-P67OmExBdWM6NZhDyYceVJOZiy8RC+njk/QvgQcWZeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 4532b766f47b4..440022da6eeb4 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.lgpl2Plus; + mainProgram = "com.github.djaler.formatter"; }; } diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index e099414c0c287..dbc66458a3155 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -15,7 +15,7 @@ , enableCairo ? true , withPNGBackend ? "libpng" , withSVGBackend ? "librsvg" -# Optional dependencies + # Optional dependencies , cairo , librsvg , libpng @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = version; - sha256 = "sha256-wl3dO6EwLXWf0XtAIml1NlNRIvpIQJuq1pxLmo/pAUE="; + sha256 = "SWt46YSXI6Dsv0ed3H4sN8kbEzQDL4U6jxFSbMyspJ0="; }; nativeBuildInputs = [ @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { tllist fcft ] ++ lib.optional enableCairo cairo - ++ lib.optional (withPNGBackend == "libpng") libpng - ++ lib.optional (withSVGBackend == "librsvg") librsvg; + ++ lib.optional (withPNGBackend == "libpng") libpng + ++ lib.optional (withSVGBackend == "librsvg") librsvg; mesonBuildType = "release"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 656a5f3bea48b..20590552fc995 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: +{ lib, buildPythonApplication, fetchPypi, requests, youtube-dl, pytestCheckHook }: buildPythonApplication rec { pname = "gallery_dl"; - version = "1.19.1"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216"; + sha256 = "7fec9ac69582dbd9922666e6ece3142ae52dc9679a2c4a613f6ee94ad09e5f68"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests youtube-dl ]; checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index c2c3a69140b96..c401b27225658 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: -stdenv.mkDerivation { - name = "garmin-plugin-0.3.26"; - src = fetchurl { - url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz"; - sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; +{ lib, stdenv, fetchFromGitHub, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: + +stdenv.mkDerivation rec { + pname = "garmin-plugin"; + version = "0.3.26"; + + src = fetchFromGitHub { + owner = "adiesner"; + repo = "GarminPlugin"; + rev = "V${version}"; + sha256 = "sha256-l0WAbEsQl1dCADf5gTepYjsA1rQCJMLcrTxRR4PfUus="; }; - sourceRoot = "GarminPlugin-0.3.26/src"; + + preConfigure = '' + cd src + ''; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; + configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" "--with-garmintools-libdir=${garmintools}/lib" ]; + installPhase = '' mkdir -p $out/lib/mozilla/plugins cp npGarminPlugin.so $out/lib/mozilla/plugins ''; - meta = { - homepage = "http://www.andreas-diesner.de/garminplugin"; - license = lib.licenses.gpl3; - maintainers = [ ]; - platforms = lib.platforms.linux; + + meta = with lib; { + homepage = "https://adiesner.github.io/GarminPlugin/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/applications/misc/gitit/default.nix index a4ffd3bf88d3b..365b3f6acd977 100644 --- a/pkgs/applications/misc/gitit/default.nix +++ b/pkgs/applications/misc/gitit/default.nix @@ -14,13 +14,13 @@ let plugins = if pluginSupport then plain - else haskell.lib.disableCabalFlag plain "plugins"; - static = haskell.lib.justStaticExecutables plugins; + else haskell.lib.compose.disableCabalFlag "plugins" plain; + static = haskell.lib.compose.justStaticExecutables plugins; in - (haskell.lib.overrideCabal static (drv: { + (haskell.lib.compose.overrideCabal (drv: { buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; - })).overrideAttrs (drv: { + }) static).overrideAttrs (drv: { # These libraries are still referenced, because they generate # a `Paths_*` module for figuring out their version. diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index aaaab255c7633..0a62ce4ea5187 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which -, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook +{ lib +, fetchurl +, stdenv +, gettext +, pkg-config +, glib +, gtk2 +, libX11 +, libSM +, libICE +, which +, IOKit +, copyDesktopItems +, makeDesktopItem +, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { - name = "gkrellm-2.3.11"; + pname = "gkrellm"; + version = "2.3.11"; src = fetchurl { - url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; + url = "http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2"; sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; - buildInputs = [gettext glib gtk2 libX11 libSM libICE] - ++ optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; @@ -48,7 +60,7 @@ stdenv.mkDerivation rec { }) ]; - meta = { + meta = with lib; { description = "Themeable process stack of system monitors"; longDescription = '' GKrellM is a single process stack of system monitors which diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 03668e5861174..f0eed5c1e2fcf 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -56,7 +56,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications - wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict ''; meta = with lib; { diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index af204b2350621..0d567dd79a106 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }: stdenv.mkDerivation rec { - name = "gpa-0.10.0"; + pname = "gpa"; + version = "0.10.0"; src = fetchurl { - url = "mirror://gnupg/gpa/${name}.tar.bz2"; + url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2"; sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index c8d6eb3b84c76..8d2b95ea4f31d 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -28,7 +28,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications - wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab ''; meta = with lib; { diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index f008ea439ed61..84651b78121ae 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.6"; + version = "9.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-Yj8lR8zgIV+gshea7rzLbMF84n1nyN3DytiIkr3B274="; + sha256 = "sha256-hIDphwmS4UNSTvE+Icupipo6AmT2fiPdaufT/I3EeJ4="; }; patches = (substituteAll { @@ -23,10 +23,9 @@ mkDerivation rec { lrelease gpxsee.pro ''; - postInstall = with stdenv; lib.optionalString isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications - wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; meta = with lib; { diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 557cd45c42c9c..6a6666763c188 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,10 +15,11 @@ }: stdenv.mkDerivation rec { - name = "grip-4.2.2"; + pname = "grip"; + version = "4.2.2"; src = fetchurl { - url = "mirror://sourceforge/grip/${name}.tar.gz"; + url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; }; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index aa07058dc808f..851f2d80c9763 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: -let - name = "gv-3.7.4"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "gv"; + version = "3.7.4"; src = fetchurl { - url = "mirror://gnu/gv/${name}.tar.gz"; + url = "mirror://gnu/gv/gv-${version}.tar.gz"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 9e8c5ddaef4ac..7c32cec721927 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: -stdenv.mkDerivation { - name = "gxneur-0.20.0"; +stdenv.mkDerivation rec { + pname = "gxneur"; + version = "0.20.0"; src = fetchurl { - url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz"; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; @@ -13,8 +14,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur - libglade GConf pcre libappindicator-gtk2 + xorg.libX11 + glib + gtk2 + xorg.libXpm + xorg.libXt + xorg.libXext + xneur + libglade + GConf + pcre + libappindicator-gtk2 ]; meta = with lib; { diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index f5a723f590188..43c2eb2422417 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -15,6 +15,7 @@ let sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx"; }; }); + click = self.callPackage ../../../development/python-modules/click/7.nix { }; }; }; in diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 3cda6d0a31811..888c7892514b8 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline, ncurses +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; + 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 797dfe504cae4..ad40f6c83894e 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh"; - version = "1.6.2-328c666b"; - sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.3-b75e2da6/Hubstaff-1.6.3-b75e2da6.sh"; + version = "1.6.3-b75e2da6"; + sha256 = "0p77182p5rqbng8j6ndijq5br9hiwcmblpw8j5nc26m5w45jfspw"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 8b72647574e64..af7e9888c17cb 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight +{ lib, stdenv, fetchurl, fetchpatch, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight , gitSupport ? false, git , docutilsSupport ? false, python, docutils , monotoneSupport ? false, monotone @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) - ++ lib.optionals docutilsSupport [python docutils] + ++ lib.optionals docutilsSupport [ + (python.withPackages (pp: with pp; [ pygments ])) + docutils + ] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] ++ lib.optionals bazaarSupport [breezy] @@ -31,9 +34,17 @@ stdenv.mkDerivation rec { ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; - # A few markdown tests fail, but this is expected when using Text::Markdown - # instead of Text::Markdown::Discount. - patches = [ ./remove-markdown-tests.patch ]; + patches = [ + # A few markdown tests fail, but this is expected when using Text::Markdown + # instead of Text::Markdown::Discount. + ./remove-markdown-tests.patch + + (fetchpatch { + name = "Catch-up-to-highlight-4.0-API-change"; + url = "http://source.ikiwiki.branchable.com/?p=source.git;a=patch;h=9ea3f9dfe7c0341f4e002b48728b8139293e19d0"; + sha256 = "16s4wvsfclx0a5cm2awr69dvw2vsi8lpm0d7kyl5w0kjlmzfc7h9"; + }) + ]; postPatch = '' sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man @@ -42,6 +53,9 @@ stdenv.mkDerivation rec { # State the gcc dependency, and make the cgi use our wrapper sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \ -e "s@'cc'@'${stdenv.cc}/bin/gcc'@" IkiWiki/Wrapper.pm + # Without patched plugin shebangs, some tests like t/rst.t fail + # (with docutilsSupport enabled) + patchShebangs plugins/* ''; configurePhase = "perl Makefile.PL PREFIX=$out"; @@ -74,5 +88,6 @@ stdenv.mkDerivation rec { homepage = "http://ikiwiki.info/"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = [ maintainers.wentasah ]; }; } diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix index b4f6b0ca4bec4..3165b3d34d6d6 100644 --- a/pkgs/applications/misc/index-fm/default.nix +++ b/pkgs/applications/misc/index-fm/default.nix @@ -17,14 +17,14 @@ mkDerivation rec { pname = "index"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "sha256-aY8JBCIh6VyCDOGQIMWhO6asGMo6I6ZTgzpDnnDy9eo="; + sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index b4573a816359c..9e07193cdb7f2 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, db, gtk2, bzip2 }: -stdenv.mkDerivation { - name = "jigdo-0.7.3"; +stdenv.mkDerivation rec { + pname = "jigdo"; + version = "0.7.3"; - # Debian sources src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz"; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz"; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; }; @@ -21,10 +21,11 @@ stdenv.mkDerivation { configureFlags = [ "--without-libdb" ]; - meta = { + meta = with lib; { description = "Download utility that can fetch files from several sources simultaneously"; - homepage = "http://atterer.net/jigdo/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; + homepage = "http://atterer.org/jigdo/"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4701fe0b54f30..9d3b751fcd6ac 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.4.6"; + version = "2.5.12"; 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-BMpRWtfx5fXEJy3hp/+q86sd+Yd/QPJbSqi2nWE2dcQ="; - x86_64-darwin = "sha256-4UNKdoGtQSN5/m+xQZrY77ZE5A7jvpDOUCRvwrS5e6g="; + x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8="; + x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 5497d37ef0e13..7d4ec87b9f4bb 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -1,20 +1,17 @@ -{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "sha256-+qKOvFoEF/gZL4ijL8lIRWE9ZWJM2eBlk29Lk46jAfQ="; + sha256 = "sha256-9TGHSGYCzU6uAIO4zZ/6+B4oVPE6SD9Phl4dShylW5o="; }; - # upstream includes an outdated Cargo.lock that stops cargo from compiling - cargoPatches = [ ./fix-cargo-lock.patch ]; - - cargoSha256 = "sha256-JlekxU9pMkHNsIcH3+7b2I6MYUlxRqNX+0wwyVrQMAE="; + cargoSha256 = "sha256-g8YYOk2RW4GPdkWlvAxd5KFdV4S1l5yKEzNm9OAc8RI="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/applications/misc/joshuto/fix-cargo-lock.patch b/pkgs/applications/misc/joshuto/fix-cargo-lock.patch deleted file mode 100644 index 023c824add10e..0000000000000 --- a/pkgs/applications/misc/joshuto/fix-cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -512,7 +512,7 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - - [[package]] - name = "joshuto" --version = "0.9.0" -+version = "0.9.1" - dependencies = [ - "alphanumeric-sort", - "chrono", diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 93e08b6607873..fa93e7257168a 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18193"; + version = "18303"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A="; + sha256 = "sha256-+gUJsx238iQKrYx/rdtd8ESVXI0u/kW2s0p33T4MSWU="; }; macosx = fetchurl { - url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk="; + url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; + sha256 = "sha256-s8MuXcDl+DwjXOtf6ltpxYSeCE9R2/x9iJs2BoZHgXM="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII="; + sha256 = "sha256-+zsbksfQPwzVPpKlXdRWachWwjVuhExlyiEKDMkaxp8="; }; }; in diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fdd606c892d29..a8548f2c5c000 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -115,11 +115,6 @@ stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; - preFixup = optionalString stdenv.isDarwin '' - # Make it work without Qt in PATH. - wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC - ''; - passthru.tests = nixosTests.keepassxc; meta = { diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 64e41eaa3d25c..f098cd6dbfb6f 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -17,10 +17,9 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ atomicwrites configobj - vobject - ruamel_yaml - ruamel_base + ruamel-yaml unidecode + vobject ]; postInstall = '' @@ -32,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { export COLUMNS=80 ''; + pythonImportsCheck = [ "khard" ]; + meta = { homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index af66e2282b407..3d11162241ebb 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.09"; + version = "2021.10.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84"; + sha256 = "sha256-UpDwexBfjlne/uNMTtNjIyZb3TDMYFeDvtwtTFARovw="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix index 533d3757a6ef6..f6071978b8676 100644 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ b/pkgs/applications/misc/lavalauncher/default.nix @@ -7,24 +7,26 @@ , scdoc , cairo , librsvg +, libxkbcommon , wayland , wayland-protocols }: stdenv.mkDerivation rec { pname = "lavalauncher"; - version = "2.0.0"; + version = "2.1.1"; src = fetchgit { url = "https://git.sr.ht/~leon_plickat/lavalauncher"; rev = "v${version}"; - sha256 = "MXREycR4ZetTe71ZwEqyozMJN9OLTDvU0W4J8qkTQAs="; + sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ cairo librsvg + libxkbcommon wayland wayland-protocols ]; diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix index 50827355cac08..f7f6c5fa2a38e 100644 --- a/pkgs/applications/misc/lifelines/default.nix +++ b/pkgs/applications/misc/lifelines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "lifelines"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/lifelines/lifelines/pull/437 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch"; + sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7"; + }) + ]; + buildInputs = [ gettext libiconv diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 24a16eeb8b1f2..d7f0624ad3f38 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "limesctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fhmGVgJ/4xnf6pe8aXxx1KEmLInxm54my+qgSU4Vc/k="; + sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; }; vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 4fb05b25c063a..3dca98c2cc773 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "EMybZH3heUWeCP74KdFr6zJY1R3hePo6RssbJXrkd9g="; + sha256 = "fGRPuv98sr3wcVbkVCJr2yKxBZ/IiQP854T9NBf/vCk="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 65f9a9f0f17e4..2e7a1365f4d2f 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,18 +1,17 @@ -{ lib, python27Packages, fetchgit }: -let - py = python27Packages; - python = py.python; -in -py.buildPythonApplication { - name = "loxodo-0.20150124"; +{ lib, python2, fetchFromGitHub }: - src = fetchgit { - url = "https://github.com/sommer/loxodo.git"; +python2.pkgs.buildPythonApplication { + pname = "loxodo"; + version = "unstable-2015-01-24"; + + src = fetchFromGitHub { + owner = "sommer"; + repo = "loxodo"; rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2"; }; - propagatedBuildInputs = with py; [ wxPython ]; + propagatedBuildInputs = with python2.pkgs; [ wxPython ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo @@ -21,7 +20,7 @@ py.buildPythonApplication { [Desktop Entry] Type=Application Exec=$out/bin/loxodo - Icon=$out/lib/${python.libPrefix}/site-packages/resources/loxodo-icon.png + Icon=$out/lib/${python2.libPrefix}/site-packages/resources/loxodo-icon.png Name=Loxodo GenericName=Password Vault Categories=Application;Other; @@ -33,5 +32,6 @@ py.buildPythonApplication { homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index f29fdfda6c181..70804ef1fddbf 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.8.0"; + version = "0.8.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-dwtrs9NlhJ+km2/146HMnDirWRB5Ur5LTmWdKAK03v0="; + sha256 = "sha256-74KNnERhyiZamVyS9yzDNVf33KMqDiSfPb5BCTKFuHA="; }; - cargoSha256 = "sha256-vQnrLt+VSDPr61VMkYFtjSDnEt+NmWBZUd4qLzPzQBU="; + cargoSha256 = "sha256-mjGZ/q9BByndwfnFGk6k5KD9ctY0X0/oaEugiOJY8Ms="; + + # setid is not allowed in the sandbox + checkFlags = [ "--skip=tests::style_for_setid" ]; meta = with lib; { description = "Rust library and tool to colorize paths using LS_COLORS"; homepage = "https://github.com/sharkdp/lscolors"; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 8c884305277a1..2dfbaeb9941a7 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -30,9 +30,6 @@ mkDerivation rec { installPhase = '' install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin - '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/bin/lsd2dsl - wrapQtApp $out/bin/lsd2dsl-qtgui ''; meta = with lib; { diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index bd35d44b7cccd..7722574720ffa 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -77,7 +77,7 @@ in buildFHSUserEnv { nasm sndio # Snes9x - epoxy minizip + libepoxy minizip # Vice bison flex diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index c98d40ab2e14a..1e71493e5fec0 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -2,16 +2,21 @@ let pname = "marktext"; - version = "v0.16.2"; -in -appimageTools.wrapType2 rec { + version = "v0.16.3"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; - sha256 = "0ivf9lvv2jk7dvxmqprzcsxgya3617xmx5bppjvik44z14b5x8r7"; + sha256 = "0s93c79vy2vsi7b6xq4hvsvjjad8bdkhl1q135vp98zmbf7bvm9b"; }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in +appimageTools.wrapType2 rec { + inherit name src; + profile = '' export LC_ALL=C.UTF-8 '' @@ -28,8 +33,16 @@ appimageTools.wrapType2 rec { p.xorg.libxkbfile ]; - # Strip version from binary name. - extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + extraInstallCommands = '' + # Strip version from binary name. + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop + substituteInPlace $out/share/applications/marktext.desktop \ + --replace "Exec=AppRun" "Exec=${pname} --" + + cp -r ${appimageContents}/usr/share/icons $out/share + ''; meta = with lib; { description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index fb1923d932ea8..17365e009bc04 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-yz8lLFAP2/16fixknqGziyrUJKs3Qo1+whV82kUPuAE="; + sha256 = "sha256-VUvV1XA9Bd3ugYHcKOcAQLUt0etxS/Cw2EgnFGxX0z0="; }; - cargoSha256 = "sha256-TGNzi8fMU7RhX2SJyxpYfJLgGYxpO/XkmDXzMdlX/2o="; + cargoSha256 = "sha256-lZ4fc/94ESlhpfa5ylg45oZNeaF1mZPxQUSLZrl2V3o="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix index 806d6a53cfaae..c4973b2755348 100644 --- a/pkgs/applications/misc/mencal/default.nix +++ b/pkgs/applications/misc/mencal/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mencal-3.0"; + pname = "mencal"; + version = "3.0"; src = fetchurl { - url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz"; + url = "http://kyberdigi.cz/projects/mencal/files/mencal-${version}.tar.gz"; sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080"; }; installPhase = '' - mkdir -p $out/bin - cp mencal $out/bin/ - ''; + mkdir -p $out/bin + cp mencal $out/bin/ + ''; buildInputs = [ perl ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 90d91583a26fc..eda540427bbd4 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -50,7 +50,6 @@ mkDerivation rec { mkdir -p $out/Applications mv binaries/bin/merkaartor.app $out/Applications mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents - wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor ''; meta = with lib; { diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 46da03b8a8821..d869164f66090 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -5,8 +5,9 @@ , desktop-file-utils , glib , gobject-introspection -, gtk3 -, libhandy +, gtk4 +, itstool +, libadwaita , librsvg , meson , ninja @@ -17,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "1.0.7"; + version = "2.0.1"; format = "other"; @@ -25,14 +26,15 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - sha256 = "sha256-HlP/QahVFCAct06pKanjozFqeyTdHoHanIemq5ID2CQ="; + sha256 = "sha256-iTKs3DEZSzqRARXJKPPygvCS5JNUMbQBkfjacwd168Y="; }; nativeBuildInputs = [ appstream desktop-file-utils glib - gtk3 + gtk4 + itstool meson ninja pkg-config @@ -41,8 +43,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gobject-introspection - gtk3 - libhandy + gtk4 + libadwaita librsvg poppler_gi ]; diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index d9e1922f1c482..07ac41f7281eb 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, curl }: +{ lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation { - name = "metar-20161013.1"; + pname = "metar"; + version = "unstable-2017-02-17"; - src = fetchgit { - url = "https://github.com/keesL/metar.git"; + src = fetchFromGitHub { + owner = "keesL"; + repo = "metar"; rev = "20e9ca69faea330f6c2493b6829131c24cb55147"; sha256 = "1fgrlnpasqf1ihh9y6zy6mzzybqx0lxvh7gmv03rjdb55dr42dxj"; }; @@ -13,8 +15,6 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/keesL/metar"; - license = licenses.gpl2; - maintainers = [ maintainers.zalakain ]; description = "Downloads weather reports and optionally decodes them"; longDescription = '' METAR reports are meteorogical weather reports for aviation. Metar is a small @@ -26,5 +26,7 @@ stdenv.mkDerivation { more work in the area of clouds need to be done, as support for Cumulus or Cumulunimbus is not yet decoded. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zalakain ]; }; } diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 607eeb5eaa3c1..63840b3f0b295 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + mainProgram = "com.github.phase1geo.minder"; }; } diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index c88ac932e4f96..29c0dce205d05 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4810"; + version = "4813"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw="; + sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/deps.nix b/pkgs/applications/misc/mkgmap/deps.nix index 22b5410d6bbc2..68cd5a79fe720 100644 --- a/pkgs/applications/misc/mkgmap/deps.nix +++ b/pkgs/applications/misc/mkgmap/deps.nix @@ -9,23 +9,23 @@ sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3"; }; protobuf = fetchurl { - url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; + url = "mirror://maven/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; }; xpp3 = fetchurl { - url = "https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; + url = "mirror://maven/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83"; }; jaxb-api = fetchurl { - url = "https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"; + url = "mirror://maven/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"; sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48"; }; junit = fetchurl { - url = "https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar"; + url = "mirror://maven/junit/junit/4.11/junit-4.11.jar"; sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h"; }; hamcrest-core = fetchurl { - url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"; }; } diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 1bd8b5899240b..1684003fb760d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "642"; + version = "643"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk="; + sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index e9e0559b0d087..f558e520da867 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.12.0"; + version = "2.0.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-5hvuaKlaWrB8nEeHytnn4ywciLbOSoXdBdc3K/PqMG8="; + sha256 = "sha256-sSeXL+eHroxDr+91rwmUJ+WwDgefZgJBRTxy4wo6DDM="; }; meta = with lib; { diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 69aca239d311c..bfdfeebae2712 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, socat, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation { - name = "mpvc-unstable-2017-03-18"; + pname = "mpvc"; + version = "unstable-2017-03-18"; src = fetchFromGitHub { owner = "wildefyr"; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 1d625a67b7b98..3890246a63d6a 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: + 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 @@ -13,7 +13,7 @@ # # https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 -python36Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; version = "9.2.0"; @@ -42,7 +42,7 @@ python36Packages.buildPythonApplication rec { buildInputs = [ libxcb - python36Packages.python + python3Packages.python qt5.full ]; @@ -58,12 +58,12 @@ python36Packages.buildPythonApplication rec { # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; - pythonPath = [ - python36Packages.dbus-python - python36Packages.pyqt5 - python36Packages.pytest-shutil - python36Packages.pyudev - python36Packages.six + pythonPath = with python3Packages; [ + dbus-python + pyqt5 + pytest-shutil + pyudev + six ]; # multibootusb ships zips with various versions of syslinux, we need to patchelf them @@ -95,7 +95,7 @@ python36Packages.buildPythonApplication rec { "''${qtWrapperArgs[@]}" # Then, add the installed scripts/ directory to the python path - --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" # Add some runtime dependencies --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 63dde76fabcc9..9ba9f360402bf 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -33,7 +33,7 @@ , proj , cairo , libxkbcommon -, epoxy +, libepoxy , wrapGAppsHook , at-spi2-core , dbus @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { libpthreadstubs libXdmcp libxkbcommon - epoxy + libepoxy at-spi2-core dbus ]; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 0727f86729107..6527a4f57411b 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "navipowm-0.2.4"; + pname = "navipowm"; + version = "0.2.4"; src = fetchurl { - url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz"; + url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz"; sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; }; @@ -12,10 +13,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/share/${name}/Icons + mkdir -p $out/bin $out/share/navipowm-${version}/Icons cp bin/NaviPOWM $out/bin - cp ../../common/Config/navipowm.ini $out/share/${name} - cp ../../common/Images/* $out/share/${name} + cp ../../common/Config/navipowm.ini $out/share/navipowm-${version} + cp ../../common/Images/* $out/share/navipowm-${version} ''; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix new file mode 100644 index 0000000000000..6807cd9024f58 --- /dev/null +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -0,0 +1,41 @@ +{ python3Packages, lib, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "nerd-font-patcher"; + version = "2.1.0"; + + # The size of the nerd fonts repository is bigger than 2GB, because it + # contains a lot of fonts and the patcher. + # until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed, + # we download the patcher from an alternative repository + src = fetchFromGitHub { + owner = "betaboon"; + repo = "nerd-fonts-patcher"; + rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0"; + sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI="; + }; + + propagatedBuildInputs = with python3Packages; [ fontforge ]; + + format = "other"; + + postPatch = '' + sed -i font-patcher \ + -e 's,__dir__ + "/src,"'$out'/share/${pname},' + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/share/${pname} + install -Dm755 font-patcher $out/bin/${pname} + cp -ra src/glyphs $out/share/${pname} + ''; + + meta = with lib; { + description = "Font patcher to generate Nerd font"; + homepage = "https://nerdfonts.com/"; + license = licenses.mit; + maintainers = with maintainers; [ ck3d ]; + }; +} diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 435bbda24d030..aad182bd18753 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; + mainProgram = "io.github.lainsce.Notejot"; }; } diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 9809a2a62058e..41467e0c58de6 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "0.5.0"; + version = "1.0.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb"; + sha256 = "sha256-8q5cEpQRnevY98PKaTUW10bqRAr5NVG/rU24+nx27rw="; }; postPatch = '' diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 3f82db124229b..24deebce1781f 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.5.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZtlAs7McVQKH626h2iOhjpVaiEHeaqs9ncZ6/KnGibg="; + sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 043ea23e3a730..770227186ff68 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo="; + sha256 = "0xkxyfbj8zljx7k5wbniz3x9jg0l4jnbbjv8hy5y5p4l10m0vpjs"; }; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 85ddbdccef7b7..e8f28479a3bcf 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -2,7 +2,7 @@ , stdenv , lib , fetchFromGitHub -, python38 +, python3 , substituteAll , nix-update-script # To include additional plugins, pass them here as an overlay. @@ -21,7 +21,7 @@ let ); }; - py = python38.override { + py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) ( [ @@ -33,17 +33,15 @@ let (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6") (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") - (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") - (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") # Requires flask<2, cannot mkOverride because tests need to be disabled ( self: super: { flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.1.2"; + version = "1.1.4"; src = oldAttrs.src.override { inherit version; - sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; + sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg"; }; doCheck = false; }); @@ -84,13 +82,18 @@ let self: super: { websocket-client = super.websocket-client.overridePythonAttrs ( oldAttrs: rec { - version = "0.58.0"; + version = "0.59.0"; src = oldAttrs.src.override { - pname = "websocket_client"; inherit version; - sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f"; + sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk"; }; - propagatedBuildInputs = [ self.six ]; + propagatedBuildInputs = with self; [ + six + pysocks + ]; + disabledTests = [ + "testConnect" # requires network access + ]; } ); } @@ -142,13 +145,13 @@ let self: super: { octoprint-firmwarecheck = self.buildPythonPackage rec { pname = "OctoPrint-FirmwareCheck"; - version = "2021.8.11"; + version = "2021.10.11"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FirmwareCheck"; rev = version; - sha256 = "sha256-WzVjHgjF12iJ642AFaFd86GSU90XyPzKhi1CSreynW4="; + sha256 = "0hl0612x0h4pcwsrga5il5x3m04j37cmyzh2dg1kl971cvrw79n2"; }; doCheck = false; }; @@ -159,14 +162,14 @@ let self: super: { octoprint-pisupport = self.buildPythonPackage rec { pname = "OctoPrint-PiSupport"; - version = "2021.8.2"; + version = "2021.10.28"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-PiSupport"; rev = version; - sha256 = "07akx61wadxhs0545pqa9gzjnaz9742bq710f8f4zs5x6sacjzbc"; + sha256 = "01bpvv1sn3113fdpw6b90c2rj8lqay118x609yy64z9ccm93khl9"; }; # requires octoprint itself during tests @@ -179,19 +182,20 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.6.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "sha256-3b3k9h8H9Spf/P3/pXpCANnSGOgbUw/EWISJbrSoPBM="; + sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4="; }; propagatedBuildInputs = with super; [ blinker cachelib click + colorlog emoji feedparser filetype @@ -211,6 +215,7 @@ let octoprint-filecheck octoprint-firmwarecheck octoprint-pisupport + pathvalidate pkginfo pip psutil @@ -252,10 +257,14 @@ let postPatch = let ignoreVersionConstraints = [ + "cachelib" + "colorlog" "emoji" "immutabledict" "sentry-sdk" "watchdog" + "wrapt" + "zeroconf" ]; in '' diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 663a7bf43eae1..c0fb436b7f8a7 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -2,7 +2,8 @@ mkDerivation { - name = "openbrf-unstable-2016-01-09"; + pname = "openbrf"; + version = "unstable-2016-01-09"; src = fetchFromGitHub { owner = "cfcohen"; diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index a3815dae00fc3..d6041554705e2 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation -, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf +, libosmscout, valhalla, libpostal, osrm-backend, protobuf , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost }: @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation - mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 libpostal sqlite marisa kyotocabinet boost protobuf date ]; @@ -52,8 +52,10 @@ mkDerivation rec { mv data/valhalla.json-3.1 data/valhalla.json ''; - # Choose to build the kirigami UI variant - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; + qmakeFlags = [ + "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant + "CONFIG+=disable_mapnik" # Disable the optional mapnik backend + ]; meta = with lib; { description = "Maps server providing tiles, geocoder, and router"; diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 932fa588d2711..12f8935797c83 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -19,9 +19,8 @@ python3.pkgs.buildPythonApplication rec { # /etc/ in check phase. postPatch = '' substituteInPlace Makefile \ - --replace \ - "dbus-run-session" \ - "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \ + --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' ''; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index a8b407dd7b5d4..deb9a98a517c3 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: +{ lib +, stdenv +, fetchurl +, glib +, intltool +, libfm +, libX11 +, pango +, pkg-config +, wrapGAppsHook +, gnome +, withGtk3 ? true +, gtk2 +, gtk3 +}: let libfm' = libfm.override { inherit withGtk3; }; @@ -7,9 +20,11 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.2"; + pname = "pcmanfm"; + version = "1.3.2"; + src = fetchurl { - url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; + url = "mirror://sourceforge/pcmanfm/pcmanfm-${version}.tar.xz"; sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 5657c7f7e1a59..dd7d3f4768ef9 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3"; + sha256 = "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index fac17c978db93..9aed6daa5c313 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.6"; + version = "4.2.7"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-H8vFbQHFTO7blTJyfaEuyVUIljhfFautIrXV73zmBeI="; + sha256 = "sha256-PVG4KZX6KxkrooywgEmqOItyLt5hGs+b/KCaguduGyc="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 97613b21957b2..1a590af94655b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -32,11 +32,24 @@ let url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch"; sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l"; }) + + # xwayland: Allow to retrieve _NET_STARTUP_ID + (fetchpatch { + name = "allow-to-retrieve-net-startup-id.patch"; + url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; + sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; + }) + # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO + (fetchpatch { + name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; + url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch"; + sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak="; + }) ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -44,7 +57,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; + sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index b0fc64a1a5e90..179af6ca87dcd 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,6 +1,7 @@ { lib , autoreconfHook , fetchFromGitHub +, fetchpatch , gettext , ncurses , readline @@ -19,6 +20,31 @@ stdenv.mkDerivation rec { sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/16dba5978146b6d3a540ac7c8f415eda49280847.patch"; + sha256 = "148fm32chvq8x9ayq9cnhgszh10g5v0cv0xph67fa7sp341p09wy"; + }) + + # Fix pending upstream inclusion for build on ncurses-6.3: + # https://github.com/baszoetekouw/pinfo/pull/27 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/fc67ceacd81f0c74fcab85447c23a532ae482827.patch"; + sha256 = "08phmng8vgfqjjazys05acpd5gh110malhw3sx29dg86nsrg2khs"; + }) + + # Fix pending upstream inclusion for build on gcc-11: + # https://github.com/baszoetekouw/pinfo/pull/27 + (fetchpatch { + name = "gcc-11.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa.patch"; + sha256 = "09g8msgan2x48hxcbm7l6j3av6n8i0bsd4g0vf5xd8bxwzynb13m"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index 96627f5cccb55..2f5ba3e6d9cbf 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "pipr"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "ElKowar"; repo = pname; rev = "v${version}"; - sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w"; + sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8="; }; - cargoSha256 = "05ryaxi479fxzdcl51r1xlqbiasfzxcxgvl4wnxync8qi8q2yqk0"; + cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 602ac3e5e3b47..77e5e34899ea8 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: -stdenv.mkDerivation { - name = "posterazor-1.5.1"; +stdenv.mkDerivation rec { + pname = "posterazor"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip"; + url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip"; sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5"; }; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1244347cc53c9..dafc73925b549 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,7 +1,13 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "procmail-3.22"; +stdenv.mkDerivation rec { + pname = "procmail"; + version = "3.22"; + + src = fetchurl { + url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; + sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + }; patches = [ ./CVE-2014-3618.patch @@ -15,20 +21,16 @@ stdenv.mkDerivation { # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' - sed -e "s%^RM.*$%#%" -i Makefile - sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile - sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile + sed -i Makefile \ + -e "s%^RM.*$%#%" \ + -e "s%^BASENAME.*%\BASENAME=$out%" \ + -e "s%^LIBS=.*%LIBS=-lm%" sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h sed -e "3i\ -.PHONY: install -" -i Makefile + .PHONY: install + " -i Makefile ''; - src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; - }; - meta = with lib; { description = "Mail processing and filtering utility"; homepage = "http://www.procmail.org/"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 479e497e3418e..9762927166110 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -6,7 +6,7 @@ let versions = { stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; }; - staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; }; + latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; }; }; override = { version, sha256 }: super: { diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index b243f19418176..7390037204476 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { - name = "ptask-1.0.0"; + pname = "ptask"; + version = "1.0.0"; src = fetchurl { - url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; + url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; }; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index ac79f5be84607..4771666cc20a4 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1iAXLs3O7EV7LfbXnajlDm75tQtanFInfNWZmnittlk="; + sha256 = "sha256-tNTKX++LrWwuVGdmAjvBStNYp4p1ai12JwJmozo1GV0="; }; - cargoSha256 = "sha256-x/qRNxZS++DBq5B9+/9eXN95QZN/FSLi+3XyJ06Y1hg="; + cargoSha256 = "sha256-t1d8K0v7kHPjH78lYCRCa4pyPCvyQT1kaQtVpoROZIE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix new file mode 100644 index 0000000000000..cb4014684fd2a --- /dev/null +++ b/pkgs/applications/misc/q4wine/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, mkDerivation, cmake, sqlite +, qtbase, qtsvg, qttools, wrapQtAppsHook +, icoutils # build and runtime deps. +, wget, fuseiso, wine, sudo, which # runtime deps. +}: + +mkDerivation rec { + pname = "q4wine"; + version = "1.3.13"; + + src = fetchFromGitHub { + owner = "brezerk"; + repo = "q4wine"; + rev = "v${version}"; + sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h"; + }; + + buildInputs = [ + sqlite icoutils qtbase qtsvg qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Add runtime deps. + postInstall = '' + wrapProgram $out/bin/q4wine \ + --prefix PATH : ${lib.makeBinPath [ icoutils wget fuseiso wine which ]} + ''; + + meta = with lib; { + homepage = "https://q4wine.brezblock.org.ua/"; + description = "A Qt GUI for Wine to manage prefixes and applications"; + license = licenses.gpl3; + maintainers = with maintainers; [ rkitover ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 11373756f8d0f..8482f85d927a0 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-ju54JSd3Zyye5YGLPEOkhY93ONh0b7eDSnvJlIawizE="; + sha256 = "sha256-KFoaZ0OAqwJm4tEUaEAGJ+70nHJUbxg0kvhm71mQB6E="; }; - vendorSha256 = "sha256-SE/0a8QUJsWoGwkSiZqYx1eXuOIL3avJujyg8iSdcBU="; + vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; doCheck = false; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 41f3475a645f6..1499cfc40dc8b 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -15,7 +15,7 @@ }: let - curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 6c9e5f6feff83..569ae6ef4cd88 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -1,24 +1,28 @@ { lib, stdenv, fetchFromGitHub, rofi, gnused }: stdenv.mkDerivation rec { - rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; - name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}"; + pname = "rofi-menugen"; + version = "unstable-2015-12-28"; + src = fetchFromGitHub { owner = "octotep"; repo = "menugen"; - inherit rev; + rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; sha256 = "09fk9i6crw772qlc5zld35pcff1jq4jcag0syial2q000fbpjx5m"; }; - patchPhase = '' + + postPatch = '' sed -i -e "s|menugenbase|$out/bin/rofi-menugenbase|" menugen sed -i -e "s|rofi |${rofi}/bin/rofi |" menugen sed -i -e "s|sed |${gnused}/bin/sed |" menugenbase ''; + installPhase = '' mkdir -p $out/bin cp menugen $out/bin/rofi-menugen cp menugenbase $out/bin/rofi-menugenbase ''; + meta = with lib; { description = "Generates menu based applications using rofi"; homepage = "https://github.com/octotep/menugen"; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 215447ed4e9fe..4ddfa6f9cf286 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sbagen-1.4.4"; + pname = "sbagen"; + version = "1.4.4"; src = fetchurl { - url = "https://uazu.net/sbagen/${name}.tgz"; + url = "https://uazu.net/sbagen/sbagen-${version}.tgz"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; }; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 3605e7c416fdb..3809283e62a84 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.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk"; + sha256 = "1lykxkqscvpzb7bvl8kfaf23mjhr2kaaqdg0756xx4z1m0smpkgy"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 0565c8add3b86..e142ec47af990 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "seatd"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "seatd"; rev = version; - sha256 = "0c07i1nq0k60xmcsnr37ryqs7nzbg4qfq6fzbnzwbh1yhr8kypcm"; + sha256 = "sha256-LLRGi3IACqaIHExLhALnUeiPyUnlhAJzsMFE2p+QSp4="; }; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 123e01fe798a6..7ba7d15478a78 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -47,5 +47,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ etu ] ++ teams.pantheon.members; platforms = platforms.linux; + mainProgram = "com.github.alecaddd.sequeler"; }; } diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 355c5915db271..800ea9419cbe3 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "sfm"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "afify"; repo = pname; rev = "v${version}"; - hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig="; + hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index f263c4ee74dd5..124ae206c8ce6 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , cmake , pkg-config , wxGTK @@ -15,7 +17,8 @@ }: stdenv.mkDerivation { - name = "slade-git-3.2.0.2021.05.13"; + pname = "slade"; + version = "unstable-2021-05-13"; src = fetchFromGitHub { owner = "sirjuddington"; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index bf8a9efb9fd0d..94c47c23afef5 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -33,10 +33,6 @@ in mkDerivation { cp sleepyhead/SleepyHead $out/bin ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" - ''; - meta = with lib; { homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 613d2f8e78bf6..5badb7f1b35a3 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/applications/misc/smos/default.nix b/pkgs/applications/misc/smos/default.nix index aa2f53b5a2c79..1039deb43a117 100644 --- a/pkgs/applications/misc/smos/default.nix +++ b/pkgs/applications/misc/smos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A comprehensive self-management system"; - homepage = https://smos.online; + homepage = "https://smos.online"; license = licenses.mit; maintainers = with maintainers; [ norfair ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/applications/misc/smpq/default.nix new file mode 100644 index 0000000000000..fd6b5937b8e5f --- /dev/null +++ b/pkgs/applications/misc/smpq/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, cmake, StormLib }: + +stdenv.mkDerivation rec { + pname = "smpq"; + version = "1.6"; + + src = fetchurl { + url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz"; + sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm"; + }; + + cmakeFlags = [ + "-DWITH_KDE=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ StormLib ]; + + meta = with lib; { + description = "StormLib MPQ archiving utility"; + homepage = "https://launchpad.net/smpq"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ aanderse karolchmist ]; + }; +} diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix new file mode 100644 index 0000000000000..84ad34637f58f --- /dev/null +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -0,0 +1,88 @@ +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups +, gtk3, nss, glib, dbus, nspr, gdk-pixbuf +, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, pango +, gcc-unwrapped, udev +}: + +stdenv.mkDerivation rec { + pname = "snapmaker-luban"; + version = "4.0.3"; + + src = fetchurl { + url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; + sha256 = "13qk7ssfawjaa5p4mnml4ndzzsqs26qpi76hc9qaipi74ss3jih4"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + cairo + cups + gcc-unwrapped + gtk3 + libXdamage + libX11 + libXScrnSaver + libXtst + libxcb + nspr + nss + ]; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups + gdk-pixbuf glib gtk3 libX11 libXcomposite + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango libXScrnSaver udev + ]; + + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,opt,share/pixmaps}/ + mv * $out/opt/ + + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/opt/snapmaker-luban + + wrapProgram $out/opt/snapmaker-luban \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/snapmaker-luban + + ln -s $out/opt/snapmaker-luban $out/bin/snapmaker-luban + ln -s $out/opt/resources/app/app/resources/images/snap-luban-logo-64x64.png $out/share/pixmaps/snapmaker-luban.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "snapmaker-luban"; + icon = "snapmaker-luban"; + desktopName = "Snapmaker Luban"; + genericName = meta.description; + categories = "Office;Printing;"; + }) + ]; + + meta = with lib; { + description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; + homepage = "https://github.com/Snapmaker/Luban"; + license = licenses.gpl3; + maintainers = [ maintainers.simonkampe ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix index a7b9cb591a5e7..451382cda3739 100644 --- a/pkgs/applications/misc/speedread/default.nix +++ b/pkgs/applications/misc/speedread/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "speedread-unstable-2016-09-21"; + pname = "speedread"; + version = "unstable-2016-09-21"; src = fetchFromGitHub { - owner = "pasky"; - repo = "speedread"; - rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd"; + owner = "pasky"; + repo = "speedread"; + rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd"; sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd"; }; diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index d3ecfcbde2b02..2c89d31df35ab 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sqls"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = pname; rev = "v${version}"; - sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az"; + sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ="; }; - vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz"; + vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 03c90af23689e..f9c91d28f14ad 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, curses }: +{ lib, stdenv, fetchFromGitHub, curses }: stdenv.mkDerivation { - name = "stag-1.0"; + pname = "stag"; + version = "1.0"; - src = fetchgit { - url = "https://github.com/seenaburns/stag.git"; + src = fetchFromGitHub { + owner = "seenaburns"; + repo = "stag"; rev = "90e2964959ea8242349250640d24cee3d1966ad6"; sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; }; @@ -15,11 +17,11 @@ stdenv.mkDerivation { make install PREFIX=$out ''; - meta = { + meta = with lib; { homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; - license = lib.licenses.bsdOriginal; - maintainers = [ lib.maintainers.matthiasbeyer ]; - platforms = lib.platforms.unix; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/synergy/build-tests.patch b/pkgs/applications/misc/synergy/build-tests.patch deleted file mode 100644 index ab08195e794d6..0000000000000 --- a/pkgs/applications/misc/synergy/build-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 9c2278dad498b8e4040f30c80cf65b3a089ba218 Mon Sep 17 00:00:00 2001 -From: talyz <kim.lindberger@gmail.com> -Date: Fri, 14 Feb 2020 16:26:36 +0100 -Subject: [PATCH] Build tests again - -The tests were accidentally disabled in -688095d0a7d22704b5c3282bc68b41ceca42ab7e. Since then, the code has -drifted slightly: the synergy lib has been renamed from synergy to -synlib in 4263fd17177d7717b04ac6d6ec62efa2f657ed74 and the curl -dependency was dropped in 491bb2de000245a943b8298462c4a9d8f34c9a44. - -This reenables the tests, targets the right lib and removes the -obsolete test. ---- - src/CMakeLists.txt | 2 + - src/test/integtests/CMakeLists.txt | 2 +- - .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- - src/test/unittests/CMakeLists.txt | 2 +- - 4 files changed, 4 insertions(+), 39 deletions(-) - delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ab63a066..fee080ab 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -22,3 +22,5 @@ add_subdirectory(cmd) - if (SYNERGY_BUILD_LEGACY_GUI) - add_subdirectory(gui) - endif (SYNERGY_BUILD_LEGACY_GUI) -+ -+add_subdirectory(test) -diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt -index f39968a3..096ba3d5 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(integtests ${sources}) - target_link_libraries(integtests -- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) -+ arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS}) -diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp -deleted file mode 100644 -index 95823e9f..00000000 ---- a/src/test/integtests/arch/ArchInternetTests.cpp -+++ /dev/null -@@ -1,37 +0,0 @@ --/* -- * synergy -- mouse and keyboard sharing utility -- * Copyright (C) 2014-2016 Symless Ltd. -- * -- * This package is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * found in the file LICENSE that should have accompanied this file. -- * -- * This package is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see <http://www.gnu.org/licenses/>. -- */ -- --#include "arch/Arch.h" -- --#include "test/global/gtest.h" -- --#define TEST_URL "https://symless.com/tests/?testString" --//#define TEST_URL "http://localhost/synergy/tests/?testString" -- --TEST(ArchInternetTests, get) --{ -- ARCH_INTERNET internet; -- String result = internet.get(TEST_URL); -- ASSERT_EQ("Hello world!", result); --} -- --TEST(ArchInternetTests, urlEncode) --{ -- ARCH_INTERNET internet; -- String result = internet.urlEncode("hello=+&world"); -- ASSERT_EQ("hello%3D%2B%26world", result); --} -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 54131eb2..46307e90 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(unittests ${sources}) - target_link_libraries(unittests -- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) -+ arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) --- -2.25.0 - diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 8d3cc8c309663..803456dc85f0c 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,41 +1,90 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, openssl, qttools -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat -, withGUI ? true, wrapQtAppsHook }: +{ withGUI ? true +, stdenv +, lib +, fetchpatch +, fetchFromGitHub +, wrapQtAppsHook + +, cmake +, openssl +, pcre +, util-linux +, libselinux +, libsepol +, pkg-config +, gdk-pixbuf +, libnotify +, qttools +, xlibsWrapper +, libX11 +, libXi +, libXtst +, libXrandr +, xinput +, avahi-compat + +# macOS / darwin +, ApplicationServices +, Carbon +, Cocoa +, CoreServices +, ScreenSaver +}: stdenv.mkDerivation rec { pname = "synergy"; - version = "1.13.1.41"; + version = "1.14.1.32"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; rev = "${version}-stable"; fetchSubmodules = true; - sha256 = "1phg0szc9g018zxs5wbys4drzq1cdhyzajfg45l6a3fmi6qdi1kw"; + sha256 = "123p75rm22vb3prw1igh0yii2y4bvv7r18iykfvmnr41hh4w7z2p"; }; - patches = lib.optional stdenv.isDarwin ./macos_build_fix.patch; + patches = [ ./macos_build_fix.patch ]; postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' ''; - cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + cmakeFlags = lib.optionals (!withGUI) [ + "-DSYNERGY_BUILD_LEGACY_GUI=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.09" + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; - nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; dontWrapQtApps = true; buildInputs = [ openssl + pcre ] ++ lib.optionals withGUI [ qttools ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices + Carbon + Cocoa + CoreServices + ScreenSaver ] ++ lib.optionals stdenv.isLinux [ - xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + util-linux + libselinux + libsepol + xlibsWrapper + libX11 + libXi + libXtst + libXrandr + xinput + avahi-compat + gdk-pixbuf + libnotify ]; installPhase = '' @@ -60,7 +109,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; - homepage = "https://synergy-project.org/"; + homepage = "https://symless.com/synergy"; license = licenses.gpl2; maintainers = with maintainers; [ talyz ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/synergy/macos_build_fix.patch b/pkgs/applications/misc/synergy/macos_build_fix.patch index 50087a2c4b4b1..c304f3bfdd443 100644 --- a/pkgs/applications/misc/synergy/macos_build_fix.patch +++ b/pkgs/applications/misc/synergy/macos_build_fix.patch @@ -1,20 +1,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e78d1d..13639ba1 100644 +index 50e712fa..d39c2ce4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -328,14 +328,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - ${OPENSSL_ROOT}/lib/libssl.lib - ${OPENSSL_ROOT}/lib/libcrypto.lib - ) --elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- set (OPENSSL_ROOT /usr/local/opt/openssl) -- include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) -- set (OPENSSL_LIBS -- ${OPENSSL_ROOT}/lib/libssl.a -- ${OPENSSL_ROOT}/lib/libcrypto.a -- ) --elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly") -+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin|.*BSD|DragonFly") - set (OPENSSL_LIBS ssl crypto) - else() - message (FATAL_ERROR "Couldn't find OpenSSL") +@@ -326,9 +326,6 @@ endif() + # Apple has to use static libraries because + # "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged." + # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html +-if(APPLE) +- set(OPENSSL_USE_STATIC_LIBS TRUE) +-endif() + find_package(OpenSSL REQUIRED) + + # +diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm +index 0c98afc1..38c190a6 100644 +--- a/src/gui/src/OSXHelpers.mm ++++ b/src/gui/src/OSXHelpers.mm +@@ -20,10 +20,6 @@ + #import <Foundation/Foundation.h> + #import <CoreData/CoreData.h> + #import <Cocoa/Cocoa.h> +-#import <UserNotifications/UNNotification.h> +-#import <UserNotifications/UNUserNotificationCenter.h> +-#import <UserNotifications/UNNotificationContent.h> +-#import <UserNotifications/UNNotificationTrigger.h> + + #import <QtGlobal> + diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index d24a7d3e0d13f..5250581762b08 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56"; }; + # Pull pending upstream inclusion for ncurses-6.3: + # https://github.com/lharding/tasknc/pull/57 + patches = [ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/lharding/tasknc/commit/f74ea0641e9bf287acf22fac9f6eeea571b01800.patch"; + sha256 = "18a90zj85sw2zfnfcv055nvi0lx3h8lcgsyabdfk94ksn78pygrv"; + }) + ]; + nativeBuildInputs = [ makeWrapper perl # For generating the man pages with pod2man diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix new file mode 100644 index 0000000000000..42f4d36eea5d5 --- /dev/null +++ b/pkgs/applications/misc/thedesk/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "thedesk"; + version = "22.3.1"; + + src = fetchurl { + url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; + sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + substituteInPlace $out/share/applications/thedesk.desktop \ + --replace '/opt/TheDesk' $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/thedesk \ + --add-flags $out/opt/TheDesk/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "Mastodon/Misskey Client for PC"; + homepage = "https://thedesk.top"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 752ab35461ea7..14f03cdc8cef1 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r"; - checkPhase = "cargo test --features=integration_tests"; + checkFeatures = [ "integration_tests" ]; meta = with lib; { description = "Human-readable diff for todo.txt files"; diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index 708596d407475..b390c7bf9d142 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation rec { pname = "tty-solitaire"; @@ -11,9 +11,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0="; }; - buildInputs = [ ncurses ]; + patches = [ + # Patch pending upstream inclusion to support ncurses-6.3: + # https://github.com/mpereira/tty-solitaire/pull/61 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/mpereira/tty-solitaire/commit/4d066c564d086ce272b78cb8f80717a7fb83c261.patch"; + sha256 = "sha256-E1XVG0be6JH3K1y7UPap93s8xk8Nk0dKLdKHcJ7mA8E="; + }) + ]; + + postPatch = '' + sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile + ''; - patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; + buildInputs = [ ncurses ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index b7974966be45c..d4b4d1d9d8035 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,7 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: mkDerivation { - name = "twmn-git-2018-10-01"; + pname = "twmn"; + version = "unstable-2018-10-01"; src = fetchFromGitHub { owner = "sboli"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index d2df076dc23d5..63a8b485df533 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { distutils_extra intltool wrapGAppsHook + gdk-pixbuf ]; buildInputs = [ @@ -58,6 +59,7 @@ python3Packages.buildPythonApplication rec { pyinotify python-Levenshtein pyxdg + pycairo requests websocket-client ]; @@ -105,7 +107,10 @@ python3Packages.buildPythonApplication rec { # do not double wrap dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wmctrl ]}" + ) ''; passthru = { diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index b1b92ebe2d3fe..6c1f035dfef66 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -9,6 +9,7 @@ , openpyxl , xlrd , h5py +, odfpy , psycopg2 , pyshp , fonttools @@ -24,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.6.1"; + version = "2.7.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33"; + sha256 = "13s1541n1sr2rkfk1qpsm61y2q773x6fs4cwin660qq4bzmgymhy"; }; propagatedBuildInputs = [ @@ -60,6 +61,7 @@ buildPythonApplication rec { tabulate wcwidth zstandard + odfpy setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; @@ -88,7 +90,7 @@ buildPythonApplication rec { meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ raskin markus1189 ]; homepage = "http://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index a38c1002a01f5..38ea7c909c051 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -10,7 +10,6 @@ , gtkmm3 , libsigcxx , jsoncpp -, fmt , scdoc , spdlog , gtk-layer-shell @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { strictDeps = false; buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] + [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index cb4f5ec34425f..45e7cf3d8f1ba 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -1,16 +1,23 @@ { lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { - name = "wmname-0.1"; + pname = "wmname"; + version = "0.1"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/wmname-${version}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; + postPatch = '' + substituteInPlace Makefile --replace "@strip" "#@strip" + ''; + buildInputs = [ libX11 ]; - preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = { description = "Prints or set the window manager name property of the root window"; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index db7fe260b924d..d57eb48781733 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: -stdenv.mkDerivation { - name = "xcruiser-0.30"; +stdenv.mkDerivation rec { + pname = "xcruiser"; + version = "0.30"; src = fetchurl { - url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz"; - sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; - }; + url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${version}/xcruiser-${version}.tar.gz"; + sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; + }; nativeBuildInputs = [ gccmakedep imake ]; buildInputs = [ libXt libXaw libXpm libXext ]; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 17e58cb54d713..d59b936608c84 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { - name = "xfe-1.42"; + pname = "xfe"; + version = "1.42"; src = fetchurl { - url = "mirror://sourceforge/xfe/${name}.tar.gz"; + url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz"; sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "MS-Explorer like file manager for X"; longDescription = '' X File Explorer (Xfe) is an MS-Explorer like file manager for X. @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "https://sourceforge.net/projects/xfe/"; - license = lib.licenses.gpl2; - maintainers = []; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 365f6217861b8..d056dd66e8da8 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,17 +2,20 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: +{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: + stdenv.mkDerivation rec { - name = "xfontsel-1.0.6"; + pname = "xfontsel"; + version = "1.0.6"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [libX11 libXaw]; + + buildInputs = [ libX11 libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; @@ -26,11 +29,11 @@ stdenv.mkDerivation rec { --set XAPPLRESDIR $out/share/X11/app-defaults ''; - meta = { + meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index e57fb75c11f12..eb5ebf3a7177d 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -51,11 +51,6 @@ stdenv.mkDerivation rec { install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; - # wrapQtAppsHook broken on macOS (https://github.com/NixOS/nixpkgs/issues/102044) - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/bin/xpdf - ''; - meta = with lib; { homepage = "https://www.xpdfreader.com"; description = "Viewer for Portable Document Format (PDF) files"; diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 065ca813155d8..61c696f1309e5 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl }: stdenv.mkDerivation { - name = "libxpdf-3.02pl5"; + pname = "libxpdf"; + version = "3.02pl5"; src = fetchurl { url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz"; diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index e8e6490cbd64b..22ad3d789ac97 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, libX11}: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { - name = "xrq-unstable-2016-01-15"; + pname = "xrq"; + version = "unstable-2016-01-15"; src = fetchFromGitHub { owner = "arianon"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index b579579195f68..d6514e58517e3 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config +{ lib +, stdenv +, fetchurl +, libX11 +, libXt +, libXext +, libXpm +, imake +, gccmakedep +, svgSupport ? false +, librsvg +, glib +, gdk-pixbuf +, pkg-config }: -assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; - stdenv.mkDerivation rec { - name = "xxkb-1.11.1"; + pname = "xxkb"; + version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/xxkb/${name}-src.tar.gz"; + url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ - libX11 libXt libXext libXpm + libX11 + libXt + libXext + libXpm ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; @@ -33,11 +47,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = { + meta = with lib; { description = "A keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; - license = lib.licenses.artistic2; - maintainers = with lib.maintainers; [ rasendubi ]; - platforms = lib.platforms.linux; + license = licenses.artistic2; + maintainers = with maintainers; [ rasendubi ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 93e8f1fc9d75c..d031f63a097a1 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -2,16 +2,33 @@ let perlDeps = with perlPackages; [ - Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon - XMLLibXML XMLSAXBase XMLParser XMLRSS + Glib + Gtk2 + Gnome2 + Pango + Cairo + Gnome2Canvas + Gnome2VFS + Gtk2GladeXML + Gtk2TrayIcon + XMLLibXML + XMLSAXBase + XMLParser + XMLRSS HTMLParser - DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + DateTime + DateTimeFormatMail + DateTimeFormatW3CDTF + DateTimeLocale + DateTimeTimeZone ParamsValidate - ModuleImplementation ModuleRuntime + ModuleImplementation + ModuleRuntime TryTiny ClassSingleton URI - AnyEvent AnyEventHTTP + AnyEvent + AnyEventHTTP commonsense FileSlurp JSON @@ -24,7 +41,7 @@ let ]; in stdenv.mkDerivation { - version = "git-2017-12-01"; + version = "unstable-2017-12-01"; pname = "yarssr"; src = fetchFromGitHub { @@ -35,7 +52,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [gnome2.libglade]; + buildInputs = perlDeps ++ [ gnome2.libglade ]; propagatedBuildInputs = libs ++ perlDeps; installPhase = '' diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 26b925d51a833..65aca548e4c38 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.0.1"; + version = "2.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-vnkZGxuLvj8Pjmey6NO3mcHuWbtO0bYEfgKwvgumbPA="; + sha256 = "sha256-AUGfD7FFB5+pfKyIqvychD4mvFU+GTRneQTRI+8bwBM="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 18de4811af79c..a60f9da39bc61 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -42,6 +42,7 @@ , zlib , xdg-utils , wrapGAppsHook +, commandLineArgs ? "" }: let @@ -92,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.31.87"; + version = "1.31.91"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "lfkTB8oXxZqgbO7d8cdktSd6ivQc3g5kiAYZKyrrLpw="; + sha256 = "LuzflA96UQehLHUVYdPDTXs+YuFLEkpzTdO2liGrWtE="; }; dontConfigure = true; @@ -158,6 +159,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + # Add command line args to wrapGApp. + gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs}) + ''; + installCheckPhase = '' # Bypass upstream wrapper which suppresses errors $out/opt/brave.com/brave/brave --version diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e88c1fa1b94a1..7edec1f5a6250 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,7 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl -, epoxy +, libepoxy # postPatch: , glibc # gconv + locale @@ -150,8 +150,7 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optionals (chromiumVersionAtLeast "96") [ - epoxy + libepoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] @@ -183,7 +182,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno + chmod -x third_party/webgpu-cts/src/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 \ diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 72d6df055b387..f13bda6f5075a 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -5,6 +5,7 @@ via upstream-info.json.""" # Usage: ./update.py [--commit] +import base64 import csv import json import re @@ -48,9 +49,10 @@ def nix_prefetch_git(url, rev): def get_file_revision(revision, file_path): """Fetches the requested Git revision of the given Chromium file.""" - url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + url = f'https://chromium.googlesource.com/chromium/src/+/refs/tags/{revision}/{file_path}?format=TEXT' with urlopen(url) as http_response: - return http_response.read() + resp = http_response.read() + return base64.b64decode(resp) def get_matching_chromedriver(version): diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index acc11144def90..4e7149ec1ee5f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,62 +1,62 @@ { "stable": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } }, "chromedriver": { - "version": "95.0.4638.54", - "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk", - "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l" + "version": "96.0.4664.35", + "sha256_linux": "0iq129a4mj4sjs08s68n82wd8563sw8196xda27wk3pfpprr23db", + "sha256_darwin": "1prc7zbgnljqz2d89clpk5c0y48r79zmb9in4vinf3j6p2rxn0vy" } }, "beta": { - "version": "96.0.4664.27", - "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6", - "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "0nsaf46a9pl8cxw5v2zsfp2ynja4m55qi1m4mhwhmyr50138655f", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, "dev": { - "version": "97.0.4682.3", - "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4", - "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a", + "version": "98.0.4710.4", + "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", + "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", "deps": { "gn": { - "version": "2021-10-08", + "version": "2021-11-16", "url": "https://gn.googlesource.com/gn", - "rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148", - "sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff" + "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", + "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" } } }, "ungoogled-chromium": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" }, "ungoogled-patches": { - "rev": "95.0.4638.69-1", - "sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" + "rev": "96.0.4664.45-1", + "sha256": "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3" } } } diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 1fea44e66279f..7ff3b843bc221 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; + mainProgram = "com.github.cassidyjames.ephemeral"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b0c77819c077d..29a506dd1b03f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -25,7 +25,9 @@ , libXi , libXinerama , libXrender +, libXrandr , libXt +, libXtst , libcanberra , libnotify , adwaita-icon-theme @@ -123,7 +125,9 @@ stdenv.mkDerivation { libXi libXinerama libXrender + libXrandr libXt + libXtst libcanberra libnotify libGLU libGL diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8d91260b6bb06..5c065c4bde293 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 = "93.0"; + version = "94.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ach/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ach/firefox-94.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "8be7f497a9bd28eedb3b30c4c5437242cbd599df3fa5e7a6a2912acadc126707"; + sha256 = "bd5c9faa119d8e16b24840ad5843b7a4c64f664ea29c1512a41756d19d2cb65e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/af/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/af/firefox-94.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "aaab5d767d832e883a5ca2ad0a81b128c0fbebe141238835064210b27e47db6b"; + sha256 = "9ed0fff3ccfef43b467e295daf21c776ab9419b00a0524de75d0f3b985baef5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/an/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/an/firefox-94.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8340801d581d55a249b94378c69061466aa6e6181d64790d5bda43d2b3631a27"; + sha256 = "989a16767a92a91ba100af7f4fc97e1cb26ab718adbd5f0a14bebf9c0cba0495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ar/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ar/firefox-94.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "03e0cd262aad9e49b10f6626ec2c96f1646a51d1e461998be5d5487a40709626"; + sha256 = "8937403e15eac062bee7b189acb52c87e33b6177eb5e8e0f9dfd9167fd5b01cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ast/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ast/firefox-94.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "062e4bdc3144b19b5f85ded44078ef64e988bc4c9658ac189771b3411b3e0145"; + sha256 = "18a4051fbc0fdde0faeaee72951e2994a50a6f041d180075c4f38ee4b7f9fd3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/az/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/az/firefox-94.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "175fb26412691b06d82f0175bdb51bf5635ff16564df93cdd4c332d6614fbcb9"; + sha256 = "bdcddebdf3e5619a916b23da26cb22dc7afb0d25304c17c167fbec030de5ca5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/be/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/be/firefox-94.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9841d99dd7407397388384d37a1b4d11027344e1710073ad3425163144445341"; + sha256 = "d0aab54e67d2782c06f1e8f5aa8b4cca8ac65c0bc146885b78449e16656fc6a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bg/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/bg/firefox-94.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2932865a731d33c3447aa17d545185faff6fb8db32502236537301ec7eb3d54f"; + sha256 = "d952c92e179ae599da578a92fd0495ccff3b82b2eba7f2613e91aa6695a87830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/bn/firefox-94.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b9d7a1d69e0bf88fcdb24038f410289187a3de5047fa28925513a5f6ac47ae46"; + sha256 = "e5934d418976a77fa926c06fb0482ba108ba91cef9019bcb0771b2d4c7101dbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/br/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/br/firefox-94.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ef5b6a548c200cd0e519c67a6542624a6b085ed20ca78e162b0dfb5b9d921a0a"; + sha256 = "a5a15f3bf0157f21617fca0e3b58e02916d8665fd082e028617911cffb8f03b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/bs/firefox-94.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "4a8e64d088509a8df5b95eea4c39267a884bb2906a71ac39056214dfc10a62c2"; + sha256 = "f9c06ab4e3c56475e0bedfa31ee1e2b6a7743251b42381d8d9330dee6e2bb4ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ca-valencia/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ca-valencia/firefox-94.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ad7401e804d5cfe80d4bea0da8c324f70d3304dee96ea9d6c7d7257c67bfca9f"; + sha256 = "d5e8779f846f0f533d895d66e4ac98f5eb38e1054f448ff7dae855270bfb3bec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ca/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ca/firefox-94.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ab9d9d2cdb33f3f6b490f463021e9afe12e930bbe227e4e26122c45522995c8c"; + sha256 = "e8d95aff6b9f383429a24b246e59b5b4abaf2d5074163b8df829296296dd2c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cak/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/cak/firefox-94.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "698e4d066469ffedd1f915d93fac4358c4f614695966937858e950b9fc455bfb"; + sha256 = "997d6162c891115d36fb3612115b00e37e1976de838a5f25a0c829361e7006fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/cs/firefox-94.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e6525afccdc478dc4db4cb23c30d18cfa2911c1f93bb85efd41b1647f9dbb85b"; + sha256 = "9224d79a6f918018baba8e8767d1d28ef2a5f85051b1dc23e09803b4d345b8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cy/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/cy/firefox-94.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dd3bf768de4120595e2264f4c8155c7037b5d220dc1cd6120c9821125f272046"; + sha256 = "4afebf3248ad98b19f2eb8e743672ff28aa40e305735a8c68b99af967fc45d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/da/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/da/firefox-94.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6b36bdd340f100ee627c34e0b959d11aa19afe15dc4d5b68fb594cd58bf3db23"; + sha256 = "d834b34eec2432f704a6ff4e122b08c157a5fc9f856e0f3983ae220ba1edffc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/de/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/de/firefox-94.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "befb39ec9a21c8ab30fbe81a3aad56bdc3734c3df5f511d5b088b79edbd179b7"; + sha256 = "73312ba296f0efc2178dc0bf8d90f6fd7723d6c1cd53372ffc058a4d6f565cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/dsb/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/dsb/firefox-94.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "1b922369255e48ef6decc6914df53d8461e5fa6139741ff6946e5f68d797aad9"; + sha256 = "af604fde6da04d8a6afc044dcbfb354d8e45415afaf7964244d5190e0d79aa45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/el/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/el/firefox-94.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ba9ddc9bdb8b7b5f1535dfcc8d6ae2062158689d57aae089a854b486e24f2b67"; + sha256 = "6a8b3aa0c49c2b0a101fc9045842b55846bbaab4b9504e54dfc0831b70008e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-CA/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/en-CA/firefox-94.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "910529d6c94fadc481238b015a35a4b6aab9f532aa4fac3b815413e02ba09f5e"; + sha256 = "8ce4c830b1c6ff8de5c7a594a55919fb1d8a6f24b8ae963aad10fc4e65b29f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-GB/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/en-GB/firefox-94.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "be7b43f5e801e3528c5e9eb732d281c36166265a1bcb84c168b017ec8cc01dd3"; + sha256 = "f6ffd778e7587e537d4376102de619ed70b5689a854a1f89e8e46b09d8f2a4c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-US/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/en-US/firefox-94.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9d06897b80d77cfb59e1c8bd4dfc427590b058616ae634e52cfe272af06f9b32"; + sha256 = "975ac4e4cccd91b10d997ecbc183b557e45a1cd54fb488aaf85a45b06dfbaa9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/eo/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/eo/firefox-94.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "83e76766de41b81936b5a2d5bdb3b61a654adfcd3ee7226cc58418a1b4257e4e"; + sha256 = "89b36aa02a95263d7e1b271c27f73672a5c4631abb9023bf3bfe4dd85aa3051b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-AR/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/es-AR/firefox-94.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f7fefb869a19511065025d1b0e0ed1d84ffdc402dbb07c4c35673bb9209403a"; + sha256 = "e011a0f14585115e93f9f68e03246b4d5f2e7874729596f917227fff0b7fe6a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-CL/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/es-CL/firefox-94.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "62531f511e3d79a2a4d80c6a09ce120ecc62662fc5e277f8ba7f73488fd870f3"; + sha256 = "6f7e829c67feaecbebefe3144f21b939eff22afcfd33e97de6371c471426996d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-ES/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/es-ES/firefox-94.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f3f3869780b3344746f8cf1e59dda3f44f56e5b9a97bab7bdc4cc58ba5d8b4a7"; + sha256 = "2e48ff3b6b839fdf88026e2cf27182a6e6256242f994aad3e4c8ef3203c8659a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-MX/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/es-MX/firefox-94.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "55dfe3202f289bf5ab4b8fa59e3ef7824ca921c436b6c872f2fa6eab8b95dfd3"; + sha256 = "399004ccf9cea84f614cb55460dc988e148a7b2d0913278cd7be0c7eee898bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/et/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/et/firefox-94.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b6ed0570c1644a00f058453b82b48953adc9e500179f51ad769a796eb7417f75"; + sha256 = "4c790bf5a4b87a3bd8efa975f768e99e05f726e915d936d296f381f0051c38c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/eu/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/eu/firefox-94.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "070ef21ffeb8c339c49346017626a0c6112ca2c63e2a2880c3b22b858c9322ff"; + sha256 = "fb96089adc354dad4dcdf43b8c65609add8022285470df4edd9bfa814e761f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fa/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/fa/firefox-94.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9dc071ecb81ba221ece8131ff54d27e94585243322a39d817ae663a35af4cc4d"; + sha256 = "1a13b4dc79d4ccd0aef20f0d3d29d42ee835e9bb4d2d90521c7a92cb327c96de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ff/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ff/firefox-94.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7d1aa96cfe5c39059ebf682216083a2d5505f9ae97290f6dffb9b15912c5b6ac"; + sha256 = "93f4bd4fdb7dde118f06247bda2d3fb72b1f072bb996d8a52e9e01abe4f248a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fi/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/fi/firefox-94.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3f050f0205134d52aa3e7fd08e1e78ccf2f987aed286dc20c9d5d8422e8dffd1"; + sha256 = "fe2b5cbb25010d7624b1fa799dc2820df057d2419f9ddd07e660cb5e32143ce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/fr/firefox-94.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "bc7aef8139c8e20c3ee69e027d93300b30320c24fbf9b651c14743b88d243f66"; + sha256 = "f916b9d0e1fb6b28248a443cb4ae31c3350eca1f6a7b7a794758792417e91105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fy-NL/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/fy-NL/firefox-94.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4236fc93d2d661e29f1b82157b179bc91a92543df8b623264c5e05b5d03747a4"; + sha256 = "f998b9475930a6517836b260e43b0a8e37424e223d1eb213755a0efb46aafa38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ga-IE/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ga-IE/firefox-94.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ef874f0887ff4724e141608aeed56a2f78a40f3a0f620e3bdd35e0247bb21194"; + sha256 = "0ff51d3fbe979bce2335d0e250f21ba2d2618ad09c999e0be929053548b30d3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gd/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/gd/firefox-94.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bb0d22e04c024a86bddba9cc527db275199a04dd2576c170f78f98c68ffe4077"; + sha256 = "31a34aacf048ca6dfd5c96fdf6b618532d368de0afe38835541cc8cdeefae9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/gl/firefox-94.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ab958633a2f6b691b950c18147c04426fe5cdb23592e142dcf15dcd5ce86bc5c"; + sha256 = "7dfee546ae528bd7888131efbb5797b0e2f7bf84764843ee88eb53a7c4b9cd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/gn/firefox-94.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1ec4293dd2658d598dee23fb04ecfb6674ccb19ae5b93fb60e94c3ac018056fb"; + sha256 = "ccd7986942c61b254d25b09db75729b82db5d7324f0be5f997bfcd8c96f2325b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gu-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/gu-IN/firefox-94.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "eaa2792ff2a4ff29ee5301e3827c758f5e93159d4212988c8a3e3bb19a609064"; + sha256 = "c93484e19a7134494c1f5473deead034dc6d6bae163f8103b063949bdb119703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/he/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/he/firefox-94.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "03ef507e5047f3f84cd4b41a1fbfe00ba72833d0f6fe2503cf0156504031228a"; + sha256 = "297ef303e6cb27bfdab73512b2a184fa2e3ac575ae99852244a29365370fb042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hi-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/hi-IN/firefox-94.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9ff924a878b7e8e69868ca33de7ac10d66a4590d022fb2255527928d905a891a"; + sha256 = "a41625cc6fda655aa420602f2eecd8e88177c088ade770ee80b9dc34d2802b9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/hr/firefox-94.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ef61afbedff8dac01c600620e82756c5bc04782d717dff13bc6f59ccc06c8ab0"; + sha256 = "dfedafaad51d27e1fb7f24a02b3149805073f37fc20f89e903ce9301b656b9d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hsb/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/hsb/firefox-94.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "57ed98a1bce575fc67cd290457072e0142183b9d8713d20a58574453fb3d7707"; + sha256 = "15acfff1d07bcd0201f4407cdd3c51d17ede6e3fada977b496acfdc924fa6606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hu/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/hu/firefox-94.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d565f5881e15197d70bfdca1d3df7eef4afd505f7fb2e71bd9bcf5495ba33007"; + sha256 = "dabc87d3fad5633b460eda4b7d4f751a33af6ded74bb9a1f992fa93d022ecdb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hy-AM/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/hy-AM/firefox-94.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ee430651716013ad37fdeb0549d96aaa1ef254888653b686ba9576844976bc36"; + sha256 = "5aea20d14846d87c9249e28520b44c9693f8d5a69b1e9490d817d50c7d2e0381"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ia/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ia/firefox-94.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d85cea5e56cff08f185084144374c782a0edbc8396a2ab7ad9e373e6d6441cab"; + sha256 = "ec4972e7494a0755e2fd3bf8d697fc5f6b6069b34dd083abdc93f625db24cac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/id/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/id/firefox-94.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f9b95eafb8f064dc9ac02693befca85b90567b6635446a20f81bd3391fd64847"; + sha256 = "3621afd47043f87741f2cf6c70fc4c749b134bbd3284f42b7cf220f500111d4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/is/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/is/firefox-94.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d1d68fe93ef3de2424f3ca4d59d339e3add6c21ae63163fa86f0f6c7751893f6"; + sha256 = "0fdbbb65a5ccb04113b39e1257079543ed0a0a044104321b568b4c7079a0c126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/it/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/it/firefox-94.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9bf7961653ac654daf8f019ee03b242bd73667e302f9910ab1a7b64aef4b7995"; + sha256 = "eb68a8b1167f964d3538c86d1276137ca3cdd6ccfd6cf66bee4286ea052d8f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ja/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ja/firefox-94.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7ed411b87cbb261094c6b7cfa34d5cbfa28f0800644b10957429e0499f03b95b"; + sha256 = "772943d646877a7845b23d05c940b4f41c7399cd81068b26793066065dd9bf9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ka/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ka/firefox-94.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b5e92b09a9348033abfbf9e55049c7d188821aa2e3ed973cf207130cb1f47abe"; + sha256 = "e410b7999f0f59dc58a777a9e3c4b5439b45ed2dd7d8bbff7060b5bbd380d12a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kab/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/kab/firefox-94.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "71368bdaa2cae9a585b1bc7e6539d5f6ba97ae87a39c8a5910077d28bb0c80fb"; + sha256 = "764c473c7abea8cdd91b88eea4bc294dd682196ecd8672e613ba4f6b50077c7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/kk/firefox-94.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e91bb39de263c5a41c54c50c11d82ce9a28ccaa4df95594657b92e2584210072"; + sha256 = "4d2ae9dbeec20d34648e4799d11b257a4897f1a9d37de04ffd59f7a0ad79d15b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/km/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/km/firefox-94.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "21aaa236b79db29eeacb9c3b4509be78bf65f5584dbf8ee7c6803bc8ce89d201"; + sha256 = "eb60a5083d30d3f98b063213da4d51e1dedfd71d6a2b5b6cdff02baedd4985c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/kn/firefox-94.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d661f1b28960791bc2e15cf6f831fb88c69c691e81bc56b61bb6bb47f4540851"; + sha256 = "8e43fabef02e33500552429f71d548db1b6c5a9d63095b53a76b7f15418accd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ko/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ko/firefox-94.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "72b75385aac30b8e659a919710412bd532103f34498bbd921e698d8d41354f31"; + sha256 = "932edd7633e23ed5318491dae495f210707f6eaac3d253263e615f3092a856cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lij/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/lij/firefox-94.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9bc73f6865faf264bc411dddb362aee6b54d4d6b14abb25e088032148027f7ae"; + sha256 = "b9326e61ae16f33bc200fe3712acc5e069df4c5575b38c48d765bf64c078c22b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lt/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/lt/firefox-94.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2499f42c4da599e2b006fe92ae921b6e3fd85af8b94c895875c242e45cfd6987"; + sha256 = "2d857aa44cc17532d6f8691c78a1a6511e87016ef95eac2a5e184dc70987ed65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lv/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/lv/firefox-94.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b413029366708222b35286b872efe6b1fcd27f092e9d5b01fa1a6ff9d48e62ad"; + sha256 = "595887befdf74b3ef4d37b7881661341a199e85d71cddfbbb62406015a60b585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/mk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/mk/firefox-94.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1f87c65a87cb5a876dd8a3749ea47c1ca5d7446bbca72de1ed64d92f77f7bc74"; + sha256 = "5408c46f1a23321b34c8a78a3af4afcc2b3bccbfd7f2188db9ae1f5db391de13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/mr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/mr/firefox-94.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8fa074c47ffff06f7bd596d3ce3e6e2281c7e924582f285aead35d37f71b18e1"; + sha256 = "85ac81aa121f611a12ee09f3c07c487e6c4af5a31999db7891ad388075a8239d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ms/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ms/firefox-94.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "674e877cd4a2e1d0844dcad823c26a50032565239f0ac07c5dd073b919beff80"; + sha256 = "95b98338001c1f4d6c0e2fa22750bf4216c754a64a7a11b063e172efa1f0c163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/my/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/my/firefox-94.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8a65cdc5a9c7455c6def1e68fab652c2c5a1d943c4e7af6a83502de5f1d5738f"; + sha256 = "dded4e09e56fdf55afefaef54e7d7b4451f3590e1c3bb4768635abce02b10891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nb-NO/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/nb-NO/firefox-94.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9c6771132a3fee58115cee692564f43464d3ce745da721d3c61519d845592304"; + sha256 = "ef6b6fd0c21c4563267551d5ee9ad805023fe12552fac44199c7a2bbe3ec81f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ne-NP/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ne-NP/firefox-94.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "110e30dc86f3996b9a3c474be5f170510383ad137a71257a5cd27ed25432ecfb"; + sha256 = "7dad25866efe784ea6b5cd244cbbd9890ddd813f386ef1a5e98530cfdbc64a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/nl/firefox-94.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4e753199be0e8b2b927fd2bef35bfbdcb2aa47fee5a178ff34f4348849f058f1"; + sha256 = "4518d9c4d6645285e4b337acda7b0bdee7733cae60c8515d8923cc85c470c596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nn-NO/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/nn-NO/firefox-94.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "7f9351e18fd74c472151bc8c9ed9181542308a15820b9aec503981de97b851b2"; + sha256 = "6df50c1c01a9bf0c43a36277d6d17213c3d5a3a273b2a6257aaa5168f727e02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/oc/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/oc/firefox-94.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0eaefd72fef1d1d86bc0250052d80993456754be8b2818ecaf5a34d4064c4ab3"; + sha256 = "3d253d2280607b5f4ce252cd730cfd282703c3a8ec90a1efd70084349bb14dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pa-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/pa-IN/firefox-94.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d82d82b827225d9764c127b0fbddbddc9fb46ff4c85a9da7d132ce54a2ef98c6"; + sha256 = "564892d7c26d757b85754f06a8481152d24a86dc32c64d63d32de0a2e7d2ccfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/pl/firefox-94.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1bafb0bff6e280a6595b82dcfd99bd2dde5bde5d5bf0993f828e1658afcf0e98"; + sha256 = "8201d195237c9902494627c95116f9e19f08224eacd1037e69b370d2ad6ec046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pt-BR/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/pt-BR/firefox-94.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ebb2bdc70f03a6aaddd3ac1e47f716f880198f3a7c5040a4a592c88a90dd7ff4"; + sha256 = "ecc6009cc5d29c4e9ab7374fa5d36faae08eda78993a7fe81816a1ed6f2da654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pt-PT/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/pt-PT/firefox-94.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c082c36c403b685e089b1a90ace81dc4fc2d612f4d82d65fd178e61fafb265ab"; + sha256 = "1810fe3d1660f8e8d28c667aa6bf6b0430aeb0d0a1008fca4658a04c33951bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/rm/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/rm/firefox-94.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b42d24bbdfb7016c71c262058af2fb9fec38fe6a9dbf47f6a3c04cd2e9d9279d"; + sha256 = "eba9fdd5cbee26f88c0e29a1765376bd2b7a6bab635e20afc29face8e9e64885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ro/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ro/firefox-94.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cdf32a9e5268885f103e9a9391a247f1e05b2922b1e3e8744c26d92fac9722bf"; + sha256 = "59d3c57654c742ac7d2424df278f3a4da50b76fcc751026d937d598160934ac1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ru/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ru/firefox-94.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b87f839b38e8b9e7f17dd97724b210f1eac2e3d290fcd677ab729c00f341757f"; + sha256 = "e5e4289edd4d7ae420aad87ce38b65eb3c1978aa4d97df144f958dd24e905afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sco/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sco/firefox-94.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "7262fb3b507d74b6d68da1426e7f4571dbecf66211cb32f9719363a6c1f2aa0c"; + sha256 = "83638c4728dfe9a486ac748c84ee721937b003989622b3b8725f6bc6b66bfb59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/si/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/si/firefox-94.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "aa3e1a8d8f05eeb024eda42c6510532b297a73ced25944e0c28137ec778be9e4"; + sha256 = "7537ce71b85d195eae40e9695bd139e624180833c358e9633e4037c1052c02e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sk/firefox-94.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e1102e5c0961c8532cd9ae49d8b3da624de490265cd39d3e952cd4da839b394f"; + sha256 = "d2073ba06b23f4b65f1fea49eb9f04a7b2f35d73ed4de16ccebc7c109b5dcbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sl/firefox-94.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1109d8fe7a1e33fe03da7c0b3cb27e9b9f314273d4c2ba8a61f12b3a6237d6e3"; + sha256 = "059f2fc2d0cc02a1b92e8cd6b3006b13bda20d412682979113683423b73d20c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/son/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/son/firefox-94.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "676739441dcfac253974ae5092c59455b7101e294f9c4df5d31eca00ca864eb4"; + sha256 = "c36e332c7d264a997d162fbd008c97bb56da46507872d58bcaf67760398a5c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sq/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sq/firefox-94.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "eae6d8801a111b38fa7d7b3ee7fc5b23469940de26760b44160d09f68f5d8e5f"; + sha256 = "270d37e65ae60be7a44e19bcae22cce56f418db70d38098a634ab38bd85be924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sr/firefox-94.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a315f119c5cbe0d5a2794933e21180ab837e672c3063a870947e12def2fad450"; + sha256 = "edfe02b63134dc88afcb326395e24f9bb7be7b58d88c2f80eaf12253f40df0a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sv-SE/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/sv-SE/firefox-94.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f3490ea0bb9fc22ea85d5d4f6eedb4531e204c1d53f8cf487dbaa063dc973a9"; + sha256 = "9ae2294f5c757261e5b320814ef11875f05a74fcf8d7001c8b9e896f761ff2ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/szl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/szl/firefox-94.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "a59912a923916040b87ce1cda8fa71aede4123b39bfcab88a8da4c0da2fb6ce0"; + sha256 = "fedbd7bc7aa4b187eab423ec612eb4a9a6e8d7bb8ad5d7474a422c8093875c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ta/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ta/firefox-94.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "f6cda89c2b4097e5c33c0eac0819bdcb65cc18e085666fe346fb64aa8d55f64e"; + sha256 = "cc302405c4d0319ec699297b78e3a38400ebee0806ebaca4bb246f5df781afdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/te/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/te/firefox-94.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dfd5f6b330b8ae139ce76c7f21451773342f960e6ec09cce6039791835f6910b"; + sha256 = "27c8ed45bc287db8c4973ab422efba9eb4680f8347ebf79a862521582b5bb9df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/th/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/th/firefox-94.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "27e625b98bbed71a299607c2cac31ffc937a597d8c6bcd0aaafeb338cdcac547"; + sha256 = "f93d1114c4dc4ca98f85a5508ae0c0288196ee484697da13fb9166ef00e423c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/tl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/tl/firefox-94.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "72a57301971f9bb1a2674a4c00e8e45e77fe1b5b041de9a3255ede15b124460c"; + sha256 = "23724a1880b7de10b7d8d5fff714454afebdf93d37e6aab2a492f3e3fcb67b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/tr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/tr/firefox-94.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c939cfa088b584330179dc3563062b6e08458e4347ef1e8c66c899ecbd642413"; + sha256 = "9e0f630b441241da1203cc22536843ff924dd470fcb0baaa7a05650f3b47533b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/trs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/trs/firefox-94.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3216099a1b3435591d1eeb3e50a90c66d9bdb697bf852a302cecb1819cc96c07"; + sha256 = "3e0b76977ad714dd05192330042ffb4388146c7f1e18193e3438b126a9c23ce2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/uk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/uk/firefox-94.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b2a63a362d0197e065608961a57ab04017fa92f6b43a9848c6046f6da08d3bda"; + sha256 = "40a30fccb01be981bf2dd47e8990b34fdf595bb7ba5837b8cc98ed4137eafc9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ur/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/ur/firefox-94.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "faf5f628ec7b1abafb385f43c26534012d6cb888d92bc1c98f17005a4c86896b"; + sha256 = "cafd95a645be820483369766250a7d1331893c40dd2cf8bf9fae7b050e10a5c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/uz/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/uz/firefox-94.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d2ffce85b1286958dc770a163103b6642c98f29b40bc441bd4771ca5c9817c0"; + sha256 = "9e08b5d962c3e3f2375be1847a9386777459baf4a477950649700e66dfa52f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/vi/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/vi/firefox-94.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6218c4c6e58dc0c07df62adef703ee5fca39be1c3e157dbd936c1a0fd670cac9"; + sha256 = "d28802eebe7928fce570a06aaa33ac83a100fadff9df92d5a4c073d653f41807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xh/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xh/firefox-94.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4a61e9af94fb6fac5b3fcb9c1461b7c551583b741c66830545744b3b717b6a05"; + sha256 = "4661018a1d62fe87a32a85cb4d492f53c8fd98f639f48da04236132844eb674a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/zh-CN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/zh-CN/firefox-94.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "dc8279b92b8e030795edfb1c939a2989f8801953547f2c581740ad24701cb95b"; + sha256 = "26fd90a4d04e9432e237e82cd33f0f633a9667e84714444f79a970216a7cca1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/zh-TW/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/zh-TW/firefox-94.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d0c7d5f5738d051959dc9ee4f39dbf699a8c8f6f2328858670663163600075e3"; + sha256 = "de1b466c4f786de15df1bb3491757c92d982a196b347fdfab7dda0bbdaf7ec7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ach/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ach/firefox-94.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ad9067dc548ce33d6441c0e94dd46a93751efd5c1de391dfabee1ea7dd81c80b"; + sha256 = "ef462def6dd6ba17dca0e360879aa6f2007f0c7cfdb1398c68efc2736dae7f29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/af/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/af/firefox-94.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8267fedba7d52a5eed2dfc64b6bbba23c2f72e9f7b28370f65047b6009191730"; + sha256 = "90aafdc86bc22b76cb1f1a3d93a5fbbff1b3acb41f194e707f028230273119e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/an/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/an/firefox-94.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ffc6725d9c9a2baad960f7b587588b221fa3aa0de7707dd6fefd3f81f61dfe89"; + sha256 = "3669136c7c039eb0bd6f06f0fb84d927d700b2c31985b0074ccb2e397c2331ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ar/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ar/firefox-94.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dafd5ead95dda8f5fe119805b1d1d3482cf4d90bd8f274bbdf551846f8b7780e"; + sha256 = "37e329462cbf7c21080494c1026fbdd1686b95fc4351d1dc25fb8339cb93cd02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ast/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ast/firefox-94.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "4ff9f1379b95aedb46017b77a86766a0fa42d4fe4f0a0c2c6d3a26b4612e578f"; + sha256 = "e0a7dd866d2bb74e444c5fbaf2a4adf354953a7119d0a399c872939e02fee46c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/az/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/az/firefox-94.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ff597f10b2f9e42e1dbf9cf7ea495732c021879afd5b3a2c5ce9d1aa9db144da"; + sha256 = "2f30b1b3c2baf0c6b8cc568f11d758851954c4842d59481729cb4485b6955638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/be/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/be/firefox-94.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "274297dda60b7b2e2c19687888affeec46dfab0a0745d8b251179bfa06361331"; + sha256 = "98e54be798769dcda2875f4b56432abba93a775801d54a7792ac0d13068bedee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bg/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/bg/firefox-94.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8acc4e37249c706f23db4964da28289cd2cfcd0984f60ed40856022b8202f147"; + sha256 = "969e80bc391c016769af80eae52f907ea3c260a4d5dbb6fba0393aca76f45628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/bn/firefox-94.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8b7e681b6d22b1d2573facfd57f0039f9afef868d38f0b4c6d15c8d9e216ff10"; + sha256 = "080802a1c60a2760296fdc6851944dffc5842ec8d9efb836977d3e9105ec3c13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/br/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/br/firefox-94.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6c621a574b031b19fe43376b5b7175a9b11be3ecacf6ae32ff7dbf42e2385e94"; + sha256 = "0f4f7da4274d5a73d7b4d0e8e1a47f82e5c40061b6cf7c2dcdafc4425603bbc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/bs/firefox-94.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d365a64a2d8dc71e2bbfd73899102671784bd313982f48a87a94fd4f5283d6ec"; + sha256 = "ca212c38fdc4d8ebdffbfee80e82518ee4476d4d962c5ac7476df2254cd58843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ca-valencia/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ca-valencia/firefox-94.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "e9af2c49c737d5546aa65a45a26e27c971bbdd0bfd94256159eca2585470ac32"; + sha256 = "d55dc5a8295f18cad6d94f548e14c4f03214b2239d40f4b177e94767a0d333bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ca/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ca/firefox-94.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "365e008db10d5d5f1cdb584718dba289af656e9176020898ef642371d8b2cc09"; + sha256 = "6f0393c75586ecc4ad877401292b18e43b245c5b9aa575d7df4ed1ca56d7cd98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cak/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/cak/firefox-94.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ca9e050e8df1b775221a3a8189b319e9dfc70aabd61421ba2ac7f8cf47da13a8"; + sha256 = "6e4f2f3d3fad7a8935faee284d8b99ac0a5484248a08b63b7cab1f3b5d0e79c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/cs/firefox-94.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7444caa7dce9e45adaa419c6a71d1ff3fe0a21a3ba3cfe4e0c08ddd93973e7db"; + sha256 = "6f6373d00d264e84672cc6e94ec5225f9202b20704a61515756b5ace6049f50a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cy/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/cy/firefox-94.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ac6e4bbbcc489c514c26dfab7ce7be56d78e2544628969b0dc1578856d0c5439"; + sha256 = "8c9a5f5792a7560d752e255a7930c71266fa964fb13170e194ea7db6f81129a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/da/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/da/firefox-94.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1f1859f9ce3b691e4fadaa82cee1680b4c23f70567d3f68a60f9fb682f96babd"; + sha256 = "25ad12a625cdc842ae2dbb04f2eb4b6e6a8991b5f1d966993a045fce9bbfcd66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/de/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/de/firefox-94.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f5ac9118d0937638a5b011657cd529d0dbc28108885b5cc2254022b7082c3ffa"; + sha256 = "12ed455d581af8b0c16c0e40681d0d7594797eb54e388a2db4aaff83616d46f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/dsb/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/dsb/firefox-94.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "86381f8c5a5c7c1431012ad8ae44360c1c78e644197e7774de82101551cccfb1"; + sha256 = "5bdb29c4a0582647cc9ff2fab7e2e4d6a1ec4a56f76fd16d4ae9880621097675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/el/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/el/firefox-94.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "89d9f1bc006e1d0f824ed794f7917430ca2285c88cc82eb98fb643fc2231218e"; + sha256 = "dd6be6a586fec66b58e748f4afa7a1385fc01d4146bba7fb778322cf48bdd985"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-CA/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/en-CA/firefox-94.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4c2c968ee7f4f9fb49bbe951a36fc23d9e51178d15772cb41e4d59f41b6c2816"; + sha256 = "e0e87a73a8c4d22dc106753ee212455f583fabc993251cbe236d0bb53c60d0d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-GB/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/en-GB/firefox-94.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ecc57a222760119d6ec9562e3953ca7541dba4b6ea194b02cf20bf3b4fb1a994"; + sha256 = "5dfd49072ce81697c22a70cfe97ada4bbaf1a7dbe5c09bd8b7a8b7c5832ce102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-US/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/en-US/firefox-94.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "56294b9d6b39d94e99a507bb4f1511dbf8a2512a846b8ad49bc93e1253f1e3a8"; + sha256 = "98ee74af986cec68df541fb5256e1c075cb2527680ba226b56e08cbea4a04217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/eo/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/eo/firefox-94.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "33eb50b3e38eb259fc7559b60df2a9d69f4ed00efc8768a6dc2cafb2c6a93fb0"; + sha256 = "a193c7f70565c5f2882adee337d8957da29051b31f64bfee8b92ec3c99e017c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-AR/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/es-AR/firefox-94.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0e21f3ca04c37439768a9ddd9de73dc725c688a109e25b95061c4fb241361820"; + sha256 = "6c5a0470625a36d5537cd10935a2cdd432fd51a695521cc3f7d4b4773208e7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-CL/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/es-CL/firefox-94.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "418fbd415180600791b91500a69811447578102488642c4b6e9c8d9f0d7f94ea"; + sha256 = "fdf83c78cf72c85d815acb85e7f46eaee24c1b3e884fe7f43a7eec29de81962c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-ES/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/es-ES/firefox-94.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6744d826f205b162800c8c32bd4955e84ea284b6c92450ed88f1b947d4ac0bbf"; + sha256 = "422fcf77fa884be57605aed5cd87cdbb8c9854901fd16ed0b02ed44edc7a62b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-MX/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/es-MX/firefox-94.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "242f2d561482a1fb9859bdadb6db2756378ef364bd622485639282a537c9d7e7"; + sha256 = "364d5706f34ca48623de35af2e42124fead5a17f9a81c0a41a28c60b8962703c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/et/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/et/firefox-94.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "df71885748c89e6298467d70486193404ad83db7e2f77a6eae70a80df73a11df"; + sha256 = "f4c2214b858afc9b5441d41203349e9fde7a9e6624808f194f57f1481a86e197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/eu/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/eu/firefox-94.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "487ef0a284b3979d5eb758bb91a51b177606b9e2a40418df914d5ee0854852c3"; + sha256 = "c55c4355c69a868107152ff48cc54afb184ef76c65b8fa9696ca6ef4ad0a240f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fa/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/fa/firefox-94.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "30e9d9421a3b13555008ce6f422e7567ecaeedbd7d06fd5c2e9d5a22b9f93f0f"; + sha256 = "6340d0db75076cb2d9c4d1c844071a97f7db79e531a6c91b0ab078f2b1674494"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ff/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ff/firefox-94.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "76339d6f61adb1fd0c33b1e37902d9af4442d4d0cdbf17bc87da5d025e1658bf"; + sha256 = "5c636999e880b9247b5efdcb8a4d286f2b98c8b010c93f1a804091f0306a9533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fi/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/fi/firefox-94.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ce7d5435d3b25f3db558a226ab99932f26d1de68a32c801693ff809f83f5ce80"; + sha256 = "4ba17ee9089216df574c3757e760d1930ee327d66e6a3b862eccf3f9c8735080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/fr/firefox-94.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "788d1fc89d22cf2a69bd412937d3a94326e780eca272eca7410d1119b2a95234"; + sha256 = "1b877fee35061d3ba5decaca3a1d81e6844f272c5d0a94cef374bda45cc65641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fy-NL/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/fy-NL/firefox-94.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d691253a24487b32a646aa7c10b36ae0f35523ee4a22a1d35d41c5e871117d73"; + sha256 = "46cb4202a12b95d112d5749613cd1c80deaa52edc386f484e23d12407e09a21a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ga-IE/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ga-IE/firefox-94.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6f5c0ccf72bae2d35be9b256c9453d4f53c60252a09b51a96d46ae2296728277"; + sha256 = "59a54b4cf76e66bac93f205d5ab7d7991bf3d6362e332164f28f09090eb7cc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gd/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/gd/firefox-94.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ac0d3239cad9315cb5a2441d287c741c44ea65656efd2a8f9c8dab88818bc8ca"; + sha256 = "2994005051ad51dc1392e2bc69e52a06113d3323577c6514aaf48837b1158136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/gl/firefox-94.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6e0f03f1f6eb30e0052ea5a4dd853f9ce4a028fae099287e8ebfffc7b45f5aed"; + sha256 = "07344a3a9602714f4291fdc451469d9d428d3b330cb6997544ee89b500214dd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/gn/firefox-94.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c5544c5847c8e1a3ed8a0ad4be937fa072fb2bf4cdb1860ed7212611cde645cc"; + sha256 = "75b22ae12362337a74b94a3fbe7b4b3cecf49b6df819b997966fb5d4a308cdd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gu-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/gu-IN/firefox-94.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7375ccbfc1e179282dfd2835b8b67dabdea4e2edbe8689dbc42ab08d518b1538"; + sha256 = "d80aae36b364920e46c03e683328f0d07357232399a3a79b9844495f100c0e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/he/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/he/firefox-94.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c918f748d226ddd8891b87c11958f9fe4df871d94bffa089fdf9d2830955b824"; + sha256 = "116afab0741c6092a5932f932a33972b8da97df07e3f329069044a4976bb71ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hi-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/hi-IN/firefox-94.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "99c86d7ed9f027a5b1f7593c840ec8c401e87bba07e90584a61e59a0d67af348"; + sha256 = "ac77a85108c1b3ede1db709829d24baa6906a73a804d9af475162bd25d9d3012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/hr/firefox-94.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8884a70c80d07cdb57a8f825db50ce7f073da01a09860ba9db5a69a94d82825f"; + sha256 = "d21ed0e4ccfd41ae59cdd0760cd66a8b065c1a451667332dd8e3d00ec509e766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hsb/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/hsb/firefox-94.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4828b9cbd728bf750d11c0e71554f9c84ed6a19303cb78e35b909f7b11a7a563"; + sha256 = "9bea8a4fb0eda357164d1418dfd6af37f55499ef76578600badf69cee629779d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hu/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/hu/firefox-94.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6faa65b0559dd42a63199bcc576d64c9ea1140df259ef0e0c0b26f0bf0b938f6"; + sha256 = "f315bcf6a4b8bd50d3177d4c3d1b3634c6d20664dbb8c896fcd73f523012ce39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hy-AM/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/hy-AM/firefox-94.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c7aaf4ab6e126608db0027524226fcd62ca6ac781d06da0bdbb0547aa0356480"; + sha256 = "7965b4e7d9da034c57377a76534d1b501eda9cff74e6963b5ab0ae57c8b3a5bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ia/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ia/firefox-94.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fccedf58c92bf64e15a2d4edfc8ad9b1098589821e395a5ed4455b030faf3584"; + sha256 = "bd2d2bc58df8343b3f01258971616ffa7475f4da1872fdf15082073e97c94fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/id/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/id/firefox-94.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "79d69217a8888f00753ad5d2ce9368a3094f5454a0fb6117ceb9c82a271688a0"; + sha256 = "8ce031a74917f6ba2ab28d18c3bf90889e2220a669ab4089967b25d4e79ad924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/is/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/is/firefox-94.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ba948a6f3b48ce5dac9090c0fdbc90bbbac3a04618a3891c0a77c033c61969b5"; + sha256 = "04ddaed817aa5697895221a0db3ae7101b8233f125bc7fef922abb1a0e7723d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/it/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/it/firefox-94.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "dcd7e0357c115395040b5a33f5f3aaad07d1c7094f4068d2c2690ec28c915a30"; + sha256 = "8aa73f43364cb54102f77cf47ebc87add3099370b843625c5eb265e3329720f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ja/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ja/firefox-94.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1d936db1e57e0fdf34a6bea460a19e2fd21a55078c50c9126d2d43041fb3d78a"; + sha256 = "fd17973256956c8b0034ce4ec9da209d07c433434d72f41623a754aade1e5b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ka/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ka/firefox-94.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "394659da7197aa055f4452edb4594850eb5300dd13940c14741ae0272337b16d"; + sha256 = "d8058f0d613b048ca9406a7c4f635aa48c03b09cae5ef0d1e26adc7ac5cdf349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kab/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/kab/firefox-94.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7c8fd02d0cb5c93cdeb8119ede9ffa54ad5f0546fe65a655a31b23ba5bb251ab"; + sha256 = "055e18fdad70268697b777b14ce17b7dc6c7c84a1b02bb3520260733add2edfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/kk/firefox-94.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3a60f6d34d7b1563d58d58019333997f1afc548dbeccb16cc2d053b4a7082479"; + sha256 = "58054d22cdeb34d96bbe99b0883aec10c73e9a30b928af7ae866a5892388dc75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/km/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/km/firefox-94.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d480093c6c276ff17eb4d001613381e8b72018a9774acc667d1a774fc71d599e"; + sha256 = "1929d50933ae722c9fc65f630099fd5f022e9dcebff4849392a78fbee79a0e60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kn/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/kn/firefox-94.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0aa8200106375275f358a732acbe658193eea29e6fca65072f9e3de22d88eb42"; + sha256 = "2ac09ba601c391fafdf09ca8524818ea46af3e5a6d2467cb4c42c36257bdfa52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ko/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ko/firefox-94.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a5b2118e3761dfd182893621f045d7cadf7a75f15b46208a0f2ce878bc1a1b2e"; + sha256 = "d4a16e36c13156761914758ba254815db1769f86aee95887a373b7cc218bdece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lij/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/lij/firefox-94.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "583110560cf65f6968e3cb5080227de3c47b9df3404a793a892be7985b132115"; + sha256 = "8ac33659d6a1621940c1d70bc573e7bf9bf867cb87e6e75f17eab5aa27f41833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lt/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/lt/firefox-94.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e9eca5885a67bf0cb8b1ac00d3f5ea0c1b829743ae710975f3cda3e09d226849"; + sha256 = "ba99c9137ce112fa2e26e0ea5c7a9852d0801042a756047f6c4114fc7ac779c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lv/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/lv/firefox-94.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4d969ee872531b2058752058bf90dceecb6c8050458d5cba5f96c82f0a6e301d"; + sha256 = "3f5ae08ad7b17f9bff80d61a984715ed12653d9a4f459d69b429225afa9f372c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/mk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/mk/firefox-94.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "322985bb11f4e6f2f7a4da6606dda4af74d7eb63bef34b6e7b86618804adba5d"; + sha256 = "6e60beeceb67b09921b383aa2e920c37425cfa2000ea497c9a0ff90e106029f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/mr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/mr/firefox-94.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1dfb359ada64faea03068afbe32e14431edfbdfb61ea61590ccffc954d637c55"; + sha256 = "ee80850f99f616687b554370873b1adc2308d8dacac346a6ee091be636268c66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ms/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ms/firefox-94.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6c8541db16063140c63dcdc6314a38c049a2179376f3cdf80787cae774dac267"; + sha256 = "d191ca6a6879586ce647c9118724048ebafe13c11058eb4499aff9a42bd13572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/my/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/my/firefox-94.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "3131c70b51193a8cb0a3ca18207c6001d8ba5f458af214ce5280924d5700782e"; + sha256 = "7d2b9ddeb1de9bde70e06ff946af4061ccc8f9bb073835f4a45aca21109e8456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nb-NO/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/nb-NO/firefox-94.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "be47aa5951f3c07e11e47959b4718b21bab16085d25469fb4eafe406caddb181"; + sha256 = "77d52d4d3f9637546d3880d1751dff795095df2baa8dc1d5b7f7f1cd312499dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ne-NP/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ne-NP/firefox-94.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4dfacf4d17838e75c51f60b26d8f66b0bf3a0bad9c2d9e2854c107fb30d8757c"; + sha256 = "7fef351583a662b87db4691cb2b3f4f26a683d2746fa51da3e89babd07f863bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/nl/firefox-94.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9f9e628c3809f9e7afc5a338abe4854a54c3cf6b8fdcb59de8a306b09a22bda1"; + sha256 = "ac25c3e4149a36b972f76e2635aa4736d5281bb467d89ac8ea8545f9446497f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nn-NO/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/nn-NO/firefox-94.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "32f057f0ff57c17f010e19ca6f3cd0d11b6ee454401f1ec57e42c08ca1ded04d"; + sha256 = "f85164e71b79178460a673a34fd68165b58fd2354b846c128cf614471325f89c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/oc/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/oc/firefox-94.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "681702c8a8d6d2b0fda8f4701c7c77fa305d3483c3d5f070d31c2b8006638f74"; + sha256 = "2e4208811215f7e893043b1c2b36263957360000f302d656044075792b8537bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pa-IN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/pa-IN/firefox-94.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "080794608bf065d92431fc5d822eae12373b3f60677229303af30e07e40a8751"; + sha256 = "0630046a3521fe19123fc75848f147ef82e07de7cb7c0539b1f70f699f3037c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/pl/firefox-94.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e44448176c0275da5e5f44b2aa4f6b378699cf44aa015e8f03513b89b204f5d8"; + sha256 = "6f0a8a98624a20d111598a1e522e987b0c8d7857a2af9a8cf0a32a8d4545490f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pt-BR/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/pt-BR/firefox-94.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fb970290b6efba30ac36f145ac57ad2d65045bd3757c78cd006864f841c1d52c"; + sha256 = "27aece21464ce9ce455f5d9fbcc2f153d20df17584db3b0f293aadc5408821d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pt-PT/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/pt-PT/firefox-94.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "97af8a13778621c873dce9393b5653f48a440f401a61e4a7401a49253d6b3ec3"; + sha256 = "0cdf45e3191b07bef1ada272ef65124c5daa591f29ea5adbd3fbe3a6edde095e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/rm/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/rm/firefox-94.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ae7852c30969fef6e8ba6d8e0fb932c5c63eeb9867a42e32135d193f8ee4ae7c"; + sha256 = "f5da93fd882199b00672ab5644a5f9a9662a0371bfd0dac034ae819c8c7af07d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ro/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ro/firefox-94.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "94e69e8e91da2e22a2ac0fce179b62b246cf9eaf7a662f348907350562951262"; + sha256 = "c35390e2e94dd991b147ef30cf5e3ba74546219c36ee137d440a40d7e6a1fdb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ru/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ru/firefox-94.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3460e2a2fb34f952bfb099671980207de7b5a45a8c5f4a7f79f2c050e6bc5e82"; + sha256 = "1353f9d55a1e74954210d4c3fc93c24e8c01b478053ca1a849812262fa119aba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sco/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sco/firefox-94.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "8e1adffa5e7a46ddcad564e4d7d01b19b3c851eed451cd1e83608c634f9e8fbc"; + sha256 = "604268a66d7a772a2cd6dfaeaaed40cd65b896fe3af36844e204128ae84a9e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/si/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/si/firefox-94.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0ed0ce0025e1ecf7b3fef2cb011b5c5fcb0e3eb67a0159e80b6c116b9034277f"; + sha256 = "5a14d6f00ab3f7aa1240ceb471f3454fe9a0b095c7d98fd6624577cc8a11bb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sk/firefox-94.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1e1334c2e55a27b6b653d038f4ef30d8655b3c7c253365788cdfd92117bb1e47"; + sha256 = "bad43a5b54fde29e19dd1324662ccae0f213cbbf0a2a1802c7d230aec4fbbe60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sl/firefox-94.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "dc91d34c44bf240b2c6c9b4285c5a7b24f3c509ee5f9de300e9a6c2ff1228ebb"; + sha256 = "df05a9c60a03d50797a8fbb72f72900d68ad776f5ab27f72a0f9b50a58e46439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/son/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/son/firefox-94.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "29121af73aaeda8e346df00f8831a3c80c77eb759604cd51c8b39597e3f7a6ea"; + sha256 = "2a502080c97053ff44ac3f910d12a5f3950a892887f24b44fd1b516c3ba237a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sq/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sq/firefox-94.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2d7ca2e6680d909659241561ec2d24369749059acc642d9db8ca90d8e67201d5"; + sha256 = "bd883d16edc899e4ba43c8125b321b468652f8eb8b39ef0285b65cb8e4e14782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sr/firefox-94.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "63ba06a120ac6702350330758aa98671feb1a008bbe08ab2b11d92d556a22a2d"; + sha256 = "bde21919dc650524f00c94fe085981d13c4be77917a370d874dff6fbc0acd400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sv-SE/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/sv-SE/firefox-94.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f2f59f378be886fc283a84f58ccea2c8ae2f2313435557122b1dd7161ba03853"; + sha256 = "6856ffabf236e03d1ee16fd34cd9b75485d5bfcb5f94356a0c636c8d886dec31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/szl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/szl/firefox-94.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "df9fc3563749939e20351021f90da4060adcf9c50eae74cc65eacc4c8e019e6c"; + sha256 = "b793d4afc5b1d67b9f90461b1a82d389970ea1550876797b9ae031f9acb1f939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ta/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ta/firefox-94.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2f1cef7b50cc9d44f816ab09c38a1b91a63fec3eee65d97a5a8637f503ed7eaa"; + sha256 = "4b4a5d317c535d23e49c341da57563b10eca4fed88f269d3fd4b2d88d58efb51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/te/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/te/firefox-94.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "40385b07128cccea8a3210c301795ebaf32c860423c3206297f3ebe2363d868b"; + sha256 = "ebe97cb46f66a10a429437c44ee7fc58112502ff72dd496a1deaf08deb35a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/th/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/th/firefox-94.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e62c3317af6ba5ea55160898c628eaef21eba1be94a77de5c5280dfad12eef65"; + sha256 = "e14f130d454ad543c26acc04fb8ae10b163e50f886eee95422976cce3109cc0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/tl/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/tl/firefox-94.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "801226da66a4a08d48483ef894e8cd4076e0f9381ab949c619d976323ceac02a"; + sha256 = "8fbec4b22f4abedc1f08e86f06b0bd58c4c9b37475dc036c48430dcf1221e2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/tr/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/tr/firefox-94.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "dde8d3b8947b8a9b87c6451cc4c1ede7fd0bb0eeb5f86eea4b58a3fa20028038"; + sha256 = "99403ff004eee5e88098e37f3e5d62c56c72fb86358609f22826326751b81461"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/trs/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/trs/firefox-94.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1b0ca6672e149b343345f1d8fa7cfbe94054a9a4d67d6d04b4c06e7216e8be38"; + sha256 = "ff0edf90e4122347430a9df1ad2d0e6fd05b7bbcf00ba92345d31b8bbaae67c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/uk/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/uk/firefox-94.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2eecee8d2d5f34222b0009b6f5e7638e650e5b692cbdafc2f1710da677ad1e5c"; + sha256 = "3ddab9ade8f193ea1c5a61a92bfd502c8264de6f4b145793158c9cce99bf1cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ur/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/ur/firefox-94.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1386c6c018807e4ca189d6a9b400c3d6bd55abafee476f88b4ab7b958017d460"; + sha256 = "5b9c92ab2ff9acf88148b9d9c9261aaf353740821fc62a2e2051217fde9c09e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/uz/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/uz/firefox-94.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7f92bd0536d32ca7af1f8dbe4fd7dd5eb7ce8c2f2d1383b21bfd5b1c8c7ca30e"; + sha256 = "f1f4b441e1d76b0b92bc3af3f8bb4545699a1860935d008de12784d4a9fe0b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/vi/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/vi/firefox-94.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "04d7ac16f2d28bfe3d70e717c8a4ee10c291bea54f022521eb22856d41f421ae"; + sha256 = "a10fa164778d39194d898d9e5159ba1db917751d63e0a84d7d52e5a12747753b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/xh/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/xh/firefox-94.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "12591a4fe50ef293015484dcef03d43e1922cca4724b3901d38e0cd136b12274"; + sha256 = "3fdd7069f4f6d546f1eed76edd33b440b658c7519ef97368844f02aa8be6e851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/zh-CN/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/zh-CN/firefox-94.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a9b69bde93512f6531740a4bea967717fb56ad5cfe88a9b89db0e4fc1a971feb"; + sha256 = "942611c8165b14eff15ebaf00415d60e45982e3eac4cdc79b765c1461a3f42fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/zh-TW/firefox-93.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/zh-TW/firefox-94.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3c790d0a8ba551c22e7b92bd993eb077159e21e2e3748e64d2aa635739511c36"; + sha256 = "60c2b8946b79d8d32248e7624c5292cf9d141beffbccb046f6c2a7308d16b23c"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2600b5209bb15..b0d11bd835b62 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -5,15 +5,15 @@ { lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss, nss_3_53 +, freetype, fontconfig, file, nspr, nss , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx_1_8 , icu69, libpng, glib, pciutils -, autoconf213, which, gnused, rustPackages, rustPackages_1_45 +, autoconf213, which, gnused, rustPackages , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 -, gtk2, gtk3, wrapGAppsHook +, gtk3, wrapGAppsHook , debugBuild ? false ### optionals @@ -27,7 +27,9 @@ , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire -, jemallocSupport ? true, jemalloc +# Workaround: disabled since currently jemalloc causes crashes with LLVM 13. +# https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 +, jemallocSupport ? false, jemalloc ## privacy-related options @@ -71,6 +73,9 @@ # > the experience of Firefox users, you won't have any issues using the # > official branding. , enableOfficialBranding ? true + +# On 32bit platforms, we disable adding "-g" for easier linking. +, enableDebugSymbols ? !stdenv.is32bit }: assert stdenv.cc.libc or null != null; @@ -91,20 +96,16 @@ let then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; - # 78 ESR won't build with rustc 1.47 - inherit (if lib.versionAtLeast version "82" then rustPackages else rustPackages_1_45) - rustc cargo; + inherit (rustPackages) rustc cargo; # Darwin's stdenv provides the default llvmPackages version, match that since # clang LTO on Darwin is broken so the stdenv is not being changed. # Target the LLVM version that rustc -Vv reports it is built with for LTO. - # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11 llvmPackages0 = - /**/ if stdenv.isDarwin + if stdenv.isDarwin then buildPackages.llvmPackages - else if lib.versionAtLeast rustc.llvm.version "11" - then buildPackages.llvmPackages_11 - else buildPackages.llvmPackages_10; + else rustc.llvmPackages; + # Force the use of lld and other llvm tools for LTO llvmPackages = llvmPackages0.override { bootBintoolsNoLibc = null; @@ -114,19 +115,12 @@ let # When LTO for Darwin is fixed, the following will need updating as lld # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. buildStdenv = if ltoSupport - then overrideCC stdenv llvmPackages.clangUseLLVM + # LTO requires LLVM bintools including ld.lld and llvm-ar. + then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { + inherit (llvmPackages) bintools; + }) else stdenv; - # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY - # https://github.com/NixOS/nixpkgs/issues/126065 - nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss.override { useP11kit = false; }; - - # --enable-release adds -ffunction-sections & LTO that require a big amount of - # RAM and the 32-bit memory space cannot handle that linking - # We also disable adding "-g" for easier linking - releaseFlags = if stdenv.is32bit - then [ "--disable-release" "--disable-debug-symbols" ] - else [ "--enable-release" ]; in buildStdenv.mkDerivation ({ @@ -137,27 +131,15 @@ buildStdenv.mkDerivation ({ patches = [ ] ++ - lib.optional (lib.versionOlder version "86") ./env_var_for_system_dir-ff85.patch ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ - lib.optional (lib.versionOlder version "83") ./no-buildconfig-ffx76.patch ++ lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++ - lib.optional (ltoSupport && lib.versionOlder version "84") ./lto-dependentlibs-generation-ffx83.patch ++ - lib.optional (ltoSupport && lib.versionAtLeast version "84" && lib.versionOlder version "86") - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3"; - sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48"; - }) - - # This patch adds pipewire support for the ESR release - ++ lib.optional (pipewireSupport && lib.versionOlder version "83") - (fetchpatch { - # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch - url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; - sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; - }) - - ++ patches; - + # This fixes a race condition causing deadlock. + # https://phabricator.services.mozilla.com/D128657 + lib.optional (lib.versionAtLeast version "94") (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9c7f25d45bb1dd6b1a865780bc249cdaa619aa83/trunk/0002-Bug-1735905-Upgrade-cubeb-pulse-to-fix-a-race-condit.patch"; + sha256 = "l4bMK/YDXcDpIjPy9DPuUSFyDpzVQca201A4h9eav5g="; + }) ++ + patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of # ./env_var_for_system_dir.patch with Firefox >=65 without having to track @@ -165,7 +147,7 @@ buildStdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk3 perl zip libjpeg zlib bzip2 + gnum4 gtk3 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.pixman yasm libGLU libGL @@ -179,7 +161,7 @@ buildStdenv.mkDerivation ({ # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ - nspr nss_pkg + nspr nss ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed @@ -187,15 +169,9 @@ buildStdenv.mkDerivation ({ ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire ++ lib.optional jemallocSupport jemalloc - ++ lib.optional (lib.versionAtLeast version "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation - Foundation libobjc AddressBook cups ] - ++ lib.optional (lib.versionOlder version "90") gtk2; - - NIX_LDFLAGS = lib.optionalString ltoSupport '' - -rpath ${llvmPackages.libunwind.out}/lib - ''; + Foundation libobjc AddressBook cups ]; MACH_USE_SYSTEM_PYTHON = "1"; @@ -203,22 +179,7 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - '' + lib.optionalString (pipewireSupport && lib.versionOlder version "83") '' - # substitute the /usr/include/ lines for the libraries that pipewire provides. - # The patch we pick from fedora only contains the generated moz.build files - # which hardcode the dependency paths instead of running pkg_config. - substituteInPlace \ - media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ - --replace /usr/include ${pipewire.dev}/include - '' + lib.optionalString (lib.versionAtLeast version "80" && lib.versionOlder version "81") '' - substituteInPlace dom/system/IOUtils.h \ - --replace '#include "nspr/prio.h"' '#include "prio.h"' - - substituteInPlace dom/system/IOUtils.cpp \ - --replace '#include "nspr/prio.h"' '#include "prio.h"' \ - --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ - --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' - ''; + ''; nativeBuildInputs = [ @@ -240,6 +201,9 @@ buildStdenv.mkDerivation ({ ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ extraNativeBuildInputs; + separateDebugInfo = enableDebugSymbols; + setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. + preConfigure = '' # remove distributed configuration files rm -f configure @@ -263,7 +227,11 @@ buildStdenv.mkDerivation ({ ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" - + ${ + # Bindgen doesn't like the flag added by `separateDebugInfo`. + lib.optionalString enableDebugSymbols '' + BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}" + ''} echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG '' + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. @@ -307,7 +275,7 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional ltoSupport "--enable-lto" + ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" @@ -321,9 +289,13 @@ buildStdenv.mkDerivation ({ ++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else ([ "--disable-debug" - "--enable-optimize" - "--enable-strip" ] ++ releaseFlags)) + else [ "--disable-debug" "--enable-optimize" ]) + # --enable-release adds -ffunction-sections & LTO that require a big amount of + # RAM and the 32-bit memory space cannot handle that linking + ++ flag (!debugBuild && !stdenv.is32bit) "release" + ++ flag enableDebugSymbols "debug-symbols" + ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] + ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; @@ -331,14 +303,7 @@ buildStdenv.mkDerivation ({ cd obj-* ''; - makeFlags = lib.optionals ltoSupport [ - "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" - "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" - "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" - "RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib" - "STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip" - ] - ++ extraMakeFlags; + makeFlags = extraMakeFlags; enableParallelBuilding = true; doCheck = false; # "--disable-tests" above @@ -356,6 +321,42 @@ buildStdenv.mkDerivation ({ gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; + # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. + # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh + # Remove it when PR #146275 is merged. + preFixup = lib.optionalString enableDebugSymbols '' + _separateDebugInfo() { + [ -e "$prefix" ] || return 0 + + local dst="''${debug:-$out}" + if [ "$prefix" = "$dst" ]; then return 0; fi + + dst="$dst/lib/debug/.build-id" + + # Find executables and dynamic libraries. + local i + while IFS= read -r -d $'\0' i; do + if ! isELF "$i"; then continue; fi + + # Extract the Build ID. FIXME: there's probably a cleaner way. + local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" + if [[ -z "$id" ]]; then + echo "could not find build ID of $i, skipping" >&2 + continue + fi + + # Extract the debug info. + header "separating debug info from $i (build ID $id)" + mkdir -p "$dst/''${id:0:2}" + $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" + $STRIP --strip-debug "$i" + + # Also a create a symlink <original-name>.debug. + ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")" + done < <(find "$prefix" -type f -print0) + } + ''; + doInstallCheck = true; installCheckPhase = '' # Some basic testing diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch deleted file mode 100644 index 18d31356989a2..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:00:14.157543388 +0100 -+++ b/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:01:28.731128320 +0100 -@@ -302 +302,2 @@ -- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); -+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); -+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir)); diff --git a/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch b/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch deleted file mode 100644 index b6f1b81fa9fe3..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/toolkit/library/build/dependentlibs.py -+++ b/toolkit/library/build/dependentlibs.py -@@ -36,26 +36,17 @@ def dependentlibs_win32_objdump(lib): - proc.wait() - return deps - --def dependentlibs_readelf(lib): -+def dependentlibs_elf_objdump(lib): - '''Returns the list of dependencies declared in the given ELF .so''' -- proc = subprocess.Popen([substs.get('TOOLCHAIN_PREFIX', '') + 'readelf', '-d', lib], stdout = subprocess.PIPE, -+ proc = subprocess.Popen([substs['LLVM_OBJDUMP'], '--private-headers', lib], stdout = subprocess.PIPE, - universal_newlines=True) - deps = [] - for line in proc.stdout: -- # Each line has the following format: -- # tag (TYPE) value -- # or with BSD readelf: -- # tag TYPE value -- # Looking for NEEDED type entries -- tmp = line.split(' ', 3) -- if len(tmp) > 3 and 'NEEDED' in tmp[2]: -- # NEEDED lines look like: -- # 0x00000001 (NEEDED) Shared library: [libname] -- # or with BSD readelf: -- # 0x00000001 NEEDED Shared library: [libname] -- match = re.search('\[(.*)\]', tmp[3]) -- if match: -- deps.append(match.group(1)) -+ # We are looking for lines with the format: -+ # NEEDED libname -+ tmp = line.split() -+ if len(tmp) == 2 and tmp[0] == 'NEEDED': -+ deps.append(tmp[1]) - proc.wait() - return deps - -@@ -110,7 +101,7 @@ def gen_list(output, lib): - libpaths = [os.path.join(substs['DIST'], 'bin')] - binary_type = get_type(lib) - if binary_type == ELF: -- func = dependentlibs_readelf -+ func = dependentlibs_elf_objdump - elif binary_type == MACHO: - func = dependentlibs_mac_objdump - else: diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch deleted file mode 100644 index 3530954ea5c59..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch +++ /dev/null @@ -1,24 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp ---- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200 -+++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200 -@@ -62,8 +62,6 @@ - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn ---- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 -+++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 -@@ -36,7 +36,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 80750b966c156..5923a967e7209 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "93.0"; + version = "94.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91"; + sha512 = "00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.2.0esr"; + version = "91.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f4cff7e43ff9927cbab3f02d37d360ee8bb0dbe988e280cb0638ee67bfe3c76e3a0469336de1b212fba66c958d58594b1739aafee1ebb84695d098c1e5c77b9d"; + sha512 = "7cf6efd165acc134bf576715580c103a2fc10ab928ede4c18f69908c62a04eb0f60affa8ceafd5883b393c31b85cae6821d0ae063c9e78117456d475947deaa9"; }; meta = { @@ -54,29 +54,4 @@ rec { versionSuffix = "esr"; }; }; - - firefox-esr-78 = common rec { - pname = "firefox-esr"; - version = "78.15.0esr"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378"; - }; - - meta = { - description = "A web browser built from Firefox Extended Support Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco hexa ]; - 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. - license = lib.licenses.mpl20; - }; - tests = [ nixosTests.firefox-esr-78 ]; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-78-unwrapped"; - versionSuffix = "esr"; - }; - }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index aa6f7da503fbf..462c24a62319f 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -290,7 +290,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" fi diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix index 7baca62e67329..4bc4e360120fd 100644 --- a/pkgs/applications/networking/browsers/gmni/default.nix +++ b/pkgs/applications/networking/browsers/gmni/default.nix @@ -1,24 +1,24 @@ -{ stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc }: +{ stdenv, lib, fetchFromSourcehut, bearssl, scdoc }: stdenv.mkDerivation rec { pname = "gmni"; - version = "unstable-2021-03-26"; + version = "1.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "gmni"; - rev = "77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87"; - sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r"; + rev = version; + sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bearssl scdoc ]; + nativeBuildInputs = [ scdoc ]; + buildInputs = [ bearssl ]; meta = with lib; { description = "A Gemini client"; homepage = "https://git.sr.ht/~sircmpwn/gmni"; license = licenses.gpl3Only; maintainers = with maintainers; [ bsima jb55 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 4028f8622c3c6..1435d24726354 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -1,31 +1,44 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtmultimedia }: +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, qmake, qtmultimedia }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kristall"; version = "0.3"; + src = fetchFromGitHub { owner = "MasterQ32"; repo = "kristall"; - rev = "V" + version; + rev = "V${version}"; sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq"; }; - buildInputs = [ qtbase qtmultimedia ]; + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i '1i #include <errno.h>' src/browsertab.cpp + ''; + + nativeBuildInputs = [ wrapQtAppsHook qmake ]; + + buildInputs = [ qtmultimedia ]; qmakeFlags = [ "src/kristall.pro" ]; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv kristall.app $out/Applications + '' else '' install -Dt $out/bin kristall install -D Kristall.desktop $out/share/applications/net.random-projects.kristall.desktop + install -D src/icons/kristall.svg $out/share/icons/hicolor/scalable/apps/net.random-projects.kristall.svg + for size in 16 32 64 128; do + install -D src/icons/kristall-''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/net.random-projects.kristall.png + done ''; - meta = with lib; - src.meta // { - description = - "Graphical small-internet client, supports gemini, http, https, gopher, finger"; - homepage = "https://random-projects.net/projects/kristall.gemini"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.gpl3; - inherit (qtmultimedia.meta) platforms; - }; + meta = with lib; { + description = + "Graphical small-internet client, supports gemini, http, https, gopher, finger"; + homepage = "https://random-projects.net/projects/kristall.gemini"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3Only; + inherit (qtmultimedia.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 8ac9235121c37..c36d37ccfdf7a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -23,7 +23,7 @@ , pango , audioSupport ? mediaSupport -, pulseaudioSupport ? false +, pulseaudioSupport ? mediaSupport , libpulseaudio , apulse @@ -43,12 +43,11 @@ # Hardening , graphene-hardened-malloc -# crashes with intel driver -, useHardenedMalloc ? false +# Whether to use graphene-hardened-malloc +, useHardenedMalloc ? true -# Whether to disable multiprocess support to work around crashing tabs -# TODO: fix the underlying problem instead of this terrible work-around -, disableContentSandbox ? true +# Whether to disable multiprocess support +, disableContentSandbox ? false # Extra preferences , extraPrefs ? "" @@ -88,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.8"; + version = "11.0"; lang = "en-US"; @@ -98,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1bn31r3cayv79pjw5ndji5qzxy552cb2mcavij3nwchsmnfqp4z1"; + sha256 = "0938a9yjfg9qa9rv5acrmbgqq11mc8j0pvl1n64jrdz29crk6sj2"; }; i686-linux = fetchurl { @@ -106,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1j3xxflwwjwxfayixj75dn6a2ka751s53f60dpkfzwpp5rfwl572"; + sha256 = "07v1ca66a69jl238qdq81mw654yffrcyq685y4rvv8xvx11fnzzp"; }; }; in diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 7fa9fb5237a90..a54ccfdf6cc33 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -131,5 +131,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix new file mode 100644 index 0000000000000..33f35ba12af35 --- /dev/null +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -0,0 +1,90 @@ +{ stdenv +, lib +, buildFHSUserEnvBubblewrap +, callPackage +, copyDesktopItems +, dpkg +, lndir +, makeDesktopItem +, makeWrapper +, requireFile +}: + +let + version = "7.3.1"; + + ptFiles = stdenv.mkDerivation { + name = "PacketTracer7drv"; + inherit version; + + dontUnpack = true; + src = requireFile { + name = "PacketTracer_${builtins.replaceStrings ["."] [""] version}_amd64.deb"; + sha256 = "c39802d15dd61d00ba27fb8c116da45fd8562ab4b49996555ad66b88deace27f"; + url = "https://www.netacad.com"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + installPhase = '' + dpkg-deb -x $src $out + makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \ + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" + ''; + }; + + desktopItem = makeDesktopItem { + name = "cisco-pt7.desktop"; + desktopName = "Cisco Packet Tracer 7"; + icon = "${ptFiles}/opt/pt/art/app.png"; + exec = "packettracer7 %f"; + mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + }; + + fhs = buildFHSUserEnvBubblewrap { + name = "packettracer7"; + runScript = "${ptFiles}/bin/packettracer7"; + + targetPkgs = pkgs: with pkgs; [ + alsa-lib + dbus + expat + fontconfig + glib + libglvnd + libpulseaudio + libudev0-shim + libxkbcommon + libxml2 + libxslt + nspr + nss + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXScrnSaver + ]; + }; +in stdenv.mkDerivation { + pname = "ciscoPacketTracer7"; + inherit version; + + dontUnpack = true; + + installPhase = '' + mkdir $out + ${lndir}/bin/lndir -silent ${fhs} $out + ''; + + desktopItems = [ desktopItem ]; + + nativeBuildInputs = [ copyDesktopItems ]; + + meta = with lib; { + description = "Network simulation tool from Cisco"; + homepage = "https://www.netacad.com/courses/packet-tracer"; + license = licenses.unfree; + maintainers = with maintainers; [ lucasew ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix new file mode 100644 index 0000000000000..c823dcbb1d35f --- /dev/null +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -0,0 +1,131 @@ +{ stdenv +, lib +, alsa-lib +, autoPatchelfHook +, buildFHSUserEnvBubblewrap +, callPackage +, copyDesktopItems +, dbus +, dpkg +, expat +, fontconfig +, glib +, libdrm +, libglvnd +, libpulseaudio +, libudev0-shim +, libxkbcommon +, libxml2 +, libxslt +, lndir +, makeDesktopItem +, makeWrapper +, nspr +, nss +, requireFile +, xorg +}: + +let + version = "8.0.1"; + + ptFiles = stdenv.mkDerivation { + name = "PacketTracer8Drv"; + inherit version; + + dontUnpack = true; + src = requireFile { + name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb"; + sha256 = "77a25351b016faed7c78959819c16c7013caa89c6b1872cb888cd96edd259140"; + url = "https://www.netacad.com"; + }; + + nativeBuildInputs = [ + alsa-lib + autoPatchelfHook + dbus + dpkg + expat + fontconfig + glib + libdrm + libglvnd + libpulseaudio + libudev0-shim + libxkbcommon + libxml2 + libxslt + makeWrapper + nspr + nss + ] ++ (with xorg; [ + libICE + libSM + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + ]); + + installPhase = '' + dpkg-deb -x $src $out + chmod 755 "$out" + makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer" \ + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" + + # Keep source archive cached, to avoid re-downloading + ln -s $src $out/usr/share/ + ''; + }; + + desktopItem = makeDesktopItem { + name = "cisco-pt8.desktop"; + desktopName = "Cisco Packet Tracer 8"; + icon = "${ptFiles}/opt/pt/art/app.png"; + exec = "packettracer8 %f"; + mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + }; + + fhs = buildFHSUserEnvBubblewrap { + name = "packettracer8"; + runScript = "${ptFiles}/bin/packettracer"; + targetPkgs = pkgs: [ libudev0-shim ]; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp "${desktopItem}"/share/applications/* "$out/share/applications/" + ''; + }; +in stdenv.mkDerivation { + pname = "ciscoPacketTracer8"; + inherit version; + + dontUnpack = true; + + installPhase = '' + mkdir $out + ${lndir}/bin/lndir -silent ${fhs} $out + ''; + + desktopItems = [ desktopItem ]; + nativeBuildInputs = [ copyDesktopItems ]; + + meta = with lib; { + description = "Network simulation tool from Cisco"; + homepage = "https://www.netacad.com/courses/packet-tracer"; + license = licenses.unfree; + maintainers = with maintainers; [ lucasew ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c959dd61bad0a..54bf0641fc825 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.9.2"; + version = "2021.11.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-UAx3DY8d3I1g7DuNmBu4w+3NGUQqDdcScXdtq/VkpJ8="; + sha256 = "sha256-amwzMSPMaXbIj95RhSVnl0kwHnEluKj4L7q4Zu2HPgE="; }; vendorSha256 = null; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://www.cloudflare.com/products/argo-tunnel"; license = licenses.unfree; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.enorris ]; + maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; } diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 4e4d47733c7ca..38b6467857b81 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -69,6 +69,6 @@ buildGoModule rec { downloadPage = "https://github.com/argoproj/argo-cd"; homepage = "https://argo-cd.readthedocs.io/en/stable/"; license = licenses.asl20; - maintainers = with maintainers; [ shahrukh330 superherointj ]; + maintainers = with maintainers; [ shahrukh330 bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix new file mode 100644 index 0000000000000..215bcba832ec8 --- /dev/null +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, kubectl +}: + +buildGoModule rec { + pname = "arkade"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "arkade"; + rev = version; + sha256 = "0jv6pip3ywx8bx7m25fby6kl5irnjxvlpss2wkm615gv9ari21aq"; + }; + + CGO_ENABLED = 0; + + vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx"; + + # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true + subPackages = [ + "." + "cmd" + "pkg/apps" + "pkg/archive" + "pkg/config" + "pkg/env" + "pkg/helm" + "pkg/k8s" + "pkg/types" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/alexellis/arkade/cmd.GitCommit=ref/tags/${version}" + "-X github.com/alexellis/arkade/cmd.Version=${version}" + ]; + + buildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/arkade" \ + --prefix PATH : ${lib.makeBinPath [ kubectl ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alexellis/arkade"; + description = "Open Source Kubernetes Marketplace"; + license = licenses.mit; + maintainers = with maintainers; [ welteki ]; + }; +} diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix new file mode 100644 index 0000000000000..752c9b3c61727 --- /dev/null +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "clusterctl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "cluster-api"; + rev = "v${version}"; + sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780="; + }; + + vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + + subPackages = [ "cmd/clusterctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = let t = "sigs.k8s.io/cluster-api/version"; in [ + "-X ${t}.gitMajor=${lib.versions.major version}" + "-X ${t}.gitMinor=${lib.versions.minor version}" + "-X ${t}.gitVersion=v${version}" + ]; + + postInstall = '' + # errors attempting to write config to read-only $HOME + export HOME=$(mktemp -d) + + installShellCompletion --cmd clusterctl \ + --bash <($out/bin/clusterctl completion bash) \ + --zsh <($out/bin/clusterctl completion zsh) + ''; + + meta = with lib; { + description = "Kubernetes cluster API tool"; + homepage = "https://cluster-api.sigs.k8s.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix new file mode 100644 index 0000000000000..c42fb87d8079b --- /dev/null +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -0,0 +1,56 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "driftctl"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "cloudskiff"; + repo = "driftctl"; + rev = "v${version}"; + sha256 = "sha256-rWC4jqquVWJmHV/dnH+DsxlNiAY01xnq9z0/owS4Yis="; + }; + + vendorSha256 = "sha256-d8vASP8KnUeUkaHRU8kCE7FCt2QLGu5ET5BN3GM2O9c="; + + postUnpack = '' + # Without this, tests fail to locate aws/3.19.0.json + for prefix in / \ + /pkg \ + /pkg/analyser \ + /pkg/alerter \ + /pkg/remote \ + /pkg/middlewares \ + /pkg/cmd/scan/output \ + /pkg/iac/terraform/state \ + /pkg/iac/supplier ; do + mkdir -p ./source/$prefix/github.com/cloudskiff + ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl + done + + # Disable check for latest version and telemetry, which are opt-out. + # Making it out-in is quite a job, and why bother? + find -name '*.go' \ + | xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g' + + # and remove corresponding flags from --help, so things look tidy. + find -name driftctl.go | \ + xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d' + + # Presumably it can be done with ldflags, but I failed to find incantation + # that would work, we here we go old-school. + find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/' + find -name build.go | xargs sed -i -e 's/"dev"/"release"/' + + # Fix the tests that checks for dev-dev. + find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + ''; + + meta = with lib; { + description = "Tool to track infrastructure drift"; + homepage = "https://github.com/cloudskiff/driftctl"; + license = licenses.asl20; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 06a8f162ccbf4..3ff2621e29f3b 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.20.0"; - sha256 = "06n4d7l00lmrrs7s41mjfk06c0cj04v0s0mbs9b3ppzbws07wca5"; - manifestsSha256 = "03hfnqc19n3iz47a5137lmwq4mgd6dxcl6ml057kq1bxm2qsq3y4"; + version = "0.23.0"; + sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy"; + manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,7 +23,7 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-WkPdBipgEOBy0qjPaX7zGfspWfCtiFB1MUMHLlHGB/U="; + vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -66,6 +66,6 @@ buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre superherointj ]; + maintainers = with maintainers; [ jlesquembre bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix new file mode 100644 index 0000000000000..7214530a046db --- /dev/null +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "helm-docs"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "norwoodj"; + repo = "helm-docs"; + rev = "v${version}"; + sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk="; + }; + + vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w="; + + subPackages = [ "cmd/helm-docs" ]; + ldflags = [ + "-w" + "-s" + "-X main.version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/norwoodj/helm-docs"; + description = "A tool for automatically generating markdown documentation for Helm charts"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 425e7e2c2462d..f13c812d604df 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm"; - version = "3.7.0"; - gitCommit = "eeac83883cb4014fe60267ec6373570374ce770b"; + version = "3.7.1"; + gitCommit = "1d11fcb5d3f3bf00dbe6fe31b8412839a96b3dc4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-dV6Bx6XVzPqaRBeCzEFR473xnxjff4f24jd5vETVX78="; + sha256 = "sha256-NjBG3yLtvnAXziLH/ALRJVaFW327qo7cvnf1Jpq3QlI="; }; - vendorSha256 = "sha256-Q/ycpLCIvf+PP+03ug3fKT+uIOdzDwP7709VfFVJglk="; + vendorSha256 = "sha256-gmyF/xuf5dTxorgqvW4PNA1l2SQ2oJuZCAFw7d8ufGc="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index a802ce67941b3..d24dff6fb8a9a 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "helmfile"; @@ -15,17 +15,10 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ makeWrapper ]; - subPackages = [ "." ]; ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; - postInstall = '' - wrapProgram $out/bin/helmfile \ - --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} - ''; - meta = { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 508ea403c5fa2..acf9cea24e6b9 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.11.2"; + version = "1.11.4"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-4v/2lEq2BJX90P3UpSyDcHkxclMOTK9bmvyq0MyB7Pg="; + sha256 = "sha256-DkZRRjnTWziAL6WSPy5V8fgjpRO2g3Ew25j3F47pDnk="; }; - vendorSha256 = "sha256-TY7l5ttLKC3rqZ2kcy0l2gRXZg3vRrZBNzYsGerPe0k="; + vendorSha256 = "sha256-kioicA4vdWuv0mvpjZRH0r1EuosS06Q3hIEkxdV4/1A="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index b552af837bd05..689922515de55 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.10.4"; + version = "0.11.4"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-22jZWRnymIYN1LlGOo8abVx8DTUe9VK1xAHddLknt6A="; + sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 662f9df030503..f3b5e4cd70c9a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -13,7 +13,6 @@ , pkg-config , ethtool , util-linux -, ipset , fetchFromGitHub , fetchurl , fetchzip @@ -43,9 +42,9 @@ 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.22.2+k3s2"; # k3s git tag - k3sCommit = "3f5774b41eb475eb10c93bb0ce58459a6f777c5f"; # k3s git commit at the above version - k3sRepoSha256 = "1kjf2zkm5d3s1aj4w9gzsc3ms3a0cm900fyi9899ijczw1cbrc61"; + k3sVersion = "1.22.3+k3s1"; # k3s git tag + k3sCommit = "61a2aab25eeb97c26fa3f2b177e4355a7654c991"; # k3s git commit at the above version + k3sRepoSha256 = "0lz5hr3c86gxm9w5jy3g26n6a26m8k0y559hv6220rsi709j7ma9"; traefikChartVersion = "10.3.0"; # taken from ./manifests/traefik.yaml at spec.version traefikChartSha256 = "0y6wr64xp7bgx24kqil0x6myr3pnfrg8rw0d1h5zd2n5a8nfd73f"; @@ -60,7 +59,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank superherointj ]; + maintainers = with maintainers; [ euank ]; platforms = platforms.linux; }; @@ -257,7 +256,6 @@ stdenv.mkDerivation rec { bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 - ipset conntrack-tools ]; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index a41c3c0ad35bc..411efb6e527ee 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 = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 7cc11b1af60fd..23ff2202704bf 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -55,13 +55,13 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) jsonpath (0.9.9) multi_json to_regexp (~> 0.2.1) jwt (2.3.0) - krane (2.3.0) + krane (2.3.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -77,15 +77,15 @@ GEM recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) memoist (0.16.2) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) minitest (5.14.4) multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) - oj (3.13.8) - os (1.1.1) + oj (3.13.9) + os (1.1.4) public_suffix (4.0.6) rake (13.0.6) recursive-open-struct (1.1.3) @@ -108,7 +108,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby @@ -117,4 +117,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.2.20 + 2.2.24 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 13163c193e36f..d66f0e4cb09a8 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -244,10 +244,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; jsonpath = { dependencies = ["multi_json" "to_regexp"]; @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r4sfyapdqcgqns4skxwkxd9v7a4f0h7y7zrgyz7za1p56jmx9sr"; + sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; @@ -308,20 +308,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; + sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; type = "gem"; }; - version = "3.2021.0901"; + version = "3.2021.1115"; }; minitest = { groups = ["default"]; @@ -368,20 +368,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wk5vk0py65aqp3xrs8s8qkj8pw6xny5z5p9dx16qdx6j3zw5a6g"; + sha256 = "1hcmczbp9afxijzg0gvp9milyzk15phfmbpmmsj5ppmziwkdls16"; type = "gem"; }; - version = "3.13.8"; + version = "3.13.9"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; public_suffix = { groups = ["default"]; @@ -512,9 +512,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.1"; }; } diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 707abd5e2bf48..6ef24ded1a678 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FZbq7f8Urx3tlJOBPnPyp1enFsmtrxqNjR42CTNo6GI="; + sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; }; - vendorSha256 = "sha256-8Rg57Uj/hdNqAj40MKZ/5PObRkdsInbsRT1ZkRqGTfo="; + vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 2c571ff83a834..b30d6999470c4 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "5.0.0"; + version = "5.0.3"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1pkrcjr78xxw3idmyzpkbx0rp20972dl44bzwkkp06milrzsq27i"; + sha256 = "sha256-BUQG+Nq5BsL+4oBksL8Im9CtNFvwuaW/HebMp9VoORo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index eb29cba7de88b..02c1c834781ae 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -4,19 +4,20 @@ , makeWrapper , git , go +, gnumake }: buildGoModule rec { pname = "kubebuilder"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "0bl5ff2cplal6hg75800crhyviamk1ws85sq60h4zg21hzf21y68"; + sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; }; - vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; + vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; subPackages = ["cmd"]; @@ -33,7 +34,7 @@ buildGoModule rec { postInstall = '' mv $out/bin/cmd $out/bin/kubebuilder wrapProgram $out/bin/kubebuilder \ - --prefix PATH : ${lib.makeBinPath [ go ]} + --prefix PATH : ${lib.makeBinPath [ go gnumake ]} ''; allowGoReference = true; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 5efee961b424c..0169442e1bfe9 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubecfg"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA="; + sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 7249c2a5cef45..29a8388bd5cc4 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.10"; + version = "0.4.12"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D1/ljIOc5vK6HcYmk0WNnIRGBt1vJk9dGxl5GjhKhuA="; + sha256 = "sha256-03eGWuDV/GS2YgDQ7LaqonU7K/ohI8sQD4dXbJGXeXw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix new file mode 100644 index 0000000000000..bd160db33cb8a --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-evict-pod"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "rajatjindal"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Z4fJzU317p7K+klcDQAukXAfZOpHd3PlH5fKO0PgKHA="; + }; + + vendorSha256 = "sha256-8VTrywlzrzoBEi/xOqkwhGW/R2B2oGqgh01Gv9FcW80="; + + meta = with lib; { + description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; + homepage = "https://github.com/rajatjindal/kubectl-evict-pod"; + license = licenses.asl20; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 655150580b589..cbf14f43d2602 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7e1VQ9uXNj6Lmnl1IXHLcADSLuK7Jgiww8acxtD4xFM="; + sha256 = "sha256-pAvaScbwGJMW3iFS26D71nImWsXcEVx7ONUP82f6QDQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 13b15da38cdee..c974b830344b3 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-O+FY9wJ0fztO7i5qJfw+cfhfBgaMWKX7IBBXJV4uuCk="; + sha256 = "sha256-yXis1nq36MO/RnYLxOYBs6xnaTf9lk+VJBzSamrHcEU="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 6e04391d7a8a8..985ae17632363 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -2,13 +2,13 @@ let pname = "lens"; - version = "5.1.3"; - build = "${version}-latest.20210722.1"; + version = "5.2.6"; + build = "${version}-latest.20211104.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "1iwwyqpn1x1m8n22f99snlhcbcr65i4przx697hlbpmnm40dw7q9"; + sha256 = "1lkxzgwrgafraimpnciv89fs6r399275vb73drxlg5z83acacf5z"; name="${pname}.AppImage"; }; diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix new file mode 100644 index 0000000000000..ff91caf4095ee --- /dev/null +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "levant"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "levant"; + rev = "v${version}"; + sha256 = "9M7a4i+DPKb1H9jOEVAvhvYxGwtj3dK/40n4GSy4Rqo="; + }; + + vendorSha256 = "5JlrgmIfhX0rPR72sUkFcofw/iIbIaca359GN9C9dhU="; + + runVend = true; + + # The tests try to connect to a Nomad cluster. + doCheck = false; + + meta = with lib; { + description = "An open source templating and deployment tool for HashiCorp Nomad jobs"; + homepage = "https://github.com/hashicorp/levant"; + license = licenses.mpl20; + maintainers = with maintainers; [ max-niederman ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 82172ebb9925a..f2c4183f47930 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -54,6 +54,6 @@ buildGoModule rec { downloadPage = "https://github.com/linkerd/linkerd2/"; homepage = "https://linkerd.io/"; license = licenses.asl20; - maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ]; + maintainers = with maintainers; [ Gonzih bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 2a6d642d0c989..874a6fdecc4f6 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.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FRu1h6DT43rPaa9dcgz83w9K+xtzJgB4l/eTu+Fbb+c="; + sha256 = "sha256-uyLY2yH/6J0rtra0brBATadPqrNyyuCcaGfOrng9h4Y="; }; - vendorSha256 = "sha256-QFACe1/5MVbXKTknEyqjWclEQgJSZAJ/QljhLq/tWe4="; + vendorSha256 = "sha256-r7xzvntTIJocdYMQpFXunI2XV65eRG+piEEzS5N2xsY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -35,7 +35,9 @@ buildGoModule rec { --prefix CNI_PATH : "${cni-plugins}/bin" installShellCompletion --cmd nerdctl \ - --bash <($out/bin/nerdctl completion bash) + --bash <($out/bin/nerdctl completion bash) \ + --fish <($out/bin/nerdctl completion fish) \ + --zsh <($out/bin/nerdctl completion zsh) ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 9eabf0ac1b5db..047a472c39844 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -23,7 +23,7 @@ let ''; meta = old.meta // { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; @@ -61,12 +61,14 @@ let ).python; pkg = interpreter.pkgs.nixops.withPlugins(ps: [ - ps.nixops-encrypted-links - ps.nixops-hercules-ci - ps.nixops-virtd ps.nixops-aws + ps.nixops-digitalocean + ps.nixops-encrypted-links ps.nixops-gcp + ps.nixops-hercules-ci + ps.nixops-hetzner ps.nixopsvbox + ps.nixops-virtd ]) // rec { # Workaround for https://github.com/NixOS/nixpkgs/issues/119407 # TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; }) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 75b9471c9e09c..c05cf0038a3d9 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "35ac02085169bc2372834d6be6cf4c1bdf820d09"; - sha256 = "1jh0jrxyywjqhac2dvpj7r7isjv68ynbg7g6f6rj55raxcqc7r3j"; + rev = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771"; + sha256 = "16pwxs5bca6cd83f0rs4sf5r8yf07wmha051waysmxs9xxl856yc"; }; } ); @@ -15,8 +15,18 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48"; - sha256 = "15jz9x3ra3hsh6xj4cbri1fvvjk2rplnnhnccz7qc6f176b5r01j"; + rev = "83900880a413218020ddd91d6cd3f5b823acb3fb"; + sha256 = "17gf4vfcl1vx81y9vk26zzcj6kac41kfhzwcx15cj91ivqrgn3b2"; + }; + } + ); + + nixops-digitalocean = super.nixops-digitalocean.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-digitalocean.git"; + rev = "b527b4bd27a419753e38c8231fd7528b3ea33886"; + sha256 = "069jlgcjqgyb1v3dnrp2h0w4gv5hfx624iq2xazaix2wxpx9w7f8"; }; } ); @@ -51,6 +61,16 @@ self: super: { } ); + nixops-hetzner = super.nixops-hetzner.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/NixOS/nixops-hetzner"; + rev = "84f4eebb89b049c4f86aa779349397c3dedc0c43"; + sha256 = "0qx8v775jhlbqyhid8wkzy3xcha08kkzb42h6ayszwq4alyfx0b0"; + }; + } + ); + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 87d8fce2f23c2..413d440c8254b 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -8,11 +8,11 @@ python-versions = "*" [[package]] name = "apache-libcloud" -version = "3.3.1" +version = "3.4.1" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false -python-versions = ">=3.5.*, <4" +python-versions = ">=3.5, <4" [package.dependencies] requests = ">=2.5.0" @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.18.64" +version = "1.20.8" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.21.64,<1.22.0" +botocore = ">=1.23.8,<1.24.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.21.64" +version = "1.23.8" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -134,6 +134,14 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] +name = "hetzner" +version = "0.8.3" +description = "High level access to the Hetzner robot" +category = "main" +optional = false +python-versions = "*" + +[[package]] name = "idna" version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" @@ -143,7 +151,7 @@ python-versions = ">=3.5" [[package]] name = "imagesize" -version = "1.2.0" +version = "1.3.0" description = "Getting image size from png/jpeg/jpeg2000/gif file" category = "dev" optional = false @@ -151,7 +159,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jinja2" -version = "3.0.2" +version = "3.0.3" description = "A very fast and expressive template engine." category = "dev" optional = false @@ -172,8 +180,21 @@ optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] +name = "jsonpickle" +version = "2.0.0" +description = "Python library for serializing any arbitrary object graph into JSON" +category = "main" +optional = false +python-versions = ">=2.7" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"] +"testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] + +[[package]] name = "libvirt-python" -version = "7.8.0" +version = "7.9.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -206,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "35ac02085169bc2372834d6be6cf4c1bdf820d09" +resolved_reference = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771" [[package]] name = "nixops-aws" @@ -228,7 +249,26 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48" +resolved_reference = "83900880a413218020ddd91d6cd3f5b823acb3fb" + +[[package]] +name = "nixops-digitalocean" +version = "2.0" +description = "NixOps plugin for Digital Ocean" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} +python-digitalocean = "^1.15.0" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-digitalocean.git" +reference = "master" +resolved_reference = "b527b4bd27a419753e38c8231fd7528b3ea33886" [[package]] name = "nixops-encrypted-links" @@ -288,6 +328,27 @@ reference = "master" resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" [[package]] +name = "nixops-hetzner" +version = "1.0" +description = "NixOS deployment tool, but for hetzner" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +hetzner = "0.8.3" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops-hetzner" +reference = "master" +resolved_reference = "84f4eebb89b049c4f86aa779349397c3dedc0c43" + +[[package]] name = "nixops-virtd" version = "1.0" description = "NixOps plugin for virtd" @@ -344,14 +405,14 @@ resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" [[package]] name = "packaging" -version = "21.0" +version = "21.3" description = "Core utilities for Python packages" category = "dev" optional = false python-versions = ">=3.6" [package.dependencies] -pyparsing = ">=2.0.2" +pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" [[package]] name = "pluggy" @@ -374,7 +435,7 @@ python-versions = "*" [[package]] name = "pycparser" -version = "2.20" +version = "2.21" description = "C parser in Python" category = "main" optional = false @@ -390,11 +451,14 @@ python-versions = ">=3.5" [[package]] name = "pyparsing" -version = "2.4.7" +version = "3.0.6" description = "Python parsing module" category = "dev" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +python-versions = ">=3.6" + +[package.extras] +diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "python-dateutil" @@ -408,6 +472,18 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" six = ">=1.5" [[package]] +name = "python-digitalocean" +version = "1.17.0" +description = "digitalocean.com API to manage Droplets and Images" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +jsonpickle = "*" +requests = "*" + +[[package]] name = "pytz" version = "2021.3" description = "World timezone definitions, modern and historical" @@ -457,7 +533,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "snowballstemmer" -version = "2.1.0" +version = "2.2.0" description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." category = "dev" optional = false @@ -601,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "8a294b2745b271983bac54258b4f3a2ab3b2e5b218440329fa7eea482c63774f" +content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2" [metadata.files] alabaster = [ @@ -609,8 +685,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] apache-libcloud = [ - {file = "apache-libcloud-3.3.1.tar.gz", hash = "sha256:d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"}, - {file = "apache_libcloud-3.3.1-py2.py3-none-any.whl", hash = "sha256:c3722c4dd58b0ee4beaf4e615e0ba82505d9a915e55319dc84383687166a3eed"}, + {file = "apache-libcloud-3.4.1.tar.gz", hash = "sha256:88f18da0cf3fac0af723e743fb741d9d1be251881edab7a5a0d1629955b5011b"}, + {file = "apache_libcloud-3.4.1-py2.py3-none-any.whl", hash = "sha256:af1a5b3cda7bc3220093726ff67dbb70928521e2ec19d0e33a31b1e22fde1850"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -621,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.18.64-py3-none-any.whl", hash = "sha256:b4d6299dd16a3042b7750cde00fe38d57fd59d3ce242308ba8488618ca931694"}, - {file = "boto3-1.18.64.tar.gz", hash = "sha256:9223b433b0d3b74f2b9574fb3c384048998343ccd6b608044318a7f9b904f661"}, + {file = "boto3-1.20.8-py3-none-any.whl", hash = "sha256:c0ac23cc36dc484edd1edd28903b5712cb07507af1ae19b2e8d6db176416d9e2"}, + {file = "boto3-1.20.8.tar.gz", hash = "sha256:81ebdcabc534a52e2b7a2bfcbe1a1d7f1e34f028f7fe1cb16ccd80e34cea867a"}, ] botocore = [ - {file = "botocore-1.21.64-py3-none-any.whl", hash = "sha256:d57287377e4c7c7d7bf6c5fa39e02994de1d99fced9492a58a00e5a54bae1cca"}, - {file = "botocore-1.21.64.tar.gz", hash = "sha256:0a30dca4dad7d43fd856e671ace95f9afc4726caa1e22f0ae11b654fc76e0c7d"}, + {file = "botocore-1.23.8-py3-none-any.whl", hash = "sha256:a0c7cfea155a0202ab197a016736dd4e6a26f9e416bdd9cdd2c9a3fb88ffa5a8"}, + {file = "botocore-1.23.8.tar.gz", hash = "sha256:ae4ed9666199020a9e53c3d3efc0a7d417315cd2313b70cb013282afe70ac358"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -715,24 +791,31 @@ docutils = [ {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, ] +hetzner = [ + {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, +] idna = [ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] imagesize = [ - {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, - {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, + {file = "imagesize-1.3.0-py2.py3-none-any.whl", hash = "sha256:1db2f82529e53c3e929e8926a1fa9235aa82d0bd0c580359c67ec31b2fddaa8c"}, + {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, ] jinja2 = [ - {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"}, - {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"}, + {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, + {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] +jsonpickle = [ + {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, + {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, +] libvirt-python = [ - {file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"}, + {file = "libvirt-python-7.9.0.tar.gz", hash = "sha256:8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359"}, ] markupsafe = [ {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, @@ -772,15 +855,17 @@ markupsafe = [ ] nixops = [] nixops-aws = [] +nixops-digitalocean = [] nixops-encrypted-links = [] nixops-gcp = [] nixops-hercules-ci = [] +nixops-hetzner = [] nixops-virtd = [] nixopsvbox = [] nixos-modules-contrib = [] packaging = [ - {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, - {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, + {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, + {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -792,21 +877,25 @@ prettytable = [ {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, ] pycparser = [ - {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, - {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, + {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, + {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pygments = [ {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, ] pyparsing = [ - {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, - {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, + {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, + {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, ] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] +python-digitalocean = [ + {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, + {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, +] pytz = [ {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, @@ -824,8 +913,8 @@ six = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] snowballstemmer = [ - {file = "snowballstemmer-2.1.0-py2.py3-none-any.whl", hash = "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2"}, - {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, + {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, + {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] sphinx = [ {file = "Sphinx-3.5.4-py3-none-any.whl", hash = "sha256:2320d4e994a191f4b4be27da514e46b3d6b420f2ff895d064f52415d342461e8"}, diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 3cd3025b1fa55..89e6e34c771ec 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -8,10 +8,12 @@ authors = ["Adam Hoese <adam.hose@tweag.io>"] python = "^3.8" nixops = {git = "https://github.com/NixOS/nixops.git"} nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} -nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} -nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} +nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"} nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} +nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} +nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} +nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} [tool.poetry.dev-dependencies] diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 910317bd9673c..e70856ef9d904 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.7"; + version = "0.9.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; + sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q="; }; ldflags = [ @@ -21,6 +21,11 @@ buildGoModule rec { doCheck = true; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/popeye version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "A Kubernetes cluster resource sanitizer"; homepage = "https://github.com/derailed/popeye"; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 13d15d0bf6188..7f960931c100c 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3"; +let rev = "dc78b39a6ff0a1a94a29fa0fd72bcbe5d95004be"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.54.0"; # Do not forget to update `rev` above + version = "0.55.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs="; + sha256 = "sha256-fMZju0Cd1JtVC+EKHwW3ZGsB2m0V3UIHsKQMbvf4i5Y="; }; - vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; + vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 7cbb2328ae731..9d532a3861a1e 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; 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 089f0b7bd974e..b5c732282b9a9 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 60fdc69023247..a03f69a9fc0a7 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -38,6 +38,6 @@ buildGoModule rec { downloadPage = "https://github.com/temporalio/temporal"; homepage = "https://temporal.io"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index ed2409ead9a3e..5e8b0bdc0ab05 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: +{ buildGoModule, cdrtools, fetchFromGitHub, lib, libvirt, makeWrapper, pkg-config }: # USAGE: # install the following package globally or in nix-shell: @@ -9,33 +9,25 @@ # # virtualisation.libvirtd.enable = true; # -# terraform-provider-libvirt does not manage pools at the moment: -# -# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images -# $ virsh --connect "qemu:///system" pool-start default -# # pick an example from (i.e ubuntu): -# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples - -buildGoPackage rec { - pname = "terraform-provider-libvirt"; - version = "0.6.3"; +# https://github.com/dmacvicar/terraform-provider-libvirt/tree/main/examples - goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; +let + sha256 = "sha256-8GGPd0+qdw7s4cr0RgLoS0Cu4C+RAuuboZzTyYN/kq8="; + vendorSha256 = "sha256-fpO2sGM+VUKLmdfJ9CQfTFnCfxVTK2m9Sirj9oerD/I="; + version = "0.6.11"; +in buildGoModule { + inherit version; + inherit vendorSha256; - patches = [ - (fetchpatch { - name = "base_volume_copy.patch"; - url = "https://github.com/cyril-s/terraform-provider-libvirt/commit/52df264e8a28c40ce26e2b614ee3daea882931c3.patch"; - sha256 = "1fg7ii2fi4c93hl41nhcncy9bpw3avbh6yiq99p1vkf87hhrw72n"; - }) - ]; + pname = "terraform-provider-libvirt"; src = fetchFromGitHub { + inherit sha256; + owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -48,7 +40,12 @@ buildGoPackage rec { # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; + postBuild = "mv $GOPATH/bin/terraform-provider-libvirt{,_v${version}}"; + + ldflags = [ "-X main.version=${version}" ]; + passthru.provider-source-address = "registry.terraform.io/dmacvicar/libvirt"; + + doCheck = false; meta = with lib; { homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index ab3d07a7f47b7..4ea2194a03a3a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-lxd"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = "terraform-provider-lxd"; rev = "v${version}"; - sha256 = "sha256-ikI8LQ6qawdeUSb1Ee03H409DQw2M4QtsIxAESxXNRI="; + sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4="; }; - vendorSha256 = "sha256-IjpC7bFodqdrqVUEQdZBc6N8py5+t2kRYvcQiPr7CHc="; + vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ffcc0b3d43b11..2f2e143af7594 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -179,10 +179,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v2.23.0", - "sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l", - "vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962", - "version": "2.23.0" + "rev": "v3.4.0", + "sha256": "1w37wkpb785jfqq91piclcsrhy3idpbmwb90n5y7rkgmm37ij7ij", + "vendorSha256": "004pb5xnvisq3j113i6qfvnh1j06nkpkgzav3wb08k0bl19b6jks", + "version": "3.4.0" }, "cloudinit": { "owner": "hashicorp", @@ -229,12 +229,13 @@ "version": "0.1.0" }, "consul": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.8.0", - "sha256": "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4", - "version": "2.8.0" + "rev": "v2.14.0", + "sha256": "19kmjjg4f74askwwwslbh5wvi5ndcr4wzm0374qr8gc57qiwxkpy", + "vendorSha256": null, + "version": "2.14.0" }, "ct": { "owner": "poseidon", @@ -362,11 +363,13 @@ "version": "1.1.0" }, "github": { - "owner": "terraform-providers", + "owner": "integrations", + "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v3.1.0", - "sha256": "1xl4fd1lfbn1vnrdmg2xljnv8hy6rmf0iv7g8pzbnzbvj2pi7w3b", - "version": "3.1.0" + "rev": "v4.18.0", + "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "vendorSha256": null, + "version": "4.18.0" }, "gitlab": { "owner": "gitlabhq", @@ -687,11 +690,13 @@ "version": "0.0.1" }, "nomad": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.5", - "sha256": "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i", - "version": "1.4.5" + "rev": "v1.4.15", + "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", + "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", + "version": "1.4.15" }, "ns1": { "owner": "terraform-providers", @@ -1109,8 +1114,8 @@ "repo": "terraform-provider-vault", "rev": "v2.24.1", "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", - "version": "2.24.1", - "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48", + "version": "2.24.1" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f97bbce83faac..03d92452ebc21 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -165,7 +165,7 @@ if [[ -z "$vendorSha256" ]]; then vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then - vendorSha256=$(nix to-base32 "$vendorSha256") + vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256") fi fi fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8dfc8c701e3ab..036ee7d8243f0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.10"; - sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; - vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; + version = "1.0.11"; + sha256 = "0k05s4zm16vksq21f1q00y2lzfgi5fhs1ygydm8jk0srs9x8ask7"; + vendorSha256 = "1brgghl7fb26va4adix443rl1dkjaqrr4jkknxjkcaps0knqp172"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index d06393718a4b1..a8541336b3de3 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -1,28 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, ... }: +{ stdenv, lib, fetchFromGitHub, jq, nix, makeWrapper }: stdenv.mkDerivation rec { pname = "terranix"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-3N4a5VhZqIgJW11w8oJKJ9T8mhfwEM33kEwV/zZkCs8="; + sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk="; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - mkdir -p $out + mkdir -p $out/{bin,core,modules,lib} mv bin core modules lib $out/ + + wrapProgram $out/bin/terranix-doc-json \ + --prefix PATH : ${lib.makeBinPath [ jq nix ]} ''; meta = with lib; { description = "A NixOS like terraform-json generator"; homepage = "https://terranix.org"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mrVanDalo ]; }; - } - diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix new file mode 100644 index 0000000000000..9a1652f25d365 --- /dev/null +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -0,0 +1,21 @@ +{ buildGoPackage, lib, fetchFromGitHub }: +buildGoPackage rec { + pname = "tgswitch"; + version = "0.5.378"; + + src = fetchFromGitHub { + owner = "warrensbox"; + repo = "tgswitch"; + rev = version; + sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i"; + }; + + goPackagePath = "github.com/warrensbox/tgswitch"; + + meta = with lib; { + description = "A command line tool to switch between different versions of terragrunt"; + homepage = "https://github.com/warrensbox/tgswitch"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index eee449de53e3b..cd8d1f703d2d2 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.22.9"; + version = "0.22.15"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h19Cj4ztgypT/j1gB+PbvgDJ7jlJ3CYPEbK62tJeMss="; + sha256 = "sha256-Aim80bg1vGRkiIlVqDa4qOFQ+mwSOL75HOPYQYovYlE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 63afa5ce76f1d..e6dca02dace73 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; }) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch"; + sha256 = "1ig054rxn5r0ph4w4fhmrxlh158c97iqqc7dbnc819adn9nw96l5"; + }) ]; nativeBuildInputs = [ wrapPython ]; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 845d0f2779c24..9c4340fffedb3 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -26,6 +26,7 @@ let genericName = "File Synchronizer"; categories = "Network;FileTransfer;"; startupNotify = "false"; + icon = "dropbox"; }; in diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix new file mode 100644 index 0000000000000..9bb34ffbbd709 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems +, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "indigenous-desktop"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip"; + sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + unzip + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "indigenous-desktop"; + icon = "indigenous-desktop"; + comment = meta.description; + desktopName = "Indigenous"; + genericName = "Feed Reader"; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps + cp -r ./ $out/opt/indigenous + mv $out/opt/indigenous/{locales,resources} $out/share/indigenous + mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png + + makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \ + --add-flags $out/share/indigenous/resources/app + + runHook postInstall + ''; + + meta = with lib; { + description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; + homepage = "https://indigenous.realize.be/indigenous-desktop"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 012d00026cf54..fdecf62c6a437 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; - rev = "v.${version}"; - hash = "sha256-c/zT+FNRDu7jdooNTEYbeG9jLrL+9txe+aC7nSy4bB0="; + rev = version; + hash = "sha256-fLG7oYt+gdl3Lwnu6c7VLJWSHCFY5LyNeDKoUNGg3Yw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yTElaPSoTiJpfIGzuNJCWxVzdWBzim5rt0N2r0ARhvM="; + hash = "sha256-dQlbK3SfY6p1xinroXz5wcaBbq2LuDM9sMlfJ6ueTTg="; }; patches = [ @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with maintainers; [ kira-bruneau stunkymonkey ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 424c67721046d..145fae2553a20 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils +, autoconf, automake, curl, iprange, iproute2, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL @@ -35,13 +35,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - curl iprange iproute2 ipset iptables iputils kmod + curl iprange iproute2 iptables iputils kmod nettools procps tcpdump traceroute util-linux whois ]; preConfigure = "./autogen.sh"; configureFlags = [ "--localstatedir=/var" - "--disable-doc" "--disable-man" ] ++ + "--disable-doc" "--disable-man" + "--disable-update-ipsets" ] ++ lib.optional onlyQOS [ "--disable-firehol" ]; meta = with lib; { diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 22fd08e3f4a87..cfb105943ef4a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.149"; + version = "3.1.153"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg"; + sha256 = "sha256-xGGSm6IXTh89wSt0/DNgbe1mFBNuG9x3YLerJcBYMmI="; }; postPatch = '' diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index c6015a6696380..411031f605edc 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -52,15 +52,16 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/Alecaddd/taxi"; description = "The FTP Client that drives you anywhere"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; - }; - - passthru.updateScript = nix-update-script { - attrPath = pname; + mainProgram = "com.github.alecaddd.taxi"; }; } diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 99e3a90b60b62..7a24151993757 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -16,9 +16,6 @@ mkDerivation rec { mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino" - ''; meta = with lib; { description = "A chat client for Twitch chat"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a359f0a4ac0f4..cd29268bec68f 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -3,6 +3,7 @@ , electron , esbuild , fetchFromGitHub +, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper @@ -14,6 +15,33 @@ }: let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + version = "1.60.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${old.pname}-${version}"; + sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + }; + patches = [ + # https://github.com/deltachat/deltachat-core-rust/pull/2589 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; + sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; + }) + ./no-static-lib.patch + # https://github.com/deltachat/deltachat-core-rust/pull/2660 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; + sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; + }) + ]; + }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else @@ -38,7 +66,7 @@ in nodePackages.deltachat-desktop.override rec { ]; buildInputs = [ - libdeltachat + libdeltachat' ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch new file mode 100644 index 0000000000000..95238cf885242 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe7abe08..acdbe0d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,6 @@ find_program(CARGO cargo) + + add_custom_command( + OUTPUT +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND +@@ -38,13 +37,11 @@ add_custom_target( + lib_deltachat + ALL + DEPENDS +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + include(GNUInstallDirs) + 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.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml +index a34a27ba..cf354abb 100644 +--- a/deltachat-ffi/Cargo.toml ++++ b/deltachat-ffi/Cargo.toml +@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] + + [lib] + name = "deltachat" +-crate-type = ["cdylib", "staticlib"] ++crate-type = ["cdylib"] + + [dependencies] + deltachat = { path = "../", default-features = false } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index 162de501e6175..dbe249d56dae6 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq nix-prefetch +#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch set -euo pipefail cd "$(dirname "$0")" @@ -13,7 +13,7 @@ rev=$( jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output ) ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(sed -n 's/.*\bversion = "\(.*\)".*/\1/p' default.nix) +old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) if [ "$ver" = "$old_ver" ]; then echo "Up to date: $ver" exit @@ -21,9 +21,12 @@ fi echo "$old_ver -> $ver" sha256=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -sed -e "s#\\bversion = \".*\"#version = \"$ver\"#" \ - -e "s#\\bsha256 = \".*\"#sha256 = \"$sha256\"#" \ - -i default.nix +tac default.nix \ + | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ + -e "0,/sha256 = \".*\"/s//sha256 = \"$sha256\"/" \ + | tac \ + | sponge default.nix + src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","esbuild","electron-builder","electron-devtools-installer","electron-notarize","esbuild","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 18f73de2fd5b0..5e362784c811b 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -5,7 +5,7 @@ , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c , libgcrypt -, epoxy +, libepoxy , at-spi2-core , sqlite , dbus @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - epoxy + libepoxy at-spi2-core dbus icu diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 2d67236c90eb9..5943917dc659b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver + libXtst nspr nss libxcb pango libXScrnSaver libappindicator-gtk3 libdbusmenu ]; 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 fbc61c23b5c4a..235955ac14e53 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.9.3", + "version": "1.9.4", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,7 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", - "allchange": "^1.0.2", + "allchange": "^1.0.5", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "13.5", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index dd7c6f0c573ed..bce13052e5ac4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -16,7 +16,7 @@ }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 33af19a9a5766..fae96e8e5e7ae 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, jq, conf ? {} }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org piwik = false; # disable analytics diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 432d69ac7a47e..ae9627afe30d6 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -2,7 +2,7 @@ , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in stdenv.mkDerivation rec { pname = "keytar"; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index dfb9791b3aa9b..6d47eb9fe7118 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.9.3", - "desktopSrcHash": "Pb9iiCYtmuD6DzdvgY8c6pCFdVAxIIUZTWLCa7y5RMI=", - "desktopYarnHash": "0iwbszhaxaxggymixljzjb2gqrsij67fwakxhd3yj9g1zds49ghh", - "webHash": "06lpb8i7fyimm06y6h3ngh19bx416if9lvs2ah2112vx28hs14zp" + "version": "1.9.4", + "desktopSrcHash": "sTY55DWeEKV3Ma5DTr4W6K6BjrE019aY8LRk/5f8pPM=", + "desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298", + "webHash": "141iz2jcvwyv3fpi63ddi697qzkk6jg100d0lz6iam98m8m35g24" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index ff3b2ba9134d1..de38c7a90bad0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in rustPlatform.buildRustPackage rec { pname = "seshat-node"; diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 05ba66f937037..a1c63cc9837fb 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.2"; + version = "5.6.3"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-8rB7SnaIaeCXAaKELNO1CnxpV8TyeKRCVamwpATeia4="; + sha256 = "sha256-cfX3x0ZRxT6sxMm20uL8lKhMbrI/yiCHVrBTPKIlDSE="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix b/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix index 019ffb468d279..8cb748f540599 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client-gnome.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation { dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + # Users that set CLUTTER_BACKEND=wayland in their default environment will + # encounter a segfault due to: + # https://git.jami.net/savoirfairelinux/jami-client-gnome/-/issues/1100 . + qtWrapperArgs+=("--unset" "CLUTTER_BACKEND") ''; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches index 2e106289a9628..5b9579f8f94e8 100644 --- a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches +++ b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches @@ -1,20 +1 @@ -0001-rfc6544.patch -0002-rfc2466.patch -0003-add-tcp-keep-alive.patch -0004-multiple_listeners.patch -0005-fix_ebusy_turn.patch -0006-ignore_ipv6_on_transport_check.patch -0007-upnp-srflx-nat-assisted-cand.patch -0008-fix_ioqueue_ipv6_sendto.patch 0009-add-config-site.patch -0010-fix-tcp-death-detection.patch -0011-fix-turn-shutdown-crash.patch -0012-ignore-down-interfaces.patch -0013-ignore-addresses-for-RFC7335.patch -0014-fix-socket-leak.patch -0015-fix-socktype-and-duplicate-checking.patch -0016-use-larger-Ta-interval.patch -0017-auto-register-thread.patch -0018-fix-ioqueue-lock-acquire.patch -0019-resort-check-list-after-adding-prflx.patch -0020-avoid-immediate-nominating-triggered-check.patch diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 456ca85ed12c0..a324d061aa73e 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -3,6 +3,7 @@ , jami-meta , stdenv , lib +, fetchFromGitHub , autoreconfHook , pkg-config , perl # for pod2man @@ -49,13 +50,23 @@ let ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); outputs = [ "out" "doc" ]; + meta = old.meta // { + # undefined reference to `ff_nlmeans_init_aarch64' + broken = stdenv.isAarch64; + }; }); pjsip-jami = pjsip.overrideAttrs (old: let + src-args = import ./pjproject-src.nix; + version = lib.concatStrings (lib.lists.take 7 (lib.stringToCharacters src-args.rev)); patch-src = src + "/daemon/contrib/src/pjproject/"; in { + inherit version; + + src = fetchFromGitHub src-args; + patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); }); @@ -64,7 +75,8 @@ let enablePushNotifications = true; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "jami-daemon"; inherit src version; sourceRoot = "source/daemon"; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ee9762a8f0328..e3bf7054949d0 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -8,11 +8,11 @@ }: rec { - version = "20211005.2.251ac7d"; + version = "20211104.2.e80361d"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - sha256 = "12ppbwhnk5zajb73szd04sz80bp17q577bkb9j8p45apvq201db3"; + sha256 = "1l48svppshh8mg7y1dymnh0rgwswy4qwdyl7qlg25mmh4y1li21f"; stripRoot = false; extraPostFetch = '' diff --git a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix new file mode 100644 index 0000000000000..1681769248711 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix @@ -0,0 +1,6 @@ +{ + owner = "savoirfairelinux"; + repo = "pjproject"; + rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a"; + sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y="; +} diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh index 22233a81bf8d8..10d9bb885c35d 100755 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ b/pkgs/applications/networking/instant-messengers/jami/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts +#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch set -e @@ -40,3 +40,11 @@ echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86" pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p') echo -e "Patches for pjsip:\n${pjsip_patches}\n" echo "${pjsip_patches}" > "$config_dir/pjsip_patches" + +# Update pjsip version +pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) +nix-prefetch fetchFromGitHub \ + --owner savoirfairelinux \ + --repo pjproject \ + --rev ${pjsip_version} \ + --output nix > "${jami_dir}/pjproject-src.nix" diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index a7cd9116195b9..c9cbdd3798641 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-2021-09-10"; + version = "unstable-2021-10-27"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "40092aa096bac7e279eb5a4cc97758bac484236c"; - sha256 = "0vmsbxx4hxh35v1lbj82vq2w8z8inj83xpf24wzlbdr9inlbmym4"; + rev = "e1201cdcce4311061643d90cc0132745023a82d2"; + sha256 = "04xqvyj4rzgl9r7sfjjw1kc3vql30c80rwppff2zr5aijr15fgjj"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 2ebf762c418b6..ad3248fabba94 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "matrix-commander"; - version = "unstable-2021-05-26"; + version = "unstable-2021-08-05"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; - rev = "06b4738bc74ee86fb3ac88c04b8230abf82e7421"; - sha256 = "1skpq3xfnz11m298qnsw68xv391p5qg47flagzsk86pnzi841vc1"; + rev = "7ab3fd9a0ef4eb19d882cb3701d2025b4d41b63a"; + sha256 = "sha256-WWf7GbJxGlqIdsS1d0T1DO0WN2RBepHGgJrl/nt7UIg="; }; buildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation { pillow urllib3 aiofiles + notify2 ]))]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 7c5bff9408480..2ca94953c4f6b 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, pkg-config, glib, loudmouth, libotr +{ lib, stdenv, fetchurl, fetchpatch, openssl, ncurses, pkg-config, glib, loudmouth, libotr , gpgme }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; + patches = [ + # Pull upstream patch for ncurses-6.3. + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/McKael/mcabber/commit/5a0893d69023b77b7671731defbdca5d47731130.patch"; + sha256 = "01bc23z0mva9l9jv587sq2r9w3diachgkmb9ad99hlzgj02fmq4v"; + stripLen = 1; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index b097864af431f..2a2c25e5593c9 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -18,10 +18,12 @@ , mtxclient , boost17x , spdlog -, fmt , olm , pkg-config , nlohmann_json +, coeurl +, libevent +, curl , voipSupport ? true , gst_all_1 , libnice @@ -29,13 +31,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-w4l91/W6F1FL+Q37qWSjYRHv4vad/10fxdKwfNeEwgw="; + sha256 = "1akhnngxkxbjwjkg5ispl6j5s2ylbcj92r3zxqqry4gbfxbjpx8k"; }; nativeBuildInputs = [ @@ -52,7 +54,6 @@ mkDerivation rec { libsecret lmdb spdlog - fmt cmark qtbase qtmultimedia @@ -60,6 +61,9 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects qtkeychain + coeurl + libevent + curl ] ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optionals voipSupport (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 153819fc8417b..9722d3b89e325 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, installShellFiles, + setuptools, installShellFiles, nixosTests, pytest, faker, pytest-aiohttp, aioresponses, @@ -63,6 +63,10 @@ buildPythonApplication rec { installManPage docs/man/*.[1-9] ''; + passthru.tests = { + inherit (nixosTests) pantalaimon; + }; + meta = with lib; { description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix new file mode 100644 index 0000000000000..b274b55ac228a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pidgin, glib, json-glib, protobuf, protobufc }: + +stdenv.mkDerivation { + pname = "purple-googlechat"; + version = "unstable-2021-10-18"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-googlechat"; + rev = "56ba7f79883eca67d37629d365776f6c0b40abdc"; + sha256 = "sha256-iTYVgYI9+6rqqBl5goeEAXpK8FgHDv0MmPsV/82reWA="; + }; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + + meta = with lib; { + homepage = "https://github.com/EionRobb/purple-googlechat"; + description = "Native Google Chat support for pidgin"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index 2170aac16e053..c0497ed86ce14 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "purple-lurch"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "gkdr"; repo = "lurch"; rev = "v${version}"; - sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz"; + sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index a7ea5bee30891..bd6febeaf9d13 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11 -, gtkspell2, aspell -, gst_all_1, startupnotification, gettext -, perlPackages, libxml2, nss, nspr, farstream -, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn -, lib, python3, libICE, libXext, libSM -, libgnt, ncurses -, cyrus_sasl ? null -, openssl ? null -, gnutls ? null -, libgcrypt ? null -, plugins, symlinkJoin -, cacert +{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell +, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss +, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn +, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl +, gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true }: # FIXME: clean the mess around choosing the SSL library (nss by default) let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - majorVersion = "2"; - version = "${majorVersion}.14.8"; + version = "2.14.8"; src = fetchurl { - url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z"; }; @@ -32,7 +23,7 @@ let unwrapped = stdenv.mkDerivation rec { buildInputs = let python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); in [ - aspell startupnotification + aspell libstartup_notification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr libXScrnSaver python-with-dbus @@ -40,17 +31,16 @@ let unwrapped = stdenv.mkDerivation rec { libICE libXext libSM cyrus_sasl libgnt ncurses # optional: build finch - the console UI ] - ++ (lib.optional (openssl != null) openssl) - ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) - ++ (lib.optional (stdenv.isDarwin) gtk2-x11); + ++ lib.optional withOpenssl openssl + ++ lib.optionals withGnutls [ gnutls libgcrypt ] + ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] + ++ lib.optional stdenv.isDarwin gtk2-x11; propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) - ++ (lib.optional (stdenv.isLinux) gtk2) - ++ (lib.optional (stdenv.isDarwin) gtk2-x11); + ++ lib.optional stdenv.isLinux gtk2 + ++ lib.optional stdenv.isDarwin gtk2-x11; patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; @@ -66,9 +56,9 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-tcl" "--disable-gevolution" ] - ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) - ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) - ++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); + ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] + ++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"] + ++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"]; enableParallelBuilding = true; @@ -90,12 +80,12 @@ let unwrapped = stdenv.mkDerivation rec { ''; passthru = { - makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${majorVersion}"; + makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}"; }; meta = with lib; { description = "Multi-protocol instant messaging client"; - homepage = "http://pidgin.im"; + homepage = "https://pidgin.im/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; @@ -103,7 +93,7 @@ let unwrapped = stdenv.mkDerivation rec { }; in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; + else callPackage ./wrapper.nix { + inherit plugins; pidgin = unwrapped; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 095f838fe981e..d5641c24fb07a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, pidgin, makeWrapper, plugins }: +{ lib, symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; @@ -11,10 +11,10 @@ in symlinkJoin { postBuild = '' wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version} $out/lib/pidgin" \ ${toString extraArgs} wrapProgram $out/bin/finch \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version}" \ ${toString extraArgs} ''; } diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 9b15e12d66fc2..42671f5d974b4 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoconf-archive , autoreconfHook , cmocka @@ -46,6 +47,23 @@ stdenv.mkDerivation rec { patches = [ ./patches/packages-osx.patch + + # pullupstream fixes for ncurses-6.3 + (fetchpatch { + name = "ncurses-6.3-p1.patch"; + url = "https://github.com/profanity-im/profanity/commit/e5b6258c997d4faf36e2ffb8a47b386c5629b4eb.patch"; + sha256 = "sha256-4rwpvsgfIQ60GcLS0O7Hyn7ZidREjYT+dVND54z0zrw="; + }) + (fetchpatch { + name = "ncurses-6.3-p2.patch"; + url = "https://github.com/profanity-im/profanity/commit/fd9ccec8dc604902bbb1d444dba4223ccee0a092.patch"; + sha256 = "sha256-4gZaXoDNulBIR+e6y/9bJKXVactCHWS8H8lPJaJwVwE="; + }) + (fetchpatch { + name = "ncurses-6.3-p3.patch"; + url = "https://github.com/profanity-im/profanity/commit/242696f09a49c8446ba6aef8bdad65fb58a77715.patch"; + sha256 = "sha256-BOYHkae9aIA7HaVM23Yu25TTK9e3SuV+u0FEi7Sn62I="; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fae4eff734e2d..b8ee5182c26b1 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,43 +40,15 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation { +mkDerivation rec { pname = "psi-plus"; - - # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi - # and “-R” ending is optional revision number. - # - # The “psi-plus-snapshots” generally provides snapshots of these separate - # repositories glued together (there are also dependencies/libraries): - # - # 1. Psi - # 2. Plugins pack for Psi - # 3. “psimedia” plugin - # 4. Resources for Psi (icons, skins, sounds) - # - # “X.X.XXXX” is literally a version of Psi. - # So often when for instance plugins are updated separately a new snapshot is - # created. And that snapshot would also be linked to “X.X.XXXX” version. - # So many commits may have the same associated version of the snapshot. - # But mind that only one Git tag is created for “X.X.XXXX” version. - # - # It’s not yet defined in the Psi+ project what value to use as a version for - # any further releases that don’t change Psi version. - # - # Let’s do what Debian does for instance (appends “-R” where “R” is a revision - # number). - # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ - # - # This has been communicated with the Psi+ main devs in this XMPP MUC chat: - # psi-dev@conference.jabber.ru - # - version = "1.5.1556-2"; + version = "1.5.1576"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; - sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; + rev = version; + sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 97d8d39f65671..0aa2d4cc6771d 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,15 +1,27 @@ -{ mkDerivation, lib, fetchurl, pkg-config, makeDesktopItem -, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols -, openssl, protobuf, qmake +{ mkDerivation +, lib +, fetchFromGitHub +, pkg-config +, makeDesktopItem +, qtbase +, qttools +, qtmultimedia +, qtquick1 +, qtquickcontrols +, openssl +, protobuf +, qmake }: mkDerivation rec { pname = "ricochet"; version = "1.1.4"; - src = fetchurl { - url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz"; - sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf"; + src = fetchFromGitHub { + owner = "ricochet-im"; + repo = "ricochet"; + rev = "v${version}"; + sha256 = "sha256-CGVTHa0Hqj90WvB6ZbA156DVgzv/R7blsU550y2Ai9c="; }; desktopItem = makeDesktopItem { @@ -23,8 +35,13 @@ mkDerivation rec { }; buildInputs = [ - qtbase qttools qtmultimedia qtquick1 qtquickcontrols - openssl protobuf + qtbase + qttools + qtmultimedia + qtquick1 + qtquickcontrols + openssl + protobuf ]; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 36e7a651eb3e9..73886d1cc52a5 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -1,16 +1,20 @@ -{ lib, stdenv, pkgs, fetchurl }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook }: let libPathNative = { packages }: lib.makeLibraryPath packages; in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.5.7"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "1ri8a60fsbqgq83f8wkyfnd59nqk4d0gpz1vanj54769zflpl71s"; + sha256 = "1691mzg52hkvkzm4pvmjyc3n04ppxk36rjk7zxh8682ciszz9pl3"; }; + nativeBuildInputs = [ + wrapGAppsHook #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix + ]; + buildInputs = with pkgs; [ gtk3 stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index 015c44e428bd1..c1bfc98047bec 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -8,7 +8,7 @@ }: let - pinData = builtins.fromJSON (builtins.readFile ./pin.json); + pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 29d4c3600c390..76e6dc0f3d06c 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: -let version = "1.63"; -in python3Packages.buildPythonPackage { - name = "scudcloud-${version}"; +python3Packages.buildPythonPackage rec { + pname = "scudcloud"; + version = "1.63"; - src = fetchurl { - url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz"; - sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; + src = fetchFromGitHub { + owner = "raelgc"; + repo = "scudcloud"; + rev = "v${version}"; + sha256 = "sha256-b8+MVjYKbSpnfM2ow2MNVY6MiT+urpNYDkFR/yUC7ik="; }; propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 33a746e0395b0..59ff3554ebf51 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.9.0"; + version = "0.9.2"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-wk8kk+PG0nw2OE7mccGjP435SEytStRy1unxg6EqP/8="; + sha256 = "sha256-CumrIlOPmvQ3x7Ua5I2G7ZlTSAbhLgAQMPUg4I5WCeQ="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 01a214bed2331..20e5898133819 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,7 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, sqlcipher }: let @@ -23,42 +22,9 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); - sqlcipher-signal = sqlcipher.overrideAttrs (_: { - # Using the same features as the upstream signal sqlcipher build - # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi - CFLAGS = [ - "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" - "-DSQLITE_THREADSAFE=2" - "-DSQLITE_USE_URI=0" - "-DSQLITE_DEFAULT_MEMSTATUS=0" - "-DSQLITE_OMIT_DEPRECATED" - "-DSQLITE_OMIT_GET_TABLE" - "-DSQLITE_OMIT_TCL_VARIABLE" - "-DSQLITE_OMIT_PROGRESS_CALLBACK" - "-DSQLITE_OMIT_SHARED_CACHE" - "-DSQLITE_TRACE_SIZE_LIMIT=32" - "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" - "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" - "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" - "-DSQLITE_ENABLE_COLUMN_METADATA" - "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - "-DSQLITE_ENABLE_STAT4" - "-DSQLITE_ENABLE_FTS5" - "-DSQLITE_ENABLE_JSON1" - "-DSQLITE_ENABLE_RTREE" - "-DSQLITE_INTROSPECTION_PRAGMAS" - - # SQLCipher-specific options - "-DSQLITE_HAS_CODEC" - "-DSQLITE_TEMP_STORE=2" - "-DSQLITE_SECURE_DELETE" - ]; - - LDFLAGS = [ "-lm" ]; - }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.22.0"; # Please backport all updates to the stable channel. + version = "5.24.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: @@ -68,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1y88qw57wk187fjb05zqvagv4pamc8171xwvznqb2k0vclsg82j8"; + sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy"; }; nativeBuildInputs = [ @@ -153,7 +119,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 4f876013903e2..1e2d87f031e58 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.20.0"; - x86_64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w"; + x86_64-darwin-version = "4.21.1"; + x86_64-darwin-sha256 = "1xhhll7mbz3f98xd2pzhyv3a49sam2v9fmvglmsvnkrmqppzsr4g"; - x86_64-linux-version = "4.20.0"; - x86_64-linux-sha256 = "1r8w8s3y74lh4klsmzq2d3f0h721b3a2b53nx8v7b0s6j8w0g0mh"; + x86_64-linux-version = "4.21.1"; + x86_64-linux-sha256 = "0mmpvrg2gfjarhrh0cy6axmhbx8v8rkn51gyp9xhr9ll9zrjpvjq"; - aarch64-darwin-version = "4.20.0"; - aarch64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w"; + aarch64-darwin-version = "4.21.1"; + aarch64-darwin-sha256 = "1rkixwg0b0nqp7wzvm24qskc9q3cl43fqfbkv6i2qkrrhpyr3zqw"; version = { x86_64-darwin = x86_64-darwin-version; 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 d9f9cd91a52da..cb4f3e5e5d156 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -4,7 +4,7 @@ , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, pcre, xorg, util-linux, libselinux, libsepol, libepoxy , at-spi2-core, libXtst, libthai, libdatrie }: @@ -41,7 +41,7 @@ in mkDerivation rec { tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol epoxy + pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy at-spi2-core libXtst libthai libdatrie ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5cbb2d974701d..1611185ca7246 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -37,7 +37,7 @@ , libXdmcp , libselinux , libsepol -, epoxy +, libepoxy , at-spi2-core , libXtst , libthai @@ -66,7 +66,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.9"; + version = "3.1.11"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -75,7 +75,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1nmakl9jxmw3k8gka56cyywbjwv06a5983dy6h9jhkkq950fn33s"; + sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn"; }; postPatch = '' @@ -135,7 +135,7 @@ mkDerivation rec { libXdmcp libselinux libsepol - epoxy + libepoxy at-spi2-core libXtst libthai diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 60baf734aa1a5..878fea994db3e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-09-15"; + version = "unstable-2021-10-21"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "575fb17d2853c43329e45f6693370f5e41668055"; - sha256 = "17lhy5g4apdakspv75zm070k7003crf1i80m8wy8f631s86v30md"; + rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138"; + sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index bff3d3769a7a1..3b69aa5566dc0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library"; downloadPage = "https://github.com/kenorb-contrib/tg"; license = licenses.gpl2Only; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 172d11f6b857d..943ec299cdbd7 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,17 +1,24 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake -, makeDesktopItem }: +{ mkDerivation +, lib +, stdenv +, fetchgit +, qtbase +, qtquickcontrols +, qmake +, makeDesktopItem +}: # we now have libqmatrixclient so a future version of tensor that supports it # should use that mkDerivation rec { - pname = "tensor-git"; - version = "2017-02-21"; + pname = "tensor"; + version = "unstable-2017-02-21"; src = fetchgit { - url = "https://github.com/davidar/tensor.git"; - rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; fetchSubmodules = true; }; @@ -19,14 +26,14 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; desktopItem = makeDesktopItem { - name = "tensor"; - exec = "@bin@"; - icon = "tensor.png"; - comment = meta.description; + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; }; installPhase = if stdenv.isDarwin then '' @@ -34,7 +41,6 @@ mkDerivation rec { mkdir -p $out/Applications cp -r tensor.app $out/Applications/tensor.app - wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor runHook postInstall '' else '' diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 3082748a35185..a6d6cac4ac764 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl +{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl , libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E="; }; + patches = [ + # Pending for upstream inclusion fix for ncurses-6.3 compatibility. + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch"; + sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0="; + }) + ]; + makeFlags = [ "PREFIX=$(out)"]; installFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 256e026a060e0..42dd9f835c9ad 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,7 +1,30 @@ -{ lib, fetchpatch, python3Packages }: +{ lib +, fetchpatch +, fetchFromGitHub +, python3 +}: -with lib; -with python3Packages; +let + py = python3.override { + packageOverrides = self: super: { + + # Support for later tweepy releases is missing + # https://github.com/louipc/turses/issues/12 + tweepy = super.tweepy.overridePythonAttrs (oldAttrs: rec { + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "tweepy"; + repo = "tweepy"; + rev = "v${version}"; + sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw"; + }; + doCheck = false; + }); + }; + }; +in +with py.pkgs; buildPythonPackage rec { pname = "turses"; @@ -12,8 +35,18 @@ buildPythonPackage rec { sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; }; - checkInputs = [ mock pytest coverage tox ]; - propagatedBuildInputs = [ urwid tweepy future ]; + propagatedBuildInputs = with py.pkgs; [ + urwid + tweepy + future + ]; + + checkInputs = with py.pkgs; [ + mock + pytest + coverage + tox + ]; LC_ALL = "en_US.UTF-8"; @@ -29,6 +62,17 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "urwid==1.3.0" "urwid" \ + --replace "future==0.14.3" "future" \ + --replace "tweepy==3.3.0" "tweepy" + substituteInPlace tests/test_config.py \ + --replace "config.generate_config_file.assert_called_once()" "assert config.generate_config_file.call_count == 1" + substituteInPlace tests/test_meta.py \ + --replace "self.observer.update.assert_called_once()" "assert self.observer.update.call_count == 1" + ''; + checkPhase = '' TMP_TURSES=`echo turses-$RANDOM` mkdir $TMP_TURSES @@ -36,18 +80,10 @@ buildPythonPackage rec { rm -rf $TMP_TURSES ''; - postPatch = '' - sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py - sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py - sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py - sed -i -e "s|config.generate_config_file.assert_called_once()|assert config.generate_config_file.call_count == 1|" tests/test_config.py - sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py - ''; - meta = with lib; { - homepage = "https://github.com/louipc/turses"; description = "A Twitter client for the console"; - license = licenses.gpl3; + homepage = "https://github.com/louipc/turses"; + license = licenses.gpl3Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 53eea50767f56..97df6d643c88e 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "viber"; - version = "13.3.1.22"; + version = "16.1.0.37"; src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "http://web.archive.org/web/20210602004133/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; + url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 4e61f39cac58a..0d5355a1eb4d2 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,25 +1,26 @@ { fetchFromGitHub , lib , stdenv -, gtkmm3 -, webkitgtk , cmake -, pkg-config -, libappindicator-gtk3 +, glib-networking , gst_all_1 +, gtkmm3 +, libappindicator-gtk3 , pcre +, pkg-config +, webkitgtk , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A="; + sha256 = "sha256-VdkCjzmZqP/ZVY1H9FxBGe5rN0nZEPZbMp3MVKL6WLc="; }; nativeBuildInputs = [ @@ -29,14 +30,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtkmm3 - webkitgtk - libappindicator-gtk3 + glib-networking + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav + gtkmm3 + libappindicator-gtk3 pcre + webkitgtk ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d04f2d18f97a1..9b3ab777b0533 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.3.145"; + version = "5.8.4.210"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr"; + sha256 = "1qjr35wg1jk6a6c958s0hbgqqczq789iim77s02yqpy5kyjbnn1n"; }; }; diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index f45f803e805f6..d807e3bd03094 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ libressl ncurses ]; strictDeps = true; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://git.causal.agency/catgirl/about/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 9148a26567dff..df7168ac308ea 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { install_name_tool \ -add_rpath @executable_path/../Frameworks \ $out/Applications/Communi.app/Contents/MacOS/Communi - - wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi '' else '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 93056ef399fb4..18a9a8882fac2 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; - installPhase = '' - make install PREFIX=$out - ''; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = { homepage = "https://tools.suckless.org/ii/"; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 129b72d847d47..705fc12510dbd 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -4,12 +4,15 @@ stdenv.mkDerivation rec { pname = "sic"; version = "1.2"; - makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + meta = { description = "Simple IRC client"; homepage = "https://tools.suckless.org/sic/"; diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix new file mode 100644 index 0000000000000..282506c5e0af4 --- /dev/null +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gtk3 +, libconfig +, libsoup +, libsecret +, openssl +, gettext +, glib +, glib-networking +, appstream-glib +, dbus-glib +, python3Packages +, meson +, ninja +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "srain"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "SrainApp"; + repo = "srain"; + rev = version; + sha256 = "14s0h5wgvlkdylnjis2fa7m835142jzw0d0yqjnir1wqnwmq1rld"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + appstream-glib + wrapGAppsHook + python3Packages.sphinx + ]; + + buildInputs = [ + gtk3 + glib + glib-networking + dbus-glib + libconfig + libsoup + libsecret + openssl + ]; + + meta = with lib; { + description = "Modern IRC client written in GTK"; + homepage = "https://srain.im"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 253143d000478..e102b1077a388 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -10,31 +10,26 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE="; + sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1"; }; - cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws="; - - # Fix Cargo.lock version. Remove with the next release. - cargoPatches = [ - ./fix-Cargo.lock.patch - ]; - - cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ]; + cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; + buildFeatures = lib.optional stdenv.isLinux "desktop-notifications"; + meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; - changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne vyp ]; }; diff --git a/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch b/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch deleted file mode 100644 index 71bc4709becee..0000000000000 --- a/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3a184dc..0e58cb1 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1023,7 +1023,7 @@ dependencies = [ - - [[package]] - name = "tiny" --version = "0.8.0" -+version = "0.9.0" - dependencies = [ - "clap", - "dirs 3.0.1", diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 1f7d663cf8e53..b6dca7e70b6b5 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,13 +1,13 @@ -{ appimageTools, lib, fetchurl }: +{ appimageTools, lib, fetchurl, libsecret }: let pname = "electron-mail"; - version = "4.12.2"; + version = "4.12.7"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; + sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46"; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -16,13 +16,16 @@ in appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; homepage = "https://github.com/vladimiry/ElectronMail"; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index d0575b60653b1..d4076c88bb8f4 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc="; - cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkg-config gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; checkInputs = [ file ]; + buildFeatures = lib.optional withNotmuch [ "notmuch" ]; + postInstall = '' mkdir -p $out/share/man/man1 gzip < docs/meli.1 > $out/share/man/man1/meli.1.gz diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a618a696d0fe1..df5c9de29d178 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34"; + version = "0.34.1"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3"; + sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5af24287c171b..d53bcda2a69de 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.2.1"; + version = "91.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "953e07d7198b8b13f312ef620caf6e232c361f78dd04ebd69c753f7b75e55f42"; + sha256 = "067592da3bdc40cb8a7d8f64e3c5d116575604f1305b8eac4b5b1cc7f79dccf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "29f34eac79855c01550a259d3663c662ec9bd259c0b20bf392efb0de1f44af8d"; + sha256 = "3a52d7c0e48496cd2259494196b0514412e922535877ddd322ceb82d02a47a39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "284d8935a5527b58f84ba9acabc0a67c51a7e1587f843d8b0ec9555e6f6d8f4e"; + sha256 = "e07001f03b642887ae4a4e2415ce6bb50542d5af7cd8a9f0531081bb084e56eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6a535aac3b4eb839a2aca1df28ac8425c142c68bd5c6907f5b9999a45b62c9c3"; + sha256 = "ae12e02ef735813f2f807a32b101ea8ac621bff3f01f4e4b3c5e0fa6c178b812"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "74dde907aaa3877651e1f2bec43a208ff36bf7d860333eaac6f8cdd20d48dc39"; + sha256 = "3892a660dcc417cbb951bd8362b8fdf06ef35606e98f121ea6f549646a0a8b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6b396a289addae8d5ade8355f8c93c285ce6833852149a0fed3f741d9ceea220"; + sha256 = "2fd0c6eca16a1435d0abd5d8fa66d68c8024f992ee57b741178c2d253f9bb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0611d49fd90777b3af1bd5b5effd3b4a5b267c7c33e6476ceed906a070a0e675"; + sha256 = "45fa1b1e80b646af457b189e07fa13c8bee61df1d80066b0b3d65414a682e105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "032e7034ab5aada649258dfa43cc10d6e00cf5be6f06b8bede06d2ca19625d79"; + sha256 = "3211236401fbf52b6085c1fe7e82e081c2d7d4f13514b11ced5a483986dabecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b0591e3bdf5e9273269354924fcfa8001579961f089f1011226faf1f4b0ab2e6"; + sha256 = "259bf43995f7990bd1ef78e030db88966688323f363f15af2065c7c551a9e6ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4087f5c5609169b6834e2eed3fdaf614826c47f3ca99177292fd379ef5d430b3"; + sha256 = "2e1719dc5b7c3687c390c7ac07ab0392a3e8f32624ebd40d2cf8208796da054e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b72f768cc2d9c2bad536e2467d1abfe68671b242fcac801e57297694fd41d231"; + sha256 = "49d8e99d05928d4678408a3b38da2f5c4915a802966c7328f4d410d5d0f7d82e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "48990ead3d84cb023e8c3e6e34113209b49e6ed3e29766fb5374fe577cd5cd94"; + sha256 = "0059061919afe9a38a3647896693e4773c3656887657b761356ff698b839cef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c7e93ffe9d8ab0bc00db145771e65fec6c589208c28c3e0ecb5bb49471b9ed61"; + sha256 = "7ac2f44c66860967cabd64e94f0b104b2807f4b6297dd2ad828525962d8d5976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c35372524d77123bb9827d26efcd29e0fb9de402744b22a3c99563531410e2b3"; + sha256 = "3fcde9b4cac6c46a6be2fe15f200cde1f96b59732f1e87b5645538568969817f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d20fa4b8c7224f35f06d384b5f37c277c56ac35f2099f59735197a0334c9f3ec"; + sha256 = "13e33af2f7c29f8bcc479a09b3f8ab82362c01984700c5371eb8c050ef0524b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "af0787957918aee6bb931b30ab92722c3ea8fe1e3fd60602d172a598422f7896"; + sha256 = "94e8bf04d513caa7cd74c4e93851a59911352e666b7bf86c8a795d63177f2e0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8968d5ecf27e37bb8204291a9739ab804ef77c082e11b4e82fc7e02c8bf0da4"; + sha256 = "a5cf280ad34305f7a83d331f554488c08e8c62acf2eb895ba7a6bcbc4aad3180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ec281675876941240ccebe0c48bbb4ae0ed442b795cd7ee1be51ec59c4331220"; + sha256 = "ae253fa8d23ee19105566a76be6ad4584ba2c5cb1eef6a3135d488109f25dea7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6436ab381f1ab7fbcf1289d50300d7238f1095022cf18d6441832a8f61df68ea"; + sha256 = "1ede7664984d3ba3ba74163f58f02d5a982aa586c000a9d2b51efdb4b0b39210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1e49089b98dcfebdc1465b93d625b6ea1b6fee4642ca915035fabdc97710eb0f"; + sha256 = "93e29146782ccaa5ba9cc0b30f4f6273d8c57f39c678bc2dc825af5f46415ff1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6a1418f15a019924b459b952330b9851c50907a7c12f3d430a79268ebdb7bac"; + sha256 = "ef431ab48190366acad917c5d8710e2df89ee31cf88ccfea206bfb49fbd2083c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "588261a4c0e9cfa0c9f506f4fd2e9e14f123d10e96f0cc1724b4ea4607151264"; + sha256 = "e4fba7cbb9cdb515eb29757bbda8b3f1fd091a5c1a35d345b34c547002c44ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9ca2d54c6f6f04ee887621332cc35aeabd0f9b73db621c41e8925bafb316670a"; + sha256 = "127de8d089c8ad535f2ca0dd60856a8822e8adffb3e5f3af868881c36e78da97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df9bae4cc2d3bd2778047d4589ec1a8e23f7b8c7fc760817decb9341b59dc0b9"; + sha256 = "28b4e3490105558c6fc47b9189451e0359f0ecfdaf9b40af173483cbef618981"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8d6445032f39152c62e98fe9093cefbaa383d2bff203734ca04a501b44a3a0c2"; + sha256 = "2b16e222cf5f9468bae76f1f3b7b0af8c7b6f8a7a9f263e9d1b1e9320e244fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b947847398a8e086d062f8e54f515d53e39afab48ec59ca0aceb956ea0e0917f"; + sha256 = "9368396e0ca3784201f3e2d2bf6c1c87d0d0dade72f96c450119929a4ae34ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3dddbb5cc78171719ed2e7c3ba854c0a346ca5324a898c698dfb79c7881051c0"; + sha256 = "7c90a96061ae3d237636baaa4fe439ae47542d0880b81687bc3a5a9e40edded9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e77eb74db9111e54b1e492fb5752fa92ec6eed96a7146392d1ba19d63b5e2ab8"; + sha256 = "12e42b78aa9757b8274df1395667b89214d393a2dd5969b374a0bf5816f04f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3e4d46ecc0ef83a619775d48e4df81295e3e95ad1e9a96efeafa26d7f24b85ee"; + sha256 = "f27542cf34fffd6aa71c479278b843ce435f4a8272130f7d8cde6f155e82b813"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "36453d6aca463fce338ac4a15c438290bdaa377aff72a56f0acefeba19860986"; + sha256 = "f21bbe1720441392a276f3a2f6025da48f74efcfb7bfbe783f134be013874cf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "dd05c379727762fde0c2456a7bbd67cc45fb7ccfbbf88958b887d6637867e80e"; + sha256 = "64b16f848c5a361d9709c2075fdf3ca4f7eb885f3f1cd9ec5acffc260b31982a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "35e4db20ff927cf079607fd0e7d207c155f23c7890cc6347ac069c9d252f6ad3"; + sha256 = "da650d001f9b10227c5a5f5225725ef9085aa71f95dca0ffc4452fc2d6b48d90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9cc7a35aed1e5808a80cade5b77d064f3bd36f08107dbbdd3b92ac11c8c83766"; + sha256 = "12fcb1295b43b8bfd9607b819a78dd931c5efb092d6a5ddc70199c3625c4c033"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "de645fdf79f33195a7caed9461214f834fb2e52f3da764bde71608fd3783305e"; + sha256 = "48250a36caa8727b6e5bf1369199b4e202c7692ef62ffd97999b71a59c8182b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f9a80f01d18cd36ac5c0a18d65908f329bc3d7ec506e0f201b833ed973528dca"; + sha256 = "aebf9b22dd1af357fdd1709448d3d753319a2f817bc30ed15ba364c75fe5ec40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9345cfdb7e35fc15e94bab52f058dacecd813da210c81770f3037c6f3f982478"; + sha256 = "3a1580283928525b20a163f13c4cb9554484823ddc28699a8d8879860ccf3a73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "49e535b7b8322645b81b8137ded607cbe54e70977a07b800114421fb529b045b"; + sha256 = "a2d2b5e2b884fa1b9547c76b9fce154431ef0db80af45379079f1c2d5c6d14b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9e66e0654c5ca2d4fec6101bd40a2ab68f17ad4a27ff58db4a1c5d927d76761d"; + sha256 = "0b909906f58125048fd4683946e62653b5c9064085b3f129b20d865c8463198b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c929ef91d1ed17db64a36b5c8653e98e1be05b7bef48c062c40c0e37a88f6844"; + sha256 = "5256b328a8920f01b5e93617c3e98a54e27094a383047df9a98f5ac50772e0fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "758c31e642a796e3c8be2848e9789bf9c3d4f896790c80603491235ba126a195"; + sha256 = "445644ffbdff8af1910f664a9ed81512af95c9882f5b1ce1add02dac715ab0e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7173cb778a4f1bc625b5dde4eedf59911eb649e29c20f8f2a2eca455696fbdfb"; + sha256 = "0b3dbd1b6e71036b64c98920ef755f418cf6c11feba93ba8d873d438a032bf87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec9ef897898c788521725879906c56593dd08e9b862b1ad32f7133bba7843b94"; + sha256 = "2bc934ce28dd4775984ae2f4db79db54806b34fdb415ec4420ae3b8927fe10a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1f95835843d33a80821c077b26ea5e6330ea3d1a818bb122623a6024dc98515c"; + sha256 = "e13dad427c8d0cb9aa79c48f4f8124ea996cabb34efdbd4ed8e90e233d00b6e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f5aff84dd6016a4223df28fc92185cffc1771107bc4f7c442bef0d19ae4cccf5"; + sha256 = "e984fe009aa98be81153b1285370fae6187705bfbfe652b3c45e83f5bb0070ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1146a72a68b454abdb3ab19e0a487e0aa46af0fec4c9261459ac20785a66f8ca"; + sha256 = "55744aaba9ae0c282d7eeba0beae71101cdfbf689bbad8a6312af3f2abc41778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a63d1124b72b4ad1e26f34b26792e576a63ade3aee161965058f6ba2144f4edc"; + sha256 = "b404dfee5b164a0401da149c33535e51030b21da29fc97d1822bc82cec2b6808"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "245692605721b9610bb730f7164c64daebad372f881842a3e2d92dd27cf2c23c"; + sha256 = "cb0bb35c9cbb31443658847bc49d29730b192b6a25875acceac3fa4fd7436edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b3b3f9b4f4e2f310b24b148960dbbada8dedd444968f923e7295ce2e3f561bc0"; + sha256 = "3a0ea72ba75230b4809901138350e0f13f981daaf590455aa75787cb107a0c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dc0a70cb19880a9ea7a076ea03c12150bf2ed6349bee7f7cd64b9ba261366e99"; + sha256 = "8e9deefa5bb510e244d8c6416371e24a2f6c97548eda5a25bf03a7aa5d500b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "be20940db6d0b0399ea90e97ce4073c698c9caa822535cfdadaf5019aaa283f0"; + sha256 = "753235eb471c7bb62f766baff612bd1df5926ff248ee174604496edb7c75546b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8e996281032049eeb70c12ecc10dd321b055d917edc3f16c12b073160552a76a"; + sha256 = "a298343b057a4d25b89386cde253ddd897550250e81b8abd6a68ff240d41c600"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d015483952516c37169d263660776a572877d6db50b4e4bc42c9d285cc413032"; + sha256 = "df52bc68926b9239d3b26fbbfea3ec7aa98837296243325dfe153e9afea6a0fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "90404c19d3ab7d5142310ae23699b346ee07ab5704b02f3b89e1972737460448"; + sha256 = "001b1145aca605e8e5d72a1fda411546de1d2cb82f7be5626d5766018e1a692a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2ed8cea88291714fe25b3f06777340536e24c1837743e6dd16bf2e66e90ed057"; + sha256 = "822e852ec3d2d5a50f042bd2e5b2ec6929441b8116a2cadf2369c769602b85b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "be29a12cd0d52f11f19cff89df0d0a883802328cbe036e9f01c2be7d296d5a4a"; + sha256 = "752538090cd3d72cb5d04cc9abf0b089e437a7726cf8eee27b5ebe2d63162b8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b9f0b22b8004af1e7704048eb7223bda77723f664aab3596a3e2fed538eab39f"; + sha256 = "a8548722e8c67da69c8f2e15855dd076b1435c5a1c6c34100dfae8de0eab7543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1edd87244be553d61bd5db1de74068130e9a3ccfa387d21c489f9a777bbae732"; + sha256 = "d6c86caa9b272b3281b9a3eea8ded13546f4d09518081feb3fd16b995955d6e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e218a20074e50dbe20d2dba7e81d5febdbcad8031e0fd9d88aca469da9cea267"; + sha256 = "a5af37b0803881489bc775e25592901ca77de996b07c4df658f17a9b66c94fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa65b90c1cc903f3e1b743e142736b1c7e897eb6bf9a80cb0bffa60db627aba2"; + sha256 = "a0292086c9e9d0462118ca5945627bb04f8943e3afcdcf3da054ff52ccd45442"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5af2e6453aa5523169d6922a8a888b757accad60802d7a457a1ee244cd74c3bc"; + sha256 = "f02b7dde392fd77cde01a9ae860a46acf11554ec32d1b606c2a0145562bea1d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "effad7de717f0597447a7559e666ee3cdb0a1270daa01226d662cab0be84a4dc"; + sha256 = "1cb2935c1517b10adb370ceea6866912656c668dd8e82abcfb0f59435a85a854"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f3c8d3d4ca4c076eb8bcc8a06df32622b87b4d4ae397ee36f5de27a947d443ee"; + sha256 = "4ad88f7f036ec199bd69ab7628d2bdf2f162603e8290cc19e4ccd586bef691fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ac464ab32927c822776b1cf873ea9b9a9473c18ac08b18534332050bde7b1dfe"; + sha256 = "538a9996a604d9464a6c1315c683d6bd80b585d3bcf59fa93272444c22fec59e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "44869c19113316a02518eb19fb5b1a7a85e266fccf7a3172d1938d758a5efa6a"; + sha256 = "470123b053cab95930e8594684e65a656da032ea4e46aae4c325f119fbed4a46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "82d915747e3e5459acba3e17663de422586f27e7bbc3a5698d992f82ee3d0cc1"; + sha256 = "cead4d02b5dd39dd146d1f2b28b61e5f30804018cd226d36e56bd39e010d82c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5ccbc3453b76c3e02a05b94905c48cdad99bb15042fb2cfc58c7f619a263da07"; + sha256 = "4ac3b8ea2e7371710b03beca630d409a7f3e101e267e15b2ef49004da728e021"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "616fc2f0265f204b8699dd0beafc02220d7ba9b2243350730573824f6fa49462"; + sha256 = "545423946de595760829c2263b90f1ca2aef3ec576a28c96c37ec6bfc3269fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "046386e67e1b775f1f228e3056660db023093180f1c200f6380b6d3744b8ce4d"; + sha256 = "1ff0fc8052bcb5c26396114be2ebce66e939cfe962c17807183ccb538dc29df1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bf64b91b16bdf4dbdfb88972432f2d2cce002a6ff8c708779511b54a05a7008f"; + sha256 = "079a3e51861d0396d89978b46bcbcc5d786b3b4d728064c7709aefb2ba95ba40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f544fbff341165e8e304a8a643be60c8b742973402861b298171699c45fe622b"; + sha256 = "04b095d3b52972e06324630b938cf703143158996036f1d338740e9058c666c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c76ec7e65fc4980f12e05f863d8babab09d771f9679d21c93d8dab0f76d16898"; + sha256 = "82ad96bb61b2c170a0c750328b110772bff263493628c8a0c00396051a30ae4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6c609f7b5886e7a7c70470d4bb35370284a454b109ca92cff9741bcc3086e9f8"; + sha256 = "e5c4a5c5edbfc95e2dbbf331e8a794fdbef77e111da3b467d050571b6447ff70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f210ac1e0740c7105abd388e9b5e22d9e199ab3deb43842c3a82ecf5e6d15f01"; + sha256 = "4c99da8214856553fd01e4bea4c01945abe799280bf4e6da94e57b8c85e5e047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "108d9bfa0b9bef9433f4837517d3d157d46c8578f889b9fb81bc72178f6dfe52"; + sha256 = "f7a9037ed7889f5de489f875611cf6a5d644b93f26b0dbddcb6e49b5f11ee2be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1bd421b89cded34d9a656b4e44b78c7b07557221b87dc99831ea7029ff6eead2"; + sha256 = "bba109d3b1ec5b5deeb7c8bd036260490252961c52855c4d879ddb73858a1110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4db52d6017baeb8a5f925b7cfcdfb89a3ed8af9d3c1a41c4a63d122e4f214ecd"; + sha256 = "182600e06827d9abf7b8428e3dc883036119d23431923eb019b6a6dc197f7e28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "584c0e8a03b068652f61978af053028ca3793e1679ff0ea214bc6f8a99761f0c"; + sha256 = "24f69ecdf96f2823e709fe4ca6f48c2eca8b8574e8ff10e7ac48a78b8a847d76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f838e8b6fdfb09e44771cfe02d22abb63722c65a0e430c77aca9fb5a53a97c4c"; + sha256 = "9c7ea981a4d8ca2917fc160dbe5598b7bf8c63a9af4b3010cfa870632f4b8e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0b0a6cb3c77e0a4f86bd3adbd4bac229d50323a88b355e470184f932b9602e4b"; + sha256 = "e55668dac59dea1f5faddf0d2d63b223932a086dc79a577f2e811dba4b3e16d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7e22ff64aed5187db9621754f1eedb158285c2514f3eca836103833ac6183f7c"; + sha256 = "b60e6106c054e8d1a107b5601fc96555024b3894334cc4f825a953bf4198e2b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a3be3dec0ec4789f8370c23e47b7ed0bef6802d28e3985c66d1a531a3aa986cf"; + sha256 = "c63b78c881f9c98523214d70053fbe25c84209ea17b634f51fabe47f7a68e700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "31c35df101e8d3f97c3df72b7660086fdf4f6612068fd03558d5f9dca2d23507"; + sha256 = "2f43f460a7b31c128c8cdae2829bbfd82a5381854d722901e8c07843d73f5030"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "70db1a684f76886131214bb0c48dccd75763f041e06428ee6fef54a3a8d524c0"; + sha256 = "5bfdc77b75b5acfff4a013884298d68ba76946f6ded7b39d973c4a4a20f0c09a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d0b792b494bea690adc6a2eb967a988920ca497db08c539f92349c925ccb7c33"; + sha256 = "5c793c8ba89d886a67ced4e6cd2271cbd9a516efc1bbf981e4b302ee4223dc37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2e4c3111435cb965972aec73eb181f7e3aac8faa03c8c8f0d7869ace109b433c"; + sha256 = "548e4ff7682d36034dac4b82bee239ff5241b8605982d4ea3e21d59f43710888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "875e98a6ffcb614b3f062b7d12069eeb9f1c9dcd62916020369ede9ac76b8f92"; + sha256 = "1c24768b70b1cd8310ed5bd9bc08aab036952c692ddb5cdda7e0605b61746713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "982a28220ed9d6881d83baaf99540e7eb5d689b0b7fca179d4847838f2596a3c"; + sha256 = "fdd4a914633aa6b1aeb4c737c63e7b0a39c60ab15b320ae37221c5a7eb273620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f0421269313849e90eab46698176f1ca425d2bf8136748628a35b0a8baf26c06"; + sha256 = "b582ff509cea4bfcdafa4b260db4831565ea60b7ac64e3163c9a43814790277b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d49aafc5baebb88b4b2ef7ea5240babe09b16632edebf9a39081aaf183e9ae3b"; + sha256 = "61fa2a02f179e50d9d4bf43cf037a6b545982ee479f7c8f040ca57fc2586ed2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "665df98e5dd0ab4cff25b530bccfdfe4b44f2a81da9167b37aeedf7f05e1f59e"; + sha256 = "c0651a533f2690ad17b336e4de840932c4711e10fec64b80f2fec18d0449f1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "28acbaec011f0222530d0f8411444fdf0743d05c05c1fc04a0c130208dd5e9f9"; + sha256 = "49f7b349a5d55ccbcdeb2ca464aac2ff6c0712b6ea1e8f124ca7562913e8c633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "97c23e4eac308b51252c0532770961133f2540b94a9dc095c0351e39f42ab038"; + sha256 = "04eca02158c56920f08368bb78ce7affaaa3d6793e6a3361b41e3c8856804130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "dfd4f5b4c9f396b4a512b38292b73f5a44146b3b46ab0d4e448067481e940914"; + sha256 = "150ea785d46bb8debe554533edd53abc2a5711ddf64268f4479dc0eda2e85be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "07a1f4a58af9172912237c35c220efbe80fbcd44151dc0bce3e40ede38dff054"; + sha256 = "d837a407f1a117299a7540fd718f4f7cffdf056871ba5f1adf09da5ecd84eb23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c1b4e64ebdcc1a06d4428d3507aa1899f3d4c27ae428161f7219ea34302b1946"; + sha256 = "d7e3e2287a2218f80f055c450b67ece63ae97320eef1dca77cd153a2106d4bc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c57005f3f10938b8cfc6adef1d5452b3235605b97a23d22da1f4528b1e356d2d"; + sha256 = "157a156e393b5a69a326aa0e9be02bd2ae3bd48433382a803ccb9c5c354ed498"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "73525dc142b6762f803ced2b567a23244b22239d355fe89507cbe59ad1130edc"; + sha256 = "bbb783688762040579258fd8650124770f2a1b6ab8dd050df5c8e0bb057510ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3f79327af36f3174cb303c65b13a0ae164bf24c87e367ba14bb46b1b6e2370b4"; + sha256 = "f14f33e5c8de0e59839654fd472ca20f592669bd739097831e011b3ad6ca3e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "58f7012723cf4ce6673fed01d038b2517c710585c6f8724181e4a91d717b2351"; + sha256 = "5a6be55557ef79101cf61c4fa684a52be1afa1a972a69e02998a35cbfd3212a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b0e7b9aa39a05148a0ef83d860fd2ab40d2aa1a66a31dd1e9a59d390d56c6e42"; + sha256 = "565299abc53960d3bb7c2a4abac86c2f5864a089aa4b908aceab20651b6d4c25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e02978eef0fc814ca190bf8bde29ae382fc2e14c61200e78ec1f43809d7cca9a"; + sha256 = "03244c4102177b81ad105ca31790000314c35813e6fa2efa2020b99b4ac45391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b11a6e09556d9f943765badb6145c5db2b7bb54cd3016de686e821aa66308bd5"; + sha256 = "2640b2cab838dea0f2252898302fe0008c2b3807da4c8c45224047a7975b9461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "604f1c4a21b58b995e72ac48549802c588b0542c352de813aa4dcc02bbc0c686"; + sha256 = "083cd62d42936adeb069b620b19c7a66f761c40c82b56205626b9e1a6364b64d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "29479a9970a622e23901c6022058d635874b41e24c7f5aef42536abc922dd1ea"; + sha256 = "8a973b47dfbe996d8e7dc894bb0cc0b473743eec0caf05f11646b3552c287516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f34050010ff533a1c3949b11ad51c6902d6efec8c92904b2906ab80f95291e6d"; + sha256 = "6f7a992d226028a6398932c8bcaf9d522ff72cfbb60336875b83e74d22564967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be3e4c5bff078c2129d6f4e1a6a820efa62cce2750e3e1359dfba0ea93e58b5a"; + sha256 = "76cda4386e76388de5d0b660541f1ae5c40ef31609c329226e07573265b34c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bd6ec1783bcd5efbf51f963eef3db42f71b50e8826fe4896dc7356d10f4eefce"; + sha256 = "9bc2b1358965e4bdaf875625296d2e40bc6f21709237b38011f82169937cf022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6279588bd47020c61250c211849b8fcbc4f480318a725090f316bb9f2099c31f"; + sha256 = "5860567197e95c1fbca7585796b34adaf453923be9e726ea33e54e390a7e800f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0f0a0fb9f6556f4207e63a12e846d2917d8e221321b51ba34860094876c3528f"; + sha256 = "5b50ebc02d93303547704312f11e10a5470bcc116da55573f6d256ec90e5d5cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2f3c40fffa081ec62396fc3b715331280603b38b6d5fe5f4b16de1ab6727a713"; + sha256 = "99756c19427ab548d6cd64a5805549ed51af95e41eaa97eff821bfea2b3691ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "da9c9cc55abbd4f0679b53b6635868fb2a5f56165292a82903512058fa57f988"; + sha256 = "2888793a3490fbebd2148128662a63a7a482c7d770e8e4c4be3e725af5eb5c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "065db90edaec65fc7cb240d7793afae97110761bca269ffc4e172d0fd5dcbeae"; + sha256 = "a4d6ffa089fc309e208508986f91283a6c839f8cee109e073d3d6a0d25397292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4e0a43f1633728dbb25dcd60218b31fa45131a8189f94d8ebeff202bc251ac55"; + sha256 = "7a9f677c39700e7b1212047327f1b080004c42c3094eb4bf7a487b39a65458df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a013acdee4b7e983c71dd39607103f1794b967addc57c538a8ca94437551743c"; + sha256 = "0967d12e7cd9d2fd4d55dc75bfb02fb07ca61c60d2f0ccb295b8c264cb565957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4bf7b530490f1fc1d031040790a568bee42206f393f8c13994551e6ff4d1ede2"; + sha256 = "1be6b84a42c215928de2dbb36bd9e0f01303eb1ba4224126c12a98205316746c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "829ffbd9402f5cf80cdd8b001081d6f67628c842cc3c73f8191b6f6ff1d54d52"; + sha256 = "54b4f955412f9c53d37188f42be5a7cc8ee1357458171d6134299145acde76d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6bc72633a3b45faf2aa51627caf5674f1b05e16840b952f58f7f86ef6ad483b9"; + sha256 = "4f31a0eeafbe516c93b00b5ac5e7b06a35db471a19965955b8f25713984b7b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "141787ba7f5aeb0faa2a33e0d84fda8fa8d31681c6fdd0e884a69cc339042048"; + sha256 = "247c78a1dc8d6013744de242efc6ddac6f2f3d10d86e1348769e90124f5eb6df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "90363481a491a239e4c3da49bc87ed3ca795e4ce0eaf2239ac5a298e5d7abc10"; + sha256 = "73b69b08de497cc2c5e50e7226b7c6de61546b1198a6757b8a63c6399fd2a9e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "95e57777da6f9fcb41bb3116771be2e90b023315433d41e21884b34feb6a38e4"; + sha256 = "3d822e2c79d38e26353cb8810b8468580d2157b62aadcfca1d96874bb7ee0681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d7e0a12bd5c7edfb130e4defdc25b8776fb71722fb146cd5309d52405ad231bd"; + sha256 = "c8e185af246c6059e85554968fa91c1ff0477e824fdf05d1860dc36ff7dd8a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b17dbc3424ce90c0360a75476d1d25568fb4e7c6e1e90a197ab332e5584cb88e"; + sha256 = "61da012cc5aa8dab7855deef3f26c20efdbca12c788caede60a4825289850b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "027f7f817823e939261c05113b3cc5518b3fff1d061e66e8fcd5703504259f2b"; + sha256 = "064e2ca29bd5c1d63bae872d4419b537d5a75bec75a602847a115da15a0dcfae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "268473436cc5230bc60b38c0678eaa71c64b5f9c3780120df51c1063790e1855"; + sha256 = "791adf04802aca3323c4a7659a83ca3affa9b93c1ae9a011447d6ad638f256df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "79bad44e8e9dd7962d67b395d27c046d84c50f3eb66c53bc10de8a9c3d94a059"; + sha256 = "494fa955b325df483902df74c99e0a5a24c50670bcac7f62d5da5989b4c3555f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c363f700537f3a466fb438ec4339b5e83b60c721faa647b4ab77c907ab9b1f21"; + sha256 = "aaf7fd5dd2c2ad95cf0ea5333a59e6f953e36ad2b19b0a24cd42075ff6a96e44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2de957d36eb6c2b5a7d33d6a06e9f4f1072981fd8530aa18d609a892f963c975"; + sha256 = "5ae7dee3ae3c33a0278c5b10401be741ed91d2cef3d00c9e6686d065830e0f32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5006d6c79aff928e307a92eb3867364f206ee1d872e275d3ebf63b9a4cf286de"; + sha256 = "455183213bfc0936a71c3f8fd35d4b753cfafb5c72df514232df97b2af75f10f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4893ea232fa746efc32cb0d84800b46fbdffb49a13fbc244559ca0382561ebca"; + sha256 = "13b600caa35aae9e6d82b7969afeb6951f2d2824a4c5af33eecf7b004e421ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "37ad46134d268639514eeb267a89aeb20fc318bde923b9eb552c281b23ae153e"; + sha256 = "4f01236b849f03599df14efc1f4cf7519077b72697758f41c69ce84a084ac37e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch deleted file mode 100644 index 98b40d83d62b9..0000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -119,9 +119,7 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) - content/messenger/buildconfig.css (content/buildconfig.css) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css - - # L10n resources and overrides. diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index fa2c5fd0fb8c0..30770390e6cd6 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.2.1"; + version = "91.3.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "3152f20ad5f0fd3ce2c1672e91f07ab8921ffb5ecf487e6b0d7d7464445c8d8df106eea0bd8d912ffa84ab0ad403dfcfb19be97f50a015150c9091201a0dff6d"; + sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b"; }; patches = [ ]; @@ -34,32 +34,4 @@ rec { attrPath = "thunderbird-unwrapped"; }; }; - - thunderbird-78 = common rec { - pname = "thunderbird"; - version = "78.14.0"; - application = "comm/mail"; - binaryName = pname; - src = fetchurl { - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0zan30jvv45pd6i59l2kfyfjwivqk5qq6vyf77xhss2dk8qhk3mfrfxpfbkrab676l14b9hs09nr6ni1h1iwn82zx5k7fx5x8sh5dx6"; - }; - patches = [ - ./no-buildconfig-78.patch - ]; - - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://thunderbird.net/"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; - platforms = platforms.unix; - badPlatforms = 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. - license = licenses.mpl20; - }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-78-unwrapped"; - }; - }; } diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index f6aad5eaa081c..beed066e65e98 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "mhost"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018"; + buildInputs = lib.optional stdenv.isDarwin Security; + CARGO_CRATE_NAME = "mhost"; doCheck = false; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index d87d23be429cc..3bcbdf0cf02ba 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.18"; + version = "1.8.19"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-FPxirzfr3MXtGaJFoF64N27+cBYRjwDJxZS8mZ1VYKU="; + sha256 = "sha256-NKHhmBF2h02+TuZu4NkQPJCYmqTc3Ehh5N4Fzn5EUms="; }; patches = [ @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; - configureFlags = - [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] + ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2fa486b83a917..e03d6fa23f5ab 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.4"; + version = "2021.5"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-JnHG4qD6nH2l7RCYHmb7Uszn0mrMsFtMHQ3cKpXcq00="; + sha256 = "186va4pllimmcqnlbry5ni8gi8p3mbpgjf7sdspmhy2hlfjvlz47"; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop + sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Br1ght0ne ymarkus ]; + maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ]; }; } diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix new file mode 100644 index 0000000000000..9e0978c80d6e8 --- /dev/null +++ b/pkgs/applications/networking/nali/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "nali"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zu1k"; + repo = "nali"; + rev = "v${version}"; + sha256 = "sha256-iRLoUBA+Kzv1/LZQ8HCvR79K1riYErxEWhB0OmvFy2g="; + }; + + vendorSha256 = "sha256-Kb2T+zDUuH+Rx8amYsTIhR5L3DIx5nGcDGqxHOn90NU="; + subPackages = [ "." ]; + runVend = true; + + meta = with lib; { + description = "An offline tool for querying IP geographic information and CDN provider"; + homepage = "https://github.com/zu1k/nali"; + license = licenses.mit; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch new file mode 100644 index 0000000000000..73325791fc2bb --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -0,0 +1,26 @@ +From bade623bb98c957d9a274df75b58296beb8ae6a7 Mon Sep 17 00:00:00 2001 +From: Marvin Dostal <maffinmaffinmaffinmaffin@gmail.com> +Date: Sun, 17 Oct 2021 21:26:51 +0200 +Subject: [PATCH] When creating the autostart entry, do not use an absolute + path + +--- + src/common/utility_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp +index 010408395..16964c64f 100644 +--- a/src/common/utility_unix.cpp ++++ b/src/common/utility_unix.cpp +@@ -83,7 +83,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, + ts << QLatin1String("[Desktop Entry]") << endl + << QLatin1String("Name=") << guiName << endl + << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl +- << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background" << endl + << QLatin1String("Terminal=") << "false" << endl + << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl + << QLatin1String("Categories=") << QLatin1String("Network") << endl +-- +2.31.1 + diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d3612321c352f..071f5adfd497e 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,18 +21,19 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-kqNN9P0G/Obi/8PStmLxImQdqkhLnJoFZ7dLpqe11TI="; + sha256 = "sha256-HhFm8rIsDaV4QmvHplbj49gf1vYCZyBl8WH5bvRHT7I="; }; 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 ]; nativeBuildInputs = [ @@ -59,6 +60,8 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + # See also: https://bugreports.qt.io/browse/QTBUG-85967 + "--set QML_DISABLE_DISK_CACHE 1" ]; cmakeFlags = [ @@ -70,7 +73,7 @@ mkDerivation rec { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ caugner kranzes ]; + maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 561a1c77b1caa..ae7eb49a1c660 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.2"; + version = "1.37.3"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc="; + sha256 = "sha256-BCDVn4JaRYIexI7NrRDchUl9u4AEJa+An9ItYYJDs3A="; }; vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index dd7f4a7bb60fe..053f1d67882b4 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; + patches = [ + # Upstream fix for ncurses-6.3 support: + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://g.blicky.net/ncdc.git/patch/?id=4126dd51e90deb9e22dfd139cc4518a7812fcad6"; + sha256 = "13hqkmhmbazj6cllb5b2ccgf51vsn5lri7jqkqc5xwivgcisfrij"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 38e1b7cfceb21..f5f5b3bde7621 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.3.8"; + version = "4.3.9"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-on5folzKuRoVlvDOpme+aWxUKUC5PnO+N3L51qwG2gY="; + sha256 = "sha256-pFHeozx72qVjA3cmW6GK058IIAOWmyNm1UQVCQ1v5EU="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 7290ec65ad561..1954ebe543da2 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "com.github.davidmhewitt.torrential"; }; } diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 82194e38eae74..8b8748d70ff3a 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; + mainProgram = "com.github.jeremyvaartjes.ping"; }; } diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 3344174cb2a01..82debe6f8a1a1 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -4,7 +4,7 @@ , libX11 , gst_all_1 , sqlite -, epoxy +, libepoxy , pango , cairo , gdk-pixbuf @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pcsclite gtk3 cairo - epoxy + libepoxy pango gdk-pixbuf gst_all_1.gstreamer diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index f61a00f89ada0..11fcde29b8826 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core + libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index b0975c56b0591..7d5d414a4f97d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ="; + sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,6 +29,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ schmittlauch ]; + maintainers = with maintainers; [ schmittlauch greizgh ]; }; } diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 3b5742ec24739..5bcbac74ca7c2 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,6 +3,7 @@ , autoconf , automake , fetchFromGitHub +, fetchpatch , libpcap , ncurses , openssl @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; }; + patches = [ + # Pull fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/irontec/sngrep/pull/382 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/irontec/sngrep/commit/d09e1c323dbd7fc899e8985899baec568f045601.patch"; + sha256 = "sha256-nY5i3WQh/oKboEAh4wvxF5Imf2BHYEKdFj+WF1M3SSA="; + }) + ]; + nativeBuildInputs = [ autoconf automake diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 50a28b5998eb7..7c9eda762603c 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -66,8 +66,6 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - - wrapQtApp $out/Applications/Wireshark.app/Contents/MacOS/Wireshark '' else optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index 5940b7cb19b4a..f52ee1a8bb07d 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.1.2"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - sha256 = "sha256-dauhGfwSjjRt1vl2+OPhtcme/QaRNTs43heQVnI7oRU="; + sha256 = "sha256-ssq4fED7YIJkSHhxybBIqOr5qVEHGordBxuJOmilSOY="; }; - vendorSha256 = "sha256-0JLbqqybLZ/cYyHAyNR4liAVJI2oIsHELJLWlQy0qjE="; + vendorSha256 = "sha256-60b0jhyXQg9RG0mkvUOmJOEGv96FZq/Iwv1S9c6C35c="; subPackages = [ "cmd/soju" diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 8022c48a5c2e8..f9fbb071b06a4 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.56.2"; + version = "1.57.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-cEh1SgIOgX04ECEF0K2pvwJdugapoUzh8xbboRaMdTs="; + sha256 = "0pwbprbkx5y0c93b61k8znan4aimk7dkssapjhkhzw4c38xd4lza"; }; - vendorSha256 = "sha256-wQYVn8yGDIYlnlVTS7tiLEMwkNLF6p3OcY35nw1mvA8="; + vendorSha256 = "0353pff07lwpa1jmi095kb2izcw09z73x6nninnnpyqppwzas6ha"; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix new file mode 100644 index 0000000000000..990e9691516da --- /dev/null +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -0,0 +1,68 @@ +{ 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"; + 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"; + license = licenses.unfree; + maintainers = with maintainers; [ jcouyang ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + + linux = qt5.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; + sha256 = "19fd2r39lb7bb6vkxfxyq0gp3l7pk5wy9fl0r7qwhym2jpi8yv6l"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ glibc gtk3 pango ]; + + unpackPhase = '' + mkdir -p $out + dpkg -x $src $out + rm -rf $out/usr/lib/nautilus + rm -rf $out/opt/Synology/SynologyDrive/package/cloudstation/icon-overlay + ''; + + installPhase = '' + cp -av $out/usr/* $out + rm -rf $out/usr + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/bin/synology-drive --replace /opt $out/opt + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; + sha256 = "1mlv8gxzivgxm59mw1pd63yq9d7as79ihm7166qyy0h0b0m04q2m"; + }; + + nativeBuildInputs = [ cpio xar undmg ]; + + postUnpack = '' + xar -xf 'Install Synology Drive Client.pkg' + cd synology-drive.installer.pkg + gunzip -dc Payload | cpio -i + ''; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications/ + cp -R 'Synology Drive Client.app' $out/Applications/ + ''; + }; +in if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/synology-drive/default.nix b/pkgs/applications/networking/synology-drive/default.nix new file mode 100644 index 0000000000000..20b0f1168cb36 --- /dev/null +++ b/pkgs/applications/networking/synology-drive/default.nix @@ -0,0 +1,45 @@ +{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }: + +mkDerivation rec { + pname = "synology-drive"; + subVersion = "12674"; + version = "3.0.1-${subVersion}"; + + src = fetchurl { + url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb"; + sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ glibc gnome.nautilus ]; + + unpackPhase = '' + mkdir -p $out + dpkg -x $src $out + ''; + + installPhase = '' + # synology-drive executable + cp -av $out/usr/* $out + rm -rf $out/usr + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/bin/synology-drive --replace /opt $out/opt + ''; + + meta = with lib; { + homepage = "https://www.synology.com/"; + description = "Synchronize files between client and Synology NAS."; + longDescription = '' + Drive for PC, the desktop utility of the DSM add-on package. + Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ MoritzBoehme ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 433c6cf6fc243..70e144cb05caa 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "unstable-2021-02-10"; + version = "1.1.4"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; - rev = "150b32083d36006cf7f496e112715ae12ee87727"; - sha256 = "sha256-yQ9/UUxBTEXK5z3f+tvVRUzIGrAnrqurQ0x56Ad7RKE="; + rev = "v${version}"; + sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index b655671b52c58..8acd862053adf 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.9"; + version = "0.9.9.1"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "sha256-8v6lg66QEVFMNO8sMkh/H6ouS8359Z7gjRQQnJs+lEE="; + sha256 = "sha256-kkUVTxh5svk61oDp/dpe3ILGyexYe3UaS+LgWsy+Z9s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index 16a52d6704501..56d5274751fce 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,<4" \ + --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \ --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/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 562372b1bb70c..1620c2878eeae 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,25 +1,29 @@ { lib, stdenv, fetchFromGitHub, znc }: let - zncDerivation = a@{ - pname, src, module_name, - buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", - installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... - } : stdenv.mkDerivation (a // { - inherit buildPhase; - inherit installPhase; - - buildInputs = znc.buildInputs; - - meta = a.meta // { platforms = lib.platforms.unix; }; - passthru.module_name = module_name; - }); - -in { + zncDerivation = + a@{ pname + , src + , module_name + , buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp" + , installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so" + , ... + }: stdenv.mkDerivation (a // { + inherit buildPhase; + inherit installPhase; + + buildInputs = znc.buildInputs; + + meta = a.meta // { platforms = lib.platforms.unix; }; + passthru.module_name = module_name; + }); + +in +{ backlog = zncDerivation rec { pname = "znc-backlog"; - version = "git-2017-06-13"; + version = "unstable-2017-06-13"; module_name = "backlog"; src = fetchFromGitHub { @@ -39,14 +43,14 @@ in { clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "git-2020-04-24"; + version = "unstable-2021-05-30"; module_name = "clientbuffer"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; - sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; + rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0"; + sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254"; }; meta = with lib; { @@ -59,7 +63,7 @@ in { clientaway = zncDerivation rec { pname = "znc-clientaway"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "clientaway"; src = fetchFromGitHub { @@ -79,7 +83,7 @@ in { fish = zncDerivation rec { pname = "znc-fish"; - version = "git-2017-06-26"; + version = "unstable-2017-06-26"; module_name = "fish"; src = fetchFromGitHub { @@ -99,7 +103,7 @@ in { ignore = zncDerivation rec { pname = "znc-ignore"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "ignore"; src = fetchFromGitHub { @@ -139,7 +143,7 @@ in { playback = zncDerivation rec { pname = "znc-playback"; - version = "git-2015-08-04"; + version = "unstable-2015-08-04"; module_name = "playback"; src = fetchFromGitHub { @@ -159,7 +163,7 @@ in { privmsg = zncDerivation rec { pname = "znc-privmsg"; - version = "git-2015-02-22"; + version = "unstable-2015-02-22"; module_name = "privmsg"; src = fetchFromGitHub { @@ -177,7 +181,7 @@ in { push = zncDerivation rec { pname = "znc-push"; - version = "git-2016-10-12"; + version = "unstable-2016-10-12"; module_name = "push"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index c42052e5f7d43..25f394e33f32e 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; + mainProgram = "com.github.dahenson.agenda"; }; } diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index f0aa323554507..5da7d84905bb5 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -1,13 +1,11 @@ { lib, fetchurl, stdenv }: -let - name = "antiword-0.37"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec{ + pname = "antiword"; + version = "0.37"; src = fetchurl { - url = "http://www.winfield.demon.nl/linux/${name}.tar.gz"; + url = "http://www.winfield.demon.nl/linux/antiword-${version}.tar.gz"; sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 351609d8c0584..e898a43ad97c7 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter - ''; - meta = with lib; { description = "Modular multi screen pdf presentation software respecting your window manager"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index ba3afbff9467a..1d5bafbdb4068 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation { - name = "bean-add-2018-01-08"; + pname = "bean-add"; + version = "unstable-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 550316b82c550..c0cdfd75d9be9 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { homepage = "https://planner-todo.web.app"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + platforms = platforms.linux; + mainProgram = "com.github.alainm23.planner"; }; } diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 0815dfc8982f9..db0e3c5573792 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, unzip, jdk, ib-tws, xpra }: +{ lib, stdenv, fetchFromGitHub, unzip, jdk, ib-tws, xpra }: stdenv.mkDerivation rec { version = "2.14.0"; pname = "ib-controller"; - src = fetchurl { - url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz"; - sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68"; + src = fetchFromGitHub { + owner = "ib-controller"; + repo = "ib-controller"; + rev = version; + sha256 = "sha256-R175CKb3uErjBNe73HEFMI+bNmmuH2nWGraCSh5bXwc="; }; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ jdk ib-tws ]; @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { fi EOF chmod u+x $out/bin/ib-gw-c - ''; + ''; meta = with lib; { diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index b87e74c256f6c..0b4ce74cdfa73 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \ --add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \ - --run 'export LD_LIBRARY_PATH=${systemLibPaths}:$LD_LIBRARY_PATH' + --prefix LD_LIBRARY_PATH : '${systemLibPaths}' cp -r ${desktopItem}/share/applications $out/share/ diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 14f48da22309e..1ff88d49d2b7b 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, python2Packages }: -python2Packages.buildPythonApplication { - name = "keepnote-0.7.8"; +python2Packages.buildPythonApplication rec { + pname = "keepnote"; + version = "0.7.8"; namePrefix = ""; src = fetchurl { - url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; + url = "http://keepnote.org/download/keepnote-${version}.tar.gz"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index e8d010aee22d1..e7580f1dc53cd 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -1,44 +1,39 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, qtsvg, qtcreator, poppler, libzip, pkg-config }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kitsas"; - version = "3.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - sha256 = "sha256-UH2bFJZd83APRjlv6JR+Uy+ng4DWnnLmavAgjgSOiRo="; + sha256 = "sha256-nmlGLrVsTQawYHNgaax9EiutL4xgFdOD34Q4/rnB/D0="; }; - nativeBuildInputs = [ pkg-config ]; + # QList::swapItemsAt was introduced in Qt 5.13 + patches = lib.optional (lib.versionOlder qtbase.version "5.13") ./qt-512.patch; - buildInputs = [ qmake qtsvg poppler libzip ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; + + buildInputs = [ qtsvg poppler libzip ]; # We use a separate build-dir as otherwise ld seems to get confused between # directory and executable name on buildPhase. preConfigure = '' - mkdir build-linux - cd build-linux + mkdir build && cd build ''; - qmakeFlags = [ - "../kitsas/kitsas.pro" - "-spec" - "linux-g++" - "CONFIG+=release" - ]; - - preFixup = '' - make clean - rm Makefile - ''; + qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = '' - mkdir -p $out/bin $out/share/applications - cp kitsas $out/bin - cp $src/kitsas.png $out/share/applications - cp $src/kitsas.desktop $out/share/applications + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv kitsas.app $out/Applications + '' else '' + install -Dm755 kitsas -t $out/bin + install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps + install -Dm644 ../kitsas.desktop -t $out/share/applications ''; meta = with lib; { @@ -46,6 +41,6 @@ mkDerivation rec { description = "An accounting tool suitable for Finnish associations and small business"; maintainers = with maintainers; [ gspia ]; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/kitsas/qt-512.patch b/pkgs/applications/office/kitsas/qt-512.patch new file mode 100644 index 0000000000000..b225b933104cf --- /dev/null +++ b/pkgs/applications/office/kitsas/qt-512.patch @@ -0,0 +1,24 @@ +diff --git i/kitsas/apuri/siirtoapuri.cpp w/kitsas/apuri/siirtoapuri.cpp +index 9a2c51f3..9565200f 100644 +--- i/kitsas/apuri/siirtoapuri.cpp ++++ w/kitsas/apuri/siirtoapuri.cpp +@@ -25,6 +25,7 @@ + #include "db/tositetyyppimodel.h" + #include "tiliote/tiliotekirjaaja.h" + ++#include <QtAlgorithms> + #include <QDebug> + + SiirtoApuri::SiirtoApuri(QWidget *parent, Tosite *tosite) : +@@ -361,8 +362,9 @@ void SiirtoApuri::laskunmaksu() + TositeVienti eka = lista.at(0).toMap(); + tosite()->asetaPvm(eka.pvm()); + tosite()->asetaOtsikko( eka.selite() ); +- if( eka.kreditEuro() ) +- lista.swapItemsAt(0,1); ++ if( eka.kreditEuro() ) { ++ qSwap(lista.begin()[0], lista.begin()[1]); ++ } + tosite()->viennit()->asetaViennit(lista); + reset(); + diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f94beabd1f90d..2ed4750b30d87 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, libepoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -78,6 +78,8 @@ in (mkDrv rec { tar -xf ${srcs.translations} ''; + patches = [ ./skip-failed-test-with-icu70.patch ]; + ### QT/KDE # # We have to resort to the ugly patching of configure.ac as it assumes that @@ -394,7 +396,7 @@ in (mkDrv rec { 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 epoxy + librevenge libe-book libmwaw glm ncurses libepoxy libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch new file mode 100644 index 0000000000000..d3ae91835ada9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch @@ -0,0 +1,29 @@ +--- a/i18npool/qa/cppunit/test_breakiterator.cxx ++++ b/i18npool/qa/cppunit/test_breakiterator.cxx +@@ -35,7 +35,7 @@ public: + void testWeak(); + void testAsian(); + void testThai(); +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + void testLao(); + #ifdef TODO + void testNorthernThai(); +@@ -52,7 +52,7 @@ public: + CPPUNIT_TEST(testWeak); + CPPUNIT_TEST(testAsian); + CPPUNIT_TEST(testThai); +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + CPPUNIT_TEST(testLao); + #ifdef TODO + CPPUNIT_TEST(testKhmer); +@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() + } + } + +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + //A test to ensure that our Lao word boundary detection is useful + void TestBreakIterator::testLao() + { diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 746e7679f380d..186f4b17d6aaa 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -9,5 +9,5 @@ attrs: "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" "--without-system-qrcodegen" ]; - patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 + patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index df6dcb58e9eaf..9ce1d26c14786 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "6"; + patch = "7"; 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 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq"; + sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3"; + sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk="; }; # 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 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31"; + sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ="; }; } diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index cb90af5244c6a..5ffd178b055da 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,13 +1,14 @@ -{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtsvg, makeWrapper, xdg-utils }: -let - version = "1.44.55"; -in mkDerivation { +mkDerivation rec { pname = "mytetra"; - inherit version; - src = fetchurl { - url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; + version = "1.44.55"; + + src = fetchFromGitHub { + owner = "xintrea"; + repo = "mytetra_dev"; + rev = "v.${version}"; + sha256 = "sha256-jQXnDoLkqbDZxfsYKPDsTOE7p/BFeA8wEznpbkRVGdw="; }; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 4422968efbca4..1aa6f7f78e937 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; + mainProgram = "com.github.philip-scott.notes-up"; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1bd29b06d9b91..dfaec86902288 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.10.9"; + version = "21.11.4"; 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 = "2c86d66ae427bdcd16d706b982cedaa669a27340f7819fc97a8e2b24c709e74f"; + sha256 = "3eb025873160cecd4fa35ae5079c150d4aa5dd3152fd58c5e216b592af43e8dc"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index b51eeb1ad954f..7b72ddcf0d98a 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; + mainProgram = "com.github.philip-scott.spice-up"; }; } diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 18126b5e2b762..7869b54a5f047 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, sqlite }: -stdenv.mkDerivation { - name = "tagainijisho-1.0.3"; +stdenv.mkDerivation rec { + pname = "tagainijisho"; + version = "1.0.3"; + src = fetchurl { - url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; + url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -14,8 +16,10 @@ stdenv.mkDerivation { description = "A free, open-source Japanese dictionary and kanji lookup tool"; homepage = "https://www.tagaini.net/"; license = with licenses; [ - /* program */ gpl3Plus - /* data */ cc-by-sa-30 + /* program */ + gpl3Plus + /* data */ + cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index 4b97f7b3dcd97..41273b7780e33 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -119,5 +119,7 @@ appimageTools.wrapType2 { license = licenses.unfree; maintainers = with maintainers; [ kamadorueda ]; platforms = [ "x86_64-linux" ]; + # gpgme for i686-linux failed to build. + broken = true; }; } diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index e01391519e49c..f1740b326dcfa 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -4,17 +4,16 @@ , installShellFiles , jq }: - let inherit (python3.pkgs) buildPythonApplication fetchPypi setuptools-scm; in buildPythonApplication rec { pname = "todoman"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4c4d0c6533da8d553f3dd170c9c4ff3752eb11fd7177ee391414a39adfef60ad"; + sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -23,6 +22,7 @@ buildPythonApplication rec { installShellFiles setuptools-scm ]; + propagatedBuildInputs = with python3.pkgs; [ atomicwrites click @@ -42,25 +42,37 @@ buildPythonApplication rec { flake8-import-order freezegun hypothesis - pytest - pytest-runner - pytest-cov + pytestCheckHook glibcLocales ]; LC_ALL = "en_US.UTF-8"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=todoman --cov-report=term-missing" "" + ''; + postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " installShellCompletion --zsh contrib/completion/zsh/_todo ''; - preCheck = '' - # Remove one failing test that only checks whether the command line works - rm tests/test_main.py - rm tests/test_cli.py - ''; + disabledTests = [ + # Testing of the CLI part and output + "test_color_due_dates" + "test_color_flag" + "test_default_command" + "test_main" + "test_missing_cache_dir" + "test_sorting_null_values" + "test_xdg_existant" + ]; + + pythonImportsCheck = [ + "todoman" + ]; meta = with lib; { homepage = "https://github.com/pimutils/todoman"; @@ -78,8 +90,8 @@ buildPythonApplication rec { Todoman is part of the pimutils project ''; + changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 5bda63b58451f..0cb26afe82964 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,5 +1,5 @@ diff --git a/src/services/log.js b/src/services/log.js -index 1345ce39..a9770516 100644 +index 4f29994..1e89e0a 100644 --- a/src/services/log.js +++ b/src/services/log.js @@ -1,14 +1,5 @@ @@ -47,7 +47,7 @@ index 1345ce39..a9770516 100644 - if (millisSinceMidnight >= DAY) { - initLogFile(); - -- millisSinceMidnight =- DAY; +- millisSinceMidnight -= DAY; - } - - return millisSinceMidnight; @@ -62,3 +62,42 @@ index 1345ce39..a9770516 100644 - console.log(str); } + +@@ -83,37 +36,6 @@ function request(req, res, timeMs, responseLength = "?") { + `${res.statusCode} ${req.method} ${req.url} with ${responseLength} bytes took ${timeMs}ms`); + } + +-function pad(num) { +- num = Math.floor(num); +- +- return num < 10 ? ("0" + num) : num.toString(); +-} +- +-function padMilli(num) { +- if (num < 10) { +- return "00" + num; +- } +- else if (num < 100) { +- return "0" + num; +- } +- else { +- return num.toString(); +- } +-} +- +-function formatTime(millisSinceMidnight) { +- return pad(millisSinceMidnight / HOUR) +- + ":" + pad((millisSinceMidnight % HOUR) / MINUTE) +- + ":" + pad((millisSinceMidnight % MINUTE) / SECOND) +- + "." + padMilli(millisSinceMidnight % SECOND); +-} +- +-function formatDate() { +- return pad(todaysMidnight.getFullYear()) +- + "-" + pad(todaysMidnight.getMonth() + 1) +- + "-" + pad(todaysMidnight.getDate()); +-} +- + module.exports = { + info, + error, diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 6cfdf3c8f9252..528b6786290ad 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.47.8"; + version = "0.48.6"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1vnwjiv4bidw5xspcd7d7fn8dbhvgia9ws363fs5zs48c9k2hwwz"; + sha256 = "1n7gm6mwzf5yyk8cpn70029p1iiv26bypyfi42sx14yyjvlny4rm"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1clgw0i3vbl8lrsjdjbn71yhim6356gm8h24831mnksb4sawhh7f"; + sha256 = "0z7cbw11mqf2mfv6ixnczg2i4jcdpvryzl0521ai26gq42jyyy0r"; }; in { @@ -44,8 +44,8 @@ in { # (they did special-case icon.png but we want the scalable svg) # Use the version here to ensure we get any changes. trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg"; - sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/icon.svg"; + sha256 = "0sz3piskdlx267whx8r6afrdadn25bf0zmxplj1599zqkf7w7n0x"; }; diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 2c6b5dfe3b3b6..2ba594a64aadd 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,18 +8,24 @@ mkDerivation rec { pname = "vnote"; - version = "3.8.1"; + version = "3.10.1"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-GgSVBVcT0rfgglyjCmkEMbKCEltesC3eSsN38psrkS4="; + sha256 = "sha256-juLyKAq21qNCWTpyMJSMw86U/DMbw/QJCr8QwyqVclA="; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebengine ]; + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + qtwebengine + ]; meta = with lib; { homepage = "https://vnotex.github.io/vnote"; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 9da6073ff42f5..bfb97d88e86b0 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "zk"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-C3/V4v8lH4F3S51egEw5d51AI0n5xzBQjwhrI64FEGA="; + sha256 = "sha256-lTg5jB3krZWmCn3wWoAwzqBji1AyTTTVf/BphC7Mr5s="; }; vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk="; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 2e4b3b30d225c..b10d817d9e494 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20210724"; + version = "20211016"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb"; + sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix new file mode 100644 index 0000000000000..9b1e75c1040fb --- /dev/null +++ b/pkgs/applications/radio/csdr/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, pkg-config, fftwFloat, libsamplerate +}: + +stdenv.mkDerivation rec { + pname = "csdr"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "1vip5a3xgskcwba3xi66zfr986xrsch9na7my818cm8vw345y57b"; + }; + + patchPhase = '' + substituteInPlace configure.ac \ + --replace -Wformat=0 "" + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + fftwFloat + libsamplerate + ]; + + meta = with lib; { + homepage = "https://github.com/jketterl/csdr"; + description = "A simple DSP library and command-line tool for Software Defined Radio"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 35a3e9f44bb29..46b851ec704e2 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { tap audio and synthesize the decoded speech. Speech synthesis requires mbelib, which is a separate package. ''; - homepage = https://github.com/szechyjs/dsd; + homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 4d27907cdd182..8be72ef3d6b50 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.1-20210714.0"; + version = "0.2-20211111.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - sha256 = "16zx6kbax59rcxyz9dhq7m8yx214knz3xayna1gzb85m6maly8v8"; + sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904"; }; buildInputs = [ pulseaudio ]; - vendorSha256 = "0qn8vg84j9kp0ycn24lkaqjnnk339j3vis4bn48ia3z5vfc22gi5"; + vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf"; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nDAX"; diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 5792031c802d4..f10840e1bea96 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-hackrf-unstable-20160827"; + pname = "kalibrate-hackrf"; + version = "unstable-2016-08-27"; # There are no tags/releases, so use the latest commit from git master. # Currently, the latest commit is from 2016-07-03. diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 255938b11d52f..4fe9ad0867814 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-rtl-20131214"; + pname = "kalibrate-rtl"; + version = "unstable-2013-12-14"; - # There are no tags/releases, so use the latest commit from git master. - # Currently, the latest commit is from 2013-12-14. - src = fetchgit { - url = "https://github.com/steve-m/kalibrate-rtl.git"; + src = fetchFromGitHub { + owner = "steve-m"; + repo = "kalibrate-rtl"; rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38"; sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with lib; { @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix new file mode 100644 index 0000000000000..928bc4168ebd0 --- /dev/null +++ b/pkgs/applications/radio/openwebrx/default.nix @@ -0,0 +1,92 @@ +{ stdenv, lib, buildPythonPackage, buildPythonApplication, fetchFromGitHub +, pkg-config, cmake, setuptools +, rtl-sdr, soapysdr-with-plugins, csdr, direwolf +}: + +let + + js8py = buildPythonPackage rec { + pname = "js8py"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "1j80zclg1cl5clqd00qqa16prz7cyc32bvxqz2mh540cirygq24w"; + }; + + pythonImportsCheck = [ "js8py" "test" ]; + + meta = with lib; { + homepage = "https://github.com/jketterl/js8py"; + description = "A library to decode the output of the js8 binary of JS8Call"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; + }; + + owrx_connector = stdenv.mkDerivation rec { + pname = "owrx_connector"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "0gz4nf2frrkx1mpjfjpz2j919fkc99g5lxd8lhva3lgqyisvf4yj"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + rtl-sdr + soapysdr-with-plugins + ]; + + meta = with lib; { + homepage = "https://github.com/jketterl/owrx_connector"; + description = "A set of connectors that are used by OpenWebRX to interface with SDR hardware"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ astro ]; + }; + }; + +in +buildPythonApplication rec { + pname = "openwebrx"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jketterl"; + repo = pname; + rev = version; + sha256 = "0maxs07yx235xknvkbmhi2zds3vfkd66l6wz6kspz3jzl4c0v1f9"; + }; + + propagatedBuildInputs = [ + setuptools + csdr + js8py + soapysdr-with-plugins + owrx_connector + direwolf + ]; + + pythonImportsCheck = [ "csdr" "owrx" "test" ]; + + passthru = { + inherit js8py owrx_connector; + }; + + meta = with lib; { + homepage = "https://github.com/jketterl/openwebrx"; + description = "A simple DSP library and command-line tool for Software Defined Radio"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 4c22d0e9325ef..2ba379400382d 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "6.17.1"; + version = "6.17.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-VWHFrgJVyI3CtLXUiG3/4/cRTD8jSdunbrro34yLKvs="; + sha256 = "sha256-sMD2JTJJlssMdXCUHdFYjEqGknhGGuG4szfnvFFN7t4="; fetchSubmodules = false; }; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index b716b0f2f90fc..beb3bd92ea5e0 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "sep20a"; - version = "20200901_a"; + srcVersion = "nov21a"; + version = "20211101_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; + sha256 = "0fb6iqwh4hm7v7sib7sx98vxdavn3d6q2gq6y6vxg2z29g31f8g2"; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index baf9ed7fc184d..d557f32bb6da1 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { - name = "gravit-0.5.1"; + pname = "gravit"; + version = "0.5.1"; src = fetchurl { - url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; + url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 898885047a05b..f54dcb94e23b3 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -28,10 +28,6 @@ mkDerivation rec { 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Stellarium.app/Contents")' ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out"/Stellarium.app/Contents/MacOS/stellarium - ''; - meta = with lib; { description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index d0196c0e25a54..f6aa5e8892ac7 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-E7+h2ipe3aj6URlqR6C0r7P+8XUWRR5PDnhHfz3TC5A="; + sha256 = "sha256-t++Iron8tVZYxb6i6MuOdWsFXhOGADbWvhN1Z4KqGcs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index f147c0422e454..b6286d11c8cbd 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,11 +1,12 @@ -{lib, stdenv, fetchurl, cmake}: +{ lib, stdenv, fetchurl, cmake }: -stdenv.mkDerivation { - name = "cmtk-3.3.1"; +stdenv.mkDerivation rec { + pname = "cmtk"; + version = "3.3.1"; src = fetchurl { name = "cmtk-source.tar.gz"; - url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; + url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1"; sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; @@ -14,13 +15,13 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { - description = "Computational Morphometry Toolkit "; + description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a back-end general-purpose library for processing and I/O''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; - license = licenses.gpl3; - homepage = "https://www.nitrc.org/projects/cmtk/"; + license = licenses.gpl3; + homepage = "https://www.nitrc.org/projects/cmtk/"; }; } diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 6224ccabb069c..36dddad5db5ac 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20210317"; + version = "1.0.20211006"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "05rjk0xsrzcxa979vlx25k1rdz1in84gkfm9l1h9f7k4a4aa5r6j"; + sha256 = "sha256-fQAVOzynMdSLDfhcYWcaXkFW/mnv4zySGLVJNE7ql/c="; }; nativeBuildInputs = [ cmake git ]; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 2e11c1d8c58cb..4f23f3f9a82c1 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, zlib }: -stdenv.mkDerivation { - name = "diamond-0.8.36"; +stdenv.mkDerivation rec { + pname = "diamond"; + version = "0.8.36"; src = fetchurl { - url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + url = "https://github.com/bbuchfink/diamond/archive/v${version}.tar.gz"; sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; }; @@ -30,7 +31,7 @@ stdenv.mkDerivation { B. Buchfink, Xie C., D. Huson, "Fast and sensitive protein alignment using DIAMOND", Nature Methods 12, 59-60 (2015). - ''; + ''; homepage = "https://github.com/bbuchfink/diamond"; license = { fullName = "University of Tuebingen, Benjamin Buchfink"; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 019370378605b..4ed11857a30e5 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gcc, zlib, python27 }: stdenv.mkDerivation rec { - name = "ecopcr-0.8.0"; + pname = "ecopcr"; + version = "0.8.0"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz"; + url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz"; sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 5cbcd46ee07cf..29669d027303a 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: +{ lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib }: + +stdenv.mkDerivation rec { + pname = "emboss"; + version = "6.6.0"; -stdenv.mkDerivation { - name = "emboss-6.6.0"; src = fetchurl { - url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; + url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${version}.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; @@ -16,13 +18,13 @@ stdenv.mkDerivation { ''; meta = { - description = "The European Molecular Biology Open Software Suite"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; - license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + license = lib.licenses.gpl2; + homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 0f83178626bf6..2a4df9d21dbac 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { homepage = "http://hmmer.org/"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; - platforms = platforms.unix; + # at least SSE is *required* + platforms = platforms.x86_64; }; } diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 72cf9c86e65b3..ba1b91298bb32 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, fetchurl, neuron-version -, libX11, libXext, patchelf +{ lib +, stdenv +, fetchurl +, neuron-version +, libX11 +, libXext +, patchelf }: -stdenv.mkDerivation rec - { name = "iv-19"; - src = fetchurl - { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; - sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; - }; - nativeBuildInputs = [ patchelf ]; - buildInputs = [ libXext ]; - propagatedBuildInputs = [ libX11 ]; - hardeningDisable = [ "format" ]; - postInstall = '' - for dir in $out/*; do # */ - if [ -d $dir/lib ]; then - mv $dir/* $out # */ - rmdir $dir - break - fi - done - '' + lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so - ''; - meta = with lib; - { description = "InterViews graphical library for Neuron"; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - platforms = platforms.all; - }; - } +stdenv.mkDerivation rec { + pname = "iv"; + version = "19"; + + src = fetchurl { + url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz"; + sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; + }; + + nativeBuildInputs = [ patchelf ]; + buildInputs = [ libXext ]; + propagatedBuildInputs = [ libX11 ]; + + hardeningDisable = [ "format" ]; + + postInstall = '' + for dir in $out/*; do # */ + if [ -d $dir/lib ]; then + mv $dir/* $out # */ + rmdir $dir + break + fi + done + '' + lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so + ''; + + meta = with lib; { + description = "InterViews graphical library for Neuron"; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index c636942ca781f..b38af2f64b544 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -1,10 +1,6 @@ -{ lib, fetchurl, python3Packages, cmake, python3 }: +{ stdenv, lib, fetchurl, python3Packages, cmake, python3 }: -let - pythonPackages = python3Packages; -in - -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "obitools3"; version = "3.0.1b11"; @@ -13,15 +9,18 @@ pythonPackages.buildPythonApplication rec { sha256 = "1x7a0nrr9agg1pfgq8i1j8r1p6c0jpyxsv196ylix1dd2iivmas1"; }; + nativeBuildInputs = [ python3Packages.cython cmake ]; + + postPatch = lib.optionalString stdenv.isAarch64 '' + substituteInPlace setup.py \ + --replace "'-msse2'," "" + ''; + preBuild = '' substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages"; export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE" ''; - disabled = !pythonPackages.isPy3k; - - nativeBuildInputs = [ pythonPackages.cython cmake ]; - dontConfigure = true; doCheck = true; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4c16413746dd7..855f90a74a328 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.3"; + version = "2.26.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-H7VgD75tmAEd01Pj1o6BNT0QaXhd1pUIpAFmKM6OUlo="; + sha256 = "sha256-KVOQuqudne0SAdgFEft/lTuoDn9vcpuDtMAafztYvPo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index f5c6d79e28aa5..c6339bab1228e 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { - name = "avogadro-1.1.1"; + pname = "avogadro"; + version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; + url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 732e97b9b0958..0434bfe120c85 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 = "10.5"; + version = "11.2"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1bgdkmsp6pwq3b6nxxkimrdmz71wqr8qi25gdzwpcv9wmcf1q27v"; + sha256 = "sha256-leEcUSjpiP13l65K9WKN2GXTtTa8vvK/MFxR2zH6Xno="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 3cd9917969892..1c3203354873d 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -5,9 +5,9 @@ } : let - version = "21.06"; + version = "21.10"; # The tag keeps moving, fix a hash instead - gitLabRev = "dd982ad4bc94dec8ac1e3e99cb6a7dd249ff71de"; + gitLabRev = "117305462bac932106e8e3a0347238b768bcb058"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -19,7 +19,7 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "07dm73n0s7ckif561yb3s9yqxsv39a73kb9qwny4yp39wdvv52hz"; + sha256 = "sha256-GMi2dsNBog+TmpmP6fhQcp6Z5Bh2LelV//MqLnvRP5c="; }; patches = [ @@ -56,7 +56,9 @@ in stdenv.mkDerivation { "-DOPENBLASROOT=${openblas.dev}" ]; - GAROOT=globalarrays; + preConfigure = '' + export GAROOT=${globalarrays}; + ''; postConfigure = '' # The Makefile will install pymolcas during the build grrr. diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 731f2db56af53..8bceed08e1db6 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "archimedes-2.0.1"; + pname = "archimedes"; + version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/archimedes/${name}.tar.gz"; + url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 1a900e10197e3..2fb3b8c8b18c0 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -75,6 +75,6 @@ let homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.rittelle ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index b30a18931213b..f1d34062d2aa3 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, fmt, graphviz, llvmPackages, z3 +, graphviz, llvmPackages, z3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index eec7830b2a157..30ef1f5d109df 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -3,7 +3,7 @@ , coreutils , cppzmq , curl -, epoxy +, libepoxy , fetchFromGitHub , glm , gtkmm3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ cppzmq curl - epoxy + libepoxy glm gtkmm3 libgit2 diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 0b024d5c947ed..61fcff77e1c79 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -27,7 +27,7 @@ , libthai , libdatrie , libxkbcommon -, epoxy +, libepoxy , dbus , at-spi2-core , libXtst @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { libthai libdatrie libxkbcommon - epoxy + libepoxy dbus.daemon at-spi2-core libXtst diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 53a67cea40bce..15b64938b2565 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,37 +1,22 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, qmake, wrapQtAppsHook +, qtbase, qttools, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; + sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r"; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ qtbase ]; - qmakeFlags = ["-r"]; - - # the build system tries to use 'git' at build time to find the HEAD hash. - # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment - # at the end of the line to remove the git call. - postPatch = '' - substituteInPlace ./libs/librepcb/common/common.pro \ - --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' - ''; - - postInstall = '' - mkdir -p $out/share/librepcb/fontobene - cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ - ''; - meta = with lib; { description = "A free EDA software to develop printed circuit boards"; homepage = "https://librepcb.org/"; diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix new file mode 100644 index 0000000000000..344d54d10a6d3 --- /dev/null +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -0,0 +1,136 @@ +{ stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 +, glib, libusb1 , zlib, gtk3-x11, callPackage +, scopes ? [ + "picocv" + "ps2000" + "ps2000a" + "ps3000" + "ps3000a" + "ps4000" + "ps4000a" + "ps5000" + "ps5000a" + "ps6000" + "ps6000a" +] }: + +let + shared_meta = lib: + with lib; { + homepage = "https://www.picotech.com/downloads/linux"; + maintainers = with maintainers; [ expipiplus1 yorickvp wirew0rm ]; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + }; + + libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }: + stdenv.mkDerivation rec { + pname = "libpicoipp"; + inherit (sources.libpicoipp) version; + src = fetchurl { inherit (sources.libpicoipp) url sha256; }; + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $src ."; + installPhase = '' + runHook preInstall + mkdir -p $out/lib + cp -d opt/picoscope/lib/* $out/lib + install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright + runHook postInstall + ''; + meta = with lib; + shared_meta lib // { + description = "library for picotech oscilloscope software"; + }; + }) { }; + + # If we don't have a platform available, put a dummy version here, so at + # least evaluation succeeds. + sources = + (lib.importJSON ./sources.json).${stdenv.system} or { picoscope.version = "unknown"; }; + + scopePkg = name: + { url, version, sha256 }: + stdenv.mkDerivation rec { + pname = "lib${name}"; + inherit version; + src = fetchurl { inherit url sha256; }; + # picoscope does a signature check, so we can't patchelf these + nativeBuildInputs = [ dpkg ]; + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $src ."; + installPhase = '' + runHook preInstall + mkdir -p $out/lib + cp -d opt/picoscope/lib/* $out/lib + runHook postInstall + ''; + meta = with lib; + shared_meta lib // { + description = "library for picotech oscilloscope ${name} series"; + }; + }; + + scopePkgs = lib.mapAttrs scopePkg sources; + +in stdenv.mkDerivation rec { + pname = "picoscope"; + inherit (sources.picoscope) version; + + src = fetchurl { inherit (sources.picoscope) url sha256; }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ]; + + unpackCmd = "dpkg-deb -x $src ."; + sourceRoot = "."; + scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs; + MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath + ([ + glib + gtk3-x11 + gtk-sharp-3_0 + libusb1 + zlib + libpicoipp + ] ++ scopeLibs)); + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -dr usr/share $out/share + cp -dr opt/picoscope/* $out/ + makeWrapper "$(command -v mono)" $out/bin/picoscope \ + --add-flags $out/lib/PicoScope.GTK.exe \ + --prefix MONO_PATH : "$MONO_PATH" \ + --prefix LD_LIBRARY_PATH : "$MONO_PATH" + runHook postInstall + ''; + + # usage: + # services.udev.packages = [ pkgs.picoscope.rules ]; + # users.groups.pico = {}; + # users.users.you.extraGroups = [ "pico" ]; + passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" + ''; + + meta = with lib; + shared_meta lib // { + description = + "Oscilloscope application that works with all PicoScope models"; + longDescription = '' + PicoScope for Linux is a powerful oscilloscope application that works + with all PicoScope models. The most important features from PicoScope + for Windows are included—scope, spectrum analyzer, advanced triggers, + automated measurements, interactive zoom, persistence modes and signal + generator control. More features are being added all the time. + + Waveform captures can be saved for off-line analysis, and shared with + PicoScope for Linux, PicoScope for macOS and PicoScope for Windows + users, or exported in text, CSV and MathWorks MATLAB 4 formats. + ''; + }; +} + diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/applications/science/electronics/picoscope/sources.json new file mode 100644 index 0000000000000..7404259b231ef --- /dev/null +++ b/pkgs/applications/science/electronics/picoscope/sources.json @@ -0,0 +1,69 @@ +{ + "x86_64-linux": { + "libpicocv": { + "sha256": "c2e74c2b0679df0226993d063b38d0eda5b05ff59f29bbfa12ded5226df37024", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.27-1r153_amd64.deb", + "version": "1.1.27-1r153" + }, + "libpicoipp": { + "sha256": "87ae49cd5e8dda4a73a835b95ea13e4c3fc4d1c4c9d6495c9affdf6fa6b1b4aa", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r121_amd64.deb", + "version": "1.3.0-4r121" + }, + "libps2000": { + "sha256": "792e506c08cebbd617e833e1547d3e5a13a186f93cea3f84608b7ed9451fb077", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.75-3r2957_amd64.deb", + "version": "3.0.75-3r2957" + }, + "libps2000a": { + "sha256": "f31b3a8e9c6af14a59e348e4b302f12f582cdb08a47a3c04d8a6a612b4630305", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.75-5r2957_amd64.deb", + "version": "2.1.75-5r2957" + }, + "libps3000": { + "sha256": "27dce3c924bb0169768a4964ce567b4a18ce74079537ca1fcba61e9234691580", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.75-3r2957_amd64.deb", + "version": "4.0.75-3r2957" + }, + "libps3000a": { + "sha256": "31cf00ce136526af6e8b211a44a56b221d137de6eaec4d6fd7f31593b4245d62", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.75-6r2957_amd64.deb", + "version": "2.1.75-6r2957" + }, + "libps4000": { + "sha256": "c976f09647f1fd2c980aafd1efe7f557bfc7c283fb9c135725c38dd59cc297e9", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.75-2r2957_amd64.deb", + "version": "2.1.75-2r2957" + }, + "libps4000a": { + "sha256": "727f24fa74759385902d41d52a26a4636b3e3f08a8743901d15cc49622207b97", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.75-2r2957_amd64.deb", + "version": "2.1.75-2r2957" + }, + "libps5000": { + "sha256": "3237c1dfdb384079b7039d2b4a8e0b0126e804830b29d60e89ae018182667edb", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.75-3r2957_amd64.deb", + "version": "2.1.75-3r2957" + }, + "libps5000a": { + "sha256": "27947f8461a16cf59d64cd23d7a78ddd27826e38dfe9fca3902e3b553591fb19", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.75-5r2957_amd64.deb", + "version": "2.1.75-5r2957" + }, + "libps6000": { + "sha256": "d65e923db969e306fb9f3f3892229a297d6187574d901dde44375270cc1e1404", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.75-6r2957_amd64.deb", + "version": "2.1.75-6r2957" + }, + "libps6000a": { + "sha256": "eff8644ad44f9cc1cf9052e27786a1480a4ab599766c1c01e370fef40a76b224", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.75-0r2957_amd64.deb", + "version": "1.0.75-0r2957" + }, + "picoscope": { + "sha256": "3d2a0e360c8143fc03c29b394c16bfc2387164e33099a46b6905af992cfab440", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.83-1r9320_amd64.deb", + "version": "7.0.83-1r9320" + } + } +} diff --git a/pkgs/applications/science/electronics/picoscope/update.py b/pkgs/applications/science/electronics/picoscope/update.py new file mode 100755 index 0000000000000..ecbd2292030d4 --- /dev/null +++ b/pkgs/applications/science/electronics/picoscope/update.py @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" +import json +import os +import requests +import sys + +def parse_packages(text): + res = [] + for package in resp.text.split("\n\n"): + if not package: continue + pkg = {} + for field in package.split("\n"): + if field.startswith(" "): # multiline string + pkg[k] += "\n" + field[1:] + else: + [k, v] = field.split(": ", 1) + pkg[k] = v + res.append(pkg) + return res + +def generate_sources(packages): + sources_spec = {} + for pkg in pkgs: + sources_spec[pkg['Package']] = { + "url": "https://labs.picotech.com/rc/picoscope7/debian/" + pkg["Filename"], + "sha256": pkg["SHA256"], + "version": pkg["Version"] + } + return sources_spec + +out = {} +for nix_system, release in {"x86_64-linux": "amd64"}.items(): + resp = requests.get("https://labs.picotech.com/rc/picoscope7/debian//dists/picoscope/main/binary-"+release+"/Packages") + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr) + sys.exit(1) + pkgs = parse_packages(resp.text) + out[nix_system] = generate_sources(pkgs) + +with open(os.path.dirname(__file__) + "/sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') + diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index de79abc3e511c..b2e3704cba70f 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { - name = "qfsm-0.54.0"; + pname = "qfsm"; + version = "0.54.0"; src = fetchurl { - url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; + url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 6a39995855344..f8741cd8d1804 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -5,10 +5,11 @@ let libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { - name = "tkgate-1.8.7"; + pname = "tkgate"; + version = "1.8.7"; src = fetchurl { - url = "http://www.tkgate.org/downloads/${name}.tgz"; + url = "http://www.tkgate.org/downloads/tkgate-${version}.tgz"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 8dee645646c51..e5779478936e7 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "antiprism"; - version = "0.26"; + version = "0.29"; src = fetchFromGitHub { owner = "antiprism"; repo = pname; rev = version; - sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ="; + sha256 = "sha256-MHzetkmRDLBXq3KrfXmUhxURY60/Y8z5zQsExT6N4cY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 245d4c12bfe07..684f5913f79fe 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tetgen-1.4.3"; + pname = "tetgen"; + version = "1.4.3"; src = fetchurl { - url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; + url = "${meta.homepage}/files/tetgen${version}.tar.gz"; sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; }; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index f9cc97893da8f..fc16423b671ef 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "aspino-unstable-2017-03-09"; + pname = "aspino"; + version = "unstable-2017-03-09"; src = fetchFromGitHub { owner = "alviano"; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 7d90dca46f591..74927dd434d02 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, python3 +{ stdenv, fetchFromGitHub, lib, python3, fetchpatch , cmake, lingeling, btor2tools, gtest, gmp }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; }; + patches = [ + # present in master - remove after 3.2.2 + (fetchpatch { + name = "fix-parser-getc-char-casts.patch"; + url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch"; + sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq"; + }) + ]; + postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index 48b1263e7961a..dc76305bd7499 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,24 +1,19 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index c51e76d..d0a26d7 100644 +index c51e76d..ae8159e 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) +@@ -56,6 +56,30 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) entry .unpack(&full_path) .chain_err(|| ErrorKind::ExtractingPackage)?; -+ nix_patchelf_if_needed(&full_path); - } - - Ok(()) - } - -+fn nix_patchelf_if_needed(dest_path: &Path) { -+ let (is_bin, is_lib) = if let Some(p) = dest_path.parent() { -+ (p.ends_with("bin"), p.ends_with("lib")) -+ } else { -+ (false, false) -+ }; ++ nix_patch_if_needed(&full_path)?; ++ } ++ ++ Ok(()) ++} + ++fn nix_patch_if_needed(dest_path: &Path) -> Result<()> { ++ let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin")); + if is_bin { + let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") + .arg("--set-interpreter") @@ -26,15 +21,15 @@ index c51e76d..d0a26d7 100644 + .arg(dest_path) + .output(); + } -+ else if is_lib { -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-rpath") -+ .arg("@libPath@") -+ .arg(dest_path) -+ .output(); -+ } -+} + - #[derive(Debug)] - pub struct ZipPackage<'a>(temp::Dir<'a>); ++ if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) { ++ use std::os::unix::fs::PermissionsExt; ++ let new_path = dest_path.with_extension("orig"); ++ ::std::fs::rename(dest_path, &new_path)?; ++ ::std::fs::write(dest_path, format!(r#"#! @shell@ ++exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@ ++"#, new_path.to_str().unwrap()))?; ++ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?; + } + Ok(()) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index fb636da0ec412..4326c5b0d6b9e 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,22 +1,18 @@ -{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: - -let - libPath = lib.makeLibraryPath [ gmp ]; -in +{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell +, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1"; + sha256 = "sha256-QNVzpnT77+9PXhq4Yz0q3o+GiQTVy7dOrg2yBTscoek="; }; - cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ="; + cargoSha256 = "sha256-G70QopoMqFrkOnuui3+3cEHYvmnf0meX1Ecv4q8FCpM="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -24,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; - cargoBuildFlags = [ "--features no-self-update" ]; + buildFeatures = [ "no-self-update" ]; patches = lib.optionals stdenv.isLinux [ # Run patchelf on the downloaded binaries. @@ -32,13 +28,13 @@ rustPlatform.buildRustPackage rec { (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; - libPath = "$ORIGIN/../lib:${libPath}"; + shell = runtimeShell; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ --subst-var dynamicLinker \ - --subst-var libPath + --subst-var shell '') ]; @@ -50,8 +46,6 @@ rustPlatform.buildRustPackage rec { done popd - wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}" - # tries to create .elan export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index be1d6f253bc59..af6673caa54f3 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gmp, mpfr, boost }: -stdenv.mkDerivation { - name = "gappa-1.4.0"; +stdenv.mkDerivation rec { + pname = "gappa"; + version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-${version}.tar.gz"; sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb"; }; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 24faa98f777ba..e66fe992e189a 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -3,11 +3,11 @@ let load_num = if num == null then "" else - '' - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ - ''; + '' + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ + ''; start_script = '' @@ -21,19 +21,22 @@ let in stdenv.mkDerivation { - name = "hol_light-2019-10-06"; + pname = "hol_light"; + version = "unstable-2019-10-06"; src = fetchFromGitHub { - owner = "jrh13"; - repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; + owner = "jrh13"; + repo = "hol-light"; + rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; - patches = [(fetchpatch { - url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; - sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; - })]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; + sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; + }) + ]; buildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; @@ -47,9 +50,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Interactive theorem prover based on Higher-Order Logic"; - homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; - license = licenses.bsd2; - platforms = platforms.unix; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; + license = licenses.bsd2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; }; } diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix new file mode 100644 index 0000000000000..08be0740117a4 --- /dev/null +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub +, drat-trim, p7zip +}: + +stdenv.mkDerivation rec { + pname = "kissat"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "kissat"; + # https://github.com/arminbiere/kissat/issues/18 + rev = "abfa45fb782fa3b7c6e2eb6b939febe74d7270b7"; + sha256 = "06pbmkjxgf2idhsrd1yzvbxr2wf8l06pjb38bzbygm6n9ami89b8"; + }; + + outputs = [ "out" "dev" "lib" ]; + + checkInputs = [ drat-trim p7zip ]; + doCheck = true; + + # 'make test' assumes that /etc/passwd is not writable. + patches = [ ./writable-passwd-is-ok.patch ]; + + # the configure script is not generated by autotools and does not accept the + # arguments that the default configurePhase passes like --prefix and --libdir + dontAddPrefix = true; + setOutputFlags = false; + + installPhase = '' + runHook preInstall + + install -Dm0755 build/kissat "$out/bin/kissat" + install -Dm0644 src/kissat.h "$dev/include/kissat.h" + install -Dm0644 build/libkissat.a "$lib/lib/libkissat.a" + mkdir -p "$out/share/doc/kissat/" + install -Dm0644 {LICEN?E,README*,VERSION} "$out/share/doc/kissat/" + + runHook postInstall + ''; + + meta = with lib; { + description = "A 'keep it simple and clean bare metal SAT solver' written in C"; + longDescription = '' + Kissat is a "keep it simple and clean bare metal SAT solver" written in C. + It is a port of CaDiCaL back to C with improved data structures, + better scheduling of inprocessing and optimized algorithms and implementation. + ''; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://fmv.jku.at/kissat"; + }; +} diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch new file mode 100644 index 0000000000000..f2cca54e1d36b --- /dev/null +++ b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch @@ -0,0 +1,13 @@ +diff --git a/test/testfile.c b/test/testfile.c +index cb311d5..0726244 100644 +--- a/test/testfile.c ++++ b/test/testfile.c +@@ -92,8 +92,6 @@ do { \ + WRITABLE (true, "../test/file/non-existing"); + WRITABLE (false, "/kissat-test-file-writable"); + WRITABLE (false, "non-existing-directory/file-in-non-existing-directory"); +- if (kissat_file_exists ("/etc/passwd")) +- WRITABLE (false, "/etc/passwd"); + #undef WRITABLE + } + diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 08bd0e4d63759..1abf38b49cf82 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -4,15 +4,14 @@ stdenv.mkDerivation { pname = "lingeling"; - # This is the version used in satcomp2018, which was - # relicensed, and also known as version 'bcj' - version = "pre1_03b4860d"; + # This is the version used in satcomp2020 + version = "pre1_708beb26"; src = fetchFromGitHub { owner = "arminbiere"; repo = "lingeling"; - rev = "03b4860d14016f42213ea271014f2f13d181f504"; - sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx"; + rev = "708beb26a7d5b5d5e7abd88d6f552fb1946b07c1"; + sha256 = "1lb2g37nd8qq5hw5g6l691nx5095336yb2zlbaw43mg56hkj8357"; }; configurePhase = '' diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 10266abffea11..cf7470b5475b0 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw"; + sha256 = "04q9bzhnzpi8cgv3ly4ii88qvmlw9n09c4p1qmg8dhxqkskdqj6h"; }; dontUnpack = true; @@ -30,8 +30,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src" - unzip $src resources/logisim/img/logisim-icon.svg - install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg + # Create icons + unzip $src "resources/logisim/img/*" + for size in 16 32 48 128 256; do + install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim-evolution.png" + done runHook postInstall ''; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 259cdcea44320..1356c88d478fc 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -28,9 +28,18 @@ let }) ]; + # source behind __linux__ check assumes system is also x86 and + # tries to disable x86/x87-specific extended precision mode + # https://github.com/sambayless/monosat/issues/33 + commonPostPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' + substituteInPlace src/monosat/Main.cc \ + --replace 'defined(__linux__)' '0' + ''; + core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src patches; + postPatch = commonPostPatch; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib gmp jdk8 ]; @@ -66,7 +75,7 @@ let # After patching src, move to where the actually relevant source is. This could just be made # the sourceRoot if it weren't for the patch. - postPatch = '' + postPatch = commonPostPatch + '' cd src/monosat/api/python '' + # The relative paths here don't make sense for our Nix build diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 77db8ae3384da..193f603656dca 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, zlib, gmp }: stdenv.mkDerivation { - name = "open-wbo-2.0"; + pname = "open-wbo"; + version = "2.0"; src = fetchFromGitHub { owner = "sat-group"; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 2ef494cca2666..e701fb2711f08 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-StnEvkSSKDHGYXIQsDUu9T9Ztl+RtDTP47JvnRyH0bE="; + sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 7fedca72b6980..aa01469bfbb87 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,7 +1,8 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "prover9-2009-11a"; + pname = "prover9"; + version = "2009-11a"; src = fetchurl { url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; @@ -10,7 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchPhase = '' + postPatch = '' RM=$(type -tp rm) MV=$(type -tp mv) CP=$(type -tp cp) @@ -30,16 +31,16 @@ stdenv.mkDerivation { cp bin/* $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = "GPL"; + license = licenses.gpl1; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover for first-order and equational logic. Prover9 is a successor of the Otter Prover. This is the LADR command-line version. ''; - platforms = lib.platforms.linux; - maintainers = []; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index ba46d87581e0a..fbc9eb2d8a157 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,28 +2,28 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.02pl1"; + version = "2.03"; src = fetchurl { - url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "1jmzfpx0hdgfmkq0jp6i3k5av9xxgndjaj743wfy37svn0ga4jjx"; + url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz"; + sha256 = "sha256:1q5mp9il09jylimcaqczb3kh34gb5px88js127gxv0jj5b4bqfc7"; }; - buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ]; + buildInputs = with ocamlPackages; [ ocaml findlib ]; - buildPhase = "./build"; + buildPhase = "./build -nointeract"; installPhase = '' - mkdir -p $out/bin - cp ./proverif $out/bin - cp ./proveriftotex $out/bin + runHook preInstall + install -D -t $out/bin proverif proveriftotex install -D -t $out/share/emacs/site-lisp/ emacs/proverif.el + runHook postInstall ''; meta = { - description = "Cryptographic protocol verifier in the Dolev-Yao model"; - homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/"; + description = "Cryptographic protocol verifier in the formal model"; + homepage = "https://bblanche.gitlabpages.inria.fr/proverif/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 43a2ec7e97e23..656f3f1b653e9 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: + stdenv.mkDerivation { - name = "redprl-2017-03-28"; - src = fetchgit { - url = "https://github.com/RedPRL/sml-redprl.git"; - rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; - sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c"; + pname = "redprl"; + version = "unstable-2019-11-04"; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "sml-redprl"; + rev = "c72190de76f7ed1cfbe1d2046c96e99ac5022b0c"; fetchSubmodules = true; + sha256 = "sha256-xrQT5o0bsIN+mCYUOz9iY4+j3HGROb1I6R2ADcLy8n4="; }; + buildInputs = [ mlton ]; - patchPhase = '' + + postPatch = '' patchShebangs ./script/ ''; + buildPhase = '' ./script/mlton.sh ''; + installPhase = '' mkdir -p $out/bin mv ./bin/redprl $out/bin ''; - meta = { + + meta = with lib; { description = "A proof assistant for Nominal Computational Type Theory"; homepage = "http://www.redprl.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.acowley ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index fe0ca1b3017ba..a509d70ed4624 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, haskell, spass }: -stdenv.mkDerivation { - name = "system-for-automated-deduction-2.3.25"; +stdenv.mkDerivation rec { + pname = "system-for-automated-deduction"; + version = "2.3.25"; src = fetchurl { - url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; + url = "http://nevidal.org/download/sad-${version}.tar.gz"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ haskell.compiler.ghc844 spass ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt - ''; + ''; installPhase = '' mkdir -p $out/{bin,provers} install alice $out/bin @@ -23,18 +24,18 @@ stdenv.mkDerivation { substituteAll provers/provers.dat $out/provers/provers.dat substituteAll init.opt $out/init.opt cp -r examples $out - ''; + ''; inherit spass; meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language - ''; + ''; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.schmitthenner ]; homepage = "http://nevidal.org/sad.en.html"; platforms = lib.platforms.linux; - broken = true; # ghc-8.4.4 is gone from Nixpkgs + broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 77dbbd7cdd1e7..19e6219fc04a4 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -22,12 +22,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0="; - # Enables build against a generic BLAS. - cargoBuildFlags = [ - "--features" - "netlib" - ]; - nativeBuildInputs = [ installShellFiles ]; buildInputs = [ @@ -38,6 +32,9 @@ rustPlatform.buildRustPackage rec { Security ]; + # Enables build against a generic BLAS. + buildFeatures = [ "netlib" ]; + postInstall = '' # Install shell completions for shell in bash fish zsh; do diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a7010966c26de..911d0043ed267 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,13 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig -# data, compression -, bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy -# maths -, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk -# libraries -, libarchive, libxml2 -# extra support -, pythonSupport ? true, pythonPackages ? null -, opencvSupport ? false, opencv ? null +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl + # build +, cmake +, ctags +, pythonPackages +, swig + # math +, eigen +, blas +, lapack +, glpk + # data +, protobuf +, json_c +, libxml2 +, hdf5 +, curl + # compression +, libarchive +, bzip2 +, xz +, snappy +, lzo + # more math +, nlopt +, lp_solve +, colpack + # extra support +, pythonSupport ? true +, opencvSupport ? false +, opencv ? null , withSvmLight ? false }: @@ -19,8 +44,10 @@ assert (!blas.isILP64) && (!lapack.isILP64); let pname = "shogun"; version = "6.1.4"; + rxcppVersion = "4.0.0"; gtestVersion = "1.8.0"; + srcs = { toolbox = fetchFromGitHub { owner = pname + "-toolbox"; @@ -29,7 +56,8 @@ let sha256 = "05s9dclmk7x5d7wnnj4qr6r6c827m72a44gizcv09lxr28pr9inz"; fetchSubmodules = true; }; - # we need the packed archive + + # The CMake external projects expect the packed archives rxcpp = fetchurl { url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz"; sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh"; @@ -42,54 +70,90 @@ let in stdenv.mkDerivation rec { - inherit pname version; - src = srcs.toolbox; - - postUnpack = '' - mkdir -p $sourceRoot/third_party/{rxcpp,gtest} - ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz - ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz - ''; + outputs = [ "out" "dev" "doc" ]; - # broken - doCheck = false; + src = srcs.toolbox; patches = [ + # Fix compile errors with json-c + # https://github.com/shogun-toolbox/shogun/pull/4104 (fetchpatch { - url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) + + # Fix compile errors with GCC 9+ + # https://github.com/shogun-toolbox/shogun/pull/4811 + (fetchpatch { + url = "https://github.com/shogun-toolbox/shogun/commit/c8b670be4790e0f06804b048a6f3d77c17c3ee95.patch"; + sha256 = "sha256-MxsR3Y2noFQevfqWK3nmX5iK4OVWeKBl5tfeDNgjcXk="; + }) + (fetchpatch { + url = "https://github.com/shogun-toolbox/shogun/commit/5aceefd9fb0e2132c354b9a0c0ceb9160cc9b2f7.patch"; + sha256 = "sha256-AgJJKQA8vc5oKaTQDqMdwBR4hT4sn9+uW0jLe7GteJw="; + }) + + # Fix compile errors with Eigen 3.4 + ./eigen-3.4.patch + ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; - CCACHE_DISABLE="1"; - CCACHE_DIR=".ccache"; - - nativeBuildInputs = [ cmake ]; - buildInputs = with lib; [ - blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk - ] - ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) - ++ optional (opencvSupport) opencv; - - NIX_CFLAGS_COMPILE="-faligned-new"; - - cmakeFlags = - let - onOff = b: if b then "ON" else "OFF"; - flag = n: b: "-D"+n+"="+onOff b; - in - with lib; [ - (flag "ENABLE_TESTING" doCheck) - (flag "BUILD_META_EXAMPLES" doCheck) - (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) - (flag "PythonModular" pythonSupport) - (flag "OpenCV" opencvSupport) - (flag "USE_SVMLIGHT" withSvmLight) + nativeBuildInputs = [ cmake swig ctags ] + ++ (with pythonPackages; [ python jinja2 ply ]); + + buildInputs = [ + eigen + blas + lapack + glpk + protobuf + json_c + libxml2 + hdf5 + curl + libarchive + bzip2 + xz + snappy + lzo + nlopt + lp_solve + colpack + ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) + ++ lib.optional opencvSupport opencv; + + cmakeFlags = let + enableIf = cond: if cond then "ON" else "OFF"; + in [ + "-DBUILD_META_EXAMPLES=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault + "-DENABLE_TESTING=${enableIf doCheck}" + "-DDISABLE_META_INTEGRATION_TESTS=ON" + "-DTRAVIS_DISABLE_META_CPP=ON" + "-DPythonModular=${enableIf pythonSupport}" + "-DOpenCV=${enableIf opencvSupport}" + "-DUSE_SVMLIGHT=${enableIf withSvmLight}" ]; + CXXFLAGS = "-faligned-new"; + + doCheck = true; + + postUnpack = '' + mkdir -p $sourceRoot/third_party/{rxcpp,GoogleMock} + ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz + ln -s ${srcs.gtest} $sourceRoot/third_party/GoogleMock/release-${gtestVersion}.tar.gz + ''; + postPatch = '' # Fix preprocessing SVMlight code sed -i \ @@ -106,10 +170,17 @@ stdenv.mkDerivation rec { ./scripts/light-scrubber.sh ''; + postInstall = '' + mkdir -p $doc/share/doc/shogun/examples + mv $out/share/shogun/examples/cpp $doc/share/doc/shogun/examples + cp ../examples/undocumented/libshogun/*.cpp $doc/share/doc/shogun/examples/cpp + rm -r $out/share + ''; + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo smancill ]; }; } diff --git a/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch b/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch new file mode 100644 index 0000000000000..863bd75918b0f --- /dev/null +++ b/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch @@ -0,0 +1,74 @@ +From: Sebastián Mancilla <smancill@smancill.dev> +Subject: [PATCH] Fix compile errors when using Eigen 3.4 + +--- + .../machine/gp/MultiLaplaceInferenceMethod.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +index 2e27678d2..60050afea 100644 +--- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp ++++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +@@ -84,9 +84,9 @@ class CMultiPsiLine : public func_base + float64_t result=0; + for(index_t bl=0; bl<C; bl++) + { +- eigen_f.block(bl*n,0,n,1)=K*alpha->block(bl*n,0,n,1)*CMath::exp(log_scale*2.0); +- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; +- eigen_f.block(bl*n,0,n,1)+=eigen_m; ++ eigen_f.segment(bl*n,n)=K*alpha->segment(bl*n,n)*CMath::exp(log_scale*2.0); ++ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; ++ eigen_f.segment(bl*n,n)+=eigen_m; + } + + // get first and second derivatives of log likelihood +@@ -272,7 +272,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + { + Map<VectorXd> alpha(m_alpha.vector, m_alpha.vlen); + for(index_t bl=0; bl<C; bl++) +- eigen_mu.block(bl*n,0,n,1)=eigen_ktrtr*CMath::exp(m_log_scale*2.0)*alpha.block(bl*n,0,n,1); ++ eigen_mu.segment(bl*n,n)=eigen_ktrtr*CMath::exp(m_log_scale*2.0)*alpha.segment(bl*n,n); + + //alpha'*(f-m)/2.0 + Psi_New=alpha.dot(eigen_mu)/2.0; +@@ -316,7 +316,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + + for(index_t bl=0; bl<C; bl++) + { +- VectorXd eigen_sD=eigen_dpi.block(bl*n,0,n,1).cwiseSqrt(); ++ VectorXd eigen_sD=eigen_dpi.segment(bl*n,n).cwiseSqrt(); + LLT<MatrixXd> chol_tmp((eigen_sD*eigen_sD.transpose()).cwiseProduct(eigen_ktrtr*CMath::exp(m_log_scale*2.0))+ + MatrixXd::Identity(m_ktrtr.num_rows, m_ktrtr.num_cols)); + MatrixXd eigen_L_tmp=chol_tmp.matrixU(); +@@ -341,11 +341,11 @@ void CMultiLaplaceInferenceMethod::update_alpha() + VectorXd tmp2=m_tmp.array().rowwise().sum(); + + for(index_t bl=0; bl<C; bl++) +- eigen_b.block(bl*n,0,n,1)+=eigen_dpi.block(bl*n,0,n,1).cwiseProduct(eigen_mu.block(bl*n,0,n,1)-eigen_mean_bl-tmp2); ++ eigen_b.segment(bl*n,n)+=eigen_dpi.segment(bl*n,n).cwiseProduct(eigen_mu.segment(bl*n,n)-eigen_mean_bl-tmp2); + + Map<VectorXd> &eigen_c=eigen_W; + for(index_t bl=0; bl<C; bl++) +- eigen_c.block(bl*n,0,n,1)=eigen_E.block(0,bl*n,n,n)*(eigen_ktrtr*CMath::exp(m_log_scale*2.0)*eigen_b.block(bl*n,0,n,1)); ++ eigen_c.segment(bl*n,n)=eigen_E.block(0,bl*n,n,n)*(eigen_ktrtr*CMath::exp(m_log_scale*2.0)*eigen_b.segment(bl*n,n)); + + Map<MatrixXd> c_tmp(eigen_c.data(),n,C); + +@@ -409,7 +409,7 @@ float64_t CMultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix<float64_t + { + result+=((eigen_E.block(0,bl*n,n,n)-eigen_U.block(0,bl*n,n,n).transpose()*eigen_U.block(0,bl*n,n,n)).array() + *eigen_dK.array()).sum(); +- result-=(eigen_dK*eigen_alpha.block(bl*n,0,n,1)).dot(eigen_alpha.block(bl*n,0,n,1)); ++ result-=(eigen_dK*eigen_alpha.segment(bl*n,n)).dot(eigen_alpha.segment(bl*n,n)); + } + + return result/2.0; +@@ -489,7 +489,7 @@ SGVector<float64_t> CMultiLaplaceInferenceMethod::get_derivative_wrt_mean( + result[i]=0; + //currently only compute the explicit term + for(index_t bl=0; bl<C; bl++) +- result[i]-=eigen_alpha.block(bl*n,0,n,1).dot(eigen_dmu); ++ result[i]-=eigen_alpha.segment(bl*n,n).dot(eigen_dmu); + } + + return result; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index ca7500cd5c354..81e0ccc71d66d 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "General-purpose neural model for efficient learning of entity embeddings"; - homepage = https://ai.facebook.com/tools/starspace/; + homepage = "https://ai.facebook.com/tools/starspace/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7ecbe09f5e18c..7e9b322b4157f 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost flatbuffers - fmt rapidjson spdlog zlib diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index dbd2fb095e00a..d08078c356e1a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji"; + sha256 = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8="; }; dontUseImakeConfigure = true; @@ -31,14 +31,17 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./skip-check-for-aarch64.patch ]; - prePatch = lib.optionalString stdenv.isDarwin '' + # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: + # https://github.com/NixOS/nixpkgs/issues/146131 + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure \ --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" + substituteInPlace tests/Examples/Makefile.in \ + --replace "test-Examples: test-Examples-Base" "test-Examples:" # do not test the examples ''; dontDisableStatic = static; diff --git a/pkgs/applications/science/math/R/skip-check-for-aarch64.patch b/pkgs/applications/science/math/R/skip-check-for-aarch64.patch deleted file mode 100644 index 8721bf6b422d9..0000000000000 --- a/pkgs/applications/science/math/R/skip-check-for-aarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd ---- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300 -+++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300 -@@ -287,7 +287,7 @@ - options(digits = 10) # more accuracy for 'trace' - ## IGNORE_RDIFF_BEGIN - try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here: -- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE)) -+ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE)) - ## --> convergence tolerance 4.997e-8 (in 11 iter.) - ## IGNORE_RDIFF_END diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 9d56ac70d9216..35b9200a47749 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub , lib -, mkDerivation , SDL2 , libGL , libarchive @@ -10,9 +9,11 @@ , git , libpng_apng , pkg-config +, wrapQtAppsHook +, stdenv }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CEmu"; version = "1.3"; src = fetchFromGitHub { @@ -26,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake git + wrapQtAppsHook pkg-config ]; @@ -40,6 +42,7 @@ mkDerivation rec { qmakeFlags = [ "gui/qt" + "CONFIG+=ltcg" ]; meta = with lib; { @@ -49,5 +52,6 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ luc65r ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 02c4c134f92e9..6ce03008d3a98 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, blas, gfortran, lapack }: -stdenv.mkDerivation { - name = "csdp-6.1.1"; +stdenv.mkDerivation rec { + pname = "csdp"; + version = "6.1.1"; src = fetchurl { - url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-${version}.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index a29d403672876..79d5664426bea 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let - version = "1.3.4"; + version = "1.3.7"; name = "fricas-" + version; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "mirror://sourceforge/fricas/files/fricas/${version}/${name}-full.tar.bz2"; - sha256 = "156k9az1623y5808j845c56z2nvvdrm48dzg1v0ivpplyl7vp57x"; + url = "mirror://sourceforge/fricas/fricas/${version}/${name}-full.tar.bz2"; + sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 58b2a617bd63f..808d89ef96361 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper -, libGLU, libGL, freeglut, mpfr, gmp +{ lib +, stdenv +, fetchurl +, ocamlPackages +, makeWrapper +, libGLU +, libGL +, freeglut +, mpfr +, gmp , pkgsHostTarget }: @@ -7,24 +15,32 @@ let inherit (pkgsHostTarget.targetPackages.stdenv) cc; in -stdenv.mkDerivation { - name = "glsurf-3.3.1"; +stdenv.mkDerivation rec { + pname = "glsurf"; + version = "3.3.1"; src = fetchurl { - url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://raffalli.eu/~christophe/glsurf/glsurf-${version}.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; nativeBuildInputs = [ makeWrapper ] ++ (with ocamlPackages; [ - ocaml findlib + ocaml + findlib ]); buildInputs = [ - freeglut libGL libGLU mpfr gmp + freeglut + libGL + libGLU + mpfr + gmp ] ++ (with ocamlPackages; [ - camlp4 lablgl camlimages_4_2_4 + camlp4 + lablgl + camlimages_4_2_4 ]); postPatch = '' diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 5c0de33a71ae1..3ddcd6206d688 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, gfortran, blas, lapack}: +{ lib, stdenv, fetchurl, gfortran, blas, lapack }: stdenv.mkDerivation rec { - name = "JAGS-4.3.0"; + pname = "JAGS"; + version = "4.3.0"; + src = fetchurl { - url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; + url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; @@ -15,8 +17,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Just Another Gibbs Sampler"; - license = licenses.gpl2; - homepage = "http://mcmc-jags.sourceforge.net"; + license = licenses.gpl2; + homepage = "http://mcmc-jags.sourceforge.net"; maintainers = [ maintainers.andres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 88db3c4b2e92c..90a7ada99504b 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , coreutils , patchelf , requireFile @@ -22,11 +23,11 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - - name = "mathematica-9.0.0"; + pname = "mathematica"; + version = "9.0.0"; src = requireFile { - name = "Mathematica_9.0.0_LINUX.sh"; + 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 @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ldpath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 588df51554ab9..6456608e7dbc1 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, zlib, gmp, ecm }: +{ lib, stdenv, fetchurl, zlib, gmp, ecm }: -stdenv.mkDerivation { - name = "msieve-1.53"; +stdenv.mkDerivation rec { + pname = "msieve"; + version = "1.53"; src = fetchurl { - url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz"; + url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; }; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index dffbdaa23aa85..2fe027365cdc5 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { maintainers = teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "com.github.parnold_x.nasc"; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index fc1a2e0abf8cb..4ba1d5c6b474e 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , gmp -, readline , libX11 -, tex , perl +, readline +, tex , withThread ? true, libpthreadstubs }: @@ -12,7 +13,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.13.1"; + version = "2.13.3"; src = fetchurl { urls = [ @@ -20,30 +21,25 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-gez31wzNquIwFlz/Ynyc4uwpe48i+fQHQiedhfht/LE="; + hash = "sha256-zLp/FgbGhU8UQ2N7tXrQlY1Bx/R1P4roRZ8dZMJnoco="; }; - patches = [ - # rebased version of 3edb98db78, see - # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2284 - ./rnfdisc.patch - ]; - buildInputs = [ gmp - readline libX11 - tex perl + readline + tex ] ++ lib.optionals withThread [ libpthreadstubs ]; configureScript = "./Configure"; configureFlags = [ - "--with-gmp=${gmp.dev}" - "--with-readline=${readline.dev}" - ] ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" + "--with-gmp=${lib.getDev gmp}" + "--with-readline=${lib.getDev readline}" + ] + ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" ++ lib.optional withThread "--mt=pthread"; preConfigure = '' @@ -57,6 +53,7 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; meta = with lib; { + homepage = "http://pari.math.u-bordeaux.fr"; description = "Computer algebra system for high-performance number theory computations"; longDescription = '' PARI/GP is a widely used computer algebra system designed for fast @@ -81,7 +78,6 @@ stdenv.mkDerivation rec { 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = "http://pari.math.u-bordeaux.fr"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 23183f83b36b6..7f31543a925f9 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -1,7 +1,9 @@ -{ lib, stdenv -, pari +{ lib +, stdenv , fetchurl -, perl }: +, pari +, perl +}: stdenv.mkDerivation rec { pname = "gp2c"; @@ -12,11 +14,15 @@ stdenv.mkDerivation rec { sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"; }; - buildInputs = [ pari perl ]; + buildInputs = [ + pari + perl + ]; configureFlags = [ "--with-paricfg=${pari}/lib/pari/pari.cfg" - "--with-perl=${perl}/bin/perl" ]; + "--with-perl=${perl}/bin/perl" + ]; meta = with lib; { description = "A compiler to translate GP scripts to PARI programs"; diff --git a/pkgs/applications/science/math/pari/rnfdisc.patch b/pkgs/applications/science/math/pari/rnfdisc.patch deleted file mode 100644 index 6acac96481d51..0000000000000 --- a/pkgs/applications/science/math/pari/rnfdisc.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 0d8a3ac970291c62b56104172418b3f2ca30927c -Author: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr> -Date: Sun Mar 28 13:27:24 2021 +0200 - - rnfdisc_factored: remove spurious Q_primpart [#2284] - -diff --git a/src/basemath/base2.c b/src/basemath/base2.c -index 7e7d0db9d..c461826f4 100644 ---- a/src/basemath/base2.c -+++ b/src/basemath/base2.c -@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd) - - nf = checknf(nf); - pol = rnfdisc_get_T(nf, pol, &lim); -- disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol))); -+ disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol)); - pol = nfX_to_monic(nf, pol, NULL); - fa = idealfactor_partial(nf, disc, lim); - P = gel(fa,1); l = lg(P); -diff --git a/src/test/32/rnf b/src/test/32/rnf -index 1e743f415..c016dce00 100644 ---- a/src/test/32/rnf -+++ b/src/test/32/rnf -@@ -853,9 +853,10 @@ error("inconsistent dimensions in idealtwoelt.") - 0 - 0 - 1 --[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0] --~] --[2, -1] -+[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25 -+/17, -12/17, 12/17, 16/17]~] -+[1, -1] -+[[12, 0, 0, 0; 0, 12, 4, 0; 0, 0, 4, 0; 0, 0, 0, 4], [6, 5, -1, 2]~] - *** at top-level: rnfdedekind(nf,P,pr2,1) - *** ^----------------------- - *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented. -diff --git a/src/test/in/rnf b/src/test/in/rnf -index 7851ae291..318d5349e 100644 ---- a/src/test/in/rnf -+++ b/src/test/in/rnf -@@ -212,6 +212,9 @@ k = nfinit(y^4 + 10*y^2 + 17); - rnfdisc(k, x^2 - x + 1/Mod(y,k.pol)) - rnfdisc(k, x^2 - x + 1/2) - -+k = nfinit(y^4 - 10*y^2 + 1); -+rnfdisc(k,x^2-(y^3/2+y^2-5*y/2+1)) -+ - \\ ERRORS, keep at end of file - rnfdedekind(nf, P, pr2, 1) - rnfdedekind(nf, P) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index d53236d8070cc..4545203dacca0 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "perseus-4-beta"; + pname = "perseus"; version = "4-beta"; nativeBuildInputs = [ unzip ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [erikryb]; + maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index bc192fe4218bb..ab5e54dab777e 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 = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-GTOdJ4dxR491WU6WM47xLHO7RGUGXkdHuQIDxJvVvFE="; + sha256 = "sha256-w0frk1Nd1/HTo94VAbD7QjVuT8laPbmgd8ENTb0+89c="; }; hardeningDisable = [ "format" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index e46553d7b09ed..eb759723256db 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchzip }: -stdenv.mkDerivation { - name = "ries-2018-04-11"; +stdenv.mkDerivation rec { + pname = "ries"; + version = "2018.04.11-1"; # upstream does not provide a stable link src = fetchzip { - url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip"; + url = "https://salsa.debian.org/debian/ries/-/archive/debian/${version}/ries-debian-${version}.zip"; sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 3ba21cf6c8be5..4a912e002d979 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -23,6 +23,12 @@ let # branches (wip patches from tickets), but exports each commit as a separate # patch, so merge commits can lead to conflicts. Used if squashed == false. # + # The above is the preferred option. To use it, find a Trac ticket and pass the + # "Commit" field from the ticket as "rev", choosing "base" as an appropriate + # release tag, i.e. a tag that doesn't cause the patch to include a lot of + # unrelated changes. If there is no such tag (due to nonlinear history, for + # example), there are two other options, listed below. + # # 2) From GitHub's sagemath/sage repo. This lets us use a GH feature that allows # us to choose between a .patch file, with one patch per commit, or a .diff file, # which squashes all commits into a single diff. This is used if squashed == @@ -110,6 +116,22 @@ stdenv.mkDerivation rec { rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; }) + + # https://trac.sagemath.org/ticket/32420 + (fetchSageDiff { + base = "9.5.beta2"; + name = "sympy-1.9-update.patch"; + rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; + sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; + }) + + # https://trac.sagemath.org/ticket/32797 + (fetchSageDiff { + base = "9.5.beta7"; + name = "pari-2.13.3-update.patch"; + rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; + sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index b6613f25cbc7c..1eb057cfc7c5c 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, mpi, flex, zlib}: stdenv.mkDerivation rec { - version = "6.0.4"; + version = "6.1.1"; pname = "scotch"; src_name = "scotch_${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7"; + sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; }; sourceRoot = "${src_name}/src"; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index e4a5f22891e8d..bee2be729d1ed 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.0"; + version = "0.21.2"; src = fetchurl { - url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0yfnbrcil5i76z1wbg308pb1mnjbcxy6nih46qpqs038v1lhh4q8"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m"; }; buildInputs = [ @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://xmedcon.sourceforge.io/Main/HomePage"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; - platforms = with platforms; [ darwin linux ]; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 21e3c47b323df..7cbd9354a372e 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -1,22 +1,35 @@ { lib -, python3Packages +, fetchFromGitHub +, git +, nodejs +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20210628163208"; + version = "3.1.20211104071347"; + format = "setuptools"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "21b885f725420413d2f87eadc5e81c08a9c91beceda89b35d1a702ec4df47e52"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = pname; + rev = version; + sha256 = "sha256-tp4SdilW2PKav7b3/BchXYl33W9U0aQH6FPdOhHSvIQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'prov == 1.5.1' 'prov' + --replace 'prov == 1.5.1' 'prov' \ + --replace "setup_requires=PYTEST_RUNNER," "" ''; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = [ + git + ]; + + propagatedBuildInputs = with python3.pkgs; [ argcomplete bagit coloredlogs @@ -24,18 +37,41 @@ python3Packages.buildPythonApplication rec { prov psutil pydot + rdflib + requests + ruamel-yaml schema-salad shellescape typing-extensions ]; - doCheck = false; # hard to setup - pythonImportsCheck = [ "cwltool" ]; + checkInputs = with python3.pkgs; [ + mock + nodejs + pytest-mock + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + "test_content_types" + "test_env_filtering" + "test_http_path_mapping" + ]; + + disabledTestPaths = [ + "tests/test_udocker.py" + "tests/test_provenance.py" + ]; + + pythonImportsCheck = [ + "cwltool" + ]; meta = with lib; { + description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; license = with licenses; [ asl20 ]; - description = "Common Workflow Language reference implementation"; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 3ab7d57f95a34..783381f9db03e 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w"; + sha256 = "sha256-7YDmojzQujHrsDuB7WC0C3Z2srTd9QUveh1baod3KvU="; }; patches = [ diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 731230130caf9..a92920c5e7958 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake -, eigen, opencv, ceres-solver, cgal, boost, vcg -, gmp, mpfr, glog, gflags, libjpeg_turbo }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, eigen +, opencv +, ceres-solver +, cgal +, boost +, vcg +, gmp +, mpfr +, glog +, gflags +, libjpeg_turbo +}: stdenv.mkDerivation { - name = "openmvs-unstable-2018-05-26"; + pname = "openmvs"; + version = "unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index ed9d185287567..7d284d5eebb7e 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "vite-1.2pre${rev}"; + pname = "vite"; + version = "1.2pre${rev}"; src = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f7756f33499e5..bbe8f6f9f5369 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 = "2021.3"; + version = "2021.4"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "4QmFbsREdo373kHzBZ4xI6vbj+Vsozsag/Me1FdaHMY="; + sha256 = "07ds8abxq0k7vfpjvxb8in3fhb6lz0pbdzbmlidyzaw37qz8lw6b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 85e20f38b6681..dd3fef5bf26cc 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; - homepage = https://sourceforge.net/projects/xflr5/; + homepage = "https://sourceforge.net/projects/xflr5/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index c4f6362465ff2..2016d6afff747 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { - name = "doodle-0.7.2"; + pname = "doodle"; + version = "0.7.2"; buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; }; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/system/pantheon-tweaks/default.nix b/pkgs/applications/system/pantheon-tweaks/default.nix index 5834e8d96308a..67e1bb32aeab6 100644 --- a/pkgs/applications/system/pantheon-tweaks/default.nix +++ b/pkgs/applications/system/pantheon-tweaks/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM="; + sha256 = "sha256-2spZ6RQ5PhBNrv/xG1TNbYsJrmuRpaZ72CeH2s8+P8g="; }; patches = [ @@ -38,9 +38,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee - pantheon.granite - pantheon.switchboard - ]; + ] ++ (with pantheon; [ + elementary-files # settings schemas + elementary-terminal # settings schemas + granite + switchboard + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index bd01b0843fb1b..ba6c6ab87c152 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,11 +1,27 @@ -{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkg-config, which }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXft +, libXi +, xorgproto +, libSM +, libICE +, freetype +, pkg-config +, which +}: -stdenv.mkDerivation { - name = "mrxvt-0.5.4"; +stdenv.mkDerivation rec { + pname = "mrxvt"; + version = "0.5.4"; - buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + src = fetchurl { + url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz"; + sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; + }; + + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" @@ -22,11 +38,6 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; - src = fetchurl { - url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; - sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; - }; - meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " @@ -36,6 +47,7 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ ]; 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)" ]; diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index fff534aaff1ae..da9bfac952b58 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,4 +1,4 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub +{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto @@ -6,31 +6,21 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.7.5"; + version = "3.11.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; + sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; }; - patches = [ - # This is the commit directly after v3.7.5. It is needed to get roxterm to - # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been - # released. - (fetchpatch { - url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; - sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp util-linuxMinimal glib docbook_xsl xmlto libselinux - libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit + libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index b9c72c97d6de5..9ecaffb185cc3 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, wmctrl }: stdenv.mkDerivation { - name = "urxvt-perl-2015-01-16"; + pname = "urxvt-perl"; + version = "unstable-2015-01-16"; src = fetchFromGitHub { owner = "effigies"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index 303555db7224f..c7510568e2641 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; - name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}"; + pname = "urxvt-theme-switch"; + version = "unstable-2014-12-21"; + dontPatchShebangs = true; src = fetchFromGitHub { owner = "felixr"; repo = "urxvt-theme-switch"; - inherit rev; + rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli"; }; @@ -23,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 446126aad7485..7d3d69122f627 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { - - name = "rxvt-unicode-vtwheel-0.3.2"; + pname = "rxvt-unicode-vtwheel"; + version = "0.3.2"; src = fetchgit { - url = "https://aur.archlinux.org/urxvt-vtwheel.git"; - rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; - sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; + url = "https://aur.archlinux.org/urxvt-vtwheel.git"; + rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; + sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; }; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 44c34d76f4695..8434c233ad4b8 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , cmake , glib , gtk3 @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.3"; + version = "3.8.4"; - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UEDc3TjoqjLNZtWGlIZB3VTVQC+31AP0ASQH0fu+U+Q="; + src = fetchFromGitHub { + owner = "dabisu"; + repo = pname; + rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc="; }; nativeBuildInputs = [ @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { # Set path to gsettings-schemata so sakura knows where to find colorchooser, # fontchooser etc. - postInstall = '' + postFixup = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index a5c4b4574df38..c217ae7f991de 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; + rev = version; sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; }; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 19e3a1c37e161..0483f5b753a20 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , ncurses +, perl , pkg-config , python3 , fontconfig @@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec { pkg-config python3 ncurses # tic for terminfo - ]; + ] ++ lib.optional stdenv.isDarwin perl; buildInputs = [ fontconfig @@ -102,5 +103,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; + # Fails on missing UserNotifications framework while linking + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 4bb9386a112a9..738260646f20a 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "369"; + version = "370"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY="; + sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 98c0ad8bc3fe5..f3bd18eb32bd4 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,54 +1,82 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: +{ lib, autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice +, stdenv, runtimeShell, unzip +}: -stdenv.mkDerivation rec { +let pname = "bcompare"; version = "4.4.0.25886"; - src = fetchurl { - url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko="; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; + sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko="; + }; + + x86_64-darwin = fetchurl { + url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; + sha256 = "sha256-dez30a1sp+4XuBBYhu07Vpn1+AUmX0Ni7aad7hy2ajQ="; + }; + + aarch64-darwin = srcs.x86_64-darwin; + }; + + src = srcs.${stdenv.hostPlatform.system} or throwSystem; + + linux = stdenv.mkDerivation { + inherit pname version src meta; + unpackPhase = '' + ar x $src + tar xfz data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,share} + + cp -R usr/{bin,lib,share} $out/ + + # Remove library that refuses to be autoPatchelf'ed + rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so + + substituteInPlace $out/bin/${pname} \ + --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ + --replace "ldd" "${glibc.out}/bin/ldd" \ + --replace "/bin/bash" "${runtimeShell}" + + # Create symlink bzip2 library + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + stdenv.cc.cc.lib + gtk2 + pango + cairo + kio + kservice + ki18n + kcoreaddons + gdk-pixbuf + bzip2 + ]; + + dontBuild = true; + dontConfigure = true; + dontWrapQtApps = true; }; - unpackPhase = '' - ar x $src - tar xfz data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib $out/share - cp -R usr/share $out/ - cp -R usr/lib $out/ - cp -R usr/bin $out/ - - # Remove library that refuses to be autoPatchelf'ed - rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so - - substituteInPlace $out/bin/bcompare \ - --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ - --replace "/bin/bash" "${runtimeShell}" - - # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - stdenv.cc.cc.lib - gtk2 - pango - cairo - kio - kservice - ki18n - kcoreaddons - gdk-pixbuf - bzip2 - ]; - - dontBuild = true; - dontConfigure = true; - dontWrapQtApps = true; + darwin = stdenv.mkDerivation { + inherit pname version src meta; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications/BCompare.app + cp -R . $out/Applications/BCompare.app + ''; + }; meta = with lib; { description = "GUI application that allows to quickly and easily compare files and folders"; @@ -59,8 +87,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.scootersoftware.com"; license = licenses.unfree; - maintainers = [ maintainers.ktor ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ktor arkivm ]; + platforms = builtins.attrNames srcs; }; - -} +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/pkgs/applications/version-management/commitizen/generate-dependencies.sh index 7111289d29098..9855e2d41d1ad 100755 --- a/pkgs/applications/version-management/commitizen/generate-dependencies.sh +++ b/pkgs/applications/version-management/commitizen/generate-dependencies.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix node2nix \ --node-env node-env.nix \ diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 0769168a78fa3..53bdef1f98646 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 262df27e464fe..5f055785791ba 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -37,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -76,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -242,8 +256,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -388,15 +402,16 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -411,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -443,10 +460,15 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -465,12 +487,12 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -483,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -512,11 +536,32 @@ let ln -s $out/lib/node_modules/.bin $out/bin ''; } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -538,5 +583,6 @@ in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeDependencies = lib.makeOverridable buildNodeDependencies; buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix index 396dedf56fd94..b8767125feece 100644 --- a/pkgs/applications/version-management/commitizen/node-packages.nix +++ b/pkgs/applications/version-management/commitizen/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -13,22 +13,22 @@ let sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg=="; }; }; - "@babel/code-frame-7.10.4" = { + "@babel/code-frame-7.15.8" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.4"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz"; + sha512 = "2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg=="; }; }; - "@babel/compat-data-7.11.0" = { + "@babel/compat-data-7.15.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.11.0"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; - sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; }; }; "@babel/core-7.11.6" = { @@ -40,319 +40,310 @@ let sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.15.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz"; + sha512 = "ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g=="; }; }; - "@babel/helper-annotate-as-pure-7.10.4" = { + "@babel/helper-annotate-as-pure-7.15.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; + sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; + sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; }; }; - "@babel/helper-compilation-targets-7.10.4" = { + "@babel/helper-compilation-targets-7.15.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; - sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; + sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.5" = { + "@babel/helper-create-class-features-plugin-7.15.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; - sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; + sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.10.4" = { + "@babel/helper-create-regexp-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; - }; - }; - "@babel/helper-define-map-7.10.5" = { - name = "_at_babel_slash_helper-define-map"; - packageName = "@babel/helper-define-map"; - version = "7.10.5"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; }; }; - "@babel/helper-explode-assignable-expression-7.11.4" = { + "@babel/helper-explode-assignable-expression-7.15.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.11.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; - sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; + sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; }; }; - "@babel/helper-function-name-7.10.4" = { + "@babel/helper-function-name-7.15.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; + sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; }; }; - "@babel/helper-get-function-arity-7.10.4" = { + "@babel/helper-get-function-arity-7.15.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; + sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; }; }; - "@babel/helper-hoist-variables-7.10.4" = { + "@babel/helper-hoist-variables-7.15.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; + sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; }; }; - "@babel/helper-member-expression-to-functions-7.11.0" = { + "@babel/helper-member-expression-to-functions-7.15.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.11.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; + sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; }; }; - "@babel/helper-module-imports-7.10.4" = { + "@babel/helper-module-imports-7.15.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; + sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.11.0" = { + "@babel/helper-module-transforms-7.15.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.11.0"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz"; + sha512 = "DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg=="; }; }; - "@babel/helper-optimise-call-expression-7.10.4" = { + "@babel/helper-optimise-call-expression-7.15.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; + sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; }; }; - "@babel/helper-plugin-utils-7.10.4" = { + "@babel/helper-plugin-utils-7.14.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; - }; - }; - "@babel/helper-regex-7.10.5" = { - name = "_at_babel_slash_helper-regex"; - packageName = "@babel/helper-regex"; - version = "7.10.5"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.11.4" = { + "@babel/helper-remap-async-to-generator-7.15.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.11.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; - sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; + sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; }; }; - "@babel/helper-replace-supers-7.10.4" = { + "@babel/helper-replace-supers-7.15.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; + sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; }; }; - "@babel/helper-simple-access-7.10.4" = { + "@babel/helper-simple-access-7.15.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; + sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.11.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; - sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; + sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; }; }; - "@babel/helper-split-export-declaration-7.11.0" = { + "@babel/helper-split-export-declaration-7.15.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.11.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; + sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; }; }; - "@babel/helper-validator-identifier-7.10.4" = { + "@babel/helper-validator-identifier-7.15.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.4"; + version = "7.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + }; + }; + "@babel/helper-validator-option-7.14.5" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.10.4" = { + "@babel/helper-wrap-function-7.15.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; + sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; }; }; - "@babel/helpers-7.10.4" = { + "@babel/helpers-7.15.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; - sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; + sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.14.5" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.11.5" = { + "@babel/parser-7.15.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.5"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; - sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz"; + sha512 = "BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.5" = { + "@babel/plugin-proposal-async-generator-functions-7.15.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.5"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; - sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz"; + sha512 = "2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA=="; }; }; - "@babel/plugin-proposal-class-properties-7.10.4" = { + "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; - sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.10.4" = { + "@babel/plugin-proposal-dynamic-import-7.14.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; - sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + "@babel/plugin-proposal-export-namespace-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; - sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; }; }; - "@babel/plugin-proposal-json-strings-7.10.4" = { + "@babel/plugin-proposal-json-strings-7.14.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; - sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.11.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; - sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; - sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.10.4" = { + "@babel/plugin-proposal-numeric-separator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; - sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.11.0" = { @@ -364,49 +355,40 @@ let sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.0" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; - sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.11.0" = { + "@babel/plugin-proposal-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.11.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; - sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.10.4" = { + "@babel/plugin-proposal-private-methods-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; - sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { + "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -418,13 +400,13 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; - "@babel/plugin-syntax-class-properties-7.10.4" = { + "@babel/plugin-syntax-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; - sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -508,301 +490,301 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.10.4" = { + "@babel/plugin-syntax-top-level-await-7.14.5" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.10.4" = { + "@babel/plugin-transform-arrow-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; - sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.10.4" = { + "@babel/plugin-transform-async-to-generator-7.14.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; - sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.10.4" = { + "@babel/plugin-transform-block-scoped-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; - sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.11.1" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.11.1"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; - sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; - "@babel/plugin-transform-classes-7.10.4" = { + "@babel/plugin-transform-classes-7.15.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; - sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; + sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.4" = { + "@babel/plugin-transform-computed-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; - sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.10.4" = { + "@babel/plugin-transform-destructuring-7.14.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.10.4"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; - sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; + sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.10.4" = { + "@babel/plugin-transform-dotall-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.10.4" = { + "@babel/plugin-transform-duplicate-keys-7.14.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; - sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.10.4" = { + "@babel/plugin-transform-exponentiation-operator-7.14.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; - sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; }; }; - "@babel/plugin-transform-for-of-7.10.4" = { + "@babel/plugin-transform-for-of-7.15.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; - sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; + sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; }; }; - "@babel/plugin-transform-function-name-7.10.4" = { + "@babel/plugin-transform-function-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; - sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; }; }; - "@babel/plugin-transform-literals-7.10.4" = { + "@babel/plugin-transform-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; - sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.10.4" = { + "@babel/plugin-transform-member-expression-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; - sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.5" = { + "@babel/plugin-transform-modules-amd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.5"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; - sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.10.4" = { + "@babel/plugin-transform-modules-commonjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; - sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; + sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.5" = { + "@babel/plugin-transform-modules-systemjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; - sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; + sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; }; }; - "@babel/plugin-transform-modules-umd-7.10.4" = { + "@babel/plugin-transform-modules-umd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; - sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.10.4"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; - sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; }; }; - "@babel/plugin-transform-new-target-7.10.4" = { + "@babel/plugin-transform-new-target-7.14.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; - sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; }; }; - "@babel/plugin-transform-object-super-7.10.4" = { + "@babel/plugin-transform-object-super-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; - sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.10.5" = { + "@babel/plugin-transform-parameters-7.15.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; - sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; + sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; }; }; - "@babel/plugin-transform-property-literals-7.10.4" = { + "@babel/plugin-transform-property-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; - sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-regenerator-7.10.4" = { + "@babel/plugin-transform-regenerator-7.14.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; - sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; }; }; - "@babel/plugin-transform-reserved-words-7.10.4" = { + "@babel/plugin-transform-reserved-words-7.14.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; - sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.10.4" = { + "@babel/plugin-transform-shorthand-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; - sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.11.0" = { + "@babel/plugin-transform-spread-7.15.8" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.11.0"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; - sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz"; + sha512 = "/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ=="; }; }; - "@babel/plugin-transform-sticky-regex-7.10.4" = { + "@babel/plugin-transform-sticky-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; - sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; }; }; - "@babel/plugin-transform-template-literals-7.10.5" = { + "@babel/plugin-transform-template-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.5"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; - sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.10.4" = { + "@babel/plugin-transform-typeof-symbol-7.14.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; - sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.10.4" = { + "@babel/plugin-transform-unicode-escapes-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; - sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.10.4" = { + "@babel/plugin-transform-unicode-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.10.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; - sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; "@babel/preset-env-7.11.5" = { @@ -832,76 +814,85 @@ let sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; - "@babel/runtime-7.11.2" = { + "@babel/runtime-7.15.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.11.2"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; - sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz"; + sha512 = "99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw=="; }; }; - "@babel/template-7.10.4" = { + "@babel/template-7.15.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.4"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; - sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; + sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; }; }; - "@babel/traverse-7.11.5" = { + "@babel/traverse-7.15.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; - sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; + sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; }; }; - "@babel/types-7.11.5" = { + "@babel/types-7.15.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.5"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; - sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz"; + sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; }; }; - "@commitlint/execute-rule-11.0.0" = { + "@commitlint/execute-rule-13.2.0" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "11.0.0"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz"; - sha512 = "g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-13.2.0.tgz"; + sha512 = "6nPwpN0hwTYmsH3WM4hCdN+NrMopgRIuQ0aqZa+jnwMoS/g6ljliQNYfL+m5WO306BaIu1W3yYpbW5aI8gEr0g=="; }; }; - "@commitlint/load-11.0.0" = { + "@commitlint/load-13.2.1" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "11.0.0"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-11.0.0.tgz"; - sha512 = "t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-13.2.1.tgz"; + sha512 = "qlaJkj0hfa9gtWRfCfbgFBTK3GYQRmjZhba4l9mUu4wV9lEZ4ICFlrLtd/8kaLXf/8xbrPhkAPkVFOAqM0YwUQ=="; }; }; - "@commitlint/resolve-extends-11.0.0" = { + "@commitlint/resolve-extends-13.2.0" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "11.0.0"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz"; - sha512 = "WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-13.2.0.tgz"; + sha512 = "HLCMkqMKtvl1yYLZ1Pm0UpFvd0kYjsm1meLOGZ7VkOd9G/XX+Fr1S2G5AT2zeiDw7WUVYK8lGVMNa319bnV+aw=="; }; }; - "@commitlint/types-11.0.0" = { + "@commitlint/types-13.2.0" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "11.0.0"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/types/-/types-13.2.0.tgz"; + sha512 = "RRVHEqmk1qn/dIaSQhvuca6k/6Z54G+r/KyimZ8gnAFielGiGUpsFRhIY3qhd5rXClVxDaa3nlcyTWckSccotQ=="; + }; + }; + "@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" = { + name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; + packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-11.0.0.tgz"; - sha512 = "VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ=="; + url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz"; + sha512 = "QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA=="; }; }; "@istanbuljs/load-nyc-config-1.1.0" = { @@ -922,58 +913,67 @@ let sha512 = "cWcUCqHOYB+Mpumsv03uaE7rMvtmJn7pZ3llc+9gyqMFC93IVcUuuJ/mknoWsiuajcEjRCqKmhGaiAaXG6kzLA=="; }; }; - "@istanbuljs/schema-0.1.2" = { + "@istanbuljs/schema-0.1.3" = { name = "_at_istanbuljs_slash_schema"; packageName = "@istanbuljs/schema"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz"; - sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; + url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"; + sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@octokit/auth-token-2.4.2" = { + "@octokit/auth-token-2.5.0" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz"; - sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"; + sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/endpoint-6.0.6" = { + "@octokit/endpoint-6.0.12" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.6"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz"; - sha512 = "7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; + }; + }; + "@octokit/openapi-types-11.2.0" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz"; + sha512 = "PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="; }; }; "@octokit/plugin-paginate-rest-1.1.2" = { @@ -985,13 +985,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-request-log-1.0.0" = { + "@octokit/plugin-request-log-1.0.4" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.0"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz"; - sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; "@octokit/plugin-rest-endpoint-methods-2.4.0" = { @@ -1003,13 +1003,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.8" = { + "@octokit/request-5.6.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.8"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.8.tgz"; - sha512 = "mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"; + sha512 = "je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA=="; }; }; "@octokit/request-error-1.2.1" = { @@ -1021,13 +1021,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.2" = { + "@octokit/request-error-2.1.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz"; - sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; "@octokit/rest-16.43.2" = { @@ -1048,13 +1048,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.4.1" = { + "@octokit/types-6.34.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.4.1"; + version = "6.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.4.1.tgz"; - sha512 = "OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz"; + sha512 = "s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw=="; }; }; "@semantic-release/commit-analyzer-6.3.3" = { @@ -1102,13 +1102,13 @@ let sha512 = "LGjgPBGjjmjap/76O0Md3wc04Y7IlLnzZceLsAkcYRwGQdRPTTFUJKqDQTuieWTs7zfHzQoZqsqPfFxEN+g2+Q=="; }; }; - "@sinonjs/commons-1.8.1" = { + "@sinonjs/commons-1.8.3" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha512 = "xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="; }; }; "@sinonjs/formatio-3.2.2" = { @@ -1147,58 +1147,49 @@ let sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; }; }; - "@types/color-name-1.1.1" = { - name = "_at_types_slash_color-name"; - packageName = "@types/color-name"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; - }; - }; - "@types/glob-7.1.3" = { + "@types/glob-7.2.0" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.3"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; - sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/minimatch-3.0.3" = { + "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.0" = { + "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/node-14.10.0" = { + "@types/node-16.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.10.0"; + version = "16.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz"; - sha512 = "SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz"; + sha512 = "PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA=="; }; }; - "@types/normalize-package-data-2.4.0" = { + "@types/normalize-package-data-2.4.1" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; }; }; "@types/parse-json-4.0.0" = { @@ -1210,13 +1201,13 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; - "@types/retry-0.12.0" = { + "@types/retry-0.12.1" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz"; + sha512 = "xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="; }; }; "JSONStream-1.3.5" = { @@ -1309,13 +1300,13 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-3.2.1" = { @@ -1327,13 +1318,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.2.1" = { + "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; "ansicolors-0.3.2" = { @@ -1372,6 +1363,15 @@ let sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; + "arg-4.1.3" = { + name = "arg"; + packageName = "arg"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -1570,13 +1570,13 @@ let sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base-0.11.2" = { @@ -1588,13 +1588,13 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "before-after-hook-2.1.0" = { + "before-after-hook-2.2.2" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz"; - sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha512 = "3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="; }; }; "binary-extensions-1.13.1" = { @@ -1687,13 +1687,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserslist-4.14.2" = { + "browserslist-4.17.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.2"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz"; + sha512 = "Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ=="; }; }; "btoa-lite-1.0.0" = { @@ -1705,13 +1705,13 @@ let sha1 = "337766da15801210fdd956c22e9c6891ab9d0337"; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "cache-base-1.0.1" = { @@ -1741,31 +1741,13 @@ let sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA=="; }; }; - "caller-callsite-2.0.0" = { - name = "caller-callsite"; - packageName = "caller-callsite"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - }; - "caller-path-2.0.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - }; - "callsites-2.0.0" = { - name = "callsites"; - packageName = "callsites"; - version = "2.0.0"; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "callsites-3.1.0" = { @@ -1804,13 +1786,13 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; - "caniuse-lite-1.0.30001125" = { + "caniuse-lite-1.0.30001270" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001125"; + version = "1.0.30001270"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz"; - sha512 = "9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz"; + sha512 = "TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A=="; }; }; "capture-stack-trace-1.0.1" = { @@ -1840,13 +1822,13 @@ let sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; }; }; - "chai-4.2.0" = { + "chai-4.1.2" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz"; + sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c"; }; }; "chalk-2.4.2" = { @@ -1858,13 +1840,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "chardet-0.7.0" = { @@ -1948,13 +1930,13 @@ let sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; - "cli-table-0.3.1" = { + "cli-table-0.3.6" = { name = "cli-table"; packageName = "cli-table"; - version = "0.3.1"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz"; + sha512 = "ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ=="; }; }; "cli-width-2.2.1" = { @@ -2101,13 +2083,13 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commitizen-4.2.1" = { + "commitizen-4.2.4" = { name = "commitizen"; packageName = "commitizen"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz"; - sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA=="; + url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.4.tgz"; + sha512 = "LlZChbDzg3Ir3O2S7jSo/cgWp5/QwylQVr59K4xayVq8S4/RdKzSyJkghAiZZHfhh5t4pxunUoyeg0ml1q/7aw=="; }; }; "commondir-1.0.1" = { @@ -2155,22 +2137,31 @@ let sha512 = "nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA=="; }; }; - "conventional-changelog-angular-5.0.11" = { + "conventional-changelog-angular-5.0.13" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.11"; + version = "5.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz"; - sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz"; + sha512 = "i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA=="; }; }; - "conventional-changelog-writer-4.0.17" = { + "conventional-changelog-conventionalcommits-4.4.0" = { + name = "conventional-changelog-conventionalcommits"; + packageName = "conventional-changelog-conventionalcommits"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz"; + sha512 = "ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA=="; + }; + }; + "conventional-changelog-writer-4.1.0" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.17"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz"; - sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz"; + sha512 = "WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw=="; }; }; "conventional-commit-types-2.3.0" = { @@ -2191,31 +2182,31 @@ let sha512 = "SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg=="; }; }; - "conventional-commits-filter-2.0.6" = { + "conventional-commits-filter-2.0.7" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz"; - sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz"; + sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.1.0" = { + "conventional-commits-parser-3.2.2" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.1.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz"; - sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.2.tgz"; + sha512 = "Jr9KAKgqAkwXMRHjxDwO/zOCDKod1XdAESHAGuJX38iZ7ZzVti/tvVoysO0suMsdAObp9NQ2rHSsSbnAqZ5f5g=="; }; }; - "convert-source-map-1.7.0" = { + "convert-source-map-1.8.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; "copy-descriptor-0.1.1" = { @@ -2227,40 +2218,40 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-compat-3.6.5" = { + "core-js-compat-3.18.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.3.tgz"; + sha512 = "4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw=="; }; }; - "core-util-is-1.0.2" = { + "core-util-is-1.0.3" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; - "cosmiconfig-5.2.1" = { + "cosmiconfig-6.0.0" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.2.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; }; }; - "cosmiconfig-7.0.0" = { + "cosmiconfig-7.0.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; - sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; }; }; "create-error-class-3.0.2" = { @@ -2272,6 +2263,15 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; + "create-require-1.1.1" = { + name = "create-require"; + packageName = "create-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; + sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; + }; + }; "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -2389,13 +2389,22 @@ let sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; - "debug-4.2.0" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decamelize-1.2.0" = { @@ -2560,6 +2569,15 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -2614,13 +2632,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "electron-to-chromium-1.3.565" = { + "electron-to-chromium-1.3.873" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.565"; + version = "1.3.873"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.565.tgz"; - sha512 = "me5dGlHFd8Q7mKhqbWRLIYnKjw4i0fO6hmW0JBxa7tM87fBfNEjWokRnDF7V+Qme/9IYpwhfMn+soWs40tXWqg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.873.tgz"; + sha512 = "TiHlCgl2uP26Z0c67u442c0a2MZCWZNCRnPTQDPhVJ4h9G6z2zU0lApD9H0K9R5yFL5SfdaiVsVD2izOY24xBQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2668,13 +2686,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.6" = { + "es-abstract-1.19.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.6"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; - sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"; + sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; }; }; "es-to-primitive-1.2.1" = { @@ -2695,13 +2713,13 @@ let sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2812,22 +2830,22 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; - "fastq-1.8.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.8.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; - sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "figures-2.0.0" = { @@ -2893,22 +2911,22 @@ let sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; - "find-cache-dir-3.3.1" = { + "find-cache-dir-3.3.2" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; - "find-node-modules-2.0.0" = { + "find-node-modules-2.1.2" = { name = "find-node-modules"; packageName = "find-node-modules"; - version = "2.0.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-node-modules/-/find-node-modules-2.0.0.tgz"; - sha512 = "8MWIBRgJi/WpjjfVXumjPKCtmQ10B+fjx6zmSA+770GMJirLhWIzg8l763rhjl9xaeaHbnxPNRQKq2mgMhr+aw=="; + url = "https://registry.npmjs.org/find-node-modules/-/find-node-modules-2.1.2.tgz"; + sha512 = "x+3P4mbtRPlSiVE1Qco0Z4YLU8WFiFcuWTf3m75OV9Uzcfs2Bg+O9N+r/K0AnmINBW06KpfqKwYJbFlFq4qNug=="; }; }; "find-root-1.1.0" = { @@ -2965,22 +2983,22 @@ let sha1 = "8ad929a3393bac627957a7e5de4623b06b0e2ceb"; }; }; - "findup-sync-3.0.0" = { + "findup-sync-4.0.0" = { name = "findup-sync"; packageName = "findup-sync"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"; - sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz"; + sha512 = "6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ=="; }; }; - "flat-4.1.0" = { + "flat-4.1.1" = { name = "flat"; packageName = "flat"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; + sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; }; }; "follow-redirects-1.5.10" = { @@ -3046,13 +3064,13 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fromentries-1.2.1" = { + "fromentries-1.3.2" = { name = "fromentries"; packageName = "fromentries"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz"; - sha512 = "Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw=="; + url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz"; + sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg=="; }; }; "fs-extra-8.1.0" = { @@ -3100,13 +3118,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-caller-file-1.0.3" = { @@ -3136,6 +3154,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; "get-package-type-0.1.0" = { name = "get-package-type"; packageName = "get-package-type"; @@ -3172,6 +3199,15 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; + "get-symbol-description-1.0.0" = { + name = "get-symbol-description"; + packageName = "get-symbol-description"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -3217,13 +3253,13 @@ let sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; - "glob-7.1.6" = { + "glob-7.2.0" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; "glob-parent-3.1.0" = { @@ -3235,13 +3271,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "global-dirs-0.1.1" = { @@ -3298,13 +3334,13 @@ let sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "graceful-readlink-1.0.1" = { @@ -3325,13 +3361,13 @@ let sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; - "handlebars-4.7.6" = { + "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; - sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; "hard-rejection-2.1.0" = { @@ -3352,6 +3388,15 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; + "has-bigints-1.0.1" = { + name = "has-bigints"; + packageName = "has-bigints"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + }; + }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -3379,13 +3424,22 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.1" = { + "has-symbols-1.0.2" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; }; "has-value-0.3.1" = { @@ -3424,13 +3478,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hasha-5.2.0" = { + "hasha-5.2.2" = { name = "hasha"; packageName = "hasha"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz"; - sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw=="; + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz"; + sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ=="; }; }; "hawk-1.1.1" = { @@ -3478,13 +3532,31 @@ let sha512 = "zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g=="; }; }; - "hosted-git-info-2.8.8" = { + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; + "hosted-git-info-3.0.8" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.8"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; + sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw=="; + }; + }; + "hosted-git-info-4.0.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; }; }; "html-escaper-2.0.2" = { @@ -3559,22 +3631,13 @@ let sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; - "import-fresh-2.0.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; - }; - }; - "import-fresh-3.2.1" = { + "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; "import-from-3.0.0" = { @@ -3604,13 +3667,13 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "in-publish-2.0.1" = { + "in-publish-2.0.0" = { name = "in-publish"; packageName = "in-publish"; - version = "2.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz"; - sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="; + url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz"; + sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; }; }; "indent-string-4.0.0" = { @@ -3640,13 +3703,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "inquirer-6.5.2" = { @@ -3658,6 +3721,15 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; "into-stream-5.1.1" = { name = "into-stream"; packageName = "into-stream"; @@ -3712,6 +3784,15 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; + "is-bigint-1.0.4" = { + name = "is-bigint"; + packageName = "is-bigint"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; + }; + }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -3721,6 +3802,15 @@ let sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; + "is-boolean-object-1.1.2" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -3730,22 +3820,22 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-buffer-2.0.4" = { + "is-buffer-2.0.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-callable-1.2.1" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz"; - sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-ci-1.2.1" = { @@ -3757,6 +3847,15 @@ let sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; }; }; + "is-core-module-2.8.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -3775,13 +3874,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-descriptor-0.1.6" = { @@ -3802,15 +3901,6 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; - "is-directory-0.3.1" = { - name = "is-directory"; - packageName = "is-directory"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; - }; - }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -3874,13 +3964,13 @@ let sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; "is-installed-globally-0.1.0" = { @@ -3892,6 +3982,15 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; + "is-negative-zero-2.0.1" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + }; + }; "is-npm-1.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -3919,6 +4018,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-object-1.0.6" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; + }; + }; "is-obj-1.0.1" = { name = "is-obj"; packageName = "is-obj"; @@ -3937,13 +4045,13 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-1.0.1" = { + "is-object-1.0.2" = { name = "is-object"; packageName = "is-object"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; + sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; }; }; "is-path-inside-1.0.1" = { @@ -3991,13 +4099,13 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "is-regex-1.1.1" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; - sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; "is-retry-allowed-1.2.0" = { @@ -4009,6 +4117,15 @@ let sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; + "is-shared-array-buffer-1.0.1" = { + name = "is-shared-array-buffer"; + packageName = "is-shared-array-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; + sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; + }; + }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -4018,22 +4135,31 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; - "is-symbol-1.0.3" = { + "is-string-1.0.7" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; + }; + }; + "is-symbol-1.0.4" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; "is-text-path-1.0.1" = { @@ -4063,6 +4189,15 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; + "is-weakref-1.0.1" = { + name = "is-weakref"; + packageName = "is-weakref"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz"; + sha512 = "b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4135,13 +4270,13 @@ let sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="; }; }; - "istanbul-lib-coverage-3.0.0" = { + "istanbul-lib-coverage-3.2.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; + sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; }; "istanbul-lib-hook-3.0.0" = { @@ -4189,22 +4324,22 @@ let sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; }; }; - "istanbul-lib-source-maps-4.0.0" = { + "istanbul-lib-source-maps-4.0.1" = { name = "istanbul-lib-source-maps"; packageName = "istanbul-lib-source-maps"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha512 = "c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg=="; + url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; + sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.0.2" = { + "istanbul-reports-3.0.5" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "3.0.2"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz"; + sha512 = "5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ=="; }; }; "java-properties-1.0.2" = { @@ -4279,13 +4414,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-2.1.3" = { + "json5-2.2.0" = { name = "json5"; packageName = "json5"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; - sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; "jsonfile-4.0.0" = { @@ -4315,13 +4450,13 @@ let sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "just-extend-4.1.0" = { + "just-extend-4.2.1" = { name = "just-extend"; packageName = "just-extend"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz"; - sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz"; + sha512 = "g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg=="; }; }; "kind-of-3.2.2" = { @@ -4441,13 +4576,13 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; - "lodash-4.17.20" = { + "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; "lodash._baseclone-4.5.7" = { @@ -4558,15 +4693,6 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; - "lodash.toarray-4.4.0" = { - name = "lodash.toarray"; - packageName = "lodash.toarray"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; - sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; - }; - }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -4657,13 +4783,22 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "macos-release-2.4.1" = { + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "macos-release-2.5.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz"; - sha512 = "H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz"; + sha512 = "EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="; }; }; "make-dir-1.3.0" = { @@ -4693,6 +4828,15 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; + "make-error-1.3.6" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + }; + }; "manage-path-2.0.0" = { name = "manage-path"; packageName = "manage-path"; @@ -4729,13 +4873,13 @@ let sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; - "map-obj-4.1.0" = { + "map-obj-4.3.0" = { name = "map-obj"; packageName = "map-obj"; - version = "4.1.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz"; - sha512 = "glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g=="; + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; }; }; "map-visit-1.0.0" = { @@ -4747,13 +4891,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "marked-0.6.3" = { + "marked-0.7.0" = { name = "marked"; packageName = "marked"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; - sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; + url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz"; + sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; "marked-terminal-3.3.0" = { @@ -4783,22 +4927,22 @@ let sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; }; }; - "meow-7.1.1" = { + "meow-8.1.2" = { name = "meow"; packageName = "meow"; - version = "7.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; - sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; + url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz"; + sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q=="; }; }; - "merge-1.2.1" = { + "merge-2.1.1" = { name = "merge"; packageName = "merge"; - version = "1.2.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; - sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; + url = "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz"; + sha512 = "jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="; }; }; "merge-descriptors-1.0.1" = { @@ -4837,13 +4981,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; "mime-1.2.11" = { @@ -4855,13 +4999,13 @@ let sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; }; - "mime-2.4.6" = { + "mime-2.5.2" = { name = "mime"; packageName = "mime"; - version = "2.4.6"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; - sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; + sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; }; }; "mime-types-1.0.2" = { @@ -4963,13 +5107,13 @@ let sha512 = "qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ=="; }; }; - "mocha-junit-reporter-1.23.3" = { + "mocha-junit-reporter-1.18.0" = { name = "mocha-junit-reporter"; packageName = "mocha-junit-reporter"; - version = "1.23.3"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz"; - sha512 = "ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA=="; + url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz"; + sha512 = "y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA=="; }; }; "mocha-multi-reporters-1.1.7" = { @@ -5026,6 +5170,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; @@ -5035,13 +5188,13 @@ let sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; - "nan-2.14.1" = { + "nan-2.15.0" = { name = "nan"; packageName = "nan"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; - sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; }; }; "nanomatch-1.2.13" = { @@ -5089,13 +5242,13 @@ let sha512 = "Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ=="; }; }; - "node-emoji-1.10.0" = { + "node-emoji-1.11.0" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; - sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"; + sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; }; }; "node-environment-flags-1.0.5" = { @@ -5107,13 +5260,13 @@ let sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; }; }; - "node-fetch-2.6.1" = { + "node-fetch-2.6.5" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.1"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; }; "node-modules-regexp-1.0.0" = { @@ -5134,13 +5287,13 @@ let sha512 = "RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ=="; }; }; - "node-releases-1.1.61" = { + "node-releases-2.0.0" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.61"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; - sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz"; + sha512 = "aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA=="; }; }; "node-uuid-1.4.8" = { @@ -5179,6 +5332,15 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; + "normalize-package-data-3.0.3" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -5197,22 +5359,22 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; - "npm-6.14.8" = { + "npm-6.14.15" = { name = "npm"; packageName = "npm"; - version = "6.14.8"; + version = "6.14.15"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz"; - sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.15.tgz"; + sha512 = "dkcQc4n+DiJAMYG2haNAMyJbmuvevjXz+WC9dCUzodw8EovwTIc6CATSsTEplCY6c0jG4OshxFGFJsrnKJguWA=="; }; }; "npm-run-path-2.0.2" = { @@ -5269,13 +5431,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.8.0" = { + "object-inspect-1.11.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.8.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; + sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; }; }; "object-keys-1.1.1" = { @@ -5305,13 +5467,22 @@ let sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; - "object.getownpropertydescriptors-2.1.0" = { + "object.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "object.getownpropertydescriptors-2.1.3" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; + sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; }; }; "object.pick-1.3.0" = { @@ -5521,13 +5692,13 @@ let sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; }; }; - "p-retry-4.2.0" = { + "p-retry-4.6.1" = { name = "p-retry"; packageName = "p-retry"; - version = "4.2.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz"; - sha512 = "jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA=="; + url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz"; + sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; }; }; "p-try-1.0.0" = { @@ -5593,13 +5764,13 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "parse-json-5.1.0" = { + "parse-json-5.2.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; - sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "parse-passwd-1.0.0" = { @@ -5683,13 +5854,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-1.8.0" = { @@ -5719,22 +5890,31 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; + }; + }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-3.0.0" = { @@ -5827,13 +6007,13 @@ let sha512 = "1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg=="; }; }; - "proxyquire-2.1.3" = { + "proxyquire-2.1.0" = { name = "proxyquire"; packageName = "proxyquire"; - version = "2.1.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz"; - sha512 = "BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg=="; + url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.0.tgz"; + sha512 = "kptdFArCfGRtQFv3Qwjr10lwbEV0TBJYvfqzhwucyfEXqVgmnAkyEw/S3FYzR5HI9i5QOq4rcqQjZ6AlknlCDQ=="; }; }; "pseudomap-1.0.2" = { @@ -5899,6 +6079,15 @@ let sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; }; }; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + }; "quick-lru-4.0.1" = { name = "quick-lru"; packageName = "quick-lru"; @@ -5944,15 +6133,6 @@ let sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; }; }; - "read-pkg-up-6.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz"; - sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw=="; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -5980,6 +6160,15 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; "readdirp-2.2.1" = { name = "readdirp"; packageName = "readdirp"; @@ -6007,31 +6196,31 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "regenerate-1.4.1" = { + "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; - sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-8.2.0" = { + "regenerate-unicode-properties-9.0.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.2.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; + sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; }; }; - "regenerator-runtime-0.13.7" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.7"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regenerator-transform-0.14.5" = { @@ -6052,13 +6241,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.8.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; + sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; }; }; "registry-auth-token-3.4.0" = { @@ -6070,13 +6259,13 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; - "registry-auth-token-4.2.0" = { + "registry-auth-token-4.2.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz"; - sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; }; "registry-url-3.1.0" = { @@ -6097,13 +6286,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.4" = { + "regjsparser-0.7.0" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.4"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; + sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; }; }; "release-zalgo-1.0.0" = { @@ -6124,13 +6313,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "repeat-element-1.1.3" = { + "repeat-element-1.1.4" = { name = "repeat-element"; packageName = "repeat-element"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"; + sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; }; }; "repeat-string-1.6.1" = { @@ -6178,13 +6367,22 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.17.0" = { + "resolve-1.20.0" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "resolve-1.8.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; + sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; }; }; "resolve-dir-1.0.1" = { @@ -6196,15 +6394,6 @@ let sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; }; }; - "resolve-from-3.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - }; "resolve-from-4.0.0" = { name = "resolve-from"; packageName = "resolve-from"; @@ -6268,13 +6457,13 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retry-0.12.0" = { + "retry-0.13.1" = { name = "retry"; packageName = "retry"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; }; }; "reusify-1.0.4" = { @@ -6313,22 +6502,22 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; - "rxjs-6.6.3" = { + "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.3"; + version = "6.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; - sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; "safe-buffer-5.1.2" = { @@ -6358,13 +6547,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "semantic-release-15.13.18" = { + "semantic-release-15.14.0" = { name = "semantic-release"; packageName = "semantic-release"; - version = "15.13.18"; + version = "15.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.13.18.tgz"; - sha512 = "JtfdrhF1zRm91nJH/Rg3taftbWGwktJqqrJJdbmZGKYx63cfC4PoaS0jxRifGJUdmmgW/Kxz8f5bhtB+p1bu8A=="; + url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.14.0.tgz"; + sha512 = "Cn43W35AOLY0RMcDbtwhJODJmWg6YCs1+R5jRQsTmmkEGzkV4B2F/QXkjVZpl4UbH91r93GGH0xhoq9kh7I5PA=="; }; }; "semver-5.7.1" = { @@ -6394,6 +6583,15 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -6466,13 +6664,22 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "signal-exit-3.0.3" = { + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; + "signal-exit-3.0.5" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz"; + sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; }; }; "signale-1.4.0" = { @@ -6484,13 +6691,13 @@ let sha512 = "iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w=="; }; }; - "sinon-6.3.5" = { + "sinon-6.3.4" = { name = "sinon"; packageName = "sinon"; - version = "6.3.5"; + version = "6.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz"; - sha512 = "xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ=="; + url = "https://registry.npmjs.org/sinon/-/sinon-6.3.4.tgz"; + sha512 = "NIaR56Z1mefuRBXYrf4otqBxkWiKveX+fvqs3HzFq2b07HcgpkMgIwmQM/owNjNFAHkx0kJXW+Q0mDthiuslXw=="; }; }; "slash-2.0.0" = { @@ -6574,22 +6781,22 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.19" = { + "source-map-support-0.5.20" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.19"; + version = "0.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; + sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; }; }; - "source-map-url-0.4.0" = { + "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; }; }; "spawn-command-0.0.2" = { @@ -6655,13 +6862,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.10" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; "split-0.2.10" = { @@ -6700,13 +6907,13 @@ let sha1 = "52e2e221d88c75f9a73f90556e263ff96772b314"; }; }; - "split2-2.2.0" = { + "split2-3.2.2" = { name = "split2"; packageName = "split2"; - version = "2.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "sprintf-js-1.0.3" = { @@ -6772,31 +6979,31 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.2.0" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "4.2.0"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.1" = { + "string.prototype.trimend-1.0.4" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; }; }; - "string.prototype.trimstart-1.0.1" = { + "string.prototype.trimstart-1.0.4" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; }; "string_decoder-0.10.31" = { @@ -6853,13 +7060,13 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; - "strip-ansi-6.0.0" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-bom-3.0.0" = { @@ -7042,13 +7249,13 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.2" = { + "through2-4.0.2" = { name = "through2"; packageName = "through2"; - version = "3.0.2"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz"; - sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; }; }; "timed-out-4.0.1" = { @@ -7132,6 +7339,15 @@ let sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; }; }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + }; "traverse-0.6.6" = { name = "traverse"; packageName = "traverse"; @@ -7141,31 +7357,40 @@ let sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; }; }; - "trim-newlines-3.0.0" = { + "trim-newlines-3.0.1" = { name = "trim-newlines"; packageName = "trim-newlines"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz"; - sha512 = "C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA=="; + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; }; }; - "trim-off-newlines-1.0.1" = { - name = "trim-off-newlines"; - packageName = "trim-off-newlines"; - version = "1.0.1"; + "ts-node-9.1.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; - sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + url = "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz"; + sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; }; }; - "tslib-1.13.0" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "tslib-2.3.1" = { + name = "tslib"; + packageName = "tslib"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "tunnel-agent-0.4.3" = { @@ -7186,13 +7411,13 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; - "type-fest-0.13.1" = { + "type-fest-0.18.1" = { name = "type-fest"; packageName = "type-fest"; - version = "0.13.1"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; - sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"; + sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; }; }; "type-fest-0.3.1" = { @@ -7204,15 +7429,6 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; - "type-fest-0.5.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -7240,58 +7456,76 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "uglify-js-3.10.4" = { + "typescript-4.4.4" = { + name = "typescript"; + packageName = "typescript"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; + }; + }; + "uglify-js-3.14.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.4"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; - sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz"; + sha512 = "rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="; }; }; - "undefsafe-2.0.3" = { + "unbox-primitive-1.0.1" = { + name = "unbox-primitive"; + packageName = "unbox-primitive"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + }; + }; + "undefsafe-2.0.5" = { name = "undefsafe"; packageName = "undefsafe"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz"; - sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz"; + sha512 = "WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="; }; }; - "unicode-canonical-property-names-ecmascript-1.0.4" = { + "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; + sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; }; }; - "unicode-match-property-ecmascript-1.0.4" = { + "unicode-match-property-ecmascript-2.0.0" = { name = "unicode-match-property-ecmascript"; packageName = "unicode-match-property-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; + sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-1.2.0" = { + "unicode-match-property-value-ecmascript-2.0.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; + sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; }; }; - "unicode-property-aliases-ecmascript-1.1.0" = { + "unicode-property-aliases-ecmascript-2.0.0" = { name = "unicode-property-aliases-ecmascript"; packageName = "unicode-property-aliases-ecmascript"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; + sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; }; }; "union-value-1.0.1" = { @@ -7429,15 +7663,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; - }; - }; "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; @@ -7456,6 +7681,24 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -7474,6 +7717,15 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; + "which-boxed-primitive-1.0.2" = { + name = "which-boxed-primitive"; + packageName = "which-boxed-primitive"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; + }; + }; "which-module-2.0.0" = { name = "which-module"; packageName = "which-module"; @@ -7600,13 +7852,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.3" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; "yallist-2.1.2" = { @@ -7618,13 +7870,22 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yaml-1.10.0" = { + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yaml-1.10.2" = { name = "yaml"; packageName = "yaml"; - version = "1.10.0"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz"; - sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="; + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; "yargs-12.0.5" = { @@ -7681,6 +7942,15 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-20.2.9" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + }; "yargs-unparser-1.5.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -7690,78 +7960,87 @@ let sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; }; }; + "yn-3.1.1" = { + name = "yn"; + packageName = "yn"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; + }; + }; }; in { commitizen = nodeEnv.buildNodePackage { name = "commitizen"; packageName = "commitizen"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz"; - sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA=="; + url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.4.tgz"; + sha512 = "LlZChbDzg3Ir3O2S7jSo/cgWp5/QwylQVr59K4xayVq8S4/RdKzSyJkghAiZZHfhh5t4pxunUoyeg0ml1q/7aw=="; }; dependencies = [ - sources."@babel/cli-7.11.6" - sources."@babel/code-frame-7.10.4" - (sources."@babel/compat-data-7.11.0" // { + (sources."@babel/cli-7.11.6" // { dependencies = [ - sources."semver-5.7.1" + sources."source-map-0.5.7" ]; }) + sources."@babel/code-frame-7.15.8" + sources."@babel/compat-data-7.15.0" (sources."@babel/core-7.11.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."ms-2.1.2" sources."semver-5.7.1" + sources."source-map-0.5.7" ]; }) - sources."@babel/generator-7.11.6" - sources."@babel/helper-annotate-as-pure-7.10.4" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.10.4" // { + (sources."@babel/generator-7.15.8" // { dependencies = [ - sources."semver-5.7.1" + sources."source-map-0.5.7" ]; }) - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" - sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.15.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.8" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" + sources."@babel/helper-validator-identifier-7.15.7" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.15.8" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -7771,69 +8050,78 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.15.4" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.15.8" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" (sources."@babel/preset-env-7.11.5" // { dependencies = [ - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" sources."@babel/register-7.11.5" - sources."@babel/runtime-7.11.2" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + (sources."@babel/traverse-7.15.4" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.11.5" - sources."@commitlint/execute-rule-11.0.0" - (sources."@commitlint/load-11.0.0" // { + sources."@babel/types-7.15.6" + sources."@commitlint/execute-rule-13.2.0" + (sources."@commitlint/load-13.2.1" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) - sources."@commitlint/resolve-extends-11.0.0" - sources."@commitlint/types-11.0.0" + sources."@commitlint/resolve-extends-13.2.0" + (sources."@commitlint/types-13.2.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ sources."find-up-4.1.0" @@ -7843,31 +8131,32 @@ in ]; }) sources."@istanbuljs/nyc-config-babel-2.1.1" - sources."@istanbuljs/schema-0.1.2" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" - sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.6" // { + sources."@istanbuljs/schema-0.1.3" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@octokit/auth-token-2.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) + sources."@octokit/openapi-types-11.2.0" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.0" + sources."@octokit/plugin-request-log-1.0.4" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.8" // { + (sources."@octokit/request-5.6.2" // { dependencies = [ - sources."@octokit/request-error-2.0.2" + sources."@octokit/request-error-2.1.0" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -7878,18 +8167,18 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.4.1" + sources."@octokit/types-6.34.0" (sources."@semantic-release/commit-analyzer-6.3.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."@semantic-release/error-2.2.0" (sources."@semantic-release/github-5.5.8" // { dependencies = [ - sources."debug-4.2.0" - sources."mime-2.4.6" + sources."debug-4.3.2" + sources."mime-2.5.2" sources."ms-2.1.2" ]; }) @@ -7898,14 +8187,14 @@ in sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."get-stream-5.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."read-pkg-5.2.0" - sources."registry-auth-token-4.2.0" + sources."registry-auth-token-4.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."type-fest-0.6.0" @@ -7914,7 +8203,7 @@ in }) (sources."@semantic-release/release-notes-generator-7.3.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."find-up-4.1.0" sources."get-stream-5.2.0" sources."locate-path-5.0.0" @@ -7926,7 +8215,7 @@ in sources."type-fest-0.6.0" ]; }) - sources."@sinonjs/commons-1.8.1" + sources."@sinonjs/commons-1.8.3" (sources."@sinonjs/formatio-3.2.2" // { dependencies = [ sources."@sinonjs/samsam-3.3.3" @@ -7934,14 +8223,13 @@ in }) sources."@sinonjs/samsam-2.1.3" sources."@sinonjs/text-encoding-0.7.1" - sources."@types/color-name-1.1.1" - sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" - sources."@types/minimist-1.2.0" - sources."@types/node-14.10.0" - sources."@types/normalize-package-data-2.4.0" + sources."@types/glob-7.2.0" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-16.11.1" + sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/retry-0.12.0" + sources."@types/retry-0.12.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-5.1.1" @@ -7954,11 +8242,29 @@ in sources."ansicolors-0.3.2" (sources."anymatch-2.0.0" // { dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" sources."normalize-path-2.1.1" + sources."to-regex-range-2.1.1" ]; }) sources."append-transform-2.0.0" sources."archy-1.0.0" + sources."arg-4.1.3" sources."argparse-1.0.10" sources."argv-formatter-1.0.0" sources."arr-diff-4.0.0" @@ -7980,18 +8286,18 @@ in sources."aws-sign2-0.5.0" (sources."axios-0.19.0" // { dependencies = [ - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-5.2.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" ]; }) - sources."before-after-hook-2.1.0" + sources."before-after-hook-2.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" (sources."bl-0.9.5" // { @@ -8009,15 +8315,11 @@ in ]; }) sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.14.2" + sources."browserslist-4.17.4" sources."btoa-lite-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cache-base-1.0.1" sources."cachedir-2.2.0" (sources."caching-transform-4.0.0" // { @@ -8026,25 +8328,29 @@ in sources."write-file-atomic-3.0.3" ]; }) - (sources."caller-callsite-2.0.0" // { - dependencies = [ - sources."callsites-2.0.0" - ]; - }) - sources."caller-path-2.0.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001270" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.6.0" - sources."chai-4.2.0" + sources."chai-4.1.2" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."charenc-0.0.2" sources."check-error-1.0.2" - sources."chokidar-2.1.8" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."to-regex-range-2.1.1" + ]; + }) sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -8066,7 +8372,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-table-0.3.1" // { + (sources."cli-table-0.3.6" // { dependencies = [ sources."colors-1.0.3" ]; @@ -8085,41 +8391,40 @@ in sources."colors-0.6.2" sources."combined-stream-0.0.7" sources."commander-4.1.1" - sources."commitizen-4.2.1" + sources."commitizen-4.2.4" sources."commondir-1.0.1" - (sources."compare-func-2.0.0" // { - dependencies = [ - sources."dot-prop-5.3.0" - sources."is-obj-2.0.0" - ]; - }) + sources."compare-func-2.0.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."configstore-3.1.5" // { dependencies = [ + sources."dot-prop-4.2.1" + sources."is-obj-1.0.1" sources."make-dir-1.3.0" sources."pify-3.0.0" ]; }) - sources."conventional-changelog-angular-5.0.11" - (sources."conventional-changelog-writer-4.0.17" // { + sources."conventional-changelog-angular-5.0.13" + sources."conventional-changelog-conventionalcommits-4.4.0" + (sources."conventional-changelog-writer-4.1.0" // { dependencies = [ sources."split-1.0.1" ]; }) sources."conventional-commit-types-3.0.0" - sources."conventional-commits-filter-2.0.6" - sources."conventional-commits-parser-3.1.0" - sources."convert-source-map-1.7.0" + sources."conventional-commits-filter-2.0.7" + sources."conventional-commits-parser-3.2.2" + sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.0" + sources."core-util-is-1.0.3" + sources."cosmiconfig-7.0.1" sources."create-error-class-3.0.2" + sources."create-require-1.1.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -8157,13 +8462,13 @@ in sources."deprecation-2.3.1" sources."detect-file-1.0.0" sources."detect-indent-6.0.0" - sources."diff-3.5.0" + sources."diff-4.0.2" sources."dir-glob-3.0.1" - sources."dot-prop-4.2.1" + sources."dot-prop-5.3.0" sources."duplexer-0.1.2" sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.873" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" (sources."env-ci-4.5.2" // { @@ -8171,7 +8476,7 @@ in sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."get-stream-5.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" @@ -8183,10 +8488,10 @@ in ]; }) sources."error-ex-1.3.2" - sources."es-abstract-1.17.6" + sources."es-abstract-1.19.1" sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" - sources."escalade-3.0.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."esutils-2.0.3" @@ -8222,27 +8527,18 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."fast-glob-3.2.4" // { + (sources."fast-glob-3.2.7" // { dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" - sources."to-regex-range-5.0.1" + sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.8.0" + sources."fastq-1.13.0" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" sources."fill-keys-1.0.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" - sources."find-node-modules-2.0.0" + sources."find-node-modules-2.1.2" sources."find-root-1.1.0" sources."find-up-3.0.0" sources."find-versions-3.2.0" @@ -8251,10 +8547,10 @@ in sources."commander-2.1.0" ]; }) - sources."findup-sync-3.0.0" - (sources."flat-4.1.0" // { + sources."findup-sync-4.0.0" + (sources."flat-4.1.1" // { dependencies = [ - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" ]; }) (sources."follow-redirects-1.5.10" // { @@ -8276,17 +8572,19 @@ in sources."form-data-0.1.4" sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fromentries-1.2.1" + sources."fromentries-1.3.2" sources."fs-extra-8.1.0" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" + sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."ghooks-2.0.4" (sources."git-log-parser-1.2.0" // { @@ -8315,27 +8613,30 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.8" sources."graceful-readlink-1.0.1" sources."growl-1.10.5" - (sources."handlebars-4.7.6" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."handlebars-4.7.7" sources."hard-rejection-2.1.0" sources."has-1.0.3" + sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) - (sources."hasha-5.2.0" // { + (sources."hasha-5.2.2" // { dependencies = [ - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" ]; }) sources."hawk-1.1.1" @@ -8343,18 +8644,18 @@ in sources."hoek-0.9.1" sources."homedir-polyfill-1.0.3" sources."hook-std-2.0.0" - sources."hosted-git-info-2.8.8" + sources."hosted-git-info-2.8.9" sources."html-escaper-2.0.2" (sources."http-proxy-agent-3.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) sources."http-signature-0.10.1" (sources."https-proxy-agent-4.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.2" sources."ms-2.1.2" ]; }) @@ -8362,7 +8663,7 @@ in sources."iconv-lite-0.4.24" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -8370,12 +8671,13 @@ in sources."import-from-3.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."in-publish-2.0.1" + sources."in-publish-2.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."inquirer-6.5.2" + sources."internal-slot-1.0.3" (sources."into-stream-5.1.1" // { dependencies = [ sources."p-is-promise-3.0.0" @@ -8385,38 +8687,41 @@ in sources."invert-kv-2.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.4" sources."is-ci-1.2.1" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" - sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" + sources."is-glob-4.0.3" sources."is-installed-globally-0.1.0" + sources."is-negative-zero-2.0.1" sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-obj-1.0.1" - sources."is-object-1.0.1" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-obj-2.0.0" + sources."is-object-1.0.2" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" - sources."is-regex-1.1.1" + sources."is-regex-1.1.4" sources."is-retry-allowed-1.2.0" + sources."is-shared-array-buffer-1.0.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" + sources."is-weakref-1.0.1" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -8428,32 +8733,30 @@ in (sources."istanbul-lib-processinfo-2.0.2" // { dependencies = [ sources."cross-spawn-7.0.3" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.2.0" sources."make-dir-3.1.0" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."uuid-3.4.0" sources."which-2.0.2" ]; }) (sources."istanbul-lib-report-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.2.0" sources."make-dir-3.1.0" sources."supports-color-7.2.0" ]; }) - (sources."istanbul-lib-source-maps-4.0.0" // { + (sources."istanbul-lib-source-maps-4.0.1" // { dependencies = [ - sources."debug-4.2.0" - sources."istanbul-lib-coverage-3.0.0" + sources."debug-4.3.2" + sources."istanbul-lib-coverage-3.2.0" sources."ms-2.1.2" - sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.0.2" + sources."istanbul-reports-3.0.5" sources."java-properties-1.0.2" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -8461,11 +8764,11 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."just-extend-4.1.0" + sources."just-extend-4.2.1" sources."kind-of-6.0.3" sources."latest-version-3.1.0" sources."lcid-2.0.0" @@ -8480,7 +8783,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._baseclone-4.5.7" sources."lodash.capitalize-4.2.1" sources."lodash.clone-4.5.0" @@ -8492,7 +8795,6 @@ in sources."lodash.isstring-4.0.1" sources."lodash.map-4.6.0" sources."lodash.set-4.3.2" - sources."lodash.toarray-4.4.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."log-symbols-2.2.0" @@ -8501,18 +8803,19 @@ in sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."make-error-1.3.6" sources."manage-path-2.0.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" - sources."map-obj-4.1.0" + sources."map-obj-4.3.0" sources."map-visit-1.0.0" - sources."marked-0.6.3" + sources."marked-0.7.0" sources."marked-terminal-3.3.0" sources."md5-2.3.0" (sources."mem-4.3.0" // { @@ -8520,14 +8823,20 @@ in sources."mimic-fn-2.1.0" ]; }) - (sources."meow-7.1.1" // { + (sources."meow-8.1.2" // { dependencies = [ sources."find-up-4.1.0" + sources."hosted-git-info-4.0.2" sources."locate-path-5.0.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" sources."p-locate-4.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -8536,15 +8845,17 @@ in sources."type-fest-0.8.1" ]; }) - sources."type-fest-0.13.1" - sources."yargs-parser-18.1.3" + sources."semver-7.3.5" + sources."type-fest-0.18.1" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" ]; }) - sources."merge-1.2.1" + sources."merge-2.1.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."mime-1.2.11" sources."mime-types-1.0.2" sources."mimic-fn-1.2.0" @@ -8565,28 +8876,30 @@ in (sources."mocha-6.2.0" // { dependencies = [ sources."debug-3.2.6" + sources."diff-3.5.0" sources."glob-7.1.3" sources."ms-2.1.1" + sources."object.assign-4.1.0" sources."strip-json-comments-2.0.1" sources."supports-color-6.0.0" ]; }) - (sources."mocha-junit-reporter-1.23.3" // { + (sources."mocha-junit-reporter-1.18.0" // { dependencies = [ sources."strip-ansi-4.0.0" ]; }) (sources."mocha-multi-reporters-1.1.7" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" + sources."debug-3.2.7" + sources."ms-2.1.3" ]; }) sources."modify-values-1.0.1" sources."module-not-found-error-1.0.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.14.1" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."neo-async-2.6.2" sources."nerf-dart-1.0.0" @@ -8596,21 +8909,21 @@ in sources."lolex-5.1.2" ]; }) - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" (sources."node-environment-flags-1.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.5" sources."node-modules-regexp-1.0.0" sources."node-preload-0.2.1" - sources."node-releases-1.1.61" + sources."node-releases-2.0.0" sources."node-uuid-1.4.8" (sources."nodemon-1.19.1" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" + sources."debug-3.2.7" + sources."ms-2.1.3" sources."semver-5.7.1" ]; }) @@ -8621,31 +8934,31 @@ in ]; }) sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" - sources."npm-6.14.8" + sources."normalize-url-4.5.1" + sources."npm-6.14.15" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" (sources."nyc-15.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" - sources."glob-7.1.6" + sources."glob-7.2.0" sources."is-fullwidth-code-point-3.0.0" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.2.0" sources."istanbul-lib-instrument-4.0.3" sources."locate-path-5.0.0" sources."make-dir-3.1.0" sources."p-locate-4.1.0" sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."test-exclude-6.0.0" sources."wrap-ansi-6.2.0" sources."yargs-15.4.1" @@ -8666,11 +8979,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" @@ -8697,7 +9010,7 @@ in sources."p-locate-3.0.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - sources."p-retry-4.2.0" + sources."p-retry-4.6.1" sources."p-try-2.2.0" sources."package-hash-4.0.0" (sources."package-json-4.0.1" // { @@ -8707,7 +9020,7 @@ in }) sources."pad-right-0.2.2" sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -8715,15 +9028,16 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-to-regexp-1.8.0" // { dependencies = [ sources."isarray-0.0.1" ]; }) sources."path-type-4.0.0" - sources."pathval-1.1.0" - sources."picomatch-2.2.2" + sources."pathval-1.1.1" + sources."picocolors-1.0.0" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pirates-4.0.1" (sources."pkg-conf-2.1.0" // { @@ -8740,7 +9054,11 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."process-on-spawn-1.0.0" - sources."proxyquire-2.1.3" + (sources."proxyquire-2.1.0" // { + dependencies = [ + sources."resolve-1.8.1" + ]; + }) sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pstree.remy-1.1.8" @@ -8748,6 +9066,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."rc-1.2.8" // { dependencies = [ @@ -8762,31 +9081,41 @@ in }) sources."read-pkg-up-4.0.0" sources."readable-stream-2.3.7" - sources."readdirp-2.2.1" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) sources."redent-3.0.0" sources."redeyed-2.1.1" - sources."regenerate-1.4.1" - sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-9.0.0" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.8.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; }) sources."release-zalgo-1.0.0" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" + sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."request-2.42.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" @@ -8794,41 +9123,60 @@ in sources."restore-cursor-2.0.0" sources."resumer-0.0.0" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."right-pad-1.0.1" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" - sources."rxjs-6.6.3" + sources."run-parallel-1.2.0" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."semantic-release-15.13.18" // { + (sources."semantic-release-15.14.0" // { dependencies = [ - sources."cosmiconfig-5.2.1" - sources."debug-4.2.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cosmiconfig-6.0.0" + sources."cross-spawn-7.0.3" + sources."debug-4.3.2" + sources."emoji-regex-8.0.0" + sources."execa-3.4.0" sources."figures-3.2.0" sources."find-up-4.1.0" sources."get-stream-5.2.0" - (sources."import-fresh-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) + sources."hosted-git-info-3.0.8" + sources."is-fullwidth-code-point-3.0.0" + sources."is-stream-2.0.1" sources."locate-path-5.0.0" + sources."lru-cache-6.0.0" + sources."mimic-fn-2.1.0" sources."ms-2.1.2" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" sources."p-locate-4.1.0" - sources."parse-json-4.0.0" sources."path-exists-4.0.0" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."parse-json-5.1.0" - sources."type-fest-0.6.0" - ]; - }) - sources."read-pkg-up-6.0.0" - sources."type-fest-0.5.2" + sources."path-key-3.1.1" + sources."read-pkg-5.2.0" + sources."read-pkg-up-7.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."type-fest-0.6.0" + sources."which-2.0.2" + sources."wrap-ansi-6.2.0" + sources."yallist-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; }) sources."semver-6.3.0" @@ -8846,9 +9194,14 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.5" sources."signale-1.4.0" - sources."sinon-6.3.5" + (sources."sinon-6.3.4" // { + dependencies = [ + sources."diff-3.5.0" + ]; + }) sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -8866,6 +9219,7 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -8879,14 +9233,10 @@ in ]; }) sources."sntp-0.2.4" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."source-map-url-0.4.0" + sources."source-map-support-0.5.20" + sources."source-map-url-0.4.1" sources."spawn-command-0.0.2" sources."spawn-error-forwarder-1.0.0" (sources."spawn-wrap-2.0.0" // { @@ -8898,12 +9248,12 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.10" sources."split-0.2.10" sources."split-string-3.1.0" - (sources."split2-2.2.0" // { + (sources."split2-3.2.2" // { dependencies = [ - sources."through2-2.0.5" + sources."readable-stream-3.6.0" ]; }) sources."sprintf-js-1.0.3" @@ -8931,8 +9281,8 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" (sources."strip-ansi-5.2.0" // { @@ -8968,7 +9318,11 @@ in sources."test-exclude-5.2.3" sources."text-extensions-1.9.0" sources."through-2.3.8" - sources."through2-3.0.2" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-fast-properties-2.0.0" @@ -8978,23 +9332,26 @@ in ]; }) sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."touch-3.1.0" sources."tough-cookie-4.0.0" + sources."tr46-0.0.3" sources."traverse-0.6.6" - sources."trim-newlines-3.0.0" - sources."trim-off-newlines-1.0.1" - sources."tslib-1.13.0" + sources."trim-newlines-3.0.1" + sources."ts-node-9.1.1" + sources."tslib-2.3.1" sources."tunnel-agent-0.4.3" sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.10.4" - sources."undefsafe-2.0.3" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."typescript-4.4.4" + sources."uglify-js-3.14.2" + sources."unbox-primitive-1.0.1" + sources."undefsafe-2.0.5" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."unique-string-1.0.0" sources."universal-user-agent-4.0.1" @@ -9018,9 +9375,12 @@ in sources."urlgrey-0.4.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" sources."widest-line-2.0.1" @@ -9040,9 +9400,9 @@ in sources."xdg-basedir-3.0.0" sources."xml-1.0.1" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.3" sources."yallist-2.1.2" - sources."yaml-1.10.0" + sources."yaml-1.10.2" (sources."yargs-13.2.2" // { dependencies = [ sources."string-width-3.1.0" @@ -9057,11 +9417,12 @@ in sources."yargs-parser-11.1.1" ]; }) + sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "Git commit, but play nice with conventions."; - homepage = https://github.com/commitizen/cz-cli; + homepage = "https://github.com/commitizen/cz-cli"; license = "MIT"; }; production = false; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 2879b688c6a51..9f039c4ab0044 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, nano }: -stdenv.mkDerivation { - name = "cvs-1.12.13"; +stdenv.mkDerivation rec { + pname = "cvs"; + version = "1.12.13"; src = fetchurl { - url = "mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2"; + url = "mirror://savannah/cvs/source/feature/${version}/cvs-${version}.tar.bz2"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ed2cf00291e28..0e6302534ad9d 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -6,6 +6,7 @@ , zlib , openssl , readline +, withInternalSqlite ? true , sqlite , ed , which @@ -15,23 +16,25 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy"; + sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; - buildInputs = [ zlib openssl readline sqlite which ed ] - ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl readline which ed ] + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - configureFlags = [ "--disable-internal-sqlite" ] + configureFlags = + lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; preBuild = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 35aada8b870f5..decd3c51a392f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec { description = "Tool for visualization of Git repositories"; homepage = "https://github.com/git-big-picture/git-big-picture"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nthorne ]; }; } 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 97b96f7461f6f..f08a74bd3401b 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 @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4="; + sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw="; }; nativeBuildInputs = [ installShellFiles ]; 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 6bdefb8cb38da..61d5225621b24 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, buildPackages , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc -, openssh, pcre2 +, openssh, pcre2, bash , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.33.0"; + version = "2.33.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z"; + sha256 = "sha256-4FSm5sKwiL0b/19h7ZulqpHJo81QlTmktBxd3wIgHy8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -73,7 +73,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; - buildInputs = [curl openssl zlib expat cpio libiconv] + buildInputs = [ curl openssl zlib expat cpio libiconv bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] @@ -84,11 +84,12 @@ stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.isFreeBSD) "-lthr"; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + configureFlags = [ + "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" "ac_cv_iconv_omits_bom=no" - "ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config" ]; preBuild = '' @@ -97,8 +98,10 @@ stdenv.mkDerivation { makeFlags = [ "prefix=\${out}" - "SHELL_PATH=${stdenv.shell}" ] + # Git does not allow setting a shell separately for building and run-time. + # Therefore lets leave it at the default /bin/sh when cross-compiling + ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}" ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] @@ -115,6 +118,10 @@ stdenv.mkDerivation { # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + stdenv.shellPackage + ]; + postBuild = '' make -C contrib/subtree @@ -338,6 +345,8 @@ stdenv.mkDerivation { disable_test t6300-for-each-ref #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found 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.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/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index a1c63538220b3..b68179b182bca 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,7 +1,8 @@ { fetchgit, lib, stdenv, perl }: -stdenv.mkDerivation { - name = "git2cl-20080827"; +stdenv.mkDerivation rec { + pname = "git2cl"; + version = "unstable-2008-08-27"; src = fetchgit { url = "git://repo.or.cz/git2cl.git"; diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index d256e212ecaec..89419605b3ba6 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,22 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.4.10"; + version = "1.5.6"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yv0RZfGLS/cxOxettHQHSPldcq+xa+TNj6dDIAmzOM="; + sha256 = "sha256-RP/8E2wqEFArWrZ1nfDhTKt2Ak1bl6PhalaHcQobfTk="; }; - cargoSha256 = "sha256-xG7aic7NCcltz9YmQ4V40/h3OR8Vt5IgApp4yoDbPuc="; + cargoSha256 = "sha256-6OGkcTGKCMgxMFDJ625NeVmKjRRwiRkQdE+oXRN3FHw="; # tests require it to be in a git repository preCheck = '' git init ''; + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + checkFlags = [ "--skip" "runs_correctly" ]; + meta = with lib; { description = "A git wrapper that allows you to compress multiple commands into one"; homepage = "https://github.com/milo123459/glitter"; diff --git a/pkgs/applications/version-management/git-and-tools/gst/default.nix b/pkgs/applications/version-management/git-and-tools/gst/default.nix index a323c61bf143d..f0f347d14ca46 100644 --- a/pkgs/applications/version-management/git-and-tools/gst/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gst/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gst"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "uetchy"; repo = "gst"; rev = "v${version}"; - sha256 = "0fqgkmhn84402hidxv4niy9himcdwm1h80prkfk9vghwcyynrbsj"; + sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in"; }; vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index 7fd83e6bf7b9a..7d91fb7754255 100644 --- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); - cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features"; + buildNoDefaultFeatures = !withOpenCL; # disable tests that require gpu - cargoTestFlags = [ "--no-default-features" ]; + checkNoDefaultFeatures = true; meta = with lib; { description = "Change the start of your git commit hashes to whatever you want"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 02888b3f87ef2..1c3fdf90aa792 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "0wa3ba7afnbb1h08n9xr0cqsg93rx0qd9jv8a34mmpp0lpijmjw6"; + sha256 = "0yx81d61kp33h7n0c14wvcrh8vvjjjq4xjh1qwq2sdbmqc43p3hg"; }; nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 8f06050d09023..6d6a3a4f9882e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.11"; + pname = "subgit"; + version = "3.3.11"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://subgit.com/download/${name}.zip"; + url = "https://subgit.com/download/subgit-${version}.zip"; sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0="; }; } diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 74f10a1428839..562658a6e99fe 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchurl, ruby, makeWrapper, git }: +{ lib, stdenv, fetchFromGitHub, ruby, makeWrapper, git }: -let - version = "2.4.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "svn2git"; - inherit version; + version = "2.4.0"; - src = fetchurl { - url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; - sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; + src = fetchFromGitHub { + owner = "nirvdrum"; + repo = "svn2git"; + rev = "v${version}"; + sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w="; }; nativeBuildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 384f5d0f01f7c..63ceb6e3868f0 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,14 +1,15 @@ -{ lib, fetchzip, python2Packages}: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { pname = "gitinspector"; version = "0.4.4"; namePrefix = ""; - src = fetchzip { - url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; - sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m"; - name = "${pname}-${version}" + "-src"; + src = fetchFromGitHub { + owner = "ejwa"; + repo = "gitinspector"; + rev = "v${version}"; + sha256 = "sha256-9bChvE5aAZFunu599pH7QKHZFd7aQzv0i9LURrvh2t0="; }; checkInputs = with python2Packages; [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index d719edb64cb77..89a4038801163 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,114 +3,141 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems }: with lib; let - curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; -in -stdenv.mkDerivation rec { + curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; version = "8.1.0"; - src = fetchzip { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1115616d642chnisil7gv6fxw699sryphrfrp92cq3vi6lcwqbn8"; - }; - - dontBuild = true; - dontConfigure = true; - - libPath = makeLibraryPath [ - stdenv.cc.cc.lib - curlWithGnuTls - udev - libX11 - libXext - libXcursor - libXi - libxcb - glib - libXScrnSaver - libxkbfile - libXtst - nss - nspr - cups - alsa-lib - expat - gdk-pixbuf - dbus - libXdamage - libXrandr - atk - pango - cairo - freetype - fontconfig - libXcomposite - libXfixes - libXrender - gtk3 - libgnome-keyring - openssl - at-spi2-atk - at-spi2-core - libuuid - e2fsprogs - krb5 - libdrm - mesa - ]; - - desktopItem = makeDesktopItem { - name = pname; - exec = "gitkraken"; - icon = "gitkraken"; - desktopName = "GitKraken"; - genericName = "Git Client"; - categories = "Development;"; - comment = "Graphical Git client from Axosoft"; - }; - - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gitkraken/ - cp -R $src/* $out/share/gitkraken/ - - mkdir -p $out/bin - ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications + srcs = { + x86_64-linux = fetchzip { - mkdir -p $out/share/pixmaps - cp gitkraken.png $out/share/pixmaps/gitkraken.png + url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; + sha256 = "sha256-yC7MGTVxD8xEutlleH3WKRnendnv0KijhUwQ00wwJYQ"; + }; - runHook postInstall - ''; + x86_64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; + sha256 = "sha256-SP+LCsxjl5YNOu4rDZOiDIqkynGE+iiLJtxi8tFugKM="; + }; - postFixup = '' - pushd $out/share/gitkraken - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken + aarch64-darwin = srcs.x86_64-darwin; + }; - for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name \*.so\* \) ); do - patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true - done - popd - ''; + src = srcs.${stdenv.hostPlatform.system} or throwSystem; meta = { homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ xnwdd evanjs ]; + platforms = builtins.attrNames srcs; + maintainers = with maintainers; [ xnwdd evanjs arkivm ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version src meta; + + dontBuild = true; + dontConfigure = true; + + libPath = makeLibraryPath [ + stdenv.cc.cc.lib + curlWithGnuTls + udev + libX11 + libXext + libXcursor + libXi + libxcb + glib + libXScrnSaver + libxkbfile + libXtst + nss + nspr + cups + alsa-lib + expat + gdk-pixbuf + dbus + libXdamage + libXrandr + atk + pango + cairo + freetype + fontconfig + libXcomposite + libXfixes + libXrender + gtk3 + libgnome-keyring + openssl + at-spi2-atk + at-spi2-core + libuuid + e2fsprogs + krb5 + libdrm + mesa + ]; + + desktopItems = [ (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "GitKraken"; + genericName = "Git Client"; + categories = "Development;"; + comment = "Graphical Git client from Axosoft"; + }) ]; + + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname}/ + cp -R $src/* $out/share/${pname} + + mkdir -p $out/bin + ln -s $out/share/${pname}/${pname} $out/bin/ + + mkdir -p $out/share/pixmaps + cp ${pname}.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + postFixup = '' + pushd $out/share/${pname} + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${pname} + + for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true + done + popd + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications/GitKraken.app + cp -R . $out/Applications/GitKraken.app + ''; }; -} +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 279d17937ec22..004560bff9958 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.4.1", - "repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm", + "version": "14.4.2", + "repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2", "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.4.1-ee", + "rev": "v14.4.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.4.1", + "GITALY_SERVER_VERSION": "14.4.2", "GITLAB_PAGES_VERSION": "1.46.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.4.1" + "GITLAB_WORKHORSE_VERSION": "14.4.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index fe43c494dd42e..c386add243e2f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -5,7 +5,7 @@ }: let - data = (builtins.fromJSON (builtins.readFile ./data.json)); + data = lib.importJSON ./data.json; version = data.version; src = fetchFromGitLab { @@ -198,7 +198,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin krav talyz yuka ]; + maintainers = with maintainers; [ fpletz globin krav talyz yayayayaka yuka ]; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c6f4df537748b..41e5908c629d3 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,8 @@ let }; }; }; - version = "14.4.1"; + + version = "14.4.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +33,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg="; + sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 63df2be4a27ac..eaae6eacf44fc 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitLab, git, buildGoModule }: let - data = (builtins.fromJSON (builtins.readFile ../data.json)); + data = lib.importJSON ../data.json; in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.4.1"; + version = "14.4.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index b987a3f55128a..6cfcb0077427f 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchzip, perl, python2, gnuplot, coreutils, gnugrep }: +{ lib, stdenv, fetchFromGitHub, perl, python2, gnuplot, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "gitstats"; version = "2016-01-08"; # upstream does not make releases - src = fetchzip { - url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip"; - sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59"; - name = "${pname}-${version}" + "-src"; + src = fetchFromGitHub { + owner = "hoxu"; + repo = "gitstats"; + rev = "55c5c285558c410bb35ebf421245d320ab9ee9fa"; + sha256 = "sha256-qUQB3aCRbPkbMoMf39kPQ0vil8RjXL8RqjdTryfkzK0="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3780be96fd6f5..eea3e7afb774f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -13,11 +13,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj"; + sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4="; }; format = "other"; @@ -27,7 +27,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca"; + sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n"; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 541a2262f999f..e3c48c5724f77 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,25 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw -, bison, libtool, fontconfig, pango, gd, libwebp +{ lib +, stdenv +, fetchurl +, pkg-config +, xlibsWrapper +, libpng +, libjpeg +, expat +, libXaw +, bison +, libtool +, fontconfig +, pango +, gd +, libwebp }: stdenv.mkDerivation rec { - name = "graphviz-2.0"; + pname = "graphviz"; + version = "2.0"; src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz"; sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper libpng libjpeg expat libXaw bison - libtool fontconfig pango gd libwebp + xlibsWrapper + libpng + libjpeg + expat + libXaw + bison + libtool + fontconfig + pango + gd + libwebp ]; hardeningDisable = [ "format" "fortify" ]; configureFlags = - [ "--with-pngincludedir=${libpng.dev}/include" + [ + "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 32126c7ce663f..f558eab6b61fe 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs="; - cargoBuildFlags = lib.optional gitImportSupport "--features=git"; - doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libsodium xxHash zstd ] @@ -32,6 +30,8 @@ rustPlatform.buildRustPackage rec { CoreServices Security SystemConfiguration ])); + buildFeatures = lib.optional gitImportSupport "git"; + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 6a9e910f80120..36e9154571be7 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, fetchurl, tcl, tk}: +{ lib, stdenv, fetchurl, tcl, tk }: -stdenv.mkDerivation -{ - name = "tkcvs-8.2.1"; +stdenv.mkDerivation rec { + pname = "tkcvs"; + version = "8.2.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; + url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 5bb13e116174a..905034091a297 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - sourceRoot = "source/src"; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/CMakeLists.txt \ + --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' + ''; + + cmakeDir = "../src"; nativeBuildInputs = [ pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index f6bc0561b0c6c..e6dcff6717583 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , appstream-glib , desktop-file-utils -, epoxy +, libepoxy , gettext , glib , gtk3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ - epoxy + libepoxy glib gtk3 mpv diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 75d3cdbcc667b..0ce0623ec9d9e 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,13 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 -, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg -, libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng -, libdv, libuuid, file, nasm, perl -, fontconfig, intltool }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, faad2 +, faac +, a52dec +, alsa-lib +, fftw +, lame +, libavc1394 +, libiec61883 +, libraw1394 +, libsndfile +, libvorbis +, libogg +, libjpeg +, libtiff +, freetype +, mjpegtools +, x264 +, gettext +, openexr +, libXext +, libXxf86vm +, libXv +, libXi +, libX11 +, libXft +, xorgproto +, libtheora +, libpng +, libdv +, libuuid +, file +, nasm +, perl +, fontconfig +, intltool +}: stdenv.mkDerivation { - name = "cinelerra-cv-2021-02-14"; + pname = "cinelerra-cv"; + version = "unstable-2021-02-14"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; @@ -26,20 +63,46 @@ stdenv.mkDerivation { preBuild = '' make -C cinelerra versioninfo.h ''; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; - buildInputs = - [ faad2 faac - a52dec alsa-lib fftw lame libavc1394 libiec61883 - libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype - mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 libXft xorgproto - libtheora libpng libdv libuuid - nasm - perl - fontconfig - ]; + + buildInputs = [ + faad2 + faac + a52dec + alsa-lib + fftw + lame + libavc1394 + libiec61883 + libraw1394 + libsndfile + libvorbis + libogg + libjpeg + libtiff + freetype + mjpegtools + x264 + gettext + openexr + libXext + libXxf86vm + libXv + libXi + libX11 + libXft + xorgproto + libtheora + libpng + libdv + libuuid + nasm + perl + fontconfig + ]; meta = with lib; { description = "Professional video editing and compositing environment (community version)"; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 09289840030e9..7f57c79c5fe54 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 -, SDL, automake, GConf }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, libgnomeui +, libXv +, libraw1394 +, libdc1394 +, SDL +, automake +, GConf +}: -stdenv.mkDerivation { - name = "coriander-2.0.1"; +stdenv.mkDerivation rec { + pname = "coriander"; + version = "2.0.1"; src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz"; + url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; }; @@ -20,7 +33,7 @@ stdenv.mkDerivation { homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index 727541e3b53d4..c1d6669c8c2f9 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -34,7 +34,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { buildInputs = [ ffmpeg qtbase ]; - propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel-yaml ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 95f3169718d96..165cb4ab4d636 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let - binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ]; + binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' #!${runtimeShell} diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 502c4c69c3f84..941b0808886e5 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config -, flex, bison }: +{ lib +, stdenv +, fetchurl +, imagemagick +, libdvdread +, libxml2 +, freetype +, fribidi +, libpng +, zlib +, pkg-config +, flex +, bison +}: stdenv.mkDerivation rec { - name = "dvdauthor-0.7.1"; + pname = "dvdauthor"; + version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/dvdauthor/${name}.tar.gz"; + url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ]; nativeBuildInputs = [ pkg-config ]; patches = [ diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 1575421175d3b..2c75633808950 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -12,7 +12,7 @@ , at-spi2-core , dbus , elfutils -, epoxy +, libepoxy , gexiv2 , glib , gobject-introspection @@ -35,6 +35,7 @@ , udev , util-linux , xorg +, zstd }: stdenv.mkDerivation rec { @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core dbus - epoxy + libepoxy elfutils gexiv2 glib @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { pcre udev util-linux + zstd ] ++ (with xorg; [ libXdmcp libXtst diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index a32228176cb99..93f11e78ffb36 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -4,7 +4,7 @@ let # FileBot requires libcurl-gnutls.so to build - curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; in diff --git a/pkgs/applications/video/flirc/99-flirc.rules b/pkgs/applications/video/flirc/99-flirc.rules new file mode 100644 index 0000000000000..eb02f8a911367 --- /dev/null +++ b/pkgs/applications/video/flirc/99-flirc.rules @@ -0,0 +1,11 @@ +# Flirc Devices + +# Bootloader +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0000", MODE="0666" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0002", MODE="0666" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="0005", MODE="0666" + +# Flirc Application +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0001", MODE="0666" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0004", MODE="0666" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="0006", MODE="0666" diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix new file mode 100644 index 0000000000000..6285094c461a4 --- /dev/null +++ b/pkgs/applications/video/flirc/default.nix @@ -0,0 +1,45 @@ +{ lib +, mkDerivation +, fetchurl +, autoPatchelfHook +, hidapi +, readline +, qtsvg +, qtxmlpatterns +}: + +mkDerivation rec { + pname = "flirc"; + version = "3.24.3"; + + src = fetchurl { + url = "https://web.archive.org/web/20211021211803/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz"; + sha256 = "0p4pp7j70lbw6m25lmjg6ibc67r6jcy7qs3kki9f86ji1jvrxpga"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + hidapi + readline + qtsvg + qtxmlpatterns + ]; + + dontConfigure = true; + dontBuild = true; + + # udev rules don't appear in the official package + # https://flirc.gitbooks.io/flirc-instructions/content/linux.html + installPhase = '' + install -D -t $out/bin/ Flirc flirc_util + install -D ${./99-flirc.rules} $out/lib/udev/rules.d/99-flirc.rules + ''; + + meta = with lib; { + homepage = "https://flirc.tv/more/flirc-usb"; + description = "Use any Remote with your Media Center"; + maintainers = with maintainers; [ aanderse ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index aa32e8828e065..c5a2a3138609a 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-52cVY3SBT048tErydk3l27yBvM/FMVpEMf5miAeInDM="; + sha256 = "sha256-7jmKD6HjsTqW/SRmD4xI3uQJnwmyDgjJZRJX9XygZyU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 5007f7419aeb1..ce64a702379c3 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,85 +7,120 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchFromGitHub, fetchpatch, +{ stdenv +, lib +, fetchFromGitHub +, nixosTests # Main build tools - pkg-config, autoconf, automake, libtool, m4, xz, python3, - numactl, +, pkg-config +, autoconf +, automake +, libtool +, m4 +, xz +, python3 +, numactl +, writeText # Processing, video codecs, containers - ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, +, ffmpeg-full +, nv-codec-headers +, libogg +, x264 +, x265 +, libvpx +, libtheora +, dav1d +, zimg # Codecs, audio - libopus, lame, libvorbis, a52dec, speex, libsamplerate, +, libopus +, lame +, libvorbis +, a52dec +, speex +, libsamplerate # Text processing - libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz, +, libiconv +, fribidi +, fontconfig +, freetype +, libass +, jansson +, libxml2 +, harfbuzz +, libjpeg_turbo # Optical media - libdvdread, libdvdnav, libdvdcss, libbluray, +, libdvdread +, libdvdnav +, libdvdcss +, libbluray # Darwin-specific - AudioToolbox ? null, - Foundation ? null, - libobjc ? null, - VideoToolbox ? null, +, AudioToolbox ? null +, Foundation ? null +, libobjc ? null +, VideoToolbox ? null # GTK # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, # which in turn depends on systemd. systemd is not supported on Darwin, so # for now we disable GTK GUI support on Darwin. (It may be possible to remove # this restriction later.) - useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null, - intltool ? null, - glib ? null, - gtk3 ? null, - libappindicator-gtk3 ? null, - libnotify ? null, - gst_all_1 ? null, - dbus-glib ? null, - udev ? null, - libgudev ? null, - hicolor-icon-theme ? null, +, useGtk ? !stdenv.isDarwin +, wrapGAppsHook +, intltool +, glib +, gtk3 +, libappindicator-gtk3 +, libnotify +, gst_all_1 +, dbus-glib +, udev +, libgudev +, hicolor-icon-theme # FDK - useFdk ? false, fdk_aac ? null +, useFdk ? false +, fdk_aac }: -stdenv.mkDerivation rec { - pname = "handbrake"; - version = "1.3.3"; +let + version = "1.4.2"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "0bsmk37543zv3p32a7wxnh2w483am23ha2amj339q3nnb4142krn"; - extraPostFetch = '' - echo "DATE=$(date +"%F %T %z" -r $out/NEWS.markdown)" > $out/version.txt - ''; + sha256 = "sha256-Usz2+U1Wb8yJ5W2HqV0FqBaaE25fuVKk/NwKBHaKzwk="; }; - # Remove with a release after 1.3.3 - patches = [ - (fetchpatch { - name = "audio-fix-ffmpeg-4_4"; - url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch"; - sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz"; - }) - ]; - - # we put as little as possible in src.extraPostFetch as it's much easier to - # add to it here without having to fiddle with src.sha256 - # only DATE and HASH are absolutely necessary + versionFile = writeText "version.txt" '' + BRANCH=${versions.majorMinor version}.x + DATE=1970-01-01 00:00:01 +0000 + HASH=${src.rev} + REV=${src.rev} + SHORTHASH=${src.rev} + TAG=${version} + URL=${src.meta.homepage} + ''; + + inherit (lib) optional optionals optionalString versions; + +in +stdenv.mkDerivation rec { + pname = "handbrake"; + inherit version src; + postPatch = '' - cat >> version.txt <<_EOF -HASH=${src.rev} -SHORTHASH=${src.rev} -TAG=${version} -URL=${src.meta.homepage} -_EOF + install -Dm444 ${versionFile} ${versionFile.name} patchShebangs scripts + substituteInPlace libhb/hb.c \ + --replace 'return hb_version;' 'return "${version}";' + # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py - '' + (lib.optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' # Use the Nix-provided libxml2 instead of the patched version available on # the Handbrake website. substituteInPlace libhb/module.defs \ @@ -95,51 +130,92 @@ _EOF # which it isn't in the Nix context. (The actual build goes fine without # xcodebuild.) sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '') + (lib.optionalString stdenv.isLinux '' + '' + optionalString stdenv.isLinux '' # Use the Nix-provided libxml2 instead of the system-provided one. substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - ''); + ''; nativeBuildInputs = [ - pkg-config autoconf automake libtool m4 python3 - ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; + autoconf + automake + libtool + m4 + pkg-config + python3 + ] + ++ optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ - ffmpeg-full libogg libtheora x264 x265 libvpx dav1d - libopus lame libvorbis a52dec speex libsamplerate - libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray xz - ] ++ lib.optional (!stdenv.isDarwin) numactl - ++ lib.optionals useGtk [ - glib gtk3 libappindicator-gtk3 libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev - libgudev hicolor-icon-theme - ] ++ lib.optional useFdk fdk_aac - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + a52dec + dav1d + ffmpeg-full + fontconfig + freetype + fribidi + harfbuzz + jansson + lame + libass + libbluray + libdvdcss + libdvdnav + libdvdread + libiconv + libjpeg_turbo + libogg + libopus + libsamplerate + libtheora + libvorbis + libvpx + libxml2 + speex + x264 + x265 + xz + zimg + ] + ++ optional (!stdenv.isDarwin) numactl + ++ optionals useGtk [ + dbus-glib + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + libappindicator-gtk3 + libgudev + libnotify + udev + ] + ++ optional useFdk fdk_aac + ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" - ++ lib.optional stdenv.isLinux nv-codec-headers; + ++ optional stdenv.isLinux nv-codec-headers; configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") - (if useFdk then "--enable-fdk-aac" else "") - (if stdenv.isDarwin then "--disable-xcode" else "") - ] ++ lib.optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; + "--disable-gtk-update-checks" + ] + ++ optional (!useGtk) "--disable-gtk" + ++ optional useFdk "--enable-fdk-aac" + ++ optional stdenv.isDarwin "--disable-xcode" + ++ optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ - "-lx265" - ]; + NIX_LDFLAGS = [ "-lx265" ]; - preBuild = '' - cd build - ''; + makeFlags = [ "--directory=build" ]; + + passthru.tests = { + basic-conversion = nixosTests.handbrake; + }; meta = with lib; { - homepage = "http://handbrake.fr/"; + homepage = "https://handbrake.fr/"; description = "A tool for converting video files and ripping DVDs"; longDescription = '' Tool for converting and remuxing video files @@ -149,8 +225,9 @@ _EOF CLI - `HandbrakeCLI` GTK GUI - `ghb` ''; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Anton-Latukha wmertens ]; platforms = with platforms; unix; + broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; }; } diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 8c23bfc5c2986..82d34d188ff64 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -94,9 +94,6 @@ mkDerivation rec { mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/" rmdir $out/Resources - # fix 'Could not find the Qt platform plugin "cocoa" in ""' error - wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" - ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer ''; diff --git a/pkgs/applications/video/kodi-packages/archive_tool/default.nix b/pkgs/applications/video/kodi-packages/archive_tool/default.nix new file mode 100644 index 0000000000000..4788556a8793a --- /dev/null +++ b/pkgs/applications/video/kodi-packages/archive_tool/default.nix @@ -0,0 +1,28 @@ +{ lib, buildKodiAddon, fetchFromGitHub, vfs-libarchive }: +buildKodiAddon rec { + pname = "archive_tool"; + namespace = "script.module.archive_tool"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "script.module.archive_tool"; + rev = version; + sha256 = "0hbkyk59xxfjv6vzfjplahmqxi5564qjlwyq6k8ijy6jjcwnd3p7"; + }; + + propagatedBuildInputs = [ + vfs-libarchive + ]; + + passthru = { + pythonPath = "lib"; + }; + + meta = with lib; { + homepage = "https://github.com/zach-morris/script.module.archive_tool"; + description = "A set of common python functions to work with the Kodi archive virtual file system (vfs) binary addons"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/defusedxml/default.nix b/pkgs/applications/video/kodi-packages/defusedxml/default.nix new file mode 100644 index 0000000000000..11738065ff601 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/defusedxml/default.nix @@ -0,0 +1,26 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "defusedxml"; + namespace = "script.module.defusedxml"; + version = "0.6.0+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd"; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.defusedxml"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/tiran/defusedxml"; + description = "defusing XML bombs and other exploits"; + license = licenses.psfl; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/iagl/default.nix b/pkgs/applications/video/kodi-packages/iagl/default.nix new file mode 100644 index 0000000000000..8ca0abdf960b9 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/iagl/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: + +buildKodiAddon rec { + pname = "iagl"; + namespace = "plugin.program.iagl"; + version = "1101521-2"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "plugin.program.iagl"; + rev = "30e82eec1a909b31767f0e298cf77fc970b256d3"; + sha256 = "11y05i5f7lzik23w2kr52jdgr8db3gin8i683sy1hzxlmplk4699"; + }; + + propagatedBuildInputs = [ + dateutil + requests + routing + vfs-libarchive + archive_tool + youtube + ]; + + meta = with lib; { + homepage = "https://github.com/zach-morris/plugin.program.iagl"; + description = "Launch Games from the Internet using Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/keymap/default.nix b/pkgs/applications/video/kodi-packages/keymap/default.nix new file mode 100644 index 0000000000000..d7b45485d6837 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/keymap/default.nix @@ -0,0 +1,24 @@ +{ lib, addonDir, buildKodiAddon, fetchzip, defusedxml, kodi-six }: + +buildKodiAddon rec { + pname = "keymap"; + namespace = "script.keymap"; + version = "1.1.3+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "1icrailzpf60nw62xd0khqdp66dnr473m2aa9wzpmkk3qj1ay6jv"; + }; + + propagatedBuildInputs = [ + defusedxml + kodi-six + ]; + + meta = with lib; { + homepage = "https://github.com/tamland/xbmc-keymap-editor"; + description = "A GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix new file mode 100644 index 0000000000000..064375107e26e --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-genplus"; + namespace = "game.libretro.genplus"; + version = "1.7.4.31"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.genplus"; + rev = "${version}-${rel}"; + sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8"; + }; + + extraCMakeFlags = [ + "-DGENPLUS_LIB=${genesis-plus-gx}/lib/retroarch/cores/genesis_plus_gx_libretro.so" + ]; + + extraBuildInputs = [ genesis-plus-gx ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.genplus"; + description = "Genesis Plus GX GameClient for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix b/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix new file mode 100644 index 0000000000000..a58f1c51b295f --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-mgba"; + namespace = "game.libretro.mgba"; + version = "0.9.2.31"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.mgba"; + rev = "${version}-${rel}"; + sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA="; + }; + + extraCMakeFlags = [ + "-DMGBA_LIB=${mgba}/lib/retroarch/cores/mgba_libretro.so" + ]; + + extraBuildInputs = [ mgba ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.mgba"; + description = "mGBA for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/libretro-snes9x/default.nix b/pkgs/applications/video/kodi-packages/libretro-snes9x/default.nix new file mode 100644 index 0000000000000..640aec3d49714 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-snes9x/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-snes9x"; + namespace = "game.libretro.snes9x"; + version = "1.60.0.29"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.snes9x"; + rev = "${version}-${rel}"; + sha256 = "1wyfkg4fncc604alnbaqk92fi1h80n7bwiqfkb8479x5517byab1"; + }; + + extraCMakeFlags = [ + "-DSNES9X_LIB=${snes9x}/lib/retroarch/cores/snes9x_libretro.so" + ]; + + extraBuildInputs = [ snes9x ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.snes9x"; + description = "Snes9X GameClient for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/libretro/default.nix b/pkgs/applications/video/kodi-packages/libretro/default.nix new file mode 100644 index 0000000000000..d1fc3d4afd2b0 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro/default.nix @@ -0,0 +1,24 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml }: + +buildKodiBinaryAddon rec { + pname = "libretro"; + namespace = "game.libretro"; + version = "19.0.0"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro"; + rev = "${version}-${rel}"; + sha256 = "1831wbbc4a545lr4mg1fm4sbx75k5lkrfqaa5fh308aar0nm974d"; + }; + + extraBuildInputs = [ tinyxml ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro"; + description = "Libretro wrapper for Kodi's Game API"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix index 72d6533f38d9e..d1eb38cd0bd4c 100644 --- a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix +++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix @@ -5,6 +5,7 @@ , extraNativeBuildInputs ? [] , extraBuildInputs ? [] , extraRuntimeDependencies ? [] +, extraCMakeFlags ? [] , extraInstallPhase ? "", ... } @ attrs: toKodiAddon (stdenv.mkDerivation ({ name = "kodi-" + name; @@ -19,7 +20,7 @@ toKodiAddon (stdenv.mkDerivation ({ # disables check ensuring install prefix is that of kodi cmakeFlags = [ "-DOVERRIDE_PATHS=1" - ]; + ] ++ extraCMakeFlags; # kodi checks for addon .so libs existance in the addon folder (share/...) # and the non-wrapped kodi lib/... folder before even trying to dlopen @@ -28,7 +29,10 @@ toKodiAddon (stdenv.mkDerivation ({ runHook preInstall make install - ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} + + [[ -f $out/lib/addons/${n}/${n}.so ]] && ln -s $out/lib/addons/${n}/${n}.so $out${addonDir}/${n}/${n}.so || true + [[ -f $out/lib/addons/${n}/${n}.so.${version} ]] && ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} || true + ${extraInstallPhase} runHook postInstall diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 7221e668f4e19..5fa652de0c7e6 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -16,7 +16,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 -, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson , lirc , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus @@ -125,7 +125,7 @@ in stdenv.mkDerivation { libgcrypt libgpg-error libunistring libcrossguid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs - ffmpeg flatbuffers fmt fstrcmp rapidjson + ffmpeg flatbuffers fstrcmp rapidjson lirc mesa # for libEGL ] diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 6203041ed63eb..f5be866473903 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -1,28 +1,40 @@ -{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib -, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja -, pkg-config, python3, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, glib +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, libpulseaudio +, librsvg +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wayland +, wrapGAppsHook +}: -python3.pkgs.buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "kooha"; - version = "1.2.1"; - format = "other"; + version = "2.0.1"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w"; + sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00"; }; - buildInputs = [ - glib - gobject-introspection - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gtk4 - libadwaita - librsvg - ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9"; + }; nativeBuildInputs = [ appstream-glib @@ -31,21 +43,31 @@ python3.pkgs.buildPythonApplication rec { ninja python3 pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wayland wrapGAppsHook ]; + buildInputs = [ + glib + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk4 + libadwaita + libpulseaudio + librsvg + ]; + propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; strictDeps = false; - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py + patchShebangs build-aux/meson_post_install.py ''; installCheckPhase = '' diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6a10aca398cb7..60604a4b8abf2 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libdvdread }: stdenv.mkDerivation rec { - name = "lxdvdrip-1.76"; + pname = "lxdvdrip"; + version = "1.76"; src = fetchurl { - url = "mirror://sourceforge/lxdvdrip/${name}.tgz"; + url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz"; sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6"; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 180d5e8e8293a..26d80b1596c2c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoPatchelfHook , pkg-config +, curl , ffmpeg , openssl , qtbase @@ -13,21 +14,21 @@ }: let - version = "1.16.4"; + version = "1.16.5"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "18kalql846b9ggl3nsz2dpbg51byn8pj0y68fsdcgwwkgvsx7yr2"; + sha256 = "1y14yxhjj0sdq0s24qr58m0ddhna2rf0q0w3ny888as4wbqiwvm0"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "0ssg3q1z80652d4gkv1z7kpsxx82xcw6kpsw266c8q4y2n8x7c76"; + sha256 = "131vdi4gyc996z77rrcqb9nfbd62j8314ai4ib1jnilmrsrk93p5"; }; in mkDerivation { @@ -42,6 +43,8 @@ in mkDerivation { buildInputs = [ ffmpeg openssl qtbase zlib ]; + runtimeDependencies = [ (lib.getLib curl) ]; + qtWrapperArgs = let binPath = lib.makeBinPath [ jre_headless ]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 84b5e2a1d735d..62e7e21cbbb30 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -6,10 +6,10 @@ mkDerivation rec { pname = "minitube"; - version = "3.8.1"; + version = "3.9.1"; src = fetchFromGitHub { - sha256 = "3lpZyPwo4NnxZJKfmCFsH4WdakV4KB5BtCr5xsleeIQ="; + sha256 = "sha256-1BVHxB7WtXCAJqP+uADszdVPc+T3ctCCzfoJPCb5ZTE="; rev = version; repo = "minitube"; owner = "flaviotordini"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 4eac16d349bf6..257d21ecc03b4 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -122,11 +122,6 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 - qtWrapperArgs = lib.optionals stdenv.isDarwin [ - "--set QT_MAC_WANTS_LAYER 1" - ]; - postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui ''; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index 53db96e31d4e7..c9ea2a51d3d48 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95"; + sha256 = "sha256-srL9F99HHq5cw82rnQpywkTuY4s6hqIO64Pw5CnaG5Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 644e35468fb54..1715ce4a6a171 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ optional - ((stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) && !crossBuild) + (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ optional fribidiSupport "--enable-fribidi" ++ optional stdenv.isLinux "--enable-vidix" diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 12ca0dfe4cb6c..3183ca9bbe92d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,148 +1,103 @@ -{ config, lib, stdenv, fetchFromGitHub, fetchpatch -, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which -, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs -, nv-codec-headers, lua, libuchardet, libiconv ? null +{ config +, lib +, stdenv +, fetchFromGitHub +, fetchpatch +, addOpenGLRunpath +, docutils +, perl +, pkg-config +, python3 +, wafHook +, which +, ffmpeg +, freefont_ttf +, freetype +, libass +, libpthreadstubs +, mujs +, nv-codec-headers +, lua +, libuchardet +, libiconv , CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux - , wayland ? null - , wayland-protocols ? null - , libxkbcommon ? null + , wayland + , wayland-protocols + , libxkbcommon , x11Support ? stdenv.isLinux - , libGLU, libGL ? null - , libX11 ? null - , libXext ? null - , libXxf86vm ? null - , libXrandr ? null + , libGLU, libGL + , libX11 + , libXext + , libXxf86vm + , libXrandr , cddaSupport ? false - , libcdio ? null - , libcdio-paranoia ? null + , libcdio + , libcdio-paranoia , vulkanSupport ? stdenv.isLinux - , libplacebo ? null - , shaderc ? null - , vulkan-headers ? null - , vulkan-loader ? null + , libplacebo + , shaderc + , vulkan-headers + , vulkan-loader , drmSupport ? stdenv.isLinux - , libdrm ? null - , mesa ? null - -, alsaSupport ? stdenv.isLinux, alsa-lib ? null -, archiveSupport ? true, libarchive ? null -, bluraySupport ? true, libbluray ? null -, bs2bSupport ? true, libbs2b ? null -, cacaSupport ? true, libcaca ? null -, cmsSupport ? true, lcms2 ? null -, dvdnavSupport ? stdenv.isLinux, libdvdnav ? null -, jackaudioSupport ? false, libjack2 ? null -, libpngSupport ? true, libpng ? null -, openalSupport ? true, openalSoft ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null -, rubberbandSupport ? stdenv.isLinux, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, sdl2Support ? true, SDL2 ? null -, sixelSupport ? false, libsixel ? null -, speexSupport ? true, speex ? null -, swiftSupport ? false, swift ? null -, theoraSupport ? true, libtheora ? null -, vaapiSupport ? stdenv.isLinux, libva ? null -, vapoursynthSupport ? false, vapoursynth ? null -, vdpauSupport ? true, libvdpau ? null -, xineramaSupport ? stdenv.isLinux, libXinerama ? null -, xvSupport ? stdenv.isLinux, libXv ? null -, zimgSupport ? true, zimg ? null + , libdrm + , mesa + +, alsaSupport ? stdenv.isLinux, alsa-lib +, archiveSupport ? true, libarchive +, bluraySupport ? true, libbluray +, bs2bSupport ? true, libbs2b +, cacaSupport ? true, libcaca +, cmsSupport ? true, lcms2 +, dvdnavSupport ? stdenv.isLinux, libdvdnav +, jackaudioSupport ? false, libjack2 +, libpngSupport ? true, libpng +, openalSupport ? true, openalSoft +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, rubberbandSupport ? stdenv.isLinux, rubberband +, screenSaverSupport ? true, libXScrnSaver +, sdl2Support ? true, SDL2 +, sixelSupport ? false, libsixel +, speexSupport ? true, speex +, swiftSupport ? false, swift +, theoraSupport ? true, libtheora +, vaapiSupport ? stdenv.isLinux, libva +, vapoursynthSupport ? false, vapoursynth +, vdpauSupport ? true, libvdpau +, xineramaSupport ? stdenv.isLinux, libXinerama +, xvSupport ? stdenv.isLinux, libXv +, zimgSupport ? true, zimg }: with lib; let - available = x: x != null; -in -assert alsaSupport -> available alsa-lib; -assert archiveSupport -> available libarchive; -assert bluraySupport -> available libbluray; -assert bs2bSupport -> available libbs2b; -assert cacaSupport -> available libcaca; -assert cddaSupport -> all available [ libcdio libcdio-paranoia ]; -assert cmsSupport -> available lcms2; -assert drmSupport -> all available [ libdrm mesa ]; -assert dvdnavSupport -> available libdvdnav; -assert jackaudioSupport -> available libjack2; -assert libpngSupport -> available libpng; -assert openalSupport -> available openalSoft; -assert pulseSupport -> available libpulseaudio; -assert rubberbandSupport -> available rubberband; -assert screenSaverSupport -> available libXScrnSaver; -assert sdl2Support -> available SDL2; -assert sixelSupport -> available libsixel; -assert speexSupport -> available speex; -assert theoraSupport -> available libtheora; -assert vaapiSupport -> available libva; -assert vapoursynthSupport -> available vapoursynth; -assert vdpauSupport -> available libvdpau; -assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ]; -assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ]; -assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ]; -assert xineramaSupport -> x11Support && available libXinerama; -assert xvSupport -> x11Support && available libXv; -assert zimgSupport -> available zimg; - -let luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.33.1"; + version = "0.34.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchFromGitHub { - owner = "mpv-player"; - repo = "mpv"; - rev = "v${version}"; - sha256 = "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45"; + owner = "mpv-player"; + repo = "mpv"; + rev = "v${version}"; + sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8="; }; - patches = [ - # To make mpv build with libplacebo 3.104.0: - (fetchpatch { # vo_gpu: placebo: update for upstream API changes - url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; - sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; - }) - # TOREMOVE when > 0.33.1 - # youtube-dl has been abandonned and is now unusable w/ - # youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not - # cut a new release yet. See - # https://github.com/mpv-player/mpv/pull/9209 - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch"; - sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f"; - }) - ]; - postPatch = '' patchShebangs ./TOOLS/ ''; - passthru = { - inherit - # The wrapper consults luaEnv and lua.version - luaEnv - lua - # In the wrapper, we want to reference vapoursynth which has the - # `python3` passthru attribute (which has the `sitePrefix` - # attribute). This way we'll be sure that in the wrapper we'll - # use the same python3.sitePrefix used to build vapoursynth. - vapoursynthSupport - vapoursynth - ; - }; - - NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " - + optionalString stdenv.isDarwin "-framework CoreFoundation"; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " + + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; wafConfigureFlags = [ "--enable-libmpv-shared" @@ -150,60 +105,71 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity - (enableFeature archiveSupport "libarchive") - (enableFeature cddaSupport "cdda") - (enableFeature dvdnavSupport "dvdnav") - (enableFeature openalSupport "openal") - (enableFeature sdl2Support "sdl2") - (enableFeature sixelSupport "sixel") - (enableFeature vaapiSupport "vaapi") - (enableFeature waylandSupport "wayland") - (enableFeature stdenv.isLinux "dvbin") + (lib.enableFeature archiveSupport "libarchive") + (lib.enableFeature cddaSupport "cdda") + (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature openalSupport "openal") + (lib.enableFeature sdl2Support "sdl2") + (lib.enableFeature sixelSupport "sixel") + (lib.enableFeature vaapiSupport "vaapi") + (lib.enableFeature waylandSupport "wayland") + (lib.enableFeature stdenv.isLinux "dvbin") ] # Disable whilst Swift isn't supported ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils perl pkg-config python3 wafHook which - ] ++ optional swiftSupport swift; + addOpenGLRunpath + docutils + perl + pkg-config + python3 + wafHook + which + ] ++ lib.optionals swiftSupport [ swift ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs - luaEnv libuchardet mujs - ] ++ optional alsaSupport alsa-lib - ++ optional archiveSupport libarchive - ++ optional bluraySupport libbluray - ++ optional bs2bSupport libbs2b - ++ optional cacaSupport libcaca - ++ optional cmsSupport lcms2 - ++ optional jackaudioSupport libjack2 - ++ optional libpngSupport libpng - ++ optional openalSupport openalSoft - ++ optional pulseSupport libpulseaudio - ++ optional rubberbandSupport rubberband - ++ optional screenSaverSupport libXScrnSaver - ++ optional sdl2Support SDL2 - ++ optional sixelSupport libsixel - ++ optional speexSupport speex - ++ optional theoraSupport libtheora - ++ optional vaapiSupport libva - ++ optional vapoursynthSupport vapoursynth - ++ optional vdpauSupport libvdpau - ++ optional xineramaSupport libXinerama - ++ optional xvSupport libXv - ++ optional zimgSupport zimg - ++ optional stdenv.isDarwin libiconv - ++ optional stdenv.isLinux nv-codec-headers - ++ optionals cddaSupport [ libcdio libcdio-paranoia ] - ++ optionals drmSupport [ libdrm mesa ] - ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] - ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] - ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; + ffmpeg + freetype + libass + libpthreadstubs + libuchardet + luaEnv + mujs + ] ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals archiveSupport [ libarchive ] + ++ lib.optionals bluraySupport [ libbluray ] + ++ lib.optionals bs2bSupport [ libbs2b ] + ++ lib.optionals cacaSupport [ libcaca ] + ++ lib.optionals cddaSupport [ libcdio libcdio-paranoia ] + ++ lib.optionals cmsSupport [ lcms2 ] + ++ lib.optionals drmSupport [ libdrm mesa ] + ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals libpngSupport [ libpng ] + ++ lib.optionals openalSupport [ openalSoft ] + ++ lib.optionals pulseSupport [ libpulseaudio ] + ++ lib.optionals rubberbandSupport [ rubberband ] + ++ lib.optionals screenSaverSupport [ libXScrnSaver ] + ++ lib.optionals sdl2Support [ SDL2 ] + ++ lib.optionals sixelSupport [ libsixel ] + ++ lib.optionals speexSupport [ speex ] + ++ lib.optionals theoraSupport [ libtheora ] + ++ lib.optionals vaapiSupport [ libva ] + ++ lib.optionals vapoursynthSupport [ vapoursynth ] + ++ lib.optionals vdpauSupport [ libvdpau ] + ++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] + ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] + ++ lib.optionals xineramaSupport [ libXinerama ] + ++ lib.optionals xvSupport [ libXv ] + ++ lib.optionals zimgSupport [ zimg ] + ++ lib.optionals stdenv.isLinux [ nv-codec-headers ] + ++ lib.optionals stdenv.isDarwin [ libiconv ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; enableParallelBuilding = true; - postBuild = optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.isDarwin '' python3 TOOLS/osxbundle.py -s build/mpv ''; @@ -219,28 +185,40 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/pkgconfig/mpv.pc \ --replace "$out/include" "$dev/include" - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. - postFixup = optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/bin/mpv ''; + passthru = { + inherit + # The wrapper consults luaEnv and lua.version + luaEnv + lua + # In the wrapper, we want to reference vapoursynth which has the `python3` + # passthru attribute (which has the `sitePrefix` attribute). This way we'll + # be sure that in the wrapper we'll use the same python3.sitePrefix used to + # build vapoursynth. + vapoursynthSupport + vapoursynth + ; + }; + meta = with lib; { - description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = "https://mpv.io"; + description = "General-purpose media player, fork of MPlayer and mplayer2"; + longDescription = '' + mpv is a free and open-source general-purpose video player, based on the + MPlayer and mplayer2 projects, with great improvements above both. + ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.darwin ++ platforms.linux; - - longDescription = '' - mpv is a free and open-source general-purpose video player, - based on the MPlayer and mplayer2 projects, with great - improvements above both. - ''; }; } diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 984623ed7780a..c097489a33c45 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -1,8 +1,8 @@ # Arguments that this derivation gets when it is created with `callPackage` { stdenv , lib -, symlinkJoin , makeWrapper +, symlinkJoin , yt-dlp }: @@ -10,7 +10,7 @@ mpv: let - # arguments to the function (called `wrapMpv` in all-packages.nix) + # arguments to the function (exposed as `wrapMpv` in all-packages.nix) wrapper = { extraMakeWrapperArgs ? [], youtubeSupport ? true, @@ -79,6 +79,8 @@ let rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; + + meta.mainProgram = "mpv"; }; in lib.makeOverridable wrapper diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 85a0725477144..31f478c47c0b3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -21,16 +21,14 @@ , curl , wayland , xorg -, makeWrapper , pkg-config , libvlc , mbedtls - +, wrapGAppsHook , scriptingSupport ? true , luajit , swig , python3 - , alsaSupport ? stdenv.isLinux , alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux @@ -68,7 +66,7 @@ mkDerivation rec { addOpenGLRunpath cmake pkg-config - makeWrapper + wrapGAppsHook ] ++ optional scriptingSupport swig; @@ -121,9 +119,13 @@ mkDerivation rec { "-DCEF_ROOT_DIR=../../cef" ]; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" - ]; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + ''${gappsWrapperArgs[@]} + ) + ''; postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index aa0f2404ab805..9f7e08a9ddf4a 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: stdenv.mkDerivation rec { - name = "ogmtools-1.5"; + pname = "ogmtools"; + version = "1.5"; src = fetchurl { - url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; - buildInputs = [libogg libvorbis libdvdread]; + buildInputs = [ libogg libvorbis libdvdread ]; meta = { description = "Tools for modifying and inspecting OGG media streams"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 3fe3dcf454a1f..e01d0a2f49c7a 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl -, raspberrypifw, pcre, boost, freetype, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, raspberrypifw +, pcre +, boost +, freetype +, zlib }: let ffmpeg = stdenv.mkDerivation rec { - name = "ffmpeg-1.1.3"; + pname = "ffmpeg"; + version = "1.1.3"; src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; - configurePlatforms = []; + configurePlatforms = [ ]; configureFlags = [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ @@ -61,26 +69,32 @@ let }; in stdenv.mkDerivation rec { - name = "omxplayer-20130328-fbee325dc2"; - src = fetchurl { - url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; - name = "${name}.tar.gz"; + pname = "omxplayer"; + version = "unstable-2013-03-28"; + + src = fetchFromGitHub { + owner = "huceke"; + repo = "omxplayer"; + rev = "fbee325dc20441138d04d8d2022ad85956302e97"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; }; - patchPhase = '' + + postPatch = '' sed -i 1d Makefile export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/" ''; + installPhase = '' mkdir -p $out/bin cp omxplayer.bin $out/bin ''; + buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ]; - meta = { + meta = with lib; { homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.arm; + license = licenses.gpl2Plus; + platforms = platforms.arm; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index ac396f4be80ae..bb6bfa637cece 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,7 +1,14 @@ -{ lib, stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch -, doxygen, python3Packages, libopenshot -, wrapGAppsHook, gtk3 -, qtsvg }: +{ lib +, stdenv +, mkDerivationWith +, fetchFromGitHub +, doxygen +, gtk3 +, libopenshot +, python3Packages +, qtsvg +, wrapGAppsHook +}: mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; @@ -14,11 +21,23 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"; }; - nativeBuildInputs = [ doxygen wrapGAppsHook ]; + nativeBuildInputs = [ + doxygen + wrapGAppsHook + ]; - buildInputs = [ gtk3 ]; + buildInputs = [ + gtk3 + ]; - propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ]; + propagatedBuildInputs = with python3Packages; [ + httplib2 + libopenshot + pyqt5_with_qtwebkit + pyzmq + requests + sip_4 + ]; dontWrapGApps = true; dontWrapQtApps = true; @@ -56,4 +75,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; + + passthru = { + inherit libopenshot; + inherit (libopenshot) libopenshot-audio; + }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index c3bcc09cd3fbd..c5a33af443775 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,34 +1,58 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen -, alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor -, zlib, AGL, Cocoa, Foundation +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, cmake +, doxygen +, libX11 +, libXcursor +, libXext +, libXft +, libXinerama +, libXrandr +, pkg-config +, zlib +, AGL +, Cocoa +, Foundation }: -with lib; stdenv.mkDerivation rec { pname = "libopenshot-audio"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf"; + sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0="; }; - nativeBuildInputs = - [ pkg-config cmake doxygen ]; + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ]; - buildInputs = - optionals stdenv.isLinux [ alsa-lib ] - ++ (if stdenv.isDarwin then - [ zlib AGL Cocoa Foundation ] - else - [ libX11 libXft libXrandr libXinerama libXext libXcursor ]) - ; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ (if stdenv.isDarwin then [ + AGL + Cocoa + Foundation + zlib + ] else [ + libX11 + libXcursor + libXext + libXft + libXinerama + libXrandr + ]); doCheck = false; - meta = { + meta = with lib; { homepage = "http://openshot.org/"; description = "High-quality sound editing library"; longDescription = '' diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 246c3d5cab86e..8a98010ef642b 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,56 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config, cmake, doxygen -, libopenshot-audio, imagemagick, ffmpeg -, swig, python3, jsoncpp -, cppzmq, zeromq -, qtbase, qtmultimedia +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, cmake +, cppzmq +, doxygen +, ffmpeg +, imagemagick +, jsoncpp +, libopenshot-audio , llvmPackages +, pkg-config +, python3 +, qtbase +, qtmultimedia +, swig +, zeromq }: -with lib; stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; + sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; }; - patches = [ - # Fix build with GCC 10. - (fetchpatch { - name = "fix-build-with-gcc-10.patch"; - url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; - sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz"; - }) - ]; - postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt + sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkg-config cmake doxygen swig ]; + nativeBuildInputs = [ + alsa-lib + cmake + doxygen + pkg-config + swig + ]; - buildInputs = - [ imagemagick ffmpeg python3 jsoncpp - cppzmq zeromq qtbase qtmultimedia ] - ++ optional stdenv.isDarwin llvmPackages.openmp - ; + buildInputs = [ + cppzmq + ffmpeg + imagemagick + jsoncpp + libopenshot-audio + python3 + qtbase + qtmultimedia + zeromq + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp + ]; dontWrapQtApps = true; - LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; - doCheck = false; cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; - meta = { + meta = with lib; { homepage = "http://openshot.org/"; description = "Free, open-source video editor library"; longDescription = '' @@ -58,8 +71,12 @@ stdenv.mkDerivation rec { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; + }; + + passthru = { + inherit libopenshot-audio; }; } diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 007ef4262ef2b..6d4e0f18d6fba 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , qmake , qtscript , wrapQtAppsHook @@ -8,14 +8,20 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "21.1.0"; + version = "21.10.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c="; + src = fetchFromGitHub { + owner = "smplayer-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8="; }; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtscript ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4abc2b6546aa1..c82cfb47cc321 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,16 @@ { lib , python3Packages -, rtmpdump , ffmpeg , fetchpatch }: python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "2.4.0"; + version = "3.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af"; + sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo="; }; checkInputs = with python3Packages; [ @@ -22,26 +21,20 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = (with python3Packages; [ + isodate + lxml + pycountry pycryptodome + pysocks requests - iso-639 - iso3166 websocket-client - isodate - lxml ]) ++ [ - rtmpdump ffmpeg ]; - patches = [ - # Patch failing tests to expect correct Accept-Encoding as generated by Requests - (fetchpatch { - url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch"; - includes = [ "tests/test_stream_json.py" ]; - sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml' + ''; meta = with lib; { homepage = "https://streamlink.github.io/"; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index e115fbcdd04de..95f7be2cbcafe 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { - name = "subdl-0.0pre.2017.11.06"; + pname = "subdl"; + version = "unstable-2017-11.06"; src = fetchFromGitHub { owner = "alexanderwink"; @@ -10,6 +11,12 @@ stdenv.mkDerivation { sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"; }; + buildInputs = [ python3 ]; + + installPhase = '' + install -vD subdl $out/bin/subdl + ''; + meta = { homepage = "https://github.com/alexanderwink/subdl"; description = "A command-line tool to download subtitles from opensubtitles.org"; @@ -17,10 +24,4 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.exfalso ]; }; - - buildInputs = [ python3 ]; - - installPhase = '' - install -vD subdl $out/bin/subdl - ''; } diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index 70c3baa0b811d..be0a7fcd2416e 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -8,11 +8,12 @@ let in -stdenv.mkDerivation { - name = "uvccapture-0.5"; +stdenv.mkDerivation rec { + pname = "uvccapture"; + version = "0.5"; src = fetchurl { - url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz"; + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${version}.orig.tar.gz"; sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi"; }; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d694ad8004e01..f7eb5f201e851 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub -, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 +, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let @@ -52,7 +52,7 @@ in { version = "20190525"; buildInputs = [ - vdr libxcb xcbutilwm ffmpeg_3 + vdr libxcb xcbutilwm ffmpeg alsa-lib libvdpau # vdpau libva # va-api @@ -62,6 +62,8 @@ in { postPatch = '' substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X + # https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5 + substituteInPlace Makefile --replace libva libva-x11 ''; src = fetchFromGitHub { diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index b046fbebaa260..d52feb8a66b05 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses , libjpeg @@ -19,10 +20,11 @@ }: stdenv.mkDerivation rec { - name = "xawtv-3.107"; + pname = "xawtv"; + version = "3.107"; src = fetchurl { - url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2"; sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index e0cca04098786..06dc6bb465cc2 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,12 +1,26 @@ -{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 -, scrollkeeper, libglade, libXmu, libX11, libXext, gettext -, lame, libXfixes, libXdamage }: +{ lib +, stdenv +, fetchurl +, perlPackages +, pkg-config +, gtk2 +, scrollkeeper +, libglade +, libXmu +, libX11 +, libXext +, gettext +, lame +, libXfixes +, libXdamage +}: -stdenv.mkDerivation { - name = "xvidcap-1.1.7"; +stdenv.mkDerivation rec { + pname = "xvidcap"; + version = "1.1.7"; src = fetchurl { - url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; + url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; @@ -14,8 +28,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gtk2 scrollkeeper - libglade libXmu gettext lame libXdamage libXfixes libXext libX11 + gtk2 + scrollkeeper + libglade + libXmu + gettext + lame + libXdamage + libXfixes + libXext + libX11 ] ++ (with perlPackages; [ perl XMLParser ]); # !!! don't know why this is necessary @@ -24,7 +46,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; - license = lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 54378dbe13d3f..7adcd328add7d 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -31,7 +31,7 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" + lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index f144ec976779e..33b2b000cbfcf 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -18,11 +18,11 @@ let arion = justStaticExecutables ( overrideCabal - arion-compose cabalOverrides + arion-compose ); - inherit (haskell.lib) justStaticExecutables overrideCabal; + inherit (haskell.lib.compose) justStaticExecutables overrideCabal; inherit (haskellPackages) arion-compose; diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index e311be68ab8cc..e059a254cb97e 100644 --- a/pkgs/applications/virtualization/catatonit/default.nix +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: stdenv.mkDerivation rec { pname = "catatonit"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "openSUSE"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hokG6o7toZxU984EvIlne33Aa2EZVZ3qu1jTZMm5nt4="; + sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4="; }; + patches = [ + # Pull the fix pending upstream inclusion to support automake-1.16.5: + # https://github.com/openSUSE/catatonit/pull/18 + (fetchpatch { + name = "automake-1.16.5.patch"; + url = "https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec.patch"; + sha256 = "sha256-ooxVjtWXJddQiBvO9I5aRyLeL8y3ecxW/Kvtfg/bpRA="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index bc7e25d93dd7f..75a3dbf374625 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc="; + sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index c91bf3d142aba..2f09c3a29c774 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-7YDU7H4dVT6qI+Gt3bkm7vqHlU0Fr7ZhF4SWcA+RhYw="; + sha256 = "sha256-c0jXhqYdEpt4De1Z6VNwyrv0KJcf039Wp3ye0oTW0Qc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 277c06438f531..ebfaac0bde1fa 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.0"; + version = "1.37.2"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1gxbgn61qv4zhzxwdd917hywwicr3jand34ghjzha35r44lmyzgz"; + sha256 = "1svhi9xf71zrk843bnwkpmq4iaaln07dpfrdvq0vdqhj5xvbx47g"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index cf6395c8a53bf..75cf99caf861f 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,29 +1,30 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "win-pvdrivers-git-20150701"; - version = "20150701"; +stdenv.mkDerivation { + pname = "win-pvdrivers"; + version = "unstable-2015-07-01"; - src = fetchgit { - url = "https://github.com/ts468/win-pvdrivers"; + src = fetchFromGitHub { + owner = "ts468"; + repo = "win-pvdrivers"; rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a"; sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106"; }; buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]); installPhase = '' mkdir -p $out cp -r x86 $out/. cp -r amd64 $out/. - ''; + ''; meta = with lib; { description = "Xen Subproject: Windows PV Driver"; homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 7c1eb0055a30a..a4cd8dacc449e 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, p7zip }: -stdenv.mkDerivation { - name = "win-qemu-0.1.105-1"; +stdenv.mkDerivation rec { + pname = "win-qemu"; version = "0.1.105-1"; dontUnpack = true; src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso"; + url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; }; buildPhase = '' ${p7zip}/bin/7z x $src - ''; + ''; installPhase = let @@ -23,10 +23,10 @@ stdenv.mkDerivation { mkdir -p $out/${arch}/qemuagent cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; + ''; copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); + (copy "amd64" "w8.1") + (copy "x86" "w8.1"); meta = with lib; { description = "Windows QEMU Drivers"; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index e9ad3b8633868..ef8ec062e4d88 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -12,8 +12,8 @@ let }; in -stdenv.mkDerivation { - name = "gplpv-0.11.0.373"; +stdenv.mkDerivation { + pname = "gplpv"; version = "0.11.0.373"; dontUnpack = true; @@ -23,13 +23,13 @@ stdenv.mkDerivation { (cd x86; ${p7zip}/bin/7z e ${src_x86}) mkdir -p amd64 (cd amd64; ${p7zip}/bin/7z e ${src_amd64}) - ''; + ''; installPhase = '' mkdir -p $out/x86 $out/amd64 cp x86/* $out/x86/. cp amd64/* $out/amd64/. - ''; + ''; meta = with lib; { description = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation { Windows to be para-virtualized. The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. - ''; + ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 9b6c412fa2110..cb45f5b7a8277 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJZg3uX++gU65bO1uqJblXXcVPzFXROCWFTn/gfkea0="; + sha256 = "sha256-HVWZ0XF1oBUHhkOQHELlZ/pxXUsUo2cVo6EhZl6S0W4="; }; - vendorSha256 = "sha256-+fx/Iy78gmhxRjXPkHYdixpaMkOwEANUsZA+KSdQkWU="; + vendorSha256 = "sha256-LhmZRa7vDylA4DRTfKFRs3lQMnwNfzF1H6ki1/zdpUg="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 705e5b5d61111..0f12d11cc381f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-+6ALwm1Hc76rYwlQN0r8zX2n+nxBk5iW4AHWBlzAIOc="; + sha256 = "sha256-VkKFlOm5r+a9+4em1oisjXNwK9mCCCPViql6g0O7PWw="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8ac00d1f8e158..c7a3620d644ed 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { - name = "qboot-20200423"; + pname = "qboot"; + version = "unstable-2020-04-23"; src = fetchFromGitHub { owner = "bonzini"; @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4e0f459ac287f..a8a18692b9ee1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,11 +18,12 @@ , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid -, openGLSupport ? sdlSupport, mesa, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true +, uringSupport ? stdenv.isLinux, liburing , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -74,10 +75,11 @@ stdenv.mkDerivation rec { ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] - ++ lib.optionals openGLSupport [ mesa epoxy libdrm ] + ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] - ++ lib.optionals smbdSupport [ samba ]; + ++ lib.optionals smbdSupport [ samba ] + ++ lib.optionals uringSupport [ liburing ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -97,12 +99,27 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch - ++ lib.optionals stdenv.hostPlatform.isMusl [ + # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests + # on some systems. Remove with next release. + (fetchpatch { + name = "fix-crash-in-v9fs_walk.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; + sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; + }) + # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; - sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; + name = "fix-aio-discard-return-value.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; + sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; }) + # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. + (fetchpatch { + name = "qxl-fix-pre-save-logic.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; + sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; + }) + ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch + ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; @@ -178,7 +195,8 @@ stdenv.mkDerivation rec { ++ lib.optional virglSupport "--enable-virglrenderer" ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" - ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"; + ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" + ++ lib.optional uringSupport "--enable-linux-io-uring"; doCheck = false; # tries to access /dev dontWrapGApps = true; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 37fad321cadaa..e8d78c5bb4a13 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU="; + sha256 = "sha256-y5Xm1osNIPK4fWDyOjv3B7fT6HzuDdSqQ4D49IGlfrw="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 98c7f80df8ad5..128753f26433f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,24 +2,24 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll +, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). -, open-watcom-bin ? null +, open-watcom-bin , makeself, perl -, javaBindings ? true, jdk ? null # Almost doesn't affect closure size -, pythonBindings ? false, python3 ? null -, extensionPack ? null, fakeroot ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, javaBindings ? true, jdk # Almost doesn't affect closure size +, pythonBindings ? false, python3 +, extensionPack ? null, fakeroot +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true +, enableWebService ? false }: with lib; let - python = python3; buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. @@ -41,22 +41,23 @@ in stdenv.mkDerivation { # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = - [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libpng libopus python ] + buildInputs = [ + acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + libcap glib lvm2 alsa-lib curl libvpx pam makeself perl + libXmu libpng libopus python3 ] ++ optional javaBindings jdk - ++ optional pythonBindings python # Python is needed even when not building bindings + ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libGL ] - ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]; + ++ optionals headless [ libXrandr libGL ] + ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ] + ++ optionals enableWebService [ gsoap zlib ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ - -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ + -e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ @@ -133,6 +134,10 @@ in stdenv.mkDerivation { PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} + ${optionalString enableWebService '' + # fix gsoap missing zlib include and produce errors with --as-needed + VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + ''} LOCAL_CONFIG ./configure \ @@ -142,6 +147,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${optionalString enableWebService "--enable-webservice"} \ ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ @@ -168,7 +174,7 @@ in stdenv.mkDerivation { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -176,14 +182,14 @@ in stdenv.mkDerivation { ${optionalString (extensionPack != null) '' mkdir -p "$share" - "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER + "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EOF "$libexec/VBoxExtPackHelperApp" install \ --base-dir "$share/ExtensionPacks" \ --cert-dir "$share/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" - EXTHELPER + EOF ''} ${optionalString (!headless) '' diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index c7ae9482840b6..7e79d963fc298 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.9.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-O+lab3K7J2Zz9t+yB/kYWtBOvQGOQMDFNDUVXzTj/h4="; + sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index ec7d3ae5004d0..ac6ba4e0bf29e 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; }) + + # Fix pending upstream inclusion for binutils-2.36 support: + # https://github.com/afterstep/afterstep/pull/7 + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; + sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8"; + }) ]; postPatch = '' diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 84380bfc9d861..df7521cd2c414 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: -stdenv.mkDerivation { - name = "dzen2-0.9.5"; +stdenv.mkDerivation rec { + pname = "dzen2"; + version = "0.9.5"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { - url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; + url = "https://github.com/robm/dzen/tarball/master/dzen2-${version}git.tar.gz"; sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556"; }; diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 7028dcfc09dc5..37a4f7c943616 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.23"; + version = "1.0.24"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - sha256 = "028rn1plggacsvdd035qnnph4xw8nya34mmjvvl7d4gqj9pj293f"; + sha256 = "1anmwfjyynwl0ylkyksa7bnsqzf58l1yccjzp3kbwq6nw1gs7dbv"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 94562cd0d224b..0855e512fd8ee 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, - xorgproto, patches ? [] }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXext +, libXrandr +, libXrender +, xorgproto +, patches ? [ ] +}: stdenv.mkDerivation rec { - name = "evilwm-1.1.1"; + pname = "evilwm"; + version = "1.1.1"; src = fetchurl { - url = "http://www.6809.org.uk/evilwm/${name}.tar.gz"; + url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a"; }; - buildInputs = [ libX11 libXext libXrandr libXrender - xorgproto ]; + buildInputs = [ + libX11 + libXext + libXrandr + libXrender + xorgproto + ]; - prePatch = ''substituteInPlace ./Makefile --replace /usr $out \ - --replace "CC = gcc" "#CC = gcc"''; + postPatch = '' + substituteInPlace ./Makefile \ + --replace /usr $out \ + --replace "CC = gcc" "#CC = gcc" + ''; # Allow users set their own list of patches inherit patches; @@ -21,14 +38,12 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.6809.org.uk/evilwm/"; description = "Minimalist window manager for the X Window System"; - license = { shortName = "evilwm"; fullName = "Custom, inherited from aewm and 9wm"; url = "http://www.6809.org.uk/evilwm/"; free = true; - }; # like BSD/MIT, but Share-Alike'y; See README. - + }; # like BSD/MIT, but Share-Alike'y; See README. maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; }; diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index 08160690dcbcb..a987c6c2e0e5d 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -5,6 +5,7 @@ , gtk3 , withWayland ? false , gtk-layer-shell +, stdenv }: rustPlatform.buildRustPackage rec { @@ -24,10 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell; - cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [ - "--no-default-features" - "--features=wayland" - ]; + buildNoDefaultFeatures = withWayland; + buildFeatures = lib.optional withWayland "wayland"; + + cargoBuildFlags = [ "--bin" "eww" ]; cargoTestFlags = cargoBuildFlags; @@ -39,5 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/elkowar/eww"; license = licenses.mit; maintainers = with maintainers; [ figsoda legendofmiracles ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 0d07ce4e8d1ab..0617e85723987 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config makeWrapper meson ninja installShellFiles + pkg-config makeWrapper meson ninja installShellFiles perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs ]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 8ab8c5630d092..6884e5ea7a1c5 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.19.1"; + version = "4.20"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug="; + sha256 = "sha256-D16wMwCabEOG0AfAhohwcCHeUSvVF93i3zT/yu0FCu8="; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 7e42a8efd7e92..9a1b959690a2c 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk -, i3lock-color, getopt, fontconfig +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, scrot +, imagemagick +, gawk +, i3lock-color +, getopt +, fontconfig }: stdenv.mkDerivation rec { - rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; - name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; + pname = "i3lock-fancy"; + version = "unstable-2018-11-25"; + src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; - inherit rev; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; - patchPhase = '' - sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy - sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy - sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy - sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy - sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy + + postPatch = '' + sed -i i3lock-fancy \ + -e "s|mktemp|${coreutils}/bin/mktemp|" \ + -e "s|'rm -f |'${coreutils}/bin/rm -f |" \ + -e "s|scrot -z |${scrot}/bin/scrot -z |" \ + -e "s|convert |${imagemagick.out}/bin/convert |" \ + -e "s|awk -F|${gawk}/bin/awk -F|" \ + -e "s| awk | ${gawk}/bin/awk |" \ + -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \ + -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \ + -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \ + -e "s|getopt |${getopt}/bin/getopt |" \ + -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \ + -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" rm Makefile ''; + installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; + meta = with lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index edb482ad15f09..a285c4b5a54a5 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,25 +12,25 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.4"; + version = "0.20.6"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lohMrsMCAnb2p7H+xfa24Wx3LEFxCAlGHfP9A70Hg48="; + sha256 = "sha256-FLMfXloAAIz/9KAtKFfB8uokQz/J8R+WsGarq/5cblo="; }; - cargoSha256 = "sha256-pe96VNTH49qgQ4yxKcAcQPN31W2k1mD9TdhNKBp4x5Q="; + cargoSha256 = "sha256-UVAF2rz0y6h3/rcTJ+31mMyJDLG7q40n6vBK8Wxultg="; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ dbus libpulseaudio notmuch openssl ]; - cargoBuildFlags = [ - "--features=notmuch" - "--features=maildir" - "--features=pulseaudio" + buildFeatures = [ + "notmuch" + "maildir" + "pulseaudio" ]; prePatch = '' diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 8e9cb2d2b76f4..bbbad532d0968 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "i3status-2.13"; + pname = "i3status"; + version = "2.13"; src = fetchurl { - url = "https://i3wm.org/i3status/${name}.tar.bz2"; + url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2"; sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6756afb4a5c5b..9c33c555353c3 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 # users. - cargoBuildFlags = [ "--features i3" ]; + buildFeatures = [ "i3" ]; meta = with lib; { description = "Visually focus windows by label"; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 8f172ac870036..45d56194bede9 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,18 +1,30 @@ { lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: -stdenv.mkDerivation { - name = "ion-3-20090110"; - meta = { - description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = "http://modeemi.fi/~tuomov/ion"; - platforms = with lib.platforms; linux; - license = lib.licenses.lgpl21; - }; +stdenv.mkDerivation rec { + pname = "ion"; + version = "3-20090110"; + src = fetchurl { - url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; + url = "https://tuomov.iki.fi/software/ion/dl/ion-${version}.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; + buildInputs = [ xlibsWrapper lua gettext groff ]; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + + # Build system is missing depends for autogenerated export headers: + # luac -o mod_tiling.lc mod_tiling.lua + # main.c:21:10: fatal error: exports.h: No such file or directory + enableParallelBuilding = false; + installFlags = [ "PREFIX=\${out}" ]; + + meta = with lib; { + description = "Tiling tabbed window manager designed with keyboard users in mind"; + homepage = "http://modeemi.fi/~tuomov/ion"; + platforms = with platforms; linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch deleted file mode 100644 index f7b6a4cb9f16f..0000000000000 --- a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 347d325..dce95a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -489,7 +489,8 @@ fi - ############################################################################ - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.19]) -+AM_GNU_GETTEXT_VERSION([0.19.6]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) - LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" - - ############################################################################ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3c97c5630b08e..2c9461d6388b8 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,21 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { pname = "jwm"; - version = "1685"; + version = "2.4.0"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; - rev = "s${version}"; - sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; + rev = "v${version}"; + sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; }; - patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - - nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; buildInputs = [ libX11 @@ -38,12 +36,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; - license = lib.licenses.gpl2; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e9d400378e629..ce212b1c682be 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: -stdenv.mkDerivation { - name = "larswm-7.5.3"; +stdenv.mkDerivation rec { + pname = "larswm"; + version = "7.5.3"; src = fetchurl { - url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; + url = "mirror://sourceforge/larswm/larswm-${version}.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 0124261e423f0..d24abb68fb7e7 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { libXft libXpm libXrandr libXrender xorgproto libXinerama ]; src = fetchurl { - url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; + url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j"; }; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 0a16bfc8842b5..2971bdeb57c1c 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; + sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix new file mode 100644 index 0000000000000..88b00c2731db9 --- /dev/null +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -0,0 +1,13 @@ +{ picom, lib, fetchFromGitHub }: + +picom.overrideAttrs (oldAttrs: rec { + pname = "picom-next"; + version = "unstable-2021-11-19"; + src = fetchFromGitHub { + owner = "yshui"; + repo = "picom"; + rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce"; + sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw="; + }; + meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; +}) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 786a47d49c344..c831bc6907e78 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python3, mypy, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { @@ -47,6 +47,14 @@ let psutil pyxdg pygobject3 + pywayland + pywlroots + xkbcommon + ]; + + # for `qtile check`, needs `stubtest` and `mypy` commands + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ mypy ]}" ]; doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index ff253b951b845..e59ce5449e2cc 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-11-01"; + version = "0.1.0"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "363fd3f6a466004eec157a40e51684e56992b857"; - sha256 = "sha256-RzReUo1p2z4UQaO5n6PKQlEv0vTBGg+1Wq1UIYii0Mo="; + rev = "v${version}"; + sha256 = "03pdgrcpj8db9s14249815z76dyjwwma8xv6p9hpw79flk6rk7v7"; fetchSubmodules = true; }; @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ wayland-protocols wlroots - pixman libxkbcommon pixman udev diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index fb0cb31fad578..782bd360d730a 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,19 +22,22 @@ stdenv.mkDerivation rec { }; patches = [ - ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch (substituteAll { src = ./fix-paths.patch; inherit swaybg; }) + ] ++ lib.optionals (!isNixOS) [ + # References to /nix/store/... will get GC'ed which causes problems when + # copying the default configuration: + ./sway-config-no-nix-store-references.patch + ] ++ lib.optionals isNixOS [ + # Use /run/current-system/sw/share and /etc instead of /nix/store + # references: + ./sway-config-nixos-paths.patch ]; - postPatch = lib.optionalString isNixOS '' - echo -e '\ninclude /etc/sway/config.d/*' >> config.in - ''; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ]; @@ -47,7 +50,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dsd-bus-provider=libsystemd" ] ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" diff --git a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch b/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch new file mode 100644 index 0000000000000..bbb0f722b8bc2 --- /dev/null +++ b/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +index 08703bef..f3872730 100644 +--- a/config.in ++++ b/config.in +@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) ++output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -214,4 +214,4 @@ bar { + } + } + +-include @sysconfdir@/sway/config.d/* ++include /etc/sway/config.d/* diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 2eeae7f4da5ed..7366ff1969542 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,9 +1,8 @@ -{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: - -with lib; +{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }: stdenv.mkDerivation { - name = "tabbed-20180310"; + pname = "tabbed"; + version = "unstable-2018-03-10"; src = fetchgit { url = "https://git.suckless.org/tabbed"; @@ -23,7 +22,7 @@ stdenv.mkDerivation { "PREFIX=$(out)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index c210b39fe181c..57cf0fc93fac1 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.8"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gdk-pixbuf gtk2 ]; + pname = "trayer"; + version = "1.1.8"; src = fetchFromGitHub { owner = "sargon"; repo = "trayer-srg"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg"; }; - preConfigure = '' + postPatch = '' patchShebangs configure ''; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gdk-pixbuf gtk2 ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 9eea18f79d602..7c47eb9c4d998 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,11 +1,21 @@ -{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, -libvterm}: +{ lib +, stdenv +, fetchurl +, ncurses +, pkg-config +, glib +, libviper +, libpseudo +, gpm +, libvterm +}: stdenv.mkDerivation rec { - name = "vwm-2.1.3"; + pname = "vwm"; + version = "2.1.3"; src = fetchurl { - url = "mirror://sourceforge/vwm/${name}.tar.gz"; + url = "mirror://sourceforge/vwm/vwm-${version}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; }; |