diff --git a/nixos/modules/hardware/xpadneo.nix b/nixos/modules/hardware/xpadneo.nix index dbc4ba212560..092f36729b31 100644 --- a/nixos/modules/hardware/xpadneo.nix +++ b/nixos/modules/hardware/xpadneo.nix @@ -15,7 +15,8 @@ in # https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth extraModprobeConfig = mkIf - config.hardware.bluetooth.enable + (config.hardware.bluetooth.enable && + (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12")) "options bluetooth disable_ertm=1"; extraModulePackages = with config.boot.kernelPackages; [ xpadneo ]; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 7dbbf4a12fe5..d5d7315a2ddf 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -6,7 +6,7 @@ let cfg = config.services.discourse; opt = options.services.discourse; - # Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5 + # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/slim.Dockerfile#L5 upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; postgresqlPackage = if config.services.postgresql.enable then @@ -604,7 +604,6 @@ in cors_origin = ""; serve_static_assets = false; sidekiq_workers = 5; - rtl_css = false; connection_reaper_age = 30; connection_reaper_interval = 30; relative_url_root = null; @@ -940,7 +939,6 @@ in proxy_cache discourse; proxy_cache_key "$scheme,$host,$request_uri"; proxy_cache_valid 200 301 302 7d; - proxy_cache_valid any 1m; ''; }; "/message-bus/" = proxy { diff --git a/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg b/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg new file mode 100644 index 000000000000..8a1bc56d0874 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index e738a0fbcbe5..fae337c079f0 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -15,7 +15,7 @@ , zlib # Optional dependencies -, alsaSupport ? true +, alsaSupport ? stdenv.isLinux , alsa-lib , dssiSupport ? false , dssi @@ -27,11 +27,13 @@ , ossSupport ? true , portaudioSupport ? true , portaudio +, sndioSupport ? stdenv.isOpenBSD +, sndio # Optional GUI dependencies , guiModule ? "off" , cairo -, fltk13 +, fltk , libGL , libjpeg , libX11 @@ -40,6 +42,7 @@ # Test dependencies , cxxtest +, ruby }: assert builtins.any (g: guiModule == g) [ "fltk" "ntk" "zest" "off" ]; @@ -50,20 +53,24 @@ let "ntk" = "NTK"; "zest" = "Zyn-Fusion"; }.${guiModule}; + mruby-zest = callPackage ./mruby-zest { }; in stdenv.mkDerivation rec { pname = "zynaddsubfx"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "1vh1gszgjxwn8m32rk5222z1j2cnjax0bqpag7b47v6i36p2q4x8"; + rev = "refs/tags/${version}"; fetchSubmodules = true; + sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; }; + outputs = [ "out" "doc" ]; + postPatch = '' + patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; @@ -75,7 +82,8 @@ in stdenv.mkDerivation rec { ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals lashSupport [ lash ] ++ lib.optionals portaudioSupport [ portaudio ] - ++ lib.optionals (guiModule == "fltk") [ fltk13 libjpeg libXpm ] + ++ lib.optionals sndioSupport [ sndio ] + ++ lib.optionals (guiModule == "fltk") [ fltk libjpeg libXpm ] ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; @@ -87,29 +95,39 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; doCheck = true; - checkInputs = [ cxxtest ]; + checkInputs = [ cxxtest ruby ]; # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let - # Tests fail on aarch64 - disabledTests = lib.optionals stdenv.isAarch64 [ - "MessageTest" - "UnisonTest" - ]; + disabledTests = + # PortChecker test fails when lashSupport is enabled because + # zynaddsubfx takes to long to start trying to connect to lash + lib.optionals lashSupport [ "PortChecker" ] + + # Tests fail on aarch64 + ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' runHook postCheck ''; + # Use Zyn-Fusion logo for zest build + # An SVG version of the logo isn't hosted anywhere we can fetch, I + # had to manually derive it from the code that draws it in-app: + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-zest/example/ZynLogo.qml#L65-L97 + postInstall = lib.optionalString (guiModule == "zest") '' + rm -r "$out/share/pixmaps" + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp ${./ZynLogo.svg} "$out/share/icons/hicolor/scalable/apps/zynaddsubfx.svg" + ''; + # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ - "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" - - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/vst/ZynAddSubFX.so")" \ - "$out/lib/vst/ZynAddSubFX.so" + for lib in "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" "$out/lib/vst/ZynAddSubFX.so"; do + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$lib")" "$lib" + done wrapProgram "$out/bin/zynaddsubfx" \ --prefix PATH : ${mruby-zest} \ @@ -123,8 +141,15 @@ in stdenv.mkDerivation rec { then "https://zynaddsubfx.sourceforge.io/zyn-fusion.html" else "https://zynaddsubfx.sourceforge.io"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu kira-bruneau ]; - platforms = platforms.linux; + platforms = platforms.all; + + # On macOS: + # - Tests don't compile (ld: unknown option: --no-as-needed) + # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) + # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX + # - Zest UI fails to start on pulg_setup: Could not open display, aborting. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 9dd5b583817d..797b4624b966 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , bison -, git -, python2 +, pkg-config , rake , ruby , libGL @@ -10,79 +10,42 @@ , libX11 }: -let - mgem-list = fetchFromGitHub { - owner = "mruby"; - repo = "mgem-list"; - rev = "2033837203c8a141b1f9d23bb781fe0cbaefbd24"; - sha256 = "0igf2nsx5i6g0yf7sjxxkngyriv213d0sjs3yidrflrabiywpxmm"; - }; - - mruby-dir = fetchFromGitHub { - owner = "iij"; - repo = "mruby-dir"; - rev = "89dceefa1250fb1ae868d4cb52498e9e24293cd1"; - sha256 = "0zrhiy9wmwmc9ls62iyb2z86j2ijqfn7rn4xfmrbrfxygczarsm9"; - }; - - mruby-errno = fetchFromGitHub { - owner = "iij"; - repo = "mruby-errno"; - rev = "b4415207ff6ea62360619c89a1cff83259dc4db0"; - sha256 = "12djcwjjw0fygai5kssxbfs3pzh3cpnq07h9m2h5b51jziw380xj"; - }; - - mruby-file-stat = fetchFromGitHub { - owner = "ksss"; - repo = "mruby-file-stat"; - rev = "aa474589f065c71d9e39ab8ba976f3bea6f9aac2"; - sha256 = "1clarmr67z133ivkbwla1a42wcjgj638j9w0mlv5n21mhim9rid5"; - }; - - mruby-process = fetchFromGitHub { - owner = "iij"; - repo = "mruby-process"; - rev = "fe171fbe2a6cc3c2cf7d713641bddde71024f7c8"; - sha256 = "00yrzc371f90gl5m1gbkw0qq8c394bpifssjr8p1wh5fmzhxqyml"; - }; - - mruby-pack = fetchFromGitHub { - owner = "iij"; - repo = "mruby-pack"; - rev = "383a9c79e191d524a9a2b4107cc5043ecbf6190b"; - sha256 = "003glxgxifk4ixl12sy4gn9bhwvgb79b4wga549ic79isgv81w2d"; - }; -in stdenv.mkDerivation rec { pname = "mruby-zest"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = pname; repo = "${pname}-build"; - rev = version; - sha256 = "0fxljrgamgz2rm85mclixs00b0f2yf109jc369039n1vf0l5m57d"; + rev = "refs/tags/${version}"; fetchSubmodules = true; + sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc="; }; - nativeBuildInputs = [ bison git python2 rake ruby ]; - buildInputs = [ libGL libuv libX11 ]; - patches = [ - ./force-gcc-as-linker.patch - ./system-libuv.patch + ./force-cxx-as-linker.patch ]; - # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake - # Should be fixed in next release, see bcadb0a5490bd6d599f1a0e66ce09b46363c9dae - postPatch = '' - mkdir -p mruby/build/mrbgems - ln -s ${mgem-list} mruby/build/mrbgems/mgem-list - ln -s ${mruby-dir} mruby/build/mrbgems/mruby-dir - ln -s ${mruby-errno} mruby/build/mrbgems/mruby-errno - ln -s ${mruby-file-stat} mruby/build/mrbgems/mruby-file-stat - ln -s ${mruby-process} mruby/build/mrbgems/mruby-process - ln -s ${mruby-pack} mruby/build/mrbgems/mruby-pack + nativeBuildInputs = [ + bison + pkg-config + rake + ruby + ]; + + buildInputs = [ + libGL + libuv + libX11 + ]; + + # Force optimization to fix: + # warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = "-O3"; + + # Remove pre-built y.tab.c to generate with nixpkgs bison + preBuild = '' + rm mruby/mrbgems/mruby-compiler/core/y.tab.c ''; installTargets = [ "pack" ]; @@ -93,8 +56,8 @@ stdenv.mkDerivation rec { # mruby-widget-lib/src/api.c requires MainWindow.qml as part of a # sanity check, even though qml files are compiled into the binary - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/src/mruby-widget-lib/src/api.c#L99-L116 - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/linux-pack.sh#L17-L18 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-widget-lib/src/api.c#L107-L124 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/linux-pack.sh#L17-L18 mkdir -p "$out/qml" touch "$out/qml/MainWindow.qml" ''; @@ -102,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Zest Framework used in ZynAddSubFX's UI"; homepage = "https://github.com/mruby-zest"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch similarity index 55% rename from pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch rename to pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch index c521d2407740..bd5cd1edd8ee 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch @@ -1,13 +1,13 @@ diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake -index f370c0ab..e5ab9f60 100644 +index 51bda6517..9bc96d0e2 100644 --- a/mruby/tasks/toolchains/gcc.rake +++ b/mruby/tasks/toolchains/gcc.rake -@@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| +@@ -23,7 +23,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| end conf.linker do |linker| -- linker.command = ENV['LD'] || 'gcc' -+ linker.command = 'gcc' +- linker.command = ENV['LD'] || ENV['CXX'] || ENV['CC'] || default_command ++ linker.command = ENV['CXX'] || ENV['CC'] || default_command linker.flags = [ENV['LDFLAGS'] || %w()] linker.libraries = %w(m) linker.library_paths = [] diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch deleted file mode 100644 index b7050abc1235..000000000000 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/Makefile b/Makefile -index f3e3be2..2398852 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,3 @@ --UV_DIR = libuv-v1.9.1 --UV_FILE = $(UV_DIR).tar.gz --UV_URL = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE) -- -- - all: - ruby ./rebuild-fcache.rb - cd deps/nanovg/src && $(CC) nanovg.c -c -fPIC -@@ -10,12 +5,12 @@ all: - # cd deps/pugl && python2 ./waf configure --no-cairo --static - cd deps/pugl && python2 ./waf configure --no-cairo --static --debug - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && make lib - cd mruby && MRUBY_CONFIG=../build_config.rb rake - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread -+ -luv -lm -lX11 -lGL -lpthread - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 - - osx: -@@ -25,12 +20,12 @@ osx: - cd deps/pugl && python2 ./waf configure --no-cairo --static - # cd deps/pugl && python2 ./waf configure --no-cairo --static --debug - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && make lib - cd mruby && MRUBY_CONFIG=../build_config.rb rake - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread -+ -luv -lm -framework OpenGL -lpthread - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99 - - windows: -@@ -38,38 +33,14 @@ windows: - $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o - cd deps/pugl && CFLAGS="-mstackrealign" python2 ./waf configure --no-cairo --static --target=win32 - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && CFLAGS="-mstackrealign" make lib - cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake - $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/libuv-win.a \ -- -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 -+ -luv -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 - $(CC) -mstackrealign -DWIN32 test-libversion.c deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99 -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 - -- --builddep: deps/libuv.a --deps/libuv.a: -- cd deps/$(UV_DIR) && ./autogen.sh -- cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure -- cd deps/$(UV_DIR) && CFLAGS=-fPIC make -- cp deps/$(UV_DIR)/.libs/libuv.a deps/ -- --builddepwin: deps/libuv-win.a --deps/libuv-win.a: -- cd deps/$(UV_DIR) && ./autogen.sh -- cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure --host=x86_64-w64-mingw32 -- cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make -- cp deps/$(UV_DIR)/.libs/libuv.a deps/libuv-win.a -- --deps/$(UV_DIR): -- cd deps && wget -4 $(UV_URL) && tar xvf $(UV_FILE) --setup: deps/$(UV_DIR) -- --setupwin: -- cd deps && wget -4 $(UV_URL) -- cd deps && tar xvf $(UV_FILE) -- - push: - cd src/osc-bridge && git push - cd src/mruby-qml-parse && git push -diff --git a/build_config.rb b/build_config.rb -index 00f1f69..11ac15b 100644 ---- a/build_config.rb -+++ b/build_config.rb -@@ -96,7 +96,6 @@ build_type.new(build_name) do |conf| - conf.cc do |cc| - cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src" - cc.include_paths << "#{`pwd`.strip}/../deps/pugl/" -- cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/" - cc.include_paths << "/usr/share/mingw-w64/include/" if windows - cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows - cc.flags << "-DLDBL_EPSILON=1e-6" if windows -@@ -117,14 +116,14 @@ build_type.new(build_name) do |conf| - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" - if(!windows) -- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" -+ linker.flags_after_libraries << "-luv" - if(ENV['OS'] != "Mac") - linker.libraries << 'GL' - linker.libraries << 'X11' - end - linker.flags_after_libraries << "-lpthread -ldl -lm" - else -- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv-win.a" -+ linker.flags_after_libraries << "-luv" - linker.flags_after_libraries << "-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi" - linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" - end diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0aadae57dc97..18e7dcfd09d9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-45"; + version = "7.1.0-46"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-fiygwb15dbMyTZ62iWbhWaHpdmoK4rKeb46v0sojgpc="; + hash = "sha256-yts86tQMPgdF9Zk1vljVza21mlx1g3XcoHjvtsMoZhA="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0fa81d908d8e..efa9d34bece9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "104.0.5112.79", - "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw", - "sha256bin64": "1m09bbh6a4sm5i0n8z2wy0hb8s7w0c2d335mpyrmndzs45py5ggx", + "version": "104.0.5112.101", + "sha256": "0nrghgngxdn9richjnxii9y94dg5zpwc3gd3vx609r4xaphibw30", + "sha256bin64": "1cj2mi3g5wl376wc52jgqg28h7izbsqm2gji526zkhmgb7rwq4sw", "deps": { "gn": { "version": "2022-06-08", @@ -45,8 +45,8 @@ } }, "ungoogled-chromium": { - "version": "104.0.5112.81", - "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y", + "version": "104.0.5112.102", + "sha256": "0sjpmfln6c96c2i83q8c2v1jfii8527951nbnyqi0g4wam5jqrfj", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" }, "ungoogled-patches": { - "rev": "104.0.5112.81-1", - "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w" + "rev": "104.0.5112.102-1", + "sha256": "06l6af4a6ywjn6x02dgb5ywk057p30rylrvr483iwvrj4jlhqvii" } } } diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 090c17718eea..575dde4ef882 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.3"; + version = "3.5.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI="; + sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc="; }; patches = [ diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch index 120cfe6feb2a..6818684e6a71 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch +++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch @@ -1,19 +1,18 @@ diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake --- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 +++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -24,7 +24,7 @@ - +@@ -37,6 +37,6 @@ set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main) set(HEXAGON hexagon) set(X86 i386) set(X86_64 x86_64) diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt --- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 +++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -474,6 +474,7 @@ +@@ -555,6 +555,7 @@ set(armv7_SOURCES ${arm_SOURCES}) set(armv7s_SOURCES ${arm_SOURCES}) set(armv7k_SOURCES ${arm_SOURCES}) @@ -21,12 +20,12 @@ diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.s set(arm64_SOURCES ${aarch64_SOURCES}) # macho_embedded archs -@@ -595,7 +596,7 @@ +@@ -705,7 +705,7 @@ foreach (arch ${BUILTIN_SUPPORTED_ARCH}) if (CAN_TARGET_${arch}) # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$") string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 04b78d6c8023..ca7e2d920107 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , substituteAll , gdb @@ -12,20 +13,20 @@ , pytest-xdist , pytestCheckHook , requests -, isPy3k -, pythonAtLeast }: buildPythonPackage rec { pname = "debugpy"; - version = "1.6.0"; + version = "1.6.3"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Microsoft"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ERsqs+pCJfYQInOWPBhM/7hC5TTfQAksYJwFCcd+vlk="; }; patches = [ @@ -59,17 +60,15 @@ buildPythonPackage rec { cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process rm *.so *.dylib *.dll *.exe *.pdb ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ - "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; - "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-linux" = "-shared -o attach_linux_amd64.so"; + "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; - "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; - "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; - "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib"; + "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; - doCheck = isPy3k; - checkInputs = [ django flask @@ -86,16 +85,8 @@ buildPythonPackage rec { "--timeout=0" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_flask_breakpoint_multiproc" - "test_subprocess[program-launch-None]" - "test_systemexit[0-zero-uncaught-raised-launch(integratedTerminal)-module]" - "test_systemexit[0-zero-uncaught--attach_pid-program]" - "test_success_exitcodes[-break_on_system_exit_zero-0-attach_listen(cli)-module]" - "test_success_exitcodes[--0-attach_connect(api)-program]" - "test_run[code-attach_connect(api)]" - "test_subprocess[program-launch-None]" - ]; + # Fixes hanging tests on Darwin + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "debugpy" diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 537531cd9747..0f51106988d9 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492fc..4ee7cfbe 100644 +index af242877..30b21a1e 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -630,6 +630,7 @@ class Session(object): +@@ -622,6 +622,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 09851260233f..ad40a504c9dc 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,5 +1,5 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 3c0e1b94..e995a20f 100644 +index 462feae9..eb2aa945 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py @@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 7d3fd5abfc2d..440513e26c1c 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index e7487100..10d36520 100644 +index 5fc40070..775a08ec 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ import sys @@ -26,24 +26,22 @@ index e7487100..10d36520 100644 description="An implementation of the Debug Adapter Protocol for Python", # noqa long_description=long_description, long_description_content_type="text/markdown", -diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c5..53553272 100644 ---- a/src/debugpy/__init__.py -+++ b/src/debugpy/__init__.py -@@ -27,7 +27,6 @@ __all__ = [ - import codecs - import os +diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py +index 3c800898..27743245 100644 +--- a/src/debugpy/public_api.py ++++ b/src/debugpy/public_api.py +@@ -7,8 +7,6 @@ from __future__ import annotations + import functools + import typing -from debugpy import _version - from debugpy.common import compat +- + + # Expose debugpy.server API from subpackage, but do not actually import it unless + # and until a member is invoked - we don't want the server package loaded in the +@@ -182,4 +180,4 @@ def trace_this_thread(__should_trace: bool): + """ -@@ -204,7 +203,7 @@ def trace_this_thread(should_trace): - return api.trace_this_thread(should_trace) - - --__version__ = _version.get_versions()["version"] -+__version__ = "@version@" - - # Force absolute path on Python 2. - __file__ = os.path.abspath(__file__) +-__version__: str = _version.get_versions()["version"] ++__version__: str = "@version@" diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index c5aa09a88608..623b881cd0f2 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; - rev = "v${version}"; - hash = "sha256-VUcS4OzvPj0o627ZWIOBqEAQJ4JuMCMjgaZoMkL/IHc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4zd+x9uYl0lJgePM9LEgLYFqvcw6VPF/CbR1XiYSwGE="; }; setSourceRoot = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 50989a42e3e3..5aba0c2d0bd9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -31,7 +31,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds src = fetchurl { url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; - inherit (packageSettings) sha256; + inherit (packageSettings) hash; }; nativeBuildInputs = [ cmake pkg-config ] @@ -238,27 +238,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.25"; - sha256 = "1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + version = "10.4.26"; + hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.16"; - sha256 = "19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + version = "10.5.17"; + hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.8"; - sha256 = "0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + version = "10.6.9"; + hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { - # Supported until 2023-02 - version = "10.7.4"; - sha256 = "0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + # Supported until 2023-02. TODO: remove ahead of 22.11 release. + version = "10.7.5"; + hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.3"; - sha256 = "14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + version = "10.8.4"; + hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; }; } diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 19860ad7886d..6986cf5271e7 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta4"; + version = "2.9.0.beta9"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4="; + sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52"; + sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0"; }; assets = stdenv.mkDerivation { @@ -177,6 +177,8 @@ let nodejs-14_x ]; + outputs = [ "out" "javascripts" ]; + patches = [ # Use the Ruby API version in the plugin gem path, to match the # one constructed by bundlerEnv @@ -253,6 +255,10 @@ let mv public/assets $out + rm -r app/assets/javascripts/plugins + mv app/assets/javascripts $javascripts + ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins + runHook postInstall ''; @@ -301,7 +307,10 @@ let # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the # state directory. - find config -type f -execdir sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -type f -name "*.rb" -execdir \ + sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -maxdepth 1 -type f -name "*.rb" -execdir \ + sed -Ei "s,require_relative (\"|')([[:alnum:]].*)(\"|'),require_relative '$out/share/discourse/config/\2'," {} \; ''; buildPhase = '' @@ -322,9 +331,10 @@ let ln -sf /var/log/discourse $out/share/discourse/log ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config - ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public ln -sf ${assets} $out/share/discourse/public.dist/assets + rm -r $out/share/discourse/app/assets/javascripts + ln -sf ${assets.javascripts} $out/share/discourse/app/assets/javascripts ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} runHook postInstall diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 3cf491a2f42d..8dc8377ac95e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "7a854fe5046783bcff6cc24fca818056e1b9414a"; - sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI="; + rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e"; + sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 4a4ff3b0e178..4de4b6e42dde 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) concurrent-ruby (1.1.10) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - minitest (5.15.0) + minitest (5.16.2) rrule (0.4.4) activesupport (>= 2.3) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) PLATFORMS diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index d935b37b5a11..922adc60b618 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "eb8bc3e864c6f735fa5a005e854f8c37411b6288"; - sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28="; + rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0"; + sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 69f2648831ce..e2db1930298d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3.1"; }; concurrent-ruby = { groups = ["default"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; rrule = { dependencies = ["activesupport"]; @@ -58,9 +58,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 07e58652d9fe..07d1afb2da49 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3"; - sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY="; + rev = "faa586b095a9ec5b0088bdfa7b04a3aba9f44521"; + sha256 = "sha256-f/9JtPtYZsRIzk3cBlXAtdG25oep7/Kl74JsGkoP4PI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index f96348e6f273..6f70efa90ab1 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c"; - sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng="; + rev = "c68fde5d2bbb92cad24a35ff61586453d67264f5"; + sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index d1bcd57fc66a..e8de49349f0c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "68941e370e132c17fc2aa21ac40c033df72c9771"; - sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs="; + rev = "8763292e9a02fc2fed6d39c59c3cf5401dcdd950"; + sha256 = "sha256-xUsTjoG25efIumrf6XX8rAKWjfcAhZiqQz9pfnG3pQU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 8073d89df817..198b1e5aba52 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "baaac7ce671e716559329ae756988cc395d7079e"; - sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ="; + rev = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e"; + sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 071b1eb5dd9b..3587c9ef2a13 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "72b2e87e84221588bc2ff08961a492044f1f8237"; - sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY="; + rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f"; + sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index ba0516980977..b31ad9452c4d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.10.0) + faraday (1.10.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -19,14 +19,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - multipart-post (2.1.1) + multipart-post (2.2.3) octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index f9ccaed863ef..e53ac21892b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "36cbacdd32916435391b4700c024074da3bcbe74"; - sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw="; + rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069"; + sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 7bab2858b652..ab21dcdc72fb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; faraday-em_http = { groups = ["default"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -127,10 +127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index d65087cca737..b18bf07789b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "b875a21b4d5225b61cb525531d30eaf852db6237"; - sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q="; + rev = "bcaccbd845825e99c39060e3898e8d5ea1bba927"; + sha256 = "sha256-c/4oVDBhDiPrLSooU9TgDQJSij8i+QYCoNqDCicXPJk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index 0fcdf01d56f9..a00258a7e5af 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -2,5 +2,9 @@ source "https://rubygems.org" +# gem "rails" gem 'bcrypt', '3.1.3' gem 'unix-crypt', '1.3.0' +gem 'ffi', '1.15.5', require: false +gem 'ffi-compiler', '1.0.1', require: false +gem 'argon2', '2.1.1' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 2c9fb9049304..255d3f2d2401 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -1,15 +1,26 @@ GEM remote: https://rubygems.org/ specs: + argon2 (2.1.1) + ffi (~> 1.14) + ffi-compiler (~> 1.0) bcrypt (3.1.3) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + rake (13.0.6) unix-crypt (1.3.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES + argon2 (= 2.1.1) bcrypt (= 3.1.3) + ffi (= 1.15.5) + ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.2.20 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 4c46dfb181e7..962c10ad7db5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "91d6a008de91853becca01846aa4662bd227670e"; - sha256 = "sha256-aKj0zXyXDnG20qVdhGvn4fwXiBeHFj2pv4bTUP81MP0="; + rev = "7d33a57b4bd2a37badc64d5eca57d7ca01d62937"; + sha256 = "sha256-BDBXgsLVHYiSSjvN4Y13ffwfWk6nuVLoJE1YKgGmLTA="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 22b4053bbd4e..00877ed48199 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -1,4 +1,15 @@ { + argon2 = { + dependencies = ["ffi" "ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + type = "gem"; + }; + version = "2.1.1"; + }; bcrypt = { groups = ["default"]; platforms = []; @@ -9,6 +20,37 @@ }; version = "3.1.3"; }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; unix-crypt = { groups = ["default"]; platforms = []; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index e3c52319d279..e4624104179b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "e897702139b9c0dca40b9385427ba8bad0e1eae9"; - sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o="; + rev = "6534ceb4529f86499b4a77300c851a7f69f016e0"; + sha256 = "sha256-25vVNH9HRddDTiwqPtFo2JdE1Fo3hNMjXn5GMWA1jzs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index e5d7259099ad..07c942303e7f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "43536e4a4977718972a673dc2475ae07df9a0a45"; - sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4="; + rev = "e8caf83e0bcbb55effb86e99324aa15259f608cc"; + sha256 = "sha256-X3VU4TUth/6j/x9hVpw2GLRZHDCnDfxLbveZUQrFfVU="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 682032bb9d0f..ad9c2f91c837 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c"; - sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE="; + rev = "836981c3d5c51353165a2dad05de5054fe7a1b77"; + sha256 = "sha256-UisVi+JKZovge0SFFlgxX4WXLOtWKX/RDMVR7Vrc8so="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index ebec54bc6e5d..5eaf0e18a6a6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "17ba805a06ddfc27c6435eb20c0f8466f1708be8"; - sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s="; + rev = "e6cce5486df906ede74aa1b17ab308a145a99b88"; + sha256 = "sha256-hgoCPMlE5qJbdftwOW/zRcp8C7S0h/W2XrfFjLrNpgw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index b4f7e000fd64..6b0a203c232f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "4a07519cf9d7ac713f5e21ba770adb127524a22d"; - sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA="; + rev = "a1e4d543e1bafeb11cbb9d09a887ce210b7eecb8"; + sha256 = "sha256-lZUT+ix1mLomeIdYIOz1vgY6sLVSPOhM85/FkXZFfWc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 4d0f71fdd7f6..ea5c172e6141 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "1da667721269ca01ef53c35ec0470486b490e72c"; - sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY="; + rev = "b6118e9e50a2bec6bbb995db235657c7097bfaa9"; + sha256 = "sha256-dXJS5ZcyBstE8mSTukUDg0H1ytEJs679wvVuojoUPY4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index e38aa7f83571..bd4dbc6bd137 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "ef4855f6afa16ef86013bba7da8e50a63e11b493"; - sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y="; + rev = "76b35ac9b20725250140602e5d12a82b31383d35"; + sha256 = "sha256-RtmnRXh8AbKSe+kuBcORv5FcKYez7WU2owcW16LFCns="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 2766c3feadc0..b2116cc8ac3e 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = '6.1.4.7' + rails_version = '7.0.3.1' gem 'actionmailer', rails_version gem 'actionpack', rails_version gem 'actionview', rails_version @@ -31,7 +31,9 @@ end gem 'json' -gem 'sprockets' +# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals +# This is a desired upgrade we should get to. +gem 'sprockets', '3.7.2' # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master @@ -39,7 +41,7 @@ gem 'actionview_precompiler', require: false gem 'seed-fu' -gem 'mail', git: 'https://github.com/discourse/mail.git', require: false +gem 'mail', git: 'https://github.com/discourse/mail.git' gem 'mini_mime' gem 'mini_suffix' @@ -66,7 +68,7 @@ gem 'http_accept_language', require: false gem 'discourse-ember-rails', '0.18.6', require: 'ember-rails' gem 'discourse-ember-source', '~> 3.12.2' gem 'ember-handlebars-template', '0.8.0' -gem 'discourse-fonts' +gem 'discourse-fonts', require: 'discourse_fonts' gem 'barber' @@ -103,7 +105,8 @@ gem 'omniauth-oauth2', require: false gem 'omniauth-google-oauth2' -gem 'oj' +# pending: https://github.com/ohler55/oj/issues/789 +gem 'oj', '3.13.14' gem 'pg' gem 'mini_sql' @@ -143,7 +146,6 @@ end # Allow everywhere for now cause we are allowing asset debugging in production group :assets do gem 'uglifier' - gem 'rtlit', require: false # for css rtling end group :test do @@ -168,7 +170,7 @@ group :test, :development do gem 'shoulda-matchers', require: false gem 'rspec-html-matchers' gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem "rubocop-discourse", require: false + gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse' gem 'parallel_tests' gem 'rswag-specs' @@ -188,7 +190,7 @@ if ENV["ALLOW_DEV_POPULATE"] == "1" gem 'discourse_dev_assets' gem 'faker', "~> 2.16" else - group :development do + group :development, :test do gem 'discourse_dev_assets' gem 'faker', "~> 2.16" end @@ -266,3 +268,7 @@ gem 'colored2', require: false gem 'maxminddb' gem 'rails_failover', require: false + +# workaround for faraday-net_http, see +# https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 +gem 'net-http' diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 4e832c8abdb1..95c706acab3f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -5,25 +5,36 @@ GIT mail (2.8.0.edge) mini_mime (>= 0.1.1) +GIT + remote: https://github.com/discourse/rubocop-discourse.git + revision: a5aea6e5f150b1eb7765a805bec0ff618cb718b3 + specs: + rubocop-discourse (2.5.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + GEM remote: https://rubygems.org/ specs: - actionmailer (6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -32,20 +43,19 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.1.4.7) - activesupport (= 6.1.4.7) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activesupport (6.1.4.7) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.2.0) @@ -53,23 +63,23 @@ GEM rake (>= 10.4, < 14.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.516.0) - aws-sdk-core (3.121.2) + aws-partitions (1.583.0) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) barber (0.12.2) ember-source (>= 1.0, < 3.1) @@ -80,10 +90,10 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.11.1) + bootsnap (1.13.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -94,7 +104,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.10) connection_pool (2.2.5) - cose (1.2.0) + cose (1.2.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.2) @@ -105,7 +115,8 @@ GEM addressable debug_inspector (1.1.0) diff-lcs (1.5.0) - diffy (3.4.0) + diffy (3.4.2) + digest (3.1.0) discourse-ember-rails (0.18.6) active_model_serializers ember-data-source (>= 1.0.0.beta.5) @@ -115,7 +126,7 @@ GEM railties (>= 3.1) discourse-ember-source (3.12.2.3) discourse-fonts (0.0.9) - discourse_dev_assets (0.0.3) + discourse_dev_assets (0.0.4) faker (~> 2.16) literate_randomizer docile (1.4.0) @@ -128,12 +139,12 @@ GEM barber (>= 0.11.0) sprockets (>= 3.3, < 4.1) ember-source (2.18.2) - erubi (1.10.0) - excon (0.92.2) + erubi (1.11.0) + excon (0.92.4) execjs (2.8.1) exifr (1.3.9) - fabrication (2.28.0) - faker (2.20.0) + fabrication (2.30.0) + faker (2.22.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) faraday (1.10.0) @@ -152,8 +163,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -175,7 +186,7 @@ GEM hkdf (0.3.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) @@ -183,23 +194,22 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.0.1) + image_size (3.0.2) in_threads (1.6.0) - ipaddr (1.2.4) jmespath (1.6.1) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.1) + json (2.6.2) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.20) + json_schemer (0.2.21) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.3.0) + jwt (2.4.1) kgio (2.11.4) libv8-node (16.10.0.0) listen (3.7.1) @@ -214,8 +224,8 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.0) - loofah (2.16.0) + logster (2.11.2) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -229,30 +239,46 @@ GEM mini_portile2 (2.8.0) mini_racer (0.6.2) libv8-node (~> 16.10.0.0) - mini_scheduler (0.13.0) + mini_scheduler (0.14.0) sidekiq (>= 4.2.3) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.15.0) - mocha (1.13.0) - msgpack (1.5.1) + minitest (5.16.2) + mocha (1.14.0) + msgpack (1.5.4) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.2.3) mustache (1.1.1) + net-http (0.2.2) + uri + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) - nokogiri (1.13.4) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oauth (0.5.8) + oauth (0.5.10) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.13.11) + oj (3.13.14) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -275,17 +301,16 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (2.2.1) - ipaddr - openssl-signature_algorithm (1.1.1) - openssl (~> 2.0) + openssl (3.0.0) + openssl-signature_algorithm (1.2.1) + openssl (> 2.0, < 3.1) optimist (3.0.1) parallel (1.22.1) - parallel_tests (3.8.1) + parallel_tests (3.11.1) parallel - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) - pg (1.3.5) + pg (1.4.3) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -300,17 +325,17 @@ GEM nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) - rack (2.2.3) + rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (2.2.0) + rack-protection (2.2.2) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails_failover (0.8.1) activerecord (> 6.0, < 7.1) @@ -319,12 +344,13 @@ GEM rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) raindrops (0.20.0) rake (13.0.6) @@ -336,16 +362,16 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.5.1) + redis (4.7.1) redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.3.0) + regexp_parser (2.5.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rqrcode (2.1.1) + rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -358,13 +384,13 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-html-matchers (0.9.4) + rspec-html-matchers (0.10.0) nokogiri (~> 1) - rspec (>= 3.0.0.a, < 4) + rspec (>= 3.0.0.a) rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.1) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -379,23 +405,20 @@ GEM activesupport (>= 3.1, < 7.1) json-schema (~> 2.2) railties (>= 3.1, < 7.1) - rtlit (0.0.5) - rubocop (1.27.0) + rubocop (1.34.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) ruby-prof (1.4.3) ruby-progressbar (1.11.0) ruby-readability (0.7.0) @@ -420,17 +443,17 @@ GEM activesupport (>= 3.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.1) + sidekiq (6.5.4) connection_pool (>= 2.2.2) rack (~> 2.0) - redis (>= 4.2.0) + redis (>= 4.5.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (4.0.3) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -438,46 +461,49 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.19) - test-prof (1.0.8) + stackprof (0.2.20) + strscan (3.0.4) + test-prof (1.0.9) thor (1.2.1) - tilt (2.0.10) - tzinfo (2.0.4) + tilt (2.0.11) + timeout (0.3.0) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.2.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) + uri (0.11.0) uri_template (0.7.0) - webmock (3.14.0) + webmock (3.17.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webpush (1.1.0) hkdf (~> 0.2) jwt (~> 2.0) - xorcist (1.1.2) + xorcist (1.1.3) yaml-lint (0.0.10) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - actionmailer (= 6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.1.4.7) - activerecord (= 6.1.4.7) - activesupport (= 6.1.4.7) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) addressable annotate aws-sdk-s3 @@ -537,8 +563,9 @@ DEPENDENCIES mocha multi_json mustache + net-http nokogiri - oj + oj (= 3.13.14) omniauth omniauth-facebook omniauth-github @@ -556,7 +583,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 6.1.4.7) + railties (= 7.0.3.1) rake rb-fsevent rbtrace @@ -571,8 +598,7 @@ DEPENDENCIES rspec-rails rss rswag-specs - rtlit - rubocop-discourse + rubocop-discourse! ruby-prof ruby-readability rubyzip @@ -583,7 +609,7 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets + sprockets (= 3.7.2) sprockets-rails sshkey stackprof diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 84f4c37dfb22..95a0d999a981 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1,14 +1,14 @@ { actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; + sha256 = "1wdh4av6w6calnvvms6r8w3k3gaw0xy1lgsrjjf5d5gxq09nk7y7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; + sha256 = "1f9y1qjnrwbwab3hf6nzlpr4v1fr1wq39l6dw3i1y3i6n8w04sb5"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; + sha256 = "1csycx6zlzrp6pw58s4nkm2qaz720cdhgxjkwjsd0qla75kvsyln"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; + sha256 = "03hn978lx6lasac267mincy6wwcir5gyix7gwrbvvk7rg7bsbmbk"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; + sha256 = "0s9gjs1a49n7rfhz84glw6w62swlrqdqjhs8421kaa72iwxavq16"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,21 +82,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; + sha256 = "1lb838wvarms8bs8hvfkccdsp4cjc0y9wjsxvw71h4ir3mys4jqg"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -145,10 +145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; + sha256 = "0bg0v08n9mgvpnvkx8aznrax25lkrfsi5sjfdlccm7dadnada5fg"; type = "gem"; }; - version = "1.516.0"; + version = "1.583.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -156,10 +156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc"; + sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; type = "gem"; }; - version = "3.121.2"; + version = "3.130.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm"; + sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; type = "gem"; }; - version = "1.44.0"; + version = "1.56.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -178,10 +178,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.96.1"; + version = "1.114.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2ggpwg7v0s0f4bw3887r5y92cbnrjld53lm69irqmx0h7q2564"; + sha256 = "0d3fhll3hqc23fvj7p0ncjrr0fri7spy21r0hfkqjhijm0q1xqg9"; type = "gem"; }; - version = "1.46.0"; + version = "1.53.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; barber = { dependencies = ["ember-source" "execjs"]; @@ -252,10 +252,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; + sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; type = "gem"; }; - version = "1.11.1"; + version = "1.13.0"; }; builder = { groups = ["default" "development" "test"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q90zk8di7a12by3d81nl78yy90rdml77vi3waxmgzqhvs6na4vj"; + sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2"; }; byebug = { groups = ["development" "test"]; @@ -372,10 +372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gx239d2fracq9az74wfdwmp5zm7zpzkcgchwnv2ng33d8r33p3m"; + sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; cppjieba_rb = { groups = ["default"]; @@ -444,10 +444,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; + sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.2"; + }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; }; discourse-ember-rails = { dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; @@ -482,14 +492,14 @@ }; discourse_dev_assets = { dependencies = ["faker" "literate_randomizer"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c6cxrf6kvv4pg6fsig71dn5nrzy7jxbxmyi8206m1ijgpj8nddg"; + sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1"; type = "gem"; }; - version = "0.0.3"; + version = "0.0.4"; }; docile = { groups = ["default" "test"]; @@ -563,20 +573,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba"; + sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; type = "gem"; }; - version = "0.92.2"; + version = "0.92.4"; }; execjs = { groups = ["assets" "default"]; @@ -603,21 +613,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; + sha256 = "0bxssmjp49whzq2zv7w751gr4nkdaiwcxd1vda0byigwyrnj6f5q"; type = "gem"; }; - version = "2.28.0"; + version = "2.30.0"; }; faker = { dependencies = ["i18n"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; + sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; type = "gem"; }; - version = "2.20.0"; + version = "2.22.0"; }; fakeweb = { groups = ["test"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -918,10 +928,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -939,10 +949,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130yn87pcnr5sblssm88hnvg8hc76isgrnhlf1d9355zhv4i2hsz"; + sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; in_threads = { groups = ["default"]; @@ -954,16 +964,6 @@ }; version = "1.6.0"; }; - ipaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; - type = "gem"; - }; - version = "1.2.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -980,20 +980,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkhm8lan1vnyl3ll0ks2q06576pdils8a1dr354vfc1y5dqw15i"; + sha256 = "0fdbln0w43n2b2kwhmm6w302iydgkd2hvw8pp0hnj0dykmy9vf54"; type = "gem"; }; - version = "4.4.0"; + version = "4.5.0"; }; json = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; type = "gem"; }; - version = "2.6.1"; + version = "2.6.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1012,20 +1012,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88"; + sha256 = "11dsw41f1zai3k8kxxjhmjlycwg67irqaqmiw4jbw12wdc6cxa6d"; type = "gem"; }; - version = "0.2.20"; + version = "0.2.21"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; kgio = { groups = ["default"]; @@ -1111,10 +1111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mamk8hgdhjcd33jf1w3j2kayvpyyscysvnmbhq3mw5kjji89cam"; + sha256 = "15kcv5agmash3szsl4aj5ns4daxp439w8czw0fvq4qgf92y4fi8s"; type = "gem"; }; - version = "2.11.0"; + version = "2.11.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; lru_redux = { groups = ["default"]; @@ -1248,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cy9c2wv19m4h2sv9fs66hh1an7hq3y9513678dzx43vm3kjvhz5"; + sha256 = "0g8mi0l90kkdvh45xz1gcmv3yzpj7d4dvgrhk8lg7lwn82d06yzw"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; mini_sql = { groups = ["default"]; @@ -1279,20 +1279,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; mocha = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; + sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; msgpack = { groups = ["default"]; @@ -1303,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.4"; }; multi_json = { groups = ["default"]; @@ -1333,10 +1333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; mustache = { groups = ["default"]; @@ -1348,6 +1348,61 @@ }; version = "1.1.1"; }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j4f0wgyps0qyms4p6fjqva63xy13wvy7bx5qg5gmzzwm3kqs1fr"; + type = "gem"; + }; + version = "0.2.2"; + }; + net-imap = { + dependencies = ["digest" "net-protocol" "strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + type = "gem"; + }; + version = "0.2.3"; + }; + net-pop = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + type = "gem"; + }; + version = "0.1.1"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; + net-smtp = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + type = "gem"; + }; + version = "0.3.1"; + }; nio4r = { groups = ["default"]; platforms = []; @@ -1364,20 +1419,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.13.4"; + version = "1.13.8"; }; oauth = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6nfg2pibc17fch0795d4bcy41a92im5zrsrgs31zdhrl6zf4w0"; + sha256 = "1asrxrbgzgzf1r9rb0c785zyyaq9v5z7v3k1avsais2sh9q1y763"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.10"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1395,10 +1450,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; + sha256 = "0bbbncvkqxbbi608vq2v7b3zzgrqac3syk403zhhbwrg352mv88q"; type = "gem"; }; - version = "3.13.11"; + version = "3.13.14"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1478,15 +1533,14 @@ version = "1.4.0"; }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; + sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1494,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173p9agv45hj62fdgl9bzqr9f6xg7hi2sf5iyd3ahiwbv220x332"; + sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; optimist = { groups = ["default"]; @@ -1529,10 +1583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7"; + sha256 = "1jgqdwfgd4g3mfi854f2n0v615z3n59l24nya7v6cdnaixn5x02y"; type = "gem"; }; - version = "3.8.1"; + version = "3.11.1"; }; parser = { dependencies = ["ast"]; @@ -1540,20 +1594,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; + sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.3"; }; progress = { groups = ["default"]; @@ -1648,10 +1702,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1670,10 +1724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; rack-test = { dependencies = ["rack"]; @@ -1681,10 +1735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1703,10 +1757,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1731,15 +1785,15 @@ version = "4.0.1"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; + sha256 = "0lnrhx0sdixz5xm2vi482ngs4alh8l725kh96v6mfk0x0qlbdsaw"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1828,10 +1882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw"; + sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; type = "gem"; }; - version = "4.5.1"; + version = "4.7.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -1849,10 +1903,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; request_store = { dependencies = ["rack"]; @@ -1901,10 +1955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; + sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rqrcode_core = { groups = ["default"]; @@ -1955,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0883rqv77n2wawnk5lp3la48l7pckyz8l013qddngzmksi5p1v3f"; + sha256 = "1bp9q28qw4xmxknrrp3ppcr08bbcnnand6r9prw4920407mvy96l"; type = "gem"; }; - version = "0.9.4"; + version = "0.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1977,10 +2031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; rspec-support = { groups = ["default" "development" "test"]; @@ -2014,26 +2068,16 @@ }; version = "2.5.1"; }; - rtlit = { - groups = ["assets"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0srfh7cl95srjiwbyc9pmn3w739zlvyj89hyj0bm7g92zrsd27qm"; - type = "gem"; - }; - version = "0.0.5"; - }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; + sha256 = "1n08wns7qaxja8g5fnixicybj1rdq3cjli33l7v1856saizp9lpf"; type = "gem"; }; - version = "1.27.0"; + version = "1.34.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2041,19 +2085,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; + sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g"; - type = "gem"; + fetchSubmodules = false; + rev = "a5aea6e5f150b1eb7765a805bec0ff618cb718b3"; + sha256 = "1h25i2ykp1m0j07ij0gq2p632ri01lnykwl3lcishmxncddcz247"; + type = "git"; + url = "https://github.com/discourse/rubocop-discourse.git"; }; version = "2.5.0"; }; @@ -2063,10 +2109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; + sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; type = "gem"; }; - version = "2.9.0"; + version = "2.12.1"; }; ruby-prof = { groups = ["development"]; @@ -2184,10 +2230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f"; + sha256 = "1zyq0faxkrk9jxqchzjlazpycjh8fg33h84qi654yv9c7a146r2z"; type = "gem"; }; - version = "6.4.1"; + version = "6.5.4"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2226,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "4.0.3"; + version = "3.7.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -2261,20 +2307,30 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19rnk17rz0lhf7l9awy0s7xxyw91ydcqxlx0576xvwyi79jh6a2m"; + sha256 = "17ih8nb2v4adihb8fihmja72f55dm0ds92j8asadsjm9mpci4bgc"; type = "gem"; }; - version = "0.2.19"; + version = "0.2.20"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00ip0m5ad5ywkj4na07qxcyi9wgdh6b877s0ibx5al23abzkxak9"; + type = "gem"; + }; + version = "3.0.4"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05"; + sha256 = "1xxw3w131mymawr94zkw5y5wgywix53rakfm0bq8s9ccqdx9mm9v"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; thor = { groups = ["default" "development" "test"]; @@ -2291,10 +2347,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; + type = "gem"; + }; + version = "0.3.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2302,10 +2368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; uglifier = { dependencies = ["execjs"]; @@ -2334,20 +2400,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; unicode-display_width = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2376,6 +2442,16 @@ }; version = "1.16.0"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w00162maixmqp7nwm8mmbvwnnpmjilwbim8yk2ypxy3x3ih6l69"; + type = "gem"; + }; + version = "0.11.0"; + }; uri_template = { groups = ["default"]; platforms = []; @@ -2392,10 +2468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk"; + sha256 = "06jbjl78szxkri3wx0mzsdhx2z2af11kp35k5rsrppchbssgagcj"; type = "gem"; }; - version = "3.14.0"; + version = "3.17.1"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -2413,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7hr3qyn1hczv9fglqc2cbaax0fb37gjjr0y24x19mmp817csdn"; + sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; yaml-lint = { groups = ["development"]; @@ -2433,9 +2509,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 64f374bad703..9fc14b177114 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -407,6 +407,7 @@ def update_plugins(): gemfile_text = '' for line in repo.get_file('plugin.rb', rev).splitlines(): if 'gem ' in line: + line = ','.join(filter(lambda x: ":require_name" not in x, line.split(','))) gemfile_text = gemfile_text + line + os.linesep version_file_match = version_file_regex.match(line) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9a2c5173491..758373091333 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1551,6 +1551,7 @@ mapAliases ({ tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 + zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b756dee71578..4667662d5efc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31134,20 +31134,19 @@ with pkgs; inherit (nodePackages) zx; - zynaddsubfx = zyn-fusion; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { + guiModule = "zest"; + fftw = fftwSinglePrec; + }; - zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { + zynaddsubfx-fltk = zynaddsubfx.override { guiModule = "fltk"; }; - zynaddsubfx-ntk = callPackage ../applications/audio/zynaddsubfx { + zynaddsubfx-ntk = zynaddsubfx.override { guiModule = "ntk"; }; - zyn-fusion = callPackage ../applications/audio/zynaddsubfx { - guiModule = "zest"; - }; - ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS aeon = callPackage ../applications/blockchains/aeon {