diff options
Diffstat (limited to 'pkgs/applications')
427 files changed, 9549 insertions, 5195 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 24cc45a3aaf..7b527139e91 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.1.6"; + version = "4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-Q4YYdMUd/T8tGGcakhoLdHvWsHwOq7LgIb77sr2OWuQ="; + sha256 = "sha256-hIIEVj5sM/NdhBiwerFvyIXqj0R8EvcxwM6UZ0CE428="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 45482c4de00..c5f3cfe5b68 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -78,13 +78,13 @@ let in mkDerivation rec { pname = "cantata"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; + sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw="; }; patches = [ diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix new file mode 100644 index 00000000000..9200a36f9f3 --- /dev/null +++ b/pkgs/applications/audio/cardinal/default.nix @@ -0,0 +1,76 @@ +{ + stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, fetchzip +, freetype +, jansson +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXrandr +, libarchive +, liblo +, libsamplerate +, mesa +, pkg-config +, python3 +, speexdsp +}: + +stdenv.mkDerivation rec { + name = "cardinal-${version}"; + version = "22.02"; + + src = fetchurl { + url = + "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; + sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + }; + + patches = [ + # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 + (fetchpatch { + url = + "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; + sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; + }) + ]; + + prePatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + jansson + libGL + libX11 + libXcursor + libXext + libXrandr + libXrandr + libarchive + liblo + libsamplerate + mesa + python3 + speexdsp + ]; + + makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + + meta = { + description = "Plugin wrapper around VCV Rack"; + homepage = "https://github.com/DISTRHO/cardinal"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ab3267eae7f..ebcdb8f4290 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.16.2"; + version = "6.17.0"; hardeningDisable = [ "format" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE="; + sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; - homepage = "http://www.csounds.com/"; - license = licenses.gpl2; + homepage = "https://csound.com/"; + license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 23ca109c6b4..de4b7a3176f 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM="; + sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix new file mode 100644 index 00000000000..e7794175ac9 --- /dev/null +++ b/pkgs/applications/audio/furnace/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, nix-update-script +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, makeWrapper +, fmt_8 +, libsndfile +, SDL2 +, zlib +, withJACK ? stdenv.hostPlatform.isUnix +, libjack2 +, withGUI ? true +, Cocoa +}: + +stdenv.mkDerivation rec { + pname = "furnace"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "tildearrow"; + repo = "furnace"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-BcaPQuDFkAaxFQKwoI6xdSWcyHo5VsqZcwf++JISqRs="; + }; + + patches = [ + (fetchpatch { + name = "0001-furnace-fix-wrong-include-path.patch"; + url = "https://github.com/tildearrow/furnace/commit/456db22f9d9f0ed40d74fe50dde492e69e901fcc.patch"; + sha256 = "17ikb1z9ldm7kdj00m4swsrq1qx94vlzhc6h020x3ryzwnglc8d3"; + }) + ]; + + postPatch = '' + # rtmidi is not used yet + sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ]; + + buildInputs = [ + fmt_8 + libsndfile + SDL2 + zlib + ] ++ lib.optionals withJACK [ + libjack2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; + + cmakeFlags = [ + "-DBUILD_GUI=${if withGUI then "ON" else "OFF"}" + "-DSYSTEM_FMT=ON" + "-DSYSTEM_LIBSNDFILE=ON" + "-DSYSTEM_ZLIB=ON" + "-DSYSTEM_SDL2=ON" + "-DWITH_JACK=${if withJACK then "ON" else "OFF"}" + "-DWARNINGS_ARE_ERRORS=ON" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a + # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access + # to /usr/bin/hdiutil). So we'll manually assemble & install everything instead. + + mkdir -p $out/{Applications/Furnace.app/Contents/{MacOS,Resources},share/{,doc,licenses}/furnace} + mv $out/{bin,Applications/Furnace.app/Contents/MacOS}/furnace + makeWrapper $out/{Applications/Furnace.app/Contents/MacOS,bin}/furnace + + install -m644 {../res,$out/Applications/Furnace.app/Contents}/Info.plist + install -m644 ../res/icon.icns $out/Applications/Furnace.app/Contents/Resources/Furnace.icns + install -m644 {..,$out/share/licenses/furnace}/LICENSE + cp -r ../papers $out/share/doc/furnace/ + cp -r ../demos $out/share/furnace/ + ''; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Multi-system chiptune tracker compatible with DefleMask modules"; + homepage = "https://github.com/tildearrow/furnace"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index cd5e476b884..6db530a2c23 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.17"; + version = "3.10.21"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; + sha256 = "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1"; }; patches = [ @@ -42,7 +42,10 @@ python3Packages.buildPythonApplication rec { ]; checkInputs = with python3Packages; [ - coverage minimock + minimock + pytest + pytest-httpserver + pytest-cov ]; doCheck = true; @@ -51,6 +54,7 @@ python3Packages.buildPythonApplication rec { feedparser dbus-python mygpoclient + requests pygobject3 eyeD3 podcastparser @@ -69,7 +73,8 @@ python3Packages.buildPythonApplication rec { ''; installCheckPhase = '' - LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder ''; meta = with lib; { diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/applications/audio/gpodder/disable-autoupdate.patch index 8f77518d03e..c7c81761328 100644 --- a/pkgs/applications/audio/gpodder/disable-autoupdate.patch +++ b/pkgs/applications/audio/gpodder/disable-autoupdate.patch @@ -11,41 +11,20 @@ </section> <section> <item> -@@ -201,4 +197,4 @@ - </submenu> - </menu> - </interface> --<!-- :noTabs=true:tabSize=2:indentSize=2: --> -\ No newline at end of file -+<!-- :noTabs=true:tabSize=2:indentSize=2: --> --- a/src/gpodder/config.py +++ b/src/gpodder/config.py -@@ -91,13 +91,6 @@ - 'retries': 3, # number of retries when downloads time out - }, +@@ -94,7 +94,7 @@ -- # Software updates from gpodder.org -- 'software_update': { + # Software updates from gpodder.org + 'software_update': { - 'check_on_startup': True, # check for updates on start -- 'last_check': 0, # unix timestamp of last update check -- 'interval': 5, # interval (in days) to check for updates -- }, -- - 'ui': { - # Settings for the Command-Line Interface - 'cli': { ++ 'check_on_startup': False, # check for updates on start + 'last_check': 0, # unix timestamp of last update check + 'interval': 5, # interval (in days) to check for updates + }, --- a/src/gpodder/gtkui/main.py +++ b/src/gpodder/gtkui/main.py -@@ -224,7 +224,7 @@ - util.idle_add(self.subscribe_to_url, self.options.subscribe) - elif not self.channels: - self.on_itemUpdate_activate() -- elif self.config.software_update.check_on_startup: -+ elif False and self.config.software_update.check_on_startup: - # Check for software updates from gpodder.org - diff = time.time() - self.config.software_update.last_check - if diff > (60 * 60 * 24) * self.config.software_update.interval: -@@ -3288,6 +3288,7 @@ +@@ -3445,6 +3445,7 @@ If silent=False, a message will be shown even if no updates are available (set silent=False when the check is manually triggered). """ diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix new file mode 100644 index 00000000000..cfb9deb5872 --- /dev/null +++ b/pkgs/applications/audio/jellycli/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildGoModule, alsa-lib }: + +buildGoModule rec { + pname = "jellycli"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tryffel"; + repo = "jellycli"; + rev = "v${version}"; + sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys"; + }; + + vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy"; + + patches = [ + # Fixes log file path for tests. + ./fix-test-dir.patch + ]; + + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Jellyfin terminal client"; + longDescription = '' + Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and + Subsonic comptabile servers (API >= 1.16), e.g., Navidrome. + ''; + homepage = "https://github.com/tryffel/jellycli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/applications/audio/jellycli/fix-test-dir.patch new file mode 100644 index 00000000000..83cacfe9af0 --- /dev/null +++ b/pkgs/applications/audio/jellycli/fix-test-dir.patch @@ -0,0 +1,13 @@ +diff --git a/config/config_test.go b/config/config_test.go +index 9f63a7e..7e790b8 100644 +--- a/config/config_test.go ++++ b/config/config_test.go +@@ -110,7 +110,7 @@ func TestInitEmptyConfig(t *testing.T) { + Subsonic: Subsonic{}, + Player: Player{ + Server: "jellyfin", +- LogFile: "/tmp/jellycli.log", ++ LogFile: "/build/jellycli.log", + LogLevel: "info", + AudioBufferingMs: 150, + HttpBufferingS: 5, diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index 92b75414785..9f393a0e752 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -2,24 +2,33 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.2"; + version = "0.3.5"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YTMusic"; - sha256 = "sha256-BZtW+qHsTnOMj+jdAFI8ZMwGxJc9lNosgPJZGbt4JgU="; + sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0' + ''; + propagatedBuildInputs = [ mopidy python3Packages.ytmusicapi python3Packages.pytube ]; + pythonImportsCheck = [ "mopidy_ytmusic" ]; + + # has no tests doCheck = false; meta = with lib; { description = "Mopidy extension for playing music from YouTube Music"; + homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; maintainers = [ maintainers.nickhu ]; }; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 3ecfde7819f..b4f450b3101 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.07"; + version = "6.2.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY="; + sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA="; }; configurePhase = '' diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix new file mode 100644 index 00000000000..d2d4927c113 --- /dev/null +++ b/pkgs/applications/audio/psst/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "psst"; + version = "unstable-2022-01-25"; + + src = fetchFromGitHub { + owner = "jpochyla"; + repo = pname; + rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; + sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + }; + + cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + # specify the subdirectory of the binary crate to build from the workspace + buildAndTestSubdir = "psst-gui"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + cairo + dbus + gdk-pixbuf + glib + gtk3 + pango + ]; + + meta = with lib; { + description = "Fast and multi-platform Spotify client with native GUI"; + homepage = "https://github.com/jpochyla/psst"; + license = licenses.mit; + maintainers = [ maintainers.vbrandl ]; + }; +} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index a44dd941c57..57c327d429d 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.40"; + version = "1.42"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-0qEhhkprIpseCEFStgJ0035TX0e9s271BK/1hVkn/JU="; + sha256 = "sha256-CwnEvQsxrYStJ4RxnE0lHt1fBHQEZrjSldnQnTOPaE0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index efa1d943610..701e6fffbbb 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,26 +1,62 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +# As of 2.1, puddletag has started pinning versions of all dependencies that it +# was built against which is an issue as the chances of us having the exact same +# versions in nixpkgs are slim to none. +# +# There is a difference between explicit and implicit version requirements and +# we should be able to safely ignore the latter. Therefore use requirements.in +# which contains just the explicit version dependencies instead of +# requirements.txt. +# +# Additionally, we do need to override some of the explicit requirements through +# `overrideVersions`. While we technically run the risk of breaking something by +# ignoring the pinned versions, it's just something we will have to accept +# unless we want to vendor those versions. + +let + # NOTE: check if we can drop any of these overrides when bumping the version + overrideVersions = [ + "pyparsing" + "pyqt5" + ]; + +in python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "keithgg"; + owner = "puddletag"; repo = "puddletag"; rev = version; - sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; + hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM="; }; - sourceRoot = "source/source"; + postPatch = '' + substituteInPlace setup.py \ + --replace share/pixmaps share/icons + + cp requirements.in requirements.txt + '' + lib.concatMapStringsSep "\n" + (e: '' + sed -i requirements.txt -e 's/^${e}.*/${e}/' + '') + overrideVersions; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ + propagatedBuildInputs = with python3Packages; [ + pyacoustid + chromaprint configobj + levenshtein + lxml mutagen pyparsing pyqt5 - ]); + rapidfuzz + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -33,8 +69,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg dschrempf ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index e95e5d9c6d1..ebddac8c539 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.14"; + version = "0.8.9.15"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "sha256-9q+YsQPFB7Ql5WnXvPj100cD7pGkmr1hHztqbpZStt8="; + sha256 = "sha256-r4T7t8Q46N59jqTkvdKBo6tffkrOYhoO/CZWvkBHOAQ="; }; checkPhase = '' diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index c92e9cf7a46..860eca652e7 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw="; + sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index fae8700d811..b02ab65cd87 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; - sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8"; + sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix new file mode 100644 index 00000000000..c0966e9ab3f --- /dev/null +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -0,0 +1,85 @@ +{ lib, fetchurl +# Optional due to unfree license. +, faacSupport ? false +, glib, python3Packages, gtk3, wrapGAppsHook +, gsettings-desktop-schemas, intltool, xvfb-run +, gobject-introspection, gst_all_1, fdk-aac-encoder }: + +python3Packages.buildPythonApplication rec { + pname = "soundconverter"; + version = "4.0.3"; + + src = fetchurl { + url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + }; + + buildInputs = [ + gtk3 + fdk-aac-encoder + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-bad.override { inherit faacSupport; }) + ]; + + nativeBuildInputs = [ + intltool + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + python3Packages.gst-python + python3Packages.distutils_extra + python3Packages.setuptools + python3Packages.pygobject3 + ]; + + checkInputs = [ + xvfb-run + ]; + + postPatch = '' + substituteInPlace bin/soundconverter --replace \ + "DATA_PATH = os.path.join(SOURCE_PATH, 'data')" \ + "DATA_PATH = '$out/share/soundconverter'" + ''; + + preCheck = let + self = { outPath = "$out"; name = "${pname}-${version}"; }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run python tests/test.py + runHook postCheck + ''; + + # Necessary to set GDK_PIXBUF_MODULE_FILE. + strictDeps = false; + + meta = with lib; { + homepage = "https://soundconverter.org/"; + description = "Leading audio file converter for the GNOME Desktop"; + longDescription = '' + SoundConverter reads anything the GStreamer library can read, + and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. + Uses Python and GTK+ GUI toolkit, and runs on X Window System. + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ jakubgs ]; + }; +} diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index fa9860ab248..3ec2cda4280 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv -, fetchgit +{ lib +, stdenv +, fetchFromGitHub , autoreconfHook , help2man , pkg-config @@ -11,24 +12,25 @@ , boost , ecasound , glibcLocales -, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU +, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation { - pname = "soundscape-renderer-unstable"; + pname = "soundscape-renderer"; + version = "unstable-2016-11-03"; - version = "2016-11-03"; - - src = fetchgit { - url = "https://github.com/SoundScapeRenderer/ssr"; + src = fetchFromGitHub { + owner = "SoundScapeRenderer"; + repo = "ssr"; rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; - sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs="; }; # Without it doesn't find all of the boost libraries. - BOOST_LIB_DIR="${boost}/lib"; + BOOST_LIB_DIR = "${boost}/lib"; # uses the deprecated get_generic_category() in boost_system - NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; + NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 1d53c2f4cea..2ec9562c620 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sptlrx"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "raitonoberu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk="; + sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE="; }; - vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08="; + vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 31fe69b00de..5fc0d6f4200 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,39 +1,50 @@ -{ lib, stdenv, fetchFromGitHub -, alsa-lib, flac, libmad, libvorbis, mpg123 +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, flac +, libmad +, libpulseaudio +, libvorbis +, mpg123 +, audioBackend ? "alsa" , dsdSupport ? true -, faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg -, opusSupport ? true, opusfile -, resampleSupport ? true, soxr -, sslSupport ? true, openssl +, faad2Support ? true +, faad2 +, ffmpegSupport ? true +, ffmpeg +, opusSupport ? true +, opusfile +, resampleSupport ? true +, soxr +, sslSupport ? true +, openssl }: let - concatStringsSep = lib.concatStringsSep; - optional = lib.optional; - opts = [ "-DLINKALL" ] - ++ optional dsdSupport "-DDSD" - ++ optional (!faad2Support) "-DNO_FAAD" - ++ optional ffmpegSupport "-DFFMPEG" - ++ optional opusSupport "-DOPUS" - ++ optional resampleSupport "-DRESAMPLE" - ++ optional sslSupport "-DUSE_SSL"; + inherit (lib) optional optionalString; -in stdenv.mkDerivation { - pname = "squeezelite"; + pulseSupport = audioBackend == "pulse"; + binName = "squeezelite${optionalString pulseSupport "-pulse"}"; + +in +stdenv.mkDerivation { + # the nixos module uses the pname as the binary name + pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.6.1196"; + version = "1.9.9.1401"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0"; - sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b"; + hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU="; }; - buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] + buildInputs = [ flac libmad libvorbis mpg123 ] + ++ lib.singleton (if pulseSupport then libpulseaudio else alsa-lib) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile @@ -47,15 +58,22 @@ in stdenv.mkDerivation { --replace "<opusfile.h>" "<opus/opusfile.h>" ''; - preBuild = '' - export OPTS="${concatStringsSep " " opts}" - ''; + EXECUTABLE = binName; + + OPTS = [ "-DLINKALL" ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional pulseSupport "-DPULSEAUDIO" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin squeezelite - install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + install -Dm555 -t $out/bin ${binName} + install -Dm444 -t $out/share/doc/squeezelite *.txt *.md runHook postInstall ''; @@ -63,7 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; - license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; + license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index b6a60c0de64..503079b9ed4 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "2.0c"; + version = "2.0e"; src = fetchurl { - url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "949e5348da9faa92ce17aac943b58027bdb797b65c7f5f365ef0610bb6dd8a3d"; + url = "https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; + sha256 = "sha256-v4dQnRr7pusOAHX8ytDChKixYxEIjg30vOTD6uA/S0o="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index a68ed3ceae5..ff9b6c679aa 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "vmpk"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-SPome4UKGOWQLT9RMoGZ0wUdwodG8mSIaGFCg0i5CmY="; + sha256 = "sha256-cwfJJVeUokyZI1iGvqBvXjcBR36VGodzrUx5Atv3POM="; }; nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 3d6f3aef9e1..0c80dda703e 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { libgee libnotify libunity - pantheon.elementary-icon-theme pantheon.granite sqlite webkitgtk @@ -73,6 +72,13 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fix build with vala 0.56 + # https://github.com/needle-and-thread/vocal/pull/503 + substituteInPlace src/Vocal.vala \ + --replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index dfb6a419c3d..fe9da33e5ca 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,33 +1,64 @@ -{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, boost +, cairo +, cmake +, fftwSinglePrec +, fltk +, libGLU +, libjack2 +, libsndfile +, libXdmcp +, lv2 +, minixml +, pcre +, pkg-config +, readline +, xorg +, zlib }: assert stdenv ? glibc; -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "yoshimi"; - # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38 - version = "unstable-2020-05-10"; + version = "2.1.2.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; - rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38"; - sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; + rev = version; + hash = "sha256-6YsA6tC94yJuuWp5rXXqHzqRy28tvmJzjOR92YwQYO0="; }; - buildInputs = [ - alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL - minixml zlib xorg.libpthreadstubs pcre - ]; - nativeBuildInputs = [ cmake pkg-config ]; + sourceRoot = "source/src"; - patchPhase = '' - substituteInPlace src/Misc/Config.cpp --replace /usr $out - substituteInPlace src/Misc/Bank.cpp --replace /usr $out + postPatch = '' + substituteInPlace Misc/Config.cpp --replace /usr $out + substituteInPlace Misc/Bank.cpp --replace /usr $out ''; - preConfigure = "cd src"; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + alsa-lib + boost + cairo + fftwSinglePrec + fltk + libGLU + libjack2 + libsndfile + libXdmcp + lv2 + minixml + pcre + readline + xorg.libpthreadstubs + zlib + ]; cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; @@ -38,8 +69,8 @@ stdenv.mkDerivation rec { ZynAddSubFX along with very good Jack and Alsa midi/audio functionality on Linux ''; - homepage = "http://yoshimi.sourceforge.net"; - license = licenses.gpl2; + homepage = "https://yoshimi.github.io/"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 2c8526c6292..28ce7512129 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80="; + sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA="; }; - cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0="; + cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 0e1e9f29112..869f8dcad05 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "154b8whbbpnb8lk1b3an44h53gh5fdzxkg5vdfrw1ld6miy68kii"; + sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 8500bbc993f..4a06592ce01 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-G6/juGBdiOc8Gh9pKFQlBfUDJzDFMd9gMtILeoF8SMk="; + sha256 = "sha256-Qz4BNrhK+NPnKBgjXGYl4P2R878LCuMGZxLECawA12E="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 207b42e5584..f912ef41677 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.11"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; + hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ="; }; postPatch = '' @@ -31,6 +31,7 @@ let chia = python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ + aiofiles aiohttp aiosqlite bitstring @@ -46,6 +47,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography + dnslib dnspythonchia fasteners keyrings-cryptfile @@ -55,6 +57,7 @@ let chia = python3Packages.buildPythonApplication rec { sortedcontainers watchdog websockets + zstd ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index df7eace3284..b58524d1eee 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , fetchurl , autoconf , automake @@ -27,16 +28,25 @@ stdenv.mkDerivation rec { sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; }; - nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; + # when building on darwin we need dawin.cctools to provide the correct libtool + # as libwally-core detects the host as darwin and tries to add the -static + # option to libtool, also we have to add the modified gsed package. + nativeBuildInputs = [ autogen autoconf automake gettext pkg-config py3 unzip which ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ] ++ [ libtool ]; buildInputs = [ gmp libsodium sqlite zlib ]; - postPatch = '' + # this causes some python trouble on a darwin host so we skip this step. + # also we have to tell libwally-core to use sed instead of gsed. + postPatch = if !stdenv.isDarwin then '' patchShebangs \ tools/generate-wire.py \ tools/update-mocks.sh \ tools/mockup.sh \ devtools/sql-rewrite.py + '' else '' + substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \ + substituteInPlace external/libwally-core/configure.ac --replace gsed sed ''; configureFlags = [ "--disable-developer" "--disable-valgrind" ]; @@ -56,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ElementsProject/lightning"; maintainers = with maintainers; [ jb55 prusnak ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 4928f363d70..f78c0fa3e35 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-6TR9OeIAVVbwDrshb9zHTS39x6taNWYK0UyRLbkW+g0="; + hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw="; }; - cargoHash = "sha256-taOrbtx74DICvPLrwym70X3pv7EBA/H22VZmlxefANM="; + cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 6c8d895e03a..be124d6f34d 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "0.21.0.1"; + version = "0.21.0.2"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-nZa5doiFQJhtK8cUUISTZhS61HzW7CMB9pPsWKc8Gac="; + sha256 = "sha256-5b3wylp9Z2U0ueu2gI9jGeWiiJoddjcjQ/6zkFATyvA="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 9c560b0fabc..22f2c970935 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2022.02.03"; + version = "2022.02.04"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M8rCLkKoCx+5Eg53HfK6Ui4UrYsujGd7G8ckONclhTM="; + sha256 = "sha256-86a1VtVyTRKpY41fAHskUfPZpXUutpyvxlRLhkiHTZ0="; }; - vendorSha256 = "sha256-loYo1nAR1lARsfoY5Q+k/tgVBxNxcr++zwUjLN3TRLA="; + vendorSha256 = "sha256-P3jdK+ubBHusTL4eWlA/TDJIrbuV17tL8Cv6c3ubjlc="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 3660aebef70..d13278b7dee 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.2.11"; + version = "22.2.25"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-/K5dB5Qfaiv68YWTQ4j5QnqSo+TXPkWcQ+PlJpzDoe8="; + sha256 = "sha256-YbApI9rIk1653Hp3hsXJrxBMpaGn6Wv3WhZiQWAfPQM="; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 297eca24542..6dc644fbb96 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.38.3"; + version = "2.39.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-svNsVdenolrfMGKJvB/8HQMq08Ov5Oe5QooI1jFAcbI="; + hash = "sha256-zVefF5CsyVVMNffec/xwA3KmMtZepM51C3Xh0ZCGl0c="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 2b58ba50bca..510873f200e 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.156.2"; + version = "1.158.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-waVTNyK3OHpOvBJrXio+Xjn9q3WmUczbx3E26ChsuKo="; + sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 9ae3c1c33ca..5e0f37c78b6 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,23 +1,23 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2021.01.01", - "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6" + "rev": "2022.03.02", + "sha256": "sha256-fBN6Ix5CqhzMbNrWGn6nw6+JRDmEfqe6o8JGHERkiPE=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2021.07.02", - "sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY=" + "rev": "2021.11.17", + "sha256": "sha256-wdYH0sISFNx42zt07gLn9ANxcyrq3WrbRhWfTFgPQWw=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.11.11", - "sha256": "sha256-lbRRiA8CHWmosJefTHrP2cTgU8nlK1SmNcppG6Bl54I=" + "rev": "2022.03.17", + "sha256": "sha256-zpirFZcqIT53tZhgxQGdwVB6pA98SQLr1o3f+Lhq2QY=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.02.19", - "sha256": "sha256-cq2dirFNPaWRmZJu0F+CFA//+SuFOOpTH3Q5zL4oPQo=" + "rev": "2022.03.17", + "sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.02.02", - "sha256": "sha256-T/6SQJHKzbv/PlObDyc9bcpC14krHgcLDQn0v2fNkLM=" + "rev": "2022.03.17", + "sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.02.01", - "sha256": "sha256-FAcq6ixmFPQFBAGG2gqB4T+YGYT+Rh/OlKdGcH/iL3g=" + "rev": "2022.03.17", + "sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index faa89b9c877..3b497f34a43 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index a6ab483a7b0..f5ed28cedf6 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; + sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix index 3202e5f5ac5..ad4f2095657 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.53"; + version = "1.55"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l"; + sha256 = "1bs2s5g79vrbk8544lvp388cdbig0s121kwk0h10hif4kp56ka9w"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 54bcc3a7c06..d11ed899bc1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -425,6 +425,21 @@ license = lib.licenses.free; }; }) {}; + buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "buffer-env"; + ename = "buffer-env"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-env-0.2.tar"; + sha256 = "1420qln8ww43d6gs70cnxab6lf10dhmk5yk29pwsvjk86afhwhwf"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-env.html"; + license = lib.licenses.free; + }; + }) {}; buffer-expose = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -463,10 +478,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.6.tar"; - sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr"; + url = "https://elpa.gnu.org/packages/cape-0.7.tar"; + sha256 = "1icgd5d55x7x7czw349v8m19mgq4yrx6j6zhbb666h2hdkbnykbg"; }; packageRequires = [ emacs ]; meta = { @@ -609,6 +624,21 @@ license = lib.licenses.free; }; }) {}; + code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "code-cells"; + ename = "code-cells"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/code-cells-0.2.tar"; + sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/code-cells.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; @@ -711,10 +741,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.15.tar"; - sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693"; + url = "https://elpa.gnu.org/packages/consult-0.16.tar"; + sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk"; }; packageRequires = [ emacs ]; meta = { @@ -741,10 +771,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.19.tar"; - sha256 = "0jilhsddzjm0is7kqdklpr2ih50k2c3sik2i9vlgcizxqaqss97c"; + url = "https://elpa.gnu.org/packages/corfu-0.20.tar"; + sha256 = "03yycimbqs4ixz7lxp7f1b4fipq6kl2bbjnl87r0n9x8mzfslbdl"; }; packageRequires = [ emacs ]; meta = { @@ -756,10 +786,10 @@ elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.4.tar"; - sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6"; + url = "https://elpa.gnu.org/packages/coterm-1.5.tar"; + sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8"; }; packageRequires = [ emacs ]; meta = { @@ -921,10 +951,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.30.tar"; - sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb"; + url = "https://elpa.gnu.org/packages/debbugs-0.31.tar"; + sha256 = "11vdjrn5m5g6pirw8jv0602fbwwgdhazfrrwxxplii8x02gqk0sr"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1127,16 +1157,16 @@ license = lib.licenses.free; }; }) {}; - dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: + dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; ename = "dts-mode"; - version = "0.1.1"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar"; - sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28"; + url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; + sha256 = "0ihwqkv1ddysjgxh01vpayv3ia0vx55ny8ym0mi5b4iz95idj60s"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dts-mode.html"; license = lib.licenses.free; @@ -1236,10 +1266,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220224"; + version = "20220316"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220224.tar"; - sha256 = "008750fm7w5k9yrkwyxgank02smxki2857cd2d8qvhsa2qnz6c5n"; + url = "https://elpa.gnu.org/packages/eev-20220316.tar"; + sha256 = "1ax487ca2rsq6ck2g0694fq3z7a89dy4pcns15wd7ygkf3a4sykf"; }; packageRequires = [ emacs ]; meta = { @@ -1354,10 +1384,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.15.tar"; - sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh"; + url = "https://elpa.gnu.org/packages/embark-0.16.tar"; + sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi"; }; packageRequires = [ emacs ]; meta = { @@ -1374,10 +1404,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar"; - sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy"; + url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar"; + sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -2419,6 +2449,21 @@ license = lib.licenses.free; }; }) {}; + logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "logos"; + ename = "logos"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/logos-0.2.0.tar"; + sha256 = "0cqmgvgyyn656rg60bbnxr2flmnw9h4z5i2w98bsf4krlp3s4i6x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/logos.html"; + license = lib.licenses.free; + }; + }) {}; map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "map"; @@ -2438,10 +2483,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.12.tar"; - sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq"; + url = "https://elpa.gnu.org/packages/marginalia-0.13.tar"; + sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j"; }; packageRequires = [ emacs ]; meta = { @@ -3006,6 +3051,21 @@ license = lib.licenses.free; }; }) {}; + org-modern = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "org-modern"; + ename = "org-modern"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-modern-0.3.tar"; + sha256 = "14f5grai6k9xbpyc33pcpgi6ka8pgy7vcnqqi77nclzq2yxhl9c1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-modern.html"; + license = lib.licenses.free; + }; + }) {}; org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; @@ -3025,10 +3085,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.0.2.tar"; - sha256 = "12g9kmr0gfs1pi1410akvcaiax0dswbw09sgqbib58mikb3074nv"; + url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar"; + sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf"; }; packageRequires = [ emacs org ]; meta = { @@ -3055,10 +3115,10 @@ elpaBuild { pname = "org-translate"; ename = "org-translate"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el"; - sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33"; + url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; + sha256 = "0dvg3h8mmzlqfg60rwxjgy17sqv84p6nj2ngjdafkp9a4halv0g7"; }; packageRequires = [ emacs org ]; meta = { @@ -3096,6 +3156,21 @@ license = lib.licenses.free; }; }) {}; + osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "osm"; + ename = "osm"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/osm-0.6.tar"; + sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/osm.html"; + license = lib.licenses.free; + }; + }) {}; other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; @@ -3220,10 +3295,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.17"; + version = "0.4.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar"; - sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.19.tar"; + sha256 = "1l9ivg6x084r235jpd90diaa4v29r1kyfsblzsb8blskb9ka5b56"; }; packageRequires = [ emacs ]; meta = { @@ -4245,10 +4320,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.2.tar"; - sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714"; + url = "https://elpa.gnu.org/packages/tempel-0.3.tar"; + sha256 = "0aa3f3sfvibp3wl401fdlww70axl9hxasbza70i44vqq0y9csv40"; }; packageRequires = [ emacs ]; meta = { @@ -4395,16 +4470,16 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: + undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.7.5"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el"; - sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p"; + url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; + sha256 = "0fgir9pls9439zwyl3j2yvrwx9wigisj1jil4ijma27dfrpgm288"; }; - packageRequires = []; + packageRequires = [ emacs queue ]; meta = { homepage = "https://elpa.gnu.org/packages/undo-tree.html"; license = lib.licenses.free; @@ -4605,10 +4680,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.20.tar"; - sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl"; + url = "https://elpa.gnu.org/packages/vertico-0.21.tar"; + sha256 = "0aw3hkr46zghvyp7s2b6ziqavsf1zpml4bbxcvs4kvm05qa0y1hv"; }; packageRequires = [ emacs ]; meta = { @@ -4933,10 +5008,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.4.0.tar"; - sha256 = "1ng03fyhpisa1v99sc96mpr7hna1pmg4gdc61p86r8lka9m5gqfx"; + url = "https://elpa.gnu.org/packages/xref-1.4.1.tar"; + sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 60028dc9950..e385cf63a16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -258,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.2.0.tar"; - sha256 = "1dkn5mcp4vyk6h4mqrn7fcqjs4h0dx1y1b1pcg2jpyx11mhdpjxf"; + url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar"; + sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x"; }; packageRequires = [ clojure-mode @@ -281,10 +281,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar"; - sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar"; + sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2"; }; packageRequires = [ emacs ]; meta = { @@ -292,6 +292,21 @@ license = lib.licenses.free; }; }) {}; + coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "coffee-mode"; + ename = "coffee-mode"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; + sha256 = "1yv1b5rzlj7cpz7gsv2j07mr8z6lkwxp1cldkrc6xlhcbqh8795a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/coffee-mode.html"; + license = lib.licenses.free; + }; + }) {}; color-theme-tangotango = callPackage ({ color-theme , elpaBuild , fetchurl @@ -688,16 +703,21 @@ license = lib.licenses.free; }; }) {}; - geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }: + geiser = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , project + , transient }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.22.2"; + version = "0.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar"; - sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.23.tar"; + sha256 = "1g82jaldq4rxiyhnzyqf82scys1545djc3y2nn9ih292g8rwqqms"; }; - packageRequires = [ emacs transient ]; + packageRequires = [ emacs project transient ]; meta = { homepage = "https://elpa.gnu.org/packages/geiser.html"; license = lib.licenses.free; @@ -782,10 +802,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.21.2"; + version = "0.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar"; - sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.tar"; + sha256 = "0fxn15kpljkdj1vvrv51232km49z2sbr6q9ghpvqwkgi0z9khxz6"; }; packageRequires = [ emacs geiser ]; meta = { @@ -2210,10 +2230,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.1.4"; + version = "17.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar"; - sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar"; + sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja"; }; packageRequires = [ emacs ]; 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 0afde2c5c33..8cab450cb2e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,19 +204,19 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220217, - 2054 + 20220301, + 1628 ], - "commit": "1cb08537e255c60a9439e3fea7c5d406e32f5e97", - "sha256": "1mm8c69r9jjs4qr0nha7pj1i8pq03q4nban4pik280swn4c8f3zl" + "commit": "8ce591165e0bdc1a6ea76e78bc10c6b55bab9634", + "sha256": "0v9hw8rf5ypxn7bbwdvv5wrmvdghp691xkfc7kj2zihc0f7vyxak" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", - "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" + "commit": "5d83f76823bc0b86d5270277b57a627f3af427a1", + "sha256": "0vw57jrjds4y37aryjx8lcxs6w6amn2gxhpxlr3ylwi1b6yimvhf" } }, { @@ -273,8 +273,8 @@ 20210923, 950 ], - "commit": "fc0eeb780d22aa1aac337f06cc9b479c51600243", - "sha256": "1vv3p6fkp352chrjm7jwc3frifzfral1jyrkx4m8pfq0cyj2g197" + "commit": "0d6aace2ffd184137618a0c6e7f29826cbd8d1f9", + "sha256": "1rf989ll07xqmamdigzqmamhfscx7wk0xh5yaqam1q3hj13yywm5" } }, { @@ -308,16 +308,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20210411, - 1013 + 20220316, + 921 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d", - "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5" + "commit": "d860ddbbd7cb93c7a77980c78c1a2a7634ef01e1", + "sha256": "03j70vk0gaf96cljkxxk2d1df85b968yn31wa13d465swcaq8wav" }, "stable": { "version": [ @@ -1763,20 +1763,26 @@ "repo": "codesuki/add-node-modules-path", "unstable": { "version": [ - 20210305, - 312 + 20220315, + 340 ], - "commit": "7d9be65b3be062842b7ead862dec15d6f25db4a2", - "sha256": "0za0jjba2qdpqdkcp5bch6ma8crf0vsi7bxj2rasn2icqgxyn89m" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 1 ], - "commit": "6f7801b2c41e3711406b7e1654257ad5557f5bb3", - "sha256": "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" } }, { @@ -1887,25 +1893,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211221, - 1304 + 20220308, + 1016 ], "deps": [ "consult" ], - "commit": "4d65f37a22425cf41c02862522a76e5688998591", - "sha256": "051k54mrq03574lni5nqabmhpbcgpjlm0vjn0yi7h4g0wl299ab6" + "commit": "36d8654a8d7e862d2e64f6bece370e664218ab1a", + "sha256": "1wj63vqr5vf2mzwsx1j837ahjkj0p20zn4vkxl52rxdl8m01m2yv" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", - "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" + "commit": "0982fbfee5877b2492568cce2d746b263f198db3", + "sha256": "01hmhg3smjni8gpyap4wmqb4ax6dxfn6jnwlpdp76imbvb9m26ma" } }, { @@ -2406,6 +2412,40 @@ } }, { + "ename": "alert-toast", + "commit": "94d83975f0554ee1ce5fcc5a151cb859e0fcaefa", + "sha256": "1bw641qxq4vrnq9q0j7avzqhl988rds92gi5f858q49as5lf5yvr", + "fetcher": "github", + "repo": "gkowzan/alert-toast", + "unstable": { + "version": [ + 20220312, + 229 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "ba931529a266537783cfec2a28c2b8c058364ff2", + "sha256": "07g7ny45gy488iqxfna1mdyc7rq8jjm4zb8krk50bymk5rhnmyar" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "96c88c93c1084de681700f655223142ee0eb944a", + "sha256": "1jir8qh87faqlxq1g0yyp5zy3d60615agyddxhsmx6l9a8x91zkn" + } + }, + { "ename": "align-cljlet", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih", @@ -2449,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220117, - 108 + 20220316, + 1339 ], - "commit": "2c963ebb75f211d2f7ac3d2db5f4a9ee2f3e27da", - "sha256": "1gn5nyyhrvz8w1y5m8lg2khwfir0czjizmdzinr70gd7n8g1xqk9" + "commit": "a040a01ef50bef5bfd1b82f0141221f334310b1d", + "sha256": "070z380816r1adbcz6jzhkqbxnycynrydpx4bdn6gpir0arjjm8h" }, "stable": { "version": [ @@ -2491,14 +2531,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20211007, - 1729 + 20220304, + 1638 ], "deps": [ "all-the-icons" ], - "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", - "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" + "commit": "147ed0dfd1034a686795a08dc63e2c293128597e", + "sha256": "1vlwhnvgpjsvrlifczlnf4w02vpzp8rqkfw3mphhzxkfzvif5v53" }, "stable": { "version": [ @@ -2539,14 +2579,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220122, - 2206 + 20220228, + 1513 ], "deps": [ "all-the-icons" ], - "commit": "67a331c94af7670a89cea2cd58a1e7b11b83e8a9", - "sha256": "1aq1g81hj9c8z6h3aw9jdiq9x531kdysdifcr6q7p2bd0vcjd79m" + "commit": "b494b329400dafac5d41ec90d505120559ee589e", + "sha256": "1sf4nx2pq9jlkxbd9gp40hzmar9c6a7fwr4dp04nkh5xkqp69hqp" }, "stable": { "version": [ @@ -2601,28 +2641,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220219, - 1054 + 20220311, + 311 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "2aca118abec76886a0689bcb4b6ba1049ff4e297", - "sha256": "0h6sq20pg3g68p4a0ziy8n41h236q9vfc21wx7qs5g9v6k3pbdng" + "commit": "42dead856fe4647fdc18bc5a8b64440f03026525", + "sha256": "167hwik7mjlvq502r0kx8hcrpizcyv532g5j3jayp5rvv2x6zwki" }, "stable": { "version": [ 1, - 6, - 3 + 7, + 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "66824c6468cbe256d7e5012f516f6840b5ab1de9", - "sha256": "19i7gnkwa7v6balx1qhd68rl1bxghl2fy442ymcaxl3yykc2hx9d" + "commit": "a866ed554932d4c52f802b2235e6d5c3382d8a67", + "sha256": "0id821qis6yqaicr0dv2cxyfdy8dh0m5xp7zbfrgnbzk1ah0npd5" } }, { @@ -2675,8 +2715,8 @@ 20220212, 1526 ], - "commit": "583ed2d65310eddcb1d5d82af236c9ed86560447", - "sha256": "1a3xk7cyxp63957mk3msrj166yq61zwyckdc7qd2l9s3spbsdq0j" + "commit": "490f9b781d6aa2be376b01326b4ccdea756ff382", + "sha256": "1bp5rcqni80izky8mzg0bmf8q8n3niwhjix6jsa9w81584kmcaha" }, "stable": { "version": [ @@ -3231,8 +3271,8 @@ 20200914, 644 ], - "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", - "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" + "commit": "2816605bfdc24c93d8801016d31beeed7608ad02", + "sha256": "0bq2hdfy86l4yby9nrf84rz521n6y0axfyvl4sw8fg5dpmx062yp" }, "stable": { "version": [ @@ -3701,8 +3741,8 @@ 20210802, 1715 ], - "commit": "00c141bbff46c89a96598b605dee05dd1d89f624", - "sha256": "1d3ssyp90k26282p46c91wj1bvqxpvghcsicp14bnh78llwninvc" + "commit": "9b4b41cac699e85cb36bd0e4ef2cb39f7af1cf3d", + "sha256": "1khbqp8iqm6p5a83bvcvdiykd9qpa4c2545l3sbb5q3qg8js67cn" }, "stable": { "version": [ @@ -3846,17 +3886,17 @@ }, { "ename": "archive-rpm", - "commit": "e5f5653e62afdc022eac30bda3d21bd2d2625d2e", - "sha256": "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7", + "commit": "64c5ca910a8a887165a34d818fe464936df64606", + "sha256": "1s9w02w6crli7cq1082y1vrlj9qmgk2dq7smg21znmi5lch1y193", "fetcher": "github", - "repo": "legoscia/archive-rpm", + "repo": "nbarrientos/archive-rpm", "unstable": { "version": [ - 20180706, - 1232 + 20220314, + 1647 ], - "commit": "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7", - "sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3" + "commit": "379dddfbe4e801df6fdb81a55528fab6c7dbb78e", + "sha256": "1w505zv614xsc0bjc0539fw68x88vfxmd8k9mnp5364pvjfc7g87" }, "stable": { "version": [ @@ -4191,11 +4231,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220104, - 1222 + 20220318, + 1342 ], - "commit": "0d52411d3accc3e11a2c64838703a8ce9755c77c", - "sha256": "0afjx74l0fywjr1gdf023prkbv9xglicjakbfbyw41m7vvlzcvk3" + "commit": "c78bab7506a70a735d2c3deab13fa87bf44a83d3", + "sha256": "1pa0cmphja9flib8m86rlsns7q53g06pn0m4ksdj0ig1xmzj4108" }, "stable": { "version": [ @@ -4296,8 +4336,8 @@ 20201026, 339 ], - "commit": "15ab7db5d188083f09d65163edd5d0ef995c4c30", - "sha256": "05fgd7h75jrzblgs8ydkd30pgjhr16ng4l4k32wr4wwqn213ag97" + "commit": "3f4b12016bd1d0115207013ebc3f02fa7f50917b", + "sha256": "07gf5p6c78kxyji4q89gz2ffyixdccn5h610d7nidiiix1bwvh1p" }, "stable": { "version": [ @@ -4320,8 +4360,8 @@ 20210731, 609 ], - "commit": "da34a3950b80bb43cc1e8b4aa404b761372dd149", - "sha256": "04jjgcs7h2bxxjqhsi65iwgf5jg912lgingfq3yd9dkcbw9nmcfc" + "commit": "7e07005dbbca6a5f409f37af37e5f5f81d057ded", + "sha256": "1mm9xfsk2kgqfy29k27b5z43j12nkpx1ssgp4y9k6bymrgbfx08v" }, "stable": { "version": [ @@ -4621,8 +4661,8 @@ "keytar", "s" ], - "commit": "c7b5893e0d93ac6a653e58161b42dc2b21793711", - "sha256": "1w9i58dg0l23dry0aj3cvb842fd33z9hngq0a7rikacmympz95r9" + "commit": "f235a34306e230dcbf60f63e19fdc3b06425f7cf", + "sha256": "1pa4syiq7ds1hfpi268krlkyi8vl7hfr23md2x16zh0wlnsxnpm2" }, "stable": { "version": [ @@ -4764,8 +4804,8 @@ "cl-lib", "popup" ], - "commit": "71dd984aa45dccea1cb797d336507eafa81b5bf4", - "sha256": "0cayj63jn1dc01bn4z87l783fiis4ixvmbww2pqii1i06mxsqxaw" + "commit": "d515059ea5316c81223f6d969e45b16b47365b5c", + "sha256": "07xp981b1j9igcai930pqfiz16idp9898bpdl623d9175i5dnrjl" }, "stable": { "version": [ @@ -5041,6 +5081,21 @@ } }, { + "ename": "auto-dark", + "commit": "5e0563fc10ad39c0bee64c91c02df54d4880491c", + "sha256": "1lh5jsqkx653p3xbpyg67jfi9n2x6nzlqh0szhawp9rahszjgwym", + "fetcher": "github", + "repo": "LionyxML/auto-dark-emacs", + "unstable": { + "version": [ + 20220318, + 2356 + ], + "commit": "fd07fbdff1d5e370b1714dde882e1ed37dca9936", + "sha256": "10r586w7p3x7axvxmf8qpjfi3mhccahgq2yk6w665j4hj917k5sr" + } + }, + { "ename": "auto-dictionary", "commit": "1711d710ac09fe407fde89ee351ccdcb78555d35", "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16", @@ -5092,8 +5147,8 @@ "deps": [ "ht" ], - "commit": "db22c24d13532e80ce02c2f51f41f6c979cf0604", - "sha256": "0z1frm9kicrlb63iyk7wa5dpvy92ygh5vxaw2kv1rvnfbsfmxl7b" + "commit": "939aa7f58c555a05451238e40c34bc8da0150870", + "sha256": "1rqphhfvi91vgqqxahgm2zkxk12dvqxvqgraqgagc75xpqsgw423" }, "stable": { "version": [ @@ -5242,8 +5297,8 @@ 20210805, 1344 ], - "commit": "beb7a4d2b15790502ac52f65588da3d23567f9db", - "sha256": "1pv88hrld0zifd7w52kqlx04fx3vfzrp56kzd2jk0fn3pvqdi5n7" + "commit": "5551157ab81b55322e7787ce16ba84162933aece", + "sha256": "18zrh7s8xn9spr5lg5zasdb3rkldnvmhi31z08d4rxjfpfhikcql" }, "stable": { "version": [ @@ -5511,8 +5566,8 @@ 20190331, 2230 ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -5655,20 +5710,20 @@ "avy", "embark" ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "avy", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -6879,8 +6934,8 @@ 20210715, 1004 ], - "commit": "e6e73647e4c176ff4f89e09d54dae753f95c7a03", - "sha256": "06r3b4wggam2a0n87cnlkxsn16aam9c0wdi6niw6sainjmk0dw8g" + "commit": "7183369a489a12f4a776f03c8e1a9bfe62d0ab3d", + "sha256": "1fg0w1c1fdvqjf5rki4zw2m8zwdxsc2g43s9vm635v6akb8ryqmy" }, "stable": { "version": [ @@ -7577,26 +7632,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220227, - 1237 + 20220302, + 1936 ], "deps": [ "a" ], - "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", - "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" }, "stable": { "version": [ 0, 4, - 3 + 4 ], "deps": [ "a" ], - "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", - "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" } }, { @@ -8596,11 +8651,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20210520, - 1616 + 20220316, + 2046 ], - "commit": "32c1cfdf06dfa7bdbd79aba8066064212672e755", - "sha256": "1mbrsakg7mbrr4szi7ha5hcfr88i79p5bn59dh7v6ywa357brmky" + "commit": "d5fbf1d173da54fd8609b2ea10832d871021feec", + "sha256": "02azqjsanpzhzby0sscnnv9jddimmqvl08ijir7172x2n3fws2dk" } }, { @@ -8798,8 +8853,8 @@ 20200924, 345 ], - "commit": "327c378c333156321974ffcf93f19aa9fad59a9e", - "sha256": "02wihnxifb17g9hn0l6ia63whfxvx7351s64ffpvvjjryz8l95fg" + "commit": "1734ee6cadaa8094e6b06876c57dbca5dbd289cf", + "sha256": "0h8da68hclfjrxpq3h84fanldm8vgkriljw0qn2vwpdd5yw5258v" }, "stable": { "version": [ @@ -9197,11 +9252,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20210105, - 2255 + 20220309, + 2311 ], - "commit": "1cb7afcb0b6d87a3e623dc26ffcb2c7d4d6dd280", - "sha256": "07f8lxcyi007qfhgq0yvpq1pg8hklzq94pfkzpqq2hb2cvyj2zb5" + "commit": "09459403f54783ddff9337010d9536da25ca7818", + "sha256": "1aaa0a8x1347xhnxsifwrzqk1inhgb6wljvqyibvhy22ap38bxm6" }, "stable": { "version": [ @@ -9700,16 +9755,19 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20210603, - 323 + 20220305, + 1621 ], "deps": [ "dash", + "esxml", + "org", + "request", "s", "transient" ], - "commit": "cb93563d0ec9e0c653210bc574f9546d1e7db437", - "sha256": "10dymcd17ili5r6ydiz7bj0q81y5fh0s1d64m4acfa8xfsi7zx55" + "commit": "20337d39e3abe4baa38cc0ed5a6c65272df9af2d", + "sha256": "08ix2iq17xsl9dcnf0xik12ykpji77kb5xs91y23w1plfl1pl0zj" }, "stable": { "version": [ @@ -9875,19 +9933,19 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220227, - 316 + 20220313, + 58 ], - "commit": "fc7a20be524d0faa848ba2a16a80767a445a1391", - "sha256": "1dwbvixk2zr2k061zrljr933l2gpkx672d1d67gbz5znz4sbjsgh" + "commit": "79e8771c18c76a5bef5fdbf74718527e74b6d702", + "sha256": "1v5q066xppxf0crzcliqa2mya0x18qjmz5xp0mcr2szi1nps8z7s" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "92c3168283c6d9faa3fcf2e72d0d71afbfa5d6e1", - "sha256": "1bmxpfp0zs24lbp1mlcc66f4s5gxgrj78001h241mzndc3kaiqfk" + "commit": "51b9bf1276445faebfbad636d9b6a39dc57b22bc", + "sha256": "0731c55bb1vxdh8k7312z1bvf7g8jwr2n04q3ffpqp0fan6ra025" } }, { @@ -9901,8 +9959,8 @@ 20210707, 2310 ], - "commit": "fe82ae30fcd53dbe3c9ae7e14e495a79ac7a9c74", - "sha256": "02z2ss5kqmda32x4pwrjwqly2ia2wyw47pny6hh93mzpc453lmj0" + "commit": "281aacc18003ae103b8a04ea83d7b6f814c97b8b", + "sha256": "0v245k0fv0dsg706v34rg91h36avfvl3yfddll1gp9h87df04hkp" }, "stable": { "version": [ @@ -9952,14 +10010,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220208, - 1933 + 20220311, + 827 ], "deps": [ "markdown-mode" ], - "commit": "841ea7d85edd10c94138339469c4d8bbd03c8a29", - "sha256": "0gnah3bdcii2xrjnwpr9kzl5x8p85dv61yl48j3fizanjmwhan13" + "commit": "8335b5577dfa526c645f7c1839c473f99b9ad1a8", + "sha256": "0dw46rd1naz9z383bn3zzywz2955r4fw6a1v87m1scr3j42i6q4p" }, "stable": { "version": [ @@ -10061,8 +10119,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20211103, - 1654 + 20220316, + 1557 ], "deps": [ "ansi", @@ -10073,14 +10131,14 @@ "s", "shut-up" ], - "commit": "751435bd56c7123d8244d9d156309e21e63cd5c0", - "sha256": "0jxwsaam7hqvqbxrkzd7hy09l87yjsg7z89jikzs6vzc72h02g8x" + "commit": "218433b408b95efdc026081ee3f44e976a3aa36b", + "sha256": "08bniq7hba6438nfwfnmhkvm1yqln5f27239ndq1gbhc3wnnq61q" }, "stable": { "version": [ 0, 8, - 7 + 8 ], "deps": [ "ansi", @@ -10091,8 +10149,8 @@ "s", "shut-up" ], - "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54", - "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7" + "commit": "9347a4d4459722f0863167bd21001477d76f3dc8", + "sha256": "1i948z6q07mfibs1v7k1cl8hs299m5vlm2brlpz9hm0bkfmmwm2f" } }, { @@ -10271,8 +10329,8 @@ 20210501, 820 ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10320,8 +10378,8 @@ 20200904, 1431 ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10590,8 +10648,8 @@ 20171115, 2108 ], - "commit": "64122d4a77d76689558412b55962cab60524c67c", - "sha256": "1a80pfhys8ja1nh32d3xqab0f7f1k3k5mzsvscnivk90cmsrakhb" + "commit": "9bc6e3d8398112532b14d0c192f19a4046c6baed", + "sha256": "1rk05zqzd0z88pyyks49zc6vnqvigq5nacdmjx1j4dx2jkwxax8p" }, "stable": { "version": [ @@ -10737,11 +10795,27 @@ }, { "ename": "cg", - "commit": "be27e728327016b819535ef8cae10020e5a07c2e", - "sha256": "1xffjilr9f2s3w7j8f3clq7qvsnr0lr8gadlybpzzy8x5fbmk4n3", - "error": "Not in archive", + "commit": "808b19a7c16fa977ecf22006c470cfb8b62b9e5d", + "sha256": "01aqh2xbg0bmj166lhxnl44qvwadsp2fcrm39w4hywccjpgvy94h", "fetcher": "github", - "repo": "emacsmirror/cg" + "repo": "GrammarSoft/cg3", + "unstable": { + "version": [ + 20220318, + 1007 + ], + "commit": "140a63995ca15d393c7e7003cf0e6edddcd4088c", + "sha256": "1ssl0nzm2bs3iyjak9x2gkl3206v5ihbzsspqrvrgijfv3h9yhzr" + }, + "stable": { + "version": [ + 1, + 3, + 6 + ], + "commit": "25afa64a35780b7d870a6c2467a404ea67d6d23f", + "sha256": "0jwyq878bayw4qx25ifc1gabsvg0xilsizg73lkwj06qzag2x0s9" + } }, { "ename": "challenger-deep-theme", @@ -11062,11 +11136,11 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220221, - 1556 + 20220310, + 2014 ], - "commit": "0b25d312a84868d6cf76f2016cd0dbc70c9312a0", - "sha256": "0mqrxzk0skkc3wj3b44k10nnrg542jnh8s226v1mx4dbcxws8rdy" + "commit": "781783c483bc8fcdba3a230bb774c3a8a5ebe396", + "sha256": "0il36mnf4c13336sa4hpbfypdc983va5fcd5shcsp7slb9zwm69m" }, "stable": { "version": [ @@ -11408,8 +11482,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220222, - 1710 + 20220309, + 618 ], "deps": [ "clojure-mode", @@ -11419,26 +11493,25 @@ "sesman", "spinner" ], - "commit": "7a072d8374eb92c8164b436ee271abb5e9e351e3", - "sha256": "098h86i41dqxydmhx9akiyixnz846i7jhl1hcsz7dnwl7ibbz14k" + "commit": "1e27eba570d265bc27317dc2a8f8c98d8b5414e0", + "sha256": "1zx918pkdiihj7s5x9pqy946q9bbjv774z3dkvkrnvj0xv1x34n6" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "clojure-mode", "parseedn", - "pkg-info", "queue", "seq", "sesman", "spinner" ], - "commit": "7869c66f81d8a2b47f2e2d912fcb96934f5aa39a", - "sha256": "1c21hdrf6b7zc65nr7wqjhcyq5a0f4aa91wrxgzx374q81xym2rf" + "commit": "02ca53021682f426323dc7bb4e6b28e6c8f5eb30", + "sha256": "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1" } }, { @@ -11719,8 +11792,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220217, - 1606 + 20220309, + 1552 ], "deps": [ "citeproc", @@ -11728,8 +11801,8 @@ "parsebib", "s" ], - "commit": "b84cb375933053cf3e5408f0386034e8dabca5cb", - "sha256": "0hgyl2akvm5z13x403hmk3xyybbdp40sxbkf97m81k9y8m5fz7lz" + "commit": "02323c6f9bad12aa3a53f6f6b9d7f714ddf6e773", + "sha256": "0izwc82qvssfkjlcp36dg773ggd2fdlflap83fgzyhldlnmf3k6c" }, "stable": { "version": [ @@ -12179,10 +12252,10 @@ }, { "ename": "clj-deps-new", - "commit": "733832bb1f0003cab6ca52ebba6cabc1bdf68659", - "sha256": "16jmdiavl7pg54kflfs1dkpislc6wbmnxxf0qh9idf584kkl1g1m", + "commit": "74d96277724fddaa7dbaa77795a02d4a97e499e6", + "sha256": "0q02wnv7i7bxz782yf5sk7lgisrh6064hagmyngpzx1dw1i29wcp", "fetcher": "github", - "repo": "jpe90/emacs-deps-new", + "repo": "jpe90/emacs-clj-deps-new", "unstable": { "version": [ 20220221, @@ -12203,8 +12276,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220213, - 1906 + 20220315, + 2251 ], "deps": [ "cider", @@ -12217,14 +12290,14 @@ "seq", "yasnippet" ], - "commit": "542225248e8d27111d6164292b37058ad5194984", - "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" }, "stable": { "version": [ 3, - 3, - 3 + 5, + 2 ], "deps": [ "cider", @@ -12237,8 +12310,8 @@ "seq", "yasnippet" ], - "commit": "542225248e8d27111d6164292b37058ad5194984", - "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" } }, { @@ -12465,20 +12538,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220222, - 827 + 20220307, + 1903 ], - "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", - "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12495,20 +12568,20 @@ "deps": [ "clojure-mode" ], - "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", - "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], "deps": [ "clojure-mode" ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12798,8 +12871,8 @@ 20210104, 1831 ], - "commit": "a2513bb55e05bb503f6c0a0122eed17a33aa1354", - "sha256": "0jgjn78y3kmfmzyhvp3j0lclaxfpa8im7d8gvvzr5qv1j83dprdr" + "commit": "c8a3c544443e81e01de6a41ba84abb3efcb509e0", + "sha256": "0rv1hv4d45s1zigd4ayfp6lwf7wz01jyl5hj9q8jvyfzh0wamixv" }, "stable": { "version": [ @@ -12807,10 +12880,10 @@ 23, 0, -1, - 2 + 4 ], - "commit": "352ea99bbacf6e57bca47f43725d98b2a4a0b87d", - "sha256": "1dg1lk5f8qpx0scp33yqvbmwxaci484bawm70l9wkx8q2zjsljsh" + "commit": "66ba460810afdc0e0f65c20b1bc057a204acc82c", + "sha256": "1qyddyxpdmyshzsax7gk8mgkjij5pnvnifd0239s4pr009x4pjyb" } }, { @@ -12962,11 +13035,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20211014, - 738 + 20220305, + 1320 ], - "commit": "f5150fc213da470da2d4fedaa4b86f476167b235", - "sha256": "1p8a4ga6pysqd41frzzpi0a5bv1a0qmn136srfqqkkg60y5rlnl0" + "commit": "8660bdeedee360e5eb632f1eb1356eb09d7dfbee", + "sha256": "0mvfsdlhc3znc0d2p8vm7apkbpvbs688wmwvd0sms33qly53f546" } }, { @@ -12995,8 +13068,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220107, - 1355 + 20220318, + 1429 ], "deps": [ "a", @@ -13009,8 +13082,8 @@ "markdown-mode", "uuidgen" ], - "commit": "ced8a31f331c034b00165d1eb6ac76f5a21db9b6", - "sha256": "1yrgkj634p9hf1jrlcy6f4yydyc4z5ig7pq14yxhfcnw0cf8ksr6" + "commit": "3af92f0259378c2b2c31f7f03bd677fa1017b3a3", + "sha256": "03dqnm50v0ga7d0m8j6f5k73p933b4cjn818cn1qfgjlxbawa8ah" }, "stable": { "version": [ @@ -13210,14 +13283,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20210607, - 1842 + 20220318, + 1558 ], "deps": [ "dash" ], - "commit": "fa42b60f9e84995a8109a49798c0b4c618fc1ed3", - "sha256": "12ybgh8yzi62lw0c7yakgvfdx45sr11szyqdlf58n2pbkz9sxkmv" + "commit": "05dfc97b004f1a962313710d81cffae3b2f9c98a", + "sha256": "161mn6b14kbpf4lyqw9ijxqir8qxbz9rr7ydx03z6shjfp7ciz54" }, "stable": { "version": [ @@ -13462,8 +13535,8 @@ "deps": [ "s" ], - "commit": "fd84b0e32a0faa450df6035fb94ce96aa777b237", - "sha256": "0gb30gyadxvc47zrvkjkjil3qj6mxavxagzyp21jlxx7fn3n0fic" + "commit": "d4958edf2a4a8cbe55097320e191045d496847d8", + "sha256": "1yi1ha4iyfb0362x7wk65lksh6377mga0xyva65s035i75r4k05n" }, "stable": { "version": [ @@ -13797,11 +13870,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220110, - 2248 + 20220310, + 2313 ], - "commit": "c25f1fbc3850e36e6521b77fa1641d5583365d8b", - "sha256": "1ski2dv8ndlrpad08xg1bz9fxy8lj3c27z8i0vlc96x40nc788bh" + "commit": "18a662082948b5aa9bea6b4ad752e027fc12aeb5", + "sha256": "0a53an8q2vgcsfvbcz3cnhpvzkc3ah79vhq16y9yd78x1zdc5wb2" }, "stable": { "version": [ @@ -14041,8 +14114,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210708, - 2357 + 20220314, + 526 ], "deps": [ "cl-lib", @@ -14051,8 +14124,8 @@ "dash", "yasnippet" ], - "commit": "382db93374380e5db56f02934ee32bbe39159019", - "sha256": "1vlbw54a02qy77ad2qgd6sy7y3b6x1y1nm3bjxcd7f67hnncjg0p" + "commit": "a6e349e0131f676a885bd14c908fd26054b2df42", + "sha256": "1qws0a0ia039d6bv2sbjsdl1ry28y9jrv98qnp5jcm7jfb2jmvsp" }, "stable": { "version": [ @@ -14255,8 +14328,8 @@ "emojify", "ht" ], - "commit": "01cbc9bf1b073abc5cf567479a3cf4b6f929d474", - "sha256": "115smqwz19c4pxh3asg046kq0pmdnwj2qz1s36h833kzz1ig3rn2" + "commit": "34f33e4bd1fc11da306c1d159def96cd92e4c00f", + "sha256": "0v6j7xjl5gs513gydxj2hn5f17p6y6fqbf8ik8v5ac5lifhwcn6q" }, "stable": { "version": [ @@ -14359,8 +14432,8 @@ "ht", "s" ], - "commit": "122cdecee0a269b014471875f3eb29cd8af96d6e", - "sha256": "1wnh11m9pqlin58izx5w72a807pi59dj7mfhl5jfvsk7ds29yb04" + "commit": "36e9af842f5d6910a6235eab6c7f815466454e0a", + "sha256": "0207n6jx2fr8k16pp39pxy67n3sycs670i4azwbhri2i4z9mx0ms" }, "stable": { "version": [ @@ -14922,8 +14995,8 @@ "company", "phpactor" ], - "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", - "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -15144,8 +15217,8 @@ "company-quickhelp", "popup" ], - "commit": "5bafab30e0edb99a3064edf1e9265a416c632a71", - "sha256": "0nbncspzxrqqn7gsaapwy3dqd00gxzzjcf7xl0i8g1glsw4nwabv" + "commit": "fe68967d901ec284022fd67d296866795476e60d", + "sha256": "1586vwl280z463h9yb5ijjhwi3dmizcmwxy54rh2pd8yljgxsjlm" }, "stable": { "version": [ @@ -15317,8 +15390,8 @@ "company", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -15840,8 +15913,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20211123, - 357 + 20220315, + 1533 ], "deps": [ "dash", @@ -15849,8 +15922,8 @@ "pythonic", "s" ], - "commit": "7a34e06931515d46f9e22154762e06e66cfbc81c", - "sha256": "0n1w3gx7xv84nc5hz8w1ab2ml45g64jx05cwrflf5kqmx496phms" + "commit": "9c28d7a853b4b4bd00215cf7f07856c1563f2ad7", + "sha256": "03r9f2pvxxv6nlxgljnd5cmnlvsykypdl38cfi79iw3spr0lcrxn" }, "stable": { "version": [ @@ -16004,19 +16077,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220227, - 1400 + 20220308, + 1010 ], - "commit": "782a90da29568a79259464c1c11854a3e16ea36e", - "sha256": "01f16chhk4s53xmrl6c3a4nac8qmx6cdwlmxkhnc7a032njgd9bi" + "commit": "800824601b610016066991d6e2dde198d4b0ad8f", + "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "e1e17965a98515a620c439be1eb28cd125f984a0", - "sha256": "0cfj8h0k05947cazsr95yy75shs0vpy59sa41f31xbw00q9l48q6" + "commit": "800824601b610016066991d6e2dde198d4b0ad8f", + "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" } }, { @@ -16133,6 +16206,24 @@ } }, { + "ename": "consult-flyspell", + "commit": "1750efda60a7c884f89ef22ed00d89a41d245272", + "sha256": "0n1kby3hs1cn48z5qsc9dh1897rpd0paji8cyx7pssncaz8mzhfy", + "fetcher": "gitlab", + "repo": "OlMon/consult-flyspell", + "unstable": { + "version": [ + 20220227, + 2210 + ], + "deps": [ + "consult" + ], + "commit": "2e7b99dec6c51259d0bffbae3e863f4054dd2346", + "sha256": "1cj3ahxdihi4v4x5qsn1lgacl7dzswy79qli23zrkxaw78x8is0i" + } + }, + { "ename": "consult-ghq", "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", "sha256": "091018x5y28lbffjrb75a5r2cvprlhz0jdj371nlyvrpsdgdfs4f", @@ -16205,27 +16296,27 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20211229, - 420 + 20220302, + 229 ], "deps": [ "consult", "notmuch" ], - "commit": "0b7fae73f51bc855078dca9593c8c7f67fe2ed98", - "sha256": "0kiwc7qbhkmaj5hlarxsv3gy3gikykvxklgqkq8f68jjfgb0hdag" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "consult", "notmuch" ], - "commit": "a5509cfd0c9f69327ab63fd18e548b7f39be16c8", - "sha256": "07qbm5p4cfrrwyp8a5sw0wkdhnqbappz4xjlnjil2krhj9g39q78" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" } }, { @@ -16236,15 +16327,26 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20220222, - 1825 + 20220228, + 843 ], "deps": [ "consult", "project" ], - "commit": "b2a7062251b101aa9d1ba6c1f3f65c69ebdfd784", - "sha256": "14ji1vjj265j0chn3fk9ncm4l66j6jq0g2nq5qz94qnpk1fadf8s" + "commit": "897f2f71a94ce1b72c3bf823e14791a332befbb7", + "sha256": "1c0nllj6hhgvjf7zzy44iacnl29flg54ahb26r4bi9lip8aw65xs" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult" + ], + "commit": "fee931a63317bcc183c34a84b758db561db3f2dd", + "sha256": "1ybgwf56ydfgww1yhbxpipknvi01h2svpjh05b8x825qmplslidp" } }, { @@ -16255,15 +16357,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220225, - 1544 + 20220310, + 1840 ], "deps": [ "consult", "projectile" ], - "commit": "758cfc259ae83421d008731642ff1ada41b7b514", - "sha256": "0fsqz88xplbkr6hl8zwmg65s3d8jjfnvf2bdfv795i0n8lsprl3c" + "commit": "df85d0f83c323f4672221c9e78d84027bcb9d96f", + "sha256": "178405z6vasr44p1rg1n1ar4vwbvp04n5fnyma1j327lp8lbppmi" } }, { @@ -16286,13 +16388,13 @@ "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "1b21fa157ba40fcfeecd0a10c5c82ecfb87aee53", - "sha256": "0bfvxzvyppkqfdj4cm5haqgkd72wrh5l7x8ldnpycapqyjpv9pip" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" } }, { @@ -16599,6 +16701,24 @@ } }, { + "ename": "corfu-doc", + "commit": "78440eba5512b37243de24364afd5d7f46f8fcca", + "sha256": "0vi12khc9c9gcz8lagw75zkx377f7f6qdlgjr6rg37nd3ip4pkj0", + "fetcher": "github", + "repo": "galeo/corfu-doc", + "unstable": { + "version": [ + 20220318, + 1052 + ], + "deps": [ + "corfu" + ], + "commit": "95fdae5755e6c88cf77b409b555290c36961ec6c", + "sha256": "09lmvb88nj7ivsr6gh93xhbfav80pm69z3dgnifnn1g2gfjnjjka" + } + }, + { "ename": "corral", "commit": "7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4", "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da", @@ -17105,8 +17225,8 @@ "dash", "ivy" ], - "commit": "6ba0f2ac7e4e5b8c1baec90296d9f24407d8d632", - "sha256": "1kp83cql4gn9g3d8g5mw3mrmpfj407kzpsi5wmwl1jr1pmw3v3jc" + "commit": "0f790def6ac2b5a84d01eed47a7ee53619a8f5b9", + "sha256": "1p15g5bc1pgibvqv6akp4dmqzysws26dhpnxgswmclrq0hy0qwjx" } }, { @@ -18603,8 +18723,8 @@ 20211111, 1407 ], - "commit": "11a9e73a4e67b162b10d3db70b513b4d14bb7a43", - "sha256": "0dh67z7aq7jq8bjdi1k7j1c3sb2b9xm8p147qv4rlllfgfqxnmig" + "commit": "518cbac89898a1b8c3390c82104c1b250a60a259", + "sha256": "1z130p4ckrp5lshdfw8k979wyj4ch2n654sffbixhcf4fk0xbfb0" }, "stable": { "version": [ @@ -18755,11 +18875,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20220214, - 552 + 20220316, + 1101 ], - "commit": "eaf1c6a99cd1697a805a3f04325906412eef8171", - "sha256": "1nb34gmzlypq3yccm4dwii86pn6k75hb9y50ldsyx3x93zwcm3dk" + "commit": "054c0b9bc9cefb53a4065096e66707d20885c461", + "sha256": "1bw9ng01d0y6ri67w42z8ql37kxxra59v4cnra94s00abc212lja" } }, { @@ -19175,11 +19295,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220208, - 915 + 20220307, + 1807 ], - "commit": "7ae46300df5d22d3941ff9f10bc52d232985b628", - "sha256": "1qv5vffbf0wjymdhabc3jl4h9ib9x38swabsjs23rm3a5jf9b091" + "commit": "d40ceaff2d26f7213eb21f6a39e58c72642ad737", + "sha256": "1fiwnld8cxc98f3syss21wqw1vxf1z8fkxrkcmvp6xsydhx23z7p" }, "stable": { "version": [ @@ -19227,8 +19347,8 @@ "deps": [ "dashboard" ], - "commit": "cde30ac64006f79be71c9e59eda2218d725e2bee", - "sha256": "0272j1wr7399zfpl0vdk397dmi1ll3bqrv5h6rrbwg8vvmfk01vj" + "commit": "08b621b78f193471025c02e4cde348010db754d9", + "sha256": "0fpzk5la94dppxvnf5klvglhy2qvza3yxfkdpm1k1sn282pc1230" }, "stable": { "version": [ @@ -19508,15 +19628,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220227, - 1955 + 20220305, + 522 ], "deps": [ "ccc", "cdb" ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -19701,11 +19821,11 @@ "repo": "sanel/declutter", "unstable": { "version": [ - 20210904, - 2039 + 20220310, + 2101 ], - "commit": "e08195e2f5691ad0ec9090d7edf550608e13fcfa", - "sha256": "1hjdjd0nmknv8yppda89hsgkyvk52zcwz92cdxsng87rlp9hwddv" + "commit": "8ac50a64dc3a12440d98bc1556b5c7727fdf51ed", + "sha256": "0kmkb5gfldim2nqkb4mnjllp1nvkr7c3j1zk84crfyxy45ln7lv4" }, "stable": { "version": [ @@ -19837,8 +19957,8 @@ "s", "wiki-summary" ], - "commit": "70dd874c7cd8fef9de17984f1e360fe1d9f0d3e1", - "sha256": "0q1z1p4wmqaa0jdkw98brnvz7nz7nwgwpfcwa7ildjldl8k8xb06" + "commit": "ba801ce1851a83bad2b962c47aef1f86f56286dd", + "sha256": "0psf7cnps4qkxz48cqvkgqcqyll825d5zdlw297v670rjjxbpclm" }, "stable": { "version": [ @@ -19983,6 +20103,36 @@ } }, { + "ename": "demap", + "commit": "3cede53ed6d8133241ea0a1949f4ba5ed51805c2", + "sha256": "1syza8lkph1p7wp40pcb46pziqbq7nw0jjh6563rcicngqyzhngc", + "fetcher": "gitlab", + "repo": "sawyerjgardner/demap.el", + "unstable": { + "version": [ + 20220317, + 829 + ], + "deps": [ + "dash" + ], + "commit": "cb119fa912699a7697b958a467e21f655b95a741", + "sha256": "027fyjmxjdskamn3js1jsyiqbrkk9c4qp79fnrf3p73xnci9570m" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "dash" + ], + "commit": "cb119fa912699a7697b958a467e21f655b95a741", + "sha256": "027fyjmxjdskamn3js1jsyiqbrkk9c4qp79fnrf3p73xnci9570m" + } + }, + { "ename": "demo-it", "commit": "1dec5877db00c29d81d76be0ee2504399bad9cc4", "sha256": "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7", @@ -20791,8 +20941,8 @@ 20220218, 1541 ], - "commit": "8db04f40c269127919e1081c658f93bf7fe395f5", - "sha256": "1j6ym1bbld1bys5q5pm0rrx1m9922rr7fw82r2alvzrb78my660i" + "commit": "8f517bbb04411a125860ce4fb169bcea06b364e9", + "sha256": "0frffd2b7q22xdvk9li9vivd810sy6xkw001ajc0q7c70wxj0ksk" }, "stable": { "version": [ @@ -21231,11 +21381,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20211205, - 712 + 20220317, + 1839 ], - "commit": "b4a5341e22efed3c1a261b9b5098d7c429d655d1", - "sha256": "1i0lc6sq87yyg1xzj2qqk3rld9j0mvbl7vhlpdpk75g7nlfi2w8w" + "commit": "72ebbe2b3d2e04dbfda636fa114d4f47835ce044", + "sha256": "0z53ymlbyan542mzsjkgab29czx2zk05qgady99kg40rik78599q" } }, { @@ -21458,15 +21608,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20210806, - 850 + 20220313, + 1533 ], "deps": [ "dash", "s" ], - "commit": "7940d9154d0a908693999b0e1ea351a6d365c93d", - "sha256": "0fhbpy9y89jm03hjqp317h0aj9iasbdan0h829rhjhga11x8rw2y" + "commit": "b327971d197e95e9b78e7ef92539bd4196a12797", + "sha256": "15bkjvrdyn1bpvj0lpxm370cl7phyypmpswc80qngx2axdqbr0a2" }, "stable": { "version": [ @@ -21489,14 +21639,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210608, - 2340 + 20220317, + 1546 ], "deps": [ "dired-subtree" ], - "commit": "6be2dad2782e28dae2f50c0cbfd82042b2b6ba8d", - "sha256": "1lqnd64ga7g8dzzgfn2bw00y65hlvlgxnj3bk7j6qr5wzkz6qp52" + "commit": "aed7e44b5a4ef37fa7be6210ddfe73bb724bac6f", + "sha256": "1wc4lb7rpim4npjl7aszc1ddpsqf2an8v7j4dasxlvdq0n2zz6qn" }, "stable": { "version": [ @@ -21834,11 +21984,20 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220223, - 1713 + 20220318, + 1804 ], - "commit": "9bb39bef29a41162e00a563da4966b6a368e6b5f", - "sha256": "0wgyd66lrvl8i6sn7ar9mvm06lq6h57asm3sfhkiq0qf65w7bwhn" + "commit": "5170e712fecb5b6ef1e537fda3994373f230ff8b", + "sha256": "1syz893g4cvlz3138f7yyazsq4rd9dblwlgckhmwiajl16hl164d" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "f010dc7a081a61588c220fb815f023544f444493", + "sha256": "0nbbj23ha9v03rqxxc6y030cvnyadk9258x287623gvy2s5p3bv0" } }, { @@ -22053,6 +22212,30 @@ } }, { + "ename": "display-wttr", + "commit": "a60a6643b6d8a5691d48b47c31eb560e0f793d26", + "sha256": "1lhnv2cqff22z7d7n2sx7pqvskyg5fbiax2dhfznf2xjmqh22lzi", + "fetcher": "github", + "repo": "josegpt/display-wttr", + "unstable": { + "version": [ + 20220316, + 213 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + } + }, + { "ename": "dispwatch", "commit": "580cee72ac9871f8f256069b371f7fb66367a048", "sha256": "1cq5lbh3r9jjwixn2q30gryy4j4l8jb70nkhsjbaln1c3jdwrf9p", @@ -22216,20 +22399,20 @@ "repo": "muffinmad/emacs-django-commands", "unstable": { "version": [ - 20191107, - 1830 + 20220314, + 1545 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 1 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" } }, { @@ -22465,11 +22648,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220211, - 548 + 20220314, + 57 ], - "commit": "5705f8d6f5583d50fc0497a88f06fb7c84a9ddb0", - "sha256": "189bahsiyv7j0h1i1nfilr5rp2bihfgi19lipdxmixfmfv8fjy6j" + "commit": "42954390621f281930a70104162db1bb70532a1b", + "sha256": "0nvk10nh2mkw430zdr0m2cnqzvi48ah32k8zay4lh0qgz4jl2kdy" } }, { @@ -22517,8 +22700,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220225, - 1528 + 20220315, + 715 ], "deps": [ "aio", @@ -22529,8 +22712,8 @@ "tablist", "transient" ], - "commit": "498ffb2ba51fce12cb543caca0ecbc62782620d3", - "sha256": "1ixzi9lsjra01srvkd30jvryhbgxl9s49mspy2f6975zna390m60" + "commit": "674bfb7e24da3f9d0fe926945dd0625e2c15e50a", + "sha256": "1fzlxqff0a4bw3l6vdki4fdw107wd0vp0l6asaqz9kkgv9wlffq0" }, "stable": { "version": [ @@ -22668,8 +22851,8 @@ 20220220, 1439 ], - "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", - "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" + "commit": "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f", + "sha256": "0cnsm9xc5lqfx0vgv0fcqadwr8mnj3s9bqldrh1s6f26q9bapncd" }, "stable": { "version": [ @@ -22732,8 +22915,8 @@ "deps": [ "s" ], - "commit": "49d0e77aa9a1c6a649c0d45030111b26222f960c", - "sha256": "0w1jjm9p2332ql8k32x2i1f51df8wqz68y07dqipz5d3h4ysgwfl" + "commit": "80f534767abf5d9037935bee90653f7bf0b064e6", + "sha256": "028s158fpfg9grdmsf1kw13gq6wl2bfshlp2ax8i8vk33gxw7sx2" }, "stable": { "version": [ @@ -22893,16 +23076,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220218, - 1547 + 20220313, + 524 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "d9b64bc56283c7816f8124dcb3a5c7ea22732643", - "sha256": "0kk0yxcb26igkgqasrp9h78k0sll9by9m07dydd7lhkpwdg4dd7r" + "commit": "b95340d24a37ac8b76b7934ff9508ff58f577a96", + "sha256": "12f03mpm7iqas25h8miqzd3jpf16flk5kiw3yhmqb6lpinaxijg8" }, "stable": { "version": [ @@ -23200,8 +23383,8 @@ 20220209, 724 ], - "commit": "2c9efdae8b7b9a8e57dfd3aa1c62426a262e9eba", - "sha256": "1wblaspw1yb2xgymlajjqap5rkj6danrsh8hnkhpcd1x9q49llis" + "commit": "e725c9e790c9e9cdaccdb35faaae9d5cb16ddb89", + "sha256": "1hj40c203a5mj9xngsgw5yihd6pcvr91aggqa0kbd4j16fcsvw9j" }, "stable": { "version": [ @@ -23335,16 +23518,16 @@ "repo": "pavpanchekha/dropbox.el", "unstable": { "version": [ - 20190918, - 1629 + 20220314, + 1638 ], "deps": [ "json", "oauth", "request" ], - "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691", - "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a" + "commit": "c048faad0be24e8fa31974f08b710a87cf5b668c", + "sha256": "1d43ynlqj60bhc5cc39b02440gdvvbw8hyppg7xs7wcljyb54jxd" } }, { @@ -23462,8 +23645,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210926, - 541 + 20220309, + 759 ], "deps": [ "cl-lib", @@ -23471,8 +23654,8 @@ "s", "seq" ], - "commit": "f6a94d86263041f9a172cb7df90e00d1ec44604a", - "sha256": "1q29lpza8rd209zh0n04ia6n359p372czkm57hhmvcd9cmi91fc8" + "commit": "56b339bc76926defa775c406113e306ec6d31b36", + "sha256": "0g33sn95zk4fp1jyh472k3qyvbm062njbxkmnv0qavrbli097q80" } }, { @@ -23632,17 +23815,17 @@ 20210909, 1010 ], - "commit": "c967d8a4880732f2f7cba39d4f283154c5ef914e", - "sha256": "079xxy2569zrfy2r621bb25gw99dlmwmys60qyrxvn01mb9ah9ql" + "commit": "9b8c6cb907d3516014450317304e4ef92853b04a", + "sha256": "1cv856hh3wqzsvw8qbbvm57j7dapldz73h8af5n7dv65gjrvkydg" }, "stable": { "version": [ 3, 0, - 2 + 3 ], - "commit": "f8c75a43bc0a8e190727161c2f67ae643b884542", - "sha256": "1spgn3sjygnwq95ybxaj5dg9s5hyp6v5dwl240w3m4664blilz4z" + "commit": "68c36597dfb99187ccbadf578988deaf690c4e25", + "sha256": "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k" } }, { @@ -24282,26 +24465,26 @@ "repo": "leoliu/easy-kill", "unstable": { "version": [ - 20181114, - 2330 + 20220311, + 1506 ], "deps": [ "cl-lib" ], - "commit": "2a6309d98aa6b71df6bbbcdf15cab3187c521a6b", - "sha256": "1j8hl0f52fqb21775xn94sf9g12yqyg6z0ibgmxzmnl02ir4xr86" + "commit": "f9b450a87c41e5ef616df565ed158cb236aa5189", + "sha256": "05drsb7kaksdsk1v0i5gip255rvlziirl4wcana08cpm9v9p4m21" }, "stable": { "version": [ 0, 9, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "e3b2442e2096cefff94ea8656e49af07fee58f47", - "sha256": "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m" + "commit": "2a6309d98aa6b71df6bbbcdf15cab3187c521a6b", + "sha256": "1j8hl0f52fqb21775xn94sf9g12yqyg6z0ibgmxzmnl02ir4xr86" } }, { @@ -24398,14 +24581,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220121, - 2236 + 20220314, + 2256 ], "deps": [ "parsebib" ], - "commit": "4aed0c3a34e5faa95435e03be043f9a843971560", - "sha256": "13h94383lqfk2gcrfd7czdm46q38zg8bm8dyk8lcbyi7b60rczbg" + "commit": "600b5e3d3dd98ba4017ad257470424b4507b4e59", + "sha256": "0mybyw2hh104z53lnp2pvcm9sg01wdad0hqyxl6msrq12n8pkr4x" }, "stable": { "version": [ @@ -24919,15 +25102,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210830, - 1025 + 20220301, + 332 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "3c03cef3110024016c688553733cdc3694a8a799", - "sha256": "1vyl3i6dgi8y3rc5a4n2hhghiri0914k2j7w7zkji8brpl8i5f0g" + "commit": "1d4acc3ec73609990eabacb59c038708bc401003", + "sha256": "1blx38fyfl1zgfh5k1mgsnxxjlski7f0n890kiyjbaw2ba9zzmgr" }, "stable": { "version": [ @@ -25082,8 +25265,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220220, - 1753 + 20220312, + 2132 ], "deps": [ "auto-complete", @@ -25094,8 +25277,8 @@ "popup", "s" ], - "commit": "603e182f8f0a4140e6cbf71c2d73673cd08028ee", - "sha256": "0zvbahgm910sdasq1404lyxxan0mrcpzcjwm64jpzinx2i0bai5j" + "commit": "d815148f22ed194116dcde63a0150919e380ecd6", + "sha256": "11x1607fcpxzrf8kqi364qiiffbpwpwld0w9x0mjfsphyvdpg62g" } }, { @@ -25290,8 +25473,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220123, - 1406 + 20220318, + 1054 ], "deps": [ "eldoc", @@ -25301,8 +25484,8 @@ "seq", "xref" ], - "commit": "bd6a1cccfe9c0f724772f846d1f4a9300f40f88f", - "sha256": "094kk4xprnfx3x94ij3fxc6sh877m03dwx35qmg1sh8capx28zi3" + "commit": "f77518711507810b779d87190d0ca0183fc02e10", + "sha256": "0jab7f92blc4gh5bpg1vcc42ly5m29zgl7ffymssypk32vbig0sd" }, "stable": { "version": [ @@ -25432,11 +25615,11 @@ "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20220119, - 2125 + 20220316, + 619 ], - "commit": "b0aab3735f3333ba0b429e669730ff22c9d59da7", - "sha256": "0ms8a4wrkf98p0fjvy4fck0285gx1fdr8nwry0c2p4s1afj48kcn" + "commit": "23c78f4850f44d18eef66c694e7e05882d841ba6", + "sha256": "1icj34anks7f0cjdqc1kgj3bva3bnhily5xc5mzx21w0iciqvpk6" }, "stable": { "version": [ @@ -26007,11 +26190,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20220209, - 2301 + 20220305, + 1234 ], - "commit": "ed8de0e9d218723f45200542b21a68dc8440f278", - "sha256": "0q1vr5ks04qjzml13wzmzkvm1za3faq9m2y5f3g0z254fh82cbbb" + "commit": "70fd716e673b724b30b921f4cfa0033f9c02d0f2", + "sha256": "043516j84q0jx558frk8afavdfr52pvwb23viyb8m54422z1psxl" } }, { @@ -26056,19 +26239,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220221, - 2055 + 20220313, + 1510 ], - "commit": "7be0cb16ce5d9d3139b4ed1724ac6d8292935267", - "sha256": "0yb8rpv6yi47kdk6gaav063zqq3l4jlyb4wk95abwzkgjcmjc4ky" + "commit": "bdc729893ccfc52b2b7369624111cc175e4ce0b9", + "sha256": "1yii555k43v94cqlxv2n9k1d6pz3mjg1sc1zgpbnx5gqhzfk7m5r" }, "stable": { "version": [ - 0, - 11 + 1, + 0 ], - "commit": "f7cfdb8648624917afec0a687c6fa92ce8d7958f", - "sha256": "10l9gdxk6l2zp14zaf6k5aq36c0nbjq8jya727xs4yra0rdg05hl" + "commit": "deaf16e832bbb4665fe5ccf825422566ce489ad6", + "sha256": "1y7ngdj2icn8zw5qpjxqj3j9dry4lb7ixgxa148ss5bgsl8pgqnd" } }, { @@ -26079,11 +26262,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220220, - 2003 + 20220228, + 631 ], - "commit": "646ae5cdd8ccbf5d78eb0488298b7c5e9c9a18a6", - "sha256": "0y2502b0d0fy2pm7kklv5262maxky2y2y8nw223f4f3bicbymxwy" + "commit": "c0cbb8d9191a1df8a289aafc8cb94a3ebb515d6b", + "sha256": "102z9wl7d563x7i44zhlc81bi7k030rlzfgs5cm8vbmalgqv1c63" }, "stable": { "version": [ @@ -26243,14 +26426,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220218, - 826 + 20220313, + 911 ], "deps": [ "dash" ], - "commit": "6dbd8f80aee44e2f6ff9995f1bebb8f05575505a", - "sha256": "0a65cin6r2bx9fz3a56iywmsdm5k6i6av0j6ba3s8hm2hdl7ckdq" + "commit": "8bcc6b02722adb21d3698df46db2426718aebf70", + "sha256": "0xh658xwx5bbzak4axdrwx90zv9vmba8lwcma4m7scinzwhnjfx5" }, "stable": { "version": [ @@ -26432,10 +26615,10 @@ }, { "ename": "elfeed-dashboard", - "commit": "339127464845e86419c6a88004fc16b60d675f57", - "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", + "commit": "40ba169fd28e3fee01bc51055a811ae78d4d6eab", + "sha256": "16r2nwlsjlfh48mbgyp3bqnqmxgaj5f4md1i2m8hvvhpyihq7969", "fetcher": "github", - "repo": "Manoj321/elfeed-dashboard", + "repo": "manojm321/elfeed-dashboard", "unstable": { "version": [ 20210727, @@ -26456,18 +26639,18 @@ "repo": "algernon/elfeed-goodies", "unstable": { "version": [ - 20220116, - 1609 + 20220306, + 2253 ], "deps": [ - "ace-jump-mode", "cl-lib", "elfeed", + "link-hint", "popwin", "powerline" ], - "commit": "8e4c1fbfb86226d867b524fd0f8ae78b4b602f1b", - "sha256": "1f8gyzzdfj0x078m8az2n4c4ihxyxg3yrhx5ry9fi0xsglzvrcn0" + "commit": "6711de66c22360f80fcfd9730293e5f3d419f787", + "sha256": "1c2wqa08wjmqq9kax1akyad23664h5cwdan9mcrn68w6pgqd9rv8" } }, { @@ -26881,11 +27064,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211013, - 1408 + 20220314, + 1302 ], - "commit": "6f61e04c8537c2e9a807dc29908f619b5202b0f8", - "sha256": "1hcmb3n2av3zdxsh4wk9d1l2x9065mjjgzbf5i3lh3ij1qrgakcm" + "commit": "e0d0466d83ec80ddb412bb1473908a21baad1ec3", + "sha256": "1whi4ni2jcinwq68yrzcl0q23dhp0b5k3jy5j3m89s2kdv3rwsm9" }, "stable": { "version": [ @@ -27274,11 +27457,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220208, - 1726 + 20220228, + 1307 ], - "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", - "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" + "commit": "ecb5e17d37249bc38c25ee278094fb93b63b0a49", + "sha256": "0q2wmsxvcg6c98fbnldk64lc49zlzd42k8zisk03f8g91l12wxac" }, "stable": { "version": [ @@ -27313,8 +27496,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220220, - 2059 + 20220318, + 2201 ], "deps": [ "company", @@ -27323,8 +27506,8 @@ "s", "yasnippet" ], - "commit": "758c1ab3516b1e38fdc5b978da6252284f4ecade", - "sha256": "0mldrhqppm3cqrdl836g3rzd6l29ynjvz4b747n0z86sj1chgn54" + "commit": "d3df7021adab256eec679b833256352753c07b88", + "sha256": "0wjpj7ddyb6krpqglp4fp4vgys2j7aca22hzfn4sbhjb8mrqvmns" }, "stable": { "version": [ @@ -27853,14 +28036,14 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20200914, - 508 + 20220304, + 1014 ], "deps": [ "emacsql" ], - "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", - "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" + "commit": "2113618732665f2112cb932a66c0e89c404d8777", + "sha256": "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw" }, "stable": { "version": [ @@ -27979,19 +28162,19 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220225, - 2232 + 20220314, + 2324 ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -28002,27 +28185,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220219, - 1728 + 20220309, + 1530 ], "deps": [ "consult", "embark" ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "consult", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -28158,16 +28341,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220221, - 1445 + 20220315, + 1727 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6afe1b26d679357586380ecd69c9795985231013", - "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" + "commit": "dd1ee74db3325d6a27e14df7ae882b5cbd84989a", + "sha256": "0s50ap75wsjapxdby7x2gk85jnsr6aaf0l1vzpb6ax96ag92d4lm" }, "stable": { "version": [ @@ -28450,8 +28633,8 @@ "emojify", "request" ], - "commit": "c641508772a7a7d455f0917d45c3c508de56e871", - "sha256": "0iam1caa6pyr3x7qf5nl9d2c0js9m5k6q59dbmvq2bwm7l243nxl" + "commit": "8ebfc21d243fc17faf074b36dbc4be6141139906", + "sha256": "1mdh1f3lbng0nbwih3haf7wj4x4mmgviziv5fwki449495mw041q" }, "stable": { "version": [ @@ -29575,8 +29758,8 @@ 20200914, 644 ], - "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", - "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" + "commit": "2816605bfdc24c93d8801016d31beeed7608ad02", + "sha256": "0bq2hdfy86l4yby9nrf84rz521n6y0axfyvl4sw8fg5dpmx062yp" }, "stable": { "version": [ @@ -29600,8 +29783,8 @@ 20220215, 1844 ], - "commit": "d469db4ddf72479a42b60f5337504fb53b65079e", - "sha256": "1mp8c7hfrdbxp6h51fkqi3ri3fqxwapgp9qbggw1jfpqlsjga8lm" + "commit": "e3deb7168cc89e391a18b77d6e09abb7c2a13f00", + "sha256": "1jz15kzbk74bbnmb58jdzrq24ajzfd0lqzwy32krcx6971vx8s49" }, "stable": { "version": [ @@ -29764,8 +29947,8 @@ "s", "shut-up" ], - "commit": "c3969c86b5b00087d8b2fcb7147481d5be56f2f7", - "sha256": "0v3ry7aza86pzrjjy9qr07jxn3md1vx324cl0xq3b055mdp6dqv6" + "commit": "80cf4f60ec8c1f04f58054ed8ad2dcfacc17d8b5", + "sha256": "1zxhiy8hpyz1nbi238gnwvs2pyrl1h8pgfyqrjhqwni8bih4kzx7" }, "stable": { "version": [ @@ -31106,15 +31289,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220217, - 748 + 20220309, + 2216 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "00fca685479e772361765b13de4689099a328c28", - "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -31308,15 +31491,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220222, - 1104 + 20220314, + 1559 ], "deps": [ "annalist", "evil" ], - "commit": "2dc6b5e56a7c320dba9da1da2c8c491be586eecf", - "sha256": "12rnxyzqna28f9mxw4fhw4wy0lilp5vjfmdvbaz3sldc162vi36q" + "commit": "e55718869252a8cd46e61e350bb514194a37f2f8", + "sha256": "0inq608gk9kn3383qni7ll93qhw3qqy7yi22ympv0y3279n8725b" }, "stable": { "version": [ @@ -31773,14 +31956,14 @@ "repo": "edkolev/evil-lion", "unstable": { "version": [ - 20170811, - 614 + 20220317, + 1030 ], "deps": [ "evil" ], - "commit": "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab", - "sha256": "1a162hynp0jcsn50c1w5a02mrw9w3q05c7lkqzqd25px3d0p772q" + "commit": "4da660e124731ed65e7aaa6c067c30e876619429", + "sha256": "0akhw0a9qsk65lvanb57fqh7hf601xdzkbyi560ximfrsr7f94pi" } }, { @@ -32634,8 +32817,8 @@ "deps": [ "evil" ], - "commit": "00fca685479e772361765b13de4689099a328c28", - "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -32837,15 +33020,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220204, - 417 + 20220306, + 711 ], "deps": [ "evil", "tree-sitter" ], - "commit": "ff733576d1dc5395c08d8f0e396b7a7073e39674", - "sha256": "1pa6ffz5wssnrs2x81p06w4c7iba4jx4man0h8qgl3qfsl2nkchw" + "commit": "f3b3e9554e5ecae55200454804e183e268b4a6fc", + "sha256": "0aiy0bkffnq5g7a7ay4jwkp7whx211ybnrh590vl5bd9mnasmxxj" } }, { @@ -32874,8 +33057,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220129, - 446 + 20220317, + 29 ], "deps": [ "avy", @@ -32884,8 +33067,8 @@ "tree-edit", "tree-sitter" ], - "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", - "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" + "commit": "5961b738e30be007cb0fe984a76e406e0854c006", + "sha256": "17lfs5qqm2gjj40s3r6j1438zvrcfbsz6bxwn9z6flz6idj7ca0n" } }, { @@ -33415,15 +33598,15 @@ "repo": "md-arif-shaikh/expenses", "unstable": { "version": [ - 20220215, - 1518 + 20220318, + 842 ], "deps": [ "dash", "ht" ], - "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", - "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" + "commit": "e668666770858e92de83d8217c7e384de3ba1e34", + "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv" }, "stable": { "version": [ @@ -33622,16 +33805,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20200206, - 2212 + 20220318, + 1958 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "14643ee53a506ddcb5d2e06cb9f1be7310cd00b1", - "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8" + "commit": "a377326e2e4ac386a0abb3fc9b1b356a0d955b61", + "sha256": "0gn221al5sf6zcpgd7rl3d8kg8c8l6plf9v5ii0z6ib14g0wvpgb" } }, { @@ -34029,19 +34212,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220219, - 1818 + 20220318, + 2213 ], - "commit": "f32c32711e936ae0397686b38b88a7dd3cc7ad21", - "sha256": "0vkd83bjprwbm02chvm1q8m818f9ngpbdzr078bxbyig5p0332z4" + "commit": "c58c162a2d1284033497feff4bfa8c3210685d9d", + "sha256": "0v5xn0zpc2khy97pbhvhja724hfc9y3rm9fmqf0xzpm6czbgi4xr" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "1385058dfe1db579cc5e08bd81ad9b15282f0650", + "sha256": "1ph7myinasxbamr7vpiijihqniq06ng4h58jgh04xb7vvi4b07nx" } }, { @@ -34160,14 +34343,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220222, - 1101 + 20220310, + 358 ], "deps": [ "s" ], - "commit": "bf214d3256143c4d18f3ec6060ee141d252424e2", - "sha256": "0wfp54h3wfvvr6sms1fzxpiqdsyhyygnmjkb9jv03gkir3asnpf9" + "commit": "b01cb24209d223ae0e7281c279daab87800ee7f4", + "sha256": "1jaw9xwh58p1n0x943f6fly0scxf6zd6czq87xrb3fnkmv8qdnhk" } }, { @@ -34523,17 +34706,17 @@ }, { "ename": "fennel-mode", - "commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f", - "sha256": "0lg69rjvbg7zl4jxc88m12r4rgv2mg2xdyz591mdmgvxwr2hfrv9", - "fetcher": "gitlab", - "repo": "technomancy/fennel-mode", + "commit": "6f1dd5342562665d32308d2cf69527a0e491f269", + "sha256": "0fbwd932jvgn7aarv04pbla76ldpdn2gz0z6zjdcjsp5h507ngps", + "fetcher": "git", + "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20220131, - 627 + 20220309, + 445 ], - "commit": "824d330c32637d8e0ef349ffaa8e002aca56991a", - "sha256": "1f1i28jlghzm7fa4998izakasmr6jvzghx96shahc6walcr8zb2h" + "commit": "c55eecd7c731a18c40be98684370c4c6903d243d", + "sha256": "1cg21a2p9pqx9dif35k0p393ckz8f433qznwxgircajjmz65b7b2" }, "stable": { "version": [ @@ -34575,8 +34758,8 @@ "f", "s" ], - "commit": "bc8828273e7a01549d6e892bb0f4ca36d59dd964", - "sha256": "0rcxlmic4hh6qc2l041i7p3qxlmncbw8bhh4lzgg59hdhc18ln04" + "commit": "dd51ad1a5a0d85ab3c71e9bd31499d50ec8b1f74", + "sha256": "1qvi1z6w8j94pp71gwvjd8h14m6fnf0wg824iwk7pvfyhfmi3p91" }, "stable": { "version": [ @@ -34679,8 +34862,8 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20220130, - 9 + 20220312, + 1650 ], "deps": [ "dash", @@ -34688,8 +34871,8 @@ "seq", "transient" ], - "commit": "953f0b2d130d3944557d2c909328afd8c8097e8c", - "sha256": "09r3k0ba89iv6vzhyzgl7aa496ycld0ab18z45qvp7m8aqkvf3jw" + "commit": "9125e5b7ebbb99b8c007018fcfd5034e7ac6630d", + "sha256": "1gwx52498q6yg8vyfdw4mrxjj49cbcaf9r95rl2dcms9rb9s5rqv" } }, { @@ -34749,8 +34932,8 @@ 20210707, 354 ], - "commit": "f23ecfc9c6b7a1369f8431ba1bd919a733b3d38e", - "sha256": "0hp3id5fc8z305y5jpbg57nqzdscw5r9yhvmzndiw6ly9pk8868a" + "commit": "466b2314f48aee2bab17810eb4fd7f9b061c9a46", + "sha256": "1dmdmgmb7gw2p62p1i1ii1b4b6wvh0kg1vvvlfpx5jmv2ix01drc" }, "stable": { "version": [ @@ -34943,11 +35126,11 @@ "repo": "muffinmad/emacs-find-file-rg", "unstable": { "version": [ - 20220109, - 2015 + 20220314, + 1540 ], - "commit": "86158409c59f0349e84fb31557cc41f93d2df5d8", - "sha256": "1aghs4411fbxdlfhgy3a2aiq5z2a5slgw5qjd2hs99iqll2zq84v" + "commit": "404b1cc97c2f700d3dc1c66b640f96ed5a268dc3", + "sha256": "18v3wdkh7ld6ap4nfc8p84i44gc99nrvk7v0gyq1zdg0yy20vwaq" } }, { @@ -35018,8 +35201,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220111, - 1121 + 20220307, + 1527 ], "deps": [ "async", @@ -35030,8 +35213,8 @@ "s", "transient" ], - "commit": "57d3e873a5a5fde4f8dfdd99608780b7020c7b9d", - "sha256": "18li3w3qf9j1lb90p3vsn28wlqqad05rq7nhd988nzf7izxir094" + "commit": "be1ae9bcb1b85d93f138c510dbc16c28af228916", + "sha256": "0jslc8j153sglagfjq5vrcnhgzjjxkf763h3md9735z231svvvk6" }, "stable": { "version": [ @@ -35892,8 +36075,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210825, - 1804 + 20220314, + 27 ], "deps": [ "dash", @@ -35901,8 +36084,8 @@ "pkg-info", "seq" ], - "commit": "784f184cdd9f9cb4e3dbb997c09d93e954142842", - "sha256": "137zsivwh3i4b757hzwf5mhv5sg8j2jg7kg0cjphplwasqk70qm7" + "commit": "278d0810f05eb03600d835c2bdd67d6b55a58034", + "sha256": "1c722aapkqbkxqchpchd2id9kz4hv2dckyl851x4na3yd7k0dzky" }, "stable": { "version": [ @@ -36696,8 +36879,8 @@ "deps": [ "seq" ], - "commit": "6274e6d5391bcdca46164b3238b045ca21c353a2", - "sha256": "0dr52dqxsgswswbkdbv0dax57k41j58n5wf3gny6yz52626kv8n8" + "commit": "911ffb3498e411c538eebce20c6b20b39d725af6", + "sha256": "1b0g9lqg6kmvhvh4a6g6xmag4jmkx3br6b37z8kb7p7x3wb691f4" } }, { @@ -36818,8 +37001,8 @@ "deps": [ "flycheck" ], - "commit": "65e7d90594b5f624702b3cf6e8867407419980b7", - "sha256": "1s7xgcn10dx4i0l3q1pl33v8r59xjjmgia4a45jmv52schpx53gp" + "commit": "6b76fa9c43834fabe501c7ab1816797af4e4a7d1", + "sha256": "1l2lv9n159c04rk3z044ib5w1kpgld6j1i63106bmr3za3kkkqv6" }, "stable": { "version": [ @@ -36889,16 +37072,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20220222, - 638 + 20220228, + 731 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "7ded0a4f36b88867ec6b14a791dc4d14baf09bd5", - "sha256": "0q3bhfjb0cr4f0g9dyyz70lgzzzwa3k77ahyhkc1jscmjafsjs5i" + "commit": "2b71f7708798aba0c766768eeb161bd2696d663d", + "sha256": "0vg9gpa4sifzdv6z5ax3cqgmqa1xzaq4g5fqpswsyr55jaxpi5r7" }, "stable": { "version": [ @@ -37276,8 +37459,8 @@ "flycheck", "keg" ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -37317,14 +37500,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20211107, - 1001 + 20220228, + 737 ], "deps": [ "flycheck" ], - "commit": "c22c4f33cfc1229177fc67b18885363fb8a23af9", - "sha256": "01nshsqjl9vlx06vg2fws0jxd6x2dy5pf2hix0am14v0rk9kh6zk" + "commit": "018b4e12b9b5e80e0169ce044fb2a898a747bd1f", + "sha256": "0v8wf6jax2gzqrsj8lijybc47bkz665mbw87a73iz6dcmlyrxsmy" }, "stable": { "version": [ @@ -38611,8 +38794,8 @@ "deps": [ "flymake" ], - "commit": "0c9f3fa273cf1cea8fd64c2b3c20119e2d5c8f6e", - "sha256": "0vw21na55i7fxrls5b3frf2mml7nk8k6y39936r7gbnmn00dcmam" + "commit": "097c8754367f68ea84eac9f5f31664cecb95eeb9", + "sha256": "1nw2lib8c919bwiljqbj2b098frw6ciamyd66ms131pzm633iplc" }, "stable": { "version": [ @@ -38703,11 +38886,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20191129, - 1558 + 20220318, + 152 ], - "commit": "6e2d376f84ddf9af593072954c97e9c82ab85331", - "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" + "commit": "bfcf28259c7d774b259a6ed122f1f0936a5b96b9", + "sha256": "18rvmvaw7jdlrc4xvl9nw9lawwqnd5ahnf7j95qlqfrr3fm2avmw" }, "stable": { "version": [ @@ -38727,14 +38910,14 @@ "repo": "purcell/flymake-flycheck", "unstable": { "version": [ - 20210404, - 2128 + 20220313, + 924 ], "deps": [ "flycheck" ], - "commit": "fd5e801b49a0dd085bc23fd6ea32b0e3be9edea7", - "sha256": "1rvrxnqplwxm2havrsfsv3nrfv0zgz574rh18dkz5ixlbscjcpx7" + "commit": "850a3f2f6908db5d4a3739e385b2c9fb3ad488f9", + "sha256": "1axr0wgmjr58fhhl2zwh5l4wd9x8h66rv2917ynxwq61p955wi87" } }, { @@ -38839,8 +39022,8 @@ "grammarly", "s" ], - "commit": "ae2190f47b8e0792ae936f972081de5a5b796d95", - "sha256": "1k66jv6nqmaazibr212swhkn4y3dkzwrg7f9mvpig19abfima6yn" + "commit": "bb8bae85b0cd5a3d4603bbb35f9237bcd83d250f", + "sha256": "1a2mzmgp6sb0wylcasg764rczlqc0nj09wbxdfmdjghdcl679pr1" }, "stable": { "version": [ @@ -39086,8 +39269,8 @@ "deps": [ "s" ], - "commit": "55df906e4a19d64aa6bc44fd45eb02819c6e77be", - "sha256": "0lxfzib1ipr3nkyjixy49n7g5z1v6hhimp1ff6n87wwz1d55lkjb" + "commit": "330a277f6469f3382fb758bd19117aa4ca5aabf9", + "sha256": "1sgcws103qbj259zi0qrpn5cgjiab36sl2w2nnfs96bky228byc9" }, "stable": { "version": [ @@ -39179,8 +39362,8 @@ "deps": [ "flymake" ], - "commit": "c70eb881d4fb27aeb72c0bf8de6707b9de49bd51", - "sha256": "1w7msjg4sa0h0a4ycl9382agv1bhzcr9z0i6hmhcg7333rd31ilh" + "commit": "dba854423933224f0d983bde8981f7c6b62a7865", + "sha256": "08j9zcj42zxwdlycqcivhh58rr1abafb66vbgcik9h2givnkx2ys" }, "stable": { "version": [ @@ -39268,8 +39451,8 @@ "deps": [ "flymake-easy" ], - "commit": "8e5ab5103c8f40a2ab6c86def6327e480ae93657", - "sha256": "19cggpaj14w3j3q6dgv7ybjqbr2pqbwhingz4yi7wkrr0w6s0lsa" + "commit": "8f6222324e4f205312b51c8a862b24562db0e02e", + "sha256": "1cpfif8v9qrcfiklfy0rvj31f8ixj6npydzkqsn2xjxd8j8266zb" }, "stable": { "version": [ @@ -39407,15 +39590,15 @@ "repo": "mohkale/flymake-rest", "unstable": { "version": [ - 20220109, - 15 + 20220313, + 1311 ], "deps": [ "flymake", "let-alist" ], - "commit": "fd9928801cf601a221cf45508e254f405d19c819", - "sha256": "1paiw6ax6zcqdr2gxj78d8by7glag0nnrp8y489qz6k2y7mwv9s8" + "commit": "6c0f39ae1e8b476b195adfe477b40cf6c4a162b6", + "sha256": "1qmzf49ags9ymdfi7q4mk4amp522ssq2hnrknkrx1sj0lfxkkypw" }, "stable": { "version": [ @@ -39525,11 +39708,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20210314, - 2048 + 20220308, + 2218 ], - "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7", - "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl" + "commit": "688638177b4e23ecc192975e3062274ca904ada1", + "sha256": "1x5blblaf1h6jz4v6l10w2gy7xkbwzzw2a4s0afdicm0r1wc7v44" } }, { @@ -39609,11 +39792,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20211215, - 1416 + 20220311, + 636 ], - "commit": "22690dd862089f470980cceea06153682a397b7a", - "sha256": "1x3ivvwnbwpsavbypgkh1il7l7vmq8vp4w3y40f60zv3zz06nf16" + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" } }, { @@ -39660,8 +39852,8 @@ 20220131, 834 ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39688,8 +39880,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39720,8 +39912,8 @@ "flyspell-correct", "helm" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39752,8 +39944,8 @@ "flyspell-correct", "ivy" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39784,8 +39976,8 @@ "flyspell-correct", "popup" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -40129,8 +40321,8 @@ 20170305, 1356 ], - "commit": "a743f80bfd53767ca9ee32da34c5ca032172a480", - "sha256": "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip" + "commit": "b64edc9f350beef07168621933d3e287bce28434", + "sha256": "1yss4akandva0rg05g6vfwjk3q9yj6p0pg85nq5glv1qxdx1rvxn" }, "stable": { "version": [ @@ -40292,8 +40484,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220225, - 1417 + 20220318, + 2335 ], "deps": [ "closql", @@ -40306,8 +40498,8 @@ "transient", "yaml" ], - "commit": "0f436173d1660321edac761e3e82c40e97709f63", - "sha256": "03iwng2l5gj3mhk8jw72wzz5iji4c0m5p59f2igbiqm79xrxghys" + "commit": "de8856738f5c5d5b77349709c42329c1e23c0da5", + "sha256": "16bchyf9dnax0cd0v45scyw7jwmmdaxaam9ss04gn8grw5drjdvr" }, "stable": { "version": [ @@ -40507,14 +40699,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20220223, - 1041 + 20211223, + 405 ], "deps": [ "seq" ], - "commit": "96dd298a2ee2f62739e4a11281daadd90352df70", - "sha256": "0amxqi4jvc0sr5i6pk72ricjwdc0v0lr0q34vccsab2l8iiwid89" + "commit": "0aab300c0a6225d93087ae112f123eb89048ce1d", + "sha256": "102g7n43ji47ssj7rdyx34frbgl84lgmppww4f3x6wbkvfwa2p6f" }, "stable": { "version": [ @@ -40793,11 +40985,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20210727, - 1535 + 20220301, + 148 ], - "commit": "151d264a0d0593b413b5a984b391023e905a190b", - "sha256": "04cv6p9df7h6w9h2ina3y3mmkp0y1rs6d9wmzari0cbm7q50hz4l" + "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5", + "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49" }, "stable": { "version": [ @@ -40826,8 +41018,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40853,16 +41045,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20201212, - 2302 + 20220309, + 1711 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40894,8 +41086,8 @@ "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -41009,8 +41201,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20220201, - 2048 + 20220315, + 1057 ], "deps": [ "add-node-modules-path", @@ -41023,8 +41215,8 @@ "tide", "web-mode" ], - "commit": "774b4b3a1f24c46c91f189a2c67d5fcf0785e2be", - "sha256": "0ks55xp65qg96vsj1nsrifbpvfz0k45glis4wsl6wyc7pfiss11y" + "commit": "18816534a977fbd28848389b58c22b6538cfdeec", + "sha256": "1nhsjkp0dm9875a1w86vvfwd1gsssvcmk144wvflvw40br9ss7h1" } }, { @@ -41131,8 +41323,8 @@ "deps": [ "cl-lib" ], - "commit": "3032408bd3b521d761eea9f0e4e89640d5485129", - "sha256": "0y6mralgvay2493vzm6m7m53sxivg9rzhs947flpdyz8xsl0ac4d" + "commit": "1945b8f54cd62c7d6dd811586ee21bf43d6794a6", + "sha256": "1ladvdxi6bbjy5lspvmb0yl8vjnl0j8fq5jrn5wnfwwq3q9fb07p" }, "stable": { "version": [ @@ -41330,8 +41522,8 @@ 20211231, 1837 ], - "commit": "20a76509831b8296bf3c8b389e1f5602c2a88899", - "sha256": "1m4qsb2hfs1v5ffxzc81km5ld0gi8j3hzgnjckw5rlgl0ikrbjg5" + "commit": "9c500225fc1e084935f4865e2117acef8e30c5f5", + "sha256": "1y7439ipgpj57asmxhdgnkjyakh7ijj2242al5ljpswqmb5404kk" }, "stable": { "version": [ @@ -41731,26 +41923,28 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220223, - 1659 + 20220315, + 2208 ], "deps": [ + "project", "transient" ], - "commit": "ed6d6a1b362fe389acb7f7e1bf6d89ff88e060af", - "sha256": "1zs3ywy81754daygch6nc03wg5z953gm03kclnv5fngxjzjf5xgk" + "commit": "b0ce078b86ea8d52a2608af4217ae80d9bf0cfab", + "sha256": "1lvnk71fb4qkh8a7h7spsdhmc9nnj1lwgp9wr3c2fgzjqsl62kgr" }, "stable": { "version": [ 0, - 22, - 2 + 23, + 1 ], "deps": [ + "project", "transient" ], - "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d", - "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v" + "commit": "b0ce078b86ea8d52a2608af4217ae80d9bf0cfab", + "sha256": "1lvnk71fb4qkh8a7h7spsdhmc9nnj1lwgp9wr3c2fgzjqsl62kgr" } }, { @@ -41904,26 +42098,25 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220215, - 2320 + 20220316, + 2111 ], "deps": [ "geiser" ], - "commit": "cfd9116dcb246126950d7f2f662f09149684128b", - "sha256": "1k8qgkamzd6ljvk7xiqs1r0fvr4gzffhylpll7c4zjywrbixw3g1" + "commit": "aa48110d69b018f03dbff0aa9e830111fef71da4", + "sha256": "1v9f90smnk41nz1pjy5mwz199y8p4qar3llgaryzxr7s4wg2v9wi" }, "stable": { "version": [ 0, - 21, - 2 + 23 ], "deps": [ "geiser" ], - "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", - "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" + "commit": "aa48110d69b018f03dbff0aa9e830111fef71da4", + "sha256": "1v9f90smnk41nz1pjy5mwz199y8p4qar3llgaryzxr7s4wg2v9wi" } }, { @@ -42232,8 +42425,8 @@ "magit", "s" ], - "commit": "a802be95aea25f500583f72df968c86c6771a3d0", - "sha256": "1ac6d4fxcac4p6dp4nhbqf3bzd0yvgwajrllrh3j0vcdpzmbg95s" + "commit": "bd0349236baacfdcdf82cb33c9ba45f451b9b255", + "sha256": "1ng68lc1z0rs23qprbwi8j1kj1162k0ckj4i9k6kff671i4f7lkm" } }, { @@ -42343,16 +42536,17 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20201222, - 438 + 20220302, + 549 ], "deps": [ + "cl-lib", "logito", "marshal", "pcache" ], - "commit": "4b2dd0667ebe9c684c1de5bc96961c2ab0885c07", - "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" + "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", + "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" }, "stable": { "version": [ @@ -42377,11 +42571,11 @@ "repo": "emacsorphanage/gh-md", "unstable": { "version": [ - 20151207, - 1740 + 20220316, + 1432 ], - "commit": "693cb0dcadff70e813e1a9d303d227aff7898557", - "sha256": "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0" + "commit": "e721fd5e41e682f47f2dd4ce26ef2ba28c7fa0b5", + "sha256": "1xnfq6bbc5bgkd0mzkr7r66sd85qfn859swpsp6sr0xfl8cq12wm" } }, { @@ -42523,15 +42717,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220216, - 2156 + 20220310, + 1436 ], "deps": [ "let-alist", "treepy" ], - "commit": "2f50383cb35f0cc54599c54cc9794bf25387c050", - "sha256": "1ph96pqhizaq2vkvmkbzilacsbyx69g2bbsb3z8kqafrhg0khajj" + "commit": "bd6e02b884368f26aeef9fd67107809f355c2c3d", + "sha256": "0qaz0p7178xd4rs5wxw01804dhnzg9c0dbxlvddm66s6l31baij5" }, "stable": { "version": [ @@ -42896,8 +43090,8 @@ "transient", "with-editor" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -42994,7 +43188,7 @@ 20211222, 913 ], - "commit": "9174c74cd607e297d7f14c0595d4c20ebb53847d", + "commit": "abe65ed3937fe038123549b948f37a3bbf1c4029", "sha256": "1jkhvxlk4lkfjgd5vlfjy8z7w6n7j91rxqr48ricyzzl62p4v2wr" }, "stable": { @@ -43491,11 +43685,20 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20211122, - 1800 + 20220313, + 2033 + ], + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + }, + "stable": { + "version": [ + 0, + 3, + 1 ], - "commit": "092324ecb9c0909da2ba2751cb21a994b4e09536", - "sha256": "1zr116c9zphm5kgacqxmll7gzd1h5583xy0asg46dzyn4gn0bmhv" + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" } }, { @@ -43540,23 +43743,46 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20211216, - 749 + 20220305, + 1450 ], "deps": [ "graphql" ], - "commit": "069e25c3e72290adc5d32c380999840ba42ccd78", - "sha256": "1c8hsh2jb9670dwhnrcyk1jcbkji1zrgr5g9ra170ya5gi16cann" + "commit": "49e5c350169b556deaabdcb67e9440bd4d5b4f8b", + "sha256": "08d2s9a8sa6r67dirj5nn1hi1k5hivsjm4yz5gawww30v4w6cwil" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", - "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + "deps": [ + "graphql" + ], + "commit": "d7198dd81afc4ee2001606be821707a9ff4f31da", + "sha256": "0gjzm4h813b065nvf4hvfji67jvygvfgzv5yhmpw5ddj1h6rz43m" + } + }, + { + "ename": "github-linguist", + "commit": "8876af18b9e797ab7521a087278a046e0cecb7bc", + "sha256": "0r77axj20qf4x2gf1c0n5xfia7sfyir9cm5kwkn85w4bgb2179dd", + "fetcher": "github", + "repo": "akirak/github-linguist.el", + "unstable": { + "version": [ + 20220311, + 827 + ], + "deps": [ + "async", + "map", + "project" + ], + "commit": "3f3f5c93f80ec664d7ffadbeb9d30bd4c2741fa4", + "sha256": "10sw9i6r07f5d23qdsy2yk2a29mvzcsrlhnbv8wk1iw8691pkd69" } }, { @@ -43956,14 +44182,14 @@ "repo": "xuchunyang/gitter.el", "unstable": { "version": [ - 20180122, - 856 + 20220316, + 138 ], "deps": [ "let-alist" ], - "commit": "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a", - "sha256": "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy" + "commit": "49327c91eb50cfea633af8fd32b0643691d75cb7", + "sha256": "0m8np2pxmgziirmprs70jbflilc98b7zlx1g07i6mhp39xw1sx98" }, "stable": { "version": [ @@ -45595,8 +45821,8 @@ "go-mode", "s" ], - "commit": "298335fab797d0465516ed396f6e2acbe8f2ed93", - "sha256": "12sn06c4gw5jddmdaw73djlraj01f57z9plnyf1gxss4gnch6kmd" + "commit": "78be56c0f210224b1e3a7d58239e2a32f8f84bf4", + "sha256": "0xkvw0wy4p8viib2s7anh322lvwm8p30g4hsjr9x0j8sqiq838ds" }, "stable": { "version": [ @@ -45648,8 +45874,8 @@ 20210323, 332 ], - "commit": "5da95c2b6d555155189c54b6857ceaafa2b72e8a", - "sha256": "07hapzb7h2rbvxzn1ml4dmzcj1ihdcsw365nirvhjfbipr1y7xkn" + "commit": "573a53f070c71e02d89866f4cdc2ba5ccdc9cecb", + "sha256": "1am0l056dyi71wwzv7viigia9qybdh9b19w4ql1fkrr80zr5m0v3" }, "stable": { "version": [ @@ -45735,8 +45961,8 @@ 20210323, 422 ], - "commit": "921f7b729fff82924c539d96feb47e299c07e7a1", - "sha256": "1v73qzgf1bfkw7j295nmlpqaims8ry5b0vszfxajz2p09011hw12" + "commit": "27fcc9e7062c9d672a513ba306fd32f7736dab78", + "sha256": "1zmpmv7121cv2v5sm3pg5jz7rfhikj8351isx2qa2z165b3ixssz" }, "stable": { "version": [ @@ -45765,8 +45991,8 @@ "magit-popup", "s" ], - "commit": "a41644562f5977dc76f2a385ab77432bfc21c993", - "sha256": "16q09nrsxnwyylfk0zdk0smxqwr31n13hww1i4f5gpw232b5lbck" + "commit": "4cce99f9ab081fd98e4e39733b0bfe2269c83de1", + "sha256": "0vlxzywqnp4wl12kv6i07ipxl8ba3cvi3mx35d88g2q4hs8jzvs0" }, "stable": { "version": [ @@ -46000,8 +46226,8 @@ "s", "websocket" ], - "commit": "b340f523caa88534a89f5fa9fd0fae502e56a12c", - "sha256": "0f8nr981n7ndc7zvj21hsfqiy4h1ry5r1vz004lggphb2lzpzgyn" + "commit": "067c58d79a90071a0d70012fa1722c5c79abdc01", + "sha256": "1w3mj1izjs0y7xpbpy7vrkj7ljpbiz7ivkv4h17847q6w79y92wa" }, "stable": { "version": [ @@ -46194,11 +46420,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20220117, - 1537 + 20220309, + 1336 ], - "commit": "a1b7d66f5c20404a1e59c2ee5e841022622535b8", - "sha256": "1xzpj81zzasj4ys9zypl4svgcikz4d32fvmzxdp8gq67bkwdlb6h" + "commit": "6e96a89762760935a7dff6b18393396f6498f976", + "sha256": "04p8x4lwbp2qwlsr5xlzjn3a25bg0rsnk3nqfvvz66zv0srz62mn" }, "stable": { "version": [ @@ -46410,11 +46636,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20220104, - 1419 + 20220311, + 1034 ], - "commit": "1fd737f7f1e34e27b6d317ba16507bbbe0d2588c", - "sha256": "1b1cams272ppzs00gbcmaxihgsjym96qp399hardiw7j8byav7fz" + "commit": "d49af7a21a1f81d809566755085679bbc7d794a5", + "sha256": "08n9bv5dxygkk8yxm58sha5ds6bcg3zhw4fradwcxs7pcdjlpabi" }, "stable": { "version": [ @@ -47381,14 +47607,15 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20220220, - 839 + 20220301, + 607 ], "deps": [ - "f" + "f", + "hydra" ], - "commit": "2e252559667ebe27485aa990a5ec062f94b67835", - "sha256": "0s2ags1ashr1mk5g5x467xh0ffxzkmyhr9w86qgmjnq37r0iw5zi" + "commit": "331eea2ed64e34cdbea024fa0fd6ba930b60d95f", + "sha256": "0clfdvsw08hb68iq9rhhlfb8rzp1dd81yx5k0d7zs0nqbldr71av" } }, { @@ -47517,11 +47744,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20220208, - 1821 + 20220312, + 1521 ], - "commit": "f13b6db78bc880e680c320e015ae232f525e0a27", - "sha256": "06amab8n56nv8a1fnd9x3ic0s36g6q4c4m5mh6sxcngaqjvvz4pa" + "commit": "5750f74d892ecc8f34ad8c73e75f78bfb3a86303", + "sha256": "1ivizlymkz4ciyyyd8l6y0cdrj72qbymagzmqivq8gxak9wyh71p" }, "stable": { "version": [ @@ -47687,8 +47914,8 @@ 20210108, 1835 ], - "commit": "f6ed4b77cdd775d53a7b824c21fd14e0eec5e3c7", - "sha256": "0314x9y3v8nmknmdw0gbl4njanxiqbh5h5m0kvnph6r6v0cz7m4s" + "commit": "b6daf4c8bfd7fa6ba7b4bdbfe03c0be7704add04", + "sha256": "0g4xp5z6wqhfivyls6asjnqdxmafbyl24fvcqk2s5zd9j94x6649" }, "stable": { "version": [ @@ -47827,15 +48054,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220226, - 2016 + 20220313, + 937 ], "deps": [ "helm-core", "popup" ], - "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", - "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" + "commit": "46008f69fded4fe7e3cba942a8c7ce91a3cf1187", + "sha256": "1447v3f2r0qyd0hkqcl1mp7xm82d31bdf0h2r3km7gf9sfvlhfl9" }, "stable": { "version": [ @@ -47935,8 +48162,8 @@ "deps": [ "helm" ], - "commit": "7cfed5d3e861717466ae6d3f76c759548a9fad04", - "sha256": "0j1l9ifssd2xmdiif0c922dsdii143kjp8ifygqigb9m4wbsz8ax" + "commit": "9109208978bc739fb8fdae760abcea4225048dd1", + "sha256": "0cm1r1qmmmvdmr0sshsndvi9s99n52y4nkirq7cs8alg86iyiyrk" }, "stable": { "version": [ @@ -48740,8 +48967,8 @@ "deps": [ "async" ], - "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", - "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" + "commit": "46008f69fded4fe7e3cba942a8c7ce91a3cf1187", + "sha256": "1447v3f2r0qyd0hkqcl1mp7xm82d31bdf0h2r3km7gf9sfvlhfl9" }, "stable": { "version": [ @@ -49073,16 +49300,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20201205, - 1635 + 20220314, + 1633 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "43d387504a292b36e4e4246abdc9090c1717a561", - "sha256": "0pgrjqhw1xjl5xy329621idg517bfaafvqb3f5wxci6fhm4x46gc" + "commit": "aefa44ab77808626c4951be2df49a2eab7820805", + "sha256": "07ric1lghxdccq30jr3nfzkqa0mpx61kp4mjyi0zsxqcwfyz7zx3" }, "stable": { "version": [ @@ -49298,8 +49525,8 @@ "deps": [ "helm" ], - "commit": "2eb2ad4f3f456fadfb6a0ec044acfef2f2e7af5c", - "sha256": "0z0ssmi8l6x2fca7xfnpkyvfmyc4zgbf925ms3bvgjzwm5q23zmk" + "commit": "6a1d1fefad4b7f3723220da2edaef0b7d6f09a0e", + "sha256": "0wzq9pj1gbyv7cyar0r4hgmskwmksq7xfpjldibw30vzrpiqapas" }, "stable": { "version": [ @@ -49563,8 +49790,8 @@ "flx", "helm" ], - "commit": "6cbdb15094354262a2f5f793b66694e3f2c86e0b", - "sha256": "1gdjczi601586f7qzdxs65vhi9im6zymmqqp02ayz0nbmkijvqxj" + "commit": "e0cf739c0765c3f0186b9d5f691c2c7750a484c2", + "sha256": "1kkcnczk295aib8r37qfl0bcvrvki12wi0r5aqjc1g8vklaf9vbp" }, "stable": { "version": [ @@ -49910,8 +50137,8 @@ "deps": [ "helm" ], - "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", - "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" + "commit": "06255ec6347efb8f1884b4a844f40f94239137bb", + "sha256": "1yp1l6na6mf91wym28pnmc06zwbhg2i3p9i1z7kx9wf3mc3982gn" }, "stable": { "version": [ @@ -50833,8 +51060,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1529 ], "deps": [ "dash", @@ -50842,13 +51069,14 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -50856,8 +51084,8 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -51735,8 +51963,8 @@ "s", "searcher" ], - "commit": "40f0db0a94ad45fe1bdb8928a884784a5adb2bd8", - "sha256": "0kprf6c06bghs4iw4y5w8ar8l2zg2511qdc46h6dpsglrp6d79pa" + "commit": "fedb0c735270764a0fd38cebcd2b3c32612fd455", + "sha256": "0jv8qbffr5wckblkdy2ka0rryczr72m8kgmg5y2is1jajnxsfwam" }, "stable": { "version": [ @@ -52216,8 +52444,8 @@ "deps": [ "helm-core" ], - "commit": "244121903650c2d25a233d12b378060cf8b010e7", - "sha256": "0ii70wn3vadx8a36q2frmsvrmlpz1w58qgn2w3knjivj195knliw" + "commit": "c1d5f9a2ccdb133aaf6122632166ba4b6fbc188b", + "sha256": "05vd7gxa21lg49hhs0pg0skpidav9qmhcijkjakzi4v8p29qjg72" }, "stable": { "version": [ @@ -53618,11 +53846,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210909, - 1114 + 20220317, + 2321 ], - "commit": "42f744ffb513cf2b95517144c64dbf3fc69f711a", - "sha256": "1f84d4wms8q2kcj5mb6ih6b5ni35fwqvckp2j3mcdznms759j7li" + "commit": "e0ba3e1829aedece7fd54a3c53d4d94376c3e707", + "sha256": "1p008l5va3fzdg3yzsz5bd9hc1p5nqa74rryl88d7qyxaq1bxm80" }, "stable": { "version": [ @@ -54223,8 +54451,8 @@ 20200929, 559 ], - "commit": "4dc29dcae47afa740f001f04ad7f7b77169ea8a6", - "sha256": "1sfbd0a6lgipcd1i8a843433pwf8rfspim13qx0lwghwzva0f7bl" + "commit": "a221c1af3d0a2bdc849adabd4044bb3f63895b54", + "sha256": "1warqfy5gq56mxypkpzd29k280yka2zzi131rrm1j2rr49ipj6dq" }, "stable": { "version": [ @@ -54405,11 +54633,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20220112, - 1138 + 20220305, + 930 ], - "commit": "3871746b51772c95b4419e978af069570c914f95", - "sha256": "1gbhz35chwzy75l514niw3sih3hwj68sn3zavvw8yzsn5yfzqd7j" + "commit": "5828705bcc3eab9af9dd36fd7dc96d48c3020d85", + "sha256": "1aij86pi2p1dy0dakbnm0a8mwy5vffayfk8y05jx3v1cishp324s" }, "stable": { "version": [ @@ -56079,8 +56307,8 @@ "deps": [ "impatient-mode" ], - "commit": "38ece99b3d566c48d9ba011a234869bc1b6f9a1e", - "sha256": "1za9rsf77f1qv2pqhw5myih8lgpdsa8n61pzj5z4lk5isj10cykw" + "commit": "8376bcfc2bbb3762e26dfc1bb8866c452f7935fe", + "sha256": "01g5r3sh1qma3vpyzzhixpw62y0kvphznpnfd80w4a5a3gbwp5m2" }, "stable": { "version": [ @@ -56220,8 +56448,8 @@ 20220227, 653 ], - "commit": "73682aac9aff60937a5f0187b1896c8f78f1b9cc", - "sha256": "195mpasf89jwr35q3gbcq286hx2siv9asyki4bz5wx175yp3yjjk" + "commit": "c6373bdfaf43255141983aea245571364f04d3cb", + "sha256": "0iphkl27ihnv2dmjaj1b3292xsx8g8m11r7hjikh421n9f1p5xy0" }, "stable": { "version": [ @@ -56426,14 +56654,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220208, - 1627 + 20220315, + 1102 ], "deps": [ "clojure-mode" ], - "commit": "e47684de78da1ee470d42ae2a411909b2cf61d50", - "sha256": "0ngkhp4i3qgl6lgld5qbnrk8grd8r18mabrsana8z2pmy58hxz73" + "commit": "f511dcad0e0684c9609c7526930e88d11da989ab", + "sha256": "1xxjqf3j2k92sj4zwhkjywc6yr5x183r8n33lba2v3w5hcfgahd0" }, "stable": { "version": [ @@ -56525,11 +56753,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220203, - 153 + 20220228, + 208 ], - "commit": "f892e6e74ffdf9f80019cf85f4e128dc66359266", - "sha256": "09kzmw9i4d77qjz1i37v40g683d9q7rw79bnxkj56acpd7h9dvk0" + "commit": "dbf4386bac12f1733257db6105e3f1fca05ffb79", + "sha256": "0sb72prfcglkjvpsgadyql5s9r28dbiihby3szl500lv7cfpc6ds" }, "stable": { "version": [ @@ -57456,8 +57684,8 @@ "deps": [ "f" ], - "commit": "68271c7784d9ef7eee61d1f55dc050225d3448e9", - "sha256": "1dzjldfljbmxfwvh3krfkjww6rxff55bwgah9ixmcrlw73gsz1h1" + "commit": "1ccf7219c2f78485aa23174e46aa8cd77a98a6a0", + "sha256": "0bws8fiqysqjcyw1y1ng1dic7nv7g1syml9hldb9gf7b0xan35yz" }, "stable": { "version": [ @@ -57967,8 +58195,8 @@ "ivy", "s" ], - "commit": "044aef3c5f9302cdf326f88b785a355fdeea6336", - "sha256": "1x9gw5xh390naa258xany93w1p37zbwmg87ikjvhxp4zidypwrr2" + "commit": "eb358d8460b944bf764cb6c01f205e6af94c4861", + "sha256": "07lazz8ca9sshrgswl47zz8gvc0niwyi397m3x3vrn5738qd0bf9" }, "stable": { "version": [ @@ -58132,16 +58360,16 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20210425, - 613 + 20220309, + 605 ], "deps": [ "ivy", "migemo", "nadvice" ], - "commit": "b91f341d1b70175baf989f0c6eee6573bf781a27", - "sha256": "0svvh14zhym9ssc0dc7wyr1pw0rhiirn2s7a0xk43wl2r0c36cgj" + "commit": "f31a2b314b81e328ce0222d8796b808230ddaa0e", + "sha256": "07l6x4aysxzrwlva7df5mdmb8kir1w9jpk7jqc5823zd00dmd6hf" }, "stable": { "version": [ @@ -58421,8 +58649,8 @@ "s", "searcher" ], - "commit": "55f5cf2ecc268686e7e124251f3c46c5065368d8", - "sha256": "1fahbnkg12dknkyrcszqm6c848rbalg0sgrxfanq7p9n7wpvskd8" + "commit": "63d55b3c333881d3c9d1e3f1ee50a72e79fd9e0e", + "sha256": "1mydy1akn25xb9wy8y08vmk997h2nvqdm48fnxldxbkli2d0zv1j" }, "stable": { "version": [ @@ -58570,8 +58798,8 @@ "ivy", "request" ], - "commit": "849b6db7ef02b080a86c1b887488e2935c31059a", - "sha256": "0f90dq8qhmsnm2hvnvzyb20nq0vmgnqzqa693scq69dv5rdjgwyj" + "commit": "273788e0d22a06cca1050eb1205d3fbc2245d001", + "sha256": "0w0aifinr8v0sdbj0gasqacwh5gmsb0rcg6jwi8ppga944wlkb2y" }, "stable": { "version": [ @@ -59428,11 +59656,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20211027, - 1852 + 20220312, + 1945 ], - "commit": "647cae28087529d18367f895d7ef689c7f64c6bd", - "sha256": "086h53mmdjx30093zazwylx3fg7jvbcjy63q4ph63ybizsbiy5lg" + "commit": "44280538a2b780536c56ee2a51b7a5b03d376a2e", + "sha256": "1x5k9d1iq33ds8cszcyl2bhbr8hkldq6hph1b77zayqyg00pnly4" } }, { @@ -59798,14 +60026,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20211229, - 135 + 20220316, + 1506 ], "deps": [ "cl-lib" ], - "commit": "997cac4c80a03062145b541b006c51cc91ee0c24", - "sha256": "1wcz3xji7viqxa5is81jd7in7x1fya6rzybm8qj9rwgdc8camvyb" + "commit": "b9ed9e406d59661bb099cb2307dfbfcc1d47beae", + "sha256": "15c5smxfh2dgk6da012fsvjz9c075cxfp2q8fglbalazplzwv4zc" }, "stable": { "version": [ @@ -60362,8 +60590,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220218, - 512 + 20220313, + 633 ], "deps": [ "dash", @@ -60372,8 +60600,8 @@ "spinner", "vterm" ], - "commit": "fc67e4d603907160766cf22e8ef16029238e78d3", - "sha256": "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7" + "commit": "388c4c9ff915dfd5ded6906b62b76f97d59ada94", + "sha256": "1wpaspl09zrj27hw1d4mk935cdhn2cs8jrg53vx7smfppip3ddb3" }, "stable": { "version": [ @@ -60613,8 +60841,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220226, - 1619 + 20220312, + 1104 ], "deps": [ "f", @@ -60622,13 +60850,13 @@ "transient", "xterm-color" ], - "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", - "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "f", @@ -60636,8 +60864,8 @@ "transient", "xterm-color" ], - "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", - "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" } }, { @@ -60969,15 +61197,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20220131, - 1652 + 20220317, + 1238 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2", - "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s" + "commit": "78df90fa411c0d24d884abd47bf63a167231a84c", + "sha256": "05z7w4ig17w5vxz3g4waghkq8ay9cdjc22aihn34h3q7h1vlv5dd" }, "stable": { "version": [ @@ -61013,10 +61241,10 @@ }, { "ename": "kapacitor", - "commit": "db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb", - "sha256": "108b3y71p7s3lcwbqxp7hy2l304yj4hxm2nq8iv7ljr8av1q7kn6", + "commit": "afb7ebaf3b1b1b3ce0162de9b8d586d699fdeac9", + "sha256": "0yccmgzmhwjnnzlqhyq326adnxkf3s27gg67g1w1hba1ippg7l60", "fetcher": "github", - "repo": "Manoj321/kapacitor-el", + "repo": "manojm321/kapacitor-el", "unstable": { "version": [ 20190414, @@ -61119,11 +61347,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211105, - 316 + 20220309, + 647 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -61134,11 +61362,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20200601, - 333 + 20220307, + 829 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -61543,8 +61771,8 @@ 20220222, 639 ], - "commit": "f0f8b04f9f8e7863bdd3459d6ee6fd88ecd55dcf", - "sha256": "0vkaz5ifqasn2q51hnx024pdbr48xvx07g1rclfpw26990ah6yqa" + "commit": "33e5e50b795a48315d869d9545c650b7641eed0a", + "sha256": "12zkfsbsbf3s5ifyfrbv5xyyrif59rkk89in83ghys03qp5kmybs" }, "stable": { "version": [ @@ -61799,19 +62027,17 @@ 20210318, 2106 ], - "commit": "71aca81024898c9c6ef88962bddc5462a93ffa0c", - "sha256": "05w51blhz9527idrky4c9j24vqlk7dnygws4ynsp78icn3lmixx6" + "commit": "06c15c1f7567c6dbc97248c85467bdfd2fcf3cf8", + "sha256": "0w36wggnmf7dq0kqkkm66zq9adq2r1f8zrdjw6qnbg7b9bdxwxik" }, "stable": { "version": [ 2, 1, - 0, - -1, - 1 + 0 ], - "commit": "87b60702e0bf8eee929ba9ac4db725d12274d7ba", - "sha256": "0ppy54rvknghjcxrbja72n45yn5ljcqbvddb3rvn8pfpzih6j1pg" + "commit": "023bd79b90f9831b45bb8eb449346648aa5fe5f8", + "sha256": "0q0hn1q5l1pg3ma2x922m93vpfax7x9cmm8psy3qw7b5pf4cillk" } }, { @@ -61822,14 +62048,14 @@ "url": "https://repo.or.cz/kiwix.el.git", "unstable": { "version": [ - 20220210, - 1403 + 20220316, + 847 ], "deps": [ "request" ], - "commit": "d21cbe30d697fa6720d016c52a807c8502719d4d", - "sha256": "0yapgm2fp9igc39did3h1kf3m236683h08n6615kldq8wxd5w774" + "commit": "444f686a7f75db788d54f544b923a3532732eb8b", + "sha256": "1pdm69ghdfzv738c5y1b61d12cfafkvcmmjf0v4m3qai2xxqk4sn" }, "stable": { "version": [ @@ -61875,18 +62101,18 @@ } }, { - "ename": "kmacro-mc", - "commit": "08973ee8f00035da7092e9eb8b850323ae83a916", - "sha256": "0ysgfrv0y4i4v6nppcs3gflx5qyx3jnkgygv0y24f833qnrnjgkd", + "ename": "kmacro-x", + "commit": "207d9fb6f29a426ce1aeac517ae31d69aa1f4d8a", + "sha256": "06q9lv3a4jsn6a9xfp0aw980pl938h817bagqq5xkh0q169f34qm", "fetcher": "github", - "repo": "vifon/kmacro-mc.el", + "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20220123, - 2254 + 20220317, + 307 ], - "commit": "c7fe2f8200ae993787246ad6c8a5021b4946b118", - "sha256": "0q3gwf42fsii6c1ql8imjryv0a47gam72yw5gbqsrhwiqr81lyll" + "commit": "f9df322d0c894129ac96e9a4fba03077957157be", + "sha256": "10gvrj5qsi6nvldl4rnxxqbwr92b2y53gsx8lk67ljrcq70vqgd1" } }, { @@ -62116,8 +62342,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220104, - 2320 + 20220318, + 2124 ], "deps": [ "dash", @@ -62125,8 +62351,8 @@ "transient", "yaml-mode" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -62151,15 +62377,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210922, - 2325 + 20220318, + 2124 ], "deps": [ "evil", "kubel" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -62313,6 +62539,21 @@ } }, { + "ename": "kuronami-theme", + "commit": "f1fe04f11b3ab6ee00a36d2d171d7042aebe3115", + "sha256": "00f5lxhpqy1p7nlaw7nka90hy95dqrg7flfv5i9f8nrx9r3r7rpp", + "fetcher": "github", + "repo": "super3ggo/kuronami", + "unstable": { + "version": [ + 20220309, + 604 + ], + "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", + "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + } + }, + { "ename": "kv", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp", @@ -62380,29 +62621,29 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20220108, - 1536 + 20220301, + 1629 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "14c6cc2ff8c0c6b20b83fb075b94a8661a985249", - "sha256": "1vz0q7z3n6iv2m3xiw5m5f17ifig47c08zz2sm3svqwjq328pnwh" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", - "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" } }, { @@ -62513,13 +62754,13 @@ "highlight", "math-symbol-lists" ], - "commit": "df2081b207ddef0fe1b83d8a2405858d8e361bcf", - "sha256": "0v2xj6x6g11g77lxzj4j777ajkwf448h0a71xzy6zggq16hvw9ma" + "commit": "c73645f35868bf436f9b50dc81a75b58c7e10806", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ @@ -62527,8 +62768,8 @@ "highlight", "math-symbol-lists" ], - "commit": "215a0e2434811f026c357f92ca15652e31a945a5", - "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm" + "commit": "0476fbec66e99750abe9d60c3aa9cb9a52189bea", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" } }, { @@ -63295,11 +63536,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20211214, - 1449 + 20220307, + 854 ], - "commit": "f47df6a18060002b47352b9c4b502556204df61b", - "sha256": "0g7qxl8b6cazp4vlqr8r6pksmm9vlrl92142k18vmfbabnjgfdm9" + "commit": "b55384d9cd14aa0ba3eb100660f929cfa6674558", + "sha256": "0wn9v7qarciq16hhcl8dy8yp1hcdhmircqkla59g5khv3qybjphs" }, "stable": { "version": [ @@ -63791,19 +64032,19 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20220215, - 303 + 20220312, + 2215 ], - "commit": "b15230dbfc66cc92bbde8f9fd369522d7666c0c7", - "sha256": "0xpjcp4b76lc0d5jpry055d572rdp93vkbm8ck5yh97wy1y2837w" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "69f2d87984f3f3d469db35e241fbbe979384cd03", - "sha256": "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" } }, { @@ -63838,8 +64079,8 @@ "deps": [ "request" ], - "commit": "19a77b73e655d4ed5de50674ad0f8c44c8f6f7b1", - "sha256": "0a7fzbapygdq6jrwbiy0cmqyf19hdzrzv7xd1f1pwa8vknhzjn7m" + "commit": "52fcd8efc293694af1b23ea401a2991f8554dbbc", + "sha256": "1cp0301l3byhzd4gyil9p7iljfgkjn2c93ilc9b88b1kj7cvbp2z" }, "stable": { "version": [ @@ -63880,17 +64121,17 @@ 20220209, 755 ], - "commit": "35d666b3e14c69eeb968f16ca8635a57b908d8ff", - "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" + "commit": "ce20b1a708224cc01dc267f3f7b76b04b0ee9548", + "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" }, "stable": { "version": [ 1, - 0, - 2 + 2, + 3 ], - "commit": "7032d39df69b5d727215c1f31e5bbc29970a30a1", - "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" + "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4", + "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" } }, { @@ -63901,16 +64142,17 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220206, - 1919 + 20220309, + 848 ], "deps": [ "fringe-helper", "ht", - "indicators" + "indicators", + "ov" ], - "commit": "c2e3b1411665f882337adbaf53af831ee10e3034", - "sha256": "1x81saxhzlaf32hhjaah1z6s7vn7jcdxxpckj4na3zx3ncg1r5jp" + "commit": "d60c0d498f12d550200d505cd8b43f953eff2ae4", + "sha256": "1kx2k2fsygf9qq9wq9cs6h7c4lr58ip781l9yrffj2vhhhmrg5kj" }, "stable": { "version": [ @@ -64155,8 +64397,8 @@ 20211004, 1429 ], - "commit": "87241398f185a134940680c1f0d0f24951dabed3", - "sha256": "0i26bzba5ysvscghgc8lih8y3vvyl6jbmlny9m7790fgy9zkps1g" + "commit": "08e6da70e485307b7c5777caeb60737de183d228", + "sha256": "0d5vkm5cpnl38zfbjfhbl6wffmrlxx4bxkh4w4f04pr97i899n9z" }, "stable": { "version": [ @@ -64660,14 +64902,14 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220225, - 2010 + 20220308, + 1707 ], "deps": [ "cl-lib" ], - "commit": "533a0c0777e25134d2782917648b6e8d8274a3ac", - "sha256": "0pspw0w0w8jzi97hhsrgniwjymf7ri59kqkjv9lrxycxddaccc5q" + "commit": "59ef93dca6618c42db1b61fe0a44bdc8faf04506", + "sha256": "08i5v97azfxkp4aqsg2kijyy2w5swxhkplvp40v1bswyy3kn176v" }, "stable": { "version": [ @@ -64749,8 +64991,8 @@ 20220208, 308 ], - "commit": "0070f01c244bd103b935052356f16b9c5d1d7387", - "sha256": "0l0w9p6vk6cjm07cmblrsk7f6vnz9b3i39yg6bzklzzqiwaskj7g" + "commit": "38864c22bf68c7a8975d1d5b2ba4881f75ac2442", + "sha256": "0lwnsxpggp5rwn7z55sgq1ibwzkb61avpna74q3gfjq2ncfx03jr" }, "stable": { "version": [ @@ -65145,8 +65387,8 @@ "ht", "s" ], - "commit": "ab124ae3b38e77f5fb14c8902928d7b010b00b41", - "sha256": "1fsx0lyfj05wqnl0i8dw1slxndcg0b2p1fmcdhxvmsa5k4l11v2y" + "commit": "b5ca8bd44a900fb85636fec9b326d0c117d3b8a6", + "sha256": "1ay81g4s02jkwwy62s2c3218b5z9z012nyrqihlx44fyglyi27b1" }, "stable": { "version": [ @@ -65318,11 +65560,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220213, - 126 + 20220313, + 2103 ], - "commit": "c6e7baedd652a9a2b7e6b9418039e8f4922e0baf", - "sha256": "0r6yp86nbbxv6m4mzh7xya2mqxrq77s3qpzf5w5aj9hlnx1p5psl" + "commit": "4ab32794b07f77b1d243dc07239c417f20cab7b8", + "sha256": "0k7mnwqkd07lwwbb7vn5bfncrp6alfggv9m07bzk7c1v4s9fqwhw" } }, { @@ -65356,11 +65598,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220227, - 1436 + 20220311, + 1130 ], - "commit": "ac0e295080f08797b6a161ff1df550ff78e9c759", - "sha256": "11ngiihl3daynk03z9ndl3ivkgxbx0k4pg4qynw1n1j6pxasb0b1" + "commit": "bd93fcd42fc2db76bf6bc3fbb4eb7401444bd04d", + "sha256": "15q0y594k5k9n96dygscc4a6jyslwri5z8sf1kg1shpkwyj3bjyz" }, "stable": { "version": [ @@ -65500,8 +65742,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220212, - 27 + 20220313, + 1835 ], "deps": [ "dap-mode", @@ -65511,8 +65753,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "40aa90d8ad0ec6d5f9682e135eefb794b675dc9a", - "sha256": "0dbbfsspwfx654y8gkn12whf5942lchcma8ki6jy06h7pbx4wgm8" + "commit": "01b58674842197eb565fdbaa723e9e536ae6d6ab", + "sha256": "1damw69qmgrw7rbsgk7mkni1isgargg17y68s7c4r5x0hg42wksy" }, "stable": { "version": [ @@ -65604,8 +65846,8 @@ "request", "s" ], - "commit": "f54d1a7ec9ee1b7bd4fd71490038064d49caa1b5", - "sha256": "0vjwwfl54lm0szsrr40mjzk3r10j0cmiks2gbwhf1aa948lwda82" + "commit": "20112b40fd3f6cbd20c659ef43a6da6635e610df", + "sha256": "1p3f90f0gsa8mj9pv905f51zb1ymyfbhz20171hv69klz4hlqfsn" }, "stable": { "version": [ @@ -65632,14 +65874,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20220226, - 1437 + 20220307, + 2312 ], "deps": [ "lsp-mode" ], - "commit": "69ddd5d32d6d7d658ec3f89c8ec6280e912e6be8", - "sha256": "080k3ghhrnlnlq8dzqki6jwnxg3dvg2kzcsx8214k7sfp47qfkwn" + "commit": "7cf64944ab3a25ea5d6f8d5e0cd33124182df991", + "sha256": "037wcvan0185bhzzhi4phw9z245a28s29zvyfik04c27n0bhm2xf" } }, { @@ -65862,8 +66104,8 @@ "deps": [ "lsp-mode" ], - "commit": "daad61dbdbdac83267c6de04a13f8e2ecde3226d", - "sha256": "1aky40r4850d4203wj1wxgx3xq0pb8rdvcv3b957nclvn8fmzvzw" + "commit": "435128d5cdc8822ccf1bb58f45184cdd9fb8589f", + "sha256": "197drh6lwghdcf52hdk7kc315jlpxlaz8cj76b4q28s0g63bh8bc" }, "stable": { "version": [ @@ -65888,8 +66130,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220218, - 1105 + 20220314, + 1111 ], "deps": [ "dap-mode", @@ -65901,8 +66143,8 @@ "scala-mode", "treemacs" ], - "commit": "5891149014308e73faf025bf40cd099cc185277b", - "sha256": "165040pm6g8sm1afcdp6x6jciqpix12cskn7jhy21vr5ff0awsiz" + "commit": "b7fe3ade85d020560947f1a4f4913130c9dd1809", + "sha256": "0dq18p5bqqyf36mqck0iprydjm77y29k8n2d25xz26i64s3pkykq" }, "stable": { "version": [ @@ -65932,8 +66174,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220227, - 2032 + 20220318, + 1246 ], "deps": [ "dash", @@ -65943,8 +66185,8 @@ "markdown-mode", "spinner" ], - "commit": "2d640a146ad164f87c7796826791d7bcb85a8e7a", - "sha256": "0j7c5m7n7g7d16ldcqicw1f12dwcbak9gx5606qm8q8nlhk76mnm" + "commit": "c6482c1bbfa366a1fc52c32c03164ac77f297022", + "sha256": "0nxjjl7hcbf7br919rkl4q5zixy7r75s08ag98mksbwrfr2mmgm1" }, "stable": { "version": [ @@ -66141,15 +66383,15 @@ "repo": "jjlee/lsp-rescript", "unstable": { "version": [ - 20210519, - 1101 + 20220314, + 1957 ], "deps": [ "lsp-mode", "rescript-mode" ], - "commit": "aac9673855314a1f34037eb785bccbd3f66d7695", - "sha256": "0jyn471mdklhw1il6bbnv5drrl0raiyh17p1qi6rdn20ywi1dbx7" + "commit": "7baf9adf10234cf964feefae99050268e9bc5681", + "sha256": "09jh4q3i0b71srfpsr4w0jk5rn9rz359v8k1pk80636g7448k8gl" } }, { @@ -66218,8 +66460,8 @@ "deps": [ "lsp-mode" ], - "commit": "dc4d5246afe8620cdffaff1a362529f5d63b1ef5", - "sha256": "1sb7apaqxv3mf601v3wxnx3v9jb71avh5m0dw4r80wbkxcgi65f2" + "commit": "010318052021ec041727e58e41752af094c8827a", + "sha256": "1rwszx7qza3nshcwvgq0lq3bnrggyq45k4363bhcqf95fbjl5jxl" }, "stable": { "version": [ @@ -66278,16 +66520,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220104, - 1635 + 20220311, + 1634 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "21ce926eedd41ef305c2d89412506ce59b1a7eac", - "sha256": "0v58imgrcgqs4fla1cncsd3wk6a8d5v7j014nn0pirypwfznyq0j" + "commit": "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7", + "sha256": "0xjskdws354zbs906frcmx37862xldpai09sicdk8jy2sdwhamk6" }, "stable": { "version": [ @@ -66493,14 +66735,14 @@ "repo": "emacs-pe/lyrics.el", "unstable": { "version": [ - 20180812, - 1841 + 20220206, + 116 ], "deps": [ "seq" ], - "commit": "d0b920be634a5be81ad49418cfaada0f0a57d6cd", - "sha256": "0926avnlxi8qkr1faplk1aj4lji0ixa4lv81badi5zsmpyyrwmm7" + "commit": "c3d42f1e039941f32f49252e1b1610de337b4470", + "sha256": "02b0b68bh4jymx08zy2dsgs134mknk1ygb10mpqmyy1z88785ybd" } }, { @@ -66774,11 +67016,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220204, - 1229 + 20220311, + 1219 ], - "commit": "0168a410ea2e25c1e98c9be6381ba0872d1e1ae1", - "sha256": "19v5902fij5q6cfzxx8b9lsm5kkgrzsd9lccj7di1aj2yf02n4jx" + "commit": "86f1ca9f0f45e61a1ac7b96c809a85defc4ca665", + "sha256": "0scg4n7p9k7kj18w2v73f3w5f6xwf7fpjvf0sa253jwpdk6ln5b8" }, "stable": { "version": [ @@ -66798,8 +67040,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220227, - 1341 + 20220318, + 1627 ], "deps": [ "dash", @@ -66808,8 +67050,8 @@ "transient", "with-editor" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -66836,15 +67078,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20211004, - 2314 + 20220302, + 1725 ], "deps": [ "cl-lib", "magit" ], - "commit": "018e8eebd2b1e56e9e8c152c6fb249f4de52e2d8", - "sha256": "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk" + "commit": "efe484644666c6b7c544b0fb7b87e30703fa9425", + "sha256": "1n2q9px8b3s3732a6yiz9gvfxbya7sa2qnxidzcn4gdp867l103c" }, "stable": { "version": [ @@ -66888,14 +67130,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220211, - 548 + 20220315, + 250 ], "deps": [ "magit" ], - "commit": "4845e535a38da2dae1b2dd857cef9eb15abefb41", - "sha256": "0vnp1xn7s447waa1319bix8xnvwbbz0vshplzl37zdjyh1myf33k" + "commit": "f0fff86ffb669357b0897132d386c4c19dbf300e", + "sha256": "0l9fg19izp4f4ph9by1zz6nwpxpvgdl77kcbxykphf22wx5j0jyr" } }, { @@ -67105,14 +67347,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20211004, + 20220306, 2311 ], "deps": [ "magit" ], - "commit": "1ee213d7fa1536c86c128d09946b44ededbfac9c", - "sha256": "1virc4ps25nwv8jkyvlb4ylxpcz676bfw449izaly97f2f2a91hk" + "commit": "37bca48218dc32cad964e01e0f9936a90f634fba", + "sha256": "064mq1xp970gk23l1rpshs1a4spqq4q61b8jjlc6jps7ls888v6j" }, "stable": { "version": [ @@ -67135,15 +67377,15 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20210918, - 2000 + 20220314, + 1957 ], "deps": [ "dash", "magit" ], - "commit": "ee005580c1441cce4251734dd239c84d9e88639e", - "sha256": "1mv5rw65gn2rsk654q1ccp7hdg6jfap123b652cf9chwxy6c6nrk" + "commit": "8ebe246f20f4ab5c9f191c38137833c7f01a0432", + "sha256": "08ild7xc9m8pvkb23x5kxdc7ar7gz7470fng1f0zjlk4izbf1nh5" }, "stable": { "version": [ @@ -67174,8 +67416,8 @@ "libgit", "magit" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -67237,14 +67479,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20220209, - 1857 + 20220313, + 1229 ], "deps": [ "magit" ], - "commit": "e792755514cb5a98b94fcd1c5eacd487f7e04d7b", - "sha256": "1x6663ycyvxmacww7cdq82cxbjkpgjpwcvxgaqgh6pfc2wwqiwml" + "commit": "96936d2bd92c8bbf87f65bc293f3246014bc2764", + "sha256": "1k0674f9c0h468nl791nrvngymgbdljnsrwapnki5b3zvaxglckc" } }, { @@ -67323,14 +67565,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220223, - 2013 + 20220311, + 1044 ], "deps": [ "dash" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -67393,26 +67635,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20220204, - 455 + 20220306, + 2311 ], "deps": [ "magit" ], - "commit": "5fc67d0ca96d5db8f51ed9f2d9e3a7f69e7cd497", - "sha256": "1gzv5d1iar53b020qy17hrvqc5h0phx4hz22lkdmw0br554vyzgl" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "magit" ], - "commit": "fef1b7772fe192c434089b67644ff93765e384d4", - "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" } }, { @@ -67436,8 +67678,8 @@ "s", "transient" ], - "commit": "60152d5c4e4b73e72e15f23ca16e8cc7734906bc", - "sha256": "1ri53hnhamp3b9nh9dld6wxjvsxrk883kw900gglvw962ndimx5x" + "commit": "12a7b80dc421804450f01a3f23e39dfb618c8bbd", + "sha256": "08z33zy50b8rmkzdvlf5555r87dmx7ng49kpm12ja46m7mycclcp" }, "stable": { "version": [ @@ -67528,8 +67770,8 @@ "repo": "vermiculus/magithub", "unstable": { "version": [ - 20190512, - 2316 + 20220315, + 117 ], "deps": [ "ghub+", @@ -67538,8 +67780,8 @@ "markdown-mode", "s" ], - "commit": "b75bb92eb5defeb358aac09bc50f6067e3c1d250", - "sha256": "1yxkzxxlbx1bhdxry114r5h6ncipycg6szn8gs8xnzj6yi5niyig" + "commit": "dd62c7057155c0a334e6d9087779a2923d2300b8", + "sha256": "1v8nsv1y4fa3y2skx1w3gbf438zlf00zlmsxkh692kmvbkx4sdf4" }, "stable": { "version": [ @@ -67905,8 +68147,8 @@ 20210108, 1832 ], - "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", - "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" + "commit": "3a8398de3a79ca03f9fe55f6f31f70f3f62f8999", + "sha256": "1788n96c5h2s0qmwc7xw9anhcw6l0qqfbgx8mrp2n95mdix04n18" }, "stable": { "version": [ @@ -67931,8 +68173,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e4d748adcf52c6d9483cd9d8bd91a1288c2d7052", - "sha256": "15321wq812plbn81g5hjagxz6pyg7z896zhicgac0v6dv0jz7cyf" + "commit": "492307c6c67c1b397084d85129e2b82cfd2c6556", + "sha256": "1di0m42hxi276a1axqayzvwqalw77zxy89qlnshldh373r5s20ax" }, "stable": { "version": [ @@ -68108,19 +68350,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220226, - 1237 + 20220312, + 1357 ], - "commit": "5767b6ff49e26ecd6aa26f552397d5d2b8213d25", - "sha256": "143d57fy5i5ziwfxxix595k0f98ay5l57x5z69g8lkp6nb7b1rq7" + "commit": "e63d27e6fb24ed16339de9d813c555d40aa1e4ca", + "sha256": "0pfl2h0xgd9jbpzw8b25pa601gad8p4l470yrkhzyzv5hs7774s4" }, "stable": { "version": [ 0, - 12 + 13 ], - "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", - "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" + "commit": "bd98c02720bc59a5c185c293f60595d06dfd7637", + "sha256": "1qk6j7l39z92h4kvvbwcs85ilyx3d6y0l8zm33iar2pjnyks1kq3" } }, { @@ -68443,8 +68685,8 @@ 20200720, 1034 ], - "commit": "74d9f566a41805cf7f2d49bb69400cca91fe7b8d", - "sha256": "0rmavxh8dvldzbc0glcg9ya2dv5gnv2nfrzc5r9yrj2slkip51qn" + "commit": "9fb36834f151ff47ae4122cc18c341f366f035fc", + "sha256": "0yb4kr5986shjjd8j6sjvynh4ijmq38y4yjy2hmrzk7chd658qnc" }, "stable": { "version": [ @@ -68632,11 +68874,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20211122, - 833 + 20220311, + 1955 ], - "commit": "c945bf50251150e0d4ad7ee751c7e9615cb4b3e8", - "sha256": "0f0h73n5zg766aqhd8w0s2lbg71av4nyswzbcxprah7l57yr6kzi" + "commit": "45febb409c474417562f79e90387d3568b4fc024", + "sha256": "0sn4c8gbvf68sn3qh75lq499lqds1rcc7ccifj5zgzxcgaf2x2wf" } }, { @@ -69139,20 +69381,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220218, - 2024 + 20220313, + 809 ], - "commit": "7d3139c9f55ba85c00e5f5b1a396be98fea1762a", - "sha256": "1brw32ghmk0l98wk0n34v8as0g816n87f8drq794y8hkx8iiw6lz" + "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", + "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "b494651e1e02a232c5b9a359d6d4474ade736baa", - "sha256": "1w6586q237c5li8c0rrivissvhn2hic6l199yr9qx92mm9cvic0q" + "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", + "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" } }, { @@ -69163,11 +69405,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210720, - 950 + 20220318, + 2012 ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69195,8 +69437,8 @@ "auto-complete", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69228,8 +69470,8 @@ "company", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69290,8 +69532,8 @@ "iedit", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -70711,11 +70953,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220227, - 1815 + 20220316, + 1159 ], - "commit": "425d428a014125022315c2de69c17700a884d3ea", - "sha256": "0map0cy1p887bgjwswnzjq9qmvgw7r8g82515gvqb8x6xw2pfyj3" + "commit": "87508b4c21343cac910040705fe14f84d2c70d70", + "sha256": "1xliizsbdg6hqkyf0fvl03mg95qspzpcsgvnj54cpc8vbyj9xafd" }, "stable": { "version": [ @@ -70738,8 +70980,8 @@ 20220111, 1220 ], - "commit": "0aad6ff44b9ee496d8c1053c3d7cbc59e11e3999", - "sha256": "0x9x7f53wv02a3i9sjhmkx0bhk93civgq52rfi2maawshh8cwwdd" + "commit": "edf3fe47fb986e283e3b04cba443dcb39fe8720e", + "sha256": "1wr6xd3hhgnqjrr2d8llbrdaagi4wz77zfxh1jg2f2mj28i52ksz" }, "stable": { "version": [ @@ -71164,11 +71406,11 @@ "repo": "Melchizedek6809/morgentau-theme", "unstable": { "version": [ - 20220223, - 1047 + 20220228, + 2214 ], - "commit": "63792c50a1fdfdf85c6ba6d7a8eb9fc3ec0a434a", - "sha256": "0p448x7kl4y9zapkf808x4yxg86ifih95af2rhgzaxxm6ndvkyjl" + "commit": "1efa7fa43f408660fa49a927ff03763354aed5f6", + "sha256": "0kl87pgy3zmz2aav80y07lm21rjwlrm2x0hb14mgq412rci287hd" } }, { @@ -71361,8 +71603,8 @@ 20210306, 1053 ], - "commit": "f4ed28f37281ae0f2318e5f52f46ba49d58c8ebc", - "sha256": "1k1aclfizzypa007x4zrpabjc8s8gpid7phwi1bycd418nhbx5z8" + "commit": "140ccd7ed9ceb6ce7eebf3b4024f2e78b12bdfa6", + "sha256": "111fgfmzdrhin68a0vsr0bf84930af1cscsjc9sc91h2a54lyz6d" }, "stable": { "version": [ @@ -72095,11 +72337,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20211230, - 2223 + 20220312, + 2321 ], - "commit": "81262345927d30571d2797a8fb8dbd9eeeb6ccf8", - "sha256": "1ps0dvbms7bgpgbrvy2yajy4xp3nxrscvw94krdxvnb8ycnvdqrk" + "commit": "c0a37d5ee969ca8a783bf6c4a9084c4efeace86d", + "sha256": "0rn0iixl37px4sbkqxrfnfkq6kmb9dsn4x83rbz335dwniqxx5iw" } }, { @@ -72968,11 +73210,11 @@ "repo": "nryotaro/narumi", "unstable": { "version": [ - 20220221, - 313 + 20220228, + 243 ], - "commit": "7a3b3c3a314612d16f89120b13ebeb8a4149d829", - "sha256": "0j47yah1prq9kvgx4nvbyvmvgivzalg6m1zjldsa63w76d8sfpqk" + "commit": "5bfb114adc0e6a2d5aebcd6335d1e6850e3f9722", + "sha256": "1vacijawhk60jqxkyk3malv1z6hd4w5dvzfkpf9nivj1fvhps9f0" } }, { @@ -73343,14 +73585,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20220211, - 1326 + 20220305, + 1224 ], "deps": [ "request" ], - "commit": "0738c875045072c277c85882330778fadd3d29f7", - "sha256": "1rxqgb3fj9zvl5pmfd2pb4hd7jrgl8620pnq455qg6b8ck24gl2i" + "commit": "f238d1d45bbeee32e0a8d169f39de4360be908f4", + "sha256": "0i460vn7plvxrzbzlnfldx36aymy0x666r5w3mak3a5ksyqpbi1c" }, "stable": { "version": [ @@ -73769,8 +74011,8 @@ 20181024, 1439 ], - "commit": "c5e509481f1e53ceedc21d0315e125895b24d68d", - "sha256": "1w0hp5fzj6g6l0x77h3c3phq3hvm7klk7bgnk6c3didnvs47z9w7" + "commit": "f0fd305a5772fe06be9627ddcdcf2950449900b9", + "sha256": "0pl0l9dhmiav2x8qbsi52ph7cskq3z43zmgq5jn0bn6dqwzmxizd" }, "stable": { "version": [ @@ -73868,15 +74110,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20220121, - 1723 + 20220228, + 1520 ], "deps": [ "magit-section", "transient" ], - "commit": "00b2b8da57dc411cbaa464521d6f6f5f1dd9eb87", - "sha256": "0rpz1rfvrkw43mjaviy8p865xnsqm76rfmhgs8945wkms54g6qky" + "commit": "20ee8d88900b169831d6b0783bd82d2625e940c7", + "sha256": "0qv5cin9668pxm5cjhrl5sf170g62qqi954q4y2yj7zh3q0qhwpi" }, "stable": { "version": [ @@ -74165,26 +74407,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220227, - 1208 + 20220315, + 2232 ], "deps": [ "cl-lib" ], - "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", - "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" + "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7", + "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24" }, "stable": { "version": [ 1, 2, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", - "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" + "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", + "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" } }, { @@ -74433,6 +74675,29 @@ } }, { + "ename": "norns", + "commit": "c40cac0da3033b1e18edd5813deed53c6c831594", + "sha256": "0zsfsg30smi0wi9854ibcakgr6wp9impy7kxdcghqvvs251sjfns", + "fetcher": "github", + "repo": "p3r7/norns.el", + "unstable": { + "version": [ + 20220315, + 1155 + ], + "deps": [ + "dash", + "f", + "osc", + "request", + "s", + "websocket" + ], + "commit": "b70ab2f9a58859243762c633628ad515f5563da8", + "sha256": "0cw0ry30im3b4b70n7rsp8pyv1567kl7byjck3rdlfrl7ll9bzr6" + } + }, + { "ename": "northcode-theme", "commit": "25dcd4dd8189ad0fbf6c31874daa618bf1957863", "sha256": "0x4dryx174kcjzm11z9q5qqlzr1c9zr0p32zwgbvgypgnvjy6i4g", @@ -75031,27 +75296,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20220214, - 1526 + 20220304, + 1546 ], "deps": [ "dash", "s" ], - "commit": "cfec608e1b95bc834e801bf285b0ff5451ccdf33", - "sha256": "1k05i8xa7c6nzgv0k4kngjnsgcpllvnwj76nl15an4k2jphcd17g" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "dash", "s" ], - "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae", - "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" } }, { @@ -76454,11 +76719,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210923, - 1348 + 20220307, + 1315 ], - "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", - "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" + "commit": "5f9a76290089a5f80b5103879941ebe4a6c35350", + "sha256": "07py859hqci15d7llmjfn2kbdwpy9f2qdzlmnbpv1lvg0272w736" }, "stable": { "version": [ @@ -77398,11 +77663,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220212, - 356 + 20220312, + 1944 ], - "commit": "7ddf5dfe9e982ee1510ceec36eeb4d8bb802ea73", - "sha256": "0jl9zcpxlz89fzvagvwz73y2qxq0vbmzk7rmqcz37f8r75fz63aw" + "commit": "f2c78c4a6059c5f892e48a3887d4368a547515ff", + "sha256": "1zr3pk1ifvn9j4f4n7g53q4wcd3r4zybjni8kyiil4jadmvsglfl" }, "stable": { "version": [ @@ -77560,30 +77825,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220102, - 1248 + 20220302, + 1706 ], "deps": [ "dash", "promise", "request" ], - "commit": "400f472e7b2e45502cac2b96bdde33830b84ea60", - "sha256": "1qj07k5j6493n76q23f4llmbkv5chf9fr43c2b5a5a8cx8qpp48f" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" }, "stable": { "version": [ 0, 0, - 7 + 9 ], "deps": [ "dash", "promise", "request" ], - "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", - "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" } }, { @@ -78619,8 +78884,8 @@ "request", "request-deferred" ], - "commit": "f7a3145fac5d7e637a7cc557e5196086061159e0", - "sha256": "0s4nai9c2s237cwy6649zsgqp6z75129ly43v0kibfvf4pgrbkxw" + "commit": "47cb514f1c70015536d15b34779897e931f45e8d", + "sha256": "0il8v92gwqmhkmc64g3qcy43xl3q424j0ig40hrykmibkqa4rgmy" }, "stable": { "version": [ @@ -78765,28 +79030,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210714, - 1604 + 20220228, + 1653 ], "deps": [ "dash", "org" ], - "commit": "416c95fc9ad8551f1d9544f2504c866daac5477e", - "sha256": "189zzfi5a1qsjm8ayq5v58s5iagibv2vk6rb6zda4p0hrmnfz2ky" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", "org" ], - "commit": "2cb87624238281b438cda67ed375c56403524489", - "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" } }, { @@ -78821,16 +79086,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20220121, - 1503 + 20220228, + 1651 ], "deps": [ "dash", "org", "s" ], - "commit": "64930ad82c0220ad7d80ec0896b8647a3206d2d3", - "sha256": "0r4kn82jwv6w6ngz5azqq7jyxlfcspjj8lpscq8cnha5112qw7nh" + "commit": "9671cf059b681fac39ce910dd8847b5c7bfad170", + "sha256": "1zygrmihzdsciqnm5kl3j4wgmm796q8ppv7nvgn3d8rv6xky5mx3" }, "stable": { "version": [ @@ -79012,16 +79277,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220216, - 801 + 20220305, + 2019 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "f8ad372c5839eeb882d2bd256ddd740e900aad95", - "sha256": "0ky4am88azrnhync6zr3ilq9lf5hknymm6m0cg4iphklx0694v6m" + "commit": "b395f5c90aa06885aa9441217cc0abaaa53ccc11", + "sha256": "1kkf6sryj9xgplxpf69lz3wz1zaifarr1cwgq5if3yc1bb868ax2" }, "stable": { "version": [ @@ -79108,8 +79373,8 @@ "posframe", "s" ], - "commit": "39f22dc98cb8268af67c6df71778ec5784d2b683", - "sha256": "14rjgdl941kja3hndc55q3c65fi7plviirxihffkw498h0vkbyhs" + "commit": "d18e73dbed8ae104699295143a44356fa1029358", + "sha256": "0387n6z3kyqvslv395wajmbsg3p05918wn1wgm2bi4d9kjw6y3qm" } }, { @@ -79344,11 +79609,19 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220226, - 26 + 20220311, + 1629 ], - "commit": "fdb7b59682b656a998bf8821d112283e1a3edbd8", - "sha256": "1ihzv6n4zwxq51gba6w3bgzb4ws18h79z8k1iw24gpbz6pw0pwww" + "commit": "0b7fc3742000431390a2de6be159f547dc4bd436", + "sha256": "17qj6zchfkx31y4hfg356z4fhqnk9b34yjfqpim3xd9qk0hkld4l" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "64fa67a3e4cc7af4084bb879bd8a0e5380333bcf", + "sha256": "187fxw2rg0kw1d2binpa32ckp67r4v10j6ypr077g9qn6nkmyvvn" } }, { @@ -79776,15 +80049,15 @@ "repo": "marcinkoziej/org-pomodoro", "unstable": { "version": [ - 20190530, - 1445 + 20220318, + 1618 ], "deps": [ "alert", "cl-lib" ], - "commit": "aa07c11318f91219336197e62c47bc7a3d090479", - "sha256": "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4" + "commit": "3f5bcfb80d61556d35fc29e5ddb09750df962cc6", + "sha256": "1x3ny357s0h73129mhah6rjipjd0jw6gh3msr6sahwx36nsdrp4m" }, "stable": { "version": [ @@ -79858,14 +80131,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20211126, - 2350 + 20220228, + 414 ], "deps": [ "org" ], - "commit": "14e39aec6e29dc15ff40b219b2b7284a9ec0af36", - "sha256": "0qza6ylknsd0d87dhwxk5hyqzs5107n2s8y189nr23lnyvpggn49" + "commit": "cb85524d5090b8189e965cc49d65be04650c17c4", + "sha256": "1ikcsn970pf5m30h6bqshykpnwpn7vwyyi9ymk3fv6pxh772x5wc" } }, { @@ -79970,8 +80243,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1534 ], "deps": [ "dash", @@ -79985,13 +80258,14 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -80005,8 +80279,8 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -80085,28 +80359,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211119, - 624 + 20220315, + 1704 ], "deps": [ "htmlize", "org" ], - "commit": "55fca47c740c50fe04cbf2b8ae90e02174626c0c", - "sha256": "01h1vdg96ml8zxfi78j178w4m33n2rmwgcl6k2cisymcfijcp2c5" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" }, "stable": { "version": [ 3, 12, - 4 + 5 ], "deps": [ "htmlize", "org" ], - "commit": "ee0417aac3969ec2d776eba1ddc6434d4c61a10d", - "sha256": "0j7394zcbzqfk33g2xdyb3fmw3brxy8v66vvf1j9nqlskfddh7bn" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" } }, { @@ -80261,8 +80535,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220212, - 1552 + 20220318, + 2105 ], "deps": [ "avy", @@ -80276,8 +80550,8 @@ "parsebib", "s" ], - "commit": "b7d43f4c66baeea7cf9a1d3af8a3cc874a6abcea", - "sha256": "1hkqaq8ksda60bsp7qlpvpz66syms0qxs5ig693q3py372p6g9pp" + "commit": "ec449195438f815698241f0b01a5395221b3306e", + "sha256": "19hf4lp1z14gczs0d39vi8lcl67bbraz2wkimshk8fwhjc14wf4l" }, "stable": { "version": [ @@ -80353,28 +80627,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220222, - 1041 + 20220310, + 1646 ], "deps": [ "dash", "org" ], - "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", - "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" }, "stable": { "version": [ 0, 3, - 8 + 10 ], "deps": [ "dash", "org" ], - "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", - "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" } }, { @@ -80400,11 +80674,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20201115, - 823 + 20220227, + 2154 ], - "commit": "56d698c2614025538f456479c79073ef40399bc3", - "sha256": "0l20a8ljpg8bk6hw4py5g9wv6kyv6y4nrc06l1w0lr0l808w5gqd" + "commit": "4bcd030f0d736d77c647955739b61fae541417e9", + "sha256": "11j7ywvhsi4a4ayapxqccvag8sraw168pwwq4s3a0f98yzknd9h9" }, "stable": { "version": [ @@ -80424,8 +80698,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220227, - 2050 + 20220315, + 637 ], "deps": [ "dash", @@ -80434,25 +80708,24 @@ "magit-section", "org" ], - "commit": "65ea325071777030978a85cac73ba6741a3c00a8", - "sha256": "0knk77scs08w2gwkxw8an0d743mz1mip6v8dcg44wh8xwwf2hvg1" + "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", + "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "dash", "emacsql", "emacsql-sqlite", - "f", "magit-section", "org" ], - "commit": "6170cc99288e75b8e3f3fd3101b66acc12a9613a", - "sha256": "0q3nhw05wnqh1qgggxsj8wki4ihciqlkic2x7qbcsskjqm73j1r7" + "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", + "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" } }, { @@ -80521,8 +80794,23 @@ "simple-httpd", "websocket" ], - "commit": "df1f9522c5a9cdb248208427fa9df4f2a7666e2a", - "sha256": "03kyg95f012ql0gpzy58kzxgdfksig5zlbr1p9m9ycgqmmxyq4jp" + "commit": "1eb9abd4fccc7be767c5df1e158e2d17982f8193", + "sha256": "16ld8ky0z3fi2bx79h3vrppvhgkhv62k5fymfcif7z0xmcv688kh" + } + }, + { + "ename": "org-ros", + "commit": "a7b6aff1afbd525b43a53229be4e6faf166c6968", + "sha256": "10jfdrrqqk0y43z32w0hsiih1l3rb6yafkqwxj64dgfd0iz4szsx", + "fetcher": "github", + "repo": "LionyxML/ros", + "unstable": { + "version": [ + 20220307, + 2308 + ], + "commit": "bf3c4a3a41ad960ef5d9ae062a20664834e926e9", + "sha256": "1l7h6f2ins9hgxd5yqb608hca5212x6crxwsmyy6025n0rq4yqmd" } }, { @@ -80775,8 +81063,8 @@ "deps": [ "dash" ], - "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", - "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" + "commit": "1d7aeee94667d9277ca5452ff44ebca67888d244", + "sha256": "0qn653fml01m1pyw8gpn7xmbbrk3yvg83q39pxjwsr8rib27jwgp" }, "stable": { "version": [ @@ -80807,8 +81095,8 @@ "org-starter", "swiper" ], - "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", - "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" + "commit": "1d7aeee94667d9277ca5452ff44ebca67888d244", + "sha256": "0qn653fml01m1pyw8gpn7xmbbrk3yvg83q39pxjwsr8rib27jwgp" }, "stable": { "version": [ @@ -80896,8 +81184,8 @@ "s", "ts" ], - "commit": "fb5e2ef277bc811a3b061106c99e4c47b6b86f80", - "sha256": "1sjx5ahyjpxv5xkxaf1x0p64bjls8ralv9knf80w17nb87dk3p91" + "commit": "3108bc3f725818f0e868520d2c243abe9acbef4e", + "sha256": "172kjz03byizc972h8qh5hp5lrjqxp8x7cpcqykzj5j4db670ym1" }, "stable": { "version": [ @@ -81058,15 +81346,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220224, - 358 + 20220315, + 1159 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "c9bfe0d84f1ea6aa18febf098ed47dbf7373782b", - "sha256": "1ldc8calzxszqr8zp3fq5ix72pszg7wjh48a7wmj2kzd6p56akh6" + "commit": "aad66c775e3010f7af2ebd3e0914aa6a57127f1b", + "sha256": "01y53nh9z7y77gns28dg5s2sr672i3sb39vpflx7mhfcijkribzj" } }, { @@ -81493,17 +81781,17 @@ 20220227, 1536 ], - "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", - "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" }, "stable": { "version": [ 1, 1, - 3 + 4 ], - "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", - "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" } }, { @@ -81602,30 +81890,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20211112, - 1600 + 20220228, + 1652 ], "deps": [ "dash", "org", "s" ], - "commit": "729445496d94ea0050706007391817ef84dc0226", - "sha256": "0xa545wbh7kjbpry74x2bkw6rs9dshlajb5i17zc6v8zf400ds4r" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" }, "stable": { "version": [ 2, - 5, - 4 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "f5512304dccc152816f9957f5627c814bcb0f683", - "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" } }, { @@ -81878,8 +82166,8 @@ "ht", "s" ], - "commit": "9570a0d438cd41332e273a057cd697de859a39ec", - "sha256": "1b7wn7b50nrps72v25c644bm19j7z0d2scpdh1bjmk1zz0mdzazx" + "commit": "3cdd1985ec06fe42b81f3029512c7530a33f15c8", + "sha256": "0xg4vikw8k3kzn5vlqcf1jagalnq2xwd4wps8l37fr1iqkpr7wqb" }, "stable": { "version": [ @@ -82288,6 +82576,29 @@ } }, { + "ename": "osm", + "commit": "6836bd94e02dd18c0a865824e1b3f285905aefc4", + "sha256": "12zlr5l8x98gzasz79f1d1i8f486c3djx46v5p0zzabmm06vfhai", + "fetcher": "github", + "repo": "minad/osm", + "unstable": { + "version": [ + 20220318, + 1151 + ], + "commit": "cd3f8e0d05ab453f9dee2527448a53c8a0e5a1cc", + "sha256": "03nw3iv7jyhv5cnjaz56jhxxzlqas55i927b8q5xb4qc8bwclm19" + }, + "stable": { + "version": [ + 0, + 6 + ], + "commit": "f76decfd0e94d5fc030a1d5c3230c213c87b47ef", + "sha256": "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5" + } + }, + { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm", @@ -83045,14 +83356,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220225, - 358 + 20220318, + 2004 ], "deps": [ "org" ], - "commit": "8503350603c10d1e264f5599ae288fd71725919f", - "sha256": "1a5idw9p83m3jnf8s3f0lg28pw5059n05q1m4j5d92wajxlxf2wv" + "commit": "917bab6cfc05d8c64e299d10f499f69cfd055b08", + "sha256": "1bqdmyaz1jj9xcq1ik8f91g6gbkb91rypwikqzmlk11dgp7fw8qi" }, "stable": { "version": [ @@ -83549,8 +83860,8 @@ 20210118, 536 ], - "commit": "238e05b01dde37fa27a3a8943cc04dcc9b9b83b2", - "sha256": "0949gabr0wfsrzzaf217jsaawkc3gj1lxkrzwp3bigmxngsn4ykn" + "commit": "edb2cdf36db88d233d4103df91357579f4b7650a", + "sha256": "0pcskv3pv6208pb4dx5gchvl1n38maxysihllac4b8avsjha9gc6" } }, { @@ -84159,8 +84470,8 @@ "repo": "r0man/paimon.el", "unstable": { "version": [ - 20220218, - 1904 + 20220304, + 1110 ], "deps": [ "aio", @@ -84172,14 +84483,14 @@ "request", "transient" ], - "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", - "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" + "commit": "38e6f128dc0a84ba805089808aff9942584db56a", + "sha256": "1dqagd4856dfy8m6ajb66rl9nlr4dyrkpznpkrm5p8xdbkryhb3v" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "aio", @@ -84191,8 +84502,8 @@ "request", "transient" ], - "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", - "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" + "commit": "38e6f128dc0a84ba805089808aff9942584db56a", + "sha256": "1dqagd4856dfy8m6ajb66rl9nlr4dyrkpznpkrm5p8xdbkryhb3v" } }, { @@ -84709,8 +85020,8 @@ "deps": [ "s" ], - "commit": "fbb88260179dd92264325dee37d7898619407558", - "sha256": "0ysgwj56wj8cbm8lrn24r89rbsxgc3s8idvx9x5apxddcjin80ik" + "commit": "aeeaad3fc5ad98906fcb34ed9b5b33e780b24cc4", + "sha256": "0iwpl5chrq81p1hyz8l9q8w17a15c781vljl39ywr50rwj0f6rl4" }, "stable": { "version": [ @@ -84786,11 +85097,11 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20220207, - 1351 + 20220313, + 1649 ], - "commit": "90595049634549e6d8872f719b13e9555897d17b", - "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" + "commit": "f32c041f2b301e790429fd16677c8cab11645702", + "sha256": "1i3xrhfhdjadq6qyn492r37ayd88cna1yih87b9n3iky1ziryljj" }, "stable": { "version": [ @@ -84950,16 +85261,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20200328, - 1214 + 20220306, + 2230 ], "deps": [ "auth-source-pass", "s", "with-editor" ], - "commit": "eea24967a002a2a81ae9b97a1fe972b5287f3a09", - "sha256": "0vsdy989b69widmvaj2hzkmraddwzkpbbnj16gv95bhl51av2582" + "commit": "c4d8a1d815e79ddd89a85d3e36a41d29f0475771", + "sha256": "1gcpnh34ra7ahzmkh6rh4wkp745f8n14jbrdq2mhgg4zvxc2w83w" }, "stable": { "version": [ @@ -85904,14 +86215,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220225, - 2254 + 20220313, + 716 ], "deps": [ "cl-lib" ], - "commit": "7297dabf6de83642e8242052fe95c79d4233eac7", - "sha256": "0rf28lq8nz3mx7hkcny10wwiaj27ph8hwpvqjji86x89w9w67pqr" + "commit": "14cbdb5460d7ee728d397aace280702866eb880e", + "sha256": "05w69p7qimnidiv08qbcj8pj7y24qj3cs6118m363pprri4yw2pf" }, "stable": { "version": [ @@ -86515,8 +86826,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20220120, - 1919 + 20220310, + 1511 ], "deps": [ "async", @@ -86524,8 +86835,8 @@ "f", "php-runtime" ], - "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", - "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -87121,11 +87432,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20210123, - 1507 + 20220312, + 1316 ], - "commit": "8a5e95c8514315cb40c47f1acdb68a4ace921497", - "sha256": "1p903a3jbw1jp5l6d6mb50dq5zd8951qxh2b97vy30p3nnl8i0lj" + "commit": "3cbf38c22d783ac77d5dbc69a38afa04e0aa4803", + "sha256": "14ll9z57jlnbvsnzarqi0k0a0bxnkc9y4r52xah1h09v5fmcyi8a" }, "stable": { "version": [ @@ -87156,10 +87467,10 @@ }, { "ename": "plain-theme", - "commit": "e170913006b93f4c235c403c5cde64d274b91e1f", - "sha256": "11hafn2wsj5dskf18q3jd6vqj20nhzii067ll8l38977c070qqlh", + "commit": "c06b0212e521aa168ad4c34c312235d6ad38b004", + "sha256": "0ij63lfpmligzp9m6lvww7jri9cs6gkzhy49wdjqhi5dy63y2xpv", "fetcher": "github", - "repo": "alpakido/plain-theme", + "repo": "sowelisuwi/plain-theme", "unstable": { "version": [ 20171124, @@ -88266,16 +88577,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20220208, - 1648 + 20220315, + 2038 ], "deps": [ "alert", "seq", "transient" ], - "commit": "6dc3b5f913908bca8db85e4b2161a1de76c60a58", - "sha256": "1rxlz0l58g2vvlhf0y3s7abfph3nplvm7q4vrymgj1s251kjxmmi" + "commit": "2a2673bdc8e2c2af99040b14e97b39271806bf79", + "sha256": "09w3m2gb0qv3cr3kklv37rgpcaxvyp21sdjmb15c26cf0i8rc86c" }, "stable": { "version": [ @@ -88451,11 +88762,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220216, - 1906 + 20220309, + 457 ], - "commit": "7b02960025fb89384f78ba12ad03cae0ddf1e411", - "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7" + "commit": "60297066e31e012b8087b1b7818febd73e02d2cf", + "sha256": "1ivj61hjg5gqlivb04ynnk2mry8bac9mmf9f473naplzwnd741p1" }, "stable": { "version": [ @@ -88477,8 +88788,8 @@ 20211231, 1823 ], - "commit": "37a04117ac83b3ed24a2cba894443a32795c2f1a", - "sha256": "0vyg6va1wzl0h9sd85a2zy922w6q8za0fq6v07hcq956lhh6wi6y" + "commit": "e112ef1cc6c86151ea97a0bad49026fbbacc768c", + "sha256": "1iwq7p7f1xpiwzlizqqm2jzf2ly0cgaj8zskjrya0lymfz8rw7dx" }, "stable": { "version": [ @@ -88621,8 +88932,8 @@ 20210215, 1849 ], - "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", - "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" + "commit": "8f90c6faeecd77c88883cafc03c37a5cce4b1982", + "sha256": "0zs4z22ib34jg1lblqr5b0gdywb88fp769dk2x53s6sq1gi7cvkp" }, "stable": { "version": [ @@ -88996,8 +89307,21 @@ "repo": "LaurenceWarne/prefab.el", "unstable": { "version": [ - 20220210, - 1658 + 20220314, + 2005 + ], + "deps": [ + "f", + "transient" + ], + "commit": "4d9cac415a4ee86bb5793ce18a350a30f562c2fd", + "sha256": "0f4cm5kvsa14yl93vw750ll51vf1g4b04vl6zivq1nzrb8gjj6zr" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "f", @@ -89254,11 +89578,11 @@ "repo": "kcyarn/pretty-speedbar", "unstable": { "version": [ - 20220124, - 16 + 20220303, + 1726 ], - "commit": "4153fed2c83faad90803f57a3c9364609eb7b3eb", - "sha256": "0s3mms1lvid47g77pp6681zrnvx1v0s08xyk3272nja5w16fizyh" + "commit": "56dc9f114fcc55843e182cde1fc9d7a14c261c6a", + "sha256": "1hz67jhvg9n9d07lil6zqciqhh512k0fv54dl605p7vi704ma2ir" } }, { @@ -89566,8 +89890,8 @@ 20210715, 1213 ], - "commit": "15b58b2220b6a09922164cedc0892f57ad148785", - "sha256": "1dpx6i0fhkkiqcx4la21grsyhkzcwp02qzpa7j9hc984yv1s1973" + "commit": "7bd4d77808e15bc3845b0ab2421bb31c20e981cc", + "sha256": "16ybwsqlw5j92bynm9x56s351y4mh2s51ycbcfcl3460b9adqsxl" }, "stable": { "version": [ @@ -89723,11 +90047,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220227, - 551 + 20220313, + 1334 ], - "commit": "2c948f3a8ed378ae5fd800d2c66aece06ba058b8", - "sha256": "1nmdyd8bldgs0zcsdqdjj4c5kq3742019qlxprx2cqs640fi5y2s" + "commit": "3c07cca10713e8212442143b6999a96ca32b68ac", + "sha256": "01i0m3vdp119icak56yqqcg5zh4j8pgrcanfz9jrgfnyyffar6f3" }, "stable": { "version": [ @@ -89844,8 +90168,8 @@ "projectile", "ripgrep" ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -90123,17 +90447,17 @@ }, { "ename": "proof-general", - "commit": "135c8f2a04739145b500b8742a697907e398d270", - "sha256": "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87", + "commit": "5bab170dd89e99f7c8430a11e6a2d8191b60f746", + "sha256": "0fx1avmkwi8ilmv0lxk6pp91hd6saycggca52z8rvjz66h9rmq3c", "fetcher": "github", "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220209, - 1726 + 20220310, + 2253 ], - "commit": "df19c7ba0eadf9f47e9dd757a7d0350fc967da99", - "sha256": "0xh9x6b4fmbnvs8awdkg74msabchqf7lx9w3z14qwfzn4jjzqwlb" + "commit": "f34a4938399e6b863f14315ba5eeefb5ce047c50", + "sha256": "1cgnjpxjrdwf1sk8a7b76gsdvlsl8p0cwb4yhizvafm5p4276v5s" } }, { @@ -90225,20 +90549,22 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20211013, - 1726 + 20220303, + 1716 ], - "commit": "cbc9826db7a7927956e4c5094427580291f55f47", - "sha256": "0zvlq5lqy5c6bc02v6442ljw8gp377pqnkfv3h4x60xqv0lqpfjm" + "commit": "46c3651c315cf77f1bcf5ad662074f04f095a04a", + "sha256": "0rfcbk445rvickv3ylwhg60lyi7d5snrr38sd4c5k8dv3nnfqxib" }, "stable": { "version": [ 3, - 19, - 4 + 20, + 0, + -1, + 2 ], - "commit": "22d0e265de7d2b3d2e9a00d071313502e7d4cccf", - "sha256": "0vhzy6xy7r7622yid374b4fhnws0x9xpfcnhd1gwp0fmi5g3q54v" + "commit": "854d86bb0922e08ab51eca4dbfd4717d86eb9a58", + "sha256": "0raqjx24rr4vzmgxjp72q0c0qgq2xnl1kf5wsg7g2sk7g294lshq" } }, { @@ -91319,8 +91645,8 @@ 20210411, 1931 ], - "commit": "90dafaef06809eab8fb1dda8bc0955b959fe1e23", - "sha256": "19rxhzbgj5fp0awgij7i7p26ippd5qf4a2c4yzm8vjyjvvmmd5vs" + "commit": "9baa5b228a3c111a42edef026615f3d9584c63df", + "sha256": "0m4a96ghrxbi2bryngs4hvsa5qhjzlv66319cfx4zm49zc4rz0yc" }, "stable": { "version": [ @@ -91530,11 +91856,11 @@ "repo": "glyph/python-docstring-mode", "unstable": { "version": [ - 20190716, - 921 + 20220308, + 22 ], - "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", - "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" + "commit": "01d0470498d08ce9d99dd4ce709c567229f857d2", + "sha256": "1573qiqllckd5xbdbll8h786v5znahd0l5hipda9i6ppb1vj3vwg" } }, { @@ -91667,11 +91993,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220223, - 1329 + 20220315, + 1118 ], - "commit": "b26546ff9d5d112baf822563beffe6f7fdd3c327", - "sha256": "0yx5bq6fq6y1v69cmwxchmxx4lnq5zgc5q0izz392bbpbyha9xzc" + "commit": "29c6815c585c200eda2541b678e499d06c3e14d2", + "sha256": "1b146lq5hwr76fl1abg189xsjdvz8ggaas18n8d3yx4zvjskiqs9" }, "stable": { "version": [ @@ -91700,7 +92026,7 @@ "s", "transient" ], - "commit": "b603c5c7f21d351364deeb78e503d3a54d08a152", + "commit": "ea53891a219659d9339220d5db50a8c525f199af", "sha256": "176c4banbgd474iw49cw17wbvncr13xwgqjsfpvvakd0awpyvzw1" }, "stable": { @@ -91837,6 +92163,24 @@ } }, { + "ename": "pyvenv-auto", + "commit": "ddf36d8974cc527db81d02c4f3792e16d1e5d80a", + "sha256": "141fjkrncmyls064w6kjxgj45zxip71p50scnrf74fizdbw2kn6d", + "fetcher": "github", + "repo": "nryotaro/pyvenv-auto", + "unstable": { + "version": [ + 20220315, + 1606 + ], + "deps": [ + "pyvenv" + ], + "commit": "59ece8554bf249f30984c81c103a5704d2fb27bf", + "sha256": "1f599q5bd89k68s0m9mq08a2f3465j00hklnmbyv0cm3j0majwzm" + } + }, + { "ename": "q-mode", "commit": "fff65433eff01d6239809df4c047f0e4349cc4a9", "sha256": "1vv3hynd6k050nxln83l703ymzyh1kl69cdy4yabdvmkqw4gbshz", @@ -91952,6 +92296,27 @@ } }, { + "ename": "quarto-mode", + "commit": "9534fae4c021b7f9c55175a189156c8658084821", + "sha256": "1cg26blid1kbnk7r1gzlpsd5gqgiqyr63kld0hqpih066xx5kaj5", + "fetcher": "github", + "repo": "quarto-dev/quarto-emacs", + "unstable": { + "version": [ + 20220306, + 2243 + ], + "deps": [ + "markdown-mode", + "poly-markdown", + "polymode", + "request" + ], + "commit": "9250975a4602d7a78efa2b0e477088aa2df5659c", + "sha256": "0n0cqcfmq9d36vdqa47scpny8hpdr975ykw01nf7924zacwgnjfb" + } + }, + { "ename": "quasi-monochrome-theme", "commit": "a9c8498e4bcca19c4c24b2fd0db035c3da477e2a", "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0", @@ -92151,8 +92516,8 @@ 20210904, 1553 ], - "commit": "78317951cd3db986d811de616b7035559831749b", - "sha256": "0z7zpsmhfhnzvf1vqpsj5wsnlxmyxgc1z6599xsbvl30fw589y1r" + "commit": "c680f5137c49e352ff3779f9c82a3f1bd4a2d9b6", + "sha256": "1jjvjdig87krjmnwlxmlal56ks0nx4pgwrb5836srkd3aqlir90b" }, "stable": { "version": [ @@ -92310,11 +92675,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220222, - 1947 + 20220310, + 1610 ], - "commit": "30b5dfdd3a11a513b1c21e448fc8cb1ecc8a71bd", - "sha256": "0fgg2qn5b5d0zm2id80jx9jrdyb4z1fjd8sbn11ajiawsjb9wb3d" + "commit": "e321d8ecfb1bc94c3772ef4d20df0ddf9c9c9d76", + "sha256": "0bnzfr2kz877bpin2xjg53c70npq772lp773ikrvhlj5zvwwk1i7" } }, { @@ -93672,8 +94037,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20220120, - 2200 + 20220312, + 1339 ], "deps": [ "ht", @@ -93681,8 +94046,8 @@ "promise", "request" ], - "commit": "edabb5df2aa0fee0c0f34b862505977dc13449cc", - "sha256": "0g6kj94904ymsk54y5f6ynh5w562hy6bx9lngnwrqxcga1xydk71" + "commit": "911a1c6310b42226392fd03dc1746a4c6fc4eb95", + "sha256": "0zljjqd1qyxh0p5rjphkljbl4b1kpmjw279axxp8y4hd67rk8fc2" } }, { @@ -94339,8 +94704,8 @@ 20211107, 1907 ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -94367,8 +94732,8 @@ "deferred", "request" ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -94619,8 +94984,8 @@ "f", "s" ], - "commit": "7f37c27f52049dae3c2630e5383dcf29fd2260d4", - "sha256": "0a8cf6wp918mxmx90z26mafi6gzyh8sj5qdc3jzjm5yzv4a2n3n2" + "commit": "4ff5fd1660eabaccca1fdbec8bdfbe0ad84eeb6a", + "sha256": "18c5gg6cgxg6dijrc6ijiw0mkxfkyb6pw3dd8vzipz17pszf2bjf" }, "stable": { "version": [ @@ -94668,14 +95033,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20211005, - 2158 + 20220309, + 1919 ], "deps": [ "seq" ], - "commit": "380cce8deb1ea7ad79a8b1aaec4a753bd300b6fa", - "sha256": "039y306py7fb3pn4nhlq2mb7rznd6kv2m9bfpd7hbxpfysj7kmi5" + "commit": "50b8376f152916bc200635a112db9439bc3cc9b5", + "sha256": "12lk6k0jwz3y9bjyxyl14g8qys4zcacb80mkc0hgz0bb7797hp3z" }, "stable": { "version": [ @@ -94790,15 +95155,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220116, - 1228 + 20220317, + 1540 ], "deps": [ "transient", "wgrep" ], - "commit": "dcbaa48689d3d73f8a142a1ab5f1e722d7434ff9", - "sha256": "1djccv9fdl0a3jlv3xsflds1hx5kam2n2ghhv7hr2whivlh9wkrb" + "commit": "82105c6ae75af1587884baeaf3668becd9eb5802", + "sha256": "1pnr461nwhi8zv88bba13mb9m8rxg5nwkvd3rl8c2dzxyw6dzaq2" }, "stable": { "version": [ @@ -94822,20 +95187,20 @@ "repo": "ROCKTAKEY/rhq", "unstable": { "version": [ - 20220128, - 1344 + 20220308, + 1254 ], - "commit": "8d7e25de54f0b11df90a21d3fd2f7fd7608607f0", - "sha256": "17qiigk6ikfcyjgwxifmvwkyl8pa6iapyxz2qs0sbskw5d4mhdan" + "commit": "9cd8c2d61c3b8d4c92542a8c7f7493f61a850dc0", + "sha256": "0pj9900jmlid6ygwv5r8nnz1j4axcspyk73hl2vi1xvlna93yxdr" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "commit": "f554339b7a0be35ba43631a316a797edb888b206", - "sha256": "0pnh1mgv5xi11nrd0w2in5p412pqa29x3xvxj5q24lrwcjpl37lw" + "commit": "32d801fb79d45ef895c4e009884dd82ea3a6e466", + "sha256": "0nfi6mgar27qqf9hr9cnzq9asdisbkrwdlfjq9fzhgdb984xn22x" } }, { @@ -95095,11 +95460,11 @@ "repo": "nlamirault/ripgrep.el", "unstable": { "version": [ - 20190215, - 841 + 20220309, + 1746 ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -95356,11 +95721,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20220119, - 1543 + 20220314, + 2026 ], - "commit": "815a985d7426d716e9f588f6bbd3a12327c3acdb", - "sha256": "01hsnnxmvmk5vqga9781g1sff1fv2x77a4cmm3v5n94sv29jky4k" + "commit": "5e2bcd808f301b1a92cd583f2799d520bd802480", + "sha256": "0gb5bk1c10n4hr9dbwpgyk17qmd6bfqj9v9l0bmrbdvxafmnii8p" } }, { @@ -95940,8 +96305,8 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220208, - 1018 + 20220301, + 2010 ], "deps": [ "dash", @@ -95949,8 +96314,8 @@ "run-command", "s" ], - "commit": "e2751673e19e55fa364bc917e150c72b8ccc3294", - "sha256": "178qs6k5z4s74xx4n6r4qadw4svarvm8sfdxm5z964166r8d3x1y" + "commit": "02a4d366e309b7dd6a45f8a94669a25d6fe80ea1", + "sha256": "0j634n2v8sqpybbmd62jayyamz28dzlmvr45bsijbwxn6b4pa8k0" } }, { @@ -96055,8 +96420,8 @@ 20220217, 2009 ], - "commit": "c8ae5dedb3deddaf35f6345da894ae26d156bf27", - "sha256": "01r727n9gp5c7pmgnka53igcaaphfjy7lqb9w8bjjp7db9ccnacd" + "commit": "26ecc903c50b2ffd289bbe981f9ad03626fc0057", + "sha256": "0jr7i85zacpwx3kqg7yb7mbz0ap8w3ydzb8rlf0syccqjiqwslnl" }, "stable": { "version": [ @@ -96099,8 +96464,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220227, - 1323 + 20220301, + 1958 ], "deps": [ "dash", @@ -96114,8 +96479,8 @@ "spinner", "xterm-color" ], - "commit": "4140ce28ed7beda6b7a1cc6e6cbf242856f1dbb7", - "sha256": "0sd1n4wxw68hj2x87r5vhii3c36p64i36d4mx6ml8f91gxh4nrc6" + "commit": "f4b5c288af2a9833a104bc54850ddabe3996b8be", + "sha256": "0mj94i701k1bdyafvhkl6k8c9sfa50ry9rqnby6i1qk5albxza14" }, "stable": { "version": [ @@ -96624,8 +96989,8 @@ 20200830, 301 ], - "commit": "fef5275f9df821b169bcf5973646c10c9179e876", - "sha256": "1xrwbf4hvm3l33j35q0xii6yrzpqx9v0rvma8p7j41afhhv9fcp0" + "commit": "a6392b3ec6ae2a0390612137f840ca083698929d", + "sha256": "1s598w6zs65jz31w354i734if8bnp377k9b54i1rhmgjkr2p6j2r" } }, { @@ -97093,20 +97458,20 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210828, - 1634 + 20220311, + 2122 ], - "commit": "cce59d2bcc48d622f3978c583108cf853f21789c", - "sha256": "0f8aqq026j0wxkgs0p3yjq3r1jd30lk79199wrdk58x9120pp6z6" + "commit": "407cbed4145af8feb5232b1161a5f79b6a9878fb", + "sha256": "0x15fwrc53z1g517jrqyjdd8diil8sjdp9qhbhnbm2nsp97f07yk" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], - "commit": "57fb0022daf5ca753dc77ee9178267c710c318db", - "sha256": "01xw04v22dh60w49i8h72wa2hvhwpqgriv0chy90m8vmn2fz40wz" + "commit": "07d74b29908447ff33365c23686682066549d671", + "sha256": "1azfr5np6m2zg7r3ga172mls3x64gb3m57lcfzwxgb9l8pmjy3an" } }, { @@ -97183,8 +97548,8 @@ "dash", "f" ], - "commit": "65498b584dd074f69e0c3fa61309542f77acd328", - "sha256": "0q27192qvf4p8cy0ks8bifag2zk2ncyz1ig1sjdwdbwx0drinw7p" + "commit": "09ae519ce825affeb6a033dac81bf7af946127ad", + "sha256": "1gprpjnm7r2faj53qcnch7s05s4jjrsh94hiji50kdi3lrwf2rs3" }, "stable": { "version": [ @@ -97421,11 +97786,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20220123, - 27 + 20220305, + 2142 ], - "commit": "26908ea0e88727f5eb6c5ebae7f9fbbe117ef25f", - "sha256": "0fd7nq7nxl9gjb37r14z5rdrk97p9z80z91i9744c1p6x714w702" + "commit": "a1ecc916f190728b574340754f4c1d8cbe37b829", + "sha256": "1mz8vmswfv0mp5b7cpmj46dik16wxmpa2a0cq87kjp1f8d4m9crn" }, "stable": { "version": [ @@ -97882,14 +98247,14 @@ "url": "https://codeberg.org/FelipeLema/session-async.el.git", "unstable": { "version": [ - 20211227, - 1609 + 20220302, + 2008 ], "deps": [ "jsonrpc" ], - "commit": "589eb5a1c6dee345880a9735c37b8b8f5de1813c", - "sha256": "0yj4r6y74w4b8axvljrm4xmd8n4v28s83wkbafsz8k25i1vrm2pj" + "commit": "427238bdfde880106dd39cf5845b559975e52f4f", + "sha256": "0zrcfycfgy87bpfm3jcfzp72ky5marbd5w4xf4rqvnw9spml6sya" } }, { @@ -98145,14 +98510,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20210523, - 1821 + 20220314, + 1527 ], "deps": [ "transient" ], - "commit": "08277b6c30568adfbe438c9f2a1d6c3db4b7ebeb", - "sha256": "1n0nc3g57kl5d4zh0k0gis70kd05yb2pv7kw8akmdp9q7hxs6m93" + "commit": "c3406576ab855daa2e7084000f9797db59251e42", + "sha256": "0jl7jg844a0cjd5s0x0mpl2if2svhaac3hvc1vxzamdwan7qvqx2" } }, { @@ -98599,8 +98964,8 @@ 20210715, 1227 ], - "commit": "b5f6338f381c796a528d399a3fbaa4bb069d185a", - "sha256": "0wagh0jw2pkkq4rqkvcdj6rdnmnsz983r6mc9fsxnl0nwm8d9m7m" + "commit": "ff41a9988523891de92379b611f8c00b44d4127e", + "sha256": "0k29xx6ym2mqcn6rszxl4p05zqfpfvhcwvc3h3cx0bf5b8pnxd3j" }, "stable": { "version": [ @@ -99435,6 +99800,24 @@ } }, { + "ename": "skerrick", + "commit": "bf90740eac9231fe9c1a71f302614b3ed4d1f464", + "sha256": "1y2v9rnlj4hidp1vr4ivsxg90l0cjbwkw6fayh5dgfnk1brck6iq", + "fetcher": "github", + "repo": "anonimitoraf/skerrick", + "unstable": { + "version": [ + 20220306, + 2139 + ], + "deps": [ + "request" + ], + "commit": "fc88e82aa4b0a71b1fbe0217df4020538ebd8cd5", + "sha256": "0cjch25ljjw0pqj69rckp9b0lw1iz41dd1nl794gfagvl86gl92f" + } + }, + { "ename": "sketch-themes", "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1", "sha256": "18n6blkrn72zyjj4ik3f6w2axmn0rwk8lpbcaynl3y7v7ij35m0r", @@ -99661,15 +100044,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220227, - 1043 + 20220302, + 1215 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "8bdcc23f9b9738dd400b98b4503bb359b7bb43e4", - "sha256": "191rqs073cis7cswjmgxmjp9fw30d8n3kqbw9x8kzqqypw0s577l" + "commit": "6ef28864d4a6b4d9390dbd0cac64f2a56582682d", + "sha256": "0pscgg31slqggdzrjfmkg721lwvqph9qrp833p1j4b7wcc1j8xvv" }, "stable": { "version": [ @@ -99900,11 +100283,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20220131, - 1646 + 20220302, + 1053 ], - "commit": "8074da031ed9d677abc77fb3dab4bb42c6be76c3", - "sha256": "0yp1fzm7kiqd7316v6ndgildf81mslylnmqhx1xn8g8hsp2fl2l6" + "commit": "4513c382f07a2a2cedb3c046231b69eae2f5e6f0", + "sha256": "10bzxhi5d7h18hqclxqy2z857d0sfbsnyxvrhmfkdi0h75zz7m4n" } }, { @@ -101189,8 +101572,8 @@ "flycheck", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -101214,11 +101597,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20220106, - 1055 + 20220308, + 1517 ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -101440,8 +101823,8 @@ "cl-lib", "deferred" ], - "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472", - "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a" + "commit": "323a364d2c220873f935ad46142c05c4fd1dea1d", + "sha256": "1dsb6j2kli0a0y06yn7gj5c72f6qz9fpwqhnvh9glcbqf6vv068r" }, "stable": { "version": [ @@ -101827,11 +102210,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220225, - 102 + 20220318, + 106 ], - "commit": "fba53cc8d05d768dc7835b06d0fb857d7f13d5ea", - "sha256": "1lmf3zmwain0y6psmdazbbh240p64a4p6cwlj55sngbnzqidf7h1" + "commit": "251b9e7e5ba3a92ea26c3d676b9e76f8c42b2654", + "sha256": "1smrz3zh4cq2f344gm7l2jww5c0lkf9pinw6dvpcsl9sasqkxz0m" } }, { @@ -103019,11 +103402,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220210, - 1829 + 20220315, + 1458 ], - "commit": "ce7c9805c9030fe28c4f29720bfe413ee4674c2d", - "sha256": "0pspxxpydzb5yhw1lmw5y6lcgrxq9zdrp40ckgjwdq0x49j7166z" + "commit": "ab9debd7ebbf1d8d1575c81743a8dab508338e5e", + "sha256": "0n20pqhy8c429mfsyx7gr01v3y6zzx92acmryxa6wqa295ndj6nl" } }, { @@ -103086,11 +103469,11 @@ "repo": "fosskers/streak", "unstable": { "version": [ - 20211004, - 2025 + 20220311, + 1929 ], - "commit": "32d6e3814df50284466d6d3a69f7f236e3746699", - "sha256": "0a3cn9kqkln4nxln78wjzr2zph3aa5y3hp0kxymniqz26dga29cn" + "commit": "b2206de2fe43f97e754bbcb0abe9b078a419e787", + "sha256": "0v2yvwgkc48kbqh2lx52044b5d7yvg7d24vivqbri1wny5zpriqr" }, "stable": { "version": [ @@ -103260,11 +103643,11 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20211022, - 2144 + 20220310, + 2237 ], - "commit": "5e7adbd6e19a2d362ba818fdb44ad7744d757df2", - "sha256": "0ikhgqwwfbx1zmbx2scvi9cx7wlzwq91pwjydj2vxsg7c03iadd8" + "commit": "618e40e0a9cf80decea32c8daecb1c9f6eae2991", + "sha256": "0yb8mnix056n6ll17w13afr9rap53bb542xqy5ywcg9ajc1gd4jz" }, "stable": { "version": [ @@ -104043,14 +104426,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20211031, - 543 + 20220313, + 542 ], "deps": [ "seq" ], - "commit": "4777c409ba0cd0d02b9a8397ba810e449b5ac213", - "sha256": "0dmrshlkhavzlfxhm2fi37x7rf1h203iiamdqvqb7dqq0axah5r7" + "commit": "0d1ef0ef183398143b13fb8c76c1284df0d5e616", + "sha256": "0s7y6xkvy2lg3bs4508dh7szsfrvmxrihbf22ysijaqgzd69s86j" }, "stable": { "version": [ @@ -104394,14 +104777,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20220103, - 1747 + 20220304, + 917 ], "deps": [ "seq" ], - "commit": "d08c33dc85a118b199415e71bba0e7c330f87c5b", - "sha256": "1k9x39hv07wxk4hv60ai5gc9rbx0h423zcgj23cvqxj34knklzgi" + "commit": "c439b73a5f9713bb3dce98986b589bb901e22130", + "sha256": "0n2yknbhwbgbrvmgxk2j2hm5gkdh6m9p5y8vpq758bxf5xk6npzm" }, "stable": { "version": [ @@ -105359,15 +105742,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220221, - 1453 + 20220306, + 2111 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "8402e7e2f016e372585273df35ea8484a7c4854c", - "sha256": "0k9q83xllhl1bmyrraylb38q285s96p43cbiagkq4lghib83d03l" + "commit": "4641f953b1183cd2e2be28d8e91374c0eb04aac2", + "sha256": "0wjivff90zffjw2j7mmcvxm00006vcg09nlvizjmv5r6lcxiyqb2" }, "stable": { "version": [ @@ -105414,16 +105797,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220218, - 449 + 20220313, + 2218 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "aa7b1ec159252f8a25f3c75fcc346fa4b0b3c73d", - "sha256": "0dy3w69rndgvhlfp5mx4axdgn517ip63js219vb8m9514mswhxav" + "commit": "7a0ba06db860dfe9a9ca012c2750b13deec385c6", + "sha256": "1w7b5qhg4nd92hl9whvbzz6nx2cb09m84ixkqqzygmjnrxknqsdl" }, "stable": { "version": [ @@ -105480,19 +105863,19 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220223, - 2047 + 20220310, + 2211 ], - "commit": "40de509ff635b75d877d83d42d8e36672fdcc47d", - "sha256": "1h9sj8w6yrrlf1gjwv7lxzkbgam78804f8zm8d3knic8qv3h03lk" + "commit": "a725dfc5bcd21423ebc108cd4d5d92fb33becded", + "sha256": "0rvz4g88403qf5vril946a1v6qvazfn3pqv1ch6k1vh5c9xyavak" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "91d19e22f9f77f897c97177601d7f870fbf807cb", - "sha256": "16972j2qq03q65qszgjjkzl52f79hk007kyi249wg1bqhvfa59b6" + "commit": "ee964c24b69579fcd5ec3c7d3d1d84d1ca3d90e4", + "sha256": "1cq7gg4fh105229my57wbb7v72l8mx957pvsg8k3zc1l0hbc796i" } }, { @@ -106174,11 +106557,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20211130, - 1719 + 20220310, + 1053 ], - "commit": "b6afe804e23c624eec2af0f2a5c04bdcdfd833b5", - "sha256": "0p63ypxfd4s0ywmja3ynyn0i9mirgv8kyr2wj4a0i20havxd29gz" + "commit": "f046a0e3da5283fdf3046b2f4cf3689a520ae552", + "sha256": "0amx3wa5vr913vvvz7vlyajvg8d5nagjfnc9gmi842nzqcm2699j" } }, { @@ -106503,18 +106886,18 @@ 20200212, 1903 ], - "commit": "6781ecec4ba66950d04180cc0c2adac4f9a1e39f", - "sha256": "0c6ag1yv08xfwh8cmv3jp9i7kr9ppha9sp518vy9pq8cz151xcyw" + "commit": "b1367a39b4e0e09ca290e0d05df2f4a9057b842b", + "sha256": "0wcig0mcppw3r68rjhlj3jjlnvac2y1z4kw2kllmy6rbmqx0irgq" }, "stable": { "version": [ 2022, - 2, - 21, + 3, + 14, 0 ], - "commit": "4d159d0224c848847f37e247b2935dd11ff0cac9", - "sha256": "0yqbl77gvd550k7pcn1vscb4kdkayp410bsya93pzrlxfxnygp90" + "commit": "c2a1b07220f1d5548e83d23f378e179dc7da5b99", + "sha256": "1l599j13s5z0spbpi2fza3fgm8499s32r2y7kqxj5lp1dhwgiix4" } }, { @@ -106594,8 +106977,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220102, - 441 + 20220314, + 930 ], "deps": [ "cl-lib", @@ -106604,8 +106987,8 @@ "s", "typescript-mode" ], - "commit": "4bd7f35d8aae160b16642aef3ca205adc71539a9", - "sha256": "0zrapfxdarakp3kwp73c2ymjx51fsnfk6azi2y1wb2kgsdxl2yim" + "commit": "b93e555858edc331ba33d1d8bd4582d578c7ca31", + "sha256": "0il0rdg6qk4bdpq86hxzwbv1rgwn028v72i3xh2kg6xsmpil4f0z" }, "stable": { "version": [ @@ -106819,11 +107202,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220126, - 2034 + 20220316, + 2014 ], - "commit": "f0e8cee8caef2f3a411cbf276940dfacfc4d4158", - "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" + "commit": "3be10cb5c3e17d9babb67190f63500ee68df267c", + "sha256": "04n31pgzn53cnlcs6qagdbspjy85w4dxm3iz6gynwnp50g4y16cv" }, "stable": { "version": [ @@ -106923,11 +107306,11 @@ "repo": "duckwork/titlecase.el", "unstable": { "version": [ - 20220118, - 604 + 20220227, + 1900 ], - "commit": "d82f3d23c166db1c3ea9ae25adaf43d1eeb748dc", - "sha256": "1m1zn8fh68jvh3n7x89bj2v0wgdj0323vrxp7251n9vj3fffnchi" + "commit": "157b2943f4aa5745d64c77c1ac4b76ce6e60c47b", + "sha256": "1bcj3k5gb28dkk8mcyqvm7scdszzf7ydp23piwsmavw0rdfqfhsd" }, "stable": { "version": [ @@ -107050,16 +107433,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20220126, - 1813 + 20220318, + 2120 ], "deps": [ "dash", "org", "transient" ], - "commit": "585cd45b2c1442888a465e4e9d538eeb1a7b3c0a", - "sha256": "1m7pxf54l7qazh7fj2b6b0z9h2zfaxspxlx7lyxrfncdmp1bcswz" + "commit": "383d139a4627f4199cdda99f08551ed3237595a2", + "sha256": "1wvf1mq0j7bnjswssvnn2b4vqfxd19hw15v2ch6c7zai0jrqylzh" } }, { @@ -107124,8 +107507,8 @@ "deps": [ "cl-lib" ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -107184,8 +107567,8 @@ 20220222, 1140 ], - "commit": "3e856aa9388af2d5acbc77f4f7be7eb920f26760", - "sha256": "1wgf1xw3fmbzawl8hykxf6sa7gmrp6vx9bpcv31199mh1nzx7iin" + "commit": "b21fe53b70fa2936b052b9db8e2d4704ac40d9f6", + "sha256": "08si1qbdcy36h08256a9fgybifbx3bghx3z9l6j6j1kyz6s1w6gy" } }, { @@ -107286,20 +107669,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220225, - 1808 + 20220317, + 1843 ], - "commit": "42ee2417302b57ea9e81c1c455841b1578934cbc", - "sha256": "167bs3c2vbvjiafgnkyic8pb538cmv9k2df3phh5ly8bk0jzx17x" + "commit": "97c69d912e36b7f7c2cca8c510be6019f45a9351", + "sha256": "16wm1h0978js0fiwqnmxb8hd1pph2w0ylqq7wzwhi7w9d7gc11d7" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "4eb27abaa182e856ba3f3c8e1e84fdd2e1f009af", - "sha256": "0zfc5ix16kk5mwjs5wiqkfaljdhahb5hsb76hmay8nwhg5xsadkj" + "commit": "270b4ace5151f38ee5145689437d2b7a2d52cd96", + "sha256": "1mj5fd7kqmaz7qdx8rdqlri4999np8fd492hgpwli98zr6ha8spc" } }, { @@ -107666,11 +108049,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220227, - 1751 + 20220314, + 1605 ], - "commit": "7c771c94c8fc31d859c1e083bf32fbce403f4766", - "sha256": "1x4bk5m9s5zag8din004n3paiy8l560p2cwcyfc9y2zjn7h5p42v" + "commit": "017eb7b3cb631bb432066539c459bfa96afa0543", + "sha256": "05389csxv8ggs2gksdv42adddjdjxfhrf3ip9ip1w8ya8n6wh9qr" }, "stable": { "version": [ @@ -107799,8 +108182,8 @@ 20200910, 1636 ], - "commit": "ec3d59c9be9a6ba3b8d4dbfc6f8834c9c3d14f7b", - "sha256": "18mqlcbic82naypgzgr8fw7zjcxp3096c5yhjspz349igqw32y01" + "commit": "8cf1c0d52509fa789870b300f2a7b3564e021104", + "sha256": "0kq5piwrby9xdx4xmqm63nsbg597xa46lzh4v59irkf89irsay49" }, "stable": { "version": [ @@ -107910,8 +108293,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220211, - 1633 + 20220317, + 29 ], "deps": [ "dash", @@ -107921,8 +108304,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", - "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" + "commit": "5961b738e30be007cb0fe984a76e406e0854c006", + "sha256": "17lfs5qqm2gjj40s3r6j1438zvrcfbsz6bxwn9z6flz6idj7ca0n" } }, { @@ -107978,15 +108361,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20211128, - 2236 + 20220305, + 1919 ], "deps": [ "seq", "tree-sitter" ], - "commit": "5f80e89b7da2074ea7f083b769448eb7026865dc", - "sha256": "14pi0vv193vpbwd4kb86hsnv1h8j9pcclvipp1wllv3nxw8k2ypk" + "commit": "785b8cb8ab17bffec958e421260746e16b438727", + "sha256": "03c7lbig8rflny20v85w7bpla2x9653dk4azjifcs0m0vpjjghma" }, "stable": { "version": [ @@ -108343,9 +108726,20 @@ "ename": "treemacs-tab-bar", "commit": "fd08b4b2dc7476e39c210207313431e554de9bb9", "sha256": "1j5ch9jki388dhjnc7lsi6drvrsajjrdhxhqr55hq8ns1dhm8gl9", - "error": "Not in archive", "fetcher": "github", - "repo": "Alexander-Miller/treemacs" + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20220221, + 2038 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + } }, { "ename": "treepy", @@ -108417,8 +108811,8 @@ 20180904, 2313 ], - "commit": "886232c6d7e92a8e9fe573eef46754ebe321f90d", - "sha256": "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr" + "commit": "f7cbd4f9283dbb0528445a3ea6d3b291d97065f6", + "sha256": "08l88w680jcl609wnsalydgfjnhrvbwiasgss7sv5r1xa16as942" }, "stable": { "version": [ @@ -108438,11 +108832,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20210420, - 1201 + 20220312, + 1645 ], - "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23", - "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g" + "commit": "d775d9f348a942230ea57b6520e1eb56a5d67569", + "sha256": "03v8izw95ksl104w4zgacy0wpcvl4x3kwzamvd11d7ndlzn3jqpy" }, "stable": { "version": [ @@ -108700,14 +109094,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20210801, - 1522 + 20220303, + 1736 ], "deps": [ "request" ], - "commit": "eeda4c2647cfdb910de776398037183f48e3fa72", - "sha256": "1fn405rmwcy8y5sa8lh5grq87n5zxbln2b9agxyilfx4jm6rcnpl" + "commit": "c81373f1bc32cbd2e2d642ee10ee1cb31915acb0", + "sha256": "1ili2jfp8ycigq022ws92x6x91k0myq34ipq318b461shd1by4yq" } }, { @@ -108927,24 +109321,6 @@ } }, { - "ename": "twtxt", - "commit": "4627ee00b9439d9dac9971ad1060af4bcf31446c", - "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l", - "fetcher": "github", - "repo": "deadblackclover/twtxt-el", - "unstable": { - "version": [ - 20200824, - 1323 - ], - "deps": [ - "request" - ], - "commit": "e7bafaf92124bb4f2a0be5c1a635b80f9b3a8c87", - "sha256": "1qqc6ykrpq311fwn5mvzc3yl6z48v1c3yq3vi8g9zv63ywj33bbk" - } - }, - { "ename": "typescript-mode", "commit": "94455323364d5a6b00e2786d577134eb350826b4", "sha256": "1abnik2dq0zfnp8pk8x6zy962qww78xadm87xyiwz17559g88d82", @@ -108955,8 +109331,8 @@ 20220223, 1506 ], - "commit": "84ff4228b5d1af287f35c9869e8eb079184a9831", - "sha256": "1kjw7phch5vyxc7gwkcwdl1p0cy3zzg7vyx4k1p5dbvh261k7c6h" + "commit": "88f317f0b6aef8f8d232e912fdbc679799580c56", + "sha256": "0qkqxvam3r21philap71dy4980sbadx32176rz20wwrs10szqnck" }, "stable": { "version": [ @@ -109374,8 +109750,8 @@ 20200719, 618 ], - "commit": "33cb9f541b1f7d4fa675e244822c8a074ebb4c4e", - "sha256": "104170qlxrvg5gr1m3ajfnankvnd3700k46lhrh7i356jl23kh1h" + "commit": "b9069b8af1bfa360d3b7197a7101fe0233c92750", + "sha256": "05873v76z7f7jrhkc78bmkgmqjvbidyaf1dymcccc8cgsc7bixp1" }, "stable": { "version": [ @@ -109469,8 +109845,8 @@ "deps": [ "cl-lib" ], - "commit": "94959e708d5a74913788324893d0b6dabc88ff18", - "sha256": "09gf5bm2kwgfx4b1rbnljarzj9mfbx3f0xiqias3cbj0x0lmwmd1" + "commit": "efb8ac3935635ad0fd731de0ef64b14a23f50b42", + "sha256": "0mvj2jhj2dl4pr4gh7rh3042lawxik9myvvnvqc25zjqa5n4jp8c" }, "stable": { "version": [ @@ -109667,11 +110043,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20210612, - 847 + 20220302, + 1231 ], - "commit": "2788d7824d23749a6e5b33f653c47471455da187", - "sha256": "1kqaqzlgf9gqxf3fzy41m606h7ridp5iik1w5a0dpq86ni23r77c" + "commit": "06bf37d649fc3b41fcd5fa29c0b0eda555aaf8bb", + "sha256": "0i6qyc5jl1151dyp95wjx7f7fs4m0pb7qnlb6skr33rrfl1icmpn" } }, { @@ -110318,8 +110694,8 @@ 20220220, 150 ], - "commit": "b590f6d3643ff70dfde0181abb287d7b24073067", - "sha256": "0zp6zyxk033n8p3ccaz50mrnhrcnb7w40b0xjm1lk4snap3hlihq" + "commit": "fb82a02b6c86e6224482b27caa08662b023b40a1", + "sha256": "1lncgprxmir4czq8iiww9cmpd4si77vipkgksjrv37r9xz5hgyr4" }, "stable": { "version": [ @@ -111448,11 +111824,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20211103, - 209 + 20220301, + 430 ], - "commit": "4effa95c7d6243fc5696597f488653f9d2a5d4a6", - "sha256": "164yiiqqxk2fpjk65y72fr71j05b1330zmvbaxh0w3ww2axkjz68" + "commit": "5205379bcfa1774a745e3dcbaa4ea861ff6a9ad2", + "sha256": "1blgy286id63mqr2gan7xkg88rn2nwj36vqdsyyxq8w2p3f5qh54" } }, { @@ -111771,8 +112147,8 @@ 20220214, 1401 ], - "commit": "6fde70a06788e2b8851e765c75ae76cd1655287d", - "sha256": "10wjd76qrr503rbvpklpcxz74pcx08zvqgn3g6a0qrzpsiigkscd" + "commit": "ac33dc2a4a7c017d2baf03a66c69d8e5c983420e", + "sha256": "1v397idaxzmc8g3a9fjba8xsxhhsdsz589vs6k8v60p7v8j1ivrl" }, "stable": { "version": [ @@ -111794,8 +112170,8 @@ 20220214, 1401 ], - "commit": "6bfe9144b626b98bbb67cbf512f3419c25ae973f", - "sha256": "05rkm1zlxmz65z1k9i3nh1dgd6arn97h0cyv3mbyw0pksfnf0gx7" + "commit": "a1a9dd9f3d6ba2352afaf920c911eaf6b2e7e0c1", + "sha256": "033rgvxas97858969nbg8xzzsx3p2x4a425wk9jvbbhl8aw8xf3d" }, "stable": { "version": [ @@ -112019,8 +112395,8 @@ "org-roam", "s" ], - "commit": "266c491ee2d583648f391803a278e8c5befbd8bd", - "sha256": "1dw05c0kfrjv09lqdkwg8i6hkxd3g2zaclixfhfzgs2976a9r23k" + "commit": "ba44342aea6a81c7b7ca6fcaae9a537701789b5e", + "sha256": "0avqxd264dpbyh8cza0pv8miflyaaqlx27xdjix4xj42wq8k6rzm" }, "stable": { "version": [ @@ -112045,14 +112421,14 @@ "repo": "embed-me/vunit-mode", "unstable": { "version": [ - 20220121, - 1644 + 20220316, + 1812 ], "deps": [ "hydra" ], - "commit": "13311cc9fba6e73cf859dd5defefd330cc41b489", - "sha256": "0k7xj2a0xdc4g0bi1fxmwy1bl1ha9z68f7l1qc296r8q3hq8ghi9" + "commit": "5643460a7011d6bc13c2d4762f329d19f6c7d46b", + "sha256": "1zzlfscnzvck658ylsmqwk30jdf9qnrnmhvghd3xinlhglnmwrp7" } }, { @@ -112250,16 +112626,16 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20201229, - 1811 + 20220318, + 2122 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "0cb9c2fef6e611b4389f7df7fcccc17744053e9b", - "sha256": "1fv4bn6c04kv39jv25r09pvxc5hz5gwwbj16fhxs5930rf77ikqb" + "commit": "3118dd4f493caffcc2849058833572dfc0c0e0a9", + "sha256": "03hyz3bhbisymm0gzqzsrmvyzkkgh73zbqgra6m70jka8sv065xs" }, "stable": { "version": [ @@ -112787,14 +113163,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210919, - 1547 + 20220312, + 2008 ], "deps": [ "templatel" ], - "commit": "0f8ec7e9065b2962c93209ee30b46f91843e2815", - "sha256": "0jiq879m74ysl0gb9wh1qmxyxi79nhnr2b1slq33mwf98r1nzcbg" + "commit": "b2bb79ed2c532cad5b03455d8cae887ddb803db3", + "sha256": "0xz9f7vz3h82hksz0swf5ykdh1fwh6dyk7dadjvral7iqjz4pjmf" }, "stable": { "version": [ @@ -112855,8 +113231,8 @@ "deps": [ "cl-lib" ], - "commit": "fda4455333309545c0787a79d73c19ddbeb57980", - "sha256": "1ga4m9xgiczb6sv7dhmy4841rd9wxsirrvi8va34srpzlq51iq65" + "commit": "82b370602fa0158670b1c6c769f223159affce9b", + "sha256": "0bl1hwdy6ign624lhb8dncvahvrs8j96dss4kl5rfxzy5rpva0jp" }, "stable": { "version": [ @@ -113354,9 +113730,16 @@ "ename": "why-this", "commit": "f45e4eabb023673be2dd3c6c46e752085587c0e2", "sha256": "1pb73qc67w73p664kfd0na1qmzbz00dmjz468smrpjjscqmazmp3", - "error": "Not in archive", "fetcher": "git", - "url": "https://codeberg.org/akib/emacs-why-this.git" + "url": "https://codeberg.org/akib/emacs-why-this.git", + "unstable": { + "version": [ + 20220314, + 1329 + ], + "commit": "ca4cf46d6e7b961a0c0fa39ac084fdca3c8c93b2", + "sha256": "14zb4abakpy2s05lfry097i0gg2d3njj0847a62dnwv8hgypsk6c" + } }, { "ename": "wide-column", @@ -113887,11 +114270,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220211, - 2034 + 20220318, + 1640 ], - "commit": "f514f23258af67a10fc8e1c431bfe94702b6e65b", - "sha256": "095gmw87ch8mnwcldyab89a04wr5ahb2hgh0nd0gbhg7mkca17ph" + "commit": "495a545178bc43adf96dc0dd7dd0546e56127d7c", + "sha256": "0dcqim83x73m0gag3gca7cdqn6vjq2gfdvyhlmfvzg2n4153wr0i" }, "stable": { "version": [ @@ -114141,8 +114524,8 @@ 20220225, 1907 ], - "commit": "19be797818be2d9ac5a0a8acf30b43ad38e2f4ed", - "sha256": "13yj1pl9v0345dnxwdpy50b74syrbqhlrf8ldfnxpiww090n7zmq" + "commit": "5a1f9a45c3d1fa58c3de5183c4456572ae861d49", + "sha256": "0jd7lbb7mbjfk66mkzxnhffh3dlj28xma5a8km5hc4lclqlm74sx" } }, { @@ -114272,11 +114655,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220106, - 249 + 20220308, + 1314 ], - "commit": "d2e1f33001f1777767a7c6e862d5e6a37e688f42", - "sha256": "03lbfbi05g03w1cnys6smaf0yxm6168ckmdbcvkxy0k519ngzyd1" + "commit": "b2c457a720e98dd1c560860e44a6a80372ef07ef", + "sha256": "198bm8l8jf6xvc7djy3d9z7xm437pkabmi9i30pd79g5l2dikj8f" }, "stable": { "version": [ @@ -115370,11 +115753,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210730, - 143 + 20220311, + 332 ], - "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", - "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" + "commit": "34c300b08579b72c7c92aefee1f4b500913f0c85", + "sha256": "1lwhm3c7xmx1j9ggf9ka0whpm7g5p6b11gfv1bxkdx1j8ypvxn0m" }, "stable": { "version": [ @@ -115537,11 +115920,11 @@ "repo": "binjo/yara-mode", "unstable": { "version": [ - 20210520, - 1318 + 20220317, + 935 ], - "commit": "345cf782926414f92f57d7f1b129974dc38a545b", - "sha256": "0n3cnxxwm3rgzpgqy1kkv6fhqzqw3gnj1p9anp5vdhss8fdad7s3" + "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", + "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" } }, { @@ -115616,8 +115999,8 @@ 20220212, 1742 ], - "commit": "d8674bbbc9d4d7bdba374f0c0473ebb1912bcac2", - "sha256": "1nryhfiddak70y1hhhzkpb2afy00kd7vc3vg4ja0frpdvdrl93pz" + "commit": "82772ac2508a4549c75f2aa31d901caea468a0fb", + "sha256": "1ccyf0y9886vq4007xr4g8w05jnw3v8pfzlqxdk7j4babj8kyjw9" }, "stable": { "version": [ @@ -116531,11 +116914,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220227, - 1351 + 20220317, + 1147 ], - "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", - "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" + "commit": "527ca510d073bcda7746c754935346f531c60b4b", + "sha256": "1zvhd1fk2p9n3gn8bbqsv3lcgc2bmhd6hf0pp4a8z0wv5nkv1235" } }, { @@ -116546,14 +116929,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220220, - 1952 + 20220312, + 2211 ], "deps": [ "zk" ], - "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", - "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" + "commit": "527ca510d073bcda7746c754935346f531c60b4b", + "sha256": "1zvhd1fk2p9n3gn8bbqsv3lcgc2bmhd6hf0pp4a8z0wv5nkv1235" } }, { @@ -116778,8 +117161,8 @@ 20201205, 1038 ], - "commit": "474ca4723517d95356145950b134652d5dc0c7f7", - "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd" + "commit": "1823f8431b36beae112a67f5b102e06afaaa52bf", + "sha256": "0mqz10ngfn2kyhm918gwx185zmmvzj47vha5dvwwkqxx28xcsfq6" }, "stable": { "version": [ @@ -116943,20 +117326,20 @@ "repo": "Vonfry/zoxide.el", "unstable": { "version": [ - 20211223, - 245 + 20220302, + 522 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "ecdcb62847b5e54ccd477d740e4974f28c8f5809", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "1ec22ca486aaa838828ec516e91f8880b478bd19", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" } }, { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 946dba0af8f..82a1d6af832 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -53,7 +53,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - inherit pname version; + pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + inherit version; patches = patches fetchpatch; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 7d060a972cd..dfdf75627bf 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - hash = "sha256-w4qCJgfBnN1PpPfhdsLdBpCRAWai9RrwU3LZl8DdEcw="; + hash = "sha256-NpgtxYqxMWMZXZRZjujob40Nn6hirsSzcjoqRJR6Rws="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix new file mode 100644 index 00000000000..b1002e23582 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, undmg +, ... +}: + +{ meta +, name +, product +, productShort ? product +, src +, version +, ... +}: + +let + loname = lib.toLower productShort; +in + stdenvNoCC.mkDerivation { + inherit meta src version; + desktopName = product; + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications/${product}.app" + mkdir -p "$APP_DIR" + cp -Tr "${product}.app" "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/${loname}" + open -na '$APP_DIR' --args "\$@" + EOF + chmod +x "$out/bin/${loname}" + runHook postInstall + ''; + nativeBuildInputs = [ undmg ]; + pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name)); + sourceRoot = "."; + } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f4700c1662..b47c1270790 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -10,7 +10,18 @@ with lib; let - mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; + platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; + ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; + + inherit (stdenv.hostPlatform) system; + + versions = builtins.fromJSON (readFile (./versions.json)); + versionKey = if stdenv.isLinux then "linux" else system; + products = versions.${versionKey} or (throw "Unsupported system: ${system}"); + + package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; + mkJetBrainsProduct = callPackage package { inherit vmopts; }; + # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -19,13 +30,12 @@ let product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; - inherit description license; + inherit description license platforms; longDescription = '' Enhancing productivity for every C and C++ developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ @@ -58,14 +68,13 @@ let product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; - inherit description license; + inherit description license platforms; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; }); @@ -75,7 +84,7 @@ let product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; - inherit description license; + inherit description license platforms; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. @@ -83,10 +92,9 @@ let and tool integrations specific for the Go language ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -98,10 +106,10 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, ... }: + buildIdea = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "IDEA"; + inherit name version src wmClass jdk product; + productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ ''--set M2_HOME "${maven}/maven"'' @@ -116,18 +124,18 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; - platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ]; + platforms = ideaPlatforms; }; }); - buildMps = { name, version, src, license, description, wmClass, ... }: + buildMps = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk; - product = "MPS"; + inherit name version src wmClass jdk product; + productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; - inherit license description; + inherit license description platforms; longDescription = '' A metaprogramming system which uses projectional editing which allows users to overcome the limits of language @@ -135,7 +143,6 @@ let diagrams. ''; maintainers = with maintainers; [ rasendubi ]; - platforms = platforms.linux; }; }); @@ -145,24 +152,23 @@ let product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; maintainers = with maintainers; [ schristo ma27 ]; - platforms = platforms.linux; }; }); - buildPycharm = { name, version, src, license, description, wmClass, ... }: + buildPycharm = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "PyCharm"; + inherit name version src wmClass jdk product; + productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; - inherit description license; + inherit description license platforms; longDescription = '' Python IDE with complete set of tools for productive development with Python programming language. In addition, the @@ -177,11 +183,8 @@ let and productive development! ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; - }).override { - propagatedUserEnvPkgs = [ python3 ]; - }; + }); buildRider = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { @@ -189,7 +192,7 @@ let product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; - inherit description license; + inherit description license platforms; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, @@ -199,7 +202,6 @@ let ASP.NET Core web applications. ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' @@ -215,10 +217,9 @@ let product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; - inherit description license; + inherit description license platforms; longDescription = description; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; }; }); @@ -228,14 +229,13 @@ let product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code. ''; maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' @@ -244,6 +244,7 @@ let rm -r jbr ''; }); + in { @@ -251,12 +252,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */ + url = products.clion.url; + sha256 = products.clion.sha256; }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -264,12 +265,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.3.4"; /* updated by script */ + version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "09dkxj5vn99gkgc1yd18w7gqkw2vzci0z9q2fcih0zn7lvqp0im3"; /* updated by script */ + url = products.datagrip.url; + sha256 = products.datagrip.sha256; }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -277,12 +278,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18z4mvxhds5fgdwcfywc4pj8s9ifvsknhradgzmxsvji0fbp0awx"; /* updated by script */ + url = products.goland.url; + sha256 = products.goland.sha256; }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -290,12 +291,13 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA CE"; + version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1j889b2r950bl9wiqq1z8v8s2qicidfcdar300cy666i8rc25qlr"; /* updated by script */ + url = products.idea-community.url; + sha256 = products.idea-community.sha256; }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -303,12 +305,13 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA"; + version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0w36qnqgkvw6j1ks09h515237bhqfaixrimzg2r494ic98amvkps"; /* updated by script */ + url = products.idea-ultimate.url; + sha256 = products.idea-ultimate.sha256; }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -316,13 +319,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.3"; /* updated by script */ - versionMajorMinor = "2021.3"; /* updated by script */ + product = "MPS ${products.mps.version-major-minor}"; + version = products.mps.version; 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 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */ + url = products.mps.url; + sha256 = products.mps.sha256; }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -330,12 +333,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */ + url = products.phpstorm.url; + sha256 = products.phpstorm.sha256; }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -343,12 +346,13 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm CE"; + version = products.pycharm-community.version; description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s36basydp7cxgbgdapjhkslx0x9vv3639xhm84ny76hf7s03bpi"; /* updated by script */ + url = products.pycharm-community.url; + sha256 = products.pycharm-community.sha256; }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -356,12 +360,13 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm"; + version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0rwykngqgby05mh47kls8wzi68gfka2z04k6kdmsxwn1hhx5gnbb"; /* updated by script */ + url = products.pycharm-professional.url; + sha256 = products.pycharm-professional.sha256; }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -369,12 +374,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "13q6hk5l3fqmz818z5wj014jd5iglpdcpi8zlpgaim1jg5fpvi8x"; /* updated by script */ + url = products.rider.url; + sha256 = products.rider.sha256; }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -382,12 +387,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "18ny40zl9hgkynkc5yyy2xqngl9diifh2gqrfnz7rfq14kp10xb9"; /* updated by script */ + url = products.ruby-mine.url; + sha256 = products.ruby-mine.sha256; }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -395,12 +400,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.webstorm.version; 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 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */ + url = products.webstorm.url; + sha256 = products.webstorm.sha256; }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/linux.nix index a5e0a2611f0..d150368ca82 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,17 +3,15 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; -let loName = toLower product; - hiName = toUpper product; +let loName = toLower productShort; + hiName = toUpper productShort; mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName - + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) - then "" - else "64" ) + + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in @@ -36,7 +34,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { nativeBuildInputs = [ makeWrapper patchelf unzip ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -73,7 +71,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl deleted file mode 100755 index 201c51094dc..00000000000 --- a/pkgs/applications/editors/jetbrains/update.pl +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp - -use strict; -use List::Util qw(reduce); -use File::Slurp; -use LWP::Simple; - -my $only_free = grep { $_ eq "--only-free" } @ARGV; - -sub semantic_less { - my ($a, $b) = @_; - $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - return $a lt $b; -} - -sub get_latest_versions { - my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; - my %h = {}; - for my $ch (@channels) { - my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/; - my @builds = $ch =~ /(<build .+?<\/build>)/gs; - my $latest_build = reduce { - my ($aversion) = $a =~ /^<build [^>]*version="([^"]+)"/; die "no version in $a" unless $aversion; - my ($bversion) = $b =~ /^<build [^>]*version="([^"]+)"/; die "no version in $b" unless $bversion; - semantic_less($aversion, $bversion) ? $b : $a; - } @builds; - next unless $latest_build; - - # version as in download url - my ($version) = $latest_build =~ /^<build [^>]*version="([^"]+)"/; - my ($fullNumber) = $latest_build =~ /^<build [^>]*fullNumber="([^"]+)"/; - my $latest_version_full1 = "$version-$fullNumber"; - $latest_version_full1 =~ s/\s*EAP//; - - my ($latest_version) = $latest_build =~ /^<build [^>]*version="([^"]+)"/; - ($latest_version) = $latest_build =~ /^<build [^>]*fullNumber="([^"]+)"/ if $latest_version =~ / /; - - $h{$id} = $latest_version; - $h{"full1_" . $id} = $latest_version_full1; - } - return %h; -} - -my %latest_versions = get_latest_versions(); -# for my $ch (sort keys %latest_versions) { -# print("$ch $latest_versions{$ch}\n"); -# } - -sub update_nix_block { - my ($block) = @_; - my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; - if ($channel) { - if ($latest_versions{$channel}) { - my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; - die "no version in $block" unless $version; - if ($version eq $latest_versions{$channel}) { - print("$channel is up to date at $version\n"); - } elsif ($only_free && $block =~ /licenses\.unfree/) { - print("$channel is unfree, skipping\n"); - } else { - my $version_string = $latest_versions{$channel}; - my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r; - - print("updating $channel: $version -> $version_string\n"); - my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; - # try to interpret some nix - my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$version_string/; - # Some url pattern contain variables more than once - $url =~ s/\$\{name\}/$name/g; - $url =~ s/\$\{version\}/$version_string/g; - $url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g; - die "$url still has some interpolation" if $url =~ /\$/; - my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - unless ( $sha256 ) { - my $full_version = $latest_versions{"full1_" . $channel}; - $url =~ s/$version_string/$full_version/; - ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - $version_string = $full_version; - } - die "invalid sha256 in $url.sha256" unless $sha256; - my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); - chomp $sha256Base32; - print "Jetbrains published SHA256: $sha256\n"; - print "Conversion into base32 yields: $sha256Base32\n"; - $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; - $block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m; - $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; - } - } else { - warn "unknown update-channel $channel"; - } - } - return $block; -} - -my $nix = read_file 'default.nix'; -$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; -write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py new file mode 100755 index 00000000000..5301a85ba9a --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict +import hashlib +import json +import pathlib +import logging +import requests +import sys +import xmltodict +from packaging import version + +updates_url = "https://www.jetbrains.com/updates/updates.xml" +versions_file_path = pathlib.Path(__file__).parent.joinpath("versions.json").resolve() + +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) + + +def one_or_more(x): + return x if isinstance(x, list) else [x] + + +def download_channels(): + logging.info("Checking for updates from %s", updates_url) + updates_response = requests.get(updates_url) + updates_response.raise_for_status() + root = xmltodict.parse(updates_response.text) + products = root["products"]["product"] + return { + channel["@name"]: channel + for product in products + for channel in one_or_more(product["channel"]) + } + + +def build_version(build): + return version.parse(build["@version"]) + + +def latest_build(channel): + builds = one_or_more(channel["build"]) + latest = max(builds, key=build_version) + return latest + + +def download_sha256(url): + download_response = requests.get(url) + download_response.raise_for_status() + h = hashlib.sha256() + h.update(download_response.content) + return h.hexdigest() + + +channels = download_channels() + + +def update_product(name, product): + update_channel = product["update-channel"] + logging.info("Updating %s", name) + channel = channels.get(update_channel) + if channel is None: + logging.error("Failed to find channel %s.", update_channel) + logging.error("Check that the update-channel in %s matches the name in %s", versions_file_path, updates_url) + else: + try: + build = latest_build(channel) + version = build["@version"] + parsed_version = build_version(build) + version_major_minor = f"{parsed_version.major}.{parsed_version.minor}" + download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor) + product["url"] = download_url + product["version-major-minor"] = version_major_minor + if "sha256" not in product or product.get("version") != version: + logging.info("Found a newer version %s.", version) + product["version"] = version + product["sha256"] = download_sha256(download_url) + else: + logging.info("Already at the latest version %s.", version) + except Exception as e: + logging.exception("Update failed:", exc_info=e) + logging.warning("Skipping %s due to the above error.", name) + logging.warning("It may be out-of-date. Fix the error and rerun.") + + +def update_products(products): + for name, product in products.items(): + update_product(name, product) + + +with open(versions_file_path, "r") as versions_file: + versions = json.load(versions_file) + +for products in versions.values(): + update_products(products) + +with open(versions_file_path, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json new file mode 100644 index 00000000000..83f486edfcf --- /dev/null +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -0,0 +1,296 @@ +{ + "linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", + "version": "2021.3.4", + "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "99e2225846d118e3190023abc65c8b2c62a1d1463f601c79a20b9494c54a08c9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", + "version": "2021.3.2", + "sha256": "face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-no-jbr.tar.gz", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2021.3", + "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + } + }, + "x86_64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", + "version": "2021.3.3", + "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", + "version": "2021.3.4", + "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", + "version": "2021.3.3", + "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", + "version": "2021.3.2", + "sha256": "20d8cee2bbedaeb0ea388f795e13d08eca5b59e59d4e980ac2d8bc07c9fed3e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", + "version": "2021.3.2", + "sha256": "9f574562b866e6ccc3d2f9b4c245c45844d1d0fd54be3dbdcc893d40ba1cf54a", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", + "version": "2021.3", + "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", + "version": "2021.3.2", + "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", + "version": "2021.3.2", + "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", + "version": "2021.3.3", + "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", + "version": "2021.3.2", + "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + } + }, + "aarch64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", + "version": "2021.3.4", + "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", + "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "79e540fb0cd480837b3a954e4802f4f252073955393e8927c9c1b28c37112d51", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "511c6aed9c5cd4c7665a9bac9ba94582977013244cbe88b820eb5464fce91a1c", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", + "version": "2021.3", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg", + "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + } + } +} diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 9f5f64f9e5b..dd8765db28a 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -15,7 +15,7 @@ from typing import List, Tuple from pathlib import Path # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) @@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix new file mode 100644 index 00000000000..2653806a14f --- /dev/null +++ b/pkgs/applications/editors/lapce/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pkg-config +, python3 +, perl +, freetype +, fontconfig +, libxkbcommon +, xcbutil +, libX11 +, libXcursor +, libXrandr +, libXi +, vulkan-loader +, copyDesktopItems +, makeDesktopItem +}: + +rustPlatform.buildRustPackage rec { + pname = "lapce"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "lapce"; + repo = pname; + rev = "v${version}"; + sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; + }; + + cargoPatches = [ ./fix-version.patch ]; + + cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + perl + copyDesktopItems + ]; + + buildInputs = [ + freetype + fontconfig + libxkbcommon + xcbutil + libX11 + libXcursor + libXrandr + libXi + vulkan-loader + ]; + + # Add missing vulkan dependency to rpath + preFixup = '' + patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce + ''; + + postInstall = '' + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg + ''; + + desktopItems = [ (makeDesktopItem { + name = "lapce"; + exec = "lapce %F"; + icon = "lapce"; + desktopName = "Lapce"; + comment = meta.description; + genericName = "Code Editor"; + categories = [ "Development" "Utility" "TextEditor" ]; + }) ]; + + meta = with lib; { + description = "Lightning-fast and Powerful Code Editor written in Rust"; + homepage = "https://github.com/lapce/lapce"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ elliot ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/editors/lapce/fix-version.patch b/pkgs/applications/editors/lapce/fix-version.patch new file mode 100644 index 00000000000..2a8d96be169 --- /dev/null +++ b/pkgs/applications/editors/lapce/fix-version.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bc9a0f8..45a74ad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2165,7 +2165,7 @@ dependencies = [ + + [[package]] + name = "lapce" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "lapce-core", + "lapce-proxy", +@@ -2173,7 +2173,7 @@ dependencies = [ + + [[package]] + name = "lapce-core" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "Inflector", + "alacritty_terminal 0.15.0", +@@ -2233,7 +2233,7 @@ dependencies = [ + + [[package]] + name = "lapce-proxy" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "alacritty_terminal 0.16.0-rc2", + "anyhow", diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 4a5f464f4bc..efe431c3396 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.5"; + version = "6.6-b2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; + sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA="; }; dontBuild = true; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index b76e4fa0a7b..3605f6c6e4e 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -2,11 +2,11 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } + { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } else - { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; + { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; in stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "tuxguitar"; src = fetchurl { diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a00646437f7..2282e583683 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.6"; + version = "13"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-K0HjEO/yw9h+2+Y5CvxyYG1+kx+KH9NSn+QsKCsvh/rG/ilYLYyy93iZfx+wzwrgEfRtfMpZGtDAxd6nyUSnCA=="; + hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA=="; }; buildCommand = '' diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 8ddd0d6a283..3b694e4b151 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "pinegrow"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz"; + sha256 = "0i8sg4criimrqmz0g68b8xcwcrb362ssid5jazswpa6hhwj6s5n4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 894b7a43c01..3cfc37b36a0 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY="; + hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y="; }; format = "other"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index cd776fb6bfc..b93fbd6110f 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw="; + sha256 = "sha256-LfP3qUzoHuYSpkTz1queVGTWOP9v9kbgbgvvtiMK6Eo="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0cb09814c0f..13c5c49db48 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.4227"; + version = "8.2.4350"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; + sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index c71f057fe0f..806e2f9d4fd 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.1719"; + version = "8.2.3455"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-166"; - sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; + rev = "snapshot-172"; + sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 49354aa9a8d..6af3e384a63 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,10 +1,10 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index af43549..dfb10fe 100644 +index 32c89b387..c2af70127 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -14,35 +14,5 @@ set backspace+=indent,eol,start - " translated to English). - set langmenu=none +@@ -9,35 +9,5 @@ set nocompatible + " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. + set backspace+=indent,eol,start -" Python2 -" MacVim is configured by default to use the pre-installed System python2 @@ -29,22 +29,22 @@ index af43549..dfb10fe 100644 -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") -- " MacPorts python 3.8 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") +- " MacPorts python 3.9 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") - " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python - endif -endif - +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index fd2d5e1..37a6d6a 100644 +index c4a3ada37..06ee3de44 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -52,12 +52,12 @@ index fd2d5e1..37a6d6a 100644 +MACVIMGUI_DEFS = -DMACOS_X_DARWIN -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe MACVIMGUI_IPATH = MACVIMGUI_LIBS_DIR = - MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 06257a5..68437df 100755 +index 39ef81449..d8fa7ec2f 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } +@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +69,7 @@ index 06257a5..68437df 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +93,7 @@ index 06257a5..68437df 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6499,13 +6479,7 @@ __: +@@ -6526,13 +6506,6 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,11 +104,10 @@ index 06257a5..68437df 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else -+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6520,7 +6494,6 @@ eof +@@ -6547,7 +6520,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -116,7 +115,7 @@ index 06257a5..68437df 100755 fi -@@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -130,7 +129,7 @@ index 06257a5..68437df 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -142,7 +141,7 @@ index 06257a5..68437df 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7521,13 +7483,8 @@ $as_echo "<not found>" >&6; } +@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -156,9 +155,9 @@ index 06257a5..68437df 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } - if test -f "$rubylibdir/$librubya"; then - librubyarg="$librubyarg" +@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` + if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" @@ -168,7 +167,7 @@ index 06257a5..68437df 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index bbc01ee..5a93591 100644 +index 4ff59f201..f91cb9836 100644 --- a/src/vim.h +++ b/src/vim.h @@ -244,17 +244,6 @@ @@ -190,15 +189,14 @@ index bbc01ee..5a93591 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b..47078b0 100755 +index 3b154f288..e89f26060 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" - if test "$1" = "-g"; then - # Try to use the GUI version of Vim if possible, it will fall back - # on Vim if Gvim is not installed. -- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" - shift +@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift fi - diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3651c6ac5e1..b15195bd015 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-25"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2"; - sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr"; + rev = "d864b463bca824ebbdf2b17a0ac046955c007b2b"; + sha256 = "173r0vj0g893c4mkd4if16xqsckx55jfsgwz7fg6rrnbazjs75h0"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-19"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5b1044e2ade71fee4a59f94faa108d99b4e61fb2"; - sha256 = "02np6iarx5yp8m5lvp4rmgl6zlxy7m64sp3fix7hh9dy51h58xs5"; + rev = "560e6340ce10ce90fac587096fb147eea43e624d"; + sha256 = "08gcy6anp648kpk1sir6nwk0dxy55a6gj9w1whp28lchjc5yrd8y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-02-19"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "6942fc4fcb2058fe1401761e97641f42aadb7758"; - sha256 = "12q9im1rd7zmdfw6bax7x7pjnlf6204ar70z77fv3cpi09r2s3sz"; + rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; + sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -461,12 +461,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-02-24"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537"; - sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l"; + rev = "d5904e8a3434acb151a4948b1b3d4760a2a12bb1"; + sha256 = "1rr048xsf4q5rpi1b2fkgqh23khrmjpd6420p240m3b3rj027brw"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -509,12 +509,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-02-16"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "5169cd99bd4bc5f0c2d505e91190383c3c323680"; - sha256 = "1q5bz37yfzbnm6h9n0c3y8nn69zphsxjsjykly28xg6q87il9di5"; + rev = "24aba3962926330266e8a722c62d7c7fcfb1961e"; + sha256 = "1h3jnfjwn16a2by95vh9l7jc79ab5jc6w6ksh56r5maxf9v49x94"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f932760f16368c5feeb079a878ed0ff8588aed29"; - sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4"; + rev = "f5fc1c613783a488e01be692c2ca3b1e9d46e8e4"; + sha256 = "0avdzzppjw59jlkjicl749kbs602dlfjmc4z7770c8ga2hzslzzd"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2022-01-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "6d0254b845e1cf42ee778763190f852b6d013dc3"; - sha256 = "15z2mfjgpr36bqady1ijvaha41d1rfw5prcwr9czcmh2iaphp2j8"; + rev = "b21e4e725dfe7aaec02d88923f45193928fe5a55"; + sha256 = "1c5gdd3j1sg0bk92iaanw855d05ximdm7y0s2z1ph4lawfn3bk37"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -929,12 +929,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-02-22"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "4f73c9dd68fdd9493e34020e3e626e788b95fd9a"; - sha256 = "0igsr25shrjl9fj8is6lpyff9l2by7jkjmck5n56wdn97cxav719"; + rev = "5581530535bc10c42f84c16665d79fbaf7d49806"; + sha256 = "1qf8gihw8bdn6253qly2d9d60ng95r20fy8v8l2vv5lfmzdaaz27"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -965,12 +965,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32"; - sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc"; + rev = "c13c51019ca922279b291f82ddeecefb26fecdac"; + sha256 = "0g2sm6f8h5si901l2nzbphin7qh66517636xv9f5821jaixwyx6m"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -989,12 +989,12 @@ final: prev: colorbuddy-nvim = buildVimPluginFrom2Nix { pname = "colorbuddy.nvim"; - version = "2022-02-22"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f"; - sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3"; + rev = "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a"; + sha256 = "1gjwgh77xgpdpzlz51c7gxnbpqyzm4hy9baspgjf9j5ny4yisn03"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -1025,12 +1025,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-06-07"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; - sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; + rev = "c797e8b76155e24ebdf180cef28e1a409604492e"; + sha256 = "0903l7q223id6b91sji8cxk22fmpj1shv3dgxjka8av0wgz7v93w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -1038,12 +1038,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-02-16"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598"; - sha256 = "00yvac1iks83jy7cbkalx0hy3sg0d14hn4zd3jk5wc25c7f1jzmq"; + rev = "026ec9530b6691db8c68a3ae4fc44c56aa281f52"; + sha256 = "14qfx8722mzb62a60l3m7ddy2g241gp06f7k5ncdfy49353qv7v8"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "1792fee68dfba89632022e9524c2dcef10d399cd"; - sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a"; + rev = "3172e9802f8cd0d6fa64c7cfa377410369786040"; + sha256 = "0zj6j1ih6knj5bhs3d7g1yr8i2pnhf6pgdh7gbj7l28j62idx9dy"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-02-22"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "3526cb195cb381cef5d4fc25c532f00942562874"; - sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2"; + rev = "074b3f1758d4e743e2d0bed0fc24ef6386387036"; + sha256 = "1qbxrl36zawvbf4x2h9za4s300b8s7yvzfp7klcy30nd9a9xfwpr"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1278,12 +1278,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-02-03"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "afa44bb9ccebbcde56bf66d498f2277206f7895c"; - sha256 = "064is1nhdldkglj03f4832qagnbbwrf4sd1bnjx9iadq9wx84lp5"; + rev = "6f0837b598d9bf0a30bc30dff39114b2e0cb79f3"; + sha256 = "1vr3p2yqdhf9515y4203h5vjgrc8gnjk1yl9lb4d83ywbbpgcxi0"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1410,12 +1410,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-01-30"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c3417f30029c384c73aeccb1084f21c14b4bae45"; - sha256 = "0dc0w8j4fhbh86vmibi9wx146r79sv2yvsqczp28hqinwss6j68b"; + rev = "6d97ad7fae49f7c00644dd96da64e14c3e23c835"; + sha256 = "0vyahlli5jg1a8m3dnln16n93jlzyimj0jx76dlbg7x906hkjd91"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1760,12 +1760,12 @@ final: prev: direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2020-11-20"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; - sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; + rev = "451e3637a15af7d4a206ac761af7a2247f139e0e"; + sha256 = "0bynm225is7xkzkllx7d95cjarpxaj2yq1p0g2svgwxgqjhb6yhx"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1808,12 +1808,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-02-02"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "8e8f7e525941ee2080a39b98c1b1f5466a6ea187"; - sha256 = "0i2wsjzy881g80rf94zmggkk1mj1jnb582dwzl6wlw3bi9vvsbg0"; + rev = "b36b69c6a5d6b30b16782be22674d6d037dc87e3"; + sha256 = "1inb7x7lcf5vrxhbcxcmdldvbldq8asn21wvp3awf9wk8zn6572i"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1832,12 +1832,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "032c406c7f63874c459234beedf8452d2fa38ee4"; - sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym"; + rev = "ba27cebaa7cc51f60f5f8dbeae0ab94c6ccca8e5"; + sha256 = "1fd32qwvqsdb2ndpsnxlaw5940f31p3vlk9j79pxykizl4zi4w39"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1928,6 +1928,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; + everforest = buildVimPluginFrom2Nix { + pname = "everforest"; + version = "2022-03-10"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "everforest"; + rev = "e6628a1ff5028086b42e90061c78c8d3bd15a7c8"; + sha256 = "0sb0vhnlfm0830w5kpy3jd1ihxpx1ban0mg0lvgg1fqxn8a0kzkx"; + }; + meta.homepage = "https://github.com/sainnhe/everforest/"; + }; + falcon = buildVimPluginFrom2Nix { pname = "falcon"; version = "2021-12-19"; @@ -2002,12 +2014,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-02-13"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "d2ceaeb0c16ff0ea38def9442d6062371cec1548"; - sha256 = "0p3r2xff2lkmvqc390nwn6qrgif5niclbqvs4hx0fypq5b86i33y"; + rev = "6a0763f917e05c3a22cfa85cbb65e6a9234da122"; + sha256 = "1yl9l3hily2548v5h848f9vg15fblnrb8imlhnv9v31w0233h9xp"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2111,12 +2123,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-02-11"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "c879f29c592afc9b9a15e4daa5fd7e78c56af89c"; - sha256 = "1669jww7cv9sv8v4z1sscilixmx2945h2rvz9afc384i1pfidips"; + rev = "2e82574f2cb6686849fb8e7a0231537734161fd4"; + sha256 = "08c9asrkmr57v83n3a6r28a0rxwna9xp227p8jr3rj3fn9ykahxw"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2135,12 +2147,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-02-02"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2e575549910571ff5abb6b02178c69ad760a4e00"; - sha256 = "06cbqxnpi5gzq9cggwixkgmw9kw5sdlw311xsczk7vn720bay26f"; + rev = "ad07b2844021b20797adda5b483265802559a693"; + sha256 = "1gar4pcdh4waxsjr423s4s1bdxplg01bgalp414pwbc4zwzrdh3b"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2231,12 +2243,12 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-02-01"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1f7bfa4007043c30027b2cd79625e8aac5cff1f9"; - sha256 = "0f6i6g9qvh9zyh56g51b1jf0bm4chsgkmqsy62fjh5yrlbkcwkai"; + rev = "b23e4bb8f853cb9641a609c5c8545751276958b0"; + sha256 = "02gz5j1pa8d7sgksjfikv8vf3gz41r6z33qwhiy9nvgnrwwmckwf"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2279,12 +2291,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-02-19"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "5957897f76b1f5fe3abbdd612d19be2c69452b0e"; - sha256 = "1d05nh2plyha3h8kr9pzys2730kbfxhb0lb2k2fg08bcxcnz144k"; + rev = "b6a426bc8224865c70244365f5c7599765d8df95"; + sha256 = "1l1485fnsf9y529snqh68kwksc5xcxg7fh7ikscisqdia2j75vg9"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2315,12 +2327,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-02-05"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "fdd38cf969af53acfaebde75ce74bb9bdc44daca"; - sha256 = "0pl60wgsc8pfhbzi6rgxa8kd4pbw7qdk2xc161i1qxykjjkczgwa"; + rev = "e60bfbc314476777a5ce200e533699691a5cdfa5"; + sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2375,12 +2387,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-02-15"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1d1f043acf025f919b8dd12bb672569109c7f099"; - sha256 = "1wcinz5r81mcx246vxwqqs3dfc7j61x81bp9zf02p3hflhf66s7h"; + rev = "5c487a804e462c284c159c800a803b8e0294d0a4"; + sha256 = "13i2c5r021h9jbsiap31f42y67z0pqjwfgmx6z64r35n3gmz5azz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2495,12 +2507,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-02-03"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "9395ee71627d7202343c606a2e1d3c7967bfb256"; - sha256 = "06v6kdsqhy59zd4il9qxcli68cmx4g1pxv5zfpaglayghvnxdn9n"; + rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0"; + sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2519,12 +2531,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-02-20"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "fde5af0921d4ac5e0b108417f3b57595ca5c7e7f"; - sha256 = "0sd106rkcsmypha79jwkangsh0i4dx4viiqgdqbk3hi05fsnwngm"; + rev = "256cd9d2bb414942eb2300d41ead84ed0f52edfd"; + sha256 = "1v7d4pfp1m9027x3spqikjhgv03fsjpmmgl6hzf2nzlxqiavh07v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2771,12 +2783,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-01-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07"; - sha256 = "1hgj7k3ml7n11nqn7cmn7bpls0rm6xh5z4sgrsgjyvrdnw6wckla"; + rev = "9915d46ba9361784c70036bb7259c436249e5b0c"; + sha256 = "0gcfm7hppgm2f909q6y8gs369mrh8flhbriyv5waq0ir15752cv4"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2952,24 +2964,24 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-02-21"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d752c2eebda44f4ba96768ffc2d61ebe41a914b3"; - sha256 = "0qqav23q85yad6i0vlq5fx74cvb97gmvb7ncnhkrh0qy3z63b0hk"; + rev = "a4b2830cedfc57152bd4e6b27050a41f02229295"; + sha256 = "0kmc6cgnsdim5yhjcy1hxcfp17a6pslj2zbray8jsfl9xkc2jl74"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-02-17"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "95462e91b82542a3d602bec5a2a54a35abe29728"; - sha256 = "1vl4p6nlp7y3vd98qgxl43c0yrcpllbyjlzqa3ajjsgkgxdjn73f"; + rev = "63cb5cc1a80def7da4bb375adee1587866250a17"; + sha256 = "08iwz314c0k63mwv3yka8n79lb2627nbx9n81l9crz1f3nplaasd"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3060,36 +3072,36 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-02-21"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "9bceeab97668935cc6b91ab5190167d9771b5210"; - sha256 = "1s2jyfssj1xvp2ym8a77pynjxw28722jj75i3lqln5i7v57dsjd9"; + rev = "ca8ea75e5a1d838635fd2fcc5c3467a5bb33c4ec"; + sha256 = "1h09yp9kmzbcraw88gdkzlv834p0yi5xacpmx4ksmp4yh4an6h5d"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-01-26"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "18dc0d630250c3d3b8cb4139bed53327aa4fed50"; - sha256 = "0cxvhinwd7afsy8jxy9c6ql9ybv1w0m8xv4dh5sl1bpybf8dsg96"; + rev = "58ef474453717efa9b700a22fc004756bf2ea5b9"; + sha256 = "1gwk1p7djny7wgy2bb1m5g230z2rr6jy2bjjfwrnbddhvhvi32q8"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-02-20"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "585503ef238726bc51bc3ce724afc0e8b64bf43b"; - sha256 = "0f6r16rhbc1k12d85a278cicqpbl3mj30pfra66s7kfv531lvw00"; + rev = "d3fef426356b6d33248c3e919cbd9b90d3742a70"; + sha256 = "0wr06w8bbsalfs188gg055wc0p4f6x7l8bqci96bjdn9f1pa1xpj"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3240,12 +3252,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-25"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a"; - sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2"; + rev = "58c9e321b188e040703b01f16922623911f11117"; + sha256 = "1x9w6nk69a6xzhr9jpcvnw3jby09k49y7gikasxyq5gpq6rp9dfs"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3276,12 +3288,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-02-18"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "eaa706a38bdf889103806d10ccbe0be1983ca746"; - sha256 = "0j8rlkyq8snsyhjw6swr35ldznz9w64hhpcbyl7qzsgcjsn62kly"; + rev = "8447cf6de2bee95a23c6e43d7cfc291a713e401e"; + sha256 = "0zr9bk6glf97g6w7wsk9s5zi6g3gbpk104b5aq0wl2dmcccxy09m"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3300,24 +3312,24 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-02-22"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "65bf5c03cd0b2a3c5c67a7600833092f89541344"; - sha256 = "1fayv5ldhvspjvlwpvpwzcggc0ih1va20hyd1krfhyj91842prz0"; + rev = "86fa6872ba2195f4dc569073c46192041f153654"; + sha256 = "0faqi0rwjdd09bv9h3j8jpyv8hmak91aymysi9rc99zwd84nvy59"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "f044fa4b465a102375d8d977e10e6427ec81ff63"; - sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9"; + rev = "4f54ff9708c59385dd2f08aad1ba7df879e638fc"; + sha256 = "076wyp90mr43xniv0zc7wh6rfk1wr50cpfw5lvaj6ai7dyys466n"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3336,12 +3348,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-02-24"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "7745d713e067b5faa44cffba85278ac820c3fe2c"; - sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh"; + rev = "c9fd775aebf702c81e2077693336584a0027d496"; + sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3407,12 +3419,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-02-15"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "f7c308e99697317ea572c6d6bafe6d4be91ee164"; - sha256 = "0s48bamqwhixlzlyn431z7k3bhp0y2mx16d36g66c9ccgrs5ifmm"; + rev = "e4f7dad45a1a3bb390977b4e69a528993bcefeac"; + sha256 = "0smxcvgyc575kmz9aw20k47awh5j11ywnc1lpq1hdgkppxm7lnm2"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3431,12 +3443,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-02-21"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "65e9ca7fb147668ce3f7321f8d734ae9b754241c"; - sha256 = "1rjmgq4jm7a785qy7xzsxy9hb5x2c3rjiqmhdqmqn3kw1d01wrxl"; + rev = "f3cdb7b3a99c548b56fe39078a69d0c594422e18"; + sha256 = "11l7iyykbd1hh673srpafggg3hlnf6a8jissmsx303gpnsml4bhv"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3467,24 +3479,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-02-21"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "016a20711ee595a11426f9c1f4ab3e04967df553"; - sha256 = "0y3rfamhl04hx3cjh6p9spr11flxr3l195a5h9h06k9hhj5rqppc"; + rev = "88a44ade818f9ee7ba730aa4096250e22b243808"; + sha256 = "0wjqpy7gvkzim27dnanzydphb44kdm345zm9yrngysrdpmbpkd0p"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5addafcc2460c7b805f14f8a257b804527bb85d7"; - sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1"; + rev = "35c7e1c1a1beec3dda228c7f3c2fba5c543c77a2"; + sha256 = "10a6p7cwa0r3zpf3az4a7i5hi4lza0d7maxywnk0wb4x039bpq9x"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3539,12 +3551,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-12-28"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "4b0aad42e72a653ca1afe31d2942f8aa5ab633e1"; - sha256 = "1qvgaf353aaq3aw8q251vx8llvm30c4yj1lyvnh43r5h8kxawc6x"; + rev = "74885b10abf792f61a612f5724030678b9704dab"; + sha256 = "12653fd7h1s0hf55399vdk2w3aqyx8n8v62kgpvb62mywbg37bam"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3575,12 +3587,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-02-07"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "a7c9069a55d136e6dc62fc107cb996df2eaebb55"; - sha256 = "1qblxq744ldzihb57b62ykjci19fa2v918610g8jb36gjrlmxdkd"; + rev = "596270a53ac5e19a3b9f9f1777d7e99dcf67f71e"; + sha256 = "0zzdks5dgfz19srflvxa4jj9gxzbany6a697p000vaq5zb59k9v2"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3611,12 +3623,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-02-17"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e36464080b7a62fe318f659cca3adb57e6712511"; - sha256 = "09l5dz6ihnzgw7hg87jckmx8ycppsbpls5lcqvamnfiy2j21rhjq"; + rev = "68f2bda2ce9ea9ecd51a133d9909c9ec07d44666"; + sha256 = "0klsy5pq3fvj2v6199aikpa6br4q6l30ig5nqnh6jm8c48bw6nqg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3647,24 +3659,24 @@ final: prev: mkdir-nvim = buildVimPluginFrom2Nix { pname = "mkdir.nvim"; - version = "2021-06-20"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "jghauser"; repo = "mkdir.nvim"; - rev = "caa4178dae081850230f2f05699fef8e83b59ded"; - sha256 = "0s87hmna6bl9zy12ni2ih4i7aml009slmsk1pkpr93lmh2mspms7"; + rev = "ed2da69babf365395be5dde420d7ee6482564938"; + sha256 = "05zavlylgadhwrv3andvr0briqblj0kr5m148s7bwczqi15y0ljy"; }; meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-02-23"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06"; - sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv"; + rev = "1f33d22f61db59faa24aaa69f2452668c37eef32"; + sha256 = "0ybi76l3f2r19d2f2ca5jjbn2gcvwdh9mxbh3xly8jin7f8anp36"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3695,24 +3707,24 @@ final: prev: mru = buildVimPluginFrom2Nix { pname = "mru"; - version = "2022-01-22"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "yegappan"; repo = "mru"; - rev = "30315ad4c07f0045c203a443291ad0c8d2fe7279"; - sha256 = "1k3x8v9c9c3mn2nakcsr5f9wqckxlx3b86smml4d985q90372fqn"; + rev = "148f71bd47bdb2af8c639694863910b6e551aaa4"; + sha256 = "1cijxc0srzbl2bycx7ccmwhgzz89frvyyim808rcy7bk7i56ccda"; }; meta.homepage = "https://github.com/yegappan/mru/"; }; Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2021-11-18"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "f7b689d72649e1d5132116c76ac2ad8b97c210d4"; - sha256 = "17yfc7ss9yslf8dvwl0vi3mdpcxp5j1g6dc8qrz20v2dx8hjxd1q"; + rev = "6bfcf7da965a03fd1e170aa6870b92b16bf739ee"; + sha256 = "1vx3ibxsn4gdq44pqhykygmim1cq1pj6qrd8cs9lpkm1vq1gz35w"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -3995,12 +4007,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-02-25"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0"; - sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95"; + rev = "f30879799f7c19d0047c6f3d3a86b818eaf0f201"; + sha256 = "1bfm5zfc97kna9hkb8asknbx1b7pznv88n3128a7d11ysasziz98"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4055,12 +4067,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf"; - sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2"; + rev = "ed9fb80e846042a46521494a980df83bc4e075fd"; + sha256 = "1f85yr0kvncxhqp9l4diwk9l3g2sg8ca3xbvp95qh957jfp03n9k"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4211,12 +4223,12 @@ final: prev: neuron-nvim = buildVimPluginFrom2Nix { pname = "neuron.nvim"; - version = "2021-12-04"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "neuron.nvim"; - rev = "d89a2f701eceae882dca1f9bbb754d2a89b0beda"; - sha256 = "0xjf5wiwy57g1rpq08lw32xyk0yx27p6z1m1bycq4wnxd1faqm8s"; + rev = "c44032ece3cb71a9ce45043d246828cd1cef002c"; + sha256 = "0r8qybg1pikp49v9v0zh79q7fxx8kh8rwafvyqghf5yb0ixcjiis"; }; meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; @@ -4247,12 +4259,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-02-22"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85"; - sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04"; + rev = "2208bcb7fe17a76d8b88f296fe632860bf62d948"; + sha256 = "0pq5r5kdq858k5cxd9ix3xqwvikllq63b86ba42jpkq1z39bdk2v"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4319,12 +4331,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-02-16"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "35b910263c614257dadc76813c9a02659912ad62"; - sha256 = "1mbxdxk637x506xdhmbybvzl2ilmy25wdd1911119s257zjq41w0"; + rev = "419542972605b808607d9339cbda0a216b6e8be6"; + sha256 = "10w85n2i7hl0whnv3pb3zva6iws61ca2a8xcrlwh1si2vjywby6i"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4355,24 +4367,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-30"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "6f803e88093573f73d4ee6c0dfe0575df3f97a9f"; - sha256 = "05napd3gqhdpb2x07affs50bm8prb3rzz0w5a39iyr40y96bpjix"; + rev = "513ff9bbdde7da53e209232d4328e734ea2bd96a"; + sha256 = "08r2ifkj9zj8c771ahl2i0b8crp3cw2cdshkpq26ci14ypdq0304"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270"; - sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap"; + rev = "2d98a1dac0a6ffc915e78738f87ad80c9c6a8d18"; + sha256 = "0wnxbfyr9q4rqbivff0lnyv1b6h9i0dkrg67qxnkqmh3zx34pq9z"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4415,12 +4427,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-02-14"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "784398a8f184431fd4329f20b0e4f52e87707bbd"; - sha256 = "14cd1aq5kyi82akkmk3pf2as0pg9kmyavggpcpkp8cl1api01xl8"; + rev = "d2cde7c5802b34d6391a8a3555a3b7b56482f2aa"; + sha256 = "1cbijlqblxf5chc35lq8jl8pzfkx0a72bbf6bzz90nvrcn4xc6m3"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4439,12 +4451,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-02-21"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "2558ee1d3a0c518301bd9bee97ddd61eb21b629c"; - sha256 = "1kjn0fvmbk5ii47vjmw8p3w7h6gdhmxr10x84x48spaz428vw5wd"; + rev = "dcb8a8762d9c93ddf7dc8f06009299c0bf11a14c"; + sha256 = "146bwcfywazl2ygs5r0yd56prdmrr1lbhlqcbrvs7l4pkh58w4fw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4475,24 +4487,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-02-15"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "13d64460cba64950aff41e230cc801225bd9a3e2"; - sha256 = "091argbivsnjp3ibsnci2qj5jrr2b39gicrlz2ky41kmb4pmw36b"; + rev = "1001683bee3a52a7b7e07ba9d391472961739c7b"; + sha256 = "1z2dy0mgzrpkxirkhximc5ibhgqf2hqa7d8xxmw6icpn3mxwb7xq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-02-21"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "b3671ef7a74912575d84b4dbc848fd3b6195b27e"; - sha256 = "0p6959z8im5r1mvr0fmx1ig24kav9wndnr50r1pvq117ch9kr59z"; + rev = "3f7fc82977e843e14bb3b16bad4cbd5d363d8694"; + sha256 = "1x9cpy79fxq5nwpbfwi2xcw5xhk6nw16rribdns2n2qy4my4ajpa"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4559,24 +4571,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-02-16"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9fcff6e02e1a549d47a2c559a4b833798537c0bc"; - sha256 = "1ai71s38dcny22wmhw5b5b82hj2mf16g60rbzi7llg54fdlfp92k"; + rev = "bc7ac4864188079a6122032a75ea914c95461c1f"; + sha256 = "05wv0cq7w0adkq78fz47vwm65ws6ckysm9bxg3yaxlkiarc59vw0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-02-24"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5"; - sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q"; + rev = "b4a596f149f87a6e93ae11c46a2121ff7c265170"; + sha256 = "12ljh9mnfvpw538lq8ggmxvsq7f1phjvp4xsnflrl7vkhdy32zsr"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4643,36 +4655,36 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-02-09"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "6afd8f7a69e7008dabe048d4fb1ee8e467a72fdf"; - sha256 = "13pgq09sxhfxxmrrqzc1f8b119f6d7yyx30lzbgr2vx59bh69ph2"; + rev = "08134573e3d5fef75c52c39f3e7097dbbdf6255c"; + sha256 = "1rs1y3ywrrcz03ad847903wrl4rmg1kzhvm9dkq33pz5m0myf75j"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-02-18"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "0f20213a9d55ac7ff19b4f9a9f8812303ec4200b"; - sha256 = "0fvmnwraxzfwm9rc4b279bg40ycmpkxjgx6yqkwg7aznzmmqlc22"; + rev = "925167117f5de9702781af9e43a9d86318a20329"; + sha256 = "1a87ry1rl86xbqhd76bgqxxavq7qmsh9ds2crmlgd9f3wgsk4bxn"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-02-23"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "2a883d68b93570a66baca5984e416d4c4d079c3f"; - sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm"; + rev = "6c6dcf5c461355392487d8c0e5b00223de933948"; + sha256 = "1rqk7n0cbrv25dzlz28xajw6fsqw9lrflicd9x830yq809mvfql0"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4739,36 +4751,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-02-23"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8"; - sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj"; + rev = "8cc31931859dc3cc187fd68509f8649599f72cba"; + sha256 = "006d9l0p86s08vhr5jjm6gi2j27wjbk3c3vfdbq9yi3bz974hgf1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66"; - sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr"; + rev = "c68bf8e382eb737d98ec77b2f87ce5c07ea09b46"; + sha256 = "10jj3qdxcsyfv260zp5sd2ys93r7y4584865iv1bvgxa98g7y8ps"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-02-24"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "470569379d708e6c8f33f082497e0374067c6fee"; - sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw"; + rev = "096398a07c2dc08d785266f9f55ddcb462ba0749"; + sha256 = "05gb0nd9iv06hr6zfa8yc2n4nd3p98mvcsdbyxm504bpfy3z8c81"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4787,12 +4799,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-02-21"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "e9553362f1bff508fa947fce09bba297cfac0f79"; - sha256 = "1k3bprxzn3qqm4a7rz2l7pld2am9aggcmvrrr6ak7aafd14v5fs9"; + rev = "32a37ce2f2cdafd0f1c5a44bcf748dae6867c982"; + sha256 = "1n3x2i0jd7lrxa66v7fw0rffy3mv5rajqv9qh1r38x45mig8vi40"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -4823,12 +4835,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-02-20"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "57093e9f3749c57f20f49d7e10be9c7d15018c86"; - sha256 = "03slk1lbgn2r66hw2gh34ja1l8kjx6qwc6p0g18bd7w1aazb3g9i"; + rev = "f81b48d298c0ff7479b66568d9cc1a4794c196d0"; + sha256 = "024zzjvdkj1bklhic3yh69jibvnjw0416wvm3lnfw7gjxshglrsy"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4847,12 +4859,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-02-11"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b6d26e21573c25e9c5faca69a1f905abe66fa294"; - sha256 = "1qsqkgs22r128jb4lvadzv15dzn586x300fwgimkl1q464cdawmx"; + rev = "0090dfbf449d7ad49f6bdaedf51b949e84affc72"; + sha256 = "194pgvs9d11aihddc2c55r8vrz05154lr751w72vii3zvnik9xhd"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4895,24 +4907,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-02-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "48e76bc0317de95ac154ae3a26193bf8881340a1"; - sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm"; + rev = "2457e141ae5c2e9c5d94a9550b37b421d25cfff1"; + sha256 = "0cw0bgp6q2sa8v88dsvncxmwmglxywbdhiws2klcm6ij9kdk1gy9"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "18c558fd92b5ec800f976c447452ede4e96e9de9"; - sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n"; + rev = "f448a78057290cca9c70c4065819da96103f3dee"; + sha256 = "0yq2lkjch42s02wr93c4xv7sqksiklwspx5pg8d4cia7ghaadj8q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4955,24 +4967,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-02-23"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e23fc8ac796b722dd30f40467d59581d4854c692"; - sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn"; + rev = "7c6b5fe0926f52854f193d058cd98d2e74c3d483"; + sha256 = "1zrgiazmqbn6664ji9gxvn36dsmp9v11nk99yl12c7fxdjlvfpql"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-02-24"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "178e40a213eeea4810cad440b6be56ceeb6af434"; - sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4"; + rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2"; + sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4991,12 +5003,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-02-24"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d"; - sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk"; + rev = "0594067ae677a192a94e383c25a93ac1c3a844d1"; + sha256 = "1pafxnzcwrxbbkqpf9psdglqksl97m8vb6180fwcrgdicbnyp793"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5039,24 +5051,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-02-18"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "bcc89cabb4841134c9aec66480499ccfac0331d6"; - sha256 = "1h350dwl73qdkyyc9nzc92grg858nardspisc49zv1dc3b9f34bj"; + rev = "3fa6223a21528f0f5528469f33f7f0e237ca9e8b"; + sha256 = "0j7m976iyw0rw7hry0sb86jc2vyrsmnpiyj7nn353hbkwazxi2lh"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-02-24"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "9b819574b63bbf8883e32602915da22ead08bf9a"; - sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw"; + rev = "6562c96cfc9c71b139807a975ada6aa8528511dc"; + sha256 = "1x4qjkq67wlhzwbhcjabqc0z8hz4racfdg7pssbig3cmj27y57ik"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5087,12 +5099,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-02-21"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "3a393b404e7066a86afd1652f5be7c8074ed4030"; - sha256 = "02ldc51k5agn9pjqzjbycdjyilz3v04c534wf0x2nsdi97ikf5vl"; + rev = "5e461b944fbf9b6207cf06102ca09fd7778854f7"; + sha256 = "0s04m3xg98sj74fhhvdmafijmjhpa70hgcylg43yxlgdcscqbd72"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5123,24 +5135,24 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-10-15"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; - sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; + rev = "d472198ec6d6a0d148dd0b4cdcf1b60e845311af"; + sha256 = "00sjcihagbdka2mcld584ba2s5g99qbbjh6wgga7n90pkqcqmlw4"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-02-24"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205"; - sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca"; + rev = "f0562da89fecbce7ef335875c70baedfdd34c7d8"; + sha256 = "1f21m3ddmqpcxv2sv80k1zn9kvnx6m8h88mxv9nk8q422r4vrh21"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5183,12 +5195,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-02-21"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6c8ec4e95755c0375c912c1f9cd1171e5fe23dec"; - sha256 = "0s4j6j6v6fy7zn1b5zm3di7yxcpj1hm352379hsmah02a3h9jv1d"; + rev = "2adb21effcedd6f2c501797a9973d49ca4862544"; + sha256 = "1z5rph5l7m50fh0lv6w56c723ajnr0fz3f4l59acci2p5158hbz0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5207,12 +5219,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-02-16"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "963cb58c3dd15699c801baf3e64393c6795b62e9"; - sha256 = "0pq9c2xdhw7pshv8xsmrdachsfc4kr3n705jxhiqm95ml6c7fm5b"; + rev = "c576ab3f1488ee86d60fd340d01ade08dcabd256"; + sha256 = "0g2h6wq2v315s1g5wh2qfvslly00iglx9sixqrq9xncrs34n4w25"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5327,12 +5339,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-02-19"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "2a278c8a12a399e25b78a43ebcd4f3996cd4e4b6"; - sha256 = "1z4mzm1bykyp82598cdxps3i8g68bzkfnc8ffr3ajmlcf0ylj6aq"; + rev = "14dfb4071022b22e08384ee125a5607464b6d397"; + sha256 = "06c3r97kki2g3jha45nrm6i8dljrqak38iy1248ml8ri3ldpj44z"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5629,24 +5641,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "85e3474449967d2ee4377fbb9633f21093a80187"; - sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp"; + rev = "7b0c1354bfdc90e9c9085d206b2611ad5d77142a"; + sha256 = "1z03xfqsrr7h7wy9lrsy1bxigyia4i102li5ndki3d2yi7pi9l61"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-02-12"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "dd2bfa41b2c43d65f1f715e07acf1f1d34b37de8"; - sha256 = "19w9v3blnr6x8sp2v362s7yq9yrcgdhkh5r18zkf75fhinaaivra"; + rev = "c66458fe5f83b57d40b678058a8eeb6340f9275c"; + sha256 = "0zf4w1ahg9dfvrw6b394asy8pyc0yjjffs73nf1mwp0bkk3hdvzh"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5773,12 +5785,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-02-22"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "9e28459c1f92de3341d70d6e9bc3ad76990e90ad"; - sha256 = "0p5w2sy2393k3d9phr8g1nafjccg1183gxkwqsibk6pr0qqsy2wd"; + rev = "9aa2d2da7f485336c5d97aa47c0acb0544ace768"; + sha256 = "1ffwvx17pl36wxfdi0v8rgh20mb2ww9b5ghrj81n3125ffvl03sk"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5821,12 +5833,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "7cb75a0e0262244728079a5482f2208b742245f9"; - sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih"; + rev = "4926d66c99fd35cf41bf497fa4f8912acb5d6e8d"; + sha256 = "0h6ncs2ac8i2rnal62blbgivykhlhspsd2nda8lwd68ri8pxn4w1"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6038,12 +6050,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-02-20"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5f9654ddbd828312af7f55202e5ecdc0ff4d6a8e"; - sha256 = "1lgn7jb0dq5ri9izwwzsgwkldq71a43j3c6imyz562q51xcb4mgq"; + rev = "d92364f07a5b0a8279bfd3c97263bbae4b3ad958"; + sha256 = "090d6s64j6w16l4ww0nm87686k3j4nwh1dl3ydd42mqqi3k95lkf"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6110,12 +6122,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-02-20"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "6975374b3be303b820c61c2fa33a43fe157265ec"; - sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n"; + rev = "e1d68de4c28ec1d71e092c1b4d7cc70e5bec6aa4"; + sha256 = "1zjj510vmvjqb248g0jssh689zsmx3xcwrclkgk3s3y84ylxmh1n"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -6183,24 +6195,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-12-20"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "3855b4ae6f20b73f8694f48b82ccc73a99d45b39"; - sha256 = "1ymzmlkh0hhhvsgbzim91yr9ga8j1dgmfi2mmwpnhvvmf2ycr5xz"; + rev = "9ccd2a6538d8a201d1ea08784bd866950e1b4130"; + sha256 = "16yq3zi8zvr39ihpw8zik7frplpmgcc3a6xf424rsxfzshn92k9f"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-02-04"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "2f0fd5fe6e47e7fe2a6de19a4b56ea4f86947780"; - sha256 = "1fcrn6f05dabk6h4c5xhfczcr7mdg1hqnraas0021cr03lgnf63w"; + rev = "15bada8f887d69ed3a3d10330b4ff7f089596464"; + sha256 = "0qix7c1z8r0gkf9g0cffymw5qk2h1bil063ddxf36bwdhpjx433s"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6315,12 +6327,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2022-01-28"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "478e11812f3ddb1778918bd243d8b27c9984ab26"; - sha256 = "15kqlbp1spkbkrgaa9dwp7dbdppncq059cps1qljpqp49qmgay2l"; + rev = "64256d0f2c410d35ac1752aa2a2f7ade3a04695e"; + sha256 = "0nljkn8wg515kdh4yrs5nss0c8jmqcdnhi3hwjd1jgkxd6wsh2al"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -6340,12 +6352,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-02-22"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "758944ebc6919c50557b6eb3a52bc41187041fe2"; - sha256 = "1qsa1i72h1vq7mxk8dd75786a1gjncc3jafc8gv5lajk7xyqc64j"; + rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2"; + sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -6388,12 +6400,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "bcb474cafade81a7fc1ecab4bd2ceda6fe359e66"; - sha256 = "0mpawhqhnva3xqpxq27amd6hr0nls3zsxxwzb7bsrkzk4lc2p1kj"; + rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; + sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -6557,12 +6569,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-02-18"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "d06fe1d4ade68ba17739025e55e941f9e977d37c"; - sha256 = "1rvcbbr3bw1i3xykk519m67kw4qkr5x6j7nml5b7camlcdva6lih"; + rev = "84efd93ec772696c1cce2aada4d39f2756953964"; + sha256 = "1n23d24nr9q857pgmzkcl6v49c1gs4bqabfdwjik18nxkjxq2zhk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6700,14 +6712,26 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; + telescope-zoxide = buildVimPluginFrom2Nix { + pname = "telescope-zoxide"; + version = "2021-10-21"; + src = fetchFromGitHub { + owner = "jvgrootveld"; + repo = "telescope-zoxide"; + rev = "b51b7f4ba0e2a08bc764fb2ee39e0bc68eec79b5"; + sha256 = "0dm7h00hz2qh73gfzypv1lm2vzk7nawp7wz1y1ar5nh6gg4zf2rl"; + }; + meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; + }; + telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-02-23"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "567ec85b157f1606b500a0f755181f284810a28e"; - sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n"; + rev = "a7517b4b2df8a066927f0a9d1f226c89bb69f06f"; + sha256 = "1vsmhra3aj1q9r7g12iszgw2mlamcv4prz6s1sx0bvmj7ahfzwkq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6883,12 +6907,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-02-21"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "981e207e17ecd8bf065b5b9201c1d6d2395e9338"; - sha256 = "1dki7g3q7qp9fmp48h1zi5pyhvn9i6ypqnqhn7n721wsf01mzcrv"; + rev = "e97d0c1046512e975a9f3fa95afe98f312752b1c"; + sha256 = "00j1q6g7js9ais6s1vi18x165k1zrx988zbp0yr1gcd5n2xnknbi"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7123,12 +7147,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-02-07"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "cc6a3d9ac374078c16a49ace984d9130b307b5e6"; - sha256 = "15yl6pk9c9dal23jlfc356z4v26a84jhflw5v04y33wv57b1kdfa"; + rev = "b7da086d9f370b65ffeec6af76c8a37cf5e43336"; + sha256 = "1ln0icwhmcrzkmn0ln75xn1inik5hyn6938i479128ysznplz8fm"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7387,12 +7411,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-02-06"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d0c67776f27eb49cccbd58008724bd6caa00ed8f"; - sha256 = "1nnwq2csz1nvj4si3y4b85sv8rihnbzxhwcm35dawki57qnvxkpw"; + rev = "e2498d72dcc123115ed1d0fe1449beba6dadecc2"; + sha256 = "0zr7ldn3kwx45qyi27bzbgy63va7hwvp9n2awrvgd3zsk1nq9kbq"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7759,12 +7783,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82"; - sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk"; + rev = "1b776663b029f00ed20cc87b871726fa0a2f394d"; + sha256 = "1vgm6wh7nsdx7737vl97c8c2x8l1gdkdjbc1zd2a468ij9qhcg00"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7884,7 +7908,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -8035,36 +8059,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-09-20"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "8fcde4c500440757f04e38c039005319476d1471"; - sha256 = "1b6759y9s8sl6d96xzc2lx5qqh0x5sabls12hz0zj6s1736hs3sk"; + rev = "23514a579ce6df28fd956070d9e2ac1051855115"; + sha256 = "0pabwgszd6s03y1mykxxvipn4cwkzch4jgb18iqcnpbpgbsyghl6"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-02-13"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "db100d536885fb920925eb0bcaf00bac3d0112dc"; - sha256 = "0g0zp9j0gaww1w8w7pdfz71dvs2fww9qwsyafbqljn9img0qdmpk"; + rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; + sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-01-03"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "a4a9051044876656fe4f22a188b084258727997d"; - sha256 = "1z16csn6ql0vnmy9646006ri9d1gxw2r7wqi9bh8sgfl2il388lp"; + rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37"; + sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -8083,12 +8107,12 @@ final: prev: vim-DetectSpellLang = buildVimPluginFrom2Nix { pname = "vim-DetectSpellLang"; - version = "2020-01-13"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "d8b545ef138a9ff013f8243f85c79b277b26f5e1"; - sha256 = "0c1bxryw4rg4cyql7vfp2gwhkl2d0b8inc6shmgfy7jg4svhzs0w"; + rev = "65c3e44b125913d40692a6bd1e5c65b4c42bddf3"; + sha256 = "0mz6hyf9il6l0gk8qn3hfazlkavjrw6w2nbhmqmxk2dnwp8h051c"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -8515,12 +8539,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-01-02"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2358b199117900d3e36eada1de1f2a12556a5506"; - sha256 = "1q5ralkkgl81cnnxvz4sm06xzh85zj0pixfl9zirfz4djjab3h82"; + rev = "47123282f501fc77965e1d3c08357209d991c7f4"; + sha256 = "18fs6pgadffdxl6r03daqnz6v65m7jap3yanx7rzp5g25c0461ps"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -8575,12 +8599,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-02-11"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c29ef11cd6478da675678265e76f9e527843876f"; - sha256 = "1mfskzmpkb7nk1y7szld46npp0r686whrw08iqih7saxbrhhkdra"; + rev = "46652a304f0b89f36d70cee954d77e467ec0f6de"; + sha256 = "174qmalqmg8miq7ixc0c3w66qpc46c9rxvpw6sn8qalyifb0z7fj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8851,12 +8875,12 @@ final: prev: vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2022-01-12"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "80a497d14d8ca72ae5ee4b9cc6b17fc57b46a407"; - sha256 = "18gw4iq84lkzmczfqr2yn31lh7kfnbm085h0vvq079c4fc2qa454"; + rev = "1e1116c17a5774851360ea8077f349e36fc733c1"; + sha256 = "07kwrkxpgjfi2cih31cxnjaiypxy2ddwan2sr66gvamixfrpixav"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -9128,12 +9152,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-11-15"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "b5c8d305df52e0cb85b3436ca1e958c22c6e2d79"; - sha256 = "1zv6k8ld938zg000svi9q6c5jkbmvlyllxzkl41jcsx2zhqkwdiw"; + rev = "8c59fc67c6a935723be0efacfe7af66866ce8570"; + sha256 = "0vg4nzykdllwwgmnbmbd9i60gd0kml8q58mqpnnc4qmzvm6krgl5"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -9393,24 +9417,24 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2021-11-01"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "f09bf7c61e4aa03293622792eaeadb315b91e77f"; - sha256 = "0rskyxi507b339ipgam3kbf4ymj6bcbw75xpc2cf32xzdlpairln"; + rev = "4c768d215a0654d61ea72eeec423716bd971948e"; + sha256 = "0q2c8n1kbqsx005cn0p1f5334qgslkla2zag03q0vy57g3yhydv4"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; vim-logreview = buildVimPluginFrom2Nix { pname = "vim-logreview"; - version = "2017-07-08"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "andreshazard"; repo = "vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + rev = "de67c14943219c12b727dfef5687d938597af31b"; + sha256 = "0c50m5x6mds4bryaphf770qmxqdm12kcrrm92l4ph86zi0v8ik4w"; }; meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; @@ -9441,12 +9465,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-02-12"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3d0fc4072bef08b578d4a4aa4a6f91de571e99e4"; - sha256 = "16cpi5x2z1gqfzxgvdnqh47g6p0b6dmhrrfqprmc45c6cfwj6plh"; + rev = "bfb7541eb88eb9804287af39aca70102e60d2bf0"; + sha256 = "1kaa92ylw5i8ysb2yxyqf666194wwcixgagi7gq3apkddr35a6g0"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10210,12 +10234,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-02-10"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "9ce73e992d4481de6235222b75e42f64d2b307ef"; - sha256 = "09w41jkidlyab67ishjpibbyrpa9qqmcrpb9y91ssyv3mzir5d3w"; + rev = "68d7c1682b1ec787905294cd980dc86c0398b7c8"; + sha256 = "0w5x4p7267yi2fs653pyw56jy8az0xd3jyyq5yw8xwk4gjr0131m"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -10258,12 +10282,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-08-04"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "980147f64d708652aad1e67d8b39c17b2dd07702"; - sha256 = "0851b22an00p6i2xbc18zx3z5ik5k8nfr6is2fcbsqhlks0g7cgf"; + rev = "0385ccda67fe8bdd1fc12cd62a88ec38af303520"; + sha256 = "1vvx1n3fkqkz7zd5b9n8q82m7ar3fskxlhgavg3qycvvnbrniff8"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -10642,12 +10666,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-30"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "27156fb69450ddef8e1bbec6afa71896681ad38a"; - sha256 = "073bc4pbsx7s5is6658q5pk0l69ip1bx4dhlz2bcvzhkslzp2ik0"; + rev = "f07ab590e5dc91ded9ef8988b93e686965001dfa"; + sha256 = "0gss50z473cqvpasj9nihvcb2yl43vwb2911v9d6kd5yxvs75hzz"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10702,12 +10726,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-09-25"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "66d206292bd2e556bbf729ef808f0fffbab92c88"; - sha256 = "1431dk1ffcvgjj0zm4sj7z6csmw8hvmf05pxl5p45jj15xbqikzh"; + rev = "b9e4cbb85e880cd32f90c2dd9853ee7c592b3528"; + sha256 = "12g2ia7yqsh98nlr4z0ij67x0xamgizv0gbmg221if7ycn222xlm"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -10738,12 +10762,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-02-05"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "851c39c38f48c47f9aa937f83cda314ab1c8dd44"; - sha256 = "04ni3fnci1h9sqrmchwad9bsqmnq9ix0lvh6mssy4s38pkl677l8"; + rev = "4e1d1456fd7d1d5d6cff256578a3e3bbeeb24e62"; + sha256 = "1pwqwbiwgnfxwilazdzgd1yzpkh642wzlpwlvn6jx1n0fywmb60j"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10822,12 +10846,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-02-19"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "d6098f5603066c438a7bde3cc4acc32fbe6972e8"; - sha256 = "0ycr5h9zng612ia6sx67mrw266wmy6xdbkrc9rrd53lzd1akh0f3"; + rev = "63967c60feb2034158bdbcf061c171e3bb4d8b99"; + sha256 = "1vqlmx16n9b53qv6kx2dqaq54k5jw8c15zgdvr69ddljksw80mjk"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -10918,12 +10942,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-01-21"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "9191af46b6bee8d3e3474c7f8ea134c800e55985"; - sha256 = "0szp8n82qmjwpm8skq3zqbmk0j9b269h86v7p6qlwdjnvr39hnis"; + rev = "698ff3074c45d4292ed6a2f629e6114fdaf4420b"; + sha256 = "0a8lzjp0mj2ml82sql44qbq1dwxmrxjp5h3snzclw4y64919yf21"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -10979,12 +11003,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-02-12"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0422b7fa087eb7dd1270dfcb1f3d634b57829b6e"; - sha256 = "060nvhxj219phx4rxi3igg2lvk39ll8g3jp762nigc242hha6wzf"; + rev = "16a3b6da1bab42473d42d7e02d89d549d7a5e138"; + sha256 = "1hlw3268x3i0pbmyj5b56kng6a9348rmh3dg8jrhq1jyy75r6m09"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11159,12 +11183,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-02-01"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "3758476a99644e8071b240184af3c74bc00373f1"; - sha256 = "0ilhyam3av9hd685938abz3h4qfpgxcv81qhr71fr8fwbfb8k2w5"; + rev = "d601fd8c4635cc127d48d6219881215782bf0b2a"; + sha256 = "1rniy8sl4pr0k2j49yvkbsj4lax6qb6lmyay7svksqyzjy3rndcl"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11219,12 +11243,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-02-19"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "3792283722949045c5218abc3cab151441828afb"; - sha256 = "1fb71npvzdgrwfdgi8m7fzn5an027fcn6s85g0vywjr89l2dqyyx"; + rev = "5b3d26c0850e3347ebb39b90c3d4e04e883edd36"; + sha256 = "1r63pn6gj2nnjayhxyxm9jhxlsqzrcn847pfmfp3ndh0fradhlzz"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11315,12 +11339,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-01-06"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7fde9c0b6878a62bcc6d2d29f9a85a6616032f02"; - sha256 = "1f0p9pk2a2fxcdf4p35vm0jyrxkkxkqgn1v8fyd622vmcrbrj860"; + rev = "70a1131d64d75150ece513b983b0f42939bcb03c"; + sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -11663,12 +11687,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "d044dea0c2669c740052a47900e6e16f64444b63"; - sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0"; + rev = "9bec3b99f6303bdcbfba669b21e4260df4f8a02b"; + sha256 = "1ynkcklpdlc5kdfcppz8vk1x4qjc2p8dwnxzigzc78hnrrgb76pz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11676,12 +11700,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-02-19"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c8c9ac5377045f3e2881d13cbb60ff1750497b15"; - sha256 = "14bl67020mswbbz63jzq25nl6sqg9qzryw12x1s802xnc2f65g9r"; + rev = "dad71b9053e50d7210cdf4e51e0aced1acd296e0"; + sha256 = "0dkkf4sz9cj768q41a1sijiah0fpc290wfm3agvdlmlbpp3l78vx"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11700,12 +11724,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2020-05-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "619f04f89861c58e5a6415a4f83847752928252d"; - sha256 = "03dic4vjl3bwd7s6jj3vrz6xicf3a3bccaqgx635hn01ha6vw1jw"; + rev = "63af6e72dd3fa840bffb3ebcb8c96970c02e0913"; + sha256 = "1cvi3bb9kqfwjh3d4biwxgavankj2ljiyss36q8z96czzaz2w40v"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -12002,12 +12026,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-02-11"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "10ff26328cf8e5ed2938b96da6f8c20737eb444a"; - sha256 = "1r50jrap0pb2mah4b7mx9scg2gz03l02bkqsfqw1a0r7rwv6alxs"; + rev = "118d9b74970899cae309823b75ddee3af999a74c"; + sha256 = "1q9gbzyrx5j95jwly0qc41lyaqpsk6wq82w2h8d0q3abfxwisy11"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -12024,4 +12048,16 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; + zoxide-vim = buildVimPluginFrom2Nix { + pname = "zoxide.vim"; + version = "2021-12-10"; + src = fetchFromGitHub { + owner = "nanotee"; + repo = "zoxide.vim"; + rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7"; + sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm"; + }; + meta.homepage = "https://github.com/nanotee/zoxide.vim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 05962249573..f3e1a5f12c3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -39,6 +39,7 @@ , which , xkb-switch , ycmd +, zoxide , nodejs # test dependencies @@ -693,6 +694,17 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace lua/telescope/_extensions/zoxide/config.lua \ + --replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls" + ''; + }); + tup = let # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim @@ -820,7 +832,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE="; + cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65"; }; in '' @@ -834,6 +846,16 @@ self: super: { dependencies = with self; [ vim-maktaba ]; }); + # Due to case-sensitivety issues, the hash differs on Darwin systems, see: + # https://github.com/NixOS/nixpkgs/issues/157609 + vim-colorschemes = super.vim-colorschemes.overrideAttrs (old: { + src = old.src.overrideAttrs (srcOld: { + postFetch = (srcOld.postFetch or "") + lib.optionalString (!stdenv.isDarwin) '' + rm $out/colors/darkBlue.vim + ''; + }); + }); + vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' substituteInPlace $out/autoload/dasht.vim \ @@ -1076,6 +1098,15 @@ self: super: { }; }); + zoxide-vim = super.zoxide-vim.overrideAttrs (old: { + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace autoload/zoxide.vim \ + --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" + ''; + }); + } // ( let nodePackageNames = [ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 48e1b99d1d0..7426fe82b2e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -347,6 +347,7 @@ justincampbell/vim-eighties justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak +jvgrootveld/telescope-zoxide jvirtanen/vim-hcl jvoorhis/coq.vim KabbAmine/vCoolor.vim @@ -520,6 +521,7 @@ mzlogin/vim-markdown-toc mzlogin/vim-smali nacro90/numb.nvim nanotech/jellybeans.vim +nanotee/zoxide.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides nathangrigg/vim-beancount @@ -720,6 +722,7 @@ ryvnf/readline.vim saadparwaiz1/cmp_luasnip saecki/crates.nvim sainnhe/edge +sainnhe/everforest sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fe3515aa37d..a5c8dcfb50f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5,6 +5,7 @@ , vscode-utils , asciidoctor , nodePackages +, python3Packages , jdk , llvmPackages_8 , nixpkgs-fmt @@ -349,6 +350,42 @@ let }; }; + bierner.emojisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "emojisense"; + publisher = "bierner"; + version = "0.9.0"; + sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-checkbox"; + publisher = "bierner"; + version = "0.3.1"; + sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-emoji = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-emoji"; + publisher = "bierner"; + version = "0.2.1"; + sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -500,6 +537,19 @@ let }; }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "daohong-emilio"; + name = "yash"; + version = "0.2.8"; + sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM="; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; @@ -648,8 +698,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.7.0"; - sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6"; + version = "12.0.3"; + sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -740,8 +790,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.2.0"; - sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI="; + version = "9.3.0"; + sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -838,8 +888,8 @@ let mktplcRef = { name = "auto-close-tag"; publisher = "formulahendry"; - version = "0.5.13"; - sha256 = "0swyxhcibv6cl54gmfpnbz6bqidjzc77nx369wndhlq264idnwkw"; + version = "0.5.14"; + sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; }; meta = { license = lib.licenses.mit; @@ -850,8 +900,8 @@ let mktplcRef = { name = "auto-rename-tag"; publisher = "formulahendry"; - version = "0.1.9"; - sha256 = "1xk8rzda16qgdxhq8bz6f8w09fd9044qczx1wfhszd6w3r4q9262"; + version = "0.1.10"; + sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; }; meta = { license = lib.licenses.mit; @@ -971,8 +1021,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.35.2022010609"; - sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa"; + version = "0.37.2022030309"; + sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v"; }; meta = { license = lib.licenses.mit; }; }; @@ -1131,10 +1181,14 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.2.0"; - sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; + version = "8.23.0"; + sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY="; }; meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; + description = "LaTeX Workshop Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop"; + homepage = "https://github.com/James-Yu/LaTeX-Workshop"; license = licenses.mit; }; }; @@ -1176,8 +1230,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.15"; - sha256 = "0a5w6qxvsdzcmgc0yfiagpmz25y90pmzgrxz9899na5qy3pjcbmz"; + version = "1.4.17"; + sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; }; meta = with lib; { license = licenses.mit; @@ -1260,6 +1314,33 @@ let }; }; + kddejong.vscode-cfn-lint = let + inherit (python3Packages) cfn-lint; + in buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-cfn-lint"; + publisher = "kddejong"; + version = "0.21.0"; + sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ cfn-lint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json + ''; + + meta = with lib; { + description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; + homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; + license = lib.licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -1321,6 +1402,18 @@ let }; }; + marp-team.marp-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "marp-vscode"; + publisher = "marp-team"; + version = "1.5.0"; + sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; @@ -1373,8 +1466,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.19.0"; - sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE="; + version = "1.20.0"; + sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg="; }; meta = { license = lib.licenses.mit; @@ -1537,8 +1630,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Y5hP/Rq9BsFwbCRQWOfiLHKoYkKBpZx8blg9o74obfk="; + version = "1.4.0"; + sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; }; buildInputs = [ jdk ]; meta = { @@ -1551,8 +1644,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60="; + version = "1.5.1"; + sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM="; }; meta = { license = lib.licenses.mit; @@ -1606,8 +1699,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.12.1"; - sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A="; + version = "4.14.1"; + sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ="; }; meta = { license = lib.licenses.mit; @@ -1626,6 +1719,18 @@ let }; }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "snake-trail"; + publisher = "richie5um2"; + version = "0.6.0"; + sha256 = "0wkpq9f48hplrgabb0v1ij6fc4sb8h4a93dagw4biprhnnm3qx49"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + ritwickdey.liveserver = buildVscodeMarketplaceExtension { mktplcRef = { name = "liveserver"; @@ -1747,6 +1852,23 @@ let }; }; + skellock.just = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "just"; + publisher = "skellock"; + version = "2.0.0"; + sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; + }; + meta = with lib; { + changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; + description = "Provides syntax and recipe launcher for Just scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just"; + homepage = "https://github.com/skellock/vscode-just"; + license = licenses.mit; + maintainers = with maintainers; [ maximsmol ]; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -1821,8 +1943,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.5"; - sha256 = "sha256-nIR3PtbtnSbAU0rS+qVtPsj++Dbfp/k86dWkx4xYcno="; + version = "2.1.7"; + sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2031,11 +2153,12 @@ let mktplcRef = { name = "vscode-pitch-black-theme"; publisher = "ViktorQvarfordt"; - version = "1.2.4"; - sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw="; + version = "1.3.0"; + sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; }; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 496dbe2496d..370647de1fc 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 = "0gv71l9cidkbbv7b1dsfyn7lnlwcmjds9qx6nrh7alymdm1xa2xr"; - x86_64-darwin = "1is795040xb3l23crblwf056wsvsi4dip3lkwhlblhkpsl0048f1"; - aarch64-linux = "186dy6h3krc6fqvmh1nay1dk5109kl9p25kx37jkbzf2qhnpibm8"; - aarch64-darwin = "04xc5fy4wcplfrigbm624dpzxd2m4rkq979xr1i57p3d20i96s6g"; - armv7l-linux = "1k7bfmrfw16zpn33p7ycxpp6g9xh8aypmf61nrkx2jn99nxy5d3s"; + x86_64-linux = "0x8vc6gj83mn767wi285k0hxhlh5gh1lcvq63na89vglja4ipna4"; + x86_64-darwin = "1x47xfq0fgd10wq6aa8gq55aqrl1ir1f6v1mm6324yny16pf20k2"; + aarch64-linux = "1ibg2qvpnwfwwzgby2xva9xz138b13x9q8vf1xf6plazv0arla1l"; + aarch64-darwin = "100834mqix7b46frlqf0jz4qs673lavxm8sizfjm7c9y0xxy4ld3"; + armv7l-linux = "100yfkzvnjccp1g3p353jr2vicvkjc0skiwmmzgad6i8j1m9js62"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.2"; + version = "1.65.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index b1ab8c57ee8..a91227d9db4 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 = "0ldfp4r7nb9npvjadgj63sd369nqmbgf5y4kpp93slsy1lbs0bk8"; - x86_64-darwin = "05z0jx2cc1askzzdxa8vxj8gp0v9rm1jw6005bpmijvyb8s2d30w"; - aarch64-linux = "1a5fyxzz51rb0af0wv3xh2h87yq00y5k501p7idqhj0zvd5mpqh6"; - armv7l-linux = "05byi0aba516whzry5qkxfkm82sy2dgv1m0hyycmnkb2dwmb552m"; + x86_64-linux = "1sh2f7hwhilwmlgy11kl0s2n3phpcir15wyl2fkyhsr2kdj4jz9r"; + x86_64-darwin = "1s04d91f08982wi8hb4dw0j57d6zqrdgns16ihrgsvahrzksgq4b"; + aarch64-linux = "1a97lk1qz2lz0lk5lpja32zy07iwdbskp6baf429iz7fz232rshm"; + armv7l-linux = "0vjqxqcr7fq3ncx1nl6ny7qcqm4vlsn33c074hhcg5292blg2a0p"; }.${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.64.2"; + version = "1.65.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1..40792c81ac1 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-csWowcRSgF5M74yv787MLSXOGXrkxnODCCgC5a3Nd7Y="; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 56e107300b5..be3e7f555f8 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15993"; + version = "5.0-16101"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "5e595616379a694789fe749e40a27ef069f0090e"; - sha256 = "1kid8qjn8r7dxh2yc1y6yal6qkfxij0ymi3zryxsnym3rjh1jds9"; + rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb"; + sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 9289fb081f0..0247a10f0e5 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-yQX58m/sMW/8Jr5cm2SrVXTiF7qyZOgOZg1v0qEyiLw="; + sha256 = "sha256-jNR9AB8s2S9ehYsompkV2GOLsaXIQzldeQ1WRCxdDG0="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3..6e389b8daf6 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "1v8a060gbpx7rdkk2w4hym361l2wip7yjjn8wny1gfsa273k3zy5"; + sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 0ea56d3a72d..6f58990e473 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13222-8c2fd5095"; - rpcs3Version = "0.0.20-13222-8c2fd5095"; - rpcs3Revision = "8c2fd50957be3af05c04a9bb782dce8505fb6400"; - rpcs3Sha256 = "1cf62vpqdc9i4masgv9zz24h7zdc7gcymx6n1hbh7wp5gg1dw4qi"; + rpcs3GitVersion = "13327-6c096b72b"; + rpcs3Version = "0.0.21-13327-6c096b72b"; + rpcs3Revision = "6c096b72b5294758067a002f981563bbd618d30d"; + rpcs3Sha256 = "0xmdhjskqbv02jvl43bvw0clsgh9gnahl50fr3q8lmpwpy13ldr4"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/appdir.patch b/pkgs/applications/emulators/ryujinx/appdir.patch new file mode 100644 index 00000000000..696077d29de --- /dev/null +++ b/pkgs/applications/emulators/ryujinx/appdir.patch @@ -0,0 +1,23 @@ +diff --git a/Ryujinx.Common/ReleaseInformations.cs b/Ryujinx.Common/ReleaseInformations.cs +index 35890406..cca77163 100644 +--- a/Ryujinx.Common/ReleaseInformations.cs ++++ b/Ryujinx.Common/ReleaseInformations.cs +@@ -42,12 +42,14 @@ namespace Ryujinx.Common + + public static string GetBaseApplicationDirectory() + { +- if (IsFlatHubBuild()) +- { ++ //if (IsFlatHubBuild()) ++ //{ ++ // This needs to be a mutable path, while CurrentDomain.BaseDirectory refers to the nix store. ++ // AppDataManager.BaseDirPath refers to ".config/Ryujinx" on Linux. + return AppDataManager.BaseDirPath; +- } ++ //} + +- return AppDomain.CurrentDomain.BaseDirectory; ++ //return AppDomain.CurrentDomain.BaseDirectory; + } + } + } diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 1a2d122e637..d2c2cf03683 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -1,8 +1,6 @@ { lib , buildDotnetModule , fetchFromGitHub -, makeDesktopItem -, copyDesktopItems , dotnetCorePackages , libX11 , libgdiplus @@ -19,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.76"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "3705c206688c69d3348f5cec84dc480d8d7c578e"; - sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908"; + rev = "e2ffa5a125fcbe8a25c73d8e04c08c08ef378860"; + sha256 = "1rmiyjqwlsbzh9q7d12n72ka9adaby2rfcbn75sf47p5857yi3p9"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -41,7 +39,6 @@ buildDotnetModule rec { executables = [ "Ryujinx" ]; nativeBuildInputs = [ - copyDesktopItems wrapGAppsHook ]; @@ -54,7 +51,6 @@ buildDotnetModule rec { gtk3 libX11 libgdiplus - ffmpeg SDL2_mixer openal libsoundio @@ -63,34 +59,31 @@ buildDotnetModule rec { ]; patches = [ - ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ]; preInstall = '' - # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349 - mkdir -p $out/lib/sndio-6 - ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - + # Ryujinx tries to use ffmpeg from PATH makeWrapperArgs+=( - --suffix LD_LIBRARY_PATH : "$out/lib/sndio-6" + --suffix PATH : ${lib.makeBinPath [ ffmpeg ]} ) + ''; + + preFixup = '' + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages} + pushd ${src}/distribution/linux + + install -D ./ryujinx.desktop $out/share/applications/ryujinx.desktop + install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml + install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png - done + substituteInPlace $out/share/applications/ryujinx.desktop --replace \ + "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" + + popd ''; - desktopItems = [ - (makeDesktopItem { - desktopName = "Ryujinx"; - name = "ryujinx"; - exec = "Ryujinx"; - icon = "ryujinx"; - comment = meta.description; - type = "Application"; - categories = [ "Game" ]; - }) - ]; + passthru.updateScript = ./updater.sh; meta = with lib; { homepage = "https://ryujinx.org/"; @@ -108,5 +101,4 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" ]; mainProgram = "Ryujinx"; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 804b17d8946..33f55f8cb6e 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -12,9 +12,9 @@ (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -22,17 +22,18 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.8.0"; sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) diff --git a/pkgs/applications/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch deleted file mode 100644 index 57e96e5c25c..00000000000 --- a/pkgs/applications/emulators/ryujinx/log.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs -index 44631ea0..534576bc 100644 ---- a/Ryujinx/Configuration/LoggerModule.cs -+++ b/Ryujinx/Configuration/LoggerModule.cs -@@ -1,6 +1,7 @@ - using Ryujinx.Common; - using Ryujinx.Common.Logging; - using System; -+using System.IO; - - namespace Ryujinx.Configuration - { -@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration - if (e.NewValue) - { - Logger.AddTarget(new AsyncLogTargetWrapper( -- new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), -+ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), - 1000, - AsyncLogTargetOverflowAction.Block - )); diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 4b5fa4834fa..9c2f69e606c 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,6 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 -set -euxo pipefail +set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" DEPS_FILE="$(realpath "./deps.nix")" @@ -31,7 +31,7 @@ NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" -echo "comparing versions $OLD_VERSION => $NEW_VERSION" +echo "comparing versions $OLD_VERSION -> $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then echo "Already up to date! Doing nothing" exit 0 @@ -42,6 +42,8 @@ SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --qui cd ../../../.. update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" +echo "building Nuget lockfile" + STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)" SRC="$(mktemp -d /tmp/ryujinx-src.XXX)" cp -rT "$STORE_SRC" "$SRC" diff --git a/pkgs/applications/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b..ff7df4b0944 100644 --- a/pkgs/applications/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook -, SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook, alsa-lib +, SDL2, zlib, gtkmm3, libXv, libepoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.60"; + version = "1.61"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; + fetchSubmodules = true; + sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ]; + buildInputs = [ alsa-lib SDL2 zlib gtkmm3 libXv libepoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight xfix ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix new file mode 100644 index 00000000000..e7ac78da18e --- /dev/null +++ b/pkgs/applications/finance/irpf/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenvNoCC +, fetchzip +, copyDesktopItems +, jdk11 +, makeDesktopItem +, makeWrapper +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "irpf"; + version = "2022-1.0"; + + src = let + year = lib.head (lib.splitVersion version); + in fetchzip { + url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; + sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem rec { + name = pname; + exec = pname; + icon = "rfb64"; + desktopName = "Imposto de Renda Pessoa Física"; + comment = "Programa Oficial da Receita para elaboração do IRPF"; + categories = [ "Office" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + BASEDIR="$out/share/${pname}" + mkdir -p "$BASEDIR" + + cp -r help lib lib-modulos "$BASEDIR" + + install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" + install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" + + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dswing.aatext=true" \ + --add-flags "-jar $BASEDIR/${pname}.jar" \ + --set _JAVA_AWT_WM_NONREPARENTING 1 \ + --set AWT_TOOLKIT MToolkit + + mkdir -p $out/share/pixmaps + unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps + + runHook postInstall + ''; + + meta = with lib; { + description = "Programa Oficial da Receita para elaboração do IRPF"; + homepage = "https://www.gov.br/receitafederal/pt-br"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 55080f333c2..4d2db993b8d 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg="; + sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index cd4972de455..39fb78b317f 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2021-08-13"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w="; + sha256 = "sha256-w66wi+aMwQa9akfNA/1cS6UmDXPWC4OPK9BIa9Kt47A="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9a91e5f8c6e..55c95c95cf7 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -180,5 +180,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "gimp"; }; } diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 679e9136c44..353990ca3a9 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -26,4 +26,6 @@ in symlinkJoin { ln -sf "$each-${versionBranch}" $out/bin/$each done ''; + + inherit (gimp) meta; } diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix index 01271f53b57..09e58fccf9d 100644 --- a/pkgs/applications/graphics/glimpse/default.nix +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -195,5 +195,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ashkitten erictapen ]; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "glimpse"; }; } diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index 361b2ba38b6..63697a9bb66 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -27,4 +27,6 @@ symlinkJoin { ln -sf "$each-${versionBranch}" $out/bin/$each done ''; + + inherit (glimpse) meta; } diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix new file mode 100644 index 00000000000..8cb4208e267 --- /dev/null +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitLab + +, gettext +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wrapGAppsHook + +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "gnome-obfuscate"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Obfuscate"; + rev = version; + sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + }; + + nativeBuildInputs = [ + gettext + glib + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + appstream-glib + desktop-file-utils + glib + gtk4 + libadwaita + ]; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + description = "Censor private information"; + homepage = "https://gitlab.gnome.org/World/obfuscate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix new file mode 100644 index 00000000000..b0e346331bc --- /dev/null +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -0,0 +1,76 @@ +{ lib +, mkDerivation +, fetchpatch +, fetchFromGitHub +, cmake +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, libraw +, exiv2 +, zlib +, alglib +, pkg-config +, makeDesktopItem +, copyDesktopItems +}: + +mkDerivation rec { + pname = "hdrmerge"; + version = "unstable-2020-11-12"; + src = fetchFromGitHub { + owner = "jcelaya"; + repo = "hdrmerge"; + rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; + sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ qtbase libraw exiv2 zlib alglib ]; + + cmakeFlags = [ + "-DALGLIB_DIR:PATH=${alglib}" + ]; + + patches = [ + (fetchpatch { + # patch FindAlglib.cmake to respect ALGLIB_DIR + # see https://github.com/jcelaya/hdrmerge/pull/213 + name = "patch-hdrmerge-CMake.patch"; + url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; + sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; + }) + ]; + + desktopItems = [ + (makeDesktopItem { + name = "HDRMerge"; + genericName = "HDR raw image merge"; + desktopName = "HDRMerge"; + comment = meta.description; + icon = "hdrmerge"; + exec = "hdrmerge %F"; + categories = [ "Graphics" ]; + mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ]; + terminal = false; + }) + ]; + + postInstall = '' + install -Dm444 ../data/images/icon.png $out/share/icons/hicolor/128x128/apps/hdrmerge.png + ''; + + meta = with lib; { + homepage = "https://github.com/jcelaya/hdrmerge"; + description = "Combines two or more raw images into an HDR"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.paperdigits ]; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index ec2ac709f86..3e68a4b9467 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,7 +5,6 @@ , gnumake , makeWrapper , pkg-config -, fetchpatch , autopanosiftc , boost , cairo @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2019.0.0"; + version = "2021.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; + sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; - sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; - }) - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 276ccb51274..4dd97d92217 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,25 +1,21 @@ { lib, stdenv, fetchurl, wrapGAppsHook -, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc -, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy +, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc +, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita }: stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.8"; + version = "0.0.11"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz"; - sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96"; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/93d183b17d216bbed7b03b2f3698059c/icon-library-${version}.tar.xz"; + sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7"; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook ]; - buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; + buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 4dc5506aed6..05a99527e5f 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.06"; + version = "1.1.03"; 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-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM="; + sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 7a601b9641d..296c9d20654 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.5.6"; + version = "1.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2k8CRya9SylauYV+2aQS2QHkQhyiTHMgGp1DNoZ4jbU="; + sha256 = "sha256-7dqV18+Q0M1PrSXfMro5bUqSeA72Stj5JfP4MsTlrjM="; }; - cargoSha256 = "sha256-NLPqJepg0WRt/X3am9J7vwIE9bn+dt2UHE26Dc/QRMM="; + cargoSha256 = "sha256-c3VpHr/X2tKh7mY4dOQac0lS7oem0GGqjzv7feNwc24="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix index 8c414c37247..c1ebbd57c0d 100644 --- a/pkgs/applications/graphics/nsxiv/default.nix +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nsxiv"; - version = "28"; + version = "29"; src = fetchFromGitHub { owner = "nsxiv"; repo = pname; rev = "v${version}"; - hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A="; + hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index cf16ecc03cb..084787d6315 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: @@ -32,6 +32,15 @@ in mkDerivation rec { sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; }; + patches = [ + # Poppler requires at least C++17 + (fetchpatch { + name = "use-c-17-for-pdf-on-linux-builds"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; + sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + }) + ]; + postPatch = '' substituteInPlace OpenBoard.pro \ --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1a761de6ec0..cd16fe1de08 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.9.1"; + version = "5.10.0"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; + sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 8396ba55638..8e864b64096 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "pixinsight"; - version = "1.8.8-12"; + version = "1.8.9"; src = requireFile rec { - name = "PI-linux-x64-${version}-20211229-c.tar.xz"; + name = "PI-linux-x64-${version}-20220313-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617"; + sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix new file mode 100644 index 00000000000..17a22880897 --- /dev/null +++ b/pkgs/applications/graphics/skanpage/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, kirigami2 +, ktextwidgets +, libksane +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "skanpage"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + kirigami2 + ktextwidgets + libksane + qtquickcontrols2 + ]; + + meta = with lib; { + description = "KDE utility to scan images and multi-page documents"; + homepage = "https://apps.kde.org/skanpage"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 092366652d4..7965f824125 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -1,64 +1,80 @@ { lib -, dbus , stdenv +, rustPlatform +, fetchFromGitHub +, dbus +, ffmpeg +, x264 +, libva , gst_all_1 , xorg , libdrm -, libva -, fetchzip -, copyDesktopItems -, fontconfig -, libpng -, pipewire -, makeWrapper -, autoPatchelfHook +, pkg-config +, pango +, cmake +, autoconf +, libtool +, nodePackages +, ApplicationServices +, Carbon +, Cocoa +, VideoToolbox }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "weylus"; version = "0.11.4"; - src = fetchzip { - url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip"; - sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk="; - stripRoot = false; + src = fetchFromGitHub { + owner = "H-M-H"; + repo = pname; + rev = "v${version}"; + sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l"; }; - installPhase = '' - runHook preInstall - - install -Dm755 ./weylus $out/bin/weylus - copyDesktopItems ./weylus.desktop - - runHook postInstall - ''; - buildInputs = [ - libpng + ffmpeg + x264 + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Carbon + Cocoa + VideoToolbox + ] ++ lib.optionals stdenv.isLinux [ dbus - libdrm - fontconfig libva gst_all_1.gst-plugins-base - pipewire - # autoPatchelfHook complains if these are missing, even on wayland + xorg.libXext xorg.libXft xorg.libXinerama xorg.libXcursor + xorg.libXrender + xorg.libXfixes + xorg.libXtst xorg.libXrandr xorg.libXcomposite - xorg.libXtst + xorg.libXi + xorg.libXv + pango + libdrm ]; - nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ + cmake + nodePackages.typescript + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + autoconf + libtool + ]; + + cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0"; + + cargoBuildFlags = [ "--features=ffmpeg-system" ]; + cargoTestFlags = [ "--features=ffmpeg-system" ]; - postFixup = let - GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - pipewire - ]; - in '' - wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + postInstall = '' + install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; meta = with lib; { @@ -66,6 +82,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ lom ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 2fb60e8fef1..db2f3333280 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "0np2x73x2g3145qnd4ibkxlz535g19lansmaqkjplf0xc6qi5zsg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "1315hycfqlalh6k4zvvz7pz3dylpp0sr45j1v9avcb143hjqnav6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1x254v25wilx4nh4dnjij4p9g0wsrqn9jyf4z48fa1bw1q3j3rba"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -74,24 +74,25 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.0"; sha256 = "0m4q75iz6nj76sakab3265rzz969gk1rm2qwbvn0v60h3hflkqgb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.0"; sha256 = "07fgwhgnwcf58dkrfpmfyzqvd33x6ir25qn3v96j8bl4x9dn4sij"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.0"; sha256 = "0z2whbviiw6kjqa7c2gj3j7fqq31m28iww66n7hvy3cnqcn3471k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "159hq4fn2n5n2mkxw6wi4nhj0ifclpn7gxspqljlgczlhkm1vxqb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "146rbmk0svvqaf0c4msg67h17x4k4gd5kzsbb3iqvs14xfkli2xw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1ywkycp9llrfk4jcd7agaivlhn9pig70cj65xkfhjw1wx51756jc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index 54bcfc8f5b3..db2f3333280 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "0np2x73x2g3145qnd4ibkxlz535g19lansmaqkjplf0xc6qi5zsg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "1315hycfqlalh6k4zvvz7pz3dylpp0sr45j1v9avcb143hjqnav6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1x254v25wilx4nh4dnjij4p9g0wsrqn9jyf4z48fa1bw1q3j3rba"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -74,24 +74,25 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.0"; sha256 = "0m4q75iz6nj76sakab3265rzz969gk1rm2qwbvn0v60h3hflkqgb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.0"; sha256 = "0aska6s99rfg13ngsaxr151a6sk8r68lv3mj8yv0bhvwcpln4342"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.0"; sha256 = "0z2whbviiw6kjqa7c2gj3j7fqq31m28iww66n7hvy3cnqcn3471k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "159hq4fn2n5n2mkxw6wi4nhj0ifclpn7gxspqljlgczlhkm1vxqb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "146rbmk0svvqaf0c4msg67h17x4k4gd5kzsbb3iqvs14xfkli2xw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1ywkycp9llrfk4jcd7agaivlhn9pig70cj65xkfhjw1wx51756jc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index de463cfd666..e822f869619 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.edwtjo ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index e80bb82ccec..5f09fba4cb7 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.23.5"; + version = "0.24.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-kVM/F0LsIgMtur8jHZzUWkFIcfHe0i8y9Zxe3z5SkVM="; + sha256 = "sha256-QyexUZNn7QGHjXYO/+1kUebTmAzdVpwG9Ile8Uh3i8Q="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cf1303422d2..9e38a208e17 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/donadigo/appeditor/pull/122 + substituteInPlace src/Application.vala \ + --replace "private static string? create_exec_filename;" "public static string? create_exec_filename;" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 29a932f40d5..d82658f529e 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,7 +1,9 @@ { config , lib , stdenv -, fetchurl +, fetchzip +, autoreconfHook +, autoconf-archive , pkg-config , CoreAudio , enableAlsa ? true @@ -35,15 +37,20 @@ stdenv.mkDerivation rec { pname = "sox"; - version = "14.4.2"; + version = "unstable-2021-05-09"; - src = fetchurl { - url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; - sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip"; + hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; }; - # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = lib.optional enableOpusfile pkg-config; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + ] ++ lib.optional enableOpusfile [ + # configure.ac uses pkg-config only to locate libopusfile + pkg-config + ]; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 7325e29f682..d4808829586 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -7,26 +7,19 @@ stdenv.mkDerivation rec { pname = "avizo"; - # Note: remove the 'use-sysconfig' patch on the next update - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8="; + sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; - patches = [ - # Remove on next update - # See https://github.com/misterdanb/avizo/pull/30 - ./use-sysconfdir-instead-of-etc.patch - ]; - postInstall = '' substituteInPlace "$out"/bin/volumectl \ --replace 'avizo-client' "$out/bin/avizo-client" diff --git a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch b/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch deleted file mode 100644 index 947559760cb..00000000000 --- a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c789be..cd4b07a 100644 ---- a/meson.build -+++ b/meson.build -@@ -12,7 +12,9 @@ app_resources_service = gnome.compile_resources( - source_dir : '.', - c_name : 'avizo_resources') - --install_data('config.ini', install_dir: '/etc/xdg/avizo') -+sysconfdir = get_option('sysconfdir') -+ -+install_data('config.ini', install_dir: join_paths(sysconfdir, 'xdg/avizo')) - install_data('volumectl', install_dir: 'bin') - install_data('lightctl', install_dir: 'bin') - diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index bec3164a008..c998309bdd3 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U="; + sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5b323185648..b3754fed179 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -96,7 +96,6 @@ mkDerivation rec { feedparser html2text html5-parser - jeepney lxml markdown mechanize diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 5f0c09303ff..907bc7a53e0 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.9.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; + sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; }; - vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk="; + vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; doCheck = false; diff --git a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch new file mode 100644 index 00000000000..d3c32cf9640 --- /dev/null +++ b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch @@ -0,0 +1,31 @@ +From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@tutanota.com> +Date: Fri, 4 Mar 2022 07:03:17 -0600 +Subject: [PATCH] Pillow update + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 5dc25e0..b3ba397 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,7 +11,7 @@ readme = "README.rst" + [tool.poetry.dependencies] + python = "^3.7" + logbook = "^1.5.3" +-Pillow = "^8.2.0" ++Pillow = "^9.0.0" + requests = "^2.24.0" + kiss-headers = "^2.2.3" + single-version = "^1.5.1" +@@ -33,4 +33,4 @@ skip-string-normalization = true + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.35.1 + diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix new file mode 100644 index 00000000000..1401a7a8df2 --- /dev/null +++ b/pkgs/applications/misc/cobang/default.nix @@ -0,0 +1,102 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, atk +, gdk-pixbuf +, gobject-introspection +, gtk3 +, gst-plugins-good +, libhandy +, librsvg +, networkmanager +, pango +, gst-python +, kiss-headers +, Logbook +, pillow +, poetry-core +, pygobject3 +, python +, python-zbar +, requests +, single-version +, pytestCheckHook }: + +buildPythonApplication rec { + pname = "cobang"; + version = "0.9.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = "CoBang"; + rev = "v${version}"; + sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + }; + + patches = [ + ./0001-Poetry-core-and-pillow-9.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gst-python + kiss-headers + Logbook + pillow + poetry-core + pygobject3 + python-zbar + requests + single-version + ]; + + buildInputs = [ + atk + gdk-pixbuf + # Needed to detect namespaces + gobject-introspection + gst-plugins-good + libhandy + networkmanager + pango + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Wrapping this manually for SVG recognition + dontWrapGApps = true; + + postInstall = '' + # Needed by the application + cp -R data $out/${python.sitePackages}/ + + # Icons and applications + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \ + --replace "Exec=" "Exec=$out/bin/" + ''; + + preFixup = '' + wrapProgram $out/bin/cobang \ + ''${gappsWrapperArgs[@]} \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ''; + + meta = with lib; { + description = "A QR code scanner desktop app for Linux"; + homepage = "https://github.com/hongquan/CoBang"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 71142727a83..8505c97e1bc 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -34,8 +34,8 @@ let qonlinetranslator = fetchFromGitHub { owner = "crow-translate"; repo = "QOnlineTranslator"; - rev = "1.5.2"; - sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM="; + rev = "1.5.3"; + sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; }; circleflags = fetchFromGitHub { owner = "HatScripts"; @@ -52,13 +52,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y="; + sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; }; patches = [ diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index 1eb1f464e55..0bfdc9ef2f7 100644 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -46,7 +46,7 @@ index c92e745..f265f03 100644 FetchContent_Declare(QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.2 +- GIT_TAG 1.5.3 + SOURCE_DIR @qonlinetranslator@ ) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 777c4b97d2b..18b61bc8a9b 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE="; + sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp cubiomes-viewer $out/bin mkdir -p $out/share/pixmaps - cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png + cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png runHook postInstall ''; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 1741e908669..d8fd18f9de4 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.22.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; + sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU="; }; - vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; + vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ba1682f02dd..61dd6e4a6d6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256 + version = "22.0.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg="; + sha256 = "sha256-LSEsaCEUoKViKC+IjJrV/w1VzOGi4EOr4LnAutOIyJU="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 850bca3320e..dee6f5c663f 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.9"; + version = "2.0"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "0qbdq7k0mmvkjp6qzz88n7vf29liqn6y5w4y39ldqdc8hzw5sld7"; + sha256 = "sha256-otfa2t/tfpYKqQu+VQxRKryUsIxM3JKILc3zseTC2KM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 17ce1d562b5..116d5430c2a 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-bSlSOAxIcFS5B5o3pWmXFsKthAXzbCltnbLAV/bIHLw="; + sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum-grs/default.nix index 412aec97ae5..c8fb9f84ad1 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum-grs/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Groestlcoin"; repo = "electrum-grs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; }; diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix new file mode 100644 index 00000000000..02d629412a3 --- /dev/null +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub +, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config +, gnome, gnupg, gtk3, udisks +}: + +stdenv.mkDerivation rec { + pname = "eos-installer"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "endlessm"; + repo = "eos-installer"; + rev = "Release_${version}"; + sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; + fetchSubmodules = true; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoconf autoconf-archive automake glib intltool libtool pkg-config + ]; + buildInputs = [ gnome.gnome-desktop gtk3 udisks ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--libexecdir=${placeholder "out"}/bin" + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + # These are for runtime, so can't be discovered from PATH, which + # is constructed from nativeBuildInputs. + GPG_PATH = "${gnupg}/bin/gpg"; + GPGCONF_PATH = "${gnupg}/bin/gpgconf"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/endlessm/eos-installer"; + description = "Installer UI which writes images to disk"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index eee466650e3..766b05b2e14 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i"; + sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bd6ae3d7478..e90c0a4ec18 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , meson -, fetchpatch , ninja , gettext , python3 @@ -26,24 +25,15 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs="; + sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; }; - patches = [ - # Fix compilation with latest Vala. - # https://github.com/FontManager/font-manager/issues/240 - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch"; - sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY="; - }) - ]; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ed0e3e72be2..dc5dedbd1ad 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.20.5"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UJAoxRybEYxQY+7l/szSj9fy1J552yaxF3MdaEmDiQQ="; + sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 44e4bd2a0b3..ebed42852b7 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; + sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI="; }; - cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; + cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ="; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 531ce423737..7365d297e3b 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -55,6 +55,10 @@ in buildPythonApplication rec { runHook postInstall ''; + # https://github.com/NixOS/nixpkgs/issues/149812 + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection + strictDeps = false; + meta = with lib; { description = "Genealogy software"; homepage = "https://gramps-project.org"; diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix new file mode 100644 index 00000000000..236af7c446d --- /dev/null +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hcl2json"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs="; + }; + + vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert hcl2 to json"; + homepage = "https://github.com/tmccombs/hcl2json"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 5110815023a..a164654b1a6 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.4-6681f81d/Hubstaff-1.6.4-6681f81d.sh"; - version = "1.6.4-6681f81d"; - sha256 = "1j0rzyqm9zm2w44zwxq61fy19m27ghlv11mbfl7yzh2ccmxljxjm"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.5-31be26f1/Hubstaff-1.6.5-31be26f1.sh"; + version = "1.6.5-31be26f1"; + sha256 = "1z1binnqppyxavmjg0l1cvy64ylzy2v454sws2x1am2qhhbnycjm"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2003e0d7e76..42d87b41fc9 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.6.10"; + version = "2.7.13"; 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-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4="; - x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4="; + x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs="; + x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 7d4ec87b9f4..32018d7151d 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "sha256-9TGHSGYCzU6uAIO4zZ/6+B4oVPE6SD9Phl4dShylW5o="; + sha256 = "sha256-RbA7MM/3u2LJG6QD5f15E/XoLwHMkPasx0ht4PqV/jc="; }; - cargoSha256 = "sha256-g8YYOk2RW4GPdkWlvAxd5KFdV4S1l5yKEzNm9OAc8RI="; + cargoSha256 = "sha256-vhTfAoAwDJ9BjhgUEkV2H+KAetJR1YqwaZ7suF6yMXA="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d1a8bd1077a..cc6d4e33fb2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18360"; + version = "18387"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s="; + sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8="; + sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix new file mode 100644 index 00000000000..4d703bff0c2 --- /dev/null +++ b/pkgs/applications/misc/kchmviewer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, chmlib, libzip, qtwebengine }: + +stdenv.mkDerivation rec { + pname = "kchmviewer"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "gyunaev"; + repo = pname; + rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; + }; + + patches = [ + # remove unused webkit + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; + sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; + }) + # QtWebengine fixes + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; + sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; + sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; + }) + ]; + + buildInputs = [ chmlib libzip qtwebengine ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + postInstall = '' + install -Dm755 bin/kchmviewer -t $out/bin + install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps + install -Dm644 packages/kchmviewer.desktop -t $out/share/applications + ''; + + meta = with lib; { + description = "CHM (Winhelp) files viewer"; + homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 2d75a9da818..9ed67817347 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch +{ lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper +, which, perl }: mkDerivation rec { pname = "klayout"; - version = "0.27.3"; + version = "0.27.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0="; + hash = "sha256-t/nd7m8XpB026q/kyH16rKkw3qza19ISalB0Juzx4NU="; }; postPatch = '' @@ -21,6 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ which + perl python3 ruby ]; @@ -35,7 +36,7 @@ mkDerivation rec { buildPhase = '' runHook preBuild mkdir -p $out/lib - ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES + ./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES runHook postBuild ''; @@ -54,8 +55,9 @@ mkDerivation rec { meta = with lib; { description = "High performance layout viewer and editor with support for GDS and OASIS"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; + changelog = "https://www.klayout.de/development.html#${version}"; platforms = platforms.linux; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a0b67042eca..043f607c010 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.8.0-alpha.3"; + version = "0.8.3-alpha.1.pre.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg"; + sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y"; }; - vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008"; + vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6"; subPackages = [ "." ]; @@ -25,7 +25,7 @@ buildGoModule rec { test/e2e/run.sh script/testenv.sh script/test-envs.sh - persistence/sql/migratest/update_fixtures.sh + script/debug-entrypoint.sh ) patchShebangs "''${files[@]}" diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index eadd6c8db55..73c8abaa13f 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; + sha256 = "sha256-52Tq6gKozM/IFUyAy8N+YDqlbcFNQw6b2tc268Zco6g="; }; - vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; + vendorSha256 = "sha256-7QEb5J5IaxisKjbulyHq5PGVeKAX022Pz+5OV5qD7Uo="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 09e31cd3409..81c9e9d5515 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.0"; + version = "0.6.3"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "9u2KdrNVAx+sy/8s2VP0DIzSMTvBK56pUGQaj7wulz0="; + sha256 = "o3tBHk7bauNczz6lPS3lV0mpYEaBa0lh/mAJKJM2eWU="; name = "${pname}-${version}.AppImage"; }; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 0688c189e45..16886390837 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -2,12 +2,12 @@ let pname = "marktext"; - version = "v0.16.3"; + version = "v0.17.1"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; - sha256 = "0s93c79vy2vsi7b6xq4hvsvjjad8bdkhl1q135vp98zmbf7bvm9b"; + sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7"; }; appimageContents = appimageTools.extractType2 { @@ -48,7 +48,7 @@ appimageTools.wrapType2 rec { description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://marktext.app"; license = licenses.mit; - maintainers = with maintainers; [ nh2 ]; + maintainers = with maintainers; [ nh2 eduarrrd ]; platforms = [ "x86_64-linux" ]; mainProgram = "marktext"; }; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 7cfe873a44e..2381e89640a 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.14"; + version = "2.8.16"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-yHThX5Xs+8SijNKgmg+4Mawbwi3zHA/DJQoIBy0Wchs="; + sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4412af583b3..9602fee5b5c 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.4"; + version = "2.1.5"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-46J0iLXzZX5tww4CK8WhrADql023rauO0fpW7Asn5ZY="; + hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 6a1f14cbd44..2786492d47a 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , python3Packages -, steam-run-native +, steam-run , unzip , webkitgtk , wrapGAppsHook @@ -54,14 +54,14 @@ python3Packages.buildPythonApplication rec { python3.pkgs.requests python3.pkgs.setuptools python3.pkgs.simplejson - steam-run-native + steam-run unzip webkitgtk ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy + sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; meta = with lib; { diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 144e6298207..976c3c7978a 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 = "4895"; + version = "4897"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "jGSDH90ze0hHa9nAaeEkj1sfADEk7EatGrePM3+/SDk="; + sha256 = "RR8o8stOnL6nnEkCtRT9tgo8foSxd6ASTsRcGDgbQRk="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index db89e538d51..97f74becede 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 = "645"; + version = "647"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "Y9feRNDjmwUbSOwxfMIaYIycCvOBMihq5LkuKbALVDY="; + sha256 = "j9TJ+9WuItueztWjYoD9s9x8wfsga2QCIY5X2+s3Z1c="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 4cd7692f67f..2b9c847bac8 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -1,21 +1,21 @@ { lib , buildGoPackage , fetchFromGitHub - -, withSpeech ? true +, stdenv +, withSpeech ? !stdenv.isDarwin , makeWrapper , espeak-ng }: buildGoPackage rec { pname = "mob"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-NXctu5gg0QfiTZ7osQ0yzETabGDuEeTVZBPFyLeNq8k="; + sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 1a764dfaef3..c2981351749 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "moonlight"; }; } diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index b822a7ed117..1aa4a3660c2 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -1,29 +1,43 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config , cairo , gobject-introspection , gtk3 , gtk-layer-shell -}: +, pkg-config +, wrapGAppsHook +, xdg-utils }: buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.11"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA="; + sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; - - nativeBuildInputs = [ pkg-config ]; + vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + doCheck = false; + + preInstall = '' + mkdir -p $out/share/nwg-drawer + cp -r desktop-directories drawer.css $out/share/nwg-drawer + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${xdg-utils}/bin + --prefix XDG_DATA_DIRS : $out/share + ) + ''; meta = with lib; { description = "Application drawer for sway Wayland compositor"; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 5e71f7d0d10..67a0939ddab 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,75 +1,99 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick -, writeScript }: - +{ stdenv +, fetchurl +, lib +, makeWrapper +, electron_16 +, makeDesktopItem +, graphicsmagick +, writeScript +, undmg +, unzip +}: let - electron = electron_13; - icon = fetchurl { - url = - "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; - }; - - desktopItem = makeDesktopItem { - name = "obsidian"; - desktopName = "Obsidian"; - comment = "Knowledge base"; - icon = "obsidian"; - exec = "obsidian"; - categories = [ "Office" ]; - }; - - updateScript = writeScript "obsidian-updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - - set -eu -o pipefail - - latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" - - update-source-version obsidian "$latestVersion" - ''; - -in stdenv.mkDerivation rec { + inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.13.23"; + version = "0.13.31"; + meta = with lib; { + description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; + homepage = "https://obsidian.md"; + downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; + license = licenses.obsidian; + maintainers = with maintainers; [ conradmearns zaninime opeik ]; + }; src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c"; + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}"; + inherit sha256; }; - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - makeWrapper ${electron}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/obsidian/app.asar - - install -m 444 -D resources/app.asar $out/share/obsidian/app.asar - install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar - - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png - done - - runHook postInstall - ''; - - passthru.updateScript = updateScript; + sha256 = rec { + x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs="; + x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU="; + aarch64-darwin = x86_64-darwin; + }.${system}; + + extension = rec { + x86_64-linux = ".tar.gz"; + x86_64-darwin = "-universal.dmg"; + aarch64-darwin = x86_64-darwin; + }.${system}; + + linux = stdenv.mkDerivation rec { + icon = fetchurl { + url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + }; + + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian"; + categories = [ "Office" ]; + }; + + inherit pname version src; + meta.platforms = [ "x86_64-linux" ]; + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/obsidian/app.asar + install -m 444 -D resources/app.asar $out/share/obsidian/app.asar + install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + done + runHook postInstall + ''; + + passthru.updateScript = writeScript "updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + update-source-version obsidian "$latestVersion" + ''; + }; - meta = with lib; { - description = - "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; - homepage = "https://obsidian.md"; - license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime ]; - platforms = [ "x86_64-linux" ]; + darwin = stdenv.mkDerivation rec { + appname = "Obsidian"; + inherit pname version src; + meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + sourceRoot = "${appname}.app"; + nativeBuildInputs = [ makeWrapper undmg unzip ]; + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appname}.app,bin} + cp -R . $out/Applications/${appname}.app + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + runHook postInstall + ''; }; -} +in +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/oil/default.nix b/pkgs/applications/misc/oil-buku/default.nix index 173cea2ee1c..e0c05488288 100644 --- a/pkgs/applications/misc/oil/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec { substituteInPlace src/oil --replace \ "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib" - substituteInPlace Makefile --replace \ - "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \ - - substituteInPlace Makefile --replace \ - "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin" - substituteInPlace src/json-to-line.jq --replace \ "/usr/bin/env -S jq" "${jq}/bin/jq" @@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec { "/usr/bin/env -S awk" "${gawk}/bin/awk" ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index afc0ac71d5d..1f5f3d18729 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.8"; + version = "2.4.9.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk="; + sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 230ec3182b7..f888d162fc4 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-ohfC10U7srs5IrFWPF5AKPwXPHaRxlYRK4ZZ0pE8tEs="; + sha256 = "sha256-cQd3dtih7C+pEmkvlrsYTJtQWBVVMiFbtNQUM0Ck3tg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 320d771bc67..58d45d19bee 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -22,9 +22,12 @@ , jq , xorg , libGL -, steam-run-native +, steam-run # needed for avoiding crash on file selector , gsettings-desktop-schemas +, glib +, wrapGAppsHook +, hicolor-icon-theme }: let @@ -76,16 +79,19 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") ''; buildInputs = [ + glib xorg.libX11 libGL python + gsettings-desktop-schemas + hicolor-icon-theme ]; postPatch = '' @@ -107,7 +113,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/playonlinux <<EOF #!${stdenv.shell} -e - exec ${steam-run-native}/bin/steam-run $out/share/playonlinux/playonlinux-wrapper "\$@" + exec ${steam-run}/bin/steam-run $out/share/playonlinux/playonlinux-wrapper "\$@" EOF chmod a+x $out/bin/playonlinux @@ -124,6 +130,15 @@ in stdenv.mkDerivation { done ''; + dontWrapGApps = true; + postFixup = '' + makeWrapper $out/share/playonlinux/playonlinux{,-wrapped} \ + --prefix PATH : ${binpath} \ + ''${gappsWrapperArgs[@]} + makeWrapper ${steam-run}/bin/steam-run $out/bin/playonlinux \ + --add-flags $out/share/playonlinux/playonlinux-wrapped + ''; + meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 7a4d2ee1d25..c3037f0da8d 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -45,7 +45,7 @@ let meta = with lib; { inherit description; - homepage = "https://github.com/supermerili/SuperSlicer"; + homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ cab404 moredread ]; mainProgram = "superslicer"; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index b7eb2367528..2a00cb92b9d 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 731608db7da..62b8dd57659 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,25 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.0.0"; + version = "3.0.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1xZMj6NjwA9pVOEL4CDv4XHC3usu3WdjsLJuW3vgxc8="; + sha256 = "sha256-tjhNE20GE1L8kvhdI5Mc90I75q8szOIV40vq2CBt98U="; }; nativeBuildInputs = [ installShellFiles ]; + # As part of its tests, sigi hard-codes a location to BATS based on git + # submodules. The tests are recommeded to skip for Linux packaging. They'll + # move to Rust after this issue: https://github.com/hiljusti/sigi/issues/19 + checkFlags = [ "SKIP_BATS_TESTS=1" ]; + postInstall = '' installManPage sigi.1 ''; - cargoSha256 = "sha256-NUWm2GkK7bASo6bAOgQgHate45iDG5l3G/KhtLrjzQ8="; + cargoSha256 = "sha256-0e0r6hfXGJmrc6tgCqq2dQXu2MhkThViZwdG3r3g028="; passthru.tests.version = testVersion { package = sigi; }; meta = with lib; { - description = "CLI tool for organization and planning"; + description = "Organizing CLI for people who don't love organizing."; homepage = "https://github.com/hiljusti/sigi"; license = licenses.gpl2; maintainers = with maintainers; [ hiljusti ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 531bc489354..85f4ffec5f1 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , rpmextract , patchelf @@ -9,11 +10,11 @@ stdenv.mkDerivation rec { pname = "snowsql"; majorVersion = "1.2"; - version = "${majorVersion}.9"; + version = "${majorVersion}.21"; src = fetchurl { url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; - sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8"; + sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 7617984ac91..08a54f49584 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY="; + sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 11face45145..48e2859fa84 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60="; + sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs="; }; - cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0="; + cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix new file mode 100644 index 00000000000..fdae9753edb --- /dev/null +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "sway-launcher-desktop"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "Biont"; + repo = "sway-launcher-desktop"; + rev = "v${version}"; + sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa"; + }; + + postPatch = '' + patchShebangs ${pname}.sh + ''; + + buildInputs = [ fzf gawk ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -d $out/bin + install ${pname}.sh $out/bin/${pname} + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ gawk fzf ]} + ''; + + meta = with lib; { + description = "TUI Application launcher with Desktop Entry support."; + longDescription = '' + This is a TUI-based launcher menu made with bash and the amazing fzf. + Despite its name, it does not (read: no longer) depend on the Sway window manager + in any way and can be used with just about any WM. + ''; + homepage = "https://github.com/Biont/sway-launcher-desktop"; + changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.mrhedgehog ]; + mainProgram = "${pname}"; + }; +} diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 6e5405ce988..770cd858401 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -1,5 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, systemd }: +{ lib +, stdenv +, fetchFromGitHub +, formats +, systemd +}: +let + ini = formats.ini { }; + + unit = ini.generate "systembus-notify.service" { + Unit = { + Description = "system bus notification daemon"; + }; + + Service = { + Type = "exec"; + ExecStart = "@out@/bin/systembus-notify"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + Slice = "background.slice"; + }; + }; + +in stdenv.mkDerivation rec { pname = "systembus-notify"; version = "1.1"; @@ -8,23 +33,32 @@ stdenv.mkDerivation rec { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; + sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0="; }; buildInputs = [ systemd ]; installPhase = '' runHook preInstall - install -Dm755 systembus-notify -t $out/bin - install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + + install -Dm555 -t $out/bin systembus-notify + install -Dm444 -t $out/share/systembus-notify systembus-notify.desktop + + install -d $out/lib/systemd/user + substitute ${unit} $out/lib/systemd/user/${unit.name} \ + --subst-var out + runHook postInstall ''; + # requires a running dbus instance + doCheck = false; + meta = with lib; { description = "System bus notification daemon"; homepage = "https://github.com/rfjakob/systembus-notify"; license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - maintainers = with maintainers; []; }; } diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index c65f9b5b84b..7b58ede3834 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.18.5"; + version = "0.20.1"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y="; + sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk="; + cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index ebc9b499668..2b4db0a7a30 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es="; + sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk="; }; vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index f29c471d04b..c11ad8d1e98 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -68,6 +68,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/bleakgrey/tootle/pull/346 + substituteInPlace src/Application.vala \ + --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 7e76d4a4e0b..a1adc152349 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,7 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -# Upstream has a `./vendor` directory with all deps which we rely upon. -buildGoPackage rec { +buildGoModule rec { pname = "tty-share"; version = "2.2.1"; @@ -12,7 +11,10 @@ buildGoPackage rec { sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; }; - goPackagePath = "github.com/elisescu/tty-share"; + # Upstream has a `./vendor` directory with all deps which we rely upon. + vendorSha256 = null; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://tty-share.com"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5543b3442bd..dc50a3b9567 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.0"; + version = "5.6.10.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_0_b124e6f3a4944b32/${pname}_${version}_amd64.deb"; - sha256 = "fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_1_de501d28cc034306/${pname}_${version}_amd64.deb"; + sha256 = "8faf896d2570d1d210793f46a3860e934d03498c1f11640d43721b6eb2b56860"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 5e5e1bead5a..01b7af16409 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.9"; + version = "0.9.12"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4="; + sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 4bbd0289a15..d446e057174 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,23 +1,21 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "wego"; - version = "unstable-2019-02-11"; - rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + version = "2.1"; - goPackagePath = "github.com/schachmat/wego"; - - src = fetchgit { - inherit rev; - url = "https://github.com/schachmat/wego"; - sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; + src = fetchFromGitHub { + owner = "schachmat"; + repo = pname; + rev = version; + sha256 = "sha256-lMcrFwYtlnivNjSbzyiAEAVX6ME87yB/Em8Cxb1LUS4="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-kv8c0TZdxCIfmkgCLDiNyoGqQZEKUlrNLEbjlG9rSPs="; - meta = { - license = lib.licenses.isc; + meta = with lib; { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; + license = licenses.isc; }; } diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix deleted file mode 100644 index 133315cd022..00000000000 --- a/pkgs/applications/misc/wego/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/schachmat/ingo"; - fetch = { - type = "git"; - url = "https://github.com/schachmat/ingo"; - rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; - sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; - sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; - }; - } -] diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index d478655eed1..3920a3a8655 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; + sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 0a18975d7c0..db28952c31f 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk="; + sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM="; + cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index b07c526c0d5..983f8ac1ee3 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "bombadillo"; - version = "2.3.3"; + version = "2.4.0"; src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; + sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 6fb29619ab9..74e14615f81 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.35.103"; + version = "1.36.116"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; + sha256 = "whGV0VgCm6JSyrcFQTKbM35b/qLQdBmChTrYuyC+OlI="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0eb1893e95c..9b18590817f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -266,7 +266,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport || chromiumVersionAtLeast "99"; + use_gio = true; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; @@ -287,24 +287,8 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); + } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + // (extraAttrs.gnFlags or {})); configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 084db58f38b..0202ead4605 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_13; + llvmPackages = llvmPackages_14; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +54,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { - llvmPackages = llvmPackages_14; - stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml new file mode 100644 index 00000000000..f2bf29cda24 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -0,0 +1,23 @@ +build_with_tflite_lib=false +chrome_pgo_phase=0 +clang_use_chrome_plugins=false +disable_fieldtrial_testing_config=true +enable_hangout_services_extension=false +enable_js_type_check=false +enable_mdns=false +enable_mse_mpeg2ts_stream_parser=true +enable_nacl=false +enable_one_click_signin=false +enable_reading_list=false +enable_remoting=false +enable_reporting=false +enable_service_discovery=false +enable_widevine=true +exclude_unwind_tables=true +google_api_key="" +google_default_client_id="" +google_default_client_secret="" +safe_browsing_mode=0 +treat_warnings_as_errors=false +use_official_google_api_keys=false +use_unofficial_version_number=false diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 3ea5dea50cd..8341f2c6ee2 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -24,6 +24,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' @@ -108,6 +109,12 @@ def get_latest_ungoogled_chromium_build(): } +def get_ungoogled_chromium_gn_flags(revision): + """Returns ungoogled-chromium's GN build flags for the given revision.""" + gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + return urlopen(gn_flags_url).read().decode() + + def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': @@ -208,6 +215,8 @@ with urlopen(HISTORY_URL) as resp: 'rev': build['ungoogled_tag'], 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] } + with open(UNGOOGLED_FLAGS_PATH, 'w') as out: + out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag'])) channels[channel_name] = channel @@ -227,6 +236,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': if channel_name == 'stable': body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8') commit_message += '\n\n' + body + elif channel_name == 'ungoogled-chromium': + subprocess.run(['git', 'add', UNGOOGLED_FLAGS_PATH], check=True) subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 45250322fb3..3652a1b5a6b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", + "version": "99.0.4844.74", + "sha256": "165vzxv3xi4r9ia3qnqsr4p9ai0344w1pnq03c6jdq7x613lcprd", + "sha256bin64": "1xzr7qv4rcardl3apr8w22dn81lzqkklhp26qqlbdcylacqqji04", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } }, "chromedriver": { - "version": "98.0.4758.102", - "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", - "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", - "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" + "version": "99.0.4844.51", + "sha256_linux": "1r5wbcfbj9s216jyjasmiscsrsix9ap3pplp12rznrwn4898p51y", + "sha256_darwin": "1nak8p5hdrw94lx73m9c110zrwag4qr6487dhplm3qfrnrkdh8wp", + "sha256_darwin_aarch64": "0hkcx6a8bcjlbmp6z3ld23mi1kpyjn2g7m3ns9qw6ns4x3rn5i3r" } }, "beta": { - "version": "99.0.4844.45", - "sha256": "1j6s9r2k6zyyjk3f74k2103zlih96wrr2a83bk79fwc582af9505", - "sha256bin64": "0lqps8lf7yg9nn5z2iy6hfrx2df59hif8vhf0camx2lfmrkgw8qa", + "version": "100.0.4896.46", + "sha256": "1qx22vadv9yd3n52pjn2sr153w70k3sxi2i8f99fdpil0kin8jkx", + "sha256bin64": "1g4xygj3946322aill7lk1qf0hi07bjn3awa17pkn1sgbl3gm8nr", "deps": { "gn": { - "version": "2022-01-10", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "80a40b07305373617eba2d5878d353532af77da3", - "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, "dev": { - "version": "100.0.4896.12", - "sha256": "07jd3d5jhs659wwxnbxk6h93pz8zaynrw72b0y9l6l824lip6hl2", - "sha256bin64": "0fnxq0vjn00zai94p8jgx69bag30zzlfl2vzn0zb65pr10fpac87", + "version": "101.0.4947.0", + "sha256": "176bby8xis0j3ifvxxxjgklvs7yd7v71c5lc18qdjkgzv5qdx0sy", + "sha256bin64": "1rkpc25ff8vf1p7znpmaljj8gwcym34qg28b4anv8x9zvwn7w21s", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } } }, "ungoogled-chromium": { - "version": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", + "version": "99.0.4844.74", + "sha256": "165vzxv3xi4r9ia3qnqsr4p9ai0344w1pnq03c6jdq7x613lcprd", + "sha256bin64": "1xzr7qv4rcardl3apr8w22dn81lzqkklhp26qqlbdcylacqqji04", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" }, "ungoogled-patches": { - "rev": "98.0.4758.102-1", - "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" + "rev": "99.0.4844.74-1", + "sha256": "1ki517fi55rz7ib2sq0q6gw1w1m2j4yakkpcgpmgvapg05s3zg7m" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8df80ab526a..50cc5718290 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -11,7 +11,6 @@ , gdk-pixbuf , glib , glibc -, gtk2 , gtk3 , libkrb5 , libX11 @@ -110,7 +109,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gtk2 gtk3 libkrb5 mesa diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 25ae29459f0..d7b63fe46bb 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 = "97.0.1"; + version = "98.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ach/firefox-98.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a10737964c66f46a15ca60c29575a837340e9b967c849809717c7009c3a01c20"; + sha256 = "92fe50154b763faba3d923ba19be737a7e6c48c04652275da2727489c0f3b14f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/af/firefox-98.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a6ef82107f918234c84da51b49bc2018910e855ac4e7e5cc3a0e71f3583140b6"; + sha256 = "f086d9cf3142c7adebff590702f497e1f99d74ccb69b7001851e1b0329b9ff7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/an/firefox-98.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "34f5a0461707feffce732749958f508efd729ecedd8567dbe1387bde5e335a66"; + sha256 = "5e7e8fa95293bf2921596ecddd10217f10682e4a576b3f0f8c70021ee785afb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ar/firefox-98.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5e126bcfa03c79e9ad777d76389a23e109dd852fc98698efc714d37125656f84"; + sha256 = "cf7e5bfe6fcc19e0e6ac6b2646118e25b471cffc025d1de85ac62b0569582285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ast/firefox-98.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "931ae804e75fa4b039eb373a38b2f6fa8dffb852e418789d559d9a9c0612c54e"; + sha256 = "54c694772844caf3946520aa624d8a5c8d2d21ab29c64bc1c438011ad830d001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/az/firefox-98.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "549dda8a1049d074887f187689e73c38b814c1f1896752320f2a03f566bad2c8"; + sha256 = "0e342f5bc920684c2b7ae988a983e27e0bdf130b6f1e210952139edee2ea9827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/be/firefox-98.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06b0f7aabf8ed42ee6f021bc37abb44029586f5ddd2673f885f73f94c64032c7"; + sha256 = "89973f6718cfb63e43713594089618355e5c8323b3912a7a67d4d0fdfbe1cfd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bg/firefox-98.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "72f5e07d24a2810659fc7d5c9a43214f427286f9a0096d602be0edbdb31d529c"; + sha256 = "b7ea5573feb114ba63e5f0b516f36d134b4015a262c2e7f824dcce5cf31d7058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bn/firefox-98.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9f3d0376edd2c74b527190a5d53f0d2a36c371484fe4fff1f91c1d03b0a2dabd"; + sha256 = "bc4837219822c224b556c826f83bc913f9454da7aa9b26ff3a44119e5284b63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/br/firefox-98.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "befbc0e991718afb4dc5362fa9aaae52a0e60fcac158a666a2b7a7b41eeaf834"; + sha256 = "36d61c43e4aaf323763676ca5ac5be3e4c23af46b4aeb00409ca7391cdf60143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bs/firefox-98.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a4d41ac7495d4d5311d5e03224a1c75a03fa059b6638666fc0622674ebfc6248"; + sha256 = "6215685be94ad53ea827a6366673a14c327d2e4fc94fca51918b6cb2a8fb5897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca-valencia/firefox-98.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2ff1b0f0035374f323fe2bfbacd321394fb040599ed064627f60d24c78571394"; + sha256 = "15220b2edf948b6027d391bf0140becb69f529565094f5f10a65b090456cc295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca/firefox-98.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6f979602867721179454d2f6286cbecbf0a14aa0d42ba68ff7d7ca751f15a341"; + sha256 = "1060f9d8a46d078b3a1234116a2b963537213084e74dec8fc6b2598a8e863196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cak/firefox-98.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "dd8bc5188874f0b5b300a03a7ded9fe059ddf9c9f69112429233f2905a5b329f"; + sha256 = "03a302fe8bea3dd231b204946cd843850526652ffd2b77b4110c97ddcd6b4f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cs/firefox-98.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8daef8ab21ad86b68999e052114b17b52d44e64e85b8879b690717c4017aa983"; + sha256 = "6815701642c6a76a3ee5f75433aa91d8e0e23b8a68c3f2204862703a4426fede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cy/firefox-98.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "758d098d80d37b2bf15dcc3b16ad7289439166a3c7321bf815c555d96531589e"; + sha256 = "f68a21a0dd833f51a9d8e66e0c5d970b5d704472728e3585512d07fcbd28c470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/da/firefox-98.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6fab3975b94d94809c734ee95cb26d9bcf24af71234a1bc3b8c4db0b97355405"; + sha256 = "66689f2a8ebdce69f3f83edf2e626017c51dfd823340a946e23550d93cbcfc80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/de/firefox-98.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1b776d58ce3b1d21580f725b065b164a6fc23e5b17d70025830286922f5c1455"; + sha256 = "183b0453e691f33ea7844a8a0b4fe91cacfca64b07375d85a84dc58aa95fdc5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/dsb/firefox-98.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9b9c082e7fe273635b1095e6caebf8645abf3aadcfbc26e098616095d64b2f6b"; + sha256 = "b129086ca18bf18ab583015c2602710e7164a53bb262c8e3ecdc62092d88eed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/el/firefox-98.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "475676b56b462193d6dd50932893b039e6826d247abf2d46a421415bd19a6c68"; + sha256 = "46f9fc4b9cabb2e9fbee8a6453b7e5cccbed4dc7529717e917e4c3be3bb7fc54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-CA/firefox-98.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8c50ad38302dbae2d6737f6a03bc6127c850101c5f17c8a15b85d157b6b39ee5"; + sha256 = "5f7f255b6d210709f716920989f835f4908bdf02a5a2c1f9c12a393e03da6a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-GB/firefox-98.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e48d9aa35fe906f6e6d99eeffbef212730c15a3b9d5a7090dcf99e3e47eda9ab"; + sha256 = "a940242819cf79b1bd834520358e0aaea24e682cd5019668f356460a6815e4c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-US/firefox-98.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a63d28ae61926c0d7447f57d4e6fb514401d560abb50ce787bb6bd0e9b7b820f"; + sha256 = "1a3d68e5e449faec50a427f709b98078bb57aee8209743a0beac978a4a72a05e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eo/firefox-98.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "94394906bbe63f6dd414aa6b0739dc30082128e0e342fd408d33ab99cb01b9f9"; + sha256 = "d070191b8184943b55c4a68a3b523712ab04b0781ac835ec1f31de5aa170782a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-AR/firefox-98.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9738031b89b434127af39f20609b31ba767a004dc0ccf5d56b965165ab91fb82"; + sha256 = "d5a3c016b4090b926710c184729f2a59af3c257ec8ba48dcadb6367f67976192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-CL/firefox-98.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ceb4fd38b2b81b16f2faa95995b11e760dad4e710cf4435e6d311245bd6cb483"; + sha256 = "c22546ecc83739731783c6090172b1a8ca9082415881d62c691a97ed27b0813f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-ES/firefox-98.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "37f94ded6c285c01300ee014f1a55d955a70b980647b8ffd5a0709dc9df34378"; + sha256 = "33a424c76e44d1ee73e360da08a5aca42ab30bdcc3ad2524c0c209be37121978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-MX/firefox-98.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b989f57bc1439e3204c912321df33626a9947691e76cb8bd22fb5bdcd77a86a2"; + sha256 = "5ee32de772d925389210cd210c326f3aec85e9ad45b8041a373cf8456008b7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/et/firefox-98.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "757190b1a6de3cb7d44c005f9b23f745fb67f0c247956007f3ac269d494019cc"; + sha256 = "3bfdba6becdc20002d267ed8d695b72915f4d59073f0c0c5c5858bd383189017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eu/firefox-98.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "092f0378fdfa3fe44f19fc71543609a8b96a9add6f41324d24edf7aa7b446d36"; + sha256 = "2c0669ed569b7676e10330d034802d9ffd24ca85ef38cff0208a7a02cba53d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fa/firefox-98.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c1d003bdd9f21d6751de57b1e4d8b1057082f48260a94a732e3a3ae180ca186f"; + sha256 = "c7c8242892426c9cd1f0f60c3235de6dc7d9e77b3b341630c9d6887e34ff2761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ff/firefox-98.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "af04da4c9528145e7b14bdc5283a41422704c0302675703a84a4bc2b42f8139e"; + sha256 = "4a7352a86887d5200106ad725e7a41aab1d353547da2c1891fc399424112ba20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fi/firefox-98.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e3f7285b7d3666155863bd7d89bb7cf87008b755d34a7b5b04ec63425f7ed6c3"; + sha256 = "a696aa3e201f6b776610195e8e0130791015229a66082e3f1240d925210db6db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fr/firefox-98.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9fa04d611d74ba0688ad7ad7441759015724e61d7303eb211b7f7404603eb1b1"; + sha256 = "67022f4ed56749d968780a97e1efc14d272a38a96aaf4bc55584e6fe423d48ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fy-NL/firefox-98.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0d017580e4847f644d8b4b8d8e90aba0a92f3b3aa436b9de68f176f7f3b00cb6"; + sha256 = "1718465d4a46d4e8b0fba79b9e0fdadb241183745ad158fa65a3f8d17212d7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ga-IE/firefox-98.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "73c602f8b41a5aefaa04646065197fbcad2e196c94b1d1537a019ebe33590a6d"; + sha256 = "65ea67422e9816b20be8259b5771f3db7f4c414e52cbc9975612a533ad4d6009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gd/firefox-98.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1c9a41012983133bdd743e0afda81d7c752b04ac2cf73a7c4daa662d9db91c8"; + sha256 = "5ba3f664ee375bf22255c5d9776c8da83747f52aea566a4436d29b91b34afb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gl/firefox-98.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8ca8b2e7a3549e1df2aebd86bc5192d6ba0b14c2581802f1ca06342ffb771ac4"; + sha256 = "58edc93a8885ae6c2686a8c8f67b93b19fc99376155770b4e72e821d762be0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gn/firefox-98.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "10acfa3beecacbfaae592dbce92e72dc220cd27503334e28d3108846ec012e00"; + sha256 = "c5c08869c3390a95de8e490af4e69783bba03fe8d55a1c2b344339cab9fbc4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gu-IN/firefox-98.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d2ea8b9386be163260d4ee0940dd80c4fa88d235cef7470fe9859fb18b5360f3"; + sha256 = "35f29f0b0574ccbb02cf08d4714e2827ce364876ad7751ba7f1cc24e9f9861c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/he/firefox-98.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6dd00a7a9518868ce35e92e22951fba8e45690ad19afc297c82ec5d43690cbb8"; + sha256 = "27c5343c95f53dced72958155d7f8af100e3cdb8aabfebc3189f1a9c2550428c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hi-IN/firefox-98.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fb583c15e2f5dba0c8c19c197f4e4f83c8e59ebcf568d3f52936bbbd4733830c"; + sha256 = "f8d7111c208a529c8f461284249d1c77f88e8d644c27f398aabdd414a7309802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hr/firefox-98.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "07d6ded87285b2192f3668cbdc74b6571e708bab6d77964aa8665f1940722ff4"; + sha256 = "721b61beae502b2b7039e29b959c2b4b8cde84260b601aa29bbcf80c73a633f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hsb/firefox-98.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fcbd4351ef9a4c3ea3bc290bf17679f900e73339b63d10ccfa2c554c09497bf4"; + sha256 = "4eb192a2d3942e0c80ec2f3ba805a19824ab4c1d85e1ada9050409cf0cfd4ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hu/firefox-98.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1fade975a0ab75308b281b556c6980e81fc6a4c540746142534401e73323d9d7"; + sha256 = "70b9a67a51d3e61242c1ece908a81d0ce4b407bfdd9d3592a7025242cfb0ecce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hy-AM/firefox-98.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ac7d7124aad964783b65d9d7de037005fde865a7922cf22b9e07f44f36830032"; + sha256 = "1135df2ba82e8834a8d38e436df2debab2601884c02a9ed876a64044dec9170e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ia/firefox-98.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cda3d476e07f15cbdce88225d0b7fe785841d56327c63a53920dccff9ec8bb4d"; + sha256 = "0e8b652231ae2962c61a90466d1e8278c11ca3b4ce70432dd3a3541a7bd55760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/id/firefox-98.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3bcd1f707740b56e345c34dcb24453d33d9761eafeb9b3590d5e74e4558b5f33"; + sha256 = "5c35d191e9010e7a0e97844b38573b6fde93ec57e13c1fcb85f3bbe595257bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/is/firefox-98.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "027f46db78d1796fa3ddbb3ec0f823e0a9e3677ca1f7e49eb1b9299be91c74a4"; + sha256 = "297aebec277c01bcc5dc0fcccc44946181991192e3f485ec4bc0555131f132ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/it/firefox-98.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7332a7566fb4f8748df9afdeaf5aa4634dab42cf63f52cc41cec13215820afa5"; + sha256 = "7d0c7162f4c3c264d5394814c99881e2a39f9fd406e7a32fb5319bf63c3fe344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ja/firefox-98.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c485ee96c2e6e0f0a508c99b2189595289f3858464ca2c48301ae78bbc59b299"; + sha256 = "eb260c766f1c82d45393d5c7f3c3c945166f837ba02f061691bcb1b3f9d11b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ka/firefox-98.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cd5b723c422e01d70856dd851337d719170585146029119f1490feec1d8ee188"; + sha256 = "ce8f6ee46fe3c8b836fd694b2642be066a81191a9011e33c0853396dea625880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kab/firefox-98.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "df540b3e9207f174cc6a280813d09c23abea18c1af540b9bc7e1330a4920be9c"; + sha256 = "05a282afed3bb3e573c4250368b3ff1edc4c322dfa81d30e8f8f3447199fe9c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kk/firefox-98.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1d6ae6bdfe89de470aebfff046d0ddd12dc85f4c7b9ad8931b8bdb9da7917906"; + sha256 = "558a35d13332976880b0cacb69d45f25d72e34d4ef43e7c92260621dc1287ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/km/firefox-98.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1a5fb9460b33db9f32000c96ccdcbbe1d2fc3fa177b2cfaece1dabc514e3467c"; + sha256 = "a3d3f64dc5e55e9b3168e18a64b2bda9d238e10bbc295d7ce7f4c1d964b6553e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kn/firefox-98.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3c5766b4c29c699309cc8191fb1aab01852db29467c38ef529704c54d9087689"; + sha256 = "b06d52db9c0e2984c8a652278595cbd0530512b9bb8e6d5ec5d3015620225bab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ko/firefox-98.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "08d9a5999a9b10fdaf9a386c9da99ec040200f2f19286cd7ff8e26de95955f5f"; + sha256 = "f1edc7483429824478a9a4d2f4f3a03a9adf23e9ae364ce8c50da8d97fb55052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lij/firefox-98.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "925ea94387cf5f07b053ca5b25dc2a50b0ad9f6372509e91116fb6d20675204e"; + sha256 = "e441db0a47d1265d1280a60c592b4b2ddd33751c1e9b38bd71afc2f25edfe469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lt/firefox-98.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f062e05e6fb52a42f813428be5be582dbb24b46f3379aa0975451bd029134c12"; + sha256 = "989c66160ac78aec5a4d543a519e11cad772cbbeb6b5bd30832b04751217d621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lv/firefox-98.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ca08ec6516a07aef0404716b0111df6941b9b167173079397a013f93db23e8a2"; + sha256 = "764a3821b57384676d1236e9553007a78583fd277d27174bf4970750ecbcf9e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mk/firefox-98.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3ddc7afca0f7030fd667f345ace3105eef1126332d18f20c7221596704eb1196"; + sha256 = "104b650e57a1d521951086fcd337a21fb3133358dce8842c434089454a389f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mr/firefox-98.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "684d22d5841abcf6c107106966568e6f7476d15e1dac80447721836c4a20a71b"; + sha256 = "396359e41e9fbbc03a548e6f77c1a607af0e3c09044d6b57e2cb01fb80fab94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ms/firefox-98.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9630d0e0b4466593a59efaa383d6fd0e9c08887959e0b851f03aeadb5c64d43a"; + sha256 = "e8dcb2af15e9fbedb0e3ebdfabdda5f596fd469b6b20e4b6c5eaedc177e6c7bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/my/firefox-98.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "2bcab7bd7e35474466c3b587991cd8a62a18a30c14ea489d9c28932e1813db5e"; + sha256 = "89e64cb715720dafacbebc7ddd72a5c6cbd69995113f1b7d1e68805b09591df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nb-NO/firefox-98.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d6c4f2ce45109e37ca35c0fab316fc31b849f256f4745858dddf519b27fd8e75"; + sha256 = "640c4b9f4e23d08df22d67e915cae12ba07aea80ef392658f693bd5a14a23572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ne-NP/firefox-98.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ef96102307ab270615166a9feaddf0ae047d2c8a18d85015be7f388d00ad3cd1"; + sha256 = "efe07ad3079a3295744b8739d3718374137ee98d39622c0056f079196175dfed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nl/firefox-98.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4ea9eccaa1c7d354cdc199b33fedb6a7ed07400f331d33357c69ca7c2c654dfe"; + sha256 = "d979a5e416109251b0f27a50e5d2831ae2fbf3da6ed3d3e34b52adf2c19221ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nn-NO/firefox-98.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "59045e5cccac7dbc125e3fa3f8c9bff7b5d8b8b0e8f1e696f5bcd633bf9353e6"; + sha256 = "cdffc971080f506d083b7c4fb1edb769046a6b56ad5c6851fd3a09b48d401bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/oc/firefox-98.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "cdc9c76871be181f86871c55bd6819de9539bdcb11450cf3bac419f4bd44185c"; + sha256 = "7d4206e9e73132f13f5ac5377eb619c796ab1088f8a91958dd13789b0b309995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pa-IN/firefox-98.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "aad979dbe94c225b4255ff6b7b78097f8a60ecb14570517eddcd7cbbc553a9bf"; + sha256 = "f46a2e85222e39c03019373cfd539ae5354c608e60783151f15bbdd1a8be3b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pl/firefox-98.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1f1be85fe26c4a55171f7114052ba679c405e731b3db7934ee2ac35323f095c6"; + sha256 = "1853fb827d238af7122e9edb0d7553aab00196f5523addc641f93b3f26b02b0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-BR/firefox-98.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "588698a09d7320027027ace6196f6430aefe315cc9aae745f75568a062d6de6b"; + sha256 = "a5f4e7c3f0b187bc86c4b085536a8dddd9c2fff6f746db77ed186b6ccc4efb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-PT/firefox-98.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4cf0b84bbb4a5945ea787ca0f3d4da56a12073797dd603be29e408772a70860e"; + sha256 = "88dd8f0332d88ccd38ba119acdaeaad4fa3692b45759762871fba67a110af9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/rm/firefox-98.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b267cb45b84b114c266551c4863bfb22db9ff4725c0b6b9d39616e0b01f71e86"; + sha256 = "7e901202cb7b29f04c481df5bb330faa92e48d41dfe49ab614f089c4787ac36c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ro/firefox-98.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "26a6ba053a270db85fe008f72c23b905072a84c27815131d1a3af90fba0f3518"; + sha256 = "149b39e24f83bd14c9befc52ef92639ad02ac2059a247d8521a8e5f8659b0983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ru/firefox-98.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "caea6755305f8f077fc82895343c01a7e1eac0e1cc70faaa1915bb88cba01344"; + sha256 = "5739758546b279d77101391edd7cfe236ddbf69434ea89dea6c5d4f857a016e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sco/firefox-98.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "eb249baafdf9d54b61e923bf3f23d2f462d5026f4b81bacfadd713bd569d3255"; + sha256 = "cbb408a2be5d3c15ba7f9e865c02228f65c9ce59d2c29dd081638515404da03a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/si/firefox-98.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "44a98bc22309035b432c3f01c5f87d469df3f2bee44c26f54f507f10b7098908"; + sha256 = "b96e1604af6e1e828230a1a3652f83bdf28247dbcb9961b233d18a9bcc829da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sk/firefox-98.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a81e8f814a2816ad95414c6e43acf55d88e4ce0757de14ab163f6b622fc49d41"; + sha256 = "ebe0774a5872e8e9f3ed3c894d10dd9aebcbce1539e56febcbbb7ee97c3ee358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sl/firefox-98.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a2b9f1dd69a9a3fd4b5198280462d06b49d5c63fd101865707cac6aa6fc9581c"; + sha256 = "2b3e38e812508438768d4f12e545d96f1b7e160d53edd26481ff70510d89388d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/son/firefox-98.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0033fcff083aa29a738799cb9bb3d32eeeafaaa3a1d41c422048c89000a9968a"; + sha256 = "df1bc20d146bdb2d1491cb040c4eaac1a70d4af024a00863539b218b6e1098ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sq/firefox-98.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3614b46f72a142655f58c0577345a772350ead46af9060cd20e8918f517c7cf4"; + sha256 = "9b40353c9c9911522fa495d35f19764b220e2c40488205050719c951911dac11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sr/firefox-98.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "034dceafc44b83ca9d493f98645bd0ae45fd513f55f20f0de85752679e39c570"; + sha256 = "d2ba0fe06528af4fed9907870bd72290df1c433c02bafad8b7b834a24b9a1427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sv-SE/firefox-98.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "aff9dc0399629aef20dff6eed5ecc7664cc8c83b53614b2cd011db6089262a9f"; + sha256 = "44fa731f57d2f0639d1e3595eebeb2491cd3dfff7ff8144eac663e966ffa8f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/szl/firefox-98.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9b6242e30b948507978f96180ec6d7d5921e32657f41fbe211a7c254cb11777b"; + sha256 = "37523769babf48c7c942d878c8c55bc0bd761a0e4df8a0d562416ccff46f8cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ta/firefox-98.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "368a48fe15bc7ed6359cbbba817b47a99a583cc3ce91d2d98f0387d3a9880a95"; + sha256 = "3aa9dc19988fb6663ac95b6c3b79d03313cd78cb4e80700708ac92c3939d513f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/te/firefox-98.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dfeadd822000e10c0214d05c75203a6e9c98c4bf20d65377c35ee8d485a2707e"; + sha256 = "bd7a1af00c7aaf49c5ba667e7e85bac5672384b68f5f7cb96e4670f7363ff063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/th/firefox-98.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f1932432028ef648897e64bf033bb3e8984100052ea52a9840d000272f9d5eb7"; + sha256 = "962c9e428f1ab3d3d143920a503dcf6d5335489e7e691a4447c32ddfad0b55d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tl/firefox-98.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9436d48c6b56c7b765a4ab6ce20bc12f3e5241691edb3b1517fe27a3a1fab6a5"; + sha256 = "6ae919a932170ccc3891f0805949e29cd403f6a2e6efed38b76c7817c9533cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tr/firefox-98.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bf0d0808d6d5f880bf382e9d440013855a6fda82275cc628833fb8cb694e4f6f"; + sha256 = "27127d6261975f62185966a8d2a9c4e686c92212b8f4e06a36b47d16434413aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/trs/firefox-98.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "546416fc106774a28b2234e31d5d9850ed4708a2e5be4a4231deb28f4544512a"; + sha256 = "a005665c64968a82221d6332ed20aa6702f197ec31960fd4a4a78871a947586c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uk/firefox-98.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5395cb322632fc68ef84241a75786db589863709344d5dfa9cbb650bc94c8f6d"; + sha256 = "866021efaa23457b203bb2700b8f24649222855d7ac1f71bf05ee98469f8c7ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ur/firefox-98.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d8dcdc4d95646392582904a29946f652e670bf276dd1b156e5b28477f4369e50"; + sha256 = "d34a0c4f6937d8f6375c5d056cb615db37673917dfafec7d1f5201c38359a1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uz/firefox-98.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7b1b8b9e9efd430ea5191d3e30c2b28ef28f9fad9779a4d65d1bd653c575986a"; + sha256 = "a5098a02bf4a8c983e81b2863afae1cccc007c69556d69432577928a9eed89d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/vi/firefox-98.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6ccc1efad3f2a57b365195afbda665548d82d141f5143beb04691d995e0ad1ad"; + sha256 = "ec7c91879c348fdccbe73b498757d1ad7bb1461df530829012c33c706c023aa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/xh/firefox-98.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4099f3357f74bc5443ad59ef72bb1d1881b1d96965628544f72eb3bf72a02a36"; + sha256 = "0b8bb8c5eaf45faa1f128c08a8d47d7f1388f37e09f73f3ee9b0e77044aa83a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-CN/firefox-98.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9588d9eee65b7389c91ac43782f455169889742b2996bce8306fa07075f1c4b5"; + sha256 = "4cbe5d68f610f3778be063d132271fca35ad9c7a7914aa32459527b4c1800948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-TW/firefox-98.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d4f9228777a8af5e68616865fcdbf522cd73d69164ca0936098bbf0534911413"; + sha256 = "80d4bc113d203fdba00f6af11ef1fd7b9184204b1788124e66049ca5ec13b3c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ach/firefox-98.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "bb0e66383954377252fe15d1e3b251ff0e7ff518fa8d817f4f26b18449e8525b"; + sha256 = "98a4025d0771980dbd3d06511ba15de71d7df7311c7e683039d315bce7dcb590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/af/firefox-98.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5d73dbd6f2cd49f79e99538ba0b4247c8c29c92ce3417e6ddc23b89df59d4ba2"; + sha256 = "8519234c67e0f8b4e13df38ca98589d0a618f607eb940cf1f686f540a3dad527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/an/firefox-98.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "43b1ccf184fee070ec1a279914eda6b25ab15f294468b524e4c2a5e975e7c818"; + sha256 = "61bcf050289a12e11c6a2b308f3323f39558aceaaa7b18cd95dd19609065a66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ar/firefox-98.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6ef2f6bf6fac15b194a08aaec137adfe59ac7a8e1e06eacf88328dc1c917c994"; + sha256 = "961d7585e36e387d7a0f01bec3cb8359704a0716124211f2a24f5c046d49d338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ast/firefox-98.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01aa7a8ea0263ba32f0c398918b184cb0d9f588df4330b16e37a8f3fb1efb165"; + sha256 = "bb104056866e6518bb0ab94ba179b525105ddba09fc969065dc48d15f70de5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/az/firefox-98.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3605a671f1752f0ba3499720095b66a7d058b5a0aeec3f864d87d7027121c970"; + sha256 = "897fe5ebfd497eadda7858701217d6a0cf0bbf2a74389ffdfc46ddc8a5706480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/be/firefox-98.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9ecdd7986a2b2b0c28ec11eab24130e4d35c8dc96e9fd95bebd0fd2e724e38ef"; + sha256 = "6e4122643e4bd368c7adeb640554c7a5252562b767093aeb0e9cd63c9a533b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bg/firefox-98.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c66c13d707aa0f52154061dd6d59407acd1bf5b1a29284da8821c2abbb2b02fe"; + sha256 = "481a3cc57cdd62d1ad23ef9f8f0c15087ff20335ab57bc28729dd74975460370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bn/firefox-98.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "bab8e1f9004caab4f2a4ba0dbfa22ce10957b5c2a4adf52049d64953200cc052"; + sha256 = "d56c44b8c5103072605b9fd3e5cec63ef613698bad3198543e67958c7ae2c97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/br/firefox-98.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "07f177e9396567d4f0852c68b2080a04ac2f00c38c3cb0c1bc0fc4fcb3b629f5"; + sha256 = "2f25b1130142faa0efe08413512353319dd341d31221fd463f198ff8ec776b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bs/firefox-98.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e9fd1dfce60b27dd8037c144810379a2526c4d270d9c2bb2536a74df8be7a586"; + sha256 = "a0a33294d9eed0867463b56bd0e02e58836c5eae91718ba918160dc98eb7ac42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca-valencia/firefox-98.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f6ae71d70746a7c56ad416543cff9ceb4298dfe30d1bce4d72ea695131ebad95"; + sha256 = "fed1ba8e292c72cff4c28ce3c5e59f58fd20f25624444084394f7b1cd61446e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca/firefox-98.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7b12613954b0e6b81ed7fb1fcca7099dc4500a72cec7333dd8de6a7deca28820"; + sha256 = "f2cff173d6c5f6d12f8b29f07b3ee0d51dc523d508f340a65a99404953e1cb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cak/firefox-98.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b18f916d3eec4121c7a854ca2ba2ccf5baecf53d7a173578e19c3c3c50aed076"; + sha256 = "c48e7d51d10b4d398a3a737faf204cd695091da360a70f3fb6dcf8b5ddcc265d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cs/firefox-98.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "56afa0af38d7ec85b938a961363b781d4980ccfeec9945f0971be201a21b1cd1"; + sha256 = "1a223fcfa992f1f58e61f9c4903253e51adbf8a73380d09e9b38eda8f713c31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cy/firefox-98.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f82d0db8338a0eb4cf5f180f4982c5c7db7db4b9fb953ec496aa2e9961966091"; + sha256 = "3f26e158ac5870fecd94d2b5a07f7116577fb0cacae5a98f456aa64b66eac64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/da/firefox-98.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fe7def9df91782a3adbdf02a4deac85ab07caa4f378f695e2253e0eccde3ab34"; + sha256 = "1ad6bd99e003d2c8a2d3dfb15360f52800b8e2b0c6ce586f1857ab491763a27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/de/firefox-98.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1fba10e324128c2d30b9a9a0489f1f065bda575afc7dbe0c6625ece2b96b4bc7"; + sha256 = "1f433c261278469c96f239c595ccaeaab2d735b461847b2a6f0770cb618e13d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/dsb/firefox-98.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3e43d5c0d27290b023c7e53a48aad5894474d9a33a544a20cca4893fe4dd3267"; + sha256 = "c0aa0c513549ddcf73243d7b0fec5110d547be0536b79d2763714447cd80460f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/el/firefox-98.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "71864f8294844e051674f20d49b78f3b129ae10f7ae93c4bdc4e194ca6a586d3"; + sha256 = "0e341f6e22862bc0d92efce71243e64cde6e9324ac33bb1fbfed59b84fb4fb89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-CA/firefox-98.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "845713d2c18c1bc029509590e6156edb2166dd7bfc8e5a8cb9e6092143bb8193"; + sha256 = "5dedc5db801b0f7c7bc42a2373e8558895a1fc757cb1f39f99b355729eff7e4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-GB/firefox-98.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b5b2f7d607be95cccfc6dbc12298333e5f261a9cb27650dff946ea4246e87df8"; + sha256 = "05d2a3ed1e9b2d7693062758183187d0a8a4524d6644532029aadb1d2d1b9548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-US/firefox-98.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c736080050a9715077a004add55dcb3dcb3be891d5870939709096bc81195eed"; + sha256 = "01e9e15b89299cac4ec8931e84f11ed63ff3ee5e70cb73be4cb6f6f5d817cfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eo/firefox-98.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "38f135a137826862f9319b88edd9ba0e41a7c57f7de3603ca23d5c6101b2cdc0"; + sha256 = "121a736e78d12f984270cea37b14915fe65a52c3dfd29e155f20a09707d69c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-AR/firefox-98.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "63856d08aab14fec8b28aa6ad6f765aa43d5bf52cd1da5e48aa3c111e13be60c"; + sha256 = "a051af8c255954d2c025cb9d3a0ad2d1ad6bbfbc1bf69436abe8ec6674277ece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-CL/firefox-98.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0bffa72431868aa53835a67b18a257e7b3083da778182b13f723f68a38478910"; + sha256 = "17a2fa85675f5fbf532da3485099315de98397e5286e2fa5a0b1c8b468a9c974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-ES/firefox-98.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "11adfe391791b2e17114c72d984db96586c70102d43563f907c371cd85c89b03"; + sha256 = "ffa84eba0ac4cd45fa385de6fba23b8bc69efbee1a3bc39b7e1fb95cf6e6581d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-MX/firefox-98.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6b9360899c575c665e156dbb8a3f20b396bebb742f14eab9957f30f1dc2f644e"; + sha256 = "f73059f6dfa6df82282ce8cf5068fc5fdbc6320d2e73c981ff6571afba8b3959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/et/firefox-98.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3fff6be4dd8d62163cbffee59d2d4811944f89b452a57192b3444515dd510bd2"; + sha256 = "250eb95ef69fa4e61fb6fff0c10c7f884684ca428318b1feed366a2b49809993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eu/firefox-98.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1fb5ce8792f92d810f170746c61133d1835513dc644c6db88f1a4a6d81906815"; + sha256 = "6a709d754542a74104539e8e043f1b07652e007a1c062e067af4123d46c46071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fa/firefox-98.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a69afe063a18b4f95fef028c584a46de1246fec45137e394e4b4a6f711be84c5"; + sha256 = "5435ad7aff621091454b61f2261e72ef1ba2fcd2b89d32148f8ffde0635e237e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ff/firefox-98.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f1c3797c11b975d7a2feeb03d20cadd89396659c3661f7604853d9912a5b6faa"; + sha256 = "627f8970b92f5a96d8023406ca14c46471be457147d282e15e71db0163822a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fi/firefox-98.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d8c628c73ff53c5883a8396bde4bb9b931e1dc7ac44637e9774b3d5d3ecf6b06"; + sha256 = "ef7912a562f3d01e20ee54dd505859ec6da549c8daba04c5003a8b618af722d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fr/firefox-98.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85dbf4270eced53b4020d7a269a9d9ed4e55fa7251672b9c32feb96d6336b110"; + sha256 = "da5b3dd660ff8ac8f10f5419d0d848503a74948d76ebe45fbf88470703b24831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fy-NL/firefox-98.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "30da6a888702ba5060e461539ed51390014c79b55c1358e6a8b76c80c335199c"; + sha256 = "5d58c3ef8e75c22db07e82131d6773f8af8930d46a3ea9667bae07a59dd6b8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ga-IE/firefox-98.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3c1a33c4d7b3e3161f2b07ff95adbc466a2e9d718227d786ee6007318730c1a0"; + sha256 = "05a3402a6be754390c79a66160510696acf866002225a5d242d2f178e3c63dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gd/firefox-98.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0ffce6d8f9e2d0d1b84c2c9b2ecc49a1861f88356c5b37d75522d537364f5208"; + sha256 = "6832439565a3a18ec623c5a6d0c36e429b2ef291bc8c0152da6934a108ca32a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gl/firefox-98.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "31fb23e14aa007cb6ea74b5ccd124d51a1d2c19cb6003d693afff07e83640666"; + sha256 = "2e55dcaf24d4fb028ff5dcba94fac38499897bbb7cecca79d6fafc0b83e21a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gn/firefox-98.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "042b2c8e5652f2f9e1e3cb01a4308cec100680d45acaa37babcf33b8bef5512f"; + sha256 = "c25a77b99c022c3de29cea922e926db9e738771cd146acc6d71545cf8f1acdaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gu-IN/firefox-98.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5052d0c6a28b1c83e1c38b771f62f3c973089ccbfd048d0e089c8a637a80d218"; + sha256 = "e41991d388c6fecf9b22416c5f840e8f96d032d3be793101c9133ef7cc545850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/he/firefox-98.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "06a78cb3435dc6f8dabff279ad1c69f6f4d44c5a8e56d04d38dbfb046ad42fa8"; + sha256 = "55125f1e56fa6d8f5af4aba206e3ede2bb80f39414563a541f07eebc568de993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hi-IN/firefox-98.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "340d637d0de3df62ab79e69b3465a154a80e47a4dfe2b48cd949874457955cbe"; + sha256 = "4ebdde0d91f94399607c127953e738855a17463cea34a4360b630ce0e6add5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hr/firefox-98.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "526fa7a1bf5e3e3b32f2fa61b8d28617873aba9bf1bacc5e13533b0621df993a"; + sha256 = "11f2449791c1613394764d36e1661cb05a83e2582904eb00ade9f09f58d4147d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hsb/firefox-98.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4443703e0b590e66dc4d295b1262d61f91cebb0a59ef6c246348a4e411663398"; + sha256 = "d7138688ce4edd030bb51d7eb68626a4055ef18dfaf30045d872c03b187b4ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hu/firefox-98.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b2b1be8b090734f1069f7bd78294072bab28920312aa34125d02213a030bc9b1"; + sha256 = "693e08538b19f9d1aaab399e8d4b582e557e34ba5d2cae7de6c7e048b175dd3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hy-AM/firefox-98.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a81e4add5314774f19fb514b539bdd7e12b907a4faf8b606c13f7dac8461e3b6"; + sha256 = "1e78ed371f092f9e1ec9ec7c43b16da6b5a277056983ea810af568e250c9d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ia/firefox-98.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a1ead289cc491600b89d63f96081b21e5f8172936023e42b5d949c0d5aea2bbd"; + sha256 = "a02a62a042cc51d7b6389366114816daf10cead0ce51a716ff58485fd7b856e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/id/firefox-98.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f56eaa86629a013f60c7af973a844abca72cb7ad236e02479bda9d1aeeb02b32"; + sha256 = "e548a304acb9075e6110c276482a1759cfb06b6cbd4edf2b7aa633f6762b91d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/is/firefox-98.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0d762f8c70bafdc9d8155572ff71ebbb0dfd9d83388298196a87ad130f8527a8"; + sha256 = "c43167df2a3739d7d9e7c8013cbe4a9ed5e18a060d06667ebf36102ad7a0587c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/it/firefox-98.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "54a79040a115b67cea2b912fd905d8acee05e737702c778628fd10282b27364e"; + sha256 = "4eba45221ef34d71353b3d442e8cc5a565fe79cad1a21b4de27129da92f165fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ja/firefox-98.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e92f3cf4d7f2f0e26280d814d6bf26f14fc2f5d8923451cbb6075607ba4d95c1"; + sha256 = "173c3f7afc252f495e9553c6b7a1afdd5090de2578a477e15307ccbecad937f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ka/firefox-98.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ff89c8ecc80897ec8acea68de166ae6f626f181fc7f0c1d30ac5208c4a221eb7"; + sha256 = "de14be28830076b11610a8824cf20e161cb4e7c0e527d160caf7d214f41ba9a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kab/firefox-98.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bdcc2807c9ac16d6df6e1f35e2648f7e1776dd117edc1731d24192eaee5f9661"; + sha256 = "385dfe3ea1c1aafd4e0f3c4176bf2498876b34d7fee5195ba5fa5884203ae338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kk/firefox-98.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "535bb672a95a37550779c84ecb5eaf98f151a30123b2b7a099b7940e8bede683"; + sha256 = "c9b2f1fe4cdce853ec155a4b99d44279dc64c266706e58274413b0b37cf71317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/km/firefox-98.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3e60008c56da46e0897c326a843871d63fe0e534487f4a94f2e398ea6c5377f9"; + sha256 = "adc84f8768a71d7f2ed314dad0347a346b3592d47bb7ef621301deb2b72f7f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kn/firefox-98.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "90d8c47a1cd42b7bd4f9e2c04ec6bfa701fc978a6ea680fc5e48bfd4fa6a727f"; + sha256 = "c0579f13e76c62e402065069ab7dcbddd7cfbea8e428b5bf2e77d42550d18557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ko/firefox-98.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d62427eafe143f3d2aaa1eba6969358316b8c76c7fe926d8fc5985dddc588e7f"; + sha256 = "bfc610608666e626715000bc4fa48dccd43ce0036ee0111e926f92b75034a0f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lij/firefox-98.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0db93d63e67c7f1bae536d425dd1789b0c0d1737fd23e8d0aa0c7b66f4c958a3"; + sha256 = "fb1afb37bd4d47aae8de6ff8b1a2dc34d41903ae4ead5a2671baeeb6ef3b3196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lt/firefox-98.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ae3cfea73e03c61afdea361c4b23408f7c894197c4ef370286a653d35e0eb406"; + sha256 = "0197a8c4ddf84ac38aba0533a84b4a57e783d3542b48e221b3317b39e9decddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lv/firefox-98.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6bb0a946109cb8316a1d3b412602b590caf4f6a22fc7659fc43d79c0f921acab"; + sha256 = "a7631d6bfc46a140c226cd1914074084ac1bba0104c7811305d40291e015c2c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mk/firefox-98.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6e36851e9c7b14e8c180ac9b715b245ec627fd2c73dbb4adc31219247696f658"; + sha256 = "78be93a5ef3ec79c9b7b8ed4134b25fd66db74e4160235e1ff57f87f7ecf7f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mr/firefox-98.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "68678735aa1fa850cc30445e71fc2589f32d3845238a781c96d62164b00a1da6"; + sha256 = "3890be73f978299ebbd3c7ef0919a6d5f916729528ee90f7d1ef86b088fb748d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ms/firefox-98.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0dc9802f1ea0bfa4e2916dd4a7b02b7aaa5cac0238aa4bae62bad4eebd49939b"; + sha256 = "5bbded06e5eb3c4f628df573ca10aed952d72125ca1f96f74643e28210121e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/my/firefox-98.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c3fdec85d214fa4f85b502647f9f0f50e0d473820e69a4f4f8d5d24fe58e6cd0"; + sha256 = "2a8ea9468c6fa4a4a303c4b5b1a9306898ed8f2fd60a3e8c9915ae549baefa09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nb-NO/firefox-98.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "48947dd10062ebef8e9095a1938dbb0b5e24689ffd5f835080512612e93f2efd"; + sha256 = "c7fb5c534a03afe15bc2c439b679dbf3316aea92d23d154b6902893633fa9b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ne-NP/firefox-98.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8952004bde5d731fe48ddde9bced409e5d2c46d25157542f3c72568b87a9be8b"; + sha256 = "d2b2731732202c4501e0989fdd95a68cca01aa4b13a02ca035247a1de7a7f299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nl/firefox-98.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f2c7c1348dabee858c89b8aaf37e5cfcf0cd867f4e9b0587285aef13aa302a26"; + sha256 = "2947d1783e0cc8126c086bb9a1ed139de735ddf2bcb4f104e9efb6d68d844503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nn-NO/firefox-98.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bd05d1b619c77fbb502080f4862cbb715e628c814d8c35720998ec43d6c4920a"; + sha256 = "1aad31043951d9b81f707cd9c6259d6c215ae20f55776719c2553148dc3bb589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/oc/firefox-98.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6092e57f1d6bcaed08e5d1acdd15d9fda0430f1c0073a48fc38f8a73578f1fba"; + sha256 = "c237cab50aba2e059224d80ebddda67f13f8737899a29d6246418dcb09c486de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pa-IN/firefox-98.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "51bc6d1b738c12eedd1b35f829b51ceb157c65a25241e911e10c13289b92a5b1"; + sha256 = "e487db05bc46eae01509b5ac3a9f4aa6e3cd8bd0970366d9501c1a74653f3110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pl/firefox-98.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f286860bd5912b91fa62494837da2c335c4a4a484a164b4b999022c2813d5c28"; + sha256 = "a84f34fd417855acfeb89926fdacc8c4fdcb870251d3b43095e04d2392a6637f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-BR/firefox-98.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a1f48ba9c56f2c54899d14b1292cbb4e517482ba0552bf17ace7dd6b517eef4d"; + sha256 = "5a4e35c0efdb79e83d535b62d57c26d5021d20c26d2654b98f6078ebbf4b6094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-PT/firefox-98.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6d91ff36f186ef11ba70d604443b7e818f608dd6d667f49a7892c1a69e64bdbc"; + sha256 = "f61b70f911e708f4964f4592e9b46c8e70a730f778aaa6e320ee7c0d3647253d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/rm/firefox-98.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc190575af60d5a09266b2296796978f7a37dd07b2709523b84b88499729e546"; + sha256 = "3b602a6d897e2311f1521a36ffc4be4c6b84705605aa1bf321b684010c02d59e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ro/firefox-98.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4193936ca7e10f01b91ab990ba0b7aa354c344a7749356bb9b30d251d46b84bf"; + sha256 = "94ff92349315c126c3c1294e9d468914b7f81ef8a0597c5fd039fe66bcad271e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ru/firefox-98.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f85ad1700117a99b8657d9fd9061935b77acfc4a0d7c8b3caa8d7c0ddf142a8d"; + sha256 = "1f24d74427e79b7c78ffcdfbe1a40c5e767ed0854a870babdf1f4956ddaa17bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sco/firefox-98.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "23d16650132fe30c6fb90797f744d09f21f16a0673821cc0c59392a9d2adbfab"; + sha256 = "2b11f6b4b380143ffb07764c6fb6fb139da7aaab0ea5bdad826b1c14eea09a3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/si/firefox-98.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "44ec177853f6d3d72ce141ebfc25508df4c63c8b37265df4dfcac8b48799b007"; + sha256 = "f644c5fcc35bb8e4a2d4ba1d7210cacfa498ca9aaed79174ac4f973021dbac63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sk/firefox-98.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4a31daac61e0ac3a729c5299dc5d14046bb2cadec61aad443fa4391a0cc99b3f"; + sha256 = "859bfb3a177429a24e585e6ad11fdf9220d5d0a2751ab861aa33e3e553a3fa2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sl/firefox-98.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8ca7306d8e68d9943ae3dbeffe3da88682c4c22fa9974142b9f609c4c62b06f7"; + sha256 = "e5ba078d2f83df37b8211f8423dc549358b9d1c508a9607d1d5e735501ca9845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/son/firefox-98.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9c5c17a9f85814779f88f320030bc6d935cac0b5b51ec9524283553c36c751c5"; + sha256 = "07f902640b9742954ac03b737fd402d1024e647d4cfc096ceff2ef5329853235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sq/firefox-98.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2c40123f37130de16e47175472086e5774598b5e6090de4d88e67512bf982c43"; + sha256 = "2dc1cdc47fabf4d212745f326dea7ad202527fa8dee9d90908812a3f7b152840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sr/firefox-98.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2ab762afa95e0d0baa3650e35612f4f56f9d4ddd2baa34f615e9fb7bf95353e3"; + sha256 = "d84a3a521ed43b9ce70a6984f6afb35bb02da5b4b9372cfdd47607151dbfdce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sv-SE/firefox-98.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ea00b75128a67638d67ca83ce9f5e15f4afe9eda1903e90cd6f27820117fcac6"; + sha256 = "5c313719484370ac42a46cda464ef5096e866a93d821fd88d8cadc3fe483b8be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/szl/firefox-98.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "88ac139760b68702f33ad02889dacbd31d3c31140f3dff763dcbf6f9e7f6adf8"; + sha256 = "6933fcc3ca447d2c530bc4d5a3fac65351359de13ca8415c17034611d343e4d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ta/firefox-98.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3828cc9dea353d7fb259fd57396ddd59b316fb323caa6b8b47f485a6aad8e1a5"; + sha256 = "a1d11f11350ad8a1aca420774896721a71db6640e78798bd5d0e9563fa215350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/te/firefox-98.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1dba53e1907eac8f76759b2fe0a5499c31c733dcd627193916e6d4ebab27c625"; + sha256 = "a09332149b4d4daf758cc75a0b50c793207e6dfa7f487f04864f8c41e2f7c2c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/th/firefox-98.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "461a11d1a033cf9ef113f0d362484696b29ba6d52e7e14ec4a3015ce55767f01"; + sha256 = "615300bf23c3903079601c5e4d9509bc3a7d5fa1e94a01aff09559f3c2994306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tl/firefox-98.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "572f60b9222c9a008ea23eb0f9c184fff17af4393e887cf2db871a7f86f74b77"; + sha256 = "f323e7204e86b91cce656780e65bfb4166bd0e27d1ba84ede5e8b87ab6c4e122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tr/firefox-98.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bcc59684f7e6c6efa6df66fb2eacec8b1a59f0aa42f8bea86a7e0fd6a29916a2"; + sha256 = "cf36e947181fc7750186b75edb0998df3219097ed94e4617435cff2690f626d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/trs/firefox-98.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d97ea9fcc6ec94e168ddfe219f08fc202013e1cbfdf35e34749569e54f6ae65a"; + sha256 = "137270152321a9922decfbfcad4643ce9d3b127498d91ef7a4d60069d249632e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uk/firefox-98.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "49078902f54f5e0ffbaa93a7a797a7795a1baeb5cb57942afd3c6df38b68683a"; + sha256 = "4571eb45952e27756ba8332cd62673c3cd21d58b85662d6eae7a43afc5aa9613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ur/firefox-98.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "7df5518a9e0f8a82b61bba992bbdb4c3ceb935768d057ffa3602036a921b1754"; + sha256 = "77d60ba1a7bf22d7fb690ec1c22dd35b84b3e59891d07c129335894d3c47e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uz/firefox-98.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6a36b93b799cbaca9a7f5765723c63a1e42c1645bad6ca2e3ee8dad8d64f3c40"; + sha256 = "a716e77dae132d1741366836c9fb59320477f623cef47713e93ff7ea6c712d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/vi/firefox-98.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "da081f083f64ebe61465848358ac018ca4417104ec94911d39f4ea87a858d49e"; + sha256 = "90d8f9ae57521d77e4f9db4166aa7124f4b935f3f1531639058cecd7cf96be36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/xh/firefox-98.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3dd0234d0ae5739290f7236264500c3ead31b6afa9b00cfbf8405e1ca13d1a57"; + sha256 = "ede2ab7f812aeef2f4f07ceac4df1edcdeca35c1b8d1d64053a7250fd781187e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-CN/firefox-98.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e21e6ea94ad72b890c1eca95da2e1ed3f5c3b61ac56216092a7393c072048e4"; + sha256 = "02c61d1b1bb6e966444a800a319eb69fa36ce913614369d0c8f95388e4bdd14d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-TW/firefox-98.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8eefb56597f20a92c839a7e4ccfabfa009de100505982a72c8088a64ecca879"; + sha256 = "5c347fe33e423b8300fd6f2a0a3026896ac6c74af7bbdfead40f72874e65b0c2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d57839b0e4b..cace1829ccc 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -15,7 +15,9 @@ , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , gtk3, wrapGAppsHook +, pkgsCross , debugBuild ? false +, runCommand ### optionals @@ -121,6 +123,15 @@ let }) else stdenv; + # Compile the wasm32 sysroot to build the RLBox Sandbox + # https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ + # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. + wasiSysRoot = runCommand "wasi-sysroot" {} '' + mkdir -p $out/lib/wasm32-wasi + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + ln -s $lib $out/lib/wasm32-wasi + done + ''; in buildStdenv.mkDerivation ({ @@ -213,7 +224,11 @@ buildStdenv.mkDerivation ({ configureScript="$(realpath ./mach) configure" export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - '' + (lib.optionalString googleAPISupport '' + '' + (lib.optionalString (lib.versionAtLeast version "95.0") '' + # RBox WASM Sandboxing + export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc + export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ + '') + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. @@ -258,6 +273,7 @@ buildStdenv.mkDerivation ({ ++ 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" + ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -277,7 +293,6 @@ buildStdenv.mkDerivation ({ ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional (lib.versionAtLeast version "95") "--without-wasm-sandboxed-libraries" ++ extraConfigureFlags; postConfigure = '' @@ -356,6 +371,7 @@ buildStdenv.mkDerivation ({ inherit applicationName; inherit tests; inherit gtk3; + inherit wasiSysRoot; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index bcedf9d22d8..bf1e1e2f4e4 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "97.0.1-1", + "packageVersion": "97.0.2-1", "source": { - "rev": "97.0.1-1", - "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j" + "rev": "97.0.2-1", + "sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m" }, "firefox": { - "version": "97.0.1", - "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c" + "version": "97.0.2", + "sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c" } } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7a5c91130f4..f5a156943c7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - version = "97.0.1"; + version = "98.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; + sha512 = "1434ff775e6cdc6d9a75fa0e6d07a4680ada86ecfd7b65208c597ed765e847d900b68df355e6bea6461f6d86ee7a8b2ce3117f23826ad144bd87dfe64ee39b42"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco lovesegfault hexa ]; + maintainers = with lib.maintainers; [ lovesegfault 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". @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.6.0esr"; + version = "91.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 52fe1ffe2d0..4713320e068 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -105,7 +105,7 @@ let enterprisePolicies = { - policies = lib.optionalAttrs usesNixExtensions { + policies = { DisableAppUpdate = true; } // lib.optionalAttrs usesNixExtensions { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index bf370dd6ec0..00d0bc8f6fd 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.6"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU="; + sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a37278bcc3d..bd7d42777f5 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "83.0.4254.54"; + version = "84.0.4316.31"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k="; + sha256 = "sha256-ypSnarhtJNQn3yOtydjmf6WmHAYbOfMg3xatCxTfIMY="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 7bf3ee9e75b..c79aa1d6f1d 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit patches; - installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Add run-time dependencies to PATH. Append them to PATH so the user can # override the dependencies with their own PATH. 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 21e86a160cf..ce1d41834c3 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.6"; + version = "11.0.7"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz"; + sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx"; + sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 139bfdc965f..fc66f471e4b 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -12,6 +12,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null , commandLineArgs ? "" +, pulseSupport ? stdenv.isLinux, libpulseaudio }: let @@ -19,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.39-1"; + version = "5.1.2567.49-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "140idghryk132nyb8np011xiwzgh518n0fxrkjnnvi3c67shq7qc"; + sha256 = "1cyd789apjh71vzry2zjxb0c215yarfryb9jzxjmkfvrqg4g23xr"; }; unpackPhase = '' @@ -40,7 +41,8 @@ in stdenv.mkDerivation rec { freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo libdrm mesa - ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; + ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs + ++ lib.optional pulseSupport libpulseaudio; libPath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.is64bit) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index a54ccfdf6cc..7df9b6b1e7a 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "21.6.2.817-1"; + version = "22.1.3.856-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-xeZkQzVPPNABxa3/YBLoZl1obbFdzxdqIgLyoA4PN8U="; + sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE="; }; nativeBuildInputs = [ @@ -109,21 +109,22 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' - mkdir -p $TMP/ya $out/bin - cp $src $TMP/ya.deb - ar vx ya.deb + mkdir $TMP/ya/ $out/bin/ -p + ar vx $src tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ ''; installPhase = '' - cp -R $TMP/ya/opt $out/ + cp $TMP/ya/{usr/share,opt} $out/ -R + substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser ''; - runtimeDependencies = [ - libpulseaudio.out - (lib.getLib systemd) - ]; + runtimeDependencies = map lib.getLib [ + libpulseaudio + curl + systemd + ] ++ buildInputs; meta = with lib; { description = "Yandex Web Browser"; @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; - broken = true; + + knownVulnerabilities = [ + '' + Trusts a Russian government issued CA certificate for some websites. + See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. + '' + ]; }; } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 954ce2292ec..3707876fd74 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.2.1"; + version = "2022.3.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U="; + hash = "sha256-iVg+AXSBO+caeYxUR41infCvsCTZkJTf7K0oZnOQmnY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 976ef396acf..503952fa59a 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.2.8"; + version = "3.3.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-A6YI5OGveJj9RRk1fMF3ejYYnMsbjxE34ximtkZUNys="; + sha256 = "sha256-BDHbbb3WqQvRJB1A4NInfvujjB3r/AMmVvos8i/CnyU="; }; - vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8="; + vendorSha256 = "sha256-YeSeaYOkNRjQgxsK9G7iPbVpfrPs4HRRFwfoUDxoCm0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a4b49adb1e2..4667b130e8d 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.0.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm"; + sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; }; - vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc"; + vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index b14c98b4453..786615801ba 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk="; + sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8="; }; - vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE="; + vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 73888f41f92..aad583c675c 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE="; + sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 725cd419d08..03f5ccda400 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -1,56 +1,56 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "driftctl"; - version = "0.20.0"; + version = "0.23.2"; src = fetchFromGitHub { - owner = "cloudskiff"; + owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-8egkz1wXvdNoTkbhOdvoP4hrBPmuiUvd2QaD6tPH2xU="; + sha256 = "sha256-hGwQdR2LF1uuq11d2BD4hVjcXpPCbRNovOqJpj0J1Sw="; }; - vendorSha256 = "sha256-lftOTcob8l9dUZkH2MMxzD6FZzLOR/PXEXFVdOaguK4="; - - 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}/' + vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/snyk/driftctl/pkg/version.version=v${version}" + "-X github.com/snyk/driftctl/build.env=release" + "-X github.com/snyk/driftctl/build.enableUsageReporting=false" + ]; + + postInstall = '' + installShellCompletion --cmd driftctl \ + --bash <($out/bin/driftctl completion bash) \ + --fish <($out/bin/driftctl completion fish) \ + --zsh <($out/bin/driftctl completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/driftctl --help + $out/bin/driftctl version | grep "v${version}" + # check there's no telemetry flag + $out/bin/driftctl --help | grep -vz "telemetry" + + runHook postInstallCheck ''; meta = with lib; { - description = "Tool to track infrastructure drift"; - homepage = "https://github.com/cloudskiff/driftctl"; + homepage = "https://driftctl.com/"; + changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}"; + description = "Detect, track and alert on infrastructure drift"; + longDescription = '' + driftctl is a free and open-source CLI that warns of infrastructure drift + and fills in the missing piece in your DevSecOps toolbox. + ''; license = licenses.asl20; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction jk ]; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index be22e1f534d..d5762d938a3 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.27.2"; - sha256 = "0rdsc9i8mjiwyb6l9sbhxirl4i3b50m6505wwvhxz4y5arzdi1k6"; - manifestsSha256 = "0h966xqjkvrblxd62iph9vwr2h7w1ig943hi5vg0swy4674v3ybf"; + version = "0.27.4"; + sha256 = "06951i332gr17nsbns8mh4kcjilqfw5w95shaznpaksx93f554g0"; + manifestsSha256 = "0fvzh7j3vi5hw8jbw2gisjnn53bffwnp7zm3dwcbv3svwpw7823d"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-xkhbGID+oI7+kLml8CveEet7gtPSty8LGv1gkqpqg6w="; + vendorSha256 = "sha256-7sHLXjyYMWSFckDPeVGJYK+nwhbRpD76tV334PCVYwA="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 9c929ba260e..22e596dabf2 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.14"; + version = "0.6.17"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-4gHwf8zOkCKbOPU4Zq1u4h5vn0r1Vi/B++ERxvr/iuk="; + sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 0e8e652fbb3..adb46540cba 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,29 +1,49 @@ -{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook -, jdk8_headless, jdk11_headless -, bash, coreutils, which -, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk8_headless +, jdk11_headless +, bash +, coreutils +, which +, bzip2 +, cyrus_sasl +, protobuf3_7 +, snappy +, zlib +, zstd , openssl +, glibc +, nixosTests }: with lib; +assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + let - common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }: + common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { inherit pname version jdk libPatches untarDir openssl; src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz"; - inherit sha256; + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + sha256 = sha256.${stdenv.system}; }; + doCheck = true; nativeBuildInputs = [ makeWrapper ] - ++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ]; + ++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; buildInputs = [ openssl ] ++ nativeLibs; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,lib} mv * $out/lib/${untarDir} - + '' + optionalString stdenv.isLinux '' + # All versions need container-executor, but some versions can't use autoPatchelf because of broken SSL versions + patchelf --set-interpreter ${glibc.out}/lib64/ld-linux-x86-64.so.2 $out/lib/${untarDir}/bin/container-executor + '' + '' for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)"\ --set-default JAVA_HOME ${jdk.home}\ @@ -34,6 +54,8 @@ let done '' + libPatches; + passthru = { inherit tests; }; + meta = { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; @@ -51,9 +73,8 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ volth illustris ]; - platforms = [ "x86_64-linux" ]; + platforms = attrNames sha256; }; - }; in { @@ -62,8 +83,13 @@ in hadoop_3_3 = common rec { pname = "hadoop"; version = "3.3.1"; - sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; untarDir = "${pname}-${version}"; + sha256 = rec { + x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; + x86_64-darwin = x86_64-linux; + aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz"; + aarch64-darwin = aarch64-linux; + }; jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library @@ -74,23 +100,28 @@ in ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ + '' + optionalString stdenv.isLinux '' + # libjvm.so for Java >=11 patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 + # Java 8 has libjvm.so at a different path + patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 ''; + tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; version = "3.2.2"; - sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; + sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden - openssl = null; + tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { pname = "hadoop"; version = "2.10.1"; - sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; + sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; jdk = jdk8_headless; - openssl = null; + tests = nixosTests.hadoop2; }; } diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 2f6dcbe0144..127ee9c6895 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lXi778MTeVUBtepGjIkKAX1kDEaaVzQI1gTKfcpANC0="; + sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; }; - vendorSha256 = "sha256-pNevyTibnhUK8LSM1lVnmumFazXK86q4AZ2WKFt5jok="; + vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 42d2e63eaac..408f1bd3ed8 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.8.0"; - gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; + version = "3.8.1"; + gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg="; + sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY="; }; - vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc="; + vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1fde5343d29..2140134d846 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.143.0"; + version = "0.143.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-3Kuj3umyD7fooa4alNJAm7Adu+7EQvoB7Gt/LRjgW94="; + sha256 = "sha256-eV2+lQVLv+bU/CmFFYM7CLjomXblT0XVZH5HVq0S+WM="; }; - vendorSha256 = "sha256-/MbKYPcZ7cOPQKT+nYQaaCiahKLcesrSVKNo8hKFlf0="; + vendorSha256 = "sha256-JHXSEOR/+ON5x0iQgaFsnb9hEDFf5/8TTh4T54qE/HE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index db9028d0af2..da633af2b8f 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-lFuDFuzart7uvs6NGNvNYh7JRF5ROx0V8uYoThF2mIU="; + sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ="; }; - vendorSha256 = "sha256-cVbQUWgreVy5m6OdS+Ik/xvUuedlI75gM9zq4qto+gY="; + vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 3beb8e9c23c..fa355b65131 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,30 +46,30 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.23.3+k3s1"; # k3s git tag - k3sCommit = "6f4217a3405d16a1a51bbb40872d7dcb87207bb9"; # k3s git commit at the above version - k3sRepoSha256 = "sha256-0dRusG1vL+1KbmViIUNCZK1b+FEgV6otcVUyFonHmm4="; - k3sVendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA="; + k3sVersion = "1.23.4+k3s1"; # k3s git tag + k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version + k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc"; + k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4="; - k3sServerVendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0="; + k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.9.1"; - traefikChartSha256 = "sha256-XM1DLofU1zEEFeB5bNQ7cgv102gXsToPP7SFh87QuGQ="; + traefikChartVersion = "10.14.1"; + traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 - k3sRootVersion = "0.9.1"; - k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8"; + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 - k3sCNIVersion = "0.9.1-k3s1"; - k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5"; + k3sCNIVersion = "1.0.1-k3s1"; + k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92"; # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` containerdVersion = "1.5.9-k3s1"; - containerdSha256 = "sha256-7xlhBA6KuwFlw+jyThygv4Ow9F3xjjIUtS6x8YHwjic="; + containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.22.0-k3s1"; diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index eb79778c963..8f199bf9cc0 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -7,7 +7,7 @@ WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ -NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/ +NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ cd ${NIXPKGS_K3S_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index a844f221675..48236cdc25e 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; @@ -21,7 +21,8 @@ buildGoModule rec { preCheck = "export HOME=$(mktemp -d)"; - doCheck = true; + # TODO investigate why some config tests are failing + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index f492bfd6884..93ccd873f77 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo="; + sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index b7a7ab3c5d9..d4a02b6ab9e 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_22 = mkKops rec { - version = "1.22.2"; - sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8="; + version = "1.22.4"; + sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 0a2386d37ce..c7d14748e80 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; + sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; }; - vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw="; + vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix new file mode 100644 index 00000000000..a5ad1ea0a77 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemqctl"; + version = "3.5.1"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "0daqvd1y6b87xvnpdl2k0sa91zdmp48r0pgp6dvnb2l44ml8a4z0"; + }; + + ldflags = [ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # TODO tests are failing + + vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemqctl"; + description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8d11bc28017..e4203f0028a 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.23.4"; + version = "1.23.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; + sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM="; }; nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 8c8a6d92930..74b5578d023 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "22.1.4"; - sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; - vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; + version = "22.2.4"; + sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369"; + vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 9a3a5f3a3d5..48ac2dc983e 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.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs="; + sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY="; }; - vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY="; + vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 047a472c398..1f08aad53e4 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -18,6 +18,8 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; + postPatch = '' substituteInPlace nixops/args.py --subst-var version ''; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 5a121cbd3ec..27c496905e5 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 = "0c989d79c9052ebf52f12964131f4fc31ac20a18"; - sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1"; + rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"; + sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "83900880a413218020ddd91d6cd3f5b823acb3fb"; - sha256 = "17gf4vfcl1vx81y9vk26zzcj6kac41kfhzwcx15cj91ivqrgn3b2"; + rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8"; + sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9"; }; } ); @@ -74,9 +74,9 @@ self: super: { nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49"; - sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc"; + url = "https://github.com/lovesegfault/nixops-libvirtd.git"; + rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350"; + sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index e0118fe7929..fa17d4286b3 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -8,14 +8,14 @@ python-versions = "*" [[package]] name = "apache-libcloud" -version = "3.4.1" +version = "3.5.0" 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.6, <4" [package.dependencies] -requests = ">=2.5.0" +requests = ">=2.26.0" [[package]] name = "babel" @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.20.20" +version = "1.21.18" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.23.20,<1.24.0" +botocore = ">=1.24.18,<1.25.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.23.20" +version = "1.24.18" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.9" +version = "2.0.12" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -181,7 +181,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "jsonpickle" -version = "2.0.0" +version = "2.1.0" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false @@ -189,12 +189,12 @@ 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 = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "enum34", "jsonlib"] "testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] [[package]] name = "libvirt-python" -version = "7.10.0" +version = "8.1.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -202,11 +202,11 @@ python-versions = "*" [[package]] name = "markupsafe" -version = "2.0.1" +version = "2.1.0" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "nixops" @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18" +resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3" [[package]] name = "nixops-aws" @@ -249,7 +249,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "83900880a413218020ddd91d6cd3f5b823acb3fb" +resolved_reference = "bc9de10b77aa74c9b245fd533f829e4307b984e8" [[package]] name = "nixops-digitalocean" @@ -358,14 +358,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -libvirt-python = "^7.0" +libvirt-python = "^8.0" nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "master" -resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49" +url = "https://github.com/lovesegfault/nixops-libvirtd.git" +reference = "update-libvirt" +resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350" [[package]] name = "nixopsvbox" @@ -443,7 +443,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pygments" -version = "2.10.0" +version = "2.11.2" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -451,7 +451,7 @@ python-versions = ">=3.5" [[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -493,7 +493,7 @@ python-versions = "*" [[package]] name = "requests" -version = "2.26.0" +version = "2.27.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -511,7 +511,7 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.5.0" +version = "0.5.2" description = "An Amazon S3 Transfer Manager" category = "main" optional = false @@ -643,7 +643,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.13.2" +version = "2.13.3" description = "Run-time type checker for Python" category = "main" optional = false @@ -663,7 +663,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.7" +version = "1.26.8" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -677,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2" +content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6" [metadata.files] alabaster = [ @@ -685,8 +685,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] apache-libcloud = [ - {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"}, + {file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"}, + {file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"}, - {file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"}, + {file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"}, + {file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"}, ] botocore = [ - {file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"}, - {file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"}, + {file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"}, + {file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -761,8 +761,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, - {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, + {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, + {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -813,82 +813,53 @@ jmespath = [ {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"}, + {file = "jsonpickle-2.1.0-py2.py3-none-any.whl", hash = "sha256:1dee77ddc5d652dfdabc33d33cff9d7e131d428007007da4fd6f7071ae774b0f"}, + {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, ] libvirt-python = [ - {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, + {file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"}, ] markupsafe = [ - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, - {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win32.whl", hash = "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win32.whl", hash = "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win32.whl", hash = "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win32.whl", hash = "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7"}, + {file = "MarkupSafe-2.1.0.tar.gz", hash = "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f"}, ] nixops = [] nixops-aws = [] @@ -918,12 +889,12 @@ pycparser = [ {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"}, + {file = "Pygments-2.11.2-py3-none-any.whl", hash = "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65"}, + {file = "Pygments-2.11.2.tar.gz", hash = "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"}, ] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, @@ -938,12 +909,12 @@ pytz = [ {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, + {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, + {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, ] s3transfer = [ - {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, - {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, + {file = "s3transfer-0.5.2-py3-none-any.whl", hash = "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971"}, + {file = "s3transfer-0.5.2.tar.gz", hash = "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -982,8 +953,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"}, - {file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"}, + {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, + {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -991,6 +962,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, + {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, + {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, ] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 89e6e34c771..acee33da249 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -14,7 +14,10 @@ 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"} +# FIXME: Once #30 lands this can be replaced +# https://github.com/nix-community/nixops-libvirtd/pull/30 +# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" } [tool.poetry.dev-dependencies] sphinx = "^3.1.2" diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 7c97b9eaedb..70c25579079 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.25.0"; + version = "0.25.1"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-woBmYDOOh3AQH0RZJtMCrOfjFBrpMPzv22cVZ2/xHZo="; - aarch64-linux = "sha256-3YUUdOZULjJZqVJP0aO/d1WulXlpwf012NYJ6Mc2qp8="; - x86_64-darwin = "sha256-9lbMyEid4I1fRLkLwGbmrB2OkycnGBPUU5wEdVZoTLo="; - aarch64-darwin = "sha256-Q0ZkQX9FpzEc6WC3mRoYfg9oW3fvLB1/Ksa64TDlSgo="; + x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; + aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; + x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; + aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 3d34a65e292..8dcb08247e3 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo="; + sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4="; }; - vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc="; + vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7876eb1c752..7770f98afe5 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop -, RSupport? true, R +{ lib +, stdenv +, fetchzip +, makeWrapper +, jdk8 +, python3Packages +, extraPythonPackages ? [ ] +, coreutils +, hadoop +, RSupport ? true +, R }: with lib; let - spark = { pname, version, src }: + spark = { pname, version, sha256 }: stdenv.mkDerivation rec { - inherit pname version src; + inherit pname version; + src = fetchzip { + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = sha256; + }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk8 python3Packages.python ] ++ extraPythonPackages @@ -45,31 +58,29 @@ let ''; meta = { - description = "Apache Spark is a fast and general engine for large-scale data processing"; - homepage = "https://spark.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + description = "Apache Spark is a fast and general engine for large-scale data processing"; + homepage = "https://spark.apache.org/"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; repositories.git = "git://git.apache.org/spark.git"; }; }; -in { - spark3 = spark rec { +in +{ + spark_3_2 = spark rec { + pname = "spark"; + version = "3.2.1"; + sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d"; + }; + spark_3_1 = spark rec { pname = "spark"; version = "3.1.2"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; - }; + sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; }; - spark2 = spark rec { + spark_2_4 = spark rec { pname = "spark"; version = "2.4.8"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; - }; + sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; }; } diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8613abd9947..374d9c972c7 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "0.14.2"; - sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI="; - vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk="; - pkgsVersion = "0.9.0-4-gc875fbe"; - extrasVersion = "0.7.0-2-gb4c9d21"; + version = "0.14.3"; + sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; + vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; + pkgsVersion = "v0.9.0-6-gbfcc795"; + extrasVersion = "v0.7.0-2-gb4c9d21"; in buildGoModule rec { pname = "talosctl"; @@ -29,8 +29,8 @@ buildGoModule rec { "-X ${versionPkg}.Name=Talos" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS + "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS + "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS "-X ${imagesPkgs}.Username=talos-systems" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 9f3c046a266..65a37168783 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA="; + sha256 = "sha256-rzKEjLjX2bPqgNGJYdyTuu15+9bq9WnsrJtsBzL/oOo="; }; vendorSha256 = null; @@ -52,10 +52,12 @@ buildGoModule rec { meta = with lib; { homepage = "https://tekton.dev"; changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; - description = "Provides a CLI for interacting with Tekton"; + description = "Provides a CLI for interacting with Tekton - tkn"; longDescription = '' - The Tekton Pipelines cli project provides a CLI for interacting with Tekton! - For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. + The Tekton Pipelines cli project provides a CLI for interacting with + Tekton! For your convenience, it is recommended that you install the + Tekton CLI, tkn, together with the core component of Tekton, Tekton + Pipelines. ''; license = licenses.asl20; maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5a81fd1b6b0..457b9d342cc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,10 +3,10 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.0.0", - "sha256": "1v62lfm9w8d8iq70nwjrry52zxh5ixmxfp0dlmxvck7qjzcng8rg", + "rev": "v2.0.1", + "sha256": "165k2sf4hq84zidlh0y5jmzwnid5gz7slhnb9rgp2771pzqm0gki", "vendorSha256": null, - "version": "2.0.0" + "version": "2.0.1" }, "acme": { "owner": "vancluever", @@ -30,20 +30,20 @@ "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.10.1", - "sha256": "0gbvq5hlibqxch4igicsyfqfbvm9pdz4901ywaabnd80jmsfhv4c", - "vendorSha256": "0rzxfybxdsl99mzr5r5amammpsjv66fiakialfws696mz915zz4k", - "version": "1.10.1" + "rev": "v1.11.0", + "sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd", + "vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb", + "version": "1.11.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.158.0", - "sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr", - "vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0", - "version": "1.158.0" + "rev": "v1.160.0", + "sha256": "sha256-ijSOvBS8bcFKX0qa2Cl/xqDdwduamVdCWzgTCWao1Sg=", + "vendorSha256": "sha256-oKaghX3u8H9vDFvmo+jelTIbvuHnAt27Z9N0oEWxcxc=", + "version": "1.160.0" }, "ansible": { "owner": "nbering", @@ -85,37 +85,37 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.21.0-6.6.ga", - "sha256": "0svims34vw8xplza77flp675r90rsh9gj8cb5c02knnh4lgf7ffv", + "rev": "v2.21.1-6.6.ga", + "sha256": "16ym9zyvvz7kb44rm97wqa7h431jkh70q3gf68mmxihvxpjvfcdh", "vendorSha256": null, - "version": "2.21.0-6.6.ga" + "version": "2.21.1-6.6.ga" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.2.0", - "sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f", - "vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb", - "version": "4.2.0" + "rev": "v4.5.0", + "sha256": "sha256-L1LRuinU3YrqywRGpmUqGQgjZ1JuYhECjCN6ysYPzco=", + "vendorSha256": "sha256-3akEup/M7Zc5MPf2XA+324PxQiHegIwzR05JNSjYanw=", + "version": "4.5.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.18.0", - "sha256": "06l4w9g4p48gnb9c9mmnydvpyr89f8rijpf103ndsg6ack6k4mg2", + "rev": "v2.19.1", + "sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=", "vendorSha256": null, - "version": "2.18.0" + "version": "2.19.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.98.0", - "sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6", + "rev": "v2.99.0", + "sha256": "sha256-HXLr22UVciRvW1iaa46sy37ivG41hKqhrQtCXpnl8ss=", "vendorSha256": null, - "version": "2.98.0" + "version": "2.99.0" }, "azurestack": { "owner": "hashicorp", @@ -139,19 +139,19 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.12.2", - "sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg", + "rev": "v1.13.0", + "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv", "vendorSha256": null, - "version": "1.12.2" + "version": "1.13.0" }, "bitbucket": { "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.4.1", - "sha256": "07y0biab2g6plkyp8scqf7b12alijnxq2zqqr05lbm6wgrc22kvk", - "vendorSha256": null, - "version": "2.4.1" + "rev": "v2.8.0", + "sha256": "sha256-W+mAud3DpBViLeFwXLWIwZ1+TOco8FWZnVrIbHUwgIU=", + "vendorSha256": "sha256-hSMVLDZXC9QMpcgREjEUjhxArtotrIrIyfdNIZw8uM4=", + "version": "2.8.0" }, "brightbox": { "owner": "brightbox", @@ -166,10 +166,10 @@ "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.1", - "sha256": "15biy4gm8lwmqm1s5rjr0d77vy4mgyjwaa3wydrna1655w3rgkr6", - "vendorSha256": "0pjxrdpsn99g6hjp0flrk7czjb05ibnsjcggrvvpwzrbj55rqzgd", - "version": "1.4.1" + "rev": "v1.4.3", + "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", + "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", + "version": "1.4.3" }, "checkpoint": { "deleteVendor": true, @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.9.1", - "sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2", - "vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l", - "version": "3.9.1" + "rev": "v3.10.1", + "sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=", + "vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=", + "version": "3.10.1" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -230,10 +230,10 @@ "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.0", - "sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw", + "rev": "v0.4.1", + "sha256": "15myw5ff22wi4cykwc2plghmfwl6d6m9pfskjqiwq8hffv35h50v", "vendorSha256": null, - "version": "0.4.0" + "version": "0.4.1" }, "consul": { "owner": "hashicorp", @@ -257,10 +257,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.8.1", - "sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh", - "vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz", - "version": "3.8.1" + "rev": "v3.9.0", + "sha256": "sha256-CncMqWIa1JiHkIkNAgIQl4fcKZVKZGD4BZSjuv5cw18=", + "vendorSha256": "sha256-U1gVP4o1mj21NW9z8jyV5KhuJNJRYAV1Qvg1fV1zGO4=", + "version": "3.9.0" }, "dhall": { "owner": "awakesecurity", @@ -275,10 +275,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.17.1", - "sha256": "0dfw4sjmsfzrs28gf5k4vqjs6phwa6w3pwi7fpbngnw6l2r4m6h9", + "rev": "v2.18.0", + "sha256": "sha256-MuJpBLOB8AeAlNhQC+rwT6mkZriU4+XgAqQY33xjFck=", "vendorSha256": null, - "version": "2.17.1" + "version": "2.18.0" }, "dme": { "owner": "DNSMadeEasy", @@ -329,19 +329,19 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0-beta.4", - "sha256": "0ypw916sziy8dhvbv96f7d4as08ps18xxx8h6ip69mk74vf029sm", - "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", - "version": "2.0.0-beta.4" + "rev": "v2.0.0", + "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", + "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", + "version": "2.0.0" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.31.2", - "sha256": "1fncpy8vc72g6h560mnkwm160wah8iik4bn12mjgbz3nvjlsm04x", + "rev": "v0.33.0", + "sha256": "sha256-mih0Bo6fcNgpyeCQ+GWSPyTrPlGzmBXkEO43TOVWMds=", "vendorSha256": null, - "version": "0.31.2" + "version": "0.33.0" }, "external": { "owner": "hashicorp", @@ -356,19 +356,19 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.0", - "sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf", + "rev": "v1.1.2", + "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", "vendorSha256": null, - "version": "1.1.0" + "version": "1.1.2" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.27.0", - "sha256": "0xc0a1gzdld039b4vlivf9b8g3pjja6pfzyqhjx0iy01akm1a9cc", + "rev": "v1.27.1", + "sha256": "0glfs1hq9v3jdga8vvjrybld4g6qmyhy4kayapccbmdnbx9rpg76", "vendorSha256": null, - "version": "1.27.0" + "version": "1.27.1" }, "fortios": { "owner": "fortinetdev", @@ -392,39 +392,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.20.0", - "sha256": "0cibbzj3nj5dgi2mcr93bdxwvb7r2qscwshjbssbc7avwvhh3171", + "rev": "v4.21.0", + "sha256": "sha256-ayL22zlfZkGL/ycyQX384g7CjFHDgK8k010kg1fI4h4=", "vendorSha256": null, - "version": "4.20.0" + "version": "4.21.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.10.0", - "sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql", - "vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj", - "version": "3.10.0" + "rev": "v3.12.0", + "sha256": "sha256-6CrM2Pt4yB0ZaXvcgUPreIhJrUhXCNt/xt+fExzGJqc=", + "vendorSha256": "sha256-78/7+t75xFjLt1JfoVpHVPlM7q5BX+NI/I9ugfjdv+g=", + "version": "3.12.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.11.0", - "sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm", - "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", - "version": "4.11.0" + "rev": "v4.13.0", + "sha256": "sha256-QSHlnvsWmkdUE7dd6HqzYtyYC+XDW69dIp/h7u1jD9g=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.11.0", - "sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy", - "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", - "version": "4.11.0" + "rev": "v4.13.0", + "sha256": "sha256-jjYUijzUgIiSC9eL6rbgtuBSh6bbHLjeifN+GIndrVs=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "grafana": { "owner": "grafana", @@ -484,10 +484,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.33.0", - "sha256": "07m2kzx4m9gn9j5czlfdsq0a1ki8vfwlywrfgz2jxvz2cqnn4gsx", + "rev": "v1.34.1", + "sha256": "14dxnphzg53qc9jxp5gr4vv0gj9j9i36zdyxh9ffcpcv4y3v9lkj", "vendorSha256": null, - "version": "1.33.0" + "version": "1.34.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -511,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.39.0-beta0", - "sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1", - "vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5", - "version": "1.39.0-beta0" + "rev": "v1.39.2", + "sha256": "sha256-9r0tt0N3m/IYq/9oepQ4DcB78ds8pb1up1TyjFYzX1U=", + "vendorSha256": "sha256-8qgm1zDdwKNE/bs1n5cpY/DUD3SKtFmnvEgwtKorASk=", + "version": "1.39.2" }, "icinga2": { "owner": "Icinga", @@ -565,10 +565,10 @@ "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.41", - "sha256": "0p8fl7dkp2nfw73ij769svm83cpvi1rw3aykf0qx33n9si78m892", - "vendorSha256": "1pm4kld23mvgs14z54fpfdvnj0alm8frkkmf0851hi58nazc54dq", - "version": "1.3.41" + "rev": "v1.3.42", + "sha256": "sha256-wj4o2XSz8ylZJdseIi/TadlhOwFWZ6nfDOUezbeGYw4=", + "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", + "version": "1.3.42" }, "kubectl": { "owner": "gavinbunney", @@ -610,10 +610,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.2", - "sha256": "18w9x80zary64873d1r824g28l5dhkda1qq0lr895afwh8g11dfp", - "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", - "version": "1.25.2" + "rev": "v1.26.1", + "sha256": "sha256-bd0raIIh/VmTlSVYnNd98fpppRKnO46g8FI5OwZPjMg=", + "vendorSha256": "sha256-SCTWvTgJ0QYh2DEbTI9coa3Fp4fBHusytF+JFzAq2XA=", + "version": "1.26.1" }, "linuxbox": { "owner": "numtide", @@ -628,10 +628,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.1.0", - "sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.2.2", + "sha256": "sha256-JpTdRi9EagrnhYnlq6sl6+t4SE6i7T7YrGTsYCDync8=", + "vendorSha256": "sha256-Ha/MGbXwwhbVxaHbkU2xBhyNcDxLivk7vYQjfVzWOcY=", + "version": "2.2.2" }, "logicmonitor": { "deleteVendor": true, @@ -719,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.37.0", - "sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9", - "vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz", - "version": "2.37.0" + "rev": "v2.39.2", + "sha256": "sha256-NfszsBliZAjY52kPWB7yhOEYZB2V4yOp6IDffF7EG6k=", + "vendorSha256": "sha256-DD6zXX7anks5jRw9tn8lUvgJY4k81oGSQr0a/xofkGk=", + "version": "2.39.2" }, "nomad": { "owner": "hashicorp", @@ -771,22 +771,22 @@ "version": "1.3.0" }, "oci": { - "owner": "terraform-providers", - "provider-source-address": "registry.terraform.io/hashicorp/oci", + "owner": "oracle", + "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.65.0", - "sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq", + "rev": "v4.68.0", + "sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=", "vendorSha256": null, - "version": "4.65.0" + "version": "4.68.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.21.0", - "sha256": "1j1nvg0qj8xaqnbwlrnhpy73032zc1ik78c0q1iq7xa2gs833qya", - "vendorSha256": "0l0di6cmm41z7i4d498xxc8wcrbg6r9w4vcdksqhz92s1gqs3f4z", - "version": "3.21.0" + "rev": "v3.22.1", + "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", + "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", + "version": "3.22.1" }, "oktaasa": { "owner": "oktadeveloper", @@ -811,10 +811,10 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.1", - "sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m", - "vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15", - "version": "0.4.1" + "rev": "v0.4.2", + "sha256": "sha256-h2trcyXJcdWQyonjdDLkJkcawE4AoFYnzLZtKPotMY0=", + "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", + "version": "0.4.2" }, "openstack": { "owner": "terraform-provider-openstack", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.6", - "sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm", - "vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m", - "version": "1.27.6" + "rev": "v1.27.7", + "sha256": "sha256-8y++zfxRam4sZvGWajyGiPv/5G8K7D4+ReNU7DBlqe8=", + "vendorSha256": "sha256-OqN+QGclKYo4jjQi0HJ/80zVTPkcOQyl4n6i2BpDZQE=", + "version": "1.27.7" }, "opsgenie": { "owner": "opsgenie", @@ -991,10 +991,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.8.1", - "sha256": "094a3avlvaacw8g45ll17x1wrch47m5bvj548rvmz77pdbhpzvr5", - "vendorSha256": "12c1lhyrl3bwnkvp4qw9wxawy54x3k86vh1dnnvf5n8916pvwcw0", - "version": "6.8.1" + "rev": "v6.10.0", + "sha256": "sha256-ZfNxab95ZDz68fEPfYd+w0E/fS/FPBVIs4kHTBhG858=", + "vendorSha256": "sha256-bX01PcLLpgWFMWxWPaUW8iEHxllqCmIX1/OIicB/h0M=", + "version": "6.10.0" }, "skytap": { "owner": "skytap", @@ -1005,6 +1005,15 @@ "vendorSha256": null, "version": "0.14.5" }, + "snowflake": { + "owner": "chanzuckerberg", + "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", + "repo": "terraform-provider-snowflake", + "rev": "v0.25.36", + "sha256": "sha256-AeIQfdn68EnSj2BXZIsC0+L3EJ6tRHLD0NYHdPcf89w=", + "vendorSha256": "sha256-oYjoTZ79ricoFZTokiFcCKNXAeqFvW4RIMQmTp763gE=", + "version": "0.25.36" + }, "sops": { "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops", @@ -1018,10 +1027,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.68.0", - "sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399", - "vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm", - "version": "1.68.0" + "rev": "v1.69.0", + "sha256": "sha256-pTQvqjh52B9w383yLvhNjDujSgQI1k8WpA1vpcY7RKI=", + "vendorSha256": "sha256-X7K0eHbmGBYnJ5ovnD/y6O9r7TTHgK7f7s9w4R5ThBU=", + "version": "1.69.0" }, "stackpath": { "owner": "stackpath", @@ -1036,10 +1045,10 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v1.0.1", - "sha256": "16pwsna1bkrdppxn2vjgbx552vsg4f2igykcb26mw3vp6n9piwfl", - "vendorSha256": null, - "version": "1.0.1" + "rev": "v2.0.0-pre", + "sha256": "sha256-S9VJRGREoRJPIb9gv822Y/8ZRa0x7WoPjU7BxLlRpOM=", + "vendorSha256": "sha256-wKrbjxRCDk8GFAR0OFz4w9UnkIXH9EO/S+p2RKNLJaM=", + "version": "2.0.0-pre" }, "sumologic": { "owner": "SumoLogic", @@ -1063,10 +1072,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.13", - "sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s", + "rev": "v1.65.0", + "sha256": "sha256-NpKZ4KbEDxCYmG2E4F/bHEUmK6invkcIaNkXDZjhmDI=", "vendorSha256": null, - "version": "1.61.13" + "version": "1.65.0" }, "tfe": { "owner": "hashicorp", @@ -1191,10 +1200,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.0.2", - "sha256": "0ncl2vs6gcx9wm710hg575hqinkg45ds73n209xwdbpxlbv8qb7m", + "rev": "v2.1.1", + "sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=", "vendorSha256": null, - "version": "2.0.2" + "version": "2.1.1" }, "vultr": { "owner": "vultr", @@ -1209,18 +1218,18 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.0", - "sha256": "1awi74b7ny021krck0vp1gv6v93a4h0rgdl5xib82lf5pxnx4wgn", - "vendorSha256": "0gbwj4cqywip22irkx9hyghy6zx9dirm6gd3i70nclchvkg9dm1x", - "version": "3.0.0" + "rev": "v3.0.1", + "sha256": "sha256-6SQjYaN0yhcHdmM+vGvIDPHKxN34ns3Yz+CMTEo13s0=", + "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", + "version": "3.0.1" }, "yandex": { "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.71.0", - "sha256": "1ccfmn6j96jy6hhqijjas31ylsmhs1gj8367v3b94mgam7p1pxcd", - "vendorSha256": "16cdg3j00dkmddxgb94as49470a67nv8linfm6s9vrx3xvjk04xw", - "version": "0.71.0" + "rev": "v0.72.0", + "sha256": "0sjwyaqb7rgmwpskw95gmb5k0bfj06f9s8kn76rk1hc8rdqrl251", + "vendorSha256": "1bh7sc210n3rzq5065qzch8pfq3ppcg6fhy7yha23xaa5j8yabqx", + "version": "0.72.0" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 57e1ab32f08..d7a05cf24a6 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -5,7 +5,7 @@ # Update all providers which have specified provider source address set -euo pipefail -providers=$( +readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] @@ -13,10 +13,13 @@ providers=$( | .alias' providers.json ) -echo "Will update providers:" -echo "${providers}" +cat <<EOF +Will update ${#providers[@]} providers: -for provider in ${providers}; do - echo "Updating ${provider}" +${providers[*]} + +EOF + +for provider in "${providers[@]}"; do ./update-provider "$@" "${provider}" done diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 255e82aee1d..4310fcdcc27 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch # shellcheck shell=bash # vim: ft=sh # @@ -75,45 +75,46 @@ if [[ -z ${provider} ]]; then exit 1 fi -provider_name=$(basename "${provider}") - # Usage: read_attr <key> read_attr() { - jq -r ".\"${provider_name}\".\"$1\"" providers.json + jq -r ".\"${provider}\".\"$1\"" providers.json } # Usage: update_attr <key> <value> update_attr() { if [[ $2 == "null" ]]; then - jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = null" providers.json | sponge providers.json else - jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = \"$2\"" providers.json | sponge providers.json fi } -prefetch_github() { - # of a given owner, repo and rev, fetch the tarball and return the output of - # `nix-prefetch-url` - local owner=$1 - local repo=$2 - local rev=$3 - nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz" +repo_root=$(git rev-parse --show-toplevel) + +generate_hash() { + nix-prefetch -I nixpkgs="${repo_root}" \ + "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { $2 = sha256; })" } -old_source_address="$(read_attr provider-source-address)" -old_vendor_sha256=$(read_attr vendorSha256) -old_version=$(read_attr version) +echo_provider() { + echo "== terraform-providers.${provider}: $* ==" +} if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then + echo_provider "init" source_address=registry.terraform.io/${provider} + provider=$(basename "${provider}") + update_attr "provider-source-address" "${source_address}" + update_attr version "0" + # create empty stings so nix-prefetch works + update_attr sha256 "" + update_attr vendorSha256 "" else - source_address=${old_source_address} -fi -if [[ ${source_address} == "null" ]]; then - echo "Could not find the source address for provider: ${provider}" - exit 1 + source_address="$(read_attr provider-source-address)" fi -update_attr "provider-source-address" "${source_address}" + +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) # The provider source address (used inside Terraform `required_providers` block) is # used to compute the registry API endpoint @@ -125,8 +126,10 @@ registry_response=$(curl -s https://"${source_address/\///v1/providers/}") version="$(jq -r '.version' <<<"${registry_response}")" if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then - echo "${provider_name} is already at version ${version}" + echo_provider "already at version ${version}" exit +else + echo_provider "updating from ${old_version} to ${version}" fi update_attr version "${version}" @@ -138,28 +141,23 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" rev="$(jq -r '.tag' <<<"${registry_response}")" update_attr rev "${rev}" -sha256=$(prefetch_github "${org}" "${repo}" "${rev}") +echo_provider "calculating sha256" +sha256=$(generate_hash src outputHash) update_attr sha256 "${sha256}" if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} ]]; then - echo "=== Calculating vendorSha256 ===" - vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") - # Deal with nix unstable - if [[ ${vendorSha256} == sha256-* ]]; then - vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}") - fi + else + echo_provider "calculating vendorSha256" + vendorSha256=$(generate_hash go-modules vendorSha256) fi fi -if [[ -n ${vendorSha256} ]]; then - update_attr vendorSha256 "${vendorSha256}" -fi +update_attr vendorSha256 "${vendorSha256}" # Check that the provider builds if [[ ${build} == 1 ]]; then - echo "=== Building terraform-providers.${provider_name} ===" - nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}" + echo_provider "building" + nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3954a143e5b..897acd76237 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.6"; - sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; - vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; + version = "1.1.7"; + sha256 = "sha256-E8qY17MSdA7fQW4wGSDiPzbndBP5SZwelAJAWzka/io="; + vendorSha256 = "sha256-lyy/hcr00ix6qZoxzSfCbXvDC8dRB2ZjrONywpqbVZ8="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index f8473481cc0..3e872c27142 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1201"; + version = "0.13.1218"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o="; + sha256 = "sha256-RJdbNXO+6TqFLapWiZ1UeXGS5522ykQvhhNDEHPr8xE="; }; - vendorSha256 = "sha256-z3UDrwlMHFFH56U3oylSWE3wqWOCA4RI2smafHHwYkQ="; + vendorSha256 = "sha256-Xqgki072Iy+snRriPVJ9oaDNJ/LiKL+AuU+eVw0zlDU="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 560e593ba19..5f669a6b9d8 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,13 +1,13 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { pname = "tgswitch"; - version = "0.5.382"; + version = "0.5.389"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "sha256-DbPf1o1XlXLpuYSrNMRwHRqi/urQhSfzPW5BPIvZC/Y="; + sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; }; goPackagePath = "github.com/warrensbox/tgswitch"; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 47392ea83a5..1bd10c28acd 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.25.1"; + version = "0.25.3"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU="; + sha256 = "sha256-YB2oKyO+pJSzx/ZgPFhP8+5auKxX/4sQyv1qW9B5PGg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index b41e443ba32..7f1476d7fbf 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU="; + sha256 = "sha256-kY12bsZyDb36KE2dWx6RVYlKTbJh+XFQcBpFXoCLgEM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index e0042e43efb..88c3a31fd2d 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40="; + sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index e238e181ded..c55ccfa02fa 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.71"; + version = "1.2.77"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-bDaxxeHeswuoEU7YACa3tU80DFnmuFvEPfAq+pANSWY="; + sha256 = "sha256-JmadwNERjexnJN+fBUjgMkvPtAaTbb7GITPsZlx2vik="; }; - vendorSha256 = "sha256-75uCGxW6Gqfhk5oImz26fUR8BeGHkikXHGJcCH32MxQ="; + vendorSha256 = "sha256-IPQiS1GgNP+k/INv3f3VitoHActC3MrRys905nTSXyI="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 57a791d9db4..9c0fda32ace 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -5,12 +5,12 @@ let pname = "cozydrive"; - version = "3.30.1"; + version = "3.32.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs"; + sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a"; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8b6a5e2cc25..c6ada11d356 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU="; + sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM="; }; - vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ="; + vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 9b173e85682..633c1e744bb 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -11,6 +11,7 @@ , wrapGAppsHook , glib +, glib-networking , gtk3 , libhandy , listparser ? callPackage ./listparser.nix { } @@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + glib-networking gtk3 libhandy webkitgtk diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6c3a9b76935..f4a2306017a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,15 +1,18 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.18"; + version = "3.3.3"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; + hash = "sha256-a76x4Klad3lct2M9RxSroUYKmEX7lPqDN+dFvfjavo8="; }; postPatch = '' @@ -18,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + sed 's/[>=]=.*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 764ba6a0d79..ebed984c4d5 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.37.0"; + version = "8.40.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U="; + sha256 = "sha256-meiIDIG7OXxF2aclHA/8FN8aSz5KWJliDbm2p/flD4k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 4c8f356cdf4..940d0b6b92b 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.6.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4f19fd924e7..d3416ef5880 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,8 +3,8 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.17"; - ptb = "0.0.27"; - canary = "0.0.133"; + ptb = "0.0.29"; + canary = "0.0.134"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -26,12 +26,12 @@ let ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a"; + sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; }; }; x86_64-darwin = { 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 ac0869e5cdc..984a9cb501d 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.4", + "version": "1.10.7", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,7 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^15.3.5", + "electron": "^17", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 27dbb16f088..f75dfc66ca9 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.4", - "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=", - "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar", - "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l" + "version": "1.10.7", + "desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=", + "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", + "webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1" } diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 92e39f091b1..0a44a37cf4b 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.7.0"; + version = "5.8.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; + sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 99aef1526d5..565c44f72e9 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -25,7 +25,7 @@ flutter.mkFlutterApp rec { icon = "fluffychat"; desktopName = "Fluffychat"; genericName = "Chat with your friends (matrix client)"; - categories = "Chat;Network;InstantMessaging;"; + categories = [ "Chat" "Network" "InstantMessaging" ]; }; buildInputs = [ @@ -49,7 +49,7 @@ flutter.mkFlutterApp rec { # replace olm dummy path postConfigure = '' - M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*) ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so ''; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index f35db8e3a11..bfe11b27218 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { setuptools watchgod dbus-python + matrix-nio ]; qmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index 6de6922913f..a8e73ad1098 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -8,6 +8,7 @@ , kconfig , kdbusaddons , ki18n +, kio , kirigami2 , kitemmodels , knotifications @@ -16,23 +17,25 @@ , libquotient , libsecret , olm +, qcoro , qqc2-desktop-style , qtgraphicaleffects , qtkeychain , qtmultimedia , qtquickcontrols2 +, sonnet }: mkDerivation rec { pname = "neochat"; - version = "1.2"; + version = "22.02"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; + sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; @@ -41,6 +44,7 @@ mkDerivation rec { cmark kconfig kdbusaddons + kio ki18n kirigami2 kitemmodels @@ -50,11 +54,13 @@ mkDerivation rec { libquotient libsecret olm + qcoro qtgraphicaleffects qtkeychain qtmultimedia qtquickcontrols2 qqc2-desktop-style + sonnet ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index bee1f7cf289..080ceda94b4 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, asciidoc , cmark , lmdb , lmdbxx @@ -32,19 +33,20 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM="; + sha256 = "sha256-roC1OIq0Vmj5rABNtH4IOMHX9aSlOMFC7ZHueuj/PmE="; }; nativeBuildInputs = [ lmdbxx cmake pkg-config + asciidoc ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b264608f510..3f6d374c399 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "qtox"; - version = "1.17.4"; + version = "1.17.6"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "sha256-j1aAry4wjb4RResdu8PQzyVazvVxnxvZMoC59sO0frw="; + sha256 = "sha256-naKWoodSMw0AEtACvkASFmw9t0H0d2pcqOW79NNTYF0="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index b5c558e7702..ac17f759088 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.7.7"; + version = "3.7.8"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY="; + sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index c8f5f30daaf..d227dc4b0fb 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,7 +1,9 @@ { - "version": "1.10.3-sc.0.test.1", - "rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd", - "srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3", - "webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf", + "version": "1.10.4-sc.1", + "rev": "v1.10.4-sc.1", + "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", + "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", + "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", + "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index c3860c9f05c..f9e00c06470 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -25,10 +25,18 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - offlineCache = fetchYarnDeps { + webOfflineCache = fetchYarnDeps { yarnLock = src + "/element-web/yarn.lock"; sha256 = pinData.webYarnHash; }; + jsSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-js-sdk/yarn.lock"; + sha256 = pinData.jsSdkYarnHash; + }; + reactSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-react-sdk/yarn.lock"; + sha256 = pinData.reactSdkYarnHash; + }; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; @@ -37,14 +45,30 @@ in stdenv.mkDerivation rec { export HOME=$PWD/tmp mkdir -p $HOME + pushd element-web - yarn config --offline set yarn-offline-mirror $offlineCache fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $webOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules rm -rf node_modules/matrix-react-sdk - patchShebangs node_modules/ ../matrix-react-sdk/scripts/ ln -s $PWD/../matrix-react-sdk node_modules/ - ln -s $PWD/node_modules ../matrix-react-sdk/ + rm -rf node_modules/matrix-js-sdk + ln -s $PWD/../matrix-js-sdk node_modules/ + popd + + pushd matrix-js-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + popd + + pushd matrix-react-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules scripts popd runHook postConfigure @@ -54,7 +78,7 @@ in stdenv.mkDerivation rec { runHook preBuild pushd matrix-react-sdk - node_modules/.bin/reskindex -h ../element-web/src/header + ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header popd pushd element-web diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 7abc0f3322b..6ddc99902c3 100755 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -27,6 +27,8 @@ src_hash=$(echo $src_data | jq -r .sha256) web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) +js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) +react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) cat > pin.json << EOF { @@ -34,6 +36,8 @@ cat > pin.json << EOF "rev": "$rev", "srcHash": "$src_hash", "webYarnHash": "$web_yarn_hash", + "jsSdkYarnHash": "$js_sdk_yarn_hash", + "reactSdkYarnHash": "$react_sdk_yarn_hash", "desktopYarnHash": "$desktop_yarn_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8af5185386c..99ee871c917 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: -, systemd, libnotify, libdbusmenu, libpulseaudio +, systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.31.1"; # Please backport all updates to the stable channel. + version = "5.35.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,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 = "sha256-6w6znIIN5TFXTLLhazWyBXiqS5882zMNRZxYxnZjRHA="; + sha256 = "sha256-2KF2OLq6/vHElgloxn+kgQisJC+HAkpOBfsKfEPW35c="; }; nativeBuildInputs = [ @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { (lib.getLib systemd) libnotify libdbusmenu + xdg-utils ]; unpackPhase = "dpkg-deb -x $src ."; @@ -123,6 +124,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) # Fix the desktop link @@ -145,7 +147,7 @@ in stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; + maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 9edc952cd6e..f03a91faa23 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220227"; + version = "20220316"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-TpemAMBh3XN71C4vYr9TmKBw2W5esgtL2dKLHN4sQd8="; + sha256 = "sha256-c9eqY3KBzCrNOLNf1DGpARmxGzwga3+tBg3e7Yr+Rb8="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 4fc3d56bacc..b23f4f107ae 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.80.0.143"; + version = "8.81.0.268"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY="; + sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ca6cc55d65a..80d04eabc82 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395 ]; desktopItem = makeDesktopItem { 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 cb4f3e5e5d1..ce5dc0e266e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,53 +1,231 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook -, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk -# Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, libepoxy -, at-spi2-core, libXtst, libthai, libdatrie +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, pkg-config +, cmake +, ninja +, clang +, python3 +, wrapGAppsHook +, wrapQtAppsHook +, removeReferencesTo +, extra-cmake-modules +, qtbase +, qtimageformats +, qtsvg +, kwayland +, lz4 +, xxHash +, ffmpeg +, openalSoft +, minizip +, libopus +, alsa-lib +, libpulseaudio +, range-v3 +, tl-expected +, hunspell +, glibmm +, webkitgtk +, jemalloc +, rnnoise +, abseil-cpp +, microsoft_gsl +, wayland +, libicns +, Cocoa +, CoreFoundation +, CoreServices +, CoreText +, CoreGraphics +, CoreMedia +, OpenGL +, AudioUnit +, ApplicationServices +, Foundation +, AGL +, Security +, SystemConfiguration +, Carbon +, AudioToolbox +, VideoToolbox +, VideoDecodeAcceleration +, AVFoundation +, CoreAudio +, CoreVideo +, CoreMediaIO +, QuartzCore +, AppKit +, CoreWLAN +, WebKit +, IOKit +, GSS +, MediaPlayer +, IOSurface +, Metal +, MetalKit +, withWebKit ? false }: with lib; let - tg_owt = callPackage ./tg_owt.nix {}; -in mkDerivation rec { + tg_owt = callPackage ./tg_owt.nix { + abseil-cpp = (abseil-cpp.override { + # abseil-cpp should use the same compiler + inherit stdenv; + cxxStandard = "20"; + }).overrideAttrs (_: { + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; + }); + + # tg_owt should use the same compiler + inherit stdenv; + + inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox + CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices; + }; +in +stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.1"; + version = "1.4.9"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "07z56gz3sk45n5j0gw9p9mxrbwixxsmp7lvqc6lqnxmglz6knc1d"; + sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; fetchSubmodules = true; }; - postPatch = '' + patches = [ + ./shortcuts-binary-path.patch + # let it build with nixpkgs 10.12 sdk + ./kotato-10.12-sdk.patch + ]; + + postPatch = optionalString stdenv.isLinux '' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ + --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + '' + optionalString (stdenv.isLinux && withWebKit) '' + substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ + --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + '' + optionalString stdenv.isDarwin '' substituteInPlace Telegram/CMakeLists.txt \ - --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' + --replace 'COMMAND iconutil' 'COMMAND png2icns' \ + --replace '--convert icns' "" \ + --replace '--output AppIcon.icns' 'AppIcon.icns' \ + --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" ''; # We want to run wrapProgram manually (with additional parameters) - dontWrapGApps = true; - dontWrapQtApps = true; + dontWrapGApps = stdenv.isLinux; + dontWrapQtApps = stdenv.isLinux && withWebKit; - nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + cmake + ninja + python3 + wrapQtAppsHook + removeReferencesTo + ] ++ optionals stdenv.isLinux [ + # to build bundled libdispatch + clang + extra-cmake-modules + ] ++ optionals (stdenv.isLinux && withWebKit) [ + wrapGAppsHook + ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk + qtbase + qtimageformats + qtsvg + lz4 + xxHash + ffmpeg + openalSoft + minizip + libopus + range-v3 + tl-expected + rnnoise tg_owt - # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy - at-spi2-core libXtst libthai libdatrie + microsoft_gsl + ] ++ optionals stdenv.isLinux [ + kwayland + alsa-lib + libpulseaudio + hunspell + glibmm + jemalloc + wayland + ] ++ optionals (stdenv.isLinux && withWebKit) [ + webkitgtk + ] ++ optionals stdenv.isDarwin [ + Cocoa + CoreFoundation + CoreServices + CoreText + CoreGraphics + CoreMedia + OpenGL + AudioUnit + ApplicationServices + Foundation + AGL + Security + SystemConfiguration + Carbon + AudioToolbox + VideoToolbox + VideoDecodeAcceleration + AVFoundation + CoreAudio + CoreVideo + CoreMediaIO + QuartzCore + AppKit + CoreWLAN + WebKit + IOKit + GSS + MediaPlayer + IOSurface + Metal + libicns ]; - cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" ]; + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DTDESKTOP_API_TEST=ON" + "-DDESKTOP_APP_QT6=OFF" + ]; + + installPhase = optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r Kotatogram.app $out/Applications + ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin + ''; + + preFixup = '' + binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} + remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName + remove-references-to -t ${microsoft_gsl} $out/bin/$binName + remove-references-to -t ${tg_owt.dev} $out/bin/$binName + ''; - postFixup = '' + postFixup = optionalString (stdenv.isLinux && withWebKit) '' # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/kotatogram-desktop \ "''${gappsWrapperArgs[@]}" \ @@ -66,9 +244,9 @@ in mkDerivation rec { It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes ''; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; homepage = "https://kotatogram.github.io"; - changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{ver}"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch new file mode 100644 index 00000000000..d603c967cfd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch @@ -0,0 +1,415 @@ +diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm +index 337055443..09604b117 100644 +--- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm +@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #include <Cocoa/Cocoa.h> + #include <CoreFoundation/CFURL.h> ++#undef check + + namespace Platform { + namespace { +diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm +index 3b4395ae3..7f8ee401f 100644 +--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm +@@ -119,6 +119,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { + switch (type) { + case PermissionType::Microphone: + case PermissionType::Camera: ++#if 0 + const auto nativeType = (type == PermissionType::Microphone) + ? AVMediaTypeAudio + : AVMediaTypeVideo; +@@ -133,6 +134,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { + return PermissionStatus::Denied; + } + } ++#endif + break; + } + return PermissionStatus::Granted; +@@ -142,6 +144,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal + switch (type) { + case PermissionType::Microphone: + case PermissionType::Camera: ++#if 0 + const auto nativeType = (type == PermissionType::Microphone) + ? AVMediaTypeAudio + : AVMediaTypeVideo; +@@ -152,6 +155,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal + }); + }]; + } ++#endif + break; + } + resultCallback(PermissionStatus::Granted); +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h +index a537929c8..82ef2b837 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h +@@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import <AppKit/NSPopoverTouchBarItem.h> + #import <AppKit/NSTouchBar.h> ++#undef check + +-API_AVAILABLE(macos(10.12.2)) + @interface TextFormatPopover : NSPopoverTouchBarItem + - (id)init:(NSTouchBarItemIdentifier)identifier; + @end +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h +index c6a4b886f..d2e0936c0 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h +@@ -8,12 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #include <AppKit/NSImageView.h> ++#undef check + + namespace Main { + class Session; + } // namespace Main + +-API_AVAILABLE(macos(10.12.2)) + @interface PinnedDialogsPanel : NSImageView + - (id)init:(not_null<Main::Session*>)session + destroyEvent:(rpl::producer<>)touchBarSwitches; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h +index 27b04467c..b1a7dfbd9 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h +@@ -9,12 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import <AppKit/NSPopoverTouchBarItem.h> + #import <AppKit/NSTouchBar.h> ++#undef check + + namespace Window { + class Controller; + } // namespace Window + +-API_AVAILABLE(macos(10.12.2)) + @interface StickerEmojiPopover : NSPopoverTouchBarItem<NSTouchBarDelegate> + - (id)init:(not_null<Window::Controller*>)controller + identifier:(NSTouchBarItemIdentifier)identifier; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h +index ec4596c67..972461aef 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h +@@ -8,8 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import <AppKit/NSTouchBar.h> ++#undef check + +-API_AVAILABLE(macos(10.12.2)) + @interface TouchBarAudioPlayer : NSTouchBar<NSTouchBarDelegate> + - (rpl::producer<>)closeRequests; + @end +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h +index 52b54de12..ac3857f9b 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h +@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import <AppKit/NSImage.h> + #import <Foundation/Foundation.h> ++#undef check + + namespace TouchBar { + +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h +index 1cc8c832f..c2178c975 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h +@@ -20,19 +20,19 @@ struct TrackState; + + namespace TouchBar { + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButton( + NSImage *image, + rpl::lifetime &lifetime, + Fn<void()> callback); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButton( + const style::icon &icon, + rpl::lifetime &lifetime, + Fn<void()> callback); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButtonWithTwoStates( + NSImage *icon1, + NSImage *icon2, +@@ -41,7 +41,7 @@ NSButton *CreateTouchBarButtonWithTwoStates( + bool firstState, + rpl::producer<bool> stateChanged = rpl::never<bool>()); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButtonWithTwoStates( + const style::icon &icon1, + const style::icon &icon2, +@@ -50,14 +50,14 @@ NSButton *CreateTouchBarButtonWithTwoStates( + bool firstState, + rpl::producer<bool> stateChanged = rpl::never<bool>()); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSSliderTouchBarItem *CreateTouchBarSlider( + NSString *itemId, + rpl::lifetime &lifetime, + Fn<void(bool, double, double)> callback, + rpl::producer<Media::Player::TrackState> stateChanged); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSCustomTouchBarItem *CreateTouchBarTrackPosition( + NSString *itemId, + rpl::producer<Media::Player::TrackState> stateChanged); +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h +index f03546eaf..bc8c63678 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h +@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import <AppKit/NSTouchBar.h> ++#undef check + + namespace Window { + class Controller; +@@ -21,7 +22,6 @@ const auto kPopoverPickerItemIdentifier = @"pickerButtons"; + + } // namespace TouchBar::Main + +-API_AVAILABLE(macos(10.12.2)) + @interface TouchBarMain : NSTouchBar + - (id)init:(not_null<Window::Controller*>)controller + touchBarSwitches:(rpl::producer<>)touchBarSwitches; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h +index 464f87c9c..9a008c75e 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h +@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import <AppKit/NSTouchBar.h> ++#undef check + + namespace Main { + class Domain; +@@ -17,7 +18,6 @@ namespace Window { + class Controller; + } // namespace Window + +-API_AVAILABLE(macos(10.12.2)) + @interface RootTouchBar : NSTouchBar<NSTouchBarDelegate> + - (id)init:(rpl::producer<bool>)canApplyMarkdown + controller:(not_null<Window::Controller*>)controller +Submodule Telegram/ThirdParty/tgcalls contains modified content +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm +index 8a4417b..2d9794e 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm +@@ -71,7 +71,7 @@ + if (@available(iOS 11.0, *)) { + [result addObject:h265Info]; + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + [result addObject:h265Info]; + } +@@ -101,7 +101,7 @@ + return [[TGRTCVideoDecoderH265 alloc] init]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { + return [[TGRTCVideoDecoderH265 alloc] init]; +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm +index 2901417..ac9ec2a 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm +@@ -76,7 +76,7 @@ + [result addObject:h265Info]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { + [result addObject:h265Info]; +@@ -112,7 +112,7 @@ + return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { + return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm +index de92427..9a5b20d 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm +@@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref + - (void)captureOutput:(AVCaptureOutput *)captureOutput + didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer + fromConnection:(AVCaptureConnection *)connection { +- NSString *droppedReason = +- (__bridge NSString *)CMGetAttachment(sampleBuffer, kCMSampleBufferAttachmentKey_DroppedFrameReason, nil); ++ NSString *droppedReason = nil; + RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason); + } + +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm +index bcabcf7..de7b6c7 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm +@@ -245,9 +245,11 @@ private: + layer.framebufferOnly = true; + layer.opaque = false; + // layer.cornerRadius = 4; ++#if 0 + if (@available(macOS 10.13, *)) { + layer.displaySyncEnabled = NO; + } ++#endif + // layer.presentsWithTransaction = YES; + layer.backgroundColor = [NSColor clearColor].CGColor; + layer.contentsGravity = kCAGravityResizeAspectFill; +@@ -334,9 +336,7 @@ private: + - (RTCVideoRotation)rtcFrameRotation { + if (_rotationOverride) { + RTCVideoRotation rotation; +- if (@available(macOS 10.13, *)) { +- [_rotationOverride getValue:&rotation size:sizeof(rotation)]; +- } else { ++ { + [_rotationOverride getValue:&rotation]; + } + return rotation; +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm +index 5491702..32befc6 100644 +--- a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm +@@ -128,6 +128,7 @@ bool Available() { + } + + bool Allowed() { ++#if 0 + if (@available(macOS 10.15, *)) { + // Input Monitoring is required on macOS 10.15 an later. + // Even if user grants access, restart is required. +@@ -141,6 +142,7 @@ bool Allowed() { + return AXIsProcessTrustedWithOptions( + (__bridge CFDictionaryRef)options); + } ++#endif + return true; + } + +diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm +index 29e368f..ea1f65f 100644 +--- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm +@@ -203,16 +203,20 @@ void Finish() { + } + + void OpenInputMonitoringPrivacySettings() { ++#if 0 + if (@available(macOS 10.15, *)) { + IOHIDRequestAccess(kIOHIDRequestTypeListenEvent); + } ++#endif + [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ListenEvent")]; + } + + void OpenDesktopCapturePrivacySettings() { ++#if 0 + if (@available(macOS 11.0, *)) { + CGRequestScreenCaptureAccess(); + } ++#endif + [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ScreenCapture")]; + } + +diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm +index c86ac77..b081162 100644 +--- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm +@@ -271,6 +271,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { + if (thumbnail.isNull()) { + return; + } ++#if 0 + if (@available(macOS 10.13.2, *)) { + const auto copy = thumbnail; + [_private->info +@@ -284,6 +285,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { + forKey:MPMediaItemPropertyArtwork]; + updateDisplay(); + } ++#endif + } + + void SystemMediaControls::setDuration(int duration) { +@@ -302,10 +304,12 @@ void SystemMediaControls::setVolume(float64 volume) { + } + + void SystemMediaControls::clearThumbnail() { ++#if 0 + if (@available(macOS 10.13.2, *)) { + [_private->info removeObjectForKey:MPMediaItemPropertyArtwork]; + updateDisplay(); + } ++#endif + } + + void SystemMediaControls::clearMetadata() { +@@ -367,9 +371,11 @@ bool SystemMediaControls::volumeSupported() const { + } + + bool SystemMediaControls::Supported() { ++#if 0 + if (@available(macOS 10.12.2, *)) { + return true; + } ++#endif + return false; + } + +Submodule Telegram/lib_webrtc contains modified content +diff --git a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm +index 21e93f7..10a3890 100644 +--- a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm ++++ b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm +@@ -397,6 +397,7 @@ void MacMediaDevices::videoInputRefreshed() { + } + + bool MacDesktopCaptureAllowed() { ++#if 0 + if (@available(macOS 11.0, *)) { + // Screen Recording is required on macOS 10.15 an later. + // Even if user grants access, restart is required. +@@ -421,6 +422,7 @@ bool MacDesktopCaptureAllowed() { + CFRelease(stream); + return true; + } ++#endif + return true; + } + diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch new file mode 100644 index 00000000000..f173a64f141 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch @@ -0,0 +1,38 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index 2a092c6ea..de46dd269 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -1173,7 +1173,7 @@ void Application::startShortcuts() { + + void Application::RegisterUrlScheme() { + base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{ +- .executable = cExeDir() + cExeName(), ++ .executable = qsl("kotatogram-desktop"), + .arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()), + .protocol = qsl("tg"), + .protocolName = qsl("Telegram Link"), +diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +index 26168baa7..00d2525a0 100644 +--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp ++++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -303,19 +303,11 @@ bool GenerateDesktopFile( + + QFile target(targetFile); + if (target.open(QIODevice::WriteOnly)) { +- fileText = fileText.replace( +- QRegularExpression( +- qsl("^TryExec=.*$"), +- QRegularExpression::MultilineOption), +- qsl("TryExec=%1").arg( +- QString(cExeDir() + cExeName()).replace('\\', "\\\\"))); +- + fileText = fileText.replace( + QRegularExpression( + qsl("^Exec=kotatogram-desktop(.*)$"), + QRegularExpression::MultilineOption), +- qsl("Exec=%1 -workdir %2\\1").arg( +- EscapeShellInLauncher(cExeDir() + cExeName()), ++ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg( + EscapeShellInLauncher(cWorkingDir()))); + + fileText = fileText.replace( diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch new file mode 100644 index 00000000000..a9adf5737a5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch @@ -0,0 +1,55 @@ +diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m +index fd9a361f..3a63be6d 100644 +--- a/src/rtc_base/system/gcd_helpers.m ++++ b/src/rtc_base/system/gcd_helpers.m +@@ -13,9 +13,6 @@ + dispatch_queue_t RTCDispatchQueueCreateWithTarget(const char *label, + dispatch_queue_attr_t attr, + dispatch_queue_t target) { +- if (@available(iOS 10, macOS 10.12, tvOS 10, watchOS 3, *)) { +- return dispatch_queue_create_with_target(label, attr, target); +- } + dispatch_queue_t queue = dispatch_queue_create(label, attr); + dispatch_set_target_queue(queue, target); + return queue; +diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc +index 61c1e7d6..b19f3f91 100644 +--- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc ++++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc +@@ -245,10 +245,7 @@ bool H265CMSampleBufferToAnnexBBuffer( + int nalu_header_size = 0; + size_t param_set_count = 0; + OSStatus status = noErr; +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( +- description, 0, nullptr, nullptr, ¶m_set_count, &nalu_header_size); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return false; + } +@@ -271,10 +268,7 @@ bool H265CMSampleBufferToAnnexBBuffer( + size_t param_set_size = 0; + const uint8_t* param_set = nullptr; + for (size_t i = 0; i < param_set_count; ++i) { +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( +- description, i, ¶m_set, ¶m_set_size, nullptr, nullptr); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return false; + } +@@ -514,11 +508,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( + // Parse the SPS and PPS into a CMVideoFormatDescription. + CMVideoFormatDescriptionRef description = nullptr; + OSStatus status = noErr; +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionCreateFromHEVCParameterSets( +- kCFAllocatorDefault, 3, param_set_ptrs, param_set_sizes, 4, nullptr, +- &description); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return nullptr; + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index aff74a174b9..fe62270b8e8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,35 +1,123 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf -, xorg, libXtst +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, ninja +, yasm +, libjpeg +, openssl +, libopus +, ffmpeg_4 +, protobuf +, openh264 +, usrsctp +, libvpx +, libX11 +, libXtst +, libXcomposite +, libXdamage +, libXext +, libXrender +, libXrandr +, libXi +, glib +, abseil-cpp +, pipewire +, mesa +, libglvnd +, libepoxy +, Cocoa +, AppKit +, IOKit +, IOSurface +, Foundation +, AVFoundation +, CoreMedia +, VideoToolbox +, CoreGraphics +, CoreVideo +, OpenGL +, Metal +, MetalKit +, CoreFoundation +, ApplicationServices }: -let - rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; - sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "tg_owt"; - version = "git-${rev}"; + version = "unstable-2022-02-26"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - inherit rev sha256; + rev = "a264028ec71d9096e0aa629113c49c25db89d260"; + sha256 = "sha256-JR+M+4w0QsQLfIunZ/7W+5Knn+gX+RR3DBrpOz7q44I="; fetchSubmodules = true; }; + patches = [ + # let it build with nixpkgs 10.12 sdk + ./tg_owt-10.12-sdk.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf - xorg.libX11 libXtst + libjpeg + openssl + libopus + ffmpeg_4 + protobuf + openh264 + usrsctp + libvpx + abseil-cpp + ] ++ lib.optionals stdenv.isLinux [ + libX11 + libXtst + libXcomposite + libXdamage + libXext + libXrender + libXrandr + libXi + glib + pipewire + mesa + libepoxy + libglvnd + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + OpenGL + Metal + MetalKit + CoreFoundation + ApplicationServices ]; - cmakeFlags = [ - # Building as a shared library isn't officially supported and currently broken: - "-DBUILD_SHARED_LIBS=OFF" + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi"; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ + # Required for linking downstream binaries. + abseil-cpp + openh264 + usrsctp + libvpx ]; meta.license = lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 265e72c3867..c23e416d2c6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -70,7 +70,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.5.2"; + version = "3.6.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +79,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh"; + sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index a3c61a6f337..200e0e887e3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-02-09"; + version = "unstable-2022-02-25"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "4cba1acdd718b700bb33945c0258283689d4eac7"; - sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca"; + rev = "a264028ec71d9096e0aa629113c49c25db89d260"; + sha256 = "10p3x8z3ps8s1ivi9y8px2gsg4pvsvz6g9wbgh5w8hilikxqq7r5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 51b119aa6de..5fb0f14f36a 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,20 +4,20 @@ let pname = "vk-messenger"; - version = "5.2.3"; + version = "5.3.2"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19"; + sha256 = "L0nE0zW4LP8udcE8uPy+cH9lLuQsUSq7cF13Gv7w2rI="; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb"; + sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ="; }; x86_64-darwin = fetchurl { - url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg"; - sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b"; + url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg"; + sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index a3398087455..4aa9dbc9b10 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.9.3.1911"; + version = "5.9.6.2225"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4"; + sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; }; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index d66efa86a7f..de4bb988d76 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.4"; + version = "0.14.5"; - vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; + vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; + sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8="; }; + # Remove patch when updating to >0.14.5 + patches = [ + (fetchpatch { + name = "remove-distribution-test.patch"; + url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch"; + sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE="; + }) + ]; + meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 08823cab573..71bd96d3b70 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.9"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; + hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; }; dontConfigure = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "http://kirc.io/"; diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index e102b1077a3..4d7f5b0ca36 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -3,9 +3,11 @@ , rustPlatform , fetchFromGitHub , pkg-config -, dbus -, openssl , Foundation +, dbusSupport ? stdenv.isLinux, dbus +# rustls will be used for TLS if useOpenSSL=false +, useOpenSSL ? stdenv.isLinux, openssl +, notificationSupport ? stdenv.isLinux }: rustPlatform.buildRustPackage rec { @@ -22,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optionals dbusSupport [ dbus ] + ++ lib.optionals useOpenSSL [ openssl ] + ++ lib.optional stdenv.isDarwin Foundation; - buildFeatures = lib.optional stdenv.isLinux "desktop-notifications"; + buildFeatures = lib.optional notificationSupport "desktop-notifications"; meta = with lib; { description = "A console IRC client"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 80f15eeff3c..541ad8c68f2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,21 +28,21 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM="; + sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" + "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 1adb61b8934..0d57e252e30 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.11"; + version = "2.9.26"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U="; + sha256 = "sha256-phzjjW9KG0Z5WAzxtYdI7i2Nw4FHVNeEJswQreHga4M="; }; - vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ="; + vendorSha256 = "sha256-Jzd6I3a/2Un2a3/T2vzFuHwe9Y3eGEvfpZWSwjWokM0="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 4e70facb5f1..27779c96983 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.5"; + version = "0.5.9"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ="; + sha256 = "sha256-g+ySsHnJ4FpmJLEjlutuiJmMkKI3Jb+HkWi1WBIo1aw="; }; - cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU="; + cargoSha256 = "sha256-NkkONl57zSilElVAOXUBxWnims4+EIVkkTdExbeBAaQ="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; @@ -34,6 +34,10 @@ rustPlatform.buildRustPackage rec { openssl ]; + # flag added because without end-to-end testing is ran which requires + # additional tooling and servers to test + cargoTestFlags = [ "--lib" ]; + postInstall = lib.optionalString enableCompletions '' # Install shell function installShellCompletion --cmd himalaya \ @@ -43,10 +47,10 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "CLI email client written in Rust"; + description = "Command-line interface for email management"; homepage = "https://github.com/soywod/himalaya"; changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ yanganto ]; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ toastal yanganto ]; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index eb708962e01..492abf1f37c 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.6.1"; + version = "91.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda"; + sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361"; + sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09"; + sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645"; + sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21"; + sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058"; + sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2"; + sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff"; + sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a"; + sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c"; + sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe"; + sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8"; + sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39"; + sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41"; + sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad"; + sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e"; + sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87"; + sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f"; + sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8"; + sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091"; + sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031"; + sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7"; + sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba"; + sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1"; + sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40"; + sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921"; + sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489"; + sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220"; + sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4"; + sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65"; + sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48"; + sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3"; + sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230"; + sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6"; + sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5"; + sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9"; + sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9"; + sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4"; + sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef"; + sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac"; + sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a"; + sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022"; + sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3"; + sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe"; + sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af"; + sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db"; + sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c"; + sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620"; + sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262"; + sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30"; + sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d"; + sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005"; + sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991"; + sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462"; + sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39"; + sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa"; + sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a"; + sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8"; + sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc"; + sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb"; + sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae"; + sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280"; + sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2"; + sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe"; + sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321"; + sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea"; + sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf"; + sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3"; + sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014"; + sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff"; + sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b"; + sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066"; + sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d"; + sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99"; + sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344"; + sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b"; + sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226"; + sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915"; + sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9"; + sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311"; + sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c"; + sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0"; + sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51"; + sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40"; + sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2"; + sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274"; + sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996"; + sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab"; + sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7"; + sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860"; + sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e"; + sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41"; + sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429"; + sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8"; + sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89"; + sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1"; + sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee"; + sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d"; + sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb"; + sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983"; + sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9"; + sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3"; + sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e"; + sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee"; + sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd"; + sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420"; + sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc"; + sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207"; + sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0"; + sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d"; + sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2"; + sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c"; + sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2"; + sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e"; + sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91"; + sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd"; + sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35"; + sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec"; + sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49"; + sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a"; + sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20"; + sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e"; + sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922"; + sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364"; + sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9"; + sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d"; + sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf"; + sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726"; + sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97"; + sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934"; + sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5b0b66ca345..3ab0c58ecc5 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.6.1"; + version = "91.7.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2"; + sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 0df8fc010e2..cf22d880406 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.6"; + version = "2022.1"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm"; + sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index c15e51921d4..a86ac412c14 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; }; }; - "@azure/core-lro-2.2.3" = { + "@azure/core-lro-2.2.4" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.3.tgz"; - sha512 = "UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz"; + sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ=="; }; }; "@azure/core-paging-1.2.1" = { @@ -85,13 +85,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.0" = { + "@azure/ms-rest-js-2.6.1" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz"; - sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz"; + sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -103,22 +103,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/storage-blob-12.8.0" = { + "@azure/storage-blob-12.9.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.8.0"; + version = "12.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz"; - sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz"; + sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.17.2" = { + "@babel/runtime-7.17.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.2"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"; - sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz"; + sha512 = "L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA=="; }; }; "@colors/colors-1.5.0" = { @@ -139,13 +139,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.5" = { + "@fontsource/open-sans-4.5.6" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.5"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.5.tgz"; - sha512 = "h1oUPSQpoMnDrnzIZTVS9PPBFhWXS87v6/cd9FY2Xc+GKbOVcjPZxcvUDU1TnCie2QSoYY9aifERRV/d8JHtWQ=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.6.tgz"; + sha512 = "bQuNS0H1VL1VLC6FwmReHlpJaICVe/seODU3Q9cpTQbJ5OtRD4TwWMrAjfTxqcFNollA6O0AlE4BnRSWMQLfvw=="; }; }; "@icetee/ftp-0.3.15" = { @@ -445,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.179" = { + "@types/lodash-4.14.180" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.179"; + version = "4.14.180"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; - sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz"; + sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g=="; }; }; "@types/lossless-json-1.0.1" = { @@ -472,13 +472,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.46" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.46"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; - sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-17.0.21" = { @@ -976,13 +976,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1082.0" = { + "aws-sdk-2.1093.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1082.0"; + version = "2.1093.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz"; - sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1093.0.tgz"; + sha512 = "YD6VNemoKkzDMHsUiGP/MwpM0T20ukp3KTSxPY34Xw3Ww0zP19C54CfjaXhn//R27f2c57BtVez+he2RZ5GwyQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1471,6 +1471,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "clamp-1.0.1" = { + name = "clamp"; + packageName = "clamp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz"; + sha1 = "66a0e64011816e37196828fdc8c8c147312c8634"; + }; + }; "class-validator-0.13.2" = { name = "class-validator"; packageName = "class-validator"; @@ -1777,6 +1786,15 @@ let sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; }; }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; @@ -1786,6 +1804,15 @@ let sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; + "cookie-parser-1.4.6" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz"; + sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="; + }; + }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -2956,13 +2983,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -3604,13 +3631,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.3" = { + "isbot-3.4.5" = { name = "isbot"; packageName = "isbot"; - version = "3.4.3"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.3.tgz"; - sha512 = "5hAgiY9ysMIJcVQlGHcXptwgZr1yYbIGNBE36a3sPo7cLZ9eLTLx0qOssekFKaTHiXTwd/ZZMTuOS7w4faOmpw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.5.tgz"; + sha512 = "+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw=="; }; }; "isexe-2.0.0" = { @@ -4045,6 +4072,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; "lodash.uniqby-4.7.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -4135,6 +4171,15 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; + "luxon-2.3.1" = { + name = "luxon"; + packageName = "luxon"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; + }; + }; "mailparser-3.4.0" = { name = "mailparser"; packageName = "mailparser"; @@ -4180,13 +4225,22 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.37.1" = { + "mappersmith-2.38.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.37.1"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz"; - sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.0.tgz"; + sha512 = "D2+ICkvNGnGCz01MADdQQilcHGffwLd1ell4b4uXS9QYvLfrX0r5nl5zb9V+2YDy3142u6VUl1b154pxJAxw3g=="; + }; + }; + "material-colors-1.2.6" = { + name = "material-colors"; + packageName = "material-colors"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz"; + sha512 = "6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="; }; }; "md5-2.3.0" = { @@ -4261,22 +4315,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "mimic-fn-2.1.0" = { @@ -4486,49 +4540,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.106.0" = { + "n8n-core-0.109.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.106.0"; + version = "0.109.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz"; - sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.109.0.tgz"; + sha512 = "hzimsUZbWHfG9RofSX7czg0DgB7YAIcLi7JRFUVB90HVdasFf1HQFVM2AwFZC/lLVckktuadWSpq2MOKW+lE3Q=="; }; }; - "n8n-design-system-0.12.0" = { + "n8n-design-system-0.14.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.12.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz"; - sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.14.0.tgz"; + sha512 = "E9Tvnjd9hktVPsqBcX579Fr4Nn/QEVAHQaYZlPGrqxXLVD76mF0WQWJpU6XTZEs/9pKfEftk/TmDihtENLVTxg=="; }; }; - "n8n-editor-ui-0.132.0" = { + "n8n-editor-ui-0.135.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.132.0"; + version = "0.135.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz"; - sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.135.0.tgz"; + sha512 = "oM+Pnh4ZaUnDy5lj6u71EyXUPGNlbEIn3lpi4+xyO8tYtFyaN1kifS/q/a1sYrgZlwbWaksgUvTqufZ3Te6Yqw=="; }; }; - "n8n-nodes-base-0.163.0" = { + "n8n-nodes-base-0.166.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.163.0"; + version = "0.166.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz"; - sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.166.0.tgz"; + sha512 = "Iet76bGJrS3rTal5KbuBsJvYzAw3o9xfcLHERpDJyXOxgvrPfZ62A7RpmLMLA3KJLfKevY+VLGLWW5odTSvtEg=="; }; }; - "n8n-workflow-0.88.0" = { + "n8n-workflow-0.91.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.88.0"; + version = "0.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz"; - sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.91.0.tgz"; + sha512 = "a4yqSvcalQs2MEDkOeadQc9cwK/3f6t+EKr/e8rEN5D9djnmuvoRJC+V9v6KPuHy66q1pv6w7fpmnrLRO+2WrA=="; }; }; "named-placeholders-1.1.2" = { @@ -5089,6 +5143,42 @@ let sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; + "passport-0.5.2" = { + name = "passport"; + packageName = "passport"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz"; + sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; + }; + }; + "passport-cookie-1.0.9" = { + name = "passport-cookie"; + packageName = "passport-cookie"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-cookie/-/passport-cookie-1.0.9.tgz"; + sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; + }; + }; + "passport-jwt-4.0.0" = { + name = "passport-jwt"; + packageName = "passport-jwt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz"; + sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg=="; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; "path-case-3.0.4" = { name = "path-case"; packageName = "path-case"; @@ -5134,6 +5224,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; "pdf-parse-1.1.1" = { name = "pdf-parse"; packageName = "pdf-parse"; @@ -5287,13 +5386,13 @@ let sha512 = "vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ=="; }; }; - "popsicle-redirects-1.1.0" = { + "popsicle-redirects-1.1.1" = { name = "popsicle-redirects"; packageName = "popsicle-redirects"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz"; - sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; + url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.1.tgz"; + sha512 = "mC2HrKjdTAWDalOjGxlXw9j6Qxrz/Yd2ui6bPxpi2IQDYWpF4gUAMxbA8EpSWJhLi0PuWKDwTHHPrUPGutAoIA=="; }; }; "popsicle-transport-http-1.2.1" = { @@ -6340,13 +6439,13 @@ let sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; - "sqlstring-2.3.2" = { + "sqlstring-2.3.3" = { name = "sqlstring"; packageName = "sqlstring"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz"; - sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="; + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz"; + sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; }; }; "sse-channel-3.1.1" = { @@ -6367,13 +6466,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.6.0" = { + "ssh2-1.7.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz"; - sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz"; + sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; }; }; "ssh2-sftp-client-7.2.2" = { @@ -6682,6 +6781,15 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; + "tinycolor2-1.4.2" = { + name = "tinycolor2"; + packageName = "tinycolor2"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; + sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + }; + }; "tlds-1.224.0" = { name = "tlds"; packageName = "tlds"; @@ -7159,6 +7267,24 @@ let sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; + "vue-2.6.14" = { + name = "vue"; + packageName = "vue"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-color-2.8.1" = { + name = "vue-color"; + packageName = "vue-color"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz"; + sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; + }; + }; "vue-fragment-1.5.2" = { name = "vue-fragment"; packageName = "vue-fragment"; @@ -7177,6 +7303,15 @@ let sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; }; }; + "vue2-boring-avatars-0.3.4" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.4.tgz"; + sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -7375,13 +7510,13 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xss-1.0.10" = { + "xss-1.0.11" = { name = "xss"; packageName = "xss"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; - sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; }; }; "xtend-4.0.2" = { @@ -7480,10 +7615,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.165.0"; + version = "0.168.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz"; - sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.168.1.tgz"; + sha512 = "bghyOcF+KZmRsmyC9p2ARb+RIlUBDwTKCMLd5eUFW1SKMBCWgQZwG8KCLCRApWjXjP1SYekeyDo1PSl5fa7Hxw=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7503,7 +7638,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@azure/core-lro-2.2.3" // { + (sources."@azure/core-lro-2.2.4" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7524,18 +7659,18 @@ in ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.0" // { + (sources."@azure/ms-rest-js-2.6.1" // { dependencies = [ sources."form-data-2.5.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/storage-blob-12.8.0" // { + (sources."@azure/storage-blob-12.9.0" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.17.2" + sources."@babel/runtime-7.17.7" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7543,7 +7678,7 @@ in sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.5" + sources."@fontsource/open-sans-4.5.6" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7592,7 +7727,7 @@ in sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.179" + sources."@types/lodash-4.14.180" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" sources."@types/node-17.0.21" @@ -7664,7 +7799,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1082.0" // { + (sources."aws-sdk-2.1093.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7774,6 +7909,7 @@ in sources."cheerio-select-1.5.0" sources."chokidar-3.5.2" sources."chownr-1.1.4" + sources."clamp-1.0.1" sources."class-validator-0.13.2" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" @@ -7835,7 +7971,8 @@ in sources."content-disposition-0.5.4" sources."content-type-1.0.4" sources."convict-6.2.1" - sources."cookie-0.4.2" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."core-js-3.21.1" sources."core-util-is-1.0.2" @@ -7923,6 +8060,7 @@ in sources."expand-tilde-2.0.2" (sources."express-4.17.3" // { dependencies = [ + sources."cookie-0.4.2" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -8011,7 +8149,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" @@ -8078,7 +8216,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.3" + sources."isbot-3.4.5" sources."isexe-2.0.0" sources."iso-639-1-2.1.13" sources."isstream-0.1.2" @@ -8137,6 +8275,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" + sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."logform-2.4.0" @@ -8154,6 +8293,7 @@ in sources."yallist-2.1.2" ]; }) + sources."luxon-2.3.1" (sources."mailparser-3.4.0" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -8168,7 +8308,8 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.37.1" + sources."mappersmith-2.38.0" + sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -8177,8 +8318,8 @@ in sources."micromatch-4.0.4" sources."millisecond-0.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" @@ -8224,19 +8365,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.106.0" // { + (sources."n8n-core-0.109.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.12.0" - sources."n8n-editor-ui-0.132.0" - (sources."n8n-nodes-base-0.163.0" // { + sources."n8n-design-system-0.14.0" + sources."n8n-editor-ui-0.135.0" + (sources."n8n-nodes-base-0.166.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.88.0" + sources."n8n-workflow-0.91.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8341,6 +8482,10 @@ in sources."tslib-2.3.1" ]; }) + sources."passport-0.5.2" + sources."passport-cookie-1.0.9" + sources."passport-jwt-4.0.0" + sources."passport-strategy-1.0.0" (sources."path-case-3.0.4" // { dependencies = [ sources."tslib-2.3.1" @@ -8350,6 +8495,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" + sources."pause-0.0.1" (sources."pdf-parse-1.1.1" // { dependencies = [ sources."debug-3.2.7" @@ -8378,7 +8524,7 @@ in sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" - sources."popsicle-redirects-1.1.0" + sources."popsicle-redirects-1.1.1" sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" @@ -8534,10 +8680,10 @@ in }) sources."sprintf-js-1.1.2" sources."sqlite3-5.0.2" - sources."sqlstring-2.3.2" + sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.6.0" + sources."ssh2-1.7.0" sources."ssh2-sftp-client-7.2.2" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -8564,7 +8710,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.46" + sources."@types/node-12.20.47" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8588,6 +8734,7 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" + sources."tinycolor2-1.4.2" sources."tlds-1.224.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -8663,8 +8810,11 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vm2-3.9.9" + sources."vue-2.6.14" + sources."vue-color-2.8.1" sources."vue-fragment-1.5.2" sources."vue-i18n-8.27.0" + sources."vue2-boring-avatars-0.3.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -8695,7 +8845,7 @@ in sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" - (sources."xss-1.0.10" // { + (sources."xss-1.0.11" // { dependencies = [ sources."commander-2.20.3" ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3a63f98c44c..deac64c903e 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA="; + sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ="; }; patches = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index a18257dfeb6..c06291c719e 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.7"; + version = "1.37.10"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-L5PeT4Y2oWM1WUJaBK9xgrpfkpvKM1+sA29A3AiDE38="; + sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo="; }; vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 02c383b30ff..cfee9d91c93 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,28 +1,41 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.5"; + version = "6.9.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java mv $(ls */*.jar) $out/share/java makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : $out/share/java \ + --set JAVA_HOME "${jre}" + + substituteInPlace $out/share/java/frostwire \ + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ + "export JAVA_PROGRAM_DIR=${jre}/bin/" + + substituteInPlace $out/share/java/frostwire.desktop \ + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" + + runHook postInstall ''; meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 2ccf4ff4b86..f24f74e5ae0 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.3"; + version = "0.16.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; + sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index b6583efe730..ecfde0a39c2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,8 +1,21 @@ -{ lib, fetchFromGitHub, gobject-introspection, imagemagick, -wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, imagemagick +, networkmanager +, pango +, webkitgtk +# Python libs +, protonvpn-nm-lib +, psutil +# Optionals +, withIndicator ? true +, libappindicator-gtk3 }: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-gui"; +buildPythonApplication rec { + pname = "protonvpn-gui"; version = "1.7.0"; src = fetchFromGitHub { @@ -12,22 +25,26 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; }; - strictDeps = false; - nativeBuildInputs = [ - gobject-introspection imagemagick wrapGAppsHook + gobject-introspection + imagemagick + wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ protonvpn-nm-lib psutil ]; buildInputs = [ - gtk3 networkmanager webkitgtk - ]; + # To avoid enabling strictDeps = false (#56943) + gobject-introspection + networkmanager + pango + webkitgtk + ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - postFixup = '' + postInstall = '' # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps @@ -45,9 +62,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python"; + description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ offline wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 19e8d1eeba7..852fcf68987 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0="; + sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index efce24a06f9..9721c6b9ba4 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 -, freerdp, libssh, libgcrypt, gnutls +, freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -8,19 +8,20 @@ # The themes here are soft dependencies; only icons are missing without them. , gnome , withLibsecret ? true +, withVte ? true }: with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.24"; + version = "1.4.25"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0="; + sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; @@ -33,10 +34,11 @@ stdenv.mkDerivation rec { libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ] ++ optionals withLibsecret [ libsecret ]; + ] ++ optionals withLibsecret [ libsecret ] + ++ optionals withVte [ vte ]; cmakeFlags = [ - "-DWITH_VTE=OFF" + "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" diff --git a/pkgs/applications/networking/remote/rustdesk/cargo.patch b/pkgs/applications/networking/remote/rustdesk/cargo.patch new file mode 100644 index 00000000000..ecf2f4af5be --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/cargo.patch @@ -0,0 +1,50 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c3e139e..b77d8bd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1761,11 +1761,11 @@ dependencies = [ + + [[package]] + name = "magnum-opus" +-version = "0.3.4-2" +-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f" ++version = "0.4.0" ++source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" + dependencies = [ +- "bindgen 0.59.1", +- "target_build_utils", ++ "libc", ++ "opusic-sys", + ] + + [[package]] +@@ -2188,6 +2188,16 @@ version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + ++[[package]] ++name = "opusic-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" ++dependencies = [ ++ "cmake", ++ "libc", ++] ++ + [[package]] + name = "parity-tokio-ipc" + version = "0.7.2" +diff --git a/Cargo.toml b/Cargo.toml +index 75504a0..43e1624 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,7 +32,7 @@ libc = "0.2" + parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } + flexi_logger = "0.17" + runas = "0.2" +-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } ++magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" } + dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } + rubato = { version = "0.8", optional = true } + samplerate = { version = "0.2", optional = true } diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix new file mode 100644 index 00000000000..677629dbcfb --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, rustPlatform +, cmake +, yasm +, nasm +, zip +, pkg-config +, clang +, gtk3 +, xdotool +, libxcb +, libXfixes +, alsa-lib +, pulseaudio +, libXtst +, libvpx +, libyuv +, libopus +, libsciter +, llvmPackages +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "rustdesk"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "rustdesk"; + repo = "rustdesk"; + rev = "0325500ebf331b66220cec6e9078afb83b0e98a7"; + sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg="; + }; + + cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw="; + + LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; + + # Change magnus-opus version to upstream so that it does not use + # vcpkg for libopus since it does not work. + cargoPatches = [ + ./cargo.patch + ]; + + # Manually simulate a vcpkg installation so that it can link the libaries + # properly. + postUnpack = let + vcpkg_target = "x64-linux"; + in '' + export VCPKG_ROOT="$TMP/vcpkg"; + + mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib + + ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ''; + + nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; + buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ]; + + # Checks require an active X display. + doCheck = false; + + desktopItems = [ (makeDesktopItem { + name = "rustdesk"; + exec = meta.mainProgram; + icon = "rustdesk"; + desktopName = "RustDesk"; + comment = meta.description; + genericName = "Remote Desktop"; + categories = ["Network"]; + }) ]; + + # Add static ui resources and libsciter to same folder as binary so that it + # can find them. + postInstall = '' + mkdir -p $out/{share/src,lib/rustdesk} + + # so needs to be next to the executable + mv $out/bin/rustdesk $out/lib/rustdesk + ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk + + makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ + --run "cd $out/share" + + cp -a $src/src/ui $out/share/src + + install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg + ''; + + meta = with lib; { + description = "Yet another remote desktop software"; + homepage = "https://rustdesk.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ leixb ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "rustdesk"; + }; +} diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dfed1f59075..bf9f59444aa 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,21 @@ -{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: +{ lib +, fetchurl +, cups +, libssh +, libXpm +, nx-libs +, openldap +, openssh +, qt5 +, qtbase +, qtsvg +, qtx11extras +, qttools +, phonon +, pkg-config +}: -mkDerivation rec { +qt5.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; @@ -10,8 +24,24 @@ mkDerivation rec { sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; - buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkg-config ]; + buildInputs = [ + cups + libssh + libXpm + nx-libs + openldap + openssh + qtbase + qtsvg + qtx11extras + qttools + phonon + ]; + + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; postPatch = '' substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" @@ -26,7 +56,7 @@ mkDerivation rec { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 7d5d414a4f9..f2cd1282fc6 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.5"; + version = "8.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; + sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5bcbac74ca7..401d6dfa32c 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,7 +3,6 @@ , autoconf , automake , fetchFromGitHub -, fetchpatch , libpcap , ncurses , openssl @@ -12,25 +11,15 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; + sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; }; - 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/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 2cbf706ea78..68af0bd2890 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.15"; + version = "2.4.16"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nYko7htg16Sp/Fs+KuPflrpHn8WShM0OKozhr9BFH5U="; + sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index f9fbb071b06..e23ba5cdf2a 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.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pwbprbkx5y0c93b61k8znan4aimk7dkssapjhkhzw4c38xd4lza"; + sha256 = "sha256-zCKXi3qeiq2AGT7UioVfCbB4bc5F2tXJ507zPa+O0pc="; }; - vendorSha256 = "0353pff07lwpa1jmi095kb2izcw09z73x6nninnnpyqppwzas6ha"; + vendorSha256 = "sha256-mgupx5SNQ3wUkQCeTVnw3wwdSCrTcwLYxcX6tlqXTyQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 3e0ed7a5020..497b91ad361 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.51.5"; + version = "2.52.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-pi5uYwPpIy0lERmgATWQCO3EA3Pg5pnn7gxv49FaPug="; + sha256 = "sha256-YCuXkHqY+JHsguvst2UkI/6YlFt3iTvchO8PQuS15nI="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 76bddac6c23..31d0ce461d0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; + sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; }; - vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; + vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; doCheck = false; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index e419a350489..6e9093373c9 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -8,19 +8,22 @@ , lib , udev , wrapGAppsHook +, libxshmfence }: stdenv.mkDerivation rec { pname = "termius"; - version = "7.17.1"; + version = "7.34.1"; src = fetchurl { # find the latest version with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version' # and the url with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap"; - sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg="; + # and the sha512 with + # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_101.snap"; + sha512 = "7fdd82535fd288277b01fedde4739dc97782236fbf25372efa56114bba676c21277ed96b32a1d46ac86af19925b14935818af50985d43a1307639530db044af4"; }; desktopItem = makeDesktopItem { @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; unpackPhase = '' runHook preUnpack diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 8bd1d8f974b..100818ad249 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index d07133e9065..54ad0753c72 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -64,14 +64,27 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # The GTK theme has been renamed in elementary OS 6 + # https://github.com/elementary/flatpak-platform/blob/6.1.0/io.elementary.Sdk.json#L182 + # Remove this in https://github.com/NixOS/nixpkgs/pull/159249 + substituteInPlace src/Application.vala \ + --replace '"gtk-theme-name", "elementary"' '"gtk-theme-name", "io.elementary.stylesheet.blueberry"' + + # Fix build with vala 0.56 + # https://github.com/alainm23/planner/pull/884 + substituteInPlace src/Application.vala \ + --replace "public const OptionEntry[] PLANNER_OPTIONS" "private const OptionEntry[] PLANNER_OPTIONS" + chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py ''; preFixup = '' gappsWrapperArgs+=( - # the theme is hardcoded + # The GTK theme is hardcoded. --prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share" + # The icon theme is hardcoded. + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 9ef7afcf958..767a4202ae8 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -17,6 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; + icon = "jameica"; categories = [ "Office" ]; }; in diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c5b5fc56f78..aac85b9d400 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , 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" ] +, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 2fcb2388b8c..ab140f90ced 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , nixosTests , python3 , ghostscript @@ -17,10 +18,6 @@ let py = python3.override { packageOverrides = self: super: { django = super.django_3; - django-picklefield = super.django-picklefield.overrideAttrs (oldAttrs: { - # Checks do not pass with django 3 - doInstallCheck = false; - }); # Avoid warning in django-q versions > 1.3.4 # https://github.com/jonaswinkler/paperless-ng/issues/857 # https://github.com/Koed00/django-q/issues/526 @@ -54,6 +51,15 @@ py.pkgs.pythonPackages.buildPythonApplication rec { sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; }; + patches = [ + # Fix the `slow_write_pdf` test: + # https://github.com/NixOS/nixpkgs/issues/136626 + (fetchpatch { + url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; + sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; + }) + ]; + format = "other"; # Make bind address configurable @@ -155,34 +161,38 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; - doCheck = true; + installPhase = '' + mkdir -p $out/lib + cp -r . $out/lib/paperless-ng + chmod +x $out/lib/paperless-ng/src/manage.py + makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${path}" + ''; + checkInputs = with py.pkgs.pythonPackages; [ - pytest - pytest-cov pytest-django pytest-env pytest-sugar pytest-xdist factory_boy + pytestCheckHook ]; + pytestFlagsArray = [ "src" ]; + # The tests require: # - PATH with runtime binaries # - A temporary HOME directory for gnupg # - XDG_DATA_DIRS with test-specific fonts - checkPhase = '' - pushd src - PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest - popd - ''; + preCheck = '' + export PATH="${path}:$PATH" + export HOME=$(mktemp -d) + export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" - installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ng - chmod +x $out/lib/paperless-ng/src/manage.py - makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "${path}" + # Disable unneeded code coverage test + substituteInPlace src/setup.cfg \ + --replace "--cov --cov-report=html" "" ''; passthru = { diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 9b6f352d97a..8f08b56d4d5 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 4ddc0b4e278..f1eb43dbdbc 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 16ee7733ed2..f80f40929a1 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -16,6 +16,7 @@ , texlive , imagemagick , perlPackages +, writeScript }: let @@ -27,12 +28,19 @@ let imagemagick perlPackages.Po4a ]; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; in python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit src version; pname = "paperwork"; + sample_docs = sample_documents // { + # a trick for the update script + name = "sample_documents"; + src = sample_documents; + }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: @@ -69,7 +77,7 @@ python3Packages.buildPythonApplication rec { export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share # build the user manual - PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do install -Dt $site/model/help/out $i done @@ -122,12 +130,20 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - python-dateutil setuptools ]; disallowedRequisites = documentation_deps; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix + docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" + update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev + ''; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index a5141a43e50..980a4aabf7a 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; + sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 121c1ccf36e..1d7a02daa9c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.9"; + version = "22.3.1"; 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 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34"; + sha256 = "4d75684751a10f24d20d993b30748c7a09bd8bdfd4e1d4d5703746954a0f6bb2"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index dfdf45da9e5..a97b3f7d37b 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -25,7 +25,9 @@ "application/vnd.openxmlformats-officedocument.spreadsheetml.template" "application/vnd.ms-excel.sheet.macroenabled.12" "application/vnd.ms-excel.template.macroEnabled.12" - "application/x-dif;text/spreadsheet;text/csv" + "application/x-dif" + "text/spreadsheet" + "text/csv" "application/x-prn" "application/vnd.ms-excel.sheet.binary.macroenabled.12" ]; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 1de5a8b817b..9c716dfd9a4 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { libgee libgudev libsoup - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index b8b98c19bbf..7cf777ae13f 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -8,22 +8,20 @@ python3.pkgs.buildPythonApplication rec { pname = "timeline"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; - sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; pythonPath = with python3.pkgs; [ - wxPython_4_1 + wxPython_4_0 humblewx icalendar markdown - pysvg-py3 - pillow ]; checkInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d8fe8649381..2055bfc0fc7 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,41 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, wxGTK +, cmake +, ninja +, wrapGAppsHook +, unstableGitUpdater +}: stdenv.mkDerivation rec { pname = "treesheets"; - version = "1.0.1"; + version = "unstable-2022-03-12"; src = fetchFromGitHub { - owner = "aardappel"; - repo = "treesheets"; - rev = "v${version}"; - sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; + owner = "aardappel"; + repo = "treesheets"; + rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; + sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wxGTK ]; + nativeBuildInputs = [ + cmake + ninja + wrapGAppsHook + ]; - preConfigure = "cd src"; + buildInputs = [ + wxGTK + ]; - postInstall = '' - mkdir "$out/share" -p - cp -av ../TS "$out/share/libexec" + NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - mkdir "$out/bin" -p - makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" - - mkdir "$out/share/doc" -p - - for f in readme.html docs examples - do - mv -v "$out/share/libexec/$f" "$out/share/doc" - ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" - done - - mkdir "$out/share/applications" -p - mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" - substituteInPlace "$out/share/applications/treesheets.desktop" \ - --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" - ''; + passthru = { + updateScript = unstableGitUpdater { }; + }; meta = with lib; { description = "Free Form Data Organizer"; @@ -49,9 +47,9 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = "https://strlen.com/treesheets/"; + homepage = "https://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; - platforms = platforms.linux; - license = licenses.zlib; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 178b2351a6b..46f2569b13a 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { installPhase = let steam-run = (steam.override { extraPkgs = p: buildInputs; - nativeOnly = true; }).run; in '' prefix=$out/opt/kingsoft/wps-office diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 6fb8aecbbca..53c61f0d993 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeDesktopItem +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, makeDesktopItem , atk , cairo , coreutils @@ -27,7 +31,8 @@ , libXt , libnotify , gnome -, libGLU, libGL +, libGLU +, libGL , nspr , nss , pango @@ -36,55 +41,56 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96.3"; + version = "6.0"; src = fetchurl { - url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; + url = + "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; + sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff"; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + buildInputs = + [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; dontStrip = true; dontPatchELF = true; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXt - libnotify - libGLU libGL - nspr - nss - pango - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + atk + cairo + curl + cups + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libxcb + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libnotify + libGLU + libGL + nspr + nss + pango + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 43cf58db258..8d97c8bbedb 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -1,16 +1,18 @@ -{ lib +{ config +, lib , stdenv , fetchFromGitHub , cmake , codec2 +, libpulseaudio , libsamplerate , libsndfile , lpcnetfreedv , portaudio -, pulseaudio , speexdsp , hamlib , wxGTK31-gtk3 +, pulseSupport ? config.pulseaudio or stdenv.isLinux }: stdenv.mkDerivation rec { @@ -33,17 +35,18 @@ stdenv.mkDerivation rec { speexdsp hamlib wxGTK31-gtk3 - ] ++ (if stdenv.isLinux then [ pulseaudio ] else [ portaudio ]); + ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]); cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" - ] ++ lib.optionals stdenv.isLinux [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; + ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; license = licenses.lgpl21; maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 29f8ec7b5e5..93836cee281 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99"; + sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 543e6820a76..52049302a27 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.10"; + version = "2.6.11"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU="; + sha256 = "sha256-iautgHOVzdLWYGOVu3wHBDt30uCbaP58mDz/l7buB1k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index b50cb4b71d0..4a51e88dc3b 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "0.99.10.1"; + version = "1.0.0"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-gqV+pJNaU+GnYiUo/imofgNdeM+AtDg/pSH7aoqhkYA="; + sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix new file mode 100644 index 00000000000..02e00cd19ad --- /dev/null +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: + +stdenv.mkDerivation rec { + pname = "angsd"; + version = "0.937"; + + src = fetchFromGitHub { + owner = "ANGSD"; + repo = "angsd"; + sha256 = "1020gh066dprqhfi90ywqzqqnq7awn49wrkkjnizmmab52v00kxs"; + rev = "${version}"; + }; + + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; + + meta = with lib; { + description = "Program for analysing NGS data"; + homepage = "http://www.popgen.dk/angsd"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2; + }; +} + diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 68cdd9f120b..bbe661b4f0a 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1260"; + version = "1268"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-bJNvoHr2sQYtiC3tr1GA0T0kRhDyx6hU3OOSTvKUSCs="; + sha256 = "sha256-9yzeLg3xporl32sZ1Ks8s63jXJNGUiI64XyQmhbQF4M="; }; nativeBuildInputs = [ unzip ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genomic sequence aligner"; - homepage = "http://last.cbrc.jp/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/mcfrith/last"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index bba8a02b76e..7e162e2d27c 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + installPhase = '' mkdir -p $out/bin cp minimap2 $out/bin @@ -25,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; - badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index cc983e24618..246618d4eaf 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.24"; + version = "14.32.33"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-YxYNb2fS7KiUkZDSRx4FN+ZeMMNpfTaElitRE4RtD0g="; + sha256 = "sha256-aImV5zgXjsXdRJLrYIomDymXHRhxuOwGYAwpMIr7wak="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 3c2b11c0e29..698095715cc 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "22.3.0"; + version = "22.7.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg="; + sha256 = "sha256-xK4C+0/Qpc2vXPmsI8KuHuDJLmJ5LXdAfRIREE+gkWA="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix new file mode 100644 index 00000000000..fc840fe45fb --- /dev/null +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: + +stdenv.mkDerivation rec { + pname = "QtRVSim"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "cvut"; + repo = "qtrvsim"; + rev = "refs/tags/v${version}"; + sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "RISC-V CPU simulator for education purposes"; + longDescription = '' + RISC-V CPU simulator for education purposes with pipeline and cache visualization. + Developed at FEE CTU for computer architecture classes. + ''; + homepage = "https://github.com/cvut/qtrvsim"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jdupak ]; + mainProgram = "qtrvsim_gui"; + }; +} diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix new file mode 100644 index 00000000000..7f0b5625e85 --- /dev/null +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, lib +, gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "gaw"; + version = "20220315"; + + src = fetchurl { + url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; + sha256 = "0j2bqi9444s1mfbr7x9rqp232xf7ab9z7ifsnl305jsklp6qmrbg"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + meta = with lib; { + description = "Gtk Analog Wave viewer"; + longDescription = '' + Gaw is a software tool for displaying analog waveforms from + sampled datas, for example from the output of simulators or + input from sound cards. Data can be imported to gaw using files, + direct tcp/ip connection or directly from the sound card. + ''; + homepage = "http://gaw.tuxfamily.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix new file mode 100644 index 00000000000..25fa0aca467 --- /dev/null +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, lib +, bison +, cairo +, flex +, libX11 +, libXpm +, pkg-config +, tcl +, tk +}: + +stdenv.mkDerivation rec { + pname = "xschem"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "StefanSchippers"; + repo = "xschem"; + rev = version; + sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + }; + + nativeBuildInputs = [ bison flex pkg-config ]; + + buildInputs = [ cairo libX11 libXpm tcl tk ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "Schematic capture and netlisting EDA tool"; + longDescription = '' + Xschem is a schematic capture program, it allows creation of + hierarchical representation of circuits with a top down approach. + By focusing on interfaces, hierarchy and instance properties a + complex system can be described in terms of simpler building + blocks. A VHDL or Verilog or Spice netlist can be generated from + the drawn schematic, allowing the simulation of the circuit. + ''; + homepage = "https://xschem.sourceforge.io/stefan/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fe73f4f4d6e..60454ca9ce9 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2021.11.12"; + version = "2022.03.04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; - hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; + rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; + hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 22e755bd852..b5e5ca8723d 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.2"; + version = "3.42.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "402f41cdedbd46a368fb7807bebe83550d887631"; - sha256 = "0jddakr07ixspw19xblpj1882vxxaljg3fflhn4myvigwzkav334"; + rev = "b35d4695da88139a9168f2ad7acf0782e66dc4f0"; + sha256 = "02rpigw6lnyjw8ccrlp2mcvswawkhl5y6kqa3zq76qp1fdjqjrbp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix new file mode 100644 index 00000000000..021c612d106 --- /dev/null +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "nuXmv"; + version = "2.0.0"; + + src = fetchurl { + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-linux64.tar.gz"; + sha256 = "0nndrw994clf8lnlcfzdf1mf00vif3fvd4xsiwcjpbyk12091zqr"; + }; + + installPhase= '' + runHook preInstall + install -Dm755 -t $out/bin ./bin/nuXmv + runHook postInstall + ''; + + meta = with lib; { + description = "Symbolic model checker for analysis of finite and infinite state systems"; + homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + license = licenses.unfree; + maintainers = with maintainers; [ siraben ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index e701fb2711f..9f104ab80a6 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.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; + sha256 = "sha256-3F4Q/ZWlgkiiW7QVjnaaDLSNLVdfAOSmwYdQo1v9Lv4="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 4bd237f8783..f91d72ff3f6 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.2"; + version = "4.1.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8="; + sha256 = "sha256-Ff9bMzxhCUBgsqUunB2OxVzELdAp45yiKr2qkJUm/tY="; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 2fe027365cd..3e7a8b56af1 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { gtk3 gtksourceview libgee - pantheon.elementary-icon-theme pantheon.granite webkitgtk # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7ba5838faba..4f68eb6ae78 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-l9lR5MVHWiRz5RG/I/nXRY4GQSSaXXP7PlRNoAu9+yo="; + sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch b/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch deleted file mode 100644 index 871e494c362..00000000000 --- a/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py -index 8a455b69b0..a93e1c9e04 100644 ---- a/src/sage/repl/interface_magic.py -+++ b/src/sage/repl/interface_magic.py -@@ -260,7 +260,7 @@ class InterfaceMagic(object): - 2 - 120 - sage: shell.run_cell('%%gap foo\n1+1;\n') -- ...File "<string>", line unknown -+ ...File...<string>... - SyntaxError: Interface magics have no options, got "foo" - <BLANKLINE> - sage: shell.run_cell('%%gap?') -diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py -index 71dbe429fd..36b1d986d6 100644 ---- a/src/sage/repl/interpreter.py -+++ b/src/sage/repl/interpreter.py -@@ -70,25 +70,6 @@ that shell. The bulk of this functionality is provided through - - TESTS: - --Check that Cython source code appears in tracebacks:: -- -- sage: from sage.repl.interpreter import get_test_shell -- sage: shell = get_test_shell() -- sage: print("dummy line"); shell.run_cell('1/0') # see #25320 for the reason of the `...` and the dummy line in this test -- dummy line -- ... -- ZeroDivisionError...Traceback (most recent call last) -- <ipython-input-...> in <module>... -- ----> 1 Integer(1)/Integer(0) -- .../sage/rings/integer.pyx in sage.rings.integer.Integer...div... -- ... -- -> ... raise ZeroDivisionError("rational division by zero") -- ....: x = <Rational> Rational.__new__(Rational) -- ....: mpq_div_zz(x.value, ....value, (<Integer>right).value) -- <BLANKLINE> -- ZeroDivisionError: rational division by zero -- sage: shell.quit() -- - Test prompt transformer:: - - sage: from sage.repl.interpreter import SagePromptTransformer -@@ -423,7 +404,7 @@ def SagePreparseTransformer(lines): - sage: from sage.repl.interpreter import get_test_shell - sage: shell = get_test_shell() - sage: shell.run_cell(bad_syntax) -- File "<string>", line unknown -+ File...<string>... - SyntaxError: Mismatched ']' - <BLANKLINE> - sage: shell.quit() diff --git a/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch new file mode 100644 index 00000000000..5fea8830903 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch @@ -0,0 +1,81 @@ +diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py +index 3f1dcdb538..b6fa8d1fbd 100644 +--- a/src/sage/interfaces/tachyon.py ++++ b/src/sage/interfaces/tachyon.py +@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section. + The {\bf PROJECTION} keyword must be followed by one of the supported + camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF}, + {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}. The {\bf FISHEYE} projection mode +-requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE} ++requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE} + which precede the regular camera options. + + \begin{verbatim} + Camera + projection perspective_dof +- focallength 0.75 ++ focaldist 0.75 + aperture 0.02 + Zoom 0.666667 + Aspectratio 1.000000 +diff --git a/src/sage/plot/plot3d/tachyon.py b/src/sage/plot/plot3d/tachyon.py +index 08caf38d67..3e827411ce 100644 +--- a/src/sage/plot/plot3d/tachyon.py ++++ b/src/sage/plot/plot3d/tachyon.py +@@ -92,7 +92,7 @@ angle, right angle):: + Finally there is the ``projection='perspective_dof'`` option. :: + + sage: T = Tachyon(xres=800, antialiasing=4, raydepth=10, +- ....: projection='perspective_dof', focallength='1.0', aperture='.0025') ++ ....: projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -186,7 +186,7 @@ class Tachyon(WithEqualityById, SageObject): + or ``'fisheye'``. + - ``frustum`` - (default ''), otherwise list of four numbers. Only + used with projection='fisheye'. +- - ``focallength`` - (default ''), otherwise a number. Only used ++ - ``focaldist`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. + - ``aperture`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. +@@ -331,7 +331,7 @@ class Tachyon(WithEqualityById, SageObject): + Use of the ``projection='perspective_dof'`` option. This may not be + implemented correctly. :: + +- sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focallength='1.0', aperture='.0025') ++ sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -365,7 +365,7 @@ class Tachyon(WithEqualityById, SageObject): + look_at=[0, 0, 0], + viewdir=None, + projection='PERSPECTIVE', +- focallength='', ++ focaldist='', + aperture='', + frustum=''): + r""" +@@ -391,7 +391,7 @@ class Tachyon(WithEqualityById, SageObject): + self._camera_position = (-3, 0, 0) # default value + self._updir = updir + self._projection = projection +- self._focallength = focallength ++ self._focaldist = focaldist + self._aperture = aperture + self._frustum = frustum + self._objects = [] +@@ -624,9 +624,9 @@ class Tachyon(WithEqualityById, SageObject): + camera_out = r""" + camera + projection %s""" % (tostr(self._projection)) +- if self._focallength != '': ++ if self._focaldist != '': + camera_out = camera_out + r""" +- focallength %s""" % (float(self._focallength)) ++ focaldist %s""" % (float(self._focaldist)) + if self._aperture != '': + camera_out = camera_out + r""" + aperture %s""" % (float(self._aperture)) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 73a5881d214..22e3a288b7d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -119,15 +119,13 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/32959 ./patches/linbox-1.7-upgrade.patch - # To emit better tracebacks, IPython 8 parses Python files using the ast - # module (via the stack_data package). Since Cython is a superset of Python, - # this results in no Cython code being printed in tracebacks. Fixing this - # properly is tracked in https://github.com/alexmojaki/stack_data/issues/21, - # but for now we just disable the corresponding test. An alternative would - # be to revert IPython's IPython/core/ultratb.py, but this would need to be - # Sage-specific (since it would worsen tracebacks for pure Python code). - # Sage tracks this at https://trac.sagemath.org/ticket/33170 - ./patches/no-cython-sources-in-tracebacks-on-ipython8.patch + # https://trac.sagemath.org/ticket/33170 + (fetchSageDiff { + base = "9.5.rc1"; + name = "ipython-8-update.patch"; + rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231"; + sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw="; + }) # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { @@ -155,6 +153,9 @@ stdenv.mkDerivation rec { rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085"; sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA="; }) + + # adapted from https://trac.sagemath.org/ticket/23712#comment:22 + ./patches/tachyon-renamed-focallength.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index bd2f94ac4a7..3ca998643ac 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.5.1"; + version = "0.6.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "v${version}"; - sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo="; + sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ="; }; nativeBuildInputs = [ @@ -52,7 +52,6 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ bibtexparser pygobject3 - watchgod ]; postPatch = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f8037c01e08..872438158d6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Hardcode path to fix use with cmake sed -i cmake/scripts/ROOTConfig.cmake.in \ - -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ '' + lib.optionalString noSplash '' diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 3dbb1a4bf5a..3f0a6a6cde5 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -12,11 +12,11 @@ let }; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.74"; + version = "1.3.76"; src = fetchurl { url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; - sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + sha256 = "sha256-vdunUGwLjDKf1LDhtyTQAExddecyWc1TdZOyuu0qMlk="; }; nativeBuildInputs = [ makeWrapper mono unzip ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 653d727525e..5de6e1165dc 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; + sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc="; fetchSubmodules = true; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stsdc/monitor"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; mainProgram = "com.github.stsdc.monitor"; }; } diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 78c6c0988c5..e7730ba4b94 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q/ulRgU6zNLRZUjL83O/Krx85voPWZPZDo65CLp/aOg="; }; - cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM="; + cargoSha256 = "sha256-S1V8hDuzp4sf6945gqs8QNVdu8jwPGVYjVbV6EY28Hk="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4c46bcc6c3f..e8fbb8cb9fa 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,48 +1,42 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ fetchzip, lib, stdenvNoCC }: /* - This derivation is impure: it relies on an Xcode toolchain being installed - and available in the expected place. The values of sandboxProfile - are copied pretty directly from the MacVim derivation, which - is also impure. In order to build you at least need the `sandbox` - option set to `relaxed` or `false`. + This cannot be built from source as it requires entitlements and + for that it needs to be code signed. Automatic updates will have + to be disabled via preferences instead of at build time. To do + that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist + and add: + SUEnableAutomaticChecks = 0; */ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.14"; + version = "3.4.15"; - src = fetchFromGitHub { - owner = "gnachman"; - repo = "iTerm2"; - rev = "v${version}"; - sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; + src = fetchzip { + url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; + sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo="; }; - patches = [ ./disable_updates.patch ]; - postPatch = '' - sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj - ''; - - preConfigure = "LD=$CC"; - makeFlagsArray = ["Nix"]; installPhase = '' - mkdir -p $out/Applications - mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + runHook preInstall + APP_DIR="$out/Applications/iTerm2.app" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/iterm2" + #!${stdenvNoCC.shell} + open -na "$APP_DIR" --args "$@" + EOF + chmod +x "$out/bin/iterm2" + runHook postInstall ''; meta = with lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = "https://www.iterm2.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.darwin; - hydraPlatforms = []; + maintainers = with maintainers; [ steinybot tricktron ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cca7e7eb9b9..1e6db04dd76 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,36 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, - libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext, wayland-protocols, wayland, - lcms2, - librsync, - installShellFiles, - dbus, - darwin, - Cocoa, - CoreGraphics, - Foundation, - IOKit, - Kernel, - OpenGL, - libcanberra, - libicns, - libpng, - python3, - zlib, +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel +, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor +, libxkbcommon, libXi, libXext, wayland-protocols, wayland +, lcms2 +, librsync +, installShellFiles +, dbus +, darwin +, Cocoa +, CoreGraphics +, Foundation +, IOKit +, Kernel +, OpenGL +, libcanberra +, libicns +, libpng +, python3 +, zlib +, bashInteractive +, zsh +, fish +, fetchpatch }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.2"; + version = "0.24.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs="; + sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug="; }; buildInputs = [ @@ -74,6 +78,19 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; + patches = [ + (fetchpatch { + name = "fix-zsh-completion-test-1.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch"; + sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE="; + }) + (fetchpatch { + name = "fix-zsh-completion-test-2.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; + sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; + }) + ]; + # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; @@ -101,7 +118,14 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ pillow ]; + checkInputs = [ + pillow + + # Shells needed for shell integration tests + bashInteractive + zsh + fish + ]; checkPhase = let buildBinPath = @@ -132,9 +156,9 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" installShellCompletion --cmd kitty \ - --bash <("$out/bin/kitty" + complete setup bash) \ - --fish <("$out/bin/kitty" + complete setup fish) \ - --zsh <("$out/bin/kitty" + complete setup zsh) + --bash <("$out/bin/kitty" +complete setup bash) \ + --fish <("$out/bin/kitty" +complete setup fish2) \ + --zsh <("$out/bin/kitty" +complete setup zsh) terminfo_src=${if stdenv.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index da9bfac952b..3e4454726b6 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.11.1"; + version = "3.12.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; + sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index fc12b1addf6..ce729fab027 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220101-133340-7edc5b5a"; + version = "20220319-142410-0fcdea07"; outputs = [ "out" "terminfo" ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM="; + sha256 = "sha256-KmIlfzSbVY003WesodN5srJ7qEQaU93izmrZW1MobCo="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc"; + cargoSha256 = "sha256-+Iu6/pd14O1QIsLkHe7fTP30XyI+8J0GiRY8cnRPS5I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 738260646f2..3530b2d1d2f 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 = "370"; + version = "372"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; + sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 0aa3f0d02ab..38aca7350a6 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ="; + sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js="; deepClone = true; }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index a0dc4a205d6..c1f2c281c7a 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-RlEPC9yyPYj974UVto7w+r24Lc5+Et1Ks49o+QTdrZQ="; + sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; }; - cargoSha256 = "sha256-4tOeYiRBF4qDUiI6yU093y0Ttq7+CdmGaA5eqdMjgow="; + cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/git-and-tools/gg/default.nix index 7bb0dec9eb2..032c461a74c 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -10,8 +10,8 @@ }: let - version = "1.2.1"; - commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57"; + version = "1.3.0"; + commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f"; in buildGoModule { pname = "gg-scm"; inherit version; @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95"; + sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 3774b43d37d..36b813f547e 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-T0xThL4VHzpNMQV8fTVnG7R+D9ol/Z7a4MYMXbkQ680="; + sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c="; }; - vendorSha256 = "sha256-tJg/vekGUYP4q1ZP5UV3+lXv6bht4doVV3IaGH+4uf8="; + vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 87bd4d891c7..543e3a7501a 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.7.8"; + version = "1.7.11"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-NZlPcr13onxgbmKPdv0ODOhYDT5T+OeSvHE8VGOGyo4="; + sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index b93491e267c..c9bf60a1eb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-cctgZz65BliOePal4zrPpTbxMkz4GJj6gIh2YzEg+Do="; + sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; }; - cargoSha256 = "sha256-M/BNqLZnLthaBONwn5XMmulmqyZTWv5LQFvxASDrBCI="; + cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3fd3a37419f..829ebedc1e8 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 @@ -3,7 +3,6 @@ , fetchFromGitHub , installShellFiles , git -, stestr , nix-update-script , testVersion , git-machete @@ -22,19 +21,15 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git stestr ]; - - postCheck = '' - stestr run - ''; + checkInputs = [ git ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --fish completion/git-machete.fish ''; postInstallCheck = '' - git init test "$($out/bin/git-machete version)" = "git-machete version ${version}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 4490f8068e0..b76f7515eba 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; - version = "1.0.2.1"; + version = "1.0.3.2"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; rev = "v${version}"; - sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn"; + sha256 = "0b5lfbrcrvzpz380817md00lbgy5yl4y76vs3vm0bpm5wmr7c027"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index ec4db1631b0..a4e0290d310 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.2"; - sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; + version = "1.3.0"; + sha256 = "sha256-CFv9gZQHeEiZctJFyB6PJ1dVNkrQ7PlVtgZuteQQTJ0="; in stdenv.mkDerivation { pname = "git-vendor"; 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 3c110402912..f8034ce42d7 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.14"; + version = "1.5.15"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q1zPPT0gNI96n8PIk1qATRzxm5vmGmRMwZ9j7bb8knk="; + sha256 = "sha256-4oI0opwbmEyHc3zx06l8bDPnOi7rGrMqUJPBDAfmPY0="; }; - cargoSha256 = "sha256-JKM98cpZz2MTa+f2A7NRcKwGjbm4YRabMlV6DHXT64U="; + cargoSha256 = "sha256-rmECD/0ThDXBAGqDMNbyHi9eoGNOJhBndaxCuUS/qpc="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f1be6a4fc8d..8f4acbc3fc4 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl"; + sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90="; }; subPackages = [ "." ]; - vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6"; + vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g="; doCheck = false; 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 7d91fb77542..e1129a72742 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 @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg"; + sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko="; }; - cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY="; + cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index a431a50af3b..63f7a459a70 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; + sha256 = "sha256-An9JKnS/Uor7iZ+lbBGR3eOkxOgV+SjnCWN/QmqFI/I="; }; propagatedBuildInputs = [ pyxdg ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f4eeb4aac12..7fe27da6080 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.21"; + version = "2.22"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-nl/NFbyL0MWgvpwaqkCOkKuSquFTQRKZ7Ski5qYRL9w="; + sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 7da383e325d..f08c88ab2fa 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.2"; + version = "1.16.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-fN7F76TzxBwvUbe2Ha5sfAk6x+FaUDIdx8YaQKfndSU="; + sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 319fddcc06b..83991407fd4 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.6"; + version = "2.9.9"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-YL3Gc76jWfQvY96pAlS5JB7BwSOUklNvGR0tOBdQHuE="; + sha256 = "sha256-LMKOxQR3Bgw00LnKqAe2hq+eASgwC7y0cxNSSt/sjWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 55a2f1627b9..2cdc2936535 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,7 +3,7 @@ , 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, unzip, copyDesktopItems +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon }: with lib; @@ -11,22 +11,25 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.2.1"; + version = "8.3.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA="; + sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs="; + sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4="; }; - aarch64-darwin = srcs.x86_64-darwin; + aarch64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; + sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ="; + }; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; @@ -85,6 +88,8 @@ let krb5 libdrm mesa + libxshmfence + libxkbcommon ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 462ff47afd7..73f84f7e9ef 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.8.2", - "repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc", - "yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x", + "version": "14.8.4", + "repo_hash": "0ra4d324all26crz84iys9xb40ykpiaqj4z2790zaw1s45wakmgj", + "yarn_hash": "106js1j6wii2axh1dxvlfr7mqhvsnsb5qs0danp9c3h1ihd4nz91", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.8.2-ee", + "rev": "v14.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.8.2", + "GITALY_SERVER_VERSION": "14.8.4", "GITLAB_PAGES_VERSION": "1.54.0", "GITLAB_SHELL_VERSION": "13.23.2", - "GITLAB_WORKHORSE_VERSION": "14.8.2" + "GITLAB_WORKHORSE_VERSION": "14.8.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b5a05dde1b4..877e0ace9fa 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.8.2"; + version = "14.8.4"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM="; + sha256 = "sha256-3doXqYj1XsOifAr78ds5ioa6gUfw8uyUwn7JzqlMVSE="; }; vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 76273acdff2..3533bccea98 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.8.2"; + version = "14.8.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix new file mode 100644 index 00000000000..3737828ef72 --- /dev/null +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtwebengine +, gitUpdater +}: + +mkDerivation rec { + pname = "gitqlient"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "018jz6b28zwr205jmgw13ddlfvlhxqf0cw1pfjiwsi6i8gay7w6s"; + }; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtwebengine + ]; + + qmakeFlags = [ + "GitQlient.pro" + ]; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + homepage = "https://github.com/francescmm/GitQlient"; + description = "Multi-platform Git client written with Qt"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 3f9d8442ea4..cf0622a6b0e 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,13 +8,13 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "sha256-t2aXRYCr54sqXwv6cJHDf1z1z94SqJM0WQRd2ejc7XY="; + sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo="; }; vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo="; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix new file mode 100644 index 00000000000..fbf800363ab --- /dev/null +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, dbus +, sqlite +, Security +, SystemConfiguration +, libiconv +, testVersion +, jujutsu +}: + +rustPlatform.buildRustPackage rec { + pname = "jujutsu"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "martinvonz"; + repo = "jj"; + rev = "v${version}"; + sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + }; + + cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; + + passthru.tests = { + version = testVersion { + package = jujutsu; + command = "jj --version"; + }; + }; + + meta = with lib; { + description = "A Git-compatible DVCS that is both simple and powerful"; + homepage = "https://github.com/martinvonz/jj"; + changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 17d21f30e3b..9dc3e0329e3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,13 +21,18 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.0.3"; + version = "6.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-Z/E2R6RlF6K1Z83Lc8mHIdddNqBDLeuxUCK3f5wTgzM="; + sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; }; + patches = [ + # Fix the type of libc buffer for aarch64-linux + ./fix-rhg-type-aarch64.patch + ]; + format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git @@ -35,7 +40,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; + sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -181,6 +186,10 @@ in nativeBuildInputs = self.nativeBuildInputs; dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch new file mode 100644 index 00000000000..84417b497c0 --- /dev/null +++ b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs +--- a/rust/hg-core/src/lock.rs ++++ b/rust/hg-core/src/lock.rs +@@ -145,7 +145,7 @@ lazy_static::lazy_static! { + + /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 + const BUFFER_SIZE: usize = 1024; +- let mut buffer = [0_i8; BUFFER_SIZE]; ++ let mut buffer = [0 as libc::c_char; BUFFER_SIZE]; + let hostname_bytes = unsafe { + let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); + if result != 0 { diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkrev/default.nix index 36e9154571b..66c1aa4d0e1 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkrev/default.nix @@ -1,18 +1,21 @@ { lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { - pname = "tkcvs"; - version = "8.2.1"; + pname = "tkrev"; + version = "9.4.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; + url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; + sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4="; }; buildInputs = [ tcl tk ]; patchPhase = '' - sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff + for file in tkrev/tkrev.tcl tkdiff/tkdiff; do + substituteInPlace "$file" \ + --replace "exec wish" "exec ${tk}/bin/wish" + done ''; installPhase = '' diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 66f3b9a0aaf..6a9903c25b2 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + sha256 = "sha256-UG13BlFY9DcsCPWaBiYa6r2oA3ieJtTYfXknDoKNkYI="; }; # Extension point for when thg's mercurial is lagging behind mainline. diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 4f09fc14d9f..0e97eab1773 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -12,7 +12,7 @@ , desktop-file-utils , makeWrapper , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook4 , meson , gjs , gtk4 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info # for update-mime-database - wrapGAppsHook # for gsettings + wrapGAppsHook4 # for gsettings ]; buildInputs = [ diff --git a/pkgs/applications/video/epgstation/client/package.json b/pkgs/applications/video/epgstation/client/package.json new file mode 100644 index 00000000000..6ba9974afa5 --- /dev/null +++ b/pkgs/applications/video/epgstation/client/package.json @@ -0,0 +1,57 @@ +{ + "name": "epgstation-client", + "version": "2.6.20", + "private": true, + "scripts": { + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "watch": "vue-cli-service build --watch --mode development" + }, + "dependencies": { + "@mdi/font": "6.5.95", + "aribb24.js": "1.8.8", + "axios": "0.24.0", + "eventemitter2": "6.4.5", + "hls.js": "1.1.2", + "inversify": "6.0.1", + "json-stable-stringify": "1.0.1", + "lodash": "4.17.21", + "material-design-icons-iconfont": "6.1.1", + "mpegts.js": "1.6.10", + "reflect-metadata": "0.1.13", + "resize-observer-polyfill": "1.5.1", + "roboto-fontface": "*", + "smoothscroll-polyfill": "0.4.4", + "socket.io-client": "4.3.2", + "typeface-roboto": "1.1.13", + "vue": "2.6.14", + "vue-class-component": "7.2.6", + "vue-property-decorator": "9.1.2", + "vue-router": "3.5.3", + "vuetify": "2.5.10", + "vuetify-datetime-picker": "2.1.1", + "@types/hls.js": "0.13.3", + "@types/json-stable-stringify": "1.0.33", + "@types/lodash": "4.14.178", + "@types/smoothscroll-polyfill": "0.3.1", + "@types/socket.io-client": "1.4.36", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "@vue/cli-plugin-eslint": "4.5.12", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/eslint-config-prettier": "6.0.0", + "@vue/eslint-config-typescript": "7.0.0", + "eslint": "7.32.0", + "eslint-plugin-prettier": "3.4.1", + "eslint-plugin-vue": "7.20.0", + "prettier": "2.4.1", + "sass": "1.32.12", + "sass-loader": "10.2.0", + "typescript": "4.4.4", + "vue-cli-plugin-vuetify": "2.4.3", + "vue-template-compiler": "2.6.14", + "vuetify-loader": "1.7.3" + } +} diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 3d910ad4c0e..77510ae153d 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -10,17 +10,18 @@ , nodePackages , gzip , jq +, yq }: let # NOTE: use updateScript to bump the package version pname = "EPGStation"; - version = "1.7.5"; + version = "2.6.20"; src = fetchFromGitHub { owner = "l3tnun"; repo = "EPGStation"; rev = "v${version}"; - sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; workaround-opencollective-buildfailures = stdenv.mkDerivation { @@ -35,19 +36,44 @@ let ''; }; - pkg = nodePackages.epgstation.override (drv: { + client = nodePackages.epgstation-client.override (drv: { + # FIXME: remove this option if possible + # + # Unsetting this option resulted NPM attempting to re-download packages. + dontNpmInstall = true; + + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; + }); + + server = nodePackages.epgstation.override (drv: { inherit src; + bypassCache = false; + + # This is set to false to keep devDependencies at build time. Build time + # dependencies are pruned afterwards. + production = false; + buildInputs = [ bash ]; nativeBuildInputs = [ + nodejs workaround-opencollective-buildfailures makeWrapper - nodePackages.node-pre-gyp - ]; + ] ++ (with nodePackages; [ + node-pre-gyp + node-gyp-build + ]); preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} + patch -p1 < ${./use-mysql-over-domain-socket.patch} + + # Workaround for https://github.com/svanderburg/node2nix/issues/275 + sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + + find . -name package-lock.json -delete ''; postInstall = let @@ -56,12 +82,19 @@ let '' mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - pushd $out/lib/node_modules/EPGStation + pushd $out/lib/node_modules/epgstation + + cp -r ${client}/lib/node_modules/epgstation-client/node_modules client/node_modules + chmod -R u+w client/node_modules npm run build + npm prune --production + pushd client + npm prune --production + popd - mv config/{enc.sh,enc.js} $out/libexec + mv config/enc.js.template $out/libexec/enc.js mv LICENSE Readme.md $out/share/doc/epgstation mv doc/* $out/share/doc/epgstation sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ @@ -82,8 +115,9 @@ let ln -sfT /var/lib/epgstation/thumbnail thumbnail makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --run "cd $out/lib/node_modules/epgstation" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + --set APP_ROOT_PATH "$out/lib/node_modules/epgstation" popd ''; @@ -99,22 +133,25 @@ let common-updater-scripts genericUpdater writers - jq; + jq + yq; }; # nodePackages.epgstation is a stub package to fetch npm dependencies and - # is marked as broken to prevent users from installing it directly. This - # technique ensures epgstation can share npm packages with the rest of - # nixpkgs while still allowing us to heavily customize the build. It also - # allows us to provide devDependencies for the epgstation build process - # without doing the same for all the other node packages. - meta = drv.meta // { broken = false; }; + # its meta.platforms is made empty to prevent users from installing it + # directly. This technique ensures epgstation can share npm packages with + # the rest of nixpkgs while still allowing us to heavily customize the + # build. It also allows us to provide devDependencies for the epgstation + # build process without doing the same for all the other node packages. + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; }); in -pkg // { +server // { name = "${pname}-${version}"; - meta = with lib; pkg.meta // { + meta = with lib; server.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/applications/video/epgstation/epgstation.1 index bb5c0238137..2dc67f64608 100644 --- a/pkgs/applications/video/epgstation/epgstation.1 +++ b/pkgs/applications/video/epgstation/epgstation.1 @@ -27,7 +27,7 @@ platforms, run to start EPGStation. .Sh FILES .Bl -tag -width Ds -compact -.It Pa /etc/epgstation/config.json +.It Pa /etc/epgstation/config.yml .Nm configuration file. .El @@ -48,5 +48,9 @@ Restore the EPGstation database. .Pp .Dl $ epgstation run restore /path/to/src .Pp +Restore the EPGstation database from the prior v1 release. +.Pp +.Dl $ epgstation run v1migrate /path/to/src +.Pp .Sh SEE ALSO .Xr npm 1 diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json index 53b1ebca2da..cf302a95161 100644 --- a/pkgs/applications/video/epgstation/package.json +++ b/pkgs/applications/video/epgstation/package.json @@ -1,85 +1,72 @@ { - "name": "EPGStation", - "version": "1.7.5", + "name": "epgstation", + "version": "2.6.20", "description": "DTV Software in Japan.", "repository": { "type": "git", - "url": "https://github.com/l3tnun/EPGStation.git" + "url": "git+https://github.com/l3tnun/EPGStation-V2.git" }, "author": "l3tnun", "license": "MIT", "bugs": { - "url": "https://github.com/l3tnun/EPGStation/issues" - }, - "homepage": "https://github.com/l3tnun/EPGStation#readme", - "engines": { - "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + "url": "https://github.com/l3tnun/EPGStation-V2/issues" }, + "homepage": "https://github.com/l3tnun/EPGStation-V2#readme", "dependencies": { - "aribts": "^2.1.12", - "b24.js": "1.0.3", - "basic-auth": "2.0.1", + "arib-subtitle-timedmetadater": "4.0.9", + "aribts": "2.1.12", + "axios": "0.24.0", "body-parser": "1.19.0", - "chart.js": "2.9.3", - "css-ripple-effect": "1.0.5", - "diskusage": "1.1.3", + "cors": "2.8.5", + "diskusage-ng": "1.0.2", "express": "4.17.1", - "express-openapi": "7.0.1", - "fs-extra": "9.0.1", - "hls-b24.js": "0.12.3", - "js-yaml": "3.14.0", - "lodash": "4.17.20", + "express-openapi": "9.3.0", + "file-type": "16.5.3", + "inversify": "5.1.1", + "js-yaml": "4.1.0", + "lodash": "4.17.21", "log4js": "6.3.0", - "material-design-icons": "3.0.1", - "material-design-lite": "1.3.0", "minimist": "1.2.5", - "mirakurun": "3.3.1", - "mithril": "2.0.4", + "mirakurun": "3.9.0-beta.26", "mkdirp": "1.0.4", - "multer": "1.4.2", + "multer": "1.4.3", "mysql": "2.18.1", - "openapi-types": "7.0.1", - "pg": "8.3.3", - "request": "2.88.2", - "socket.io": "2.3.0", - "socket.io-client": "2.3.0", - "sqlite3": "5.0.0", - "swagger-ui-dist": "3.34.0", + "openapi-types": "9.3.0", + "reflect-metadata": "0.1.13", + "socket.io": "4.3.1", + "source-map-support": "0.5.20", + "sqlite3": "5.0.2", + "swagger-ui-dist": "3.52.5", + "typeorm": "0.2.38", "url-join": "4.0.1", - "@types/basic-auth": "1.1.3", - "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.24", - "@types/express": "4.17.8", - "@types/hls.js": "0.13.1", - "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.161", - "@types/material-design-lite": "1.1.16", - "@types/minimist": "1.2.0", - "@types/mithril": "2.0.3", - "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.4", - "@types/mysql": "2.15.15", - "@types/node": "14.11.1", - "@types/pg": "7.14.5", - "@types/request": "2.48.5", - "@types/socket.io": "2.1.11", - "@types/socket.io-client": "1.4.33", - "@types/sqlite3": "3.1.6", - "@types/url-join": "4.0.0", - "del": "5.1.0", + "@types/body-parser": "1.19.1", + "@types/express": "4.17.13", + "@types/file-type": "10.9.1", + "@types/js-yaml": "4.0.4", + "@types/lodash": "4.14.176", + "@types/minimist": "1.2.2", + "@types/mkdirp": "1.0.2", + "@types/mongodb": "4.0.6", + "@types/multer": "1.4.7", + "@types/node": "16.11.6", + "@types/socket.io": "3.0.1", + "@types/source-map-support": "0.5.4", + "@types/sqlite3": "3.1.7", + "@types/url-join": "4.0.1", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "del": "6.0.0", + "eslint": "7.32.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.1", "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-concat": "2.6.1", - "gulp-dart-sass": "1.0.2", + "gulp-eslint": "6.0.0", "gulp-plumber": "1.2.1", - "gulp-sourcemaps": "2.6.5", - "gulp-tslint": "8.1.4", + "gulp-sourcemaps": "3.0.0", "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "4.2.2", - "ts-loader": "8.0.4", - "tslint": "6.1.3", - "typescript": "4.0.3", - "webpack": "4.44.2", - "webpack-stream": "6.1.0" + "prettier": "2.4.1", + "ts-loader": "9.2.6", + "ts-node": "10.4.0", + "typescript": "4.4.4" } } diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 5c2fbe66f04..5eb23be6c52 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -6,6 +6,7 @@ , genericUpdater , writers , jq +, yq }: let @@ -40,6 +41,11 @@ in writers.writeBash "update-epgstation" '' } | del(.devDependencies, .main, .scripts)' \ "$SRC/package.json" \ > package.json + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/client/package.json" \ + > client/package.json # Regenerate node packages to update the pre-overriden epgstation derivation. # This must come *after* package.json has been regenerated. @@ -49,18 +55,11 @@ in writers.writeBash "update-epgstation" '' # Generate default streaming settings for the nixos module. pushd ../../../../nixos/modules/services/video/epgstation - ${jq}/bin/jq ' - { liveHLS - , liveMP4 - , liveWebM - , mpegTsStreaming - , mpegTsViewer - , recordedDownloader - , recordedStreaming - , recordedHLS - , recordedViewer - }' \ - "$SRC/config/config.sample.json" \ + ${yq}/bin/yq -j '{ urlscheme , stream }' \ + "$SRC/config/config.yml.template" \ > streaming.json + + # Fix generated output for EditorConfig compliance + printf '\n' >> streaming.json # rule: insert_final_newline popd '' diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch index 48640f2ba08..87bb3e7fbd1 100644 --- a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch +++ b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -1,17 +1,46 @@ -diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts -index d23badd..1dd2b98 100644 ---- a/src/server/ConfigInterface.ts -+++ b/src/server/ConfigInterface.ts -@@ -11,9 +11,10 @@ interface ConfigInterface { - dbPath: string; - dbInfoPath: string; - mysql: { +diff --git a/ormconfig.js b/ormconfig.js +index 5591853b..838c06cb 100644 +--- a/ormconfig.js ++++ b/ormconfig.js +@@ -38,8 +38,6 @@ switch (config.dbtype) { + + case 'mysql': + ormConfig.type = 'mysql'; +- ormConfig.host = config.mysql.host; +- ormConfig.port = config.mysql.port; + ormConfig.username = config.mysql.user; + ormConfig.password = config.mysql.password; + ormConfig.database = config.mysql.database; +@@ -49,6 +47,12 @@ switch (config.dbtype) { + } else { + ormConfig.charset = config.mysql.charset; + } ++ if (config.mysql.socketPath) { ++ ormConfig.socketPath = config.mysql.socketPath; ++ } else { ++ ormConfig.host = config.mysql.host; ++ ormConfig.port = config.mysql.port; ++ } + break; + + case 'postgres': +diff --git a/src/model/IConfigFile.ts b/src/model/IConfigFile.ts +index 6a502e83..ba84a423 100644 +--- a/src/model/IConfigFile.ts ++++ b/src/model/IConfigFile.ts +@@ -61,12 +61,13 @@ export default interface IConfigFile { + regexp?: boolean; + }; + mysql?: { - host: string; + host?: string; -+ socketPath?: string; user: string; -- password: string; -+ password?: string; +- port: number; ++ port?: number; + password: string; database: string; - connectTimeout: number; - connectionLimit: number; + charset?: string; ++ socketPath?: string; + }; + postgres?: { + host: string; diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix index 33e1863428e..7c091b425af 100644 --- a/pkgs/applications/video/f1viewer/default.nix +++ b/pkgs/applications/video/f1viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f1viewer"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "SoMuchForSubtlety"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cTXueIOD+OXx4WikhdNv3v/F2/f5aDicyPP7FgTU6AM="; + sha256 = "sha256-MY8xqpAzK1c4XL7w/LR83DyHFCI5X7wldosDDo7pXNI="; }; - vendorSha256 = "sha256-47uLx4t0N1T3zqZ9o/su/onJEUdGXpq+iVSUaRnwW3I="; + vendorSha256 = "sha256-8c1+t6Lo11Q2kEDy9IWLw9bsZYtJFksE7Om3ysx7fc4="; meta = with lib; { description = diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index add2e525dc9..a2f802c6e87 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.7"; + version = "1.22.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU="; + sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 8b90704a535..c93be6b6383 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/scalable/apps cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share + cp -a ${appimageContents}/usr/share/icons/hicolor/scalable/freetube.svg $out/share/icons/hicolor/scalable/apps substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 0ffb5170dc2..99ddd7b24b6 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCOyeXo3uoR4ry/nFbF+//U62/hHnPK+tbG+8Rv6Rv0="; + sha256 = "sha256-h8qWwMaEhXnj6ZSrKAXBVbrMR0je41EoOtFeN9XlCuk="; }; - vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; + vendorSha256 = "sha256-PpMLHuJR6irp+QHhzguwGtBy30HM7DR0tNGiwB07M5E="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 758e509b85d..9c7041441ff 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "19.0.2"; + version = "19.1.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho="; + sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 89eeed89048..18319468eae 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,24 +38,24 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20211024"; - kodiVersion = "19.3"; + kodiReleaseDate = "20220303"; + kodiVersion = "19.4"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw"; + sha256 = "sha256-XDtmY3KthiD91kvueQRSamBcdM7fBpRntmZX6KRsCzE="; }; ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.2"; + version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-${kodiVersion}"; + rev = "${version}-${rel}-19.2"; sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; }; preConfigure = '' diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index 460b0a17668..ea69ea547df 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -2,7 +2,7 @@ let pname = "lbry-desktop"; - version = "0.52.4"; + version = "0.52.5"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "TWRFCVktSKs5PORtm8FvM6qNWuiL/1HN98ilr1busVUGvain0QXGZwB/Dzvsox1c+X9VofUdapzozSOT6r58qw=="; + sha512 = "i0t1Ygf3el7Brh6TA804V6n5r5UczvOPxAdhyJ7Gvvg9VqN1+QXB6hsqF4jYTW3jcKxvorVALwrFDVezBTPv5g=="; }; }; diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index d1f60c3dd2c..e6be6f54e1d 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: let pname = "losslesscut"; @@ -11,7 +11,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv"; + inherit sha256; }; extracted = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 01f9c158062..be7786f9102 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.33.1"; - appimage = callPackage ./appimage.nix { inherit version; }; - dmg = callPackage ./dmg.nix { inherit version; }; - windows = callPackage ./windows.nix { inherit version; }; + version = "3.43.0"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows @@ -13,7 +13,7 @@ in ( meta = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; - license = licenses.mit; + license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; } // oldAttrs.meta // { platforms = diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3d0bad19757..3cbd77198b9 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchurl, undmg, version }: +{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: let pname = "losslesscut"; @@ -10,7 +10,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj"; + inherit sha256; }; in stdenvNoCC.mkDerivation { inherit pname version src; diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index fe5df9d6c90..0e6ed9b0412 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -3,6 +3,7 @@ , fetchurl , unzip , version +, sha256 , useMklink ? false , customSymlinkCommand ? null }: @@ -18,12 +19,12 @@ let else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); in stdenvNoCC.mkDerivation { - inherit pname version; + inherit pname version sha256; src = fetchurl { name = nameSource; url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb"; + inherit sha256; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 26d80b1596c..712ccacd7a0 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.16.5"; + version = "1.16.7"; # 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 = "1y14yxhjj0sdq0s24qr58m0ddhna2rf0q0w3ny888as4wbqiwvm0"; + sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs="; }; 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 = "131vdi4gyc996z77rrcqb9nfbd62j8314ai4ib1jnilmrsrk93p5"; + sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8="; }; in mkDerivation { @@ -55,15 +55,15 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop - install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* - install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* - install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* - install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* - install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop + install -Dm444 -t $out/share/icons/hicolor/16x16/apps ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* + install -Dm444 -t $out/share/icons/hicolor/32x32/apps ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* + install -Dm444 -t $out/share/icons/hicolor/64x64/apps ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* + install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* + install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* runHook postInstall ''; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0928c7617f9..137731312b0 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "65.0.0"; + version = "66.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1zphcpfrzic9ialx3xxi2ywzxnllys667vy140bgdshzr798sg2p"; + sha256 = "sha256-JTPayZhV3Z+o1v+TbHp9SGMAZk1oEzMdNhk67BYB75A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 576f79c4779..3ceda57fb89 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,7 +15,6 @@ , freetype , libass , libpthreadstubs -, mujs , nv-codec-headers , lua , libuchardet @@ -56,6 +55,7 @@ , cmsSupport ? true, lcms2 , dvdnavSupport ? stdenv.isLinux, libdvdnav , jackaudioSupport ? false, libjack2 +, javascriptSupport ? true, mujs , libpngSupport ? true, libpng , openalSupport ? true, openalSoft , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature archiveSupport "libarchive") (lib.enableFeature cddaSupport "cdda") (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature javascriptSupport "javascript") (lib.enableFeature openalSupport "openal") (lib.enableFeature sdl2Support "sdl2") (lib.enableFeature sixelSupport "sixel") @@ -134,7 +135,6 @@ in stdenv.mkDerivation rec { libpthreadstubs libuchardet luaEnv - mujs ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] @@ -145,6 +145,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ] ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals javascriptSupport [ mujs ] ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] ++ lib.optionals pulseSupport [ libpulseaudio ] diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix new file mode 100644 index 00000000000..4c4aacef31d --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchFromGitHub, ffmpeg }: + +stdenvNoCC.mkDerivation rec { + pname = "vr-reversal"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "dfaker"; + repo = pname; + rev = "v${version}"; + sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; + }; + + dontBuild = true; + + # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 + postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' + substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + ''; + + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r 360plugin.lua $out/share/mpv/scripts/ + ''; + + passthru.scriptName = "360plugin.lua"; + + meta = with lib; { + description = "Script for mpv to play VR video with optional saving of head tracking data."; + homepage = "https://github.com/dfaker/VR-reversal"; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = with maintainers; [ schnusch ]; + }; +} diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 6d4e0f18d6f..eecb3a6b974 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "21.10.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8="; + hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8="; }; nativeBuildInputs = [ @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ qtscript ]; + buildInputs = [ + qtscript + ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 911373c58e3..395da881ea9 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -27,7 +27,7 @@ }: let basename = "streamlink-twitch-gui"; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + runtimeLibs = lib.makeLibraryPath [ gtk3-x11 libudev0-shim ]; runtimeBins = lib.makeBinPath [ streamlink ]; arch = if stdenv.hostPlatform.system == "x86_64-linux" @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "${basename}-bin"; - version = "1.11.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; - sha256 = + hash = if arch == "linux64" then - "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y" + "sha256-5AgQ+nvv/J493Zi+F+6QRT/DGg8JyusXsP5qVuXtiG4=" else - "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y"; + "sha256-+jgTpIYb4BPM7Ixmo+YUeOX5OlQlMaRVEXf3WzS2lAI="; }; nativeBuildInputs = with xorg; [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 957911e239c..415790b4c11 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.1.1"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ="; + sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; }; checkInputs = with python3Packages; [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { ''; changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a5e65480b2b..c19b8fa15cd 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -82,11 +82,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; + sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -187,11 +187,6 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # Required in order to run newer srt plugin. Remove it when next release arrives - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch"; - sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ="; - }) # patches to build with recent live555 # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 (fetchpatch { diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 955d609d7a2..b381d3ccca1 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "21.0"; + version = "22.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5"; + sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d"; + cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; + + OPENSSL_NO_VENDOR = true; # Integration tests require root. cargoTestFlags = [ "--bins" ]; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e83fc4ef501..980955fcda6 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI="; + sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/virtualization/containerd/1.4.nix b/pkgs/applications/virtualization/containerd/1.4.nix deleted file mode 100644 index 92c7ab0b2fd..00000000000 --- a/pkgs/applications/virtualization/containerd/1.4.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoPackage -, btrfs-progs -, go-md2man -, installShellFiles -, util-linux -, nixosTests -}: - -buildGoPackage rec { - pname = "containerd"; - version = "1.4.11"; - - src = fetchFromGitHub { - owner = "containerd"; - repo = "containerd"; - rev = "v${version}"; - sha256 = "sha256-mUagr1/LqTCFvshWuiSMxsqdRqjzogt2tZ0uwR7ZVAs="; - }; - - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; - - buildInputs = [ btrfs-progs ]; - - buildPhase = '' - cd go/src/${goPackagePath} - patchShebangs . - make binaries man "VERSION=v${version}" "REVISION=${src.rev}" - ''; - - installPhase = '' - install -Dm555 bin/* -t $out/bin - installManPage man/*.[1-9] - installShellCompletion --bash contrib/autocomplete/ctr - installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete - ''; - - passthru.tests = { inherit (nixosTests) docker; }; - - meta = with lib; { - homepage = "https://containerd.io/"; - description = "A daemon to control runC"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index aa4a9000d23..281f1f24612 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-0Fbmtb7Ec6WcA7ARtgdBK5i7yAq2t3iXtfLb/MZcKJA="; + sha256 = "sha256-NOFDUOypq/1ePM8rdK2cDnH1LsSZJ7eQOzDc5h4/PvY="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 87b91196f88..b6d238d599e 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.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c="; + sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 4a2ec178be2..07e0cb6c533 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -18,6 +18,7 @@ let disabledTests = [ "test_capabilities.py" "test_cwd.py" + "test_delete.py" "test_detach.py" "test_exec.py" "test_hooks.py" @@ -37,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI="; + sha256 = "sha256-5q8HirGOPsbaJ7JoLa4DRYkZX3kucWOZ633nzx4zVhg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix new file mode 100644 index 00000000000..8e9ea890a9b --- /dev/null +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -0,0 +1,38 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "distrobox"; + version = "1.2.13"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = pname; + rev = version; + sha256 = "047mrhsfi88mgwylnnyxg6xa7hjjrajn2pf7vfmb6161myqybvfy"; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ./install -p $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Wrapper around podman or docker to create and start containers"; + longDescription = '' + Use any linux distribution inside your terminal. Enable both backward and + forward compatibility with software and freedom to use whatever distribution + you’re more comfortable with + ''; + homepage = "https://distrobox.privatedns.org/"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index cd8a1f5041a..3bc0f225de6 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.3"; + version = "1.37.4"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw="; + sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index a149b5e4b33..440d094b430 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08="; + sha256 = "sha256-PSqVe4m2na6BjNxIKKZG1ja6zEzwI2AwgJlaMfaW2EM="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 35856eae01c..e2a3f1e1077 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.2.3"; + version = "2.3.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q="; + sha256 = "sha256-PFR7EcRkqn/d6gYlMNN36nRIslYEN0JFSbFU9niGc+Y="; }; - vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww="; + vendorSha256 = "sha256-L6PNKK1ID7ZVX/4sG72wn9ZjWlx0lsNuiBc/EtCN03E="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 462ebb556f1..87bb16ab833 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,9 +10,9 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs @@ -33,7 +33,7 @@ rec { patches = []; }); - docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -79,6 +79,16 @@ rec { extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + patches = [ + # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. + # It could be removed when a version incorporating this patch is released. + (fetchpatch { + name = "buildkit-zfs.patch"; + url = "https://github.com/moby/moby/pull/43136.patch"; + sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + }) + ]; + postPatch = '' patchShebangs hack/make.sh hack/make/ ''; @@ -233,20 +243,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.12"; + version = "20.10.13"; rev = "v${version}"; - sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c="; + sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4="; + sha256 = "sha256-ajceIdMM8yAa+bvTjRwZ/zF7yTLF2LhGmbrweWni7hM="; }; - runcRev = "v1.0.2"; - runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp"; - containerdRev = "v1.4.12"; - containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8="; - tiniRev = "v0.19.0"; # v0.19.0 - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + runcRev = "v1.0.3"; + runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; + containerdRev = "v1.5.10"; + containerdSha256 = "sha256-ee0dwWSGedo08omKOmZtW5qQ1J5M9Mm+kZHq7a+zyT4="; + tiniRev = "v0.19.0"; + tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index c2769a0ccf3..9d35e87f161 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; - aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; + aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix new file mode 100644 index 00000000000..d258604496e --- /dev/null +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -0,0 +1,49 @@ +{ lib +, cni-plugins +, buildGoModule +, firecracker +, containerd +, runc +, makeWrapper +, fetchFromGitHub +}: + +buildGoModule rec{ + pname = "flintlock"; + version = "0.1.0-alpha.9"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = "flintlock"; + rev = "v${version}"; + sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM="; + }; + + vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE="; + + subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; + + ldflags = [ "-s" "-w" "-X github.com/weaveworks/flintlock/internal/version.Version=v${version}" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + firecracker + ]; + + postInstall = '' + for prog in flintlockd flintlock-metrics; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ cni-plugins firecracker containerd runc ]} + done + ''; + + meta = with lib; { + description = "Create and manage the lifecycle of MicroVMs backed by containerd"; + homepage = "https://github.com/weaveworks/flintlock"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 4f58f012716..68e902253ed 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.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hzoc5zbdnHHTY04aGn+77lHvPh+KNOPoZmW19YIZHv8="; + sha256 = "sha256-Y15oYAdq+bsG2qD/ZTqXHgkelAdQF4SnOE79gDhlNGE="; }; - vendorSha256 = "sha256-eJnwXXYWMaIfM8SW4MtmG4wsPA/9sx4j2AkOd6GpnsY="; + vendorSha256 = "sha256-66CcLWG45vZwM2LVc1xsjJYyxefGEBW4fY3wo1ESQUM="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 5d2be06db0a..60db5708922 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]; postUnpack = '' echo ${src.rev} > source/VERSION diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c3721bbe36e..6018608a3f1 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook -, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which , libdrm, udev @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.3.5"; + version = "12.0.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "03fahljrijq4ij8a4v8d7806mpf22ppkgr61n5s974g3xfdvpl13"; + sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -22,10 +22,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] + buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow + # Will be fixed in the release after 12.0.0 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; + sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; + }) + ]; + + prePatch = '' + cd .. + ''; + postPatch = '' + cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am @@ -43,6 +57,7 @@ stdenv.mkDerivation rec { "--without-kernel-modules" "--without-xmlsecurity" "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + "--with-fuse=fuse3" ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 46b8e1c7ed5..7d783b211bb 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-DpSDMjUFA8coRInJO1jhMALOYG444WRFw1w7vJKc7cw="; + sha256 = "sha256-uLpvTnn2EWEI8+5gC3ofMjsZ9O7nLOaaUGGuvSE1gdE="; }; vendorSha256 = null; @@ -58,6 +58,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper ${if stdenv.isDarwin then '' mv bin/{darwin/podman,podman} '' else '' diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d4815336124..fa3a50bc535 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -3,6 +3,7 @@ , makeWrapper , symlinkJoin , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -15,6 +16,7 @@ , iptables , iproute2 , catatonit +, gvproxy }: # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed @@ -25,6 +27,7 @@ let podman = podman-unwrapped; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -40,6 +43,8 @@ let # this only works for some binaries, others may need to be be added to `binPath` or in the modules paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ catatonit # added here for the pause image and also set in `containersConf` for `init_path` podman.rootlessport ]; diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch deleted file mode 100644 index 03e47a57863..00000000000 --- a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611 -Author: aszlig <aszlig@nix.build> -Date: Mon Mar 18 13:21:01 2019 +0100 - - 9pfs: Ignore O_NOATIME open flag - - Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir, - which in turn causes errors when the Nix store is mounted in the guest - because the file owner of the store paths typically don't match the - owner of the QEMU process. - - After submitting a patch to the overlayfs mailing list[1], it turns out - that my patch was incomplete[2] and needs a bit more rework. - - So instead of using an incomplete kernel patch in nixpkgs, which affects - *all* users of overlayfs, not just NixOS VM tests, I decided that for - now it's better to patch QEMU instead. - - The change here really only ignores the O_NOATIME flag so that the - behaviour is similar to what NFS does. From open(2): - - This flag may not be effective on all filesystems. One example is NFS, - where the server maintains the access time. - - This change is therefore only temporary until the final fix lands in the - stable kernel releases. - - [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html - [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html - - Signed-off-by: aszlig <aszlig@nix.build> - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index 55821343e5..0b8425fe18 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags) - { P9_DOTL_LARGEFILE, O_LARGEFILE }, - { P9_DOTL_DIRECTORY, O_DIRECTORY }, - { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, -- { P9_DOTL_NOATIME, O_NOATIME }, - { P9_DOTL_SYNC, O_SYNC }, - }; - diff --git a/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch new file mode 100644 index 00000000000..a498d309c23 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch @@ -0,0 +1,77 @@ +From 4ca09b7cd1d42eb6b1587fed74cd4d684e31bfbe Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sun, 27 Feb 2022 17:35:22 -0500 +Subject: [PATCH] 9p: darwin: meson: Allow VirtFS on Darwin + +To allow VirtFS on darwin, we need to check that pthread_fchdir_np is +available, which has only been available since macOS 10.12. + +Additionally, virtfs_proxy_helper is disabled on Darwin. This patch +series does not currently provide an implementation of the proxy-helper, +but this functionality could be implemented later on. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +[Will Cohen: - Rebase to master] +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> +[Will Cohen: - Add check for pthread_fchdir_np to virtfs + - Add comments to patch commit + - Note that virtfs_proxy_helper does not work + on macOS + - Fully adjust meson virtfs error note to specify + macOS + - Rebase to master] +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Message-Id: <20220227223522.91937-12-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + fsdev/meson.build | 1 + + meson.build | 17 +++++++++++------ + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/fsdev/meson.build b/fsdev/meson.build +index adf57cc43e..b632b66348 100644 +--- a/fsdev/meson.build ++++ b/fsdev/meson.build +@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( + 'qemu-fsdev.c', + ), if_false: files('qemu-fsdev-dummy.c')) + softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) ++softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) + + if have_virtfs_proxy_helper + executable('virtfs-proxy-helper', +diff --git a/meson.build b/meson.build +index 2265fa409a..6d73c02903 100644 +--- a/meson.build ++++ b/meson.build +@@ -1383,12 +1383,17 @@ endif + have_host_block_device = (targetos != 'darwin' or + cc.has_header('IOKit/storage/IOMedia.h')) + +-have_virtfs = (targetos == 'linux' and +- have_system and +- libattr.found() and +- libcap_ng.found()) +- +-have_virtfs_proxy_helper = have_virtfs and have_tools ++have_virtfs = get_option('virtfs') \ ++ .require(targetos == 'linux' or targetos == 'darwin', ++ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ ++ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), ++ error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ ++ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), ++ error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ ++ .disable_auto_if(not have_tools and not have_system) \ ++ .allowed() ++ ++have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools + + if get_option('virtfs').enabled() + if not have_virtfs +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ee923f4e0cd..2b183dd48d0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, runtimeShell +, makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -88,14 +88,62 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch - ./9p-ignore-noatime.patch # Cocoa clipboard support only works on macOS 10.14+ (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff"; sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; + # 9p-darwin for 7.0 backported to 6.2.0 + # + # Can generally be removed when updating derivation to 7.0. Nine of the + # patches can be drawn directly from QEMU upstream, but the second commit + # and the eleventh commit had to be modified when rebasing back to 6.2.0. + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/e0bd743bb2dd4985791d4de880446bdbb4e04fed.patch"; + sha256 = "sha256-c6QYL3zig47fJwm6rqkqGp3E1PakVTaihvXDRebbBlQ="; + }) + ./rename-9p-util.patch + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/f41db099c71151291c269bf48ad006de9cbd9ca6.patch"; + sha256 = "sha256-70/rrhZw+02JJbJ3CoW8B1GbdM4Lwb2WkUdwstYAoIQ="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/6b3b279bd670c6a2fa23c9049820c814f0e2c846.patch"; + sha256 = "sha256-7WqklSvLirEuxTXTIMQDQhWpXnwMseJ1RumT+faq/Y8="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/67a71e3b71a2834d028031a92e76eb9444e423c6.patch"; + sha256 = "sha256-COFm/SwfJSoSl9YDpL6ceAE8CcE4mGhsGxw1HMuL++o="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/38d7fd68b0c8775b5253ab84367419621aa032e6.patch"; + sha256 = "sha256-iwGIzq9FWW6zpbDg/IKrp5OZpK9cgQqTRWWq8WBIHRQ="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/57b3910bc3513ab515296692daafd1c546f3c115.patch"; + sha256 = "sha256-ybl9+umZAcQKHYL7NkGJQC0W7bccTagA9KQiFaR2LYA="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/b5989326f558faedd2511f29459112cced2ca8f5.patch"; + sha256 = "sha256-s+O9eCgj2Ev+INjL9LY9MJBdISIdZLslI3lue2DICGM="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/029ed1bd9defa33a80bb40cdcd003699299af8db.patch"; + sha256 = "sha256-mGqcRWcEibDJdhTRrN7ZWrMuCfUWW8vWiFj7sb2/RYo="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; + sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; + }) + ./allow-virtfs-on-darwin.patch + # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin + # support on nix requires utimensat fallback. The patch adding this fallback + # set was removed during the process of upstreaming this functionality, and + # will still be needed in nix until the macOS SDK reaches 10.13+. + ./provide-fallback-for-utimensat.patch + ] + ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. @@ -175,6 +223,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ + remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do @@ -219,6 +268,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' + ln -s $out/libexec/virtiofsd $out/bin ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; @@ -239,5 +289,6 @@ stdenv.mkDerivation rec { mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; + priority = 10; # Prefer virtiofsd from the virtiofsd package. }; } diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch new file mode 100644 index 00000000000..dbc4e2b9af5 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch @@ -0,0 +1,190 @@ +From 70328c307001f4bb75d30d93c5bba3c3cd790c88 Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sat, 16 Jun 2018 20:56:54 -0400 +Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat + +This function is new in Mac OS 10.13. Provide a fallback implementation +when building against older SDKs. The complication in the definition comes +having to separately handle the used SDK version and the target OS version. + +- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not + defined in the header, so we must not try to use it (doing so would error). +- Otherwise, if the targetted OS version is at least 10.13, we know this + function is available, so we can unconditionally call it. +- Lastly, we check for the availability of the __builtin_available macro to + potentially insert a dynamic check for this OS version. However, __builtin_available + is only available with sufficiently recent versions of clang and while all + Apple clang versions that ship with Xcode versions that support the 10.13 + SDK support with builtin, we want to allow building with compilers other + than Apple clang that may not support this builtin. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +Signed-off-by: Will Cohen <wwcohen@gmail.com> +--- + hw/9pfs/9p-local.c | 2 +- + hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ + hw/9pfs/9p-util-linux.c | 6 +++ + hw/9pfs/9p-util.h | 8 ++++ + 4 files changed, 111 insertions(+), 1 deletion(-) + +diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c +index d42ce6d8b8..b2c1fa42e1 100644 +--- a/hw/9pfs/9p-local.c ++++ b/hw/9pfs/9p-local.c +@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, + goto out; + } + +- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); ++ ret = utimensat_nofollow(dirfd, name, buf); + close_preserve_errno(dirfd); + out: + g_free(dirpath); +diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c +index bec0253474..2fc0475292 100644 +--- a/hw/9pfs/9p-util-darwin.c ++++ b/hw/9pfs/9p-util-darwin.c +@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + } + + #endif ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++static int update_times_from_stat(int fd, struct timespec times[2], ++ int update0, int update1) ++{ ++ struct stat buf; ++ int ret = fstat(fd, &buf); ++ if (ret == -1) { ++ return ret; ++ } ++ if (update0) { ++ times[0] = buf.st_atimespec; ++ } ++ if (update1) { ++ times[1] = buf.st_mtimespec; ++ } ++ return 0; ++} ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times_in[2]) ++{ ++ int ret, fd; ++ int special0, special1; ++ struct timeval futimes_buf[2]; ++ struct timespec times[2]; ++ memcpy(times, times_in, 2 * sizeof(struct timespec)); ++ ++/* Check whether we have an SDK version that defines utimensat */ ++#if defined(__MAC_10_13) ++# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 ++# define UTIMENSAT_AVAILABLE 1 ++# elif __has_builtin(__builtin_available) ++# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) ++# else ++# define UTIMENSAT_AVAILABLE 0 ++# endif ++ if (UTIMENSAT_AVAILABLE) { ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++ } ++#endif ++ ++ /* utimensat not available. Use futimes. */ ++ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); ++ if (fd == -1) { ++ return -1; ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_OMIT; ++ special1 = times[1].tv_nsec == UTIME_OMIT; ++ if (special0 || special1) { ++ /* If both are set, nothing to do */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_NOW; ++ special1 = times[1].tv_nsec == UTIME_NOW; ++ if (special0 || special1) { ++ ret = futimes(fd, NULL); ++ if (ret < 0) { ++ goto done; ++ } ++ ++ /* If both are set, we are done */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ futimes_buf[0].tv_sec = times[0].tv_sec; ++ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; ++ futimes_buf[1].tv_sec = times[1].tv_sec; ++ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; ++ ret = futimes(fd, futimes_buf); ++ ++done: ++ close_preserve_errno(fd); ++ return ret; ++} +diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c +index db451b0784..320697f347 100644 +--- a/hw/9pfs/9p-util-linux.c ++++ b/hw/9pfs/9p-util-linux.c +@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + { + return mknodat(dirfd, filename, mode, dev); + } ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]) ++{ ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++} +diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h +index 1f74d37558..a4b002d1b5 100644 +--- a/hw/9pfs/9p-util.h ++++ b/hw/9pfs/9p-util.h +@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name, + #define qemu_lsetxattr lsetxattr + #endif + ++/* Compatibility with old SDK Versions for Darwin */ ++#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) ++#define UTIME_NOW -1 ++#define UTIME_OMIT -2 ++#endif ++ + static inline void close_preserve_errno(int fd) + { + int serrno = errno; +@@ -96,6 +102,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, + char *list, size_t size); + ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, + const char *name); ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]); + + /** + * Darwin has d_seekoff, which appears to function similarly to d_off. +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/rename-9p-util.patch b/pkgs/applications/virtualization/qemu/rename-9p-util.patch new file mode 100644 index 00000000000..fe3e2d7b4b8 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/rename-9p-util.patch @@ -0,0 +1,54 @@ +From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sun, 27 Feb 2022 17:35:13 -0500 +Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The current file only has the Linux versions of these functions. +Rename the file accordingly and update the Makefile to only build +it on Linux. A Darwin version of these will follow later in the +series. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Reviewed-by: Greg Kurz <groug@kaod.org> +Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> +Message-Id: <20220227223522.91937-3-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0 + hw/9pfs/meson.build | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%) + +diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c +similarity index 100% +rename from hw/9pfs/9p-util.c +rename to hw/9pfs/9p-util-linux.c +diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build +index 99be5d9119..1b28e70040 100644 +--- a/hw/9pfs/meson.build ++++ b/hw/9pfs/meson.build +@@ -4,7 +4,6 @@ fs_ss.add(files( + '9p-posix-acl.c', + '9p-proxy.c', + '9p-synth.c', +- '9p-util.c', + '9p-xattr-user.c', + '9p-xattr.c', + '9p.c', +@@ -14,6 +13,7 @@ fs_ss.add(files( + 'coth.c', + 'coxattr.c', + )) ++fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) + fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) + softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) + +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index af2c4939ad0..c6442b57a42 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, acpica-tools, python3 }: +{ lib, stdenv, fetchgit, acpica-tools, python3 }: stdenv.mkDerivation rec { pname = "seabios"; - version = "1.15.0"; + version = "1.16.0"; - src = fetchurl { - url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-YownF8mUMmtFMlFXPRBZ4qOhEtSqSIds4nyz8d4ZiPg="; + src = fetchgit { + url = "https://git.seabios.org/seabios.git"; + rev = "rel-${version}"; + sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; }; nativeBuildInputs = [ python3 ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb62a0d2e11..aa225c1d173 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl, python3Packages, intltool, file -, wrapGAppsHook, gtk-vnc, vte, avahi, dconf -, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome -, gtksourceview4, docutils +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt +, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio +, e2fsprogs, findutils, gzip, cdrtools, xorriso , spiceSupport ? true, spice-gtk ? null -, cpio, e2fsprogs, findutils, gzip -, cdrtools }: with lib; -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "3.2.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; }; nativeBuildInputs = [ @@ -32,7 +31,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; @@ -42,14 +41,16 @@ python3Packages.buildPythonApplication rec { ''; postConfigure = '' - ${python3Packages.python.interpreter} setup.py configure --prefix=$out + ${python3.interpreter} setup.py configure --prefix=$out ''; - setupPyGlobalFlags = [ "--no-update-icon-cache" ]; + setupPyGlobalFlags = [ "--no-update-icon-cache" "--no-compile-schemas" ]; dontWrapGApps = true; preFixup = '' + glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") @@ -57,14 +58,17 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + cpio + cdrtools + xorriso + ]; - disabledTestPaths = [ - "tests/test_cli.py" - "tests/test_disk.py" - "tests/test_checkprops.py" - "tests/test_storage.py" - ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5 + disabledTests = [ + "testAlterDisk" + "test_misc_nonpredicatble_generate" + ]; preCheck = '' export HOME=. diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 6ac7377122d..bad1e98296c 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 = "7.1.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic="; + sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index e7cc1a477c5..f6ba52013f6 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM="; + hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://berrywm.org/"; description = "A healthy, bite-sized window manager"; longDescription = '' berry is a healthy, bite-sized window manager written in C for unix @@ -69,11 +70,8 @@ stdenv.mkDerivation rec { - Intuitively place new windows in unoccupied spaces. - Virtual desktops. ''; - homepage = "https://berrywm.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: report upstream that `which` is not POSIX; the `command` shell builtin -# should be used instead diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index cdcfcca15ea..ed518d8eb2e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.6"; + version = "0.21.8"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so="; + sha256 = "sha256-l0XfitQSmSkivEg8+XcA/+bWdy/wzIpii/Npc4p8kUw="; }; - cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE="; + cargoSha256 = "sha256-2rJ9ZZHK1acJu6r6EjuoolLJZMdBsbKgN1DNvGM7deA="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index deac4bed607..75cb96f27f4 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { - owner = "ice-wm"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4="; + hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { perl pkg-config ]; + buildInputs = [ expat fontconfig @@ -108,11 +109,11 @@ stdenv.mkDerivation rec { system. Application windows can be managed by keyboard and mouse. Windows can be iconified to the taskbar, to the tray, to the desktop or be made hidden. They are controllable by a quick switch window (Alt+Tab) and in a - window list. A handful of configurable focus models are - menu-selectable. Setups with multiple monitors are supported by RandR and - Xinerama. IceWM is very configurable, themeable and well documented. It - includes an optional external background wallpaper manager with - transparency support, a simple session manager and a system tray. + window list. A handful of configurable focus models are menu-selectable. + Setups with multiple monitors are supported by RandR and Xinerama. IceWM + is very configurable, themeable and well documented. It includes an + optional external background wallpaper manager with transparency support, + a simple session manager and a system tray. ''; license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 580fd29faa0..f58b71ef03a 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -21,20 +21,15 @@ stdenv.mkDerivation rec { pname = "labwc"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "labwc"; repo = pname; rev = version; - hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; + hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk="; }; - patches = [ - # Required to fix the build with wlroots 0.15.1: - ./relax-the-version-constraint-for-wlroots.patch - ]; - nativeBuildInputs = [ meson ninja @@ -64,6 +59,6 @@ stdenv.mkDerivation rec { description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + inherit (wayland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch b/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch deleted file mode 100644 index 9a790f28516..00000000000 --- a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Fri, 4 Feb 2022 21:17:05 +0100 -Subject: [PATCH] build: Relax the version constraint for wlroots to accept - patch releases - -Patch releases only contain backwards compatible changes (mainly bug -fixes) so we want to allow them. This fixes the build with the recently -released wlroots 0.15.1 and uses the same version constraints as other -projects that depend on wlroots (e.g., Sway). ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f950b8e..1905dda 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,7 @@ if git.found() - endif - add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') - --wlroots_version = ['=0.15.0'] -+wlroots_version = ['>=0.15.0', '<0.16.0'] - wlroots_proj = subproject( - 'wlroots', - default_options: ['default_library=static', 'examples=false'], --- -2.34.1 diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index c4a33628e13..4a48225d801 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -69,4 +69,7 @@ in name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; + + # restore original qtile attrs + inherit (unwrapped) pname version meta; }) diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 6d91d8c8f46..e98adefa447 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576"; + hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 194525dcffb..727d9b4e6b3 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, wayland, libxkbcommon, pcre, json_c, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -8,8 +8,19 @@ , isNixOS ? false , enableXWayland ? true +, systemdSupport ? stdenv.isLinux +, dbusSupport ? true +, dbus +, trayEnabled ? systemdSupport && dbusSupport }: +# The "sd-bus-provider" meson option does not include a "none" option, +# but it is silently ignored iff "-Dtray=disabled". We use "basu" +# (which is not in nixpkgs) instead of "none" to alert us if this +# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 +assert trayEnabled -> systemdSupport && dbusSupport; +let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in + stdenv.mkDerivation rec { pname = "sway-unwrapped"; version = "1.7"; @@ -47,16 +58,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev + wayland libxkbcommon pcre json_c libevdev pango cairo libinput libcap pam gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit enableXWayland; }) + ] ++ lib.optionals dbusSupport [ + dbus ]; - mesonFlags = [ - "-Dsd-bus-provider=libsystemd" - ] + mesonFlags = + [ "-Dsd-bus-provider=${sd-bus-provider}" ] ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" + ++ lib.optional (!trayEnabled) "-Dtray=disabled" ; passthru.tests.basic = nixosTests.sway; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index fd424e3074a..0928fbcfb4e 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, systemd +, wayland, wayland-protocols +, systemdSupport ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { @@ -15,9 +16,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols systemd ]; + buildInputs = [ wayland wayland-protocols ] + ++ lib.optionals systemdSupport [ systemd ]; - mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; meta = with lib; { description = "Idle management daemon for Wayland"; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 6dccedad827..b70160b1dbf 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; + sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '1.4'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 827fce89702..c1f531683d7 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -8,6 +8,7 @@ , isNixOS ? false , enableXWayland ? true +, dbusSupport ? true }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -27,7 +28,7 @@ let export DBUS_SESSION_BUS_ADDRESS exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" + exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" fi ''; in symlinkJoin { |