diff options
Diffstat (limited to 'pkgs')
160 files changed, 1708 insertions, 1239 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 953e9887f5a6e..733368c115c4c 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -13,6 +13,7 @@ , libjack2 , lv2 , lilv +, mpg123 , serd , sord , sqlite @@ -45,52 +46,36 @@ , libsepol , libxkbcommon , util-linux -, wxGTK +, wavpack +, wxGTK32 +, gtk3 , libpng , libjpeg -, AppKit ? null -, AudioToolbox ? null -, AudioUnit ? null -, Carbon ? null -, Cocoa ? null -, CoreAudio ? null -, CoreAudioKit ? null -, CoreServices ? null -, wxmac +, AppKit +, AudioToolbox +, AudioUnit +, Carbon +, CoreAudio +, CoreAudioKit +, CoreServices }: # TODO -# 1. as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions -# 2. detach sbsms +# 1. detach sbsms let inherit (lib) optionals; pname = "audacity"; - version = "3.1.3"; - - wxWidgets_src = fetchFromGitHub { - owner = pname; - repo = "wxWidgets"; - rev = "v${version}-${pname}"; - sha256 = "sha256-KrmYYv23DHBYKIuxMYBioCQ2e4KWdgmuREnimtm0XNU="; - fetchSubmodules = true; - }; - - wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { - src = wxWidgets_src; - }); - - wxmac' = wxmac.overrideAttrs (oldAttrs: rec { - src = wxWidgets_src; - }); -in stdenv.mkDerivation rec { + version = "3.2.1"; +in +stdenv.mkDerivation rec { inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-sdI4paxIHDZgoWTCekjrkFR4JFpQC6OatcnJdVXCCZk="; + sha256 = "sha256-7rfttp9LnfM2LBT5seupPyDckS7LEzWDZoqtLsGgqgI="; }; postPatch = '' @@ -105,9 +90,9 @@ in stdenv.mkDerivation rec { gettext pkg-config python3 + makeWrapper ] ++ optionals stdenv.isLinux [ linuxHeaders - makeWrapper ]; buildInputs = [ @@ -115,6 +100,7 @@ in stdenv.mkDerivation rec { ffmpeg_4 file flac + gtk3 lame libid3tag libjack2 @@ -125,6 +111,7 @@ in stdenv.mkDerivation rec { libvorbis lilv lv2 + mpg123 pcre portmidi serd @@ -136,6 +123,8 @@ in stdenv.mkDerivation rec { suil twolame portaudio + wavpack + wxGTK32 ] ++ optionals stdenv.isLinux [ alsa-lib # for portaudio at-spi2-core @@ -149,12 +138,8 @@ in stdenv.mkDerivation rec { libsepol libuuid util-linux - wxGTK' - wxGTK'.gtk ] ++ optionals stdenv.isDarwin [ - wxmac' AppKit - Cocoa CoreAudioKit AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio libpng @@ -167,22 +152,33 @@ in stdenv.mkDerivation rec { "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" "-Daudacity_conan_enabled=Off" "-Daudacity_use_ffmpeg=loaded" + "-Daudacity_has_vst3=Off" # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + # [ 57%] Generating LightThemeAsCeeCode.h... + # ../../utils/image-compiler: error while loading shared libraries: + # lib-theme.so: cannot open shared object file: No such file or directory + preBuild = '' + export LD_LIBRARY_PATH=$PWD/utils + ''; + doCheck = false; # Test fails # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency postInstall = lib.optionalString stdenv.isLinux '' - rm "$out/audacity" wrapProgram "$out/bin/audacity" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/Audacity.app $out/Applications/ + makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity ''; meta = with lib; { @@ -198,11 +194,9 @@ in stdenv.mkDerivation rec { # Documentation. cc-by-30 ]; - maintainers = with maintainers; [ lheckemann veprbl ]; + maintainers = with maintainers; [ lheckemann veprbl wegank ]; platforms = platforms.unix; - # darwin-aarch due to qtbase broken for it. - # darwin-x86_64 due to - # https://logs.nix.ci/?attempt_id=5cbc4581-09b4-4148-82fe-0326411a56b3&key=nixos%2Fnixpkgs.152273. - broken = stdenv.isDarwin; + # error: unknown type name 'NSAppearanceName' + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 377dc4d2975c3..d05a12ec30af3 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.22"; + version = "6.2.23"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-RE4QDK5x9xG1RsAWB6dgviu3V1ay/+r0vyHCPCu/qCU="; + sha256 = "sha256-gl+kT8wXLCWnNmOBx6Vg+FbmJ8kJ8pJKsahpqcYw9Lk="; }; configurePhase = '' diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 28d050d2e4258..6b09e086fa3de 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,12 +17,15 @@ , libpulseaudio }: +let + url_for_platform = version: arch: "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; +in stdenv.mkDerivation rec { pname = "reaper"; version = "6.66"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; + url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs="; aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo="; @@ -75,6 +78,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./updater.sh; + meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh new file mode 100755 index 0000000000000..750bea346bbc3 --- /dev/null +++ b/pkgs/applications/audio/reaper/updater.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9]\.[0-9]*' | head -n1 | cut -d' ' -f2) + +function set_hash_for_arch() { + local arch=$1 + pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) + pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + # reset the version so the second architecture update doesn't get ignored + update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-linux + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux +} + +set_hash_for_arch aarch64 +set_hash_for_arch x86_64 diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 6f1734bbc1359..c1ede1ea839f6 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -15,6 +15,7 @@ , protobuf , qrencode , libevent +, sqlite , withGui , python3 , jemalloc @@ -23,17 +24,15 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.21.13"; + version = "0.26.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; + sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az"; }; - patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl @@ -47,6 +46,7 @@ mkDerivation rec { util-linux protobuf libevent + sqlite ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; cmakeFlags = lib.optionals (!withGui) [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch deleted file mode 100644 index c49bbc4325192..0000000000000 --- a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100 -+++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100 -@@ -35,11 +35,7 @@ - dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. - AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ - BITCOIN_QT_CHECK([ -- if test "x$3" != x; then -- AC_PATH_PROGS($1,$2,,$3) -- else -- AC_PATH_PROGS($1,$2) -- fi -+ AC_PATH_PROGS($1,$2) - if test "x$$1" = x && test "x$4" != xyes; then - BITCOIN_QT_FAIL([$1 not found]) - fi diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index af3a0c7c99daf..70a87a98e8856 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -12,7 +12,7 @@ buildGoModule rec { fetchSubmodules = true; }; - vendorSha256 = "sha256-zdm11bGkCcwnz+8dve2pdcpg6pDgLe4UG3Ob/mbqhko="; + vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 2e7df608eba09..92342bfda7856 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.28"; + version = "0.9.29"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-PYPNbysk9jHGtAUGr8O/Ah0ArTNKQYYToR5djG+XujI="; + sha256 = "sha256-/IJs3153KzhGf5I6LueljzRhDl/PYYlPseF6wCh+u3M="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Dqcjt3yvZdaHp6sIQFo9wYH/icIInyXqKHE1Q/JjrwY="; + cargoSha256 = "sha256-mI8VvTlM9ynstDBC0ubQkzg3D2ZXuWqJGS/Y23D6dU0="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0cef634c28999..3ed8976b06031 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-04"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "faf602afe86b4cc33a4471371f128d80328cacf2"; - sha256 = "1ilgdzjcqmplk81xx89rsspvvp7mhzrpcv9lwb9dk3drgnvlzza2"; + rev = "23bf2d69967491b1dc43f37c809f2711cc879fd2"; + sha256 = "0zl8sf9sy2i3fp3wbpw9rvm5wjkak897i5yl699jfxxv0gal5sgv"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "0026ba28a52156e8e965f131a060b8bdaed2769e"; - sha256 = "1cph6c7x5sdx5gbmszl9w0blspnjwfzg3pf42gyvnph1c3hacqwk"; + rev = "cd193b852d51dc70200fbf8f7d92f174735ee657"; + sha256 = "0syimr7v6a87fq9zvxkh8xc38102y04jm8z0g53inayamp64vz2p"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-09-27"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "8c173bc4d2c5b03cf53575092a7c5c2bc67afd9a"; - sha256 = "1m2sk3pqc2825px3x8l8jrwjwrdljygrf3pb2wy4y15dbjy56hf1"; + rev = "99ccab251fad7c8b235582b46752a0536d01b315"; + sha256 = "1whjbplgqik4pdp3z1ly7z1qii6z615drqc3i09p4sahdb7cw2n6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-01"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "6f1b28b549147c2f9e09de16869fcc34cf076253"; - sha256 = "02k6p7bx63xsj98hvi0chm2g8wyk8kv9y8cz265lv9i5yrh6fpcc"; + rev = "bbdfc56c5a00f4f31936a057fed99807c0a52f0c"; + sha256 = "04ma4nz47ld6a4x0d5pn7a70kx0a8p2ynyb2gg8mb1x09593q95m"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -538,8 +538,8 @@ final: prev: src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "4094426c707dda404754487bf496db1b4c7d05f1"; - sha256 = "1v56lzs9i29bwzb1iqwanzv3khr9gd9lmwv5v5ddhg9b3bq55rnv"; + rev = "f085227504076dff5224cbf10cb1bf83286188a9"; + sha256 = "00n3vagkgy31r47a1ivy0zxm3a13z3d80l6ay7l49srh10rfh3c1"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -666,24 +666,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-09-23"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "7ee75ae20c7d556f1febb6d1a5961e48766c9c0b"; - sha256 = "1ikxarjknpba4mvd1bkyswvai9laca38biccn3py7x8lwvlvhp85"; + rev = "8d92822df7fb5549bbc0cc65056e960341433cdf"; + sha256 = "0af6fn9iym0kgldbla1h13dds8sd8pd441f20bpszfbmr4djfskh"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-09-29"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "1a5f4916192767973c05b3bb648548b0891865a2"; - sha256 = "0ghg00bflnp9lyrjjls7si0vvjzxzy72fxz36dvps15rddm4bry2"; + rev = "32d2af43f196605f35aa78f38b16e9a8d158b010"; + sha256 = "0ryq8qsrjzdyrapz040mvp9f3mzcflcw14nddp5fq95859n18n2k"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -906,12 +906,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-05-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "46255e4a76c4fb450a94885527f5e58a7d96983c"; - sha256 = "1z6m9bavyx2ln2dik05fcaf6gq6jdrpcgrq5i1l1sy45h447a3hw"; + rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93"; + sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -942,12 +942,12 @@ final: prev: bullets-vim = buildVimPluginFrom2Nix { pname = "bullets.vim"; - version = "2022-09-10"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "dkarter"; repo = "bullets.vim"; - rev = "d3a75d60ffe74c91b2a1225327bbeff540fdab11"; - sha256 = "18l2nszcpm55x7q1ardp790sajairs1a2y8a9z63cck9bkigmj3w"; + rev = "bb2b9f3cae530fcc9e70055243cbbdda4daa497e"; + sha256 = "1k9ynbkiag6b42zaqk7vyq2l376g5p7j8hn5xmjnmxzra1s68yx4"; }; meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; @@ -990,12 +990,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-10-04"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "81dd97874eb63ac719c372bdeb1cd15d9ddcca15"; - sha256 = "1rpj7qlwwycq8znxa1v369mbbirhgkj81whrhcm5vrwmkhy9j1w7"; + rev = "666a406659fadd22a9c2b0fb1fed432f4529e7f1"; + sha256 = "1cdkws7k3b55ahbhfhnqv4f47jm20n6cfgrr5yrfmplqvl2az70h"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1518,24 +1518,24 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-09-14"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "01653a5934b242e8ca517e079419c3b151ce2b00"; - sha256 = "03nvx8rmdi23iiga5c3fnyaxl46jhv0hkqkcvcx10jjk34v1x9b0"; + rev = "5a6d58badbfed69ee285983bf2cf5a17d957483a"; + sha256 = "1dsbq0wcqf8c7y5ld74gqxbf2pdh28km7wdk37xvlqcvfk1kzmxs"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; cmp-tmux = buildVimPluginFrom2Nix { pname = "cmp-tmux"; - version = "2022-08-02"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "cmp-tmux"; - rev = "e32f2f1417c9ff307ad348a134788eabd76c6112"; - sha256 = "1fq9jiyf19mxlq13cg9775wmmrpm6jphhl0hrf7jb1aikvdi1b6y"; + rev = "984772716f66d8ee88535a6bf3f94c4b4e1301f5"; + sha256 = "1fy0rw9garhabbif6d7vvrv73c25lwv9fjh5b4y0m3kisvkbqfyr"; }; meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; @@ -1650,12 +1650,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-09-13"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "5127966503e070770225437205949c6d244ab8a1"; - sha256 = "1w5y0dkvmrrw4ilwlvcybp98mlx9222ygb0kdg31k5v4jzqynxj1"; + rev = "cb405c0dc72312a06d17710a537ab0e6b6758648"; + sha256 = "12s2nxyck0hwxk3z4h5knss9wsjmwiimj9kxs4bywwibwlwgnf6i"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -1722,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-01"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "487d077e1131ee5b09e329d15f9d9ae53aa8f44a"; - sha256 = "148wajzy64ys74km0k1mgvrfk3mqdib0nh2wylwfnx83s50f2sx2"; + rev = "d0fa7acd233d76585daf9ce0b74ad1112591e271"; + sha256 = "04qs3gcx2qjagawr577sadz6bkwlr40532i9f7p7jfkbd7ybgzm2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1794,24 +1794,24 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-09-18"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "f6a6cf7fb17cee08ca0ca84ffce6aabccc3d8476"; - sha256 = "0gi6z6l5gw7dhg8gqbd6m3yzasyd2ccmwjjh8j4ma0dd7f5c7iq7"; + rev = "f8d67e234aa39856ce62246cd4bf1c76f8b46245"; + sha256 = "1iq34bysnkl65gvdpsfqgimvmnpq964654c0g1ijjc0ayfk1yyd8"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-10-02"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "97a188a98b5a3a6f9b1b850799ac078faa17ab67"; - sha256 = "05836nr9nwssjzjmg8zmbdfx8wclhnjb6pp4cwiykgi6kv4dzjnz"; + rev = "d30f2b059c0c03fcfab3842684212bac525a3d0b"; + sha256 = "0n0ybjzwfdh7dk8wk3mf77hf0v7zxakv26a9z608srdia2xa3ndr"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1878,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-10-03"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "018d04971eb5939c01637e23377449b61f68f363"; - sha256 = "072y39crph99mb1wzij480nmylh1llcfg0lf9smb90xabiads7sr"; + rev = "b611606f62b4ae0de10cc9a5565ce32f629a868a"; + sha256 = "102ic12byilviz65nnk3crwnrfsw1dqwvvfhj6gfix7ybg76vkx6"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1962,12 +1962,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-09-26"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0c91dd3c8c994f1cef3f91356133b971ffaf52c3"; - sha256 = "1859f750c1v1y79khk6z7yizbgawvnndxsiwyb04wpzx2np3s21i"; + rev = "839fe23a7746f03aa9ef1ebf087501cd6126cf0f"; + sha256 = "1009jc5zz20hfi8g7j4znnrwm6jdj6041a24i3ayklgl5dqw2519"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2010,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "72a41cd2fa99c577ffa998321af38951655cc43c"; - sha256 = "051vsxqxh6snv2awkh0jyx8pa43z94z2dpng463dsiw89fss2va0"; + rev = "39a174683e28b7b96a4b6521d1d3d2ef3a571ce2"; + sha256 = "0wk5jgsn0k2zp4kg6rj4pagnnbmq4rbk566d01svfw6vphv4d9fc"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "67342598dd2628a19e272acaf773b5b9f1a72248"; - sha256 = "077agh0gzflrc7955xnbgzghf0kr1la1n3xfjydg6plb70kjqlri"; + rev = "46dc68b8193873ce44f2f572f1f2ecb3f5cdb9a9"; + sha256 = "14z16aw60ns90yf8g5z8rcb757byrvq1c8yaw0qb6bcvvgzgpwbm"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8b165521046a05320c478f2a129a1310415bd7b6"; - sha256 = "1c1iyi17qld3q0c275yzjwxrqjkynbmx000jsrsmgjh63xjzslg0"; + rev = "27fb487f108d8159793f0eeb6aa1e5ee0d4da9aa"; + sha256 = "1wzwgi6czri6cnq7qws5pw97k2c81q72masn7cd7lv7dva6bzz3p"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2190,12 +2190,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-10-02"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1676ebeb334a644dd68f7858f9e993602dd8577c"; - sha256 = "164giy2s45dc1zlf63fsbf9z8qvf81npdmy304xxr81azpb8amqi"; + rev = "bd7163f56ac715a6d687737ea144731ac6ce8478"; + sha256 = "0rbxs7bj0vhjrwmjlw74shskgy5igcfyn4iddrk1qc3kryaakdhw"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2562,14 +2562,26 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + dial-nvim = buildVimPluginFrom2Nix { + pname = "dial.nvim"; + version = "2022-08-29"; + src = fetchFromGitHub { + owner = "monaqa"; + repo = "dial.nvim"; + rev = "d2d7a57fb030c82b8b0d6712d9c35dfb49d9aa3c"; + sha256 = "1zm116xd7b79piaiia9fn56h7ivnmy0dip02q3n61fmn1sqijggr"; + }; + meta.homepage = "https://github.com/monaqa/dial.nvim/"; + }; + diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "7c149a4df943c05846d3f552b89b47df50f009c9"; - sha256 = "0660pvik5hzv8m42zwm67cm73rk1kln3ig2kpqyidbihpaxx95ay"; + rev = "a1fbcaa7e1e154cfa793ab44da4a6eb0ae15458d"; + sha256 = "0wffr2g0d2nasbjqabm0arjgv28xlg6xqay9w5gw3hglz33rr5np"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2770,12 +2782,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-10-03"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "5d6a054c476f2c2e3de72022d8f59764e53946ee"; - sha256 = "1376p6hjwl3dd4fsc93qhc19dcnycp2gkz3nz684var2nk9rxanq"; + rev = "f26dd12e5b0e39a8dd2abcb46066c250b5651de9"; + sha256 = "03rla7gwjd8l35pk2mgi0qj23mpssdvfv2iz6c4dj2ixqs1ry9sh"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2853,6 +2865,18 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; + flit-nvim = buildVimPluginFrom2Nix { + pname = "flit.nvim"; + version = "2022-09-23"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "flit.nvim"; + rev = "dd43846edca345075a60d2f749bcca71cd47a17f"; + sha256 = "1da1pfkm0jg9570smg0l2hc059jjaxpzvz8jbkx6i2m56gq9lmnh"; + }; + meta.homepage = "https://github.com/ggandor/flit.nvim/"; + }; + float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview.nvim"; version = "2020-11-03"; @@ -2927,12 +2951,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-10-03"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9f4ffd17ade26815cad52ba90f478a4e6e2d80df"; - sha256 = "18saq9cswki4ny1ihvng1bgfc2zl69vngdm5c2hh7vszra95ql3s"; + rev = "6cd7469403fd06a3840a1065728d1affe1c23ec8"; + sha256 = "0qilmi6xg37xq29kfk6nnchz1jm18qrbvgcfzq028pmdbnakg7r5"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3035,12 +3059,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-10-01"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "e7c610889ff954101c644cdb9cf68e499a3751ac"; - sha256 = "15bkdkr9jr9rdg3nwjyzb3rzx27h5ldi6484whqaij40gpk1ifgz"; + rev = "c81874db259eef85ae21794b2f29e953519c692c"; + sha256 = "1k6h1n4rpi47ggqvmxrw9bhis5mkd2fnqvyirvr4yz2sgivljmwn"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3191,12 +3215,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-09-18"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f98c85e7c3d65a51f45863a34feb4849c82f240f"; - sha256 = "0ljzja43jdkv77nh4253x3gwk2hjx968yk7b5ag4y1mvyp1540qn"; + rev = "9787c94178b4062f30d2f06b6d52984217196647"; + sha256 = "1w96nqwmc9y3k6wyrnbr8br1h6lwxcvyykv22320lbxipl6i8rhw"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3227,12 +3251,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-09-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "b6b997277e019f751031ea52f9571ad2e1e7e42d"; - sha256 = "1cnzgm0pixh2zrmkfgxjybb6i1lqa0hbkwrmbm1jb5p0hhc4d1j6"; + rev = "9038d7cdd76a930973b6158d800c8dbc02236a4b"; + sha256 = "0x49l7g84m1328fqad501f4iqqy3imbl8r8rh4rxsi1zam46f2ba"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3394,12 +3418,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-08-10"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "f4aff5bf9b512f5a85fe20eb1dcf4a87e512d971"; - sha256 = "0jfc9d4dkx331567aic36mbqv3p2rq5nds35n33qg4f4mwqy8n6b"; + rev = "4dfe94e633945c14ad0f03044f601b8e6a99c708"; + sha256 = "1jr4k56glyd98lk19dj9r7i8zx72hhzn5lz1w846ffvsci5ffw1g"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -3909,14 +3933,38 @@ final: prev: meta.homepage = "https://github.com/leanprover/lean.vim/"; }; + leap-ast-nvim = buildVimPluginFrom2Nix { + pname = "leap-ast.nvim"; + version = "2022-08-02"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "leap-ast.nvim"; + rev = "38d05c808fc8cecb4c380912649d87c7abfa9e95"; + sha256 = "0d52ndk9r8g6mp09rjryz9hp7mdyfqqcjf94j0f83qdkdmv3i9gp"; + }; + meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; + }; + + leap-nvim = buildVimPluginFrom2Nix { + pname = "leap.nvim"; + version = "2022-10-01"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "leap.nvim"; + rev = "5a09c30bf676d1392ff00eb9a41e0a1fc9b60a1b"; + sha256 = "078q9dr4a2j6c6v7l4n1ly2j94d3q4fbinpmi4qma9zmrpg9nsn6"; + }; + meta.homepage = "https://github.com/ggandor/leap.nvim/"; + }; + legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-10-03"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "aeb8ac4976094c9fb8741b623c301e3da9221edb"; - sha256 = "01lz5p8mjjrfx6hm2s678ydixyxa3hqpmc7jv3j612lkk13hypms"; + rev = "4ecafc2993b31e74bb8cecb93a90f2414f008be2"; + sha256 = "0d0qg2hs83jf26hjca7bwjxgv59zrnw4w8gm54p0fr8gaqcvr514"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -3947,12 +3995,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-09-26"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "4a0644b64da8ebc5d64b964f7da9a394f06259bd"; - sha256 = "0kyc1v26y98hmx3ajqgdr9xl4jw62c56n1i3xl6hab98inp1vq6z"; + rev = "6be26d4c4a06228f72329b424f6f92d860de611d"; + sha256 = "0nn3r7b513jhg9l0fa94rmxpdkwg9r7hdqn1x7jw3q6s547z9pin"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4043,12 +4091,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2022-05-09"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "b02ef0d9f253dfc1cbb3f340b74998d7a4db0bf6"; - sha256 = "1rr5n23vvybfi3gbqljalqn0pnkwzzb4zqcz74jlz1dfyddsngah"; + rev = "b1e91b41f5028d65fa3d31a425ff21591d5d957f"; + sha256 = "0xb0hdjk4dww80s2ypvgz5rsvv41b07hskahz8r7xq6si5m5scrn"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -4161,6 +4209,18 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; + live-command-nvim = buildVimPluginFrom2Nix { + pname = "live-command.nvim"; + version = "2022-10-06"; + src = fetchFromGitHub { + owner = "smjonas"; + repo = "live-command.nvim"; + rev = "76abef7bcf40afd8db381c8d95a0f3143aa28e68"; + sha256 = "0swz1pvzl5fr57y7vzxzb9gqfmw5d3zh0751hgj7jqdy4hn00a6z"; + }; + meta.homepage = "https://github.com/smjonas/live-command.nvim/"; + }; + lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; version = "2022-09-05"; @@ -4306,12 +4366,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-10-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "e651a72bd045f3d82efdd7d20f3630379af784b0"; - sha256 = "140211vdac3khf082jfdfr6jixbl2s5x5g8z9j8ga6qyw0apdk95"; + rev = "a37b9ba11a4d1ed97284b416526e6251d23d58e1"; + sha256 = "1ida1a97ddz5ps4yhxpvm9in20q8jy345a0b8kc7h4h3v0pqmdkd"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4330,24 +4390,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-09-11"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "a52f078026b27694d2290e34efa61a6e4a690621"; - sha256 = "0cz9vpbd1z3986qbd166h747az8rqgwls0mhi1imqz0z9b66hrbc"; + rev = "edca2b03c724f22bdc310eee1587b1523f31ec7c"; + sha256 = "06gy6jy3gfhhjcy61fx9myhs4bmknhlfsmnsi1mmcydhm4gcbm2b"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-09-28"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8f8d493e7836f2697df878ef9c128337cbf2bb84"; - sha256 = "17kz2w90m1f7wg8gyaz6lhg8hdkjq4zly092halgd1fn6brhd23f"; + rev = "aa7acef98392f35288590f2fcf984b19e0d5bc29"; + sha256 = "1xs5h97q3fg4avsab9csf8nwmxadc9pvhv31khq86637kximgzz1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4427,12 +4487,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-10-03"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "88e1d132cc7b27a8304b897873384bee343b2d2c"; - sha256 = "1jg2vqrbd1m94gqbdc3nwp6lbgb578vrw3nkh2a2p8694gp8ha5g"; + rev = "de33236e23cab880a1ab3d1cfdc828d3eedbddf8"; + sha256 = "1qww1rl7aw4n9766asbdz765wllxkhygm0azdkic7j8hb95dr94x"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4883,12 +4943,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-02"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "c5345e72ebdd84585eec6272755aa26233431317"; - sha256 = "0ip2gy11xhvfdrin1yz3fqr9z2hwbd51avm1616825pj6mr8dxn5"; + rev = "7e56721877cb8219a6b982710d98eb675738f499"; + sha256 = "1n875jcbrqvc3gyswld3np9r7axns7v0pmd4cf0lcx64pkb3wrn2"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4991,12 +5051,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-09-12"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "2a0a05ff983aa62d74ba868aadf89deb93dd5454"; - sha256 = "1qbkhkvag4aqp11b938j18drra5dymqqxjghwnq00dq97ll777s7"; + rev = "60f3a2bc2bd22b98af5770b940762f77ca17cfee"; + sha256 = "0vcv0j5zvz4mmaczkkspl5l5fv8x36fdlvm9sf3s85hsz0gh03xp"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5111,24 +5171,24 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "15f3bbd607feee3dd4ea255ea2344c3d7d647406"; - sha256 = "0kps8h4wrlidkjlklmhwdxabgfkb57qr5qmmn3b0bzlqamph21f7"; + rev = "b479e237c3af7b72e26e032f790a73a9aae91897"; + sha256 = "1hv0gqs088ga60clp4dszjqsf67g6ppggmwi9h4pkyr9yni6himh"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2022-05-31"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "bc0f057162491e9228207d74bd88b5efe875316e"; - sha256 = "16fm573my8ysmcy68wy9kxwrm85q8fmpggwr83z1gwq3mmws59xy"; + rev = "0748955e9e8d9770b44f2bec8456189430b37d9d"; + sha256 = "1xifxwyjwfr9z801mm9sfh2sy0xf5ydhbg8ssi5mpdilffpkghp6"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -5147,12 +5207,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-08-17"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "40c71de9596ad9e7a7c742ba969399790cadd711"; - sha256 = "1md1ykr1anjxf2fcksk2wjhkqd7nc144l3v6pyc6pb0vs27qakzg"; + rev = "fab5de2c7430b1d091801b254afc30c066a3b200"; + sha256 = "1jqqnsi0sqfkgynhwy8a5ya3rqhry3fiabdkkivns9cjvvq5lz4m"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5183,24 +5243,24 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "c333ecce37ee5f096f17754901e4ec4827041166"; - sha256 = "10nrgr1jqh3rqanakx2pary4yqlnjk2lz5bslbaznbv1jgxh2zj6"; + rev = "3d76bb2968310f7e18a20711ac89c5e7b07e8c93"; + sha256 = "145dqk8423b8wnkzrv7ajvymxpsvpr2bj3malywmlyb6zkzkc8q4"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2022-03-20"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "453c50ab921fa066fb073d2fd0f826cb036eaf7b"; - sha256 = "0pkssmd29r2d5f0s770ppj0z4rv0qj5szd43jh16wxknwwjmqi9n"; + rev = "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1"; + sha256 = "1g8nnrxyfgn3v9k4xi7dh1b29vnp73k5x7vz002q7xar4alj468z"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -5267,12 +5327,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-10-04"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "90b00664709bc799bfa7cccde6dc34004499a089"; - sha256 = "09nahj79xqira309dm84vm012n2b8q2k47z8wjib7a4zf2gqfmds"; + rev = "c33b5c57ff82d71f8004b37c8c17a7928da76d08"; + sha256 = "019lhnwaiz0drdqx6vj56hgjqklfjf48vsx1fk35j5b97nh0sbnh"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5303,24 +5363,24 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-02"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "b0dff0ec4f2748626aae13f011d1a47071fe9abc"; - sha256 = "1md42dvgphrrcrs8vb8ff98l5j2sfrfkfip7vfjapymdlk356byp"; + rev = "0e436ee23abc6c3fe5f3600145d2a413703e7272"; + sha256 = "02w95zqbl3nx0vnl2fhlhlkil3jzy6yi2731xmy01qjl54vgqgdj"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-05-29"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "ee599409ed6ab31f6d7115e9c5c4550336470c14"; - sha256 = "09kldrnfy4fz6f706s444rnwkrzl0zx5fpiygs4mgvdcq1maavlw"; + rev = "58e12501ea028ff1171f8f06ea53891f7c6e1c3f"; + sha256 = "18vfrfkwr27jswflwrsppv17ylvi1l2rgxrv4p14cmyr03h8zx22"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -5399,24 +5459,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-10-01"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "0b320f5bd4e5f81e8376f9d9681b5c4ee4483c25"; - sha256 = "1308jj5jqqadw7kw8zkh7x1hs9cn0030xnb5bms4wsp013krdr08"; + rev = "684f57f9d6aed53dfa349986a1038b10b759e18b"; + sha256 = "1w1ka48zhv0qgx6s03q5c9clm3y7x572q0k6qvgqlj22fcqcqph1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-10-01"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "c8ce83a66deb0ca6f5af5a9f9d5fcc05a6d0f66b"; - sha256 = "18v77mx5806v2g9yksbfxv97b6nb1c9jp09gad1bcd09lvwqd3d9"; + rev = "1cd4764221c91686dcf4d6b62d7a7b2d112e0b13"; + sha256 = "19fn9jghvjvmvfm06g2a1hbpm1yd9w5dnr5dcqpwcaz0pxi1y74x"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5627,12 +5687,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-03"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "fc2f44dc6024bddb75b82e471c642ad1f4483094"; - sha256 = "197d6xjsp8cn8ff1awvv0yb3qqbb5kvyj8ddwdkvrfkm1a4hkbf6"; + rev = "9d4b8d393aad0e6e9227e2d67629aa99e56b994a"; + sha256 = "0yajlbas8ghm75d2qsngl6c72w1kk05rhpzfmsrp3yzm57jpx73v"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5711,12 +5771,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-10-01"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "414465468c93f693be4e2f69f47586cf37f3f751"; - sha256 = "04gzpjv8a7hwszs0smd23n11mhia90r00h15ywmlgx7xbp8a9c8y"; + rev = "74eb04da1945cb4411bb7b1a4373d61b4f4c135b"; + sha256 = "05rszmk0x5xbhlprfky2kn3dm2gvbiphqcb7yj65sng4423z4g40"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5795,12 +5855,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-09-27"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "17191679202978b1de8c1bd5d975400897b1b92d"; - sha256 = "0d9vq7zkn1pzdzhh68qxzciky27n57cwb74ma1s6ibkks9s52f9d"; + rev = "faf9ffe92d871dd18b4d26b52fcc6b36d315f335"; + sha256 = "1miwnazlrgjw547lnh1ksv1p9qmiwrqfw5x7f6z6f18ilhly1k1q"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -5819,36 +5879,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-01"; + version = "2022-10-09"; src = fetchFromGitHub { - owner = "kyazdani42"; + owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7282f7de8aedf861fe0162a559fc2b214383c51c"; - sha256 = "1x8alllrhd1ns2gghv8cl0lra9f9rk0qy3h4z4b6rj2dq6if3jx9"; + rev = "0db49773037a399996db81bb2ba0ac5301d8bf1d"; + sha256 = "1d19hb819zxbl1vzn3d50gyhp97z818hh5q9fdgav33kkkhycc4f"; }; - meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; + meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ffd4525fd9e61950520cea4737abc1800ad4aabb"; - sha256 = "0v73bdkmcnmm9j44w94hly2c6vnqfm375h1bss2vvw0whnk3in94"; + rev = "b273a06728305c1e7bd0179977ca48049aeff5e6"; + sha256 = "107yb35kq5c8fg2h9mr0v1wjskym9ai1wmfdr5j72gcv0zc174xj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-09-23"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "8d0759eb798fee2e1201b26c3279713ac67c44c2"; - sha256 = "1pbd9x89vcph1n67ybfnn659xlnbsy8wjx403j9hp7x1qy73906p"; + rev = "c46a8a0a60412a8fe43aa6bd3a01845c46de6bf2"; + sha256 = "0p90akdva7zjfb2yc6gybx1i7yr82rbg6943xz74c8wgynppasbr"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5879,12 +5939,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-09-28"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "41e8d8964e5c874d9ce5e37d00a52f37f218502e"; - sha256 = "0bl98fbxp7sjd943wvz127xqivj8830pgdfwf510lyzczaixn1ds"; + rev = "80a38f9408102693539f54eef3e6a57d44c6147d"; + sha256 = "1gnv82ph7irmaf17mmgm9a18gnysming6sfvbirx13d23y61xb1x"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5929,12 +5989,12 @@ final: prev: pname = "nvim-web-devicons"; version = "2022-10-03"; src = fetchFromGitHub { - owner = "kyazdani42"; + owner = "nvim-tree"; repo = "nvim-web-devicons"; rev = "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da"; sha256 = "1946azhr3rq702mvidzby9jvq7h2zs45d6k9j7clxw2g9xbx0k6a"; }; - meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; + meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { @@ -6071,12 +6131,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "11f6050c85e42d3f24bafd42ea20c4ab5540266f"; - sha256 = "0iq5ajrfs1iqxnd4x1hm1d0321czvqbkfrig796ih3qcnglhn26s"; + rev = "18d2362f28ba577824e68e0a12d2338f67da0e06"; + sha256 = "1qan2g1a0kmbbzwd4hs9msv5bx47m0pa02jhl7ha03g0j2qbxbcx"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6119,12 +6179,12 @@ final: prev: open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser.vim"; - version = "2021-10-05"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "80ec3f2bb0a86ac13c998e2f2c86e16e6d2f20bb"; - sha256 = "01qj967nch3wwkbshrsdzyyr4apvsqrpa4dkmpn21qr2183w84zz"; + rev = "7d4c1d8198e889d513a030b5a83faa07606bac27"; + sha256 = "0sqzj25sdczxcpbp2ncpm07y631w9x81yv292xji3l0nzx7601pm"; }; meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; @@ -6469,12 +6529,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-11-15"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "c18071e5c7790928b763c2e88c487dfc93d84a15"; - sha256 = "1m691f3w1zraam4cmq0sj9a86bmd7g1bhirrzqy5mg089x6n3rdc"; + rev = "61f719aebe0dc5c3048330c50db72cfee1afdd34"; + sha256 = "0q6ynkv08b4rlns6gzrkwxrihykpadcrln8ckbcwmsv97injhxws"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -7083,12 +7143,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2022-07-09"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "f7c4d93d6822df1770a90b7fdb46f6df5c94052e"; - sha256 = "01ngpjnpppazq4dqfwrdc2jkgz5ikpxkscsy0gc89lyi4q2srpai"; + rev = "34069870a8e72632c5447188e638e1c6bfebc353"; + sha256 = "0ik3p1p3wndclw7a72rx507fzk6d9zv6b75lahd0sp9ra9xhzc86"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -7131,12 +7191,12 @@ final: prev: substrata-nvim = buildVimPluginFrom2Nix { pname = "substrata.nvim"; - version = "2022-06-21"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "kvrohit"; repo = "substrata.nvim"; - rev = "aea8143ceab98ffcb02934773cc3b4249425f76c"; - sha256 = "07jjywqmcnll82hnibdrs42i148whn1x6l9dp2wr52kskq1419l2"; + rev = "e3b2b69ce597e8d17767a41d8db45b15178a0b45"; + sha256 = "0vw1s46fzqxd8mrqhb1azk6sks9bpacgczmyaki8g47i1adbs8cq"; }; meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; @@ -7191,12 +7251,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-09-21"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "5369682267a826a1717c1331ea5f90c19d5ff64d"; - sha256 = "017kj74lm935bi5sxg4gm32b0jq2wmfck65cjyhmxyyy8mcwi24c"; + rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; + sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7421,12 +7481,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-08-27"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "f1e5a5129129e2dd69f1d3f3df0dd8956903a963"; - sha256 = "1jhif6vi7n5kvn4xfz11ahy0a37dzkjq0scc3iiah9ad5nydmykx"; + rev = "ecf56935b05c7da4150e6d046f07b920628aab53"; + sha256 = "16jl04zbsmhry1ybpcl9czs2lzlni6dzpaf163y9ff080cs5f3si"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -7626,12 +7686,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-09-30"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "76ea9a898d3307244dce3573392dcf2cc38f340f"; - sha256 = "0f5x1jxmzj2mndknrz3cbyz8inb127hfw3zvmxiqpg2kjvmvxrhd"; + rev = "5fadc247c56e739d9c5c30a484fd291bb87bd378"; + sha256 = "1bdzdsxx9l0aq2hk81diawpa56m7yh33wvb6kb0s4c7i2c6kbi3m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7831,12 +7891,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-10-04"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "d6a0adfe3f914efa06ca6e662f0b1398f3522783"; - sha256 = "0d7ps1cya20i32d19qy93ycjwb57w2kid5wg2scg88kdi4g46q4v"; + rev = "fd9105c9487996aa2269992b72a6fea7504688e4"; + sha256 = "1aawphnlac7aaizn4im4v7lx87gnp1avishghvk3fglfsm95r3fz"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -7975,12 +8035,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-09-10"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "bf76bf2d1a097cda024699738286fa81fb6529ac"; - sha256 = "0993pydpn62z6k7f9msd5d3xaks8ij2sg10xrzawd6n3s35n77lh"; + rev = "bd60cb564e3c3220b35293679669bb77af5f389d"; + sha256 = "0w05yhyjh6j7gcdfghvbjylc64wba42fagnj4bxk1lbcqvnnzxc8"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -8011,12 +8071,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-09-25"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "da852a2d7e2aabae6d60178267d175d02c3396e2"; - sha256 = "0v4ahqalwrj076jp7kg52hk2cididihbgkzq1z6i1f86vnm69kv8"; + rev = "b60eb8f5f5257778645d9472d666853e1b86cc66"; + sha256 = "00zp7w77glgzdncr95d5k7k8cd3b46m3kpsn77ya96yhb25g8i7w"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8083,12 +8143,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-09-21"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "90eeb664a73c640fbc6304855d1a153687ae583f"; - sha256 = "1dyck2icfn4mdjlj4sz7458qsb4ilfp7244054qpzyxmxyf0ihma"; + rev = "c40fd7de27b527e018d7ff5bb0191d94b5e54bcc"; + sha256 = "1s63pcp8n33ajl18m2j49i3pskda376mwjdcyiw6wgvaz8sfzj7w"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8803,12 +8863,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-10-04"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e2df4b83764f816d517563229b0f1c48d2610b3f"; - sha256 = "13iy41x595nw5k8xd93v04xdbvnsx5s254v1mh5ima300abmx27w"; + rev = "bebf5bec5f497af5e299ea162087c443ed96c003"; + sha256 = "15bg1bqxskx9ji7w7id1ri5r1xlkcdih9bpfv7gpfm95ifkd8ss2"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -10594,12 +10654,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2022-07-26"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "436076b9f2daa805948fa054a24e3b519f6fc089"; - sha256 = "1gcc35pp44sm632nqa14hg9d8ymfrfs9sd62gzjkygjbyz9c8nc1"; + rev = "e8740401cdec9199f4676c5a640a785ec094258b"; + sha256 = "09rmmqq9a3xjcplw69kxsqbv3bpdkw1zvdiiihl499vafwrhky6w"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -11674,24 +11734,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-04-28"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8"; - sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs"; + rev = "8332f123a63c739c870c96907d987cc3ff719d24"; + sha256 = "15aln4mb82d2k67brgh6xq8nx9rn9ymy3a2ciwwjnxawzjs2pbpg"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-08-30"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c959072d38fabb36cd5371439aaba0b692fb0b73"; - sha256 = "1chq7ppyv7djjsamj7a05dx3zs5ic3nr0wvvc8qfswx1i9lrjhys"; + rev = "9cdd180a6056e8ae0c7d3581313344b9a3e8e7e8"; + sha256 = "02f8lmyrp60myj624aqgdqg91l19rfs32gds3d2y411w0p77kzbl"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -11770,12 +11830,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-09-12"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "faaa499189c4ee3fe13860e675e2370d55e3e5dd"; - sha256 = "11zhff8l3r60jcmmvy7yv5dxz661ggv7sjs8gca5xw9m63d9v3z1"; + rev = "250fd916757a545e7dfa29a62afa1e7ea16e2460"; + sha256 = "1iimz25g4vyg9fnjsrbc1b6rkga99y9b3wn0qnyf9d1hms643k3a"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12191,24 +12251,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-03"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "5b9701c5b2c9d90a304f10aaf75c85cc91678d57"; - sha256 = "09174syh0yd85xwc9kv8jv6h7zsd5ds8hrvzk7qryacb95vgv8mv"; + rev = "c345f17e8ff7c3158a60d7a4285fc29972fa0c80"; + sha256 = "1mi6x2k1dpyrw9fsrbq48rfyj4bsgcazy8jw7nnkhicmhp73mzqs"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2020-11-18"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "05f068ebd9dbdf71d2d334d02abd99deb0311c40"; - sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; + rev = "907174052a504e60e9b915f5c083ee5f6e067080"; + sha256 = "07jsgsv4j1zcxizl9wflib68rrp61zpxzy89yzak4b1lyxnl66s9"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -12359,12 +12419,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-04-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9"; - sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai"; + rev = "b2caf50a6e3c021c92b236abff70bbb467bce24f"; + sha256 = "0dccl6rqvkj7vlx25s7ja5p0nsxzryabd1hpj16r9dnsvklzs1wq"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -13033,12 +13093,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-02"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a111e8075101c0ac8be79f293e8c5181efa06402"; - sha256 = "0zqfl8xrwvab2gypw85kjirl10gc4afnwddz9j3spcq1mc11c3sn"; + rev = "e9b313b4dcaa35a8092c91fbff5984df39406173"; + sha256 = "08g2qlqjrg0svj53h91ay95fraa15v8myvx3yjvggi1f6y4vgwcf"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13057,12 +13117,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "588c7e471f80666a3796cd432b192182238181c5"; - sha256 = "1sig0gpgdj7qgpd889h5iabmz8x33niyd0jqfspsbw256vy6mki0"; + rev = "06d13155ac420b410b2b48e36d62069035c00323"; + sha256 = "0mn54z0w6sjxh3fb0igkmcbms102mi52js3fj3kjx5b56iy1k87r"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 69f07ef40fec7..850f82f7018ca 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -359,6 +359,10 @@ self: super: { }; }); + flit-nvim = super.flit-nvim.overrideAttrs (old: { + dependencies = with self; [ leap-nvim ]; + }); + forms = super.forms.overrideAttrs (old: { dependencies = with self; [ self.self ]; }); @@ -522,6 +526,10 @@ self: super: { dependencies = with self; [ nvim-lspconfig plenary-nvim ]; }); + leap-ast-nvim = super.leap-ast-nvim.overrideAttrs (old: { + dependencies = with self; [ leap-nvim nvim-treesitter ]; + }); + lens-vim = super.lens-vim.overrideAttrs (old: { # remove duplicate g:lens#animate in doc/lens.txt # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 746a46a0bd208..33223084447f2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -214,6 +214,7 @@ https://github.com/rhysd/devdocs.vim/,, https://github.com/vmchale/dhall-vim/,, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, +https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, https://github.com/direnv/direnv.vim/,, https://github.com/doki-theme/doki-theme-vim/,, @@ -238,6 +239,7 @@ https://github.com/wincent/ferret/,, https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/andviro/flake8-vim/,, +https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, @@ -327,6 +329,8 @@ https://github.com/latex-box-team/latex-box/,, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, +https://github.com/ggandor/leap-ast.nvim/,HEAD, +https://github.com/ggandor/leap.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, https://github.com/thirtythreeforty/lessspace.vim/,, @@ -348,6 +352,7 @@ https://github.com/ldelossa/litee-calltree.nvim/,, https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, +https://github.com/smjonas/live-command.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 7936ced720f0a..d02e08ed6cd40 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -7,28 +7,28 @@ , makeDesktopItem , curl , extra-cmake-modules +, libevdev , libpulseaudio , libXrandr , mesa # for libgbm , ninja , pkg-config , qtbase -, qtsvg , qttools , vulkan-loader -, wayland +#, wayland # Wayland doesn't work correctly this version , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "duckstation"; - version = "unstable-2022-08-22"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "4f2da4213d1d2c69417392d15b27bb123ee9d297"; - sha256 = "sha256-VJeKbJ40ZErlu/6RETvk0KDSc9T7ssBrLDecNczQlXU="; + rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; + sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; }; nativeBuildInputs = [ @@ -44,30 +44,31 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 curl + libevdev libpulseaudio libXrandr mesa qtbase - qtsvg vulkan-loader - wayland + #wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" + #"-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem { - name = "DuckStation"; - desktopName = "JamesDSP"; + name = "duckstation-qt"; + desktopName = "DuckStation"; genericName = "PlayStation 1 Emulator"; icon = "duckstation"; tryExec = "duckstation-qt"; exec = "duckstation-qt %f"; comment = "Fast PlayStation 1 emulator"; categories = [ "Game" "Emulator" "Qt" ]; + type = "Application"; }) ]; @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { cp -r bin $out/share/duckstation ln -s $out/share/duckstation/duckstation-qt $out/bin/ - install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png + install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png runHook postInstall ''; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ + "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 2e6aa683e4d3a..22173fe9e0853 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ wxGTK31 coreutils SDL2 openal ] + buildInputs = [ wxGTK32 coreutils SDL2 openal ] ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 0052212ec691b..57ae88dbd42ce 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -204,6 +204,14 @@ in makefile = "Makefile"; }; + beetle-supafaust = mkLibRetroCore { + core = "mednafen-supafaust"; + src = getCoreSrc "beetle-supafaust"; + description = "Port of Mednafen's experimental snes_faust core to libretro"; + license = lib.licenses.gpl2Plus; + makefile = "Makefile"; + }; + beetle-supergrafx = mkLibRetroCore { core = "mednafen-supergrafx"; src = getCoreSrc "beetle-supergrafx"; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 2e929debc34ba..1754ad5eccb6b 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -129,12 +129,7 @@ stdenv.mkDerivation rec { # Workaround for the following error affecting newer versions of Clang: # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ] - # Workaround build failure on -fno-common toolchains: - # duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o - # TODO: drop when upstream gets a fix for it: - # https://github.com/libretro/RetroArch/issues/14025 - ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ]; passthru.tests = nixosTests.retroarch; @@ -145,5 +140,9 @@ stdenv.mkDerivation rec { platforms = platforms.unix; changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md"; maintainers = with maintainers; teams.libretro.members ++ [ matthewbauer kolbycrouch ]; + # FIXME: error while building in macOS: + # "Undefined symbols for architecture <arch>" + # See also retroarch/wrapper.nix that is also broken in macOS + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 71eec60faf0e1..fac926c9062bd 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -53,6 +53,12 @@ "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91", "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" }, + "beetle-supafaust": { + "owner": "libretro", + "repo": "supafaust", + "rev": "85b5527231a6ad6f9475c15c8ff1b9d16884cd30", + "sha256": "6ynxRfGYlp7Fuq3XT2uHsR9Uwu7WMIYjclLc0Pf/qNM=" + }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index eb8ae705af73d..b546569d283fe 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -18,6 +18,7 @@ CORES = { "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, "beetle-snes": {"repo": "beetle-bsnes-libretro"}, + "beetle-supafaust": {"repo": "supafaust"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, "beetle-wswan": {"repo": "beetle-wswan-libretro"}, diff --git a/pkgs/applications/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix index 6adcb8ffd8b44..535cd40db6c34 100644 --- a/pkgs/applications/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { The following cores are included: ${lib.concatStringsSep "\n" (map (x: " - ${x.name}") cores)} ''; - # FIXME: exits with error on macOS: + # FIXME: exit with error on macOS: # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix new file mode 100644 index 0000000000000..04bc102311621 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -0,0 +1,21 @@ +{ stdenv +, pname +, version +, src +, meta +, unzip +, undmg +}: + +stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index ad9f0f93d0632..7f8cc200a968f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,144 +1,58 @@ -{ lib -, stdenv +{ stdenv +, callPackage +, channel ? "stable" , fetchurl -, makeWrapper -, wrapGAppsHook -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libXcomposite -, libXdamage -, libXext -, libXfixes -, libXrandr -, libdrm -, libxcb -, libxkbcommon -, libxshmfence -, libGL -, libappindicator-gtk3 -, mesa -, nspr -, nss -, pango -, systemd -, udev -, xdg-utils +, lib +# This is only relevant for Linux, so we need to pass it through +, polkitPolicyOwners ? [ ] }: - # The 1Password polkit file requires a list of users for whom polkit - # integrations should be enabled. This should be a list of strings that - # correspond to usernames. -, polkitPolicyOwners ? [] -}: let - # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. - policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { pname = "1password"; - version = "8.9.4"; + version = if channel == "stable" then "8.9.4" else "8.9.6-30.BETA"; - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-SJDUfAFEwYnOR+y/6Dg2S/CkA84QogoRpMXOPP5PyrM="; - } - else - fetchurl { + sources = { + stable = { + x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; sha256 = "sha256-Smq0gOGfBTjIOMwF1AI+TJwXaIiTi/YP9mGIqcjsCNQ="; }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "sha256-SJDUfAFEwYnOR+y/6Dg2S/CkA84QogoRpMXOPP5PyrM="; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-+2FQQ5FiB0N30JM/Mtnfa04K2XZaf3r/W1+i8VKNslA="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-nhocEwtr6cMSSStPa7S+g8SwPStJVWPblA3HbqJ8q6Q="; + }; + }; + beta = { + x86_64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; + }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-PNlEBFoIGYkDR4TzbudsqAE5vjbiVHTNL7XoflN+mUY="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-PYS0N4VeUjNhCncSDXvpyLuHlpv4nn35aJTPANdMXwk="; + }; + }; + }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ glib ]; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontWrapGApps = true; - - installPhase = - let rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - libGL - libappindicator-gtk3 - mesa - nspr - nss - pango - systemd - ] + ":${stdenv.cc.cc.lib}/lib64"; - in '' - runHook preInstall - - mkdir -p $out/bin $out/share/1password - cp -a * $out/share/1password - - # Desktop file - install -Dt $out/share/applications resources/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' - - '' + (lib.optionalString (polkitPolicyOwners != [ ]) - '' - # Polkit file - mkdir -p $out/share/polkit-1/actions - substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" - '') + '' - - # Icons - cp -a resources/icons $out/share - - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} - for file in $(find $out -type f -name \*.so\* ); do - patchelf --set-rpath ${rpath}:$out/share/1password $file - done - - runHook postInstall - ''; - - preFixup = '' - # Electron is trying to open udev via dlopen() - # and for some reason that doesn't seem to be impacted from the rpath. - # Adding udev to LD_LIBRARY_PATH fixes that. - # Make xdg-open overrideable at runtime. - makeWrapper $out/share/1password/1password $out/bin/1password \ - ''${gappsWrapperArgs[@]} \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - ''; + src = fetchurl { + inherit (sources.${channel}.${stdenv.system}) url sha256; + }; meta = with lib; { description = "Multi-platform password manager"; @@ -146,6 +60,9 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = builtins.attrNames sources.${channel}; }; -} + +in if stdenv.isDarwin +then callPackage ./darwin.nix { inherit pname version src meta; } +else callPackage ./linux.nix { inherit pname version src meta polkitPolicyOwners; } diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/linux.nix index fabbf862f3d07..06a10dd973d3d 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -1,6 +1,9 @@ { lib , stdenv -, fetchurl +, pname +, version +, src +, meta , makeWrapper , wrapGAppsHook , alsa-lib @@ -43,21 +46,8 @@ let # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { - pname = "1password"; - version = "8.9.6-30.BETA"; - - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; - } - else - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; - }; +in stdenv.mkDerivation { + inherit pname version src meta; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ glib ]; @@ -139,14 +129,4 @@ in stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} ''; - - - meta = with lib; { - description = "Multi-platform password manager"; - homepage = "https://1password.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; } diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index c5d48ff454e4f..fec26285b9823 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 = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw="; + sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc="; }; - cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug="; + cargoSha256 = "sha256-wpCzWJglX3FnNySnBRJjFWST5FIG5wAO7u+D4VIevtU="; depsExtraArgs = { nativeBuildInputs = [ jq ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 6ef5400d8accb..d57f2270daf18 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4="; }; - vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU="; + vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI="; doCheck = false; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 49f5f15ea5cb5..aecd7a4b09001 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18565"; + version = "18570"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-sL0u/lXxmJGn0RB2/6Vl0mLO5FyLrUIkRXD4TvZJp/Y="; + hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-YeriOUQqGbdIRaYTzm3/jXnNUIVsSNxCQ+BqJhS1bRI="; + hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 4e229c59fab45..bd27a60e7443d 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-Faz/cujnbK83vrIM1KUWXbUzNIB9eYAWCqWs+oJ1sYk="; + vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix new file mode 100644 index 0000000000000..2a6495ff0155f --- /dev/null +++ b/pkgs/applications/misc/oxker/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "oxker"; + version = "0.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-OhXU61F8XK5ts4GwDUkFv4+FGNFUmJJ9ooRS9/D0yvQ="; + }; + + cargoSha256 = "sha256-ldf0XYBhxLL2v0+yBX9Dqq8kYgJZ2f4Lor+rUA0/47E="; + + meta = with lib; { + description = "A simple tui to view & control docker containers"; + homepage = "https://github.com/mrjackwills/oxker"; + changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ siph ]; + }; +} diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 93d5d74ac731c..966d8207cc0dc 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "pgmodeler"; - version = "0.9.4"; + version = "1.0.0-beta"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-FwLPhIc2ofaB8Z2ZUYMFFt5XdoosEfEOwoIaI7pSxa0="; + sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d7613b0c2a54f..405d992576da8 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39 +, python39, fetchpatch }: let @@ -107,6 +107,16 @@ python3'.pkgs.buildPythonPackage rec { pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt ]; + patches = [ + # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes + # `Exceeds the limit (4300) for integer string conversion` in the tests, + # see https://hydra.nixos.org/build/192932057 + (fetchpatch { + url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; + sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; + }) + ]; + passthru.tests = { inherit (nixosTests) privacyidea; }; checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 80563a931292f..442f9d0e9b50b 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/guillaumegomez/process-viewer"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "process_viewer"; }; } diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 0ba8c5a97ad9d..e7a871a171dfb 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; + sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto="; }; - vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; + vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps="; doCheck = false; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 3278191a9c532..d2cb55810eb0b 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib , brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses xlibsWrapper bzip2 zlib brotli zstd xz + ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] ++ lib.optional stdenv.isLinux gpm diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index ce2392ab4edca..a3f5b32369730 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 -, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking +{ stdenv, lib, fetchurl, fetchzip, fetchFromGitHub, python3 +, wrapQtAppsHook, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -7,35 +7,56 @@ , backend ? "webengine" , pipewireSupport ? stdenv.isLinux , pipewire_0_2 -}: +, qtwayland +, mkDerivationWith ? null +, qtbase ? null +, qtwebengine ? null +, wrapGAppsHook ? null +}: let + isQt6 = mkDerivationWith == null; -assert withMediaPlayback -> gst_all_1 != null; - -let python3Packages = python3.pkgs; pdfjs = let version = "2.14.305"; in - fetchzip rec { + fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4="; stripRoot = false; }; backendPackage = - if backend == "webengine" then python3Packages.pyqtwebengine else + if backend == "webengine" then if isQt6 then python3Packages.pyqt6-webengine else python3Packages.pyqtwebengine else if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else throw '' Unknown qutebrowser backend "${backend}". Valid choices are qtwebengine (recommended) or qtwebkit. ''; -in mkDerivationWith python3Packages.buildPythonApplication rec { + buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication; + pname = "qutebrowser"; - version = "2.5.2"; + version = if isQt6 then "unstable-2022-09-16" else "2.5.2"; +in + +assert withMediaPlayback -> gst_all_1 != null; +assert isQt6 -> backend != "webkit"; + +buildPythonApplication { + inherit pname version; + + src = if isQt6 then + # comes from qt6-v2 branch of upstream + # https://github.com/qutebrowser/qutebrowser/issues/7202 + fetchFromGitHub { + owner = "qutebrowser"; + repo = "qutebrowser"; + rev = "5e11e6c7d413cf5c77056ba871a545aae1cfd66a"; + sha256 = "sha256-5HNzPO07lUQe/Q3Nb4JiS9kb9GMQ5/FqM5029vLNNWo="; + } # the release tarballs are different from the git checkout! - src = fetchurl { + else fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; }; @@ -66,6 +87,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { adblock ] ++ lib.optional (pythonOlder "3.9") importlib-resources + ++ lib.optional stdenv.isLinux qtwayland ); patches = [ @@ -94,14 +116,15 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { # Install icons for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ + install -Dm644 "qutebrowser/icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done - install -Dm644 icons/qutebrowser.svg \ + install -Dm644 ${if isQt6 then "qutebrowser/" else ""}icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + ${if isQt6 then "rm -rf scripts/{testbrowser,dev}" else ""} install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 1d799c9fe9fdd..3fd45f3e9c28d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.9"; + version = "3.4.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE="; + sha256 = "sha256-bAfND84mbJulv0IO6JF2c+ZbwKeND8AVAJHmdMmhZ/s="; }; - vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI="; + vendorSha256 = "sha256-S4p56/OZpufpi71aueYTvPcM4LoZWyAhcAzUUUrUw4Q="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index ca4c7139adba6..8aef3f81af518 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU="; }; - vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q="; + vendorSha256 = "sha256-waEvrIEXQMyzSyHpPo7H0OwfD5Zo/rwWTpeWvipZXv8="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 23914a6a9fe82..c3c6355cd0cfc 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ="; + sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 5ef3a336e2953..fe4e052fd5118 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo119Module , fetchFromGitHub , callPackage , config @@ -21,7 +21,7 @@ let , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false - , mkProviderGoModule ? buildGoModule + , mkProviderGoModule ? buildGo119Module # Looks like "registry.terraform.io/vancluever/acme" , provider-source-address , ... diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1fd25b138cf16..47d7e2ccbced0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -47,13 +47,12 @@ "version": "2.4.2" }, "alicloud": { - "deleteVendor": true, "hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=", "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", "rev": "v1.187.0", - "vendorHash": "sha256-aiybvpps/TyrMRP8vbfhBAUO+9kR7WWrgo1kOWKTj24=", + "vendorHash": null, "version": "1.187.0" }, "ansible": { @@ -138,13 +137,12 @@ "version": "1.0.0" }, "baiducloud": { - "deleteVendor": true, "hash": "sha256-LaehOof8T2LGgn6Q/oo+SPcld9QRVk+MjaEJnYvNNnQ=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", "rev": "v1.15.10", - "vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=", + "vendorHash": null, "version": "1.15.10" }, "bigip": { @@ -411,7 +409,7 @@ "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.15.0", - "vendorHash": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=", + "vendorHash": "sha256-QsUJ9BqoCtMC9PpGzwlKvBn+BDlcjUR2rU9zx8FvLCk=", "version": "1.15.0" }, "gandi": { @@ -448,7 +446,7 @@ "proxyVendor": true, "repo": "terraform-provider-google", "rev": "v4.39.0", - "vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=", + "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", "version": "4.39.0" }, "google-beta": { @@ -458,7 +456,7 @@ "proxyVendor": true, "repo": "terraform-provider-google-beta", "rev": "v4.39.0", - "vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=", + "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", "version": "4.39.0" }, "googleworkspace": { @@ -531,7 +529,7 @@ "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", - "vendorHash": "sha256-VlJO11t7uqAl0U26T/UY2u//+Vfq97+h4gABWt7iQwk=", + "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=", "version": "1.0.4" }, "http": { @@ -754,10 +752,9 @@ "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", - "proxyVendor": true, "repo": "terraform-provider-mongodbatlas", "rev": "v1.4.6", - "vendorHash": "sha256-jmT5SoJA4iQDmP9cRedQ4wTPoOXB4NL8hHClsp37ykU=", + "vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=", "version": "1.4.6" }, "namecheap": { @@ -1201,7 +1198,7 @@ "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.9.1", - "vendorHash": "sha256-l0uKS8ZIXq0LgSLtYBwtiWuPLeYA62rCt6eDxrnTZfA=", + "vendorHash": "sha256-/ZIGfLHkHq1Yv+AsSO7KueK5ANxnUWFKwLKyZ02q1cY=", "version": "3.9.1" }, "vcd": { diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 5759257c4a05c..2d24365466b79 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KRm6+WRMGzM7L17ABj/g6Nu+eU6F3C4a9CAa0ePC6i8="; + sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 6b7b240eb4893..22c0178cd8fe9 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA="; }; - vendorHash = "sha256-ZZh6vKbipp/JmDiB2ELKCFuRUDetmA3+WG7o6ZIQXZk="; + vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; proxyVendor = true; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index cc3ab2c01accb..931cb683d3cb0 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.31"; + version = "3.3.32"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-JUeH62y2Y73N843ADvvK91PpHAwn1QApnz5Qusm64mI="; + hash = "sha256-AeEVsgJtg9QVSstliKNbwogbXKpVhL3VnnsnEqg27wc="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index aa5b0fcc4b063..48f2f2e1fe0f1 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -96,7 +96,7 @@ gcc12Stdenv.mkDerivation rec { meta = with lib; { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; - license = licenses.gpl3Only; + license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.libssh2 ]; maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index 8ac65ea45d3eb..d18cc7d0e8bf8 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the seshat package." + echo "Regenerates packaging data for the keytar package." echo "Usage: $0 [git release tag]" exit 1 fi diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a7c7c30206fba..6a5f898348cf2 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-FjRrAswoE1yuDoR42U3ppzvEvFN6K/VBdQ0w99wXPtM="; + sha256 = "sha256-kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65fb5458fa493..be8ba9c132a3d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.3.1"; + version = "102.3.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4e9ec93b6cadc5596aa61efbaaccb377b4666e48dc73237c6119f9a91478fdc9"; + sha256 = "be8247ed8d61d6a62958ec015e6e192b32dd897ba8fb1d1cdad00b992a65e838"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ab00353e8e55395525fdb85d5b2e824a144d52117e113ef88d5b120e99ebd506"; + sha256 = "98b8a0d748e1c3ea7f776c7a79e04d16c14eddd2a6b2bd68bea2440cda9c716e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2d7fc95f771cb315791d7b5558a05cd0b897e407b456d464235c593afa8c8dd6"; + sha256 = "cc7e318a00a4dc7ea1094f01fd876bcf38712a3cf2ff9662fdd01e7be0509d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "091e1da27b7590cd3a667c3a380d59723b2807e66401834a2d54dbbced4f98ea"; + sha256 = "d2452c7a69509a8ec5043151f2ffdb3aa40ae51fafbc7343a902c56ee3da833d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "02cb218c8f9b0407f1c7da2b688d3ced64c4e05166e6b234d89b7ec3f35204c3"; + sha256 = "ab50997f169d11d54f3873be2d0a75debb1d66853cbeb2a0f6716e215798d558"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4257d1f808ff6c4559f5710e5f3ba03f28a2a6725a8d707d10baca133bc28c0a"; + sha256 = "3959465afba39a3c77e03fa9b2c9f74e455af2122cc91fce743767430f96462f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cc9deaa88c614ecf831cf7cebab21197f3f4eeae39934da474a60ce29b8e2ceb"; + sha256 = "c055af1ef096fd5b6269b230ccd37bc165172e6a21da1330d8b4ee6c3ff583d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "917854ff9d323a2c827450e3c37dc8b1b0de3d666f91b400999f290dbca00ecb"; + sha256 = "65fbb4680513d04a12f0acb476e485cffaa8cea977e8f17abe0371c990e5aff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9d785bb167ccdf14cffa6cefd78e40da6851c328ca898c332647639c79c2217e"; + sha256 = "0b21e350dba000535ca747207034c5b7665d9adc652905330adb3c0b2ed52025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a7cf8397ad73f8f9beddfffc93950336d6619bacf8e5e3baca0cb6ce934927a"; + sha256 = "a998fc9979a679220e5078945a3aadf3168ac89278f6063ae8af410fd9ba11db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5cd15b8266e6f27e676bc268e44dcac15f24bb385443dcda60ce6493a3a9694f"; + sha256 = "4fdc6aadee7fb96408d39d3454e77c03f09efd2110fed03450cb4076fca0f127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f765a23938acd9d7a34c16bf578ed2992d81981f7425b3ae0971f8daf6567d86"; + sha256 = "6780d62564adb5ec21c85b85535e92a2116e34829b873787003c70eef0f0fae9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "71bd0e2685b76081aaae2d30ec30f787c58d6c22d191f91c968e0e8393c1accb"; + sha256 = "9eaaab1db1d64482693fd9fe8194aae2d0d8b84822e78ac9f5819042059a4fb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9c6312b6c76c388bfe85edf0c23df474224db5db804298eea2623229f82ba6c0"; + sha256 = "9a5a7ba9c532fd91a781fca68146634987d0546e237703cad0a5d71ed33076c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cb0d81609be24e85454a7c52f05ef6f4557837e6ca63908376c6beefa4d6a7f5"; + sha256 = "ead8deb57af6f8fdee2a1cdb6ea19132ccc2c0a1c4fb87bb25ecc1c8992995e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8fce652d0f319812e1bcb485c011087a09034a81ebefc19d8e6bff6ce74897a0"; + sha256 = "3c7083ff11d817d7d29afb0fb144124ae33570eb1bb26a166e70d9a79f217cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "23c48f5d92915d1ed823c2f47f3a611bf81dd6d69b9b1a5a0aeb939a405d7466"; + sha256 = "0cab200bb2acf7024f772a2762fcbc6b8a6d8cce4471cd95558b030e6b0547cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ffb7f0e9d6df315f9fe18dc955d2d5394a8b2413727ae674fa81d72fae0d8a14"; + sha256 = "973d0a573181b17461e9dfc80cd3b4d2d38b9d489caff2fea43b2ca307b24cd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0442f1146c6c455c4934834b8b6dabe42afc29512a48f9ccdb28467de0d8800"; + sha256 = "ea745ba8bb2db5e1b53a88b9436b0a49d0644c53cc379c84588b0db82603728d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "84f7b65736a7c872ec6ac7283ff53d1c0b9e36edb1469784b5094fa963b44d59"; + sha256 = "fe408a962b117eb768a2b83da65301286331642c6fdb30def84669ea659b7cf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6c2985ac3473f124b842daca57d97f584a58d1d5cd0864cbcc432e1af250e83d"; + sha256 = "419f37f72857d123594e2915571eefe91ff7a6b68c10c48b5efa7fc7d248ddd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "adafa0ecbb2f8a8ee2d4f06b38744c9bec60d1d0bee386b9840a4d5e08f28cb1"; + sha256 = "8cfdaea3cfbdac4143becdf49166934fcc9f55a826b424282d7af2df40e35f55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ab7e814fe7e45f49bc6cb9451ad388b3d220af33d02071c8d9358ad1949937c3"; + sha256 = "2a8d309a5eaf7c558fc2337612ff8c6aab7de9e8d1f8787b603cbc9a1cf46de3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f2bc22c3a12fa32c8c13e50a3fe502d5966fa082e6b07c84d2867b043f7770fd"; + sha256 = "7dd70ae9161f0a360febd3df1cbd0eb2b4c0ebf3f372e64abe2762e1614be6c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eeba9b084a5cc818dd62f0bc60de98769c2a62923a121ed77b84f9b4409e60ae"; + sha256 = "5df8cd18f0cb1cbf8df3cc2377e9db499bab2615ef612fe6651e93b376cd03d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6a86c5e24299ee5a24a573d5e598eb42686c4c5baf58798f487048bb18b9d892"; + sha256 = "7d65ee7e12ee587357b46b4f8cdf4941607e5c8166e0e9b70bb9ae0add8c762e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a53567a12afc89f3dbdc20976a098f085298414e9a2453e86608715e7500609b"; + sha256 = "5a9b6c76571dde94dcb8e17b375d0e294bed23c4805f08628b7d7261223efb47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "fc47765f922e599b18903a9697493a3c939e5660b3efb19353c511876bc1e74e"; + sha256 = "78be935f676cfe736e0930eb5ce3fcc722ad3711bfda9b2e5d773c4407150867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5ea02bf7572cf7568e508b42ebfc7dd8ceacc6675b80a609d6fb2448f99d111c"; + sha256 = "ad8ffd7c335c845826c477c59e6c830711d03a2420a1f1fe4931fe47c6673589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cc304fdd627e3eb6286ef919bdc0afa08c13c06b9586e058724a30a58e06bda5"; + sha256 = "fff30dcff80b6bef6330287534ed4823b3e3cfcddc1c1af522c81ce498ec0084"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5b4daf66a885260f00d6142102830abe91cc3e4ba5f44dce89f9ea405edcb725"; + sha256 = "51e184549219cfa88f96b0d64e09aea00ffc6237fe658b899fdb17bacad52234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "eff03ec8945cbe8378651d8847aeeaf395c3c5a6351f8f77586969db13cff90a"; + sha256 = "140fbeaadf1aadab59f941a0d2bbb7bf1d26b5e3e71aaf5f600ddcd6bcfa144f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3e1d117ca12ab81c71ac412532691bac97488d4c4de0f2c6b3e04ad8842b8d5"; + sha256 = "abe9b2d0c3fcefd789e169a7dcb2ead15d55d6fa7638fa0dfa942a25dccf8ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "31783513a34d7c254bf256fece50303d19659d555ec9be6aa65d7c927331b613"; + sha256 = "600779207924004b413f8929337bad94749babf9881fff934fe22bad6b9653a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6872d041b88b3ef63c576545f290306002af052bddf836755983f1cc04e0d88e"; + sha256 = "a1a30d74a88331e16a9e607987702ff8c586e0c1125e53e76e3ce58b94c7066d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "62b3f417ce64feec22cad34bed2ceff9b148e1c70fa6c113a6ebdffa03176790"; + sha256 = "48cf2fc404a1957b3e788f1744bbe09fa0c43da8a48fe2f16e620dc7897c42e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d532ffe63954e34a1fabf0c4fd82650d47b6149ed24e721ec8a982e41151656d"; + sha256 = "92519bb0731fe2f7c4e5977153a297c8d00e59a7e74df974d5c97511cb0d24ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "34f6c534c1a1e0765beddab6f282a37a433019bf34c8f682b34bb2043ee50873"; + sha256 = "680e31023d639d4f040b6c7c64e81169d28ed8d57b30aa9e26b6bf1a4c7d76e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c8eb3166d1969e61092b360387cc36225a40dd6a6bd02fb1770fe9038737725f"; + sha256 = "0011c0b32afa890108133f9c5ca56c5cac521f76e1462497facf3bd56ef80c4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1ac2a9fa3c8c4d81011bfaf7832f1b0e8e90eb5d5e6244090d72147d2e2b8fb7"; + sha256 = "95c95f06d61ab3090908e24e58d19da58ac7f5581f8fa414796ef493a1bcdd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cf93f79fa959c5bdf95b4c35c55db071825026d251ee877901864e875b28cc0f"; + sha256 = "9b80bedc6791f41acbff75794d3fda188f112b3c010ad9c1cf070624a07055d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ae27c62284aa6884daf2e798f150d2d23134dc1a9f94fa6af707436af2018c13"; + sha256 = "42aedde250458f5764b0d79c551feb0f2d06e40cf7214f83e8d61401a700ee5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1866d66a091e4b8126b70371631e5c97ce0a5868c77355b8e918678b1864e982"; + sha256 = "a3b2cf7a102cebea1ff3bbe9eaefddddfc800a0b7a8500209be71e191ffaf62d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "01b3960e8316292b7e76ff1c43784120d515ce9f1dde3698db3242fb1b06edf2"; + sha256 = "b20af066f049d1763ace7da37255a5383a2d441cb9ba9135906fdc1aa76fc479"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98afda50d6fe63681e643d6580a773bffac167a6b074fc2523ddeaa99b34b791"; + sha256 = "0a570b14610cde2fcb4ab0fc4db9ed5a2eb468690d5adf0518487d45b6866643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fa8e08b8ed82590db431527c75f407365b01da7a8bf445060eabd3b1cb433191"; + sha256 = "440ecc50c0c245494e4fd8f32aa3b927744a096b4aacbe4fd11c72c6ba466e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b1696f0c18425096daba4cf42000b62fb3e520b670b96c716dad159dfd87ea8d"; + sha256 = "abe9de2a4ed8d11c5f8b5f51b39eec4814eda96ef601b4feb5236779c259d04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "64d1d93e474178e58ecbb6a320334fcf282768a6670d7a4b61a9868028a2b872"; + sha256 = "343689c4aa8970ab7fc6681a43b0bcc4bd69d63c900cfb4e4f62c4ccbdd93181"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2944648239de42d63296117fd400f91f113f1abe43c07427d8bae171fc704178"; + sha256 = "d24b3718ebc598191f3ae650ecc6bbd800e6fc3725fcb8b6ef7fa7f63ef9eaea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8a90e2f181579f2f554323c0a517f39068261157fdb9c7a3e103b7e12bdaf85a"; + sha256 = "7cb226cbf2054aa34a27f2e9c033fd3f1fd5848d0737225da38f0fe22d2d9a01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "daf5b99316e61405a791d4c08934135578b89046b9364f59d8ff3c96ae2aad8c"; + sha256 = "1f65677e9e595b39962d0ae6a9cc0942b69c9fbf7b3e22c21a12830678ca8fab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "21293b3675a5cf775840a197278538132ce6072fcf05c9752658d7b8c1733507"; + sha256 = "cf07014796cd820061490c0fcd0be3c429f80a8edf9ecd712a5252420c8333f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a488e2de83e8a644dd4943ae1fb1ef7e573044d896d40174c057d85b5c572bdd"; + sha256 = "6691874f03e8a39c570e8b1b51eb0a4ae0c9b7b7ec6e10d955a82fb86dc5628c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c442169025d3af45f6f17d93b4ee6b93a19dee8dc76aa3a86d05f909c7738f01"; + sha256 = "28cf9994e05d3ae6b6d740e73fe773486f4f80e94d9886ca356e22230a26f4a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ecdf233b3492989e4bfa8479603088bae5c01d91f803d0ef75217999727bfb96"; + sha256 = "9d07755c8471e85514c3b06a819b4acadaba1f5e19a83d64b6f33dc0e23ed4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a50de5e9e4d521fe82dac6975fc0524cda87982dbb408fc49020d444fe4a517"; + sha256 = "f7be5127b7e7f10dbf0587c1593ca7ed6c06c8ab7c6027ae6e3e02d01887f294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "85374a718f1968852318320d39dee77b1377aab49e9d16457a1a92b8606f0390"; + sha256 = "ef624dc3078b216c2364bd409b1a34aa7b7bfa85571b47c6ceff1acde0232fe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1a2799e9821b1eb49ec90e6b50fc2b306e53738e192fbb8bcccba0ddaad90cc7"; + sha256 = "3dc3281d8395ea38c877a28e0d825a61466092b2b1206db219e14d2a7ae761f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f1d06d90214103104788f2f874b0ec7b915fda8f2a2c54155706f6c8b9455c7"; + sha256 = "2a72cfaef31debb488acc070365764e6478c8c437b76eddcd783c4c0af8764b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1d611eb6a2a1dfeea5e08bdc1d46a580df25f172169a9752d865b89e44bd673c"; + sha256 = "8a668f1bb70ea4b93f18e7c8e0667605bd3f97a175d6887adbb38a1cb5247452"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3c9df11854ff3a775b9bafe57feeb585afd46e853e8be06b73f9fb5a06b21595"; + sha256 = "32dbd1790457f0224584115471366b09f1bc4a72a72467a3ec25c6cd4f1da520"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fa3a01b7a86a8885aa05fe9251ca8843b08268d338d73a4f26e790b76249e429"; + sha256 = "2f95ecb5ba9c725fed978f2a27d117cafa622eb3988ca3e0a3afd3bd38a1d529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8e87c7f295216f70d861ced167970968db3926ddfc597613b51be82724793e19"; + sha256 = "44e1c9893960f43dd74b9fbfc2cce481538b1eac76944dd57f9e580b99027bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c8a75c6a87e5606037da51c57a9b0ca01cce95b9a6bf51f92645902be7fe666c"; + sha256 = "5fa13f379f064a7d070a32b4eeff8d8c80dae880ade4cea73ddd1d43bf3395df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "679f176ab93c5afe107c9afad67216c86f3b85fd95051da8a194e3f28bbc9c24"; + sha256 = "0636cb784ae1d4c17a2c9f34293a1bd0def3ba11ac38114d0230bc807a0b5cc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d9dac3efd9f3b6f8b3de483fb895b21079f9cda9cee4247dcf605e7d1a15ed71"; + sha256 = "37e13e04ccf331da55467ba0aeed7ab8be837eeb48b64a46a8dd975955cb2b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "448bba05f7fc7982e189cd0b012b83695a16b7912050919ae15ccff23ac0e9c1"; + sha256 = "9f63be2b52e9eeaf0d17a23287f406af72a15a3469f699f31c78c0065ddafc01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ce5d762c58ae99327e1b40bb0a2fa39e66391d620b09d156299c1240f3cd6214"; + sha256 = "b796db3c8f75a0a20ee74e264a08c35e8f77788fa539951d184f78843f35cfcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2bb16102cbbf2d5ecf8a4d0cf7e52abe59e0e77bab8b99955753ed2833c7c60b"; + sha256 = "ec8ba04578e0a04d55dbfd8c59e79a7c57b0c43e577b1c675463509f6defe155"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "77480fd5f82259c02107072cfe572d8c13611279fd9a6ffb2a9203db8cf1e233"; + sha256 = "687c2a8a79423ed5641592c09df5e93526da5b03c9f8e19fd5accd019ab31e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "317909be58eb0718ee8a38e07ba22ef78fa912a75f18b547a1a65840214c52a7"; + sha256 = "b233d9f0a61fe08bd6781edb25da9ed272ff670ded5be133d0cb8750f478d5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a6b8d5c4012c00cbcd03beedb87826fd3553497da09710517d07ab5f26347f92"; + sha256 = "413384529739c1b4d38766e307c950a77dfb9924da394ab27dfd815cc9bf0d43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "337d21f0927c21e54009d0a38744230145e7ab36710940da1180517a946bf06f"; + sha256 = "f861c426676cf903d4ffa54b95472da384a387e0639c70692ec3b7481fbfe77b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d626cc58418c56a6505087e3ce1b8387cbf371c86653e5576b24421ef1be8cff"; + sha256 = "87679b7dcc550f1813085a7152e478eaca0e6f4a330d58d9d19281228049a054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "85422320690772a867f9128c77784f16270d739561e613505894ded2d5dea8bd"; + sha256 = "3c78f10ca1d7aa45f8267720ef3f6c6d7184f84103dd3fcf0445e05537528cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1b01874769ddcde6a5e520034131a42418f2f7cadb07d0aa9e815ebd0c59dbda"; + sha256 = "6505b99879b9c689f1b6c29adecb020c6dab72e13f4e8604862760d6eaf522a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6381065e3e8841a6113d2cfdc2ccb6d8082f68e977940040ee85af2ad59162a0"; + sha256 = "782422e9469deec492c38f6e004828c972341650b36c86b74d86f511789838d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ce9525f4d3df6336f01c526d095292490a3ef8c50752140899ef01dd5a4822cf"; + sha256 = "07077a1d02803a9c510bbba3bce2efc3d987ab1df654c6d638a9e8717e11fc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5597b4565df7f09e2a5682fe252076c1f689a3c7f139a38b9415c1e1ff6d3255"; + sha256 = "5ca4dab28f2f912a56fd0c2377d9537001bd07ae09b9ce20050afd338d0dd615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4b1a586b566482d4a0b333642f6a3f8d4b68c6eebb0a0620713af4e5cea97997"; + sha256 = "12c8883d711ff39876dd481f94e078508513d4dd3ac74cbccf33c44ddb0bc0ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d6f1602354ac05f3220f8f4dc95164d511530f3aeee50e5f24141a9807359320"; + sha256 = "c169a179d6bfd912cf3b44bb7491d43f572bcb8044100d7f395504fb3b031c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "14432051534a87a677318885cebe3e1ecd0d8121426bdf378251da28f8c1a3a0"; + sha256 = "a4d2a36f571537310f92bc6f15a7ced0f65f22d6c5392384ed8d7a41302832d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "24b0bbb9eb51289daa6dd422dda05b044f1a5a791d9d5108ea6eeb711c44de76"; + sha256 = "69f5fde05bcbfddce4e11e7e18efe535fde0f79011fa5f51d5713d4b987e3c36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b7624620c724a64b1d87f09bf685c26ce0a84d80b07ca6d9d3f784ad21967277"; + sha256 = "839318c257e33ea00be23d985f4ae59083e406fe08cbaa70853c8df762a98629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "dfecfa47b402b90456dc5d4ae623816cbeda9c80c4938f741bf151fae0793f47"; + sha256 = "b33fd34807fcc93f6fa2d82a0a8f4043929163045d884756abb9ec1f63ac7259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8e6527ad6aad041262d85f514ecafd9d62814844a8a29d7ca1ae883e79cef50d"; + sha256 = "d0e87997410023ab0a17b8e1787846794d8db04d39b79af909cee47ee34977ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8d18b241852707454ced76b234b242b3779b8d6e1443dac325379be06e688e9c"; + sha256 = "c1181432421d40855719720d0523dded01e9a6c5a5bcaef70ac46a101e0e322d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b8aef6273a96f6e78ba194833fcfb31461fdc6bf6bba0fd6b2412fdf152ec53c"; + sha256 = "f9de976e9bc341963b7b74963a7c910a37072a4e9b873de488b058f3c43d6399"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "001c89758fc323fa0adcc687d9a593a7cd37a02bff039028876cbe29cbc30c2e"; + sha256 = "229dfceb87668c8107748095ac8675473fbee621b1b330c306d80a78832a75cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "736754863283dfb3c3a4fed93d75fca3e7c91e8b82b501569931c34fe75610a3"; + sha256 = "c280b145e31d954ad61d65bbe18651abd82e0de916508bdaf82986bf6c5c137c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "99de0a63b7591e089fbe107c9054334dfba47a6c2b3fe5a1257dbdd6201d6ca2"; + sha256 = "9bd48a6794b2be0396a028ecf68d3a5ae3e36d758fb5459a28129a96aaa88ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b7e2fdf11b027c6ebc8854b1dc88c8bd0f9d7fd79cf8a795aaa3e915201fec80"; + sha256 = "b9c1200b4342f03bdc3e37ef28f902310e89d200befeff2eac27c77a7a128ea5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8e8c4c8fc100186085c7a6fbbf5aa051effae790a6616e0b9443dac25b635da4"; + sha256 = "22fd8a830e0c35288ff80e26dac73fa8761bc830e3d3ecb85a9b463481d695e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6961cbf70431de590dfb00037bb78872086405f0e6b769f75ed3d053e4d12ace"; + sha256 = "3bf4cc4bb3861ae6145930b269fc5130bb51c482ddcac32db2af366428c44a79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2b7c4b2fc9ef21cc303435ce65361314c9e7621259384205658ea06fa191f91a"; + sha256 = "a46292647a3edd4f98bd7a228523d62c398ecb08cc6c589a63db8b7b59ae34ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2e223e3830b8d7b4747633c2450f654d6c92b822d04c7c652d9c5e5431d19cca"; + sha256 = "5fabbf58c7ffd50959e35bcb35d7ede411185c6243331410849db34544117ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b8b49ac96522c1e0a44aa0341a272bbfac68bc3022bced753baba929c276fe7e"; + sha256 = "eb7000d604770fe4ae252a084b873bf4daa21e63ee61b8ce55b9ebbafe602e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b3a5aefaac3a95d4dd1d809835cc024338fcf2ed6820808dac1007e74cb11c2b"; + sha256 = "7ce1406fa995ae3970256f589bd0cb66a650c35eda023dc8ff581e6529a5743d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "adc79864747e21dd293d46d91f57dae8a502964c5d6f952c010dc0f0a1d4c656"; + sha256 = "de6453eddbbae63e0336dba130fea7b3ea00cf7ffcafb3a24ab5ac42c5799411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a154337146c6a8d5a8acab2f332ca8da6572bafdc9c888ba062bc29bc7ef37fd"; + sha256 = "d2e952ee9e4ef37d5024bbff1ea3f1b9c88c7aa0df4f9feba440101900e24390"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5799af2df9dd50b0c6694335b12cb77783ab0f622a8415ff82fbf15aca2822ad"; + sha256 = "2804654ca434fdc9f80d8b32c75bfcccad25747f9d67c54752d6f313ecb0ed93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6c2e9dc4c6a805f919840c22a75fd6acd4bb3078a82a16b3b27e5ae1a63e21d3"; + sha256 = "0907217dcb9896d9bca6d0c7c62a557c897102b3b45c9142bc51d3c6b185cc70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9e67f40ceb46fd39f50cc0f8f5d83ea3c677bd91810dd84d225c636f6c20a290"; + sha256 = "049b550bb8d8a1dd274ef696dfedbb84602d2811c14e893c7dbcdbb38fb367f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "765c999714bb3b897dfaa0fa3e6743123ba7e3d7dc9e54eea9252dc10e5535cd"; + sha256 = "c609dc4eed2de0e0a4537a3f9640ddff41403672c787471ee09fb02a476f9047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "63380a855e8e68d5796d22c06beaf0c0021e5488cc8d408049126334e62fb70a"; + sha256 = "be17a41bd8d3b76d7cfe1d1f099efec944e2df53ec5a89ccc397217a258539c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "694dfb86d441657d7fa3a5c9fb0aee04963fca34e6062278170b7ddb828bd6f4"; + sha256 = "289d699f0bddb51abd9df3628ec0a83990c0c15e434da471f3f3578c757a4630"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "533945ef9f5f4b47b8042e226a062fb0f406a70c89fd727c86360ff86ede56a8"; + sha256 = "494aa9bdf725a911f2494d33698daac3da429e653a89c0eaa33b6f833af6e5f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f59bc567e18f0a7bf6a8309ffd41d812196a4fb7328d0485ba01154b46b4bf89"; + sha256 = "68fe30d3246ef7de15cce1ee8c504759891dbbe70d7334ac5c30674083cdb114"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "48ba520948c2ca6e10e6a16bd7110538895780612fcd49eeb9485c6c77e6e43d"; + sha256 = "1fbb6f9f68053e4c321f4711f5aa21bb9367045f9468741cce43069ec891d6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9bdb1a669c831dc8a714d35adaaef8a25149462d7230efbee4daa1632b487425"; + sha256 = "f78b55d0319e53e1591e1a11982f51381e45a605849743f34091bb8413de4c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "07016efab2eb7ed564cebcce06aa96842c2db9935e20627207ea81eb4febc583"; + sha256 = "481a74cb75fc088ddc47ebe4feda4148ff9ed826c7b2f8838c4fd6d2e34c8c03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6da0d6ddc98213620e9d9b20a008e1d419f9c183a379ce29a03113be3f168388"; + sha256 = "10ddf93f44666d0b7678bbbaa54b188178ad1bce7a47a804c29779f43cc0f5b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8ede5e5a46e972d5b08e2c5afe316ca8f789faffc2b25e235eefda361073cbc3"; + sha256 = "d1dab28a6768aef75d0b2235b4b922ec8f6e54f03905e58a69d1ccb6c2c2c3ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7090dc233b508586d04c19b9f0a72d49207daf01f7dba009fbab6004bffa2da"; + sha256 = "1cad44aac21295951ee0422bea1324314ebbbf266a254ba7aa0335a16a83b17c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "55728076e95a42ae58bd545f4a9a07d43937e3eeca432cf14cc5b990df993cb7"; + sha256 = "66c1d6c0a2924819bd7443852f2d6c03f5e4fe666260410fbd35a5446717c440"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4fcef15d7ff85a5dbfc8c30628ab50403715217ba90c28c10a46f6dfd54c806e"; + sha256 = "8fce80badd70051942bb1e8a2816907fe40a64302ec2c53db601adb76ae4b046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3a52e1938df9e3905e628444fa39a8ec242d5035d22081b9b236f4c9530360a2"; + sha256 = "528e4d61fc6183cbc878c50794a624fec24dae7ecd0de723b052916a38dae8d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fe1a9489fb05b630958419e9a861900f1f2208563cbfddca1535f2189fb22c9d"; + sha256 = "20175fc24b0422f8218dd2b9fe3c7272ab16d2c42bf908cf91d426d1df52aa7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "27faa3fe3ec2491bbba28719d1251b3b1708d533c7139d7ed9ae764cfff77b4f"; + sha256 = "3419299a3df936f428fd118f5728ca2583ee8674a9110b2846bfaebdc8fcac67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "25d8d95ee2310f168ba3c3b9ac382f9faa7980e2993d53170007fd8430ea81de"; + sha256 = "c2e058b4e73579f8459364d0197b63f5fa47b159d936ef6d02fb7ddfac0dc0bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c20d3375ecd71abc3a2e0ac02ecd3eba94a551515f3359ef1b67ba0bf6bce00e"; + sha256 = "832bd202ba4eaedbdc1a56c240a80d01b897fa323bfde55e10d7b469ae96b04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0228e8468438a9aa8eac458e24b20bfafe6aefdb5e48b54954ed00e63706bc13"; + sha256 = "5caa4ef84763e5fedf0ce7bdba3c18c78d8e6adb9cb9393b192981473f5e7124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5a8663228110c37300854bf27dcc7266ab7f644433b661504c45abba41aed2e8"; + sha256 = "4ab052d9941061b1754a2abc0327a416cfd3bf2d313f2763f71cdc3f2e9f1787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9a1df52ac44477ca7686408fe0581cdd72767ca72195799026ce5140623c096b"; + sha256 = "da52e326fa26db84cab3981dbadf1686c9657230d3a33725db07b089f310c252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "232aa296cc744b133127baffd286521dd9f07f3236619bd052b3f279860db9ff"; + sha256 = "a97b6001a6b4fb5b7797c745674f4d782b8b9eb6e969858aa64c7109734763c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "184a66243f02c8387e10cccaf8a464aba3da6f3e2f20d8493a7e6e491b16a329"; + sha256 = "aa3e07d59b55f5e691173fdf2876d75b470312823329b70b2812c39f6d70e2e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9ed55035f0d9348f5903bf80a8f4b9b25d024f42eb67c7f90e32546bbe8aad37"; + sha256 = "685d0005a6db08a644527167f7f72758ce1441a35dee17d67ca82ab567e9796e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2c8b84d9cc9db19d8bfccba149c02f2b339967e2e97b3955a3628f9cec3e26f2"; + sha256 = "2bc50651e17ffbeebfc51ef7a91ae348da5372f2cefded4d2810e0587d6bcc3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "47e31e1aaf4b8cd9506bc22f25cc1b7be23b6c6aa36dc7828f2d56f3506f7def"; + sha256 = "a8f6901be7bae700cef8aed58341bbfee177688cc5629326446a5a00ef76fc84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9253ed61361b5c7888429c10c2792f95c59b72dd56ab16c2707db5e4305f34b"; + sha256 = "b39bacae6af2aa1ba4b3bbbdcb7a9bd169d25878f90c7ca83b434c7fb4cb8c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f978eb65f70017c61f7e32994bbf5be19fe2f18176a58f1b1aa0e36e688dc2ef"; + sha256 = "0f033acd591aaa1252ffa987d27bd1ca8924c12c980e6a57824d4ac2c7576304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a337e36d45668e5c6b20e60b3617f9acdf0f0a9166ca234567a1f0e4a47181a"; + sha256 = "acfcb269900e6e24ab41fc6e6ef313b4a4e6f605de4642e1fa9398f2817fda80"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index aebb182dcb231..2e53260f08bd4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.3.1"; + version = "102.3.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "8a127958b35c1c14b8acaa3ac256f8a3a7e9bde89fc810299ae4036c80c41d0c0d45c85ed47099d6ec37e2774a6bdeefe0de6b0b4b8bceca8206c7e54c3f93c1"; + sha512 = "e10b0322293a723c5683231e4337b1c3a214c064bbcc7f569c111c4ace42e74ddc312f2f30a260020dac48e44662f093538fab935a78ee0f6fc4a2a70488f74a"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index bf236e179ccd7..98d873097a531 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -29,6 +29,8 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; }; + format = "other"; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index d28f1d1812159..f8623d9a7bf7b 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -8,7 +8,8 @@ , netpbm , imagemagick , dbus -, xlibsWrapper +, freetype +, fontconfig , libGLU , libGL , shared-mime-info @@ -40,7 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xlibsWrapper + xorg.libXrender + freetype + fontconfig libGLU libGL tcl diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 5ad81bc0a7680..6187584940114 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,33 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, zip }: +{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: stdenv.mkDerivation rec { - version = "13.8.0"; + version = "13.9.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; + sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; }; + nativeBuildInputs = [ makeWrapper zip ]; - installPhase = '' + installPhase = + let + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; + in + '' runHook preInstall mkdir -p $out/{bin,lib} - # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html - zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class - install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" runHook postInstall ''; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 32c1e4a9f637a..4ad3a6603deac 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { description = "Cross-platform tools for Matroska"; homepage = "https://mkvtoolnix.download/"; license = licenses.gpl2Only; + mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix"; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index a1179ef7aa3af..b59f9de387141 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,27 +1,26 @@ -{ lib, stdenvNoCC, fetchFromGitHub, youtube-dl }: +{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }: stdenvNoCC.mkDerivation rec { pname = "mpv-playlistmanager"; - version = "unstable-2021-09-27"; + version = "unstable-2022-08-26"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "9a759b300c92b55e82be5824fe058e263975741a"; - sha256 = "qMzDJlouBptwyNdw2ag4VKEtmkQNUlos0USPerBAV/s="; + rev = "07393162f7f78f8188e976f616f1b89813cec741"; + sha256 = "sha256-Vgh5F6c90ijp5LVrP2cdAOXo+QtJ9aXI9G/3C2HGqd4="; }; postPatch = '' substituteInPlace playlistmanager.lua \ - --replace "'youtube-dl'" "'${youtube-dl}/bin/youtube-dl'" \ + --replace "youtube-dl" "${lib.getBin yt-dlp}/bin/yt-dlp" ''; dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/share/mpv/scripts - cp playlistmanager.lua $out/share/mpv/scripts + install -D -t $out/share/mpv/scripts playlistmanager.lua runHook postInstall ''; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index cec54e0b2ed18..d19a764e4eb1d 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc="; + sha256 = "sha256-mVEp/4iL23rrw6HSl/7qMGK4YCJ6I+9gcSIhyPsAWzc="; # We need the git revision leaveDotGit = true; postFetch = '' diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index da1e414d84168..e0c4523404562 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -1,16 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, ghcWithPackages, ... }: +{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }: let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]); in stdenv.mkDerivation rec { pname = "xmonadctl"; - version = "0.17.0"; - src = fetchFromGitHub { - owner = "xmonad"; - repo = "xmonad-contrib"; - rev = "v${version}"; - sha256 = "142ycg7dammq98drimv6xbih8dla9qindxds9fgkspmrrils3sar"; - }; + inherit (haskellPackages.xmonad-contrib) src version; installPhase = '' runHook preInstall diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 251dde481fd26..6e5dc5f35a182 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "0bbw8far4fjz7fiy205wnzp9ibnvqspfcjkinhjj8l0s272h7wjp"; + sha256 = "sha256-ptiJeb4ebfnH6HpTN1NsPAYbkLlPcZtn2aBKO0zW2Tw="; }; sourceRoot = "."; diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index c1f5f7165095e..918f715341a17 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "surf-display"; - version = "unstable-2019-04-15"; + version = "unstable-2022-10-07"; src = fetchgit { url = "https://code.it-zukunft-schule.de/cgit/surf-display"; - rev = "972d6c4b7c4503dbb63fa6c92cdc24d1e32064a4"; - sha256 = "03c68gg4kfmkri1gn5b7m1g8vh9ciawhajb29c17kkc7mn388hjm"; + rev = "ad0bd30642f8334d42bb08ea5c1b9dd03fccc4d1"; + hash = "sha256-wiyFh1te3afASIODn0cA5QXcqnrP/8Bk6hBAZYbKJQQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 9ee2a21bd0f09..9d8a2367b9348 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; + # nixpkgs-update: no auto update version = "unstable-2022-10-03"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 12bac4c4d9d8f..734f4d079ef0d 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg, python3, ruby, icu68 }: +, ffmpeg_4, python3, ruby, icu68 }: let major = "17"; @@ -21,7 +21,7 @@ let sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index b37c380c4c939..9233489b06aeb 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { bison flex cmake - python3 ] ++ lib.optional enableDocumentation [ doxygen graphviz ] ++ lib.optional enableBPF [ libllvm libbpf ]; @@ -76,6 +75,7 @@ stdenv.mkDerivation rec { boehmgc gmp flex + python3 ]; meta = with lib; { diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 73152fb9d2c35..7c7e11e3d2b1d 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,6 +29,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 0b3dfefcbe8c0..5487116b53afd 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,9 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; + # Skipping proxy tests since it requires network access. + postConfigure = '' + sed -i -e '94i (test-skip 1)' ./tests/proxy.scm + ''; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1698614c426fa..dee81f2baebde 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -15,19 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site/json%' json/Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache/json%' json/Makefile; - ''; - nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; meta = with lib; { description = "JSON Bindings for GNU Guile"; diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix index 81975bc5250e1..497799e0a2af0 100644 --- a/pkgs/development/interpreters/python/update-python-libraries/default.nix +++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix @@ -1,7 +1,8 @@ -{ python3, runCommand, git }: +{ python3, runCommand, git, nix }: runCommand "update-python-libraries" { buildInputs = [ + nix (python3.withPackages(ps: with ps; [ packaging requests toolz ])) git ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 6fc48c2d4e447..1e671c7b2e7d8 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -83,6 +83,8 @@ stdenv.mkDerivation rec { rm -f ../tests/bugfixes/redmine/test_issue_662.py rm -f ../tests/bugfixes/github/test_issue_1046.py + rm ../tests/bugfixes/redmine/test_issue_683.py + # disable tests that requires loopback networking substituteInPlace ../tests/bash_tests/testcases.py \ --replace "def io_test(self):" "def io_disabled(self):" diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix deleted file mode 100644 index 5d6e99e8bd7f4..0000000000000 --- a/pkgs/development/libraries/gdal/2.4.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libjpeg, libtiff, zlib -, postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat -, libiconv, libxml2 -, netcdfSupport ? true, netcdf, hdf5, curl -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "gdal"; - version = "2.4.4"; - - src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3.patch"; - sha256 = "sha256-rBgIxJcgRzZR1gyzDWK/Sh7MdPWeczxEYVELbYEV8JY="; - relative = "gdal"; - # this doesn't apply correctly because of line endings - excludes = [ "third_party/LercLib/Lerc2.h" ]; - }) - ]; - - buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite - libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] - ++ (with python3Packages; [ python numpy wrapPython ]) - ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; - - configureFlags = [ - "--with-expat=${expat.dev}" - "--with-jpeg=${libjpeg.dev}" - "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-png=${libpng.dev}" # optional - "--with-poppler=${poppler.dev}" # optional - "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${getDev libmysqlclient}/bin/mysql_config" - "--with-geotiff=${libgeotiff.dev}" - "--with-sqlite3=${sqlite.dev}" - "--with-spatialite=${libspatialite}" - "--with-python" # optional - "--with-proj=${proj.dev}" # optional - "--with-geos=${geos}/bin/geos-config"# optional - "--with-hdf4=${hdf4.dev}" # optional - "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional - (if netcdfSupport then "--with-netcdf=${netcdf}" else "") - ]; - - hardeningDisable = [ "format" ]; - - CXXFLAGS = "-fpermissive"; - - postPatch = '' - sed -i '/ifdef bool/i\ - #ifdef swap\ - #undef swap\ - #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h - ''; - - # - Unset CC and CXX as they confuse libtool. - # - teach gdal that libdf is the legacy name for libhdf - preConfigure = '' - unset CC CXX - substituteInPlace configure \ - --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" - ''; - - preBuild = '' - substituteInPlace swig/python/GNUmakefile \ - --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" - ''; - - postInstall = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = { - description = "Translator library for raster geospatial data formats"; - homepage = "https://www.gdal.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.marcweber ]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 5df230b081add..23df659a689fd 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.1-2"; + version = "5.1.2-1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA="; + sha256 = "sha256-56IDFZnHDL3jArNd/U/ZRdHyJ54oqhY+U4XcwOLTGqQ="; }; configureFlags = old.configureFlags ++ [ diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix new file mode 100644 index 0000000000000..134b3acf20572 --- /dev/null +++ b/pkgs/development/libraries/librist/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, pkg-config +, cjson +, cmocka +, mbedtls +}: + +stdenv.mkDerivation rec { + pname = "librist"; + version = "0.2.7"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "rist"; + repo = "librist"; + rev = "v${version}"; + sha256 = "sha256-qQG2eRAPAQgxghMeUZk3nwyacX6jDl33F8BWW63nM3c="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + cjson + cmocka + mbedtls + ]; + + meta = with lib; { + description = "A library that can be used to easily add the RIST protocol to your application."; + homepage = "https://code.videolan.org/rist/librist"; + license = with licenses; [ bsd2 mit isc ]; + maintainers = with maintainers; [ raphaelr sebtm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 1b5d65335b8d0..ce496637fcc20 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; - license = licenses.bsd3; + license = with licenses; [ bsd3 libssh2 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index e4b56e7e7664b..c365f3c068532 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -69,7 +69,7 @@ , enableProprietaryCodecs ? true }: -qtModule rec { +qtModule { pname = "qtwebengine"; qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ]; nativeBuildInputs = [ @@ -94,6 +94,12 @@ qtModule rec { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; + patches = [ + # fixes consistent crashing in github on 6.4.0, can probably remove when there is a patch release + # https://codereview.qt-project.org/c/qt/qtwebengine/+/436316 + ../patches/qtwebengine-fix.patch + ]; + postPatch = '' # Patch Chromium build tools ( diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch new file mode 100644 index 0000000000000..672421ed43d46 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch @@ -0,0 +1,28 @@ +From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001 +From: Martin Negyokru <negyokru@inf.u-szeged.hu> +Date: Mon, 03 Oct 2022 12:20:00 +0200 +Subject: [PATCH] Do not intercept websocket connection when there is no associated frame + +This fix is based on chrome's implementation. + +Fixes: QTBUG-107144 +Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + +diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp +index 020ae91..99a3aa3 100644 +--- a/src/core/content_browser_client_qt.cpp ++++ b/src/core/content_browser_client_qt.cpp +@@ -1237,8 +1237,7 @@ + + bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame) + { +- Q_UNUSED(frame); +- return true; // It is probably not worth it to only intercept when interceptors are installed ++ return frame != nullptr; + } + + QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame) diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 0e0da6a94bb76..1486947707772 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-async"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 510437f1c3bc8..5edb68d30cfad 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,19 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf , re, cmdliner, alcotest }: buildDunePackage rec { pname = "caqti"; - version = "1.8.0"; - useDune2 = true; + version = "1.9.1"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; - src = fetchFromGitHub { - owner = "paurkedal"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "sha256-8uKlrq9j1Z3QzkCyoRIn2j6wCdGyo7BY7XlbFHN1xVE="; + src = fetchurl { + url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; + sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index 5f4f681540e9a..bff515eff381e 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-mariadb"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti mariadb ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index a1b427a5edf43..f33e38fab8df2 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-postgresql"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti postgresql ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 5282ba5ef5056..822c002a8de31 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 6ed86683728b5..8e6a30a1a3129 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-dynload"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ]; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index f02fa377f806b..d06421136280f 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-lwt"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti logs lwt ]; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index d2050e2cf4743..26b0887f20e8a 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -2,9 +2,7 @@ buildDunePackage { pname = "caqti-type-calendar"; - version = "1.2.0"; - useDune2 = true; - inherit (caqti) src; + inherit (caqti) src version; propagatedBuildInputs = [ calendar caqti ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 2ae3ef374eb5d..c8f312b21d6b2 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "37"; + version = "38"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0="; + hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 5c1b779b79e05..95a993e359a6a 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-llOQAzH4vR9O+pzaLCueJ7aar7Kt8UsrzmV5f3UzOss="; + hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 8197b415c3bd8..4e509e1b3c27c 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.1"; + version = "0.34.2"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-a2skDJVqbct1+Ky2D8LXv8VMqFwqznUzXh+o+M6GtvQ="; + sha256 = "sha256-78LUQBFV4TFPDLiSHBG+RLnQLaCPX4LZpow9aszQAQA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 1d43c142187e3..aabd0cd414319 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1I7ZnYgzEFd3JvlrnHRcEd48nbO1UR5s7sddVkYM23Y="; + hash = "sha256-C+REl68BZKP3NwkSmBQ/Xs8/sMGNT4bjXa8Jkk/C0Uw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 2aa669e44a331..2a47f58c6a8e0 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -18,6 +18,8 @@ , pytestCheckHook , matplotlib , pytest-xdist +, gcc +, llvmPackages }: buildPythonPackage rec { @@ -46,7 +48,7 @@ buildPythonPackage rec { -i requirements.txt ''; - checkInputs = [ pytestCheckHook pytest-xdist matplotlib ]; + checkInputs = [ pytestCheckHook pytest-xdist matplotlib gcc ]; # I've had to disable the following tests since they fail while using nix-build, but they do pass # outside the build. They mostly related to the usage of MPI in a sandboxed environment. @@ -88,12 +90,11 @@ buildPythonPackage rec { pyrevolve scipy sympy - ]; + ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; pythonImportsCheck = [ "devito" ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://www.devitoproject.org/"; description = "Code generation framework for automated finite difference computation"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 6bbc951ec9f99..c8ab772fe4e84 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.5.0"; + version = "5.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM="; + hash = "sha256-n8qFUXP9suZIs9qee7/7g2Ab/XxxMdRPp4HfhMaJ5/w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 17c25f74b7658..631e0b6eaad38 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.4.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-viJOrmvrooHh47yyJJomOGBhQvcoWM3jKMRwZ+6/UJ8="; + hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 0e6a156a4a9e9..725953f0726c7 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.2.2"; + version = "3.2.4"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-WVE8evbfWdQNsuDEQF7WfEYDQEKGKXElKQBkUn7bJ1I="; + sha256 = "sha256-ydOJBgKPkmw2Qf0TB3ukWGpi8P0BgcCGA47dASjRrgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index 71bf10bb3c00b..0f607df1de0ce 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "patsy"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d"; + sha256 = "sha256-vcGAAYdeMZvJHIEsHrahC+S7E8uB63Y/RmF53KO2cnc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index b12eb288ad822..996d85b67d9fc 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.0.1"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Pebble"; inherit version; - hash = "sha256-7kHDO+PUEihVcfLMfPkU1MKoGrPTiMaLPHRrerOwuGU="; + hash = "sha256-nFjAPq+SDDEodETG/vOdxTuurJ3iIerRBPXJtI6L1Yc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 9396a170ba1d8..e6b1d2b37e179 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.4"; + version = "0.3.5"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-yBqU1FN2KlWE2Stg9OMdBLUfIQdbUGWCH4GU6r6HkDI="; + hash = "sha256-e2+Yrgpj6Cy76qzw9/NhDq9ogsNQAJcKi9kvY2fZE+k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index adbb0d21a8c36..66608d7783ccd 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.7.0"; + version = "2.7.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; + hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig="; }; propagatedBuildInputs = [ @@ -28,17 +30,15 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.7.0 - # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' - doCheck = false; - checkInputs = [ freezegun pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ "pydaikin" ]; + pythonImportsCheck = [ + "pydaikin" + ]; meta = with lib; { description = "Python Daikin HVAC appliances interface"; diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 70366adaa4068..87a9930ef3a28 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc="; }; + patches = [ + (fetchpatch { + # https://github.com/nficano/humps/pull/281 + url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch"; + hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 5def66a11ef56..0923d8214c619 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-BvxF/9bnA0oXCAXq1GXoR7AUnPF9hQLxmlOHxfYX+u8="; + hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 78f864ef30bc7..3eff843631027 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.5.4"; + version = "1.5.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI="; + hash = "sha256-5HoCoVgq1pg+VxD324Fijosk2ln4sGE0oWpemFVAsfc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -45,11 +50,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' - ''; - pythonImportsCheck = [ "pyoverkiz" ]; diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 5e87e700a55f6..1aef6e13d2c75 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -2,20 +2,14 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - sha256 = "sha256-SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8="; + sha256 = "sha256-Z1WTHG0viUBVPgM00QyTPOXMGLZEJelP2hrM9P93T1k="; }; - patches = [ - # use the sip-distinfo executable from PATH instead of trying to guess, - # we know it's the right one because it's the _only_ one - ./use-sip-distinfo-from-path.patch - ]; - propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; @@ -27,6 +21,6 @@ buildPythonPackage rec { description = "PEP 517 compliant build system for PyQt"; homepage = "https://pypi.org/project/PyQt-builder/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nrdxp ]; }; } diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix new file mode 100644 index 0000000000000..96fa057a47cae --- /dev/null +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkg-config +, lndir +, sip +, pyqt-builder +, qt6Packages +, pythonOlder +, pyqt6 +, python +}: + +buildPythonPackage rec { + pname = "PyQt6_WebEngine"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-THHBMIYKvNEeBMr7IuM5g/qaOu6DI8UZCbFaFwGCjiE="; + }; + + # fix include path and increase verbosity + postPatch = '' + sed -i \ + '/\[tool.sip.project\]/a\ + verbose = true\ + sip-include-dirs = [\"${pyqt6}/${python.sitePackages}/PyQt6/bindings\"]' \ + pyproject.toml + ''; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + postUnpack = '' + export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + ''; + + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; + + nativeBuildInputs = with qt6Packages; [ + pkg-config + lndir + sip + qtwebengine + qmake + pyqt-builder + ]; + + buildInputs = with qt6Packages; [ + qtwebengine + ]; + + propagatedBuildInputs = [ + pyqt6 + ]; + + passthru = { + inherit sip; + }; + + dontConfigure = true; + + # Checked using pythonImportsCheck, has no tests + doCheck = true; + + pythonImportsCheck = [ + "PyQt6.QtWebEngineCore" + "PyQt6.QtWebEngineQuick" + "PyQt6.QtWebEngineWidgets" + ]; + + meta = with lib; { + description = "Python bindings for Qt6 WebEngine"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ LunNova nrdxp ]; + }; +} diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix new file mode 100644 index 0000000000000..2a276c1aab7cb --- /dev/null +++ b/pkgs/development/python-modules/rst2pdf/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, docutils +, importlib-metadata +, jinja2 +, packaging +, pygments +, pyyaml +, reportlab +, smartypants +, pillow +, pytestCheckHook +, pymupdf +, sphinx +}: + +buildPythonPackage rec { + pname = "rst2pdf"; + version = "0.99"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "8fa23fa93bddd1f52d058ceaeab6582c145546d80f2f8a95974f3703bd6c8152"; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + docutils + importlib-metadata + jinja2 + packaging + pygments + pyyaml + reportlab + smartypants + pillow + ]; + + pythonImportsCheck = [ + "rst2pdf" + ]; + + checkInputs = [ + pytestCheckHook + pymupdf + sphinx + ]; + + # Test suite fails: https://github.com/rst2pdf/rst2pdf/issues/1067 + doCheck = false; + + postInstall = '' + mkdir -p $man/share/man/man1/ + ${docutils}/bin/rst2man.py doc/rst2pdf.rst $man/share/man/man1/rst2pdf.1 + ''; + + meta = with lib; { + description = "Convert reStructured Text to PDF via ReportLab"; + homepage = "https://rst2pdf.org/"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 68052145766c3..ab2701fefdc33 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,35 +2,19 @@ buildPythonPackage rec { pname = "sip"; - version = "6.6.2"; + version = "6.7.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-Dj76wcXf2OUlrlcUCSffJpk+E/WLidFXfDFPQQW/2Q0="; + sha256 = "sha256-KBcP34gPk3Am/If6qcF3sGLDU8XRaeoyQrB4AmFN3Qw="; }; - patches = [ - # on non-x86 Linux platforms, sip incorrectly detects the manylinux version - # and PIP will refuse to install the resulting wheel. - # remove once upstream fixes this, hopefully in 6.5.2 - ./fix-manylinux-version.patch - - # fix issue triggered by QGIS 3.26.x, already fixed upstream - # in SIP, waiting for release past 6.6.2 - (fetchpatch { - url = "https://riverbankcomputing.com/hg/sip/raw-diff/323d39a2d602/sipbuild/generator/parser/instantiations.py"; - hash = "sha256-QEQuRzXA+wK9Dt22U/LgIwtherY9pJURGJYpKpJkiok="; - }) - ]; - propagatedBuildInputs = [ packaging ply toml ]; # There aren't tests doCheck = false; - pythonImportsCheck = [ "sipbuild" ]; - # FIXME: Why isn't this detected automatically? # Needs to be specified in pyproject.toml, e.g.: # [tool.sip.bindings.MODULE] @@ -45,10 +29,12 @@ buildPythonPackage rec { else throw "unsupported platform"; + pythonImportsCheck = [ "sipbuild" ]; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "https://riverbankcomputing.com/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nrdxp ]; }; } diff --git a/pkgs/development/python-modules/sip/fix-manylinux-version.patch b/pkgs/development/python-modules/sip/fix-manylinux-version.patch deleted file mode 100644 index 4b8e99ae8e472..0000000000000 --- a/pkgs/development/python-modules/sip/fix-manylinux-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/sipbuild/project.py b/sipbuild/project.py ---- a/sipbuild/project.py -+++ b/sipbuild/project.py -@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable): - # We expect a two part tag so leave anything else unchanged. - parts = platform_tag.split('-') - if len(parts) == 2: -- if self.minimum_glibc_version > (2, 17): -+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}: - # PEP 600. - parts[0] = 'manylinux' - parts.insert(1, - '{}.{}'.format(self.minimum_glibc_version[0], - self.minimum_glibc_version[1])) -- elif self.minimum_glibc_version > (2, 12): -+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}: - # PEP 599. - parts[0] = 'manylinux2014' - elif self.minimum_glibc_version > (2, 5): diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index 60ef3ceb48e83..a4a414328b552 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "82151cbd43ccec94a1530155f4ad34f251aaca6a0ffd5516d7fadf952d32dc1e"; + sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index b9454f9ad097d..5bd7d15d11219 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.6.6"; + version = "22.9.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2qPtC8gsRw9ZOkl+H8euTwTrPVAB0cdfFflhbLqXz/I="; + sha256 = "sha256-9YmO0nD6QSFMSXsWlfbRxNWW1nwe7WXinC9pLe7rDEY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 1077703d16072..d484ac30a28d1 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.16.0"; + version = "0.16.1"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-xbee"; - rev = version; - sha256 = "sha256-0Eg+XaMDEB3Zh0Ksn8Nsaf7AYdhRqzpscuZIz19DxCI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 74ec6a282477f..c79efdf738ca5 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/v${version}"; - hash = "sha256-JcKmLD3ET17PaNm1DoAV8TDMw88Qd5okDPOStLUqASM="; + hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 19b6d566a827b..2b7fef4c8e273 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GvGWda+vsDwJrRIjc3hkl9zMrJ/cj2HGvHSeCROE69g="; + sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index e8d846273c35c..fbce8f8db61ea 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.2"; + version = "0.51.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-6JHj75ntbW3Pu4P6/nw0/xhZ+fZCfpNCzB1ZB7WJ0jY="; + hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 602b0d86f44bf..1cbbdf0bf29d6 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -29,6 +24,9 @@ stdenv.mkDerivation rec { guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures"; diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 8e91eeeb304c2..4e958176fa74f 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.20"; + version = "1.6.21"; subPackages = [ "cmd/actionlint" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-WQqEST5f3yUsvjw86ckS/jRaxcnUd13zb7lmQvfmsjM="; + sha256 = "sha256-EbiyWDcDin11pGNIJtIVI44avNdZZ/4EmV5w22yx/YI="; }; vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY="; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 1801b3d4d3832..162bfa9b65ae6 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9HyGHj1JWZ2S7XZCj69VdzlG4nwgzr1BKW4+4f+L+yM="; + sha256 = "sha256-KoAaECfZ8DwGN/U1HCp/4NUvTvFYiN+li3I5gNYM/oU="; }; - cargoSha256 = "sha256-DlBOZUdIg7yqLeLWqiiOFb+NSeTYJUl0RIJRG35oV4M="; + cargoSha256 = "sha256-ifUbUeqWm/gwOqzxY8lpGvW1ArZmGAy8XxAkvEfpLVQ="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index c18e3bcdba044..34cd4c5d618a0 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.87.1"; + version = "0.87.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ZH+oky15SCXdptBbj2UqKC5WZ+a9q05YW9p9Yhrc8A="; + sha256 = "sha256-xw9eqaToasONmkld2EeiykuuVaMG77eGIsx6YDmXKKM="; }; vendorSha256 = "sha256-HX4seTtO5DWeR1PqXnYKIKq1/wP6/ppTclDpkQSzgbM="; diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index 14ec4ca792b7d..5c85a5c174182 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -11,9 +11,7 @@ buildGoModule rec { sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q="; }; - proxyVendor = true; - - vendorSha256 = "sha256-kq9vfmST8M69yiWqzsM/ORG7F7ERtEv9dyfy8u3sWYk="; + vendorSha256 = "sha256-RtackQ4uJo1j2jePu9xd0idQBKbwBh4L2spiS2mRynw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 9786412e91927..5b3862082d8f7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -46,6 +46,7 @@ tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json; tree-sitter-json = lib.importJSON ./tree-sitter-json.json; tree-sitter-json5 = lib.importJSON ./tree-sitter-json5.json; + tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json; tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json; tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json; tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json new file mode 100644 index 0000000000000..11ef27c05e92c --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/sourcegraph/tree-sitter-jsonnet", + "rev": "0475a5017ad7dc84845d1d33187f2321abcb261d", + "date": "2022-05-27T01:23:53-04:00", + "path": "/nix/store/n4yijz5b0bky4zd8kvh632a5zlxc3rfv-tree-sitter-jsonnet", + "sha256": "1dh8wqi8mnsapzicrdjg6cj6skj9f2ia4ijg08pl45bcxc1lidzc", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 81c9debe84b52..49863f189dad0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -53,7 +53,7 @@ let # this is the haskell language bindings, tree-sitter-haskell is the grammar "haskell-tree-sitter" # this is the ruby language bindings, tree-sitter-ruby is the grammar - "ruby-tree-sitter" + "ruby-tree-sitter.old" # this is the (unmaintained) rust language bindings, tree-sitter-rust is the grammar "rust-tree-sitter" # this is the nodejs language bindings, tree-sitter-javascript is the grammar @@ -347,6 +347,10 @@ let orga = "indoorvivants"; repo = "tree-sitter-smithy"; }; + "tree-sitter-jsonnet" = { + orga = "sourcegraph"; + repo = "tree-sitter-jsonnet"; + }; }; allGrammars = diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index bcf38f77049dd..b896e5c583ba6 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -600,9 +600,9 @@ lib.composeManyExtensions [ fiona = super.fiona.overridePythonAttrs ( old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ]; nativeBuildInputs = [ - pkgs.gdal_2 # for gdal-config + pkgs.gdal # for gdal-config ]; } ); diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 005fa5278b8fb..6a6befd30fa89 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.61"; + version = "0.0.63"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gmuf8vZMP74r3CtImmD9hCTPIxaMfHGXO0C/hGAyqb0="; + sha256 = "sha256-mbwBTKC6ibYBYDSA6A0AGHWj9NzHgdfmcIYnFh8c+do="; }; - cargoSha256 = "sha256-jSBTou8GekqHoTTXRrhCwCWA2tjU5woKKB0g63M2VGU="; + cargoSha256 = "sha256-g/TNPBKc1pEoWRNclmtJsiSXxXmPn+T30e4JSt/wqE4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 7c3403b30547b..c4b4c121153a4 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-s3hcwYnP45eeU7T499phpuRHb0A8xRKlhO1haxwcPpc="; + hash = "sha256-6hiRxVxm9GGss4rLctYiA5ukkyd6V9N47RJ0c/VhqTY="; }; - cargoSha256 = "sha256-abtOI+enjTRNwLqSv5ZCbTAm8/EKPgfb2wqj2jXivdo="; + cargoSha256 = "sha256-+JKBmqtDxi30T5Lw5YOn47gSW7p5fecOxZ8i9smDz/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index da5e542454777..bbf4b899e2294 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qwOlYy9pNAKEJDgt3ML4dxDwlkyPIVO+X/q/YijEHo0="; + sha256 = "sha256-lYQmuenL7cbgfb6tdhdxkNe3wrQj7hTijyrhr/p4zLo="; }; - cargoSha256 = "sha256-8x2B8WBN9u17HS58bAwMNPEoSabNX6KzyPBLEvaGOBk="; + cargoSha256 = "sha256-Ae0ootHGbW5FJTkIRc9lTKHWsHOz6/WZCWCLZlSROU4="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index 59a691a50a813..4dbd230d563ba 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -1,16 +1,26 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.10.1"; + version = "0.50.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - sha256 = "sha256-kUoML6UUgZLOBCbakj1CJeRSt268rv2ymAdvPkcn8R4="; + sha256 = "sha256-wSRIJF2XPJvzmxuGbuPYPFgn9Eap3vqHT1CM/oQy8vM="; }; - cargoSha256 = "sha256-MPfzC5iEE8GficLUaGaBy5usZzYoreYsdadoiiRoVQI="; + + cargoSha256 = "sha256-IGZZEyy9IGqkpsbnOzLdBSFbinZ7jhH2LWub/+gP89E="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd snazy \ + --bash <($out/bin/snazy --shell-completion bash) \ + --fish <($out/bin/snazy --shell-completion fish) \ + --zsh <($out/bin/snazy --shell-completion zsh) + ''; doInstallCheck = true; installCheckPhase = '' @@ -29,6 +39,6 @@ rustPlatform.buildRustPackage rec { with nice colors. ''; license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ figsoda jk ]; }; } diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index d74d4ad422e81..a5690c8468c8b 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.29"; + version = "1.0.30"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-7Kh8kCwdSZX7E2s7UWptQHabYCVZG4luMiB1RJ72hQc="; + sha256 = "sha256-C8S1+wcJhfv65HY8KCSnX+F6wP1E4Vkr0iwW83OwZxk="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index d2ab1a987bf7a..4dd88b1f0d782 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { sha256 = "sha256-mAHRjIi4/cC29NqTdUF9sMLyHhFANw+QBibk1ENo1BA="; } + "/v2"; - vendorSha256 = "sha256-jvjFV7StHCYn85iLWTRBXjPSUeWM+Yr5F3H0rFciCOc="; + vendorSha256 = "sha256-Ufm7sUak31/PzR3UGlUKdcrzdX6NRhFEXqteaowmz9k="; proxyVendor = true; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0be537f73caaa..6bb223ad6c679 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.404"; + version = "0.0.406"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-GR/ZZtSkVF8d9frIdBPfjXukXZr/ewt0r8YmbZHGbZQ="; + sha256 = "sha256-2GisQo7RUqCGuw5ThfunjH4Bk8RIo0wov4lcsWu2NMs="; }; vendorSha256 = "sha256-zOhURlJCt+cDSiIz+DOQEC8yJCODCEuE1oXro54vX7I="; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix new file mode 100644 index 0000000000000..69e45f44eb85d --- /dev/null +++ b/pkgs/development/web/ihp-new/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, git, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "ihp-new"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "digitallyinduced"; + repo = "ihp"; + rev = "v${version}"; + sha256 = "sha256-fvFRBnMnFGsPleVv5aPfuoP1UzjnBel0NiNULFP+GkI="; + }; + + dontConfigure = true; + sourceRoot = "source/ProjectGenerator"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 bin/ihp-new -t $out/bin + wrapProgram $out/bin/ihp-new \ + --suffix PATH ":" "${lib.makeBinPath [ git ]}"; + ''; + + meta = with lib; { + description = "Project generator for the IHP (Integrated Haskell Platform) web framework"; + homepage = "https://ihp.digitallyinduced.com"; + license = licenses.mit; + maintainers = [ maintainers.mpscholten ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 7b47c0aadf52b..7fc79f8be4389 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.1.11"; + version = "4.2.0"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CqErnyBoGC+jTN1wNzKsjuAmfuwZ0NzZKyqdP2hPKUM="; + sha256 = "sha256-pJis4Lab/qRc5taeTxSoJOvNrhsWhGJrPILvkmB8k2A="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-2IEIIO4Gi9nyf0FoTiqGuA/ebE15sIFjeFqlETARaJY="; + cargoSha256 = "sha256-J1BY0gSkUQRFZJ/UlikvQqrLvCjHlf2jxbg6BIoZZUE="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/os-specific/linux/adcli/default.nix index 977c1d09dbaee..66e017437f9da 100644 --- a/pkgs/os-specific/linux/adcli/default.nix +++ b/pkgs/os-specific/linux/adcli/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , openldap , libkrb5 , libxslt @@ -16,25 +15,33 @@ stdenv.mkDerivation rec { pname = "adcli"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = pname; rev = version; - sha256 = "sha256-Zzt4qgLiJNuSrbtDWuxJEfGL7sWSbqN301q3qXZpn9c="; + sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; - # https://bugs.gentoo.org/820224 - # Without this it produces some weird missing symbol error in glibc - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch?id=01db544de893262e857685e11b33c2a74210181f"; - sha256 = "sha256-dZ6dkzxd+0XjY/X9/2IWMan3syvCDGFHiMbxFxMHGFA="; - }) + nativeBuildInputs = [ + autoreconfHook + pkg-config + docbook_xsl + util-linux + xmlto ]; + buildInputs = [ + openldap + libkrb5 + libxslt + cyrus_sasl + ]; + + configureFlags = [ "--disable-debug" ]; + postPatch = '' substituteInPlace tools/Makefile.am \ --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' - function patch_docbook(){ + function patch_docbook() { substituteInPlace $1 \ --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" @@ -52,17 +59,12 @@ stdenv.mkDerivation rec { patch_docbook doc/adcli-devel.xml patch_docbook doc/adcli-docs.xml ''; - nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ]; - - buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ]; - - configureFlags = [ "--disable-debug" ]; meta = with lib; { homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; description = "A helper library and tools for Active Directory client operations."; license = licenses.lgpl21Only; - maintainers = with maintainers; [ SohamG ]; + maintainers = with maintainers; [ SohamG anthonyroussel ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 0b14398e58f64..a5416648a7c0a 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r"; + sha256 = "sha256-CZ3rz1foFpDO1X9Ra0k1iKc1GPSMFNZW+COym0/CS10="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 462151ff64f74..ef92739ec275a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.7.4"; + version = "2.8.0"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-tPrximWUeG3wcuZZNo8l4QqC9ZwcZupIBZGF7bm7hqQ="; + sha256 = "sha256-i2RRvIFQLuFw9Q3pLOgomvCH9j8h3JAailoIww1dnLs="; }; postPatch = '' diff --git a/pkgs/servers/apache-directory-server/default.nix b/pkgs/servers/apache-directory-server/default.nix new file mode 100644 index 0000000000000..7008e0e40d256 --- /dev/null +++ b/pkgs/servers/apache-directory-server/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip, jdk11, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "apache-directory-server"; + version = "2.0.0.AM26"; + + src = fetchzip { + url = "https://dlcdn.apache.org//directory/apacheds/dist/${version}/apacheds-${version}.zip"; + sha256 = "sha256-36kDvfSy5rt/3+nivEFTepnIKf6sX0NTgPRm28M+1v4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/apacheds + install -D $src/lib/*.jar $out/share/apacheds + classpath=$(jars=($out/share/apacheds/*.jar); IFS=:; echo "''${jars[*]}") + makeWrapper ${jdk11}/bin/java $out/bin/apache-directory-server \ + --add-flags "-classpath $classpath org.apache.directory.server.UberjarMain" + ''; + + meta = with lib; { + description = "An extensible and embeddable directory server"; + homepage = "https://directory.apache.org/apacheds/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.ners ]; + }; +} diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index ffd8c355b841e..f6415ee72acda 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, nixosTests }: buildGoModule rec { @@ -18,6 +19,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + passthru.tests = nixosTests.endlessh-go; + meta = with lib; { description = "An implementation of endlessh exporting Prometheus metrics"; homepage = "https://github.com/shizunge/endlessh-go"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 88d7a0ea3e02b..70fe396b83815 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.10.1"; + version = "2022.10.2"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e2301323fc9fd..4e7574744574d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -261,7 +261,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.10.1"; + hassVersion = "2022.10.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-+hf+Qjj/UrEJ8gHsaXZonKkANVJpjEsb5HoaSbsCFJ8="; + hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -302,6 +302,7 @@ in python.pkgs.buildPythonApplication rec { "orjson" "PyJWT" "requests" + "typing-extensions" "yarl" ]; in '' diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index be22ebdd36c9d..7609c6ea54549 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -1,23 +1,19 @@ -{lib, stdenv, fetchurl, erlang, pam, perl }: +{lib, stdenv, fetchFromGitHub, erlang, pam, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "yaws"; - version = "2.0.6"; + version = "2.1.1"; - src = fetchurl { - url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz"; - sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9"; + src = fetchFromGitHub { + owner = "erlyaws"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-F1qhq0SEChWw/EBodXKWTqMNmGoTwP2JgkmfANUFD9I="; }; - # The tarball includes a symlink yaws -> yaws-1.95, which seems to be - # necessary for importing erlang files - unpackPhase = '' - tar xzf $src - cd $name - ''; - configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ erlang pam perl ]; postInstall = '' @@ -25,8 +21,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A high performance HTTP 1.1 server in Erlang"; - homepage = "http://yaws.hyber.org"; + description = "A webserver for dynamic content written in Erlang."; + homepage = "https://github.com/erlyaws/yaws"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix new file mode 100644 index 0000000000000..e8539ee60a32a --- /dev/null +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -0,0 +1,7 @@ +{ lib, grafana-loki }: + +grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; +}) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 5450853c8e8f7..ba0f779e4e17e 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-2DUP3g7k0DLXlmhCZH0IUgWpYbdUnRjtsc7uEioYzrE="; }; - vendorSha256 = "sha256-RsNsjDUAqNtNDqCC+UjKTw4ue4Yd0A7k8tU+wYiQIbc="; + vendorSha256 = "sha256-q6NMzfXoUYpv/BF6ddiQTPq6Xf3oKuUWrEF6fTDvkZI="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix new file mode 100644 index 0000000000000..3fc63a91cd366 --- /dev/null +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchzip, jdk11, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "janusgraph"; + version = "0.6.2"; + + src = fetchzip { + url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; + sha256 = "sha256-8TMYk8gGyL71zcFk0Lgo7Isvm4k3eh/H6PjfVePpkI4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/janusgraph + install -D $src/lib/*.jar $out/share/janusgraph + cd $src + find conf scripts -type f -exec install -D {} $out/share/janusgraph/{} \; + + JANUSGRAPH_LIB=$out/share/janusgraph + classpath="" + # Add the slf4j-log4j12 binding + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name 'slf4j-log4j12*.jar' | sort | tr '\n' ':') + # Add the jars in $JANUSGRAPH_LIB that start with "janusgraph" + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name 'janusgraph*.jar' | sort | tr '\n' ':') + # Add the remaining jars in $JANUSGRAPH_LIB. + classpath="$classpath":$(find -L $JANUSGRAPH_LIB -name '*.jar' \ + \! -name 'janusgraph*' \ + \! -name 'slf4j-log4j12*.jar' | sort | tr '\n' ':') + + makeWrapper ${jdk11}/bin/java $out/bin/janusgraph-server \ + --add-flags "-classpath $classpath org.janusgraph.graphdb.server.JanusGraphServer" + ''; + + meta = with lib; { + description = "An open-source, distributed graph database"; + homepage = "https://janusgraph.org/"; + mainProgram = "janusgraph-server"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.ners ]; + }; +} + diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 385f7147b8073..4655bfc6e405f 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-t5KjzB+dJGNr80mbRRlGvzuC6NvicyScoVeCygzjKeA="; - arm64-linux_hash = "sha256-wj1B573MgLZee3pjzbDyYsEYQ6fIyWQkYQnAbV6IW2Q="; - x64-osx_hash = "sha256-sbaWK5FK9luSpra/8aujd02/8Z1LOKkAm5eAghT6LJk="; + x64-linux_hash = "sha256-IGCRQWI0jz7t8dMAgvRNTdPTOFp5469VgEJgZCz5zyQ="; + arm64-linux_hash = "sha256-X/SCgKM7hZQQLwkrBlTLkV4GkxymEC1JuvKaxe+RAxY="; + x64-osx_hash = "sha256-sFfuiwTYvizTJR47Vhtk7KMAo8fg8WvI7RFIuhltnWc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.4.5.1960"; + version = "0.4.6.1969"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 5ad9f457c18b6..94f471dd53fe1 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.40"; + version = "0.25.44"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-AHV/HSKuVWZFdZdkFp9p7okAcFO40d9OqV20MaHKXaU="; + sha256 = "sha256-j9sLIxUru2rjKaL4uV03yQfEdbXpKo1xGunrNZc/t7E="; }; patches = [ diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index 5c4256155ddc4..a0eacd743d004 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "15.0.3"; + version = "16.0.0"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-HMOYj93ZvqM0FQjt313yuGj/r9ELqQlnNkg/CxrBjRM="; + sha256 = "sha256-6BS1UHcfxiG1AXJSagxydtl5TU7tyZt21Q3geNmwkYY="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 4d57de25a8f97..0348883035f0a 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-J1cX8mm1yZTvsaz7DOAbmjmXkdoIrs793aDnmHm8BFk="; + hash = "sha256-Bnx0GqgkOHfoDYLJqVAz/tKyF+cZ0BQTRTGO2pDv7tM="; }; vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w="; diff --git a/pkgs/servers/web-apps/hedgedoc/update.sh b/pkgs/servers/web-apps/hedgedoc/update.sh index 6403eb5da7804..02f9a1598310c 100755 --- a/pkgs/servers/web-apps/hedgedoc/update.sh +++ b/pkgs/servers/web-apps/hedgedoc/update.sh @@ -4,7 +4,7 @@ set -euo pipefail cd "$(dirname "$0")" if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the element packages." + echo "Regenerates packaging data for the hedgedoc packages." echo "Usage: $0 [git release tag]" exit 1 fi diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 5c021430eaf5e..8dbf9a385a8af 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "4.0.2"; + version = "4.0.4"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-Ouz1U5bMzwzQZiMmVOrx3oWtqyn7GE/oeaTrsXmsBJI="; + sha256 = "sha256-mwfUTMjNj9BKqIFezaekUtR9lwAMmsHaAUt6rkqfW8k="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 4370eab7851a1..85b103da39d02 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -83,6 +83,12 @@ "sha256": "1wy9cbibbngjarc8c9qn4bil3qc8i0h2kz0k364zcsnfpwi8jk3c", "version": "1.3.3" }, + "static-mail-sender-configurator": { + "path": "static-mail-sender-configurator/tags/0.9.3", + "rev": "2574393", + "sha256": "0dirfpm71av0a6qhfsczn94ry9gam4zsyin0czzy8bjzbwd6m649", + "version": "0.9.3" + }, "webp-converter-for-media": { "path": "webp-converter-for-media/tags/5.2.4", "rev": "2791011", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 5cf542b457c64..bef597c40f839 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -13,6 +13,7 @@ , "mailpoet" , "opengraph" , "simple-login-captcha" +, "static-mail-sender-configurator" , "webp-converter-for-media" , "wp-mail-smtp" , "wp-gdpr-compliance" diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 4474577d2e87f..af274958baa3c 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "2.11.2030"; + version = "2.11.2200"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/W0nNmMdjtkktwkNGHrxHHibqqbujC591nC4NwEG47U="; + sha256 = "sha256-nyrZttTOWpr7rBc2Ks04cWMGZFmd7lVIz6mHa0m+dDE="; }; vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g="; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 35305d44635f4..a5fc87aaf6f2b 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, libvdpau }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libvdpau }: stdenv.mkDerivation rec { pname = "vdpauinfo"; - version = "1.3"; + version = "1.5"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/6fa9718c507ef0fb6966170ef55344bf/${pname}-${version}.tar.gz"; - sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g"; + url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-uOs/r8Ow7KvSpY1NhD2A+D4Qs6iWJe4fZGfVj6nIiCw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libvdpau ]; meta = with lib; { @@ -17,6 +18,6 @@ stdenv.mkDerivation rec { description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/tools/admin/synapse-admin/default.nix index 098cc57d97e7b..2cde74ba45325 100644 --- a/pkgs/tools/admin/synapse-admin/default.nix +++ b/pkgs/tools/admin/synapse-admin/default.nix @@ -23,6 +23,9 @@ mkYarnPackage rec { NODE_ENV = "production"; ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl; + # error:0308010C:digital envelope routines::unsupported + NODE_OPTIONS = "--openssl-legacy-provider"; + buildPhase = '' runHook preBuild diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 32dacb1ec1729..c6676a89d9492 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-iXc70QOZZjnFuvRDm9e1uWqjkJNqV/1uAu1EdZNjL70="; + vendorSha256 = "sha256-h9GydAVW2mIFNMlz9aEW6hUioD9noQwnueatkoQDkpY="; excludedPackages = "misc"; diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index 332ad619a431d..29d4d5392ae80 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "zfsbackup"; - version = "unstable-2021-05-26"; - rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0"; + version = "unstable-2022-09-23"; + rev = "a30f1a44bcae5f64cfb36a12926242a968a759c6"; src = fetchFromGitHub { owner = "someone1"; repo = "zfsbackup-go"; inherit rev; - sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k="; + sha256 = "sha256-ZJ7gtT4AdMLEs2+hJa2Sia0hSoQd3CftdqRsH/oJxd8="; }; - vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg="; + vendorSha256 = "sha256-aYAficUFYYhZygfQZyczP49CeouAKKZJW8IFlkFh9lI="; ldflags = [ "-w" "-s" ]; diff --git a/pkgs/tools/misc/csv2parquet/default.nix b/pkgs/tools/misc/csv2parquet/default.nix new file mode 100644 index 0000000000000..2ebd7d378eb13 --- /dev/null +++ b/pkgs/tools/misc/csv2parquet/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "csv2parquet"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "domoritz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kb5j7d5lhElbDuoDpsijaXy3Dxjs7nRCUorkg4vKQi8="; + }; + + cargoSha256 = "sha256-rfwqLWNl05GyIBCOv9PaaYmkHBa58x0ck8Jz1qZyeos="; + + meta = with lib; { + description = "Convert CSV files to Apache Parquet"; + homepage = "https://github.com/domoritz/csv2parquet"; + license = licenses.mit; + maintainers = with maintainers; [ john-shaffer ]; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index cd63ca305ea1e..83585f41149e5 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-Fl2/rPrtbL3/gcM5hm4MgQwcS0PValuxa+nThYAE4l0="; + vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index bfd4db8ff8829..a2c7710984ea9 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,26 +9,33 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4="; + hash = "sha256-w984vvjjieSv4eM3jT8zJIIR7/7pmADhR3Esj+2dCTs="; }; - cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA="; + cargoHash = "sha256-L/QdFjSYm3PekKS3tdsUl8XBVyIBE044EHOIB+aEltI="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + openssl + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; + changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix new file mode 100644 index 0000000000000..0bd10a5750500 --- /dev/null +++ b/pkgs/tools/misc/star-history/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "star-history"; + version = "1.0.4"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-sVcYQneWEZXcsbzMJ2ZfHS0C529J6s1sDxrcIojEC4U="; + }; + + cargoSha256 = "sha256-d0PesmJTZFVoVwBLMZzOsF76hcUbRaEoymmfw3Qh9mc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + meta = with lib; { + description = "Command line program to generate a graph showing number of GitHub stars of a user, org or repo over time"; + homepage = "https://github.com/dtolnay/star-history"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/tools/misc/twspace-dl/default.nix new file mode 100644 index 0000000000000..e1a3f06b2e99f --- /dev/null +++ b/pkgs/tools/misc/twspace-dl/default.nix @@ -0,0 +1,29 @@ +{ lib, python3Packages, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "twspace-dl"; + version = "2022.6.6.1"; + + format = "setuptools"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "47622f306f2601185b00d6ef24f821810adcc581b7361c423eec979263725afc"; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; + + pythonImportsCheck = [ "twspace_dl" ]; + + meta = with lib; { + description = "A python module to download twitter spaces"; + homepage = "https://github.com/HoloArchivists/twspace-dl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ marsam ]; + mainProgram = "twspace_dl"; + }; +} diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 982f383da3047..8335e37f6e02f 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-Ty7DC4ap2F+mPzr1xaL8XeLSjQaQQVX0oGAcPpkoag4="; + sha256 = "sha256-TRuTvaCALQPxilkzSODdeI2P4FuxTGg8UTHkMDiuYTU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 03f31e5064b8a..d812873b086c9 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20220815"; + version = "20221008"; src = fetchFromGitHub { owner = "elceef"; repo = pname; - rev = version; - sha256 = "sha256-cmwgnjhfTqehMCu6mN0840NIaTN8gf4r098ULVj0yPI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JRlUQoN8lNEaovAeYzrect/r6jdXtIzChK2lqaxAavc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 695c580917c41..f37c0aa04babc 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-xL8xRVJdCyaP39TO+cJLAPbdc7WHxgBQMEyxkyhWlA8="; }; - vendorSha256 = "sha256-DxbH0vtNnuOycvUp2TBN2TS9sF6RYVqwfUbVH11HDN8="; + vendorSha256 = "sha256-VCQHkkYmGU0ZPmTuYu2XFa5ezDJ3x7dZGN+Usmq4sOY="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index d1f0d2e973911..8d1c0df11a85c 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-cyriV6z904QlkDlP80CSpakISJn7S81/2fcspAf5uk4="; + sha256 = "sha256-aZjb4mWoevRnPyL+b7H+VjIVklNe+u054OsmJbxPx4g="; }; subPackages = [ diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index f64237b82540e..6cfd46954e328 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -20,7 +20,6 @@ buildGoModule rec { subPackages = [ "cmd/cosign" - "cmd/sget" ]; tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; @@ -45,10 +44,6 @@ buildGoModule rec { --bash <($out/bin/cosign completion bash) \ --fish <($out/bin/cosign completion fish) \ --zsh <($out/bin/cosign completion zsh) - installShellCompletion --cmd sget \ - --bash <($out/bin/sget completion bash) \ - --fish <($out/bin/sget completion fish) \ - --zsh <($out/bin/sget completion zsh) ''; meta = with lib; { diff --git a/pkgs/tools/security/sget/default.nix b/pkgs/tools/security/sget/default.nix new file mode 100644 index 0000000000000..ef59b5db33418 --- /dev/null +++ b/pkgs/tools/security/sget/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "sget"; + version = "unstable-2022-10-04"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "d7d1e53b21ca906000e74474729854cb5ac48dbc"; + sha256 = "sha256-BgxTlLmtKqtDq3HgLoH+j0vBrpRujmL9Wr8F4d+jPi0="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorSha256 = "sha256-KPQHS7Hfco1ljOJgStIXMaol7j4dglcr0w+6Boj7GK8="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + installShellCompletion --cmd sget \ + --bash <($out/bin/sget completion bash) \ + --fish <($out/bin/sget completion fish) \ + --zsh <($out/bin/sget completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/sigstore/sget"; + description = "Command for safer, automatic verification of signatures and integration with Sigstore's binary transparency log, Rekor"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index a39e2788a5703..93cf8ea6b5aeb 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-gpgduZbFCMMg/mXefhwMHvs4omml3RZ0h5XexO5vslM="; + vendorSha256 = "sha256-KLeVSrPDS1lKsKFemRmgxT6Pxack3X3B/btSCOUSUFY="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 537a9dc840291..bbfcd5a681b96 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.8"; + version = "5.9"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-xwwC+I4cThl2iq3eKcjInFciWlhBfQvNA5LBalaXBuQ="; + sha256 = "sha256-x4xGgYeMi7KbD2WGHOd/ixmZ+5EY5g6CLd7/CBYldNQ="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9cad7bdda5cdc..2ef122ba137d0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -87,6 +87,8 @@ mapAliases ({ asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 + audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 + audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2022-09-24 awesome-4-0 = awesome; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 179ce4f083749..f3cdbf696c65b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -731,7 +731,9 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - mangal = callPackage ../applications/misc/mangal { }; + mangal = callPackage ../applications/misc/mangal { + buildGoModule = buildGo119Module; + }; graphw00f = callPackage ../tools/security/graphw00f { }; @@ -1072,7 +1074,7 @@ with pkgs; _1password-gui = callPackage ../applications/misc/1password-gui { }; - _1password-gui-beta = callPackage ../applications/misc/1password-gui/beta.nix { }; + _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; _6tunnel = callPackage ../tools/networking/6tunnel { }; @@ -1498,7 +1500,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; @@ -3579,6 +3581,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csv2parquet = callPackage ../tools/misc/csv2parquet { }; + csvdiff = callPackage ../tools/text/csvdiff { }; csview = callPackage ../tools/text/csview { }; @@ -4199,7 +4203,9 @@ with pkgs; }); }; - hysteria = callPackage ../tools/networking/hysteria { }; + hysteria = callPackage ../tools/networking/hysteria { + buildGoModule = buildGo119Module; + }; hyx = callPackage ../tools/text/hyx { }; @@ -6084,7 +6090,9 @@ with pkgs; tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; - trivy = callPackage ../tools/admin/trivy { }; + trivy = callPackage ../tools/admin/trivy { + buildGoModule = buildGo119Module; + }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -7449,7 +7457,9 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; - gvproxy = callPackage ../tools/networking/gvproxy { }; + gvproxy = callPackage ../tools/networking/gvproxy { + buildGoModule = buildGo118Module; # fails to build with 1.19 + }; gzip = callPackage ../tools/compression/gzip { }; @@ -9838,7 +9848,9 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { + buildGoModule = buildGo119Module; + }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -9895,6 +9907,8 @@ with pkgs; overmind = callPackage ../applications/misc/overmind { }; + oxker = callPackage ../applications/misc/oxker { }; + ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; ovito = libsForQt5.callPackage ../applications/graphics/ovito { @@ -11063,6 +11077,8 @@ with pkgs; sg3_utils = callPackage ../tools/system/sg3_utils { }; + sget = callPackage ../tools/security/sget { }; + sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { }; shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; @@ -11678,7 +11694,9 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; + telegraf = callPackage ../servers/monitoring/telegraf { + buildGoModule = buildGo119Module; + }; teleport = callPackage ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -12035,6 +12053,8 @@ with pkgs; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twspace-dl = callPackage ../tools/misc/twspace-dl { }; + twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; twurl = callPackage ../tools/misc/twurl { }; @@ -12919,10 +12939,7 @@ with pkgs; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; - zfsbackup = callPackage ../tools/backup/zfsbackup { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + zfsbackup = callPackage ../tools/backup/zfsbackup { }; zfstools = callPackage ../tools/filesystems/zfstools { }; @@ -16818,6 +16835,8 @@ with pkgs; insomnia = callPackage ../development/web/insomnia { }; + ihp-new = callPackage ../development/web/ihp-new { }; + iozone = callPackage ../development/tools/misc/iozone { }; itstool = callPackage ../development/tools/misc/itstool { }; @@ -17612,7 +17631,9 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; - wails = callPackage ../development/tools/wails { }; + wails = callPackage ../development/tools/wails { + buildGoModule = buildGo119Module; + }; whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; @@ -18563,8 +18584,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; - gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -23203,15 +23222,10 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; + promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; - promtail = grafana-loki.overrideAttrs (o: { - pname = "promtail"; - subPackages = ["clients/cmd/promtail"]; - CGO_ENABLED = 1; - }); - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; @@ -23298,6 +23312,8 @@ with pkgs; janus-gateway = callPackage ../servers/janus-gateway { }; + janusgraph = callPackage ../servers/nosql/janusgraph { }; + jboss = callPackage ../servers/http/jboss { }; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; @@ -24215,9 +24231,7 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { - erlang = erlangR21; - }; + yaws = callPackage ../servers/http/yaws { }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; @@ -25061,6 +25075,7 @@ with pkgs; gotop = callPackage ../tools/system/gotop { inherit (darwin.apple_sdk.frameworks) IOKit; + buildGoModule = buildGo119Module; }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -26043,6 +26058,8 @@ with pkgs; libratbag = callPackage ../os-specific/linux/libratbag { }; + librist = callPackage ../development/libraries/librist { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; @@ -26407,6 +26424,10 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; + star-history = callPackage ../tools/misc/star-history { + inherit (darwin.apple_sdk.frameworks) Security; + }; + starfetch = callPackage ../tools/misc/starfetch { }; starship = callPackage ../tools/misc/starship { @@ -26824,6 +26845,8 @@ with pkgs; ao = libfive; + apache-directory-server = callPackage ../servers/apache-directory-server {}; + apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; apkeep = callPackage ../tools/misc/apkeep { @@ -26852,7 +26875,9 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; - argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { }; + argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { + buildGoModule = buildGo119Module; + }; argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; @@ -26900,16 +26925,10 @@ with pkgs; }; audaciousQt5 = audacious; - audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; - audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; - audacity = - if stdenv.isDarwin then - callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon Cocoa CoreAudio CoreAudioKit CoreServices; - suil = suil-qt5; - } - else - audacity-gtk2; + audacity = callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; + suil = suil-qt5; + }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -28746,7 +28765,9 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + buildGoModule = buildGo119Module; + }; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; @@ -29782,7 +29803,7 @@ with pkgs; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; + mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; megapixels = callPackage ../applications/graphics/megapixels { }; @@ -31088,6 +31109,9 @@ with pkgs; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser-qt6 = callPackage ../applications/networking/browsers/qutebrowser { + inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + }; qxw = callPackage ../applications/editors/qxw {}; @@ -33025,7 +33049,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { }; + erigon = callPackage ../applications/blockchains/erigon.nix { + buildGoModule = buildGo119Module; + }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -37364,7 +37390,9 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { }; + werf = callPackage ../applications/networking/cluster/werf { + buildGoModule = buildGo119Module; + }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 004fb9827c369..fd7f1b993c8ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8421,6 +8421,8 @@ in { pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; + pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { @@ -9898,6 +9900,8 @@ in { rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rst2pdf = callPackage ../development/python-modules/rst2pdf { }; + rstcheck = callPackage ../development/python-modules/rstcheck { }; rstcheck-core = callPackage ../development/python-modules/rstcheck-core { }; |