diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 661d243aed66..148dfc36bebe 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -39,7 +39,7 @@ buildRubyGem, rustc, cargo, - pnpm_9, + pnpm, fetchPnpmDeps, pnpmConfigHook, svgo, @@ -53,13 +53,13 @@ }: let - version = "2025.12.2"; + version = "2026.1.1"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-lovpaG5K+avTC9W2rFN21JZQXCT8b0HBXLMgWEIz9fs="; + sha256 = "sha256-sZky/gCCfaEw75NWsUatcxN3gjeKD8jzqzGXkDbcsfU="; }; ruby = ruby_3_3; @@ -304,9 +304,9 @@ let pnpmDeps = fetchPnpmDeps { pname = "discourse-assets"; inherit version src; - pnpm = pnpm_9; + pnpm = pnpm; fetcherVersion = 1; - hash = "sha256-/GJQqbmBXn5SSdxQ3TBQEUGe6Qm7aJ1ogoYqOFD5Pm0="; + hash = "sha256-/vPNHEB/ZuHWnSLqfz2NM/scSRH9wzotzjunDAw5Imc="; }; nativeBuildInputs = runtimeDeps ++ [ @@ -320,7 +320,7 @@ let moreutils nodejs-slim_22 pnpmConfigHook - pnpm_9 + pnpm ]; outputs = [ @@ -534,7 +534,10 @@ let meta = { homepage = "https://www.discourse.org/"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ talyz ]; + maintainers = with lib.maintainers; [ + leona + talyz + ]; license = lib.licenses.gpl2Plus; description = "Open source discussion platform"; }; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index da915e17f364..78744b8933f2 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "2e32fe4573912612ab61cf9c1962f3ae85fd732a"; - sha256 = "sha256-7M2K3yx1CwzrLgS83e/3YKGyGJA4S7wT2QG7m9yZNnI="; + rev = "8c621d07a7a60b94d717fd435b0f137e89db99cd"; + sha256 = "sha256-+LqlJpg9s2GbZE136FUDIRn9C10a7IYPPu1crkMqMSA="; }; meta = { homepage = "https://github.com/discourse/discourse-bbcode-color"; 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 8fa871f7c6c7..23bedcf7d3df 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "f755032b6988c217da30025d7e281d07361bbc47"; - sha256 = "sha256-GOwLPbRLZ8F+hY4n+TAbN+DruaQgTzoM7KhVU9hfisM="; + rev = "742515b059c27803a7b813ae420b65ceba1e8798"; + sha256 = "sha256-AG4WYskmEdW68n2XX4t139I3rlc0PNAL8cTehVvEgAs="; }; meta = { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile index abd2e7688bb7..6b2f95057594 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile @@ -3,8 +3,12 @@ source "https://rubygems.org" # gem "rails" -gem "discourse_subscription_client", "0.1.11" gem "iso-639", "0.3.5" gem "ice_cube", "0.16.4" gem "icalendar", "2.8.0" gem "icalendar-recurrence", "1.1.3" +gem "omnievent", "0.1.0.pre11" +gem "omnievent-api", "0.1.0.pre5" +gem "omnievent-icalendar", "0.1.0.pre9" +gem "omnievent-google", "0.1.0.pre8" +gem "omnievent-outlook", "0.1.0.pre11" diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile.lock index bfe659db2b0b..00c97d85d1d5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-events/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - discourse_subscription_client (0.1.11) icalendar (2.8.0) ice_cube (~> 0.16) icalendar-recurrence (1.1.3) @@ -9,16 +8,31 @@ GEM ice_cube (~> 0.16) ice_cube (0.16.4) iso-639 (0.3.5) + omnievent (0.1.0.pre11) + omnievent-api (0.1.0.pre5) + omnievent + omnievent-google (0.1.0.pre8) + omnievent + omnievent-api + omnievent-icalendar (0.1.0.pre9) + omnievent + omnievent-outlook (0.1.0.pre11) + omnievent + omnievent-api PLATFORMS ruby DEPENDENCIES - discourse_subscription_client (= 0.1.11) icalendar (= 2.8.0) icalendar-recurrence (= 1.1.3) ice_cube (= 0.16.4) iso-639 (= 0.3.5) + omnievent (= 0.1.0.pre11) + omnievent-api (= 0.1.0.pre5) + omnievent-google (= 0.1.0.pre8) + omnievent-icalendar (= 0.1.0.pre9) + omnievent-outlook (= 0.1.0.pre11) BUNDLED WITH - 2.5.22 + 2.7.2 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-events/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-events/default.nix index 2c7b8f8ec870..a0a59a6495f7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-events/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-events/default.nix @@ -10,8 +10,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "angusmcleod"; repo = "discourse-events"; - rev = "83a6ee2c36a83bdb21fc58e3ec4bbd5fd5953e2e"; - sha256 = "sha256-QNcP32JYaon7phv3sFi1vlWZNwuL+LDzRWe6vi2FwTE="; + rev = "3004435beb0913296dbaf8e5b3cd65be7b84df56"; + sha256 = "sha256-TQ+mcd2IAswxqY6OJfXk+d770WBNBZ73bB2aAfxYSDs="; }; meta = { homepage = "https://github.com/angusmcleod/discourse-events"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-events/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-events/gemset.nix index f783f52d2ee9..c78a6006eeb4 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-events/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-events/gemset.nix @@ -1,14 +1,4 @@ { - discourse_subscription_client = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13vmi645ilsqjalz04738d8ng9zxhw5nd5s80lwcdd87dpzmkk3v"; - type = "gem"; - }; - version = "0.1.11"; - }; icalendar = { dependencies = [ "ice_cube" ]; groups = [ "default" ]; @@ -54,4 +44,64 @@ }; version = "0.3.5"; }; + omnievent = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xiz1jag2z8agjk1mycw44lkgrq7nfj2m6gx2v1zr8c6p2wvk4lj"; + type = "gem"; + }; + version = "0.1.0.pre11"; + }; + omnievent-api = { + dependencies = [ "omnievent" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nlp8vmsachbc8s8h6h34h9gw5i3yd6zbcs7sdkbhdwsqaf61ypp"; + type = "gem"; + }; + version = "0.1.0.pre5"; + }; + omnievent-google = { + dependencies = [ + "omnievent" + "omnievent-api" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ma15ijrf0dq4mlghg3vrhz62llhfp7k6cq7nfwy12h229gnzdrx"; + type = "gem"; + }; + version = "0.1.0.pre8"; + }; + omnievent-icalendar = { + dependencies = [ "omnievent" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dl634wgah2dv851dhv18hkmg1p6a1laa2f9blizlizvnvi5g1g5"; + type = "gem"; + }; + version = "0.1.0.pre9"; + }; + omnievent-outlook = { + dependencies = [ + "omnievent" + "omnievent-api" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "072aycqq94w5bfj9nda8inxpc88a4bqn1l1jar0c4dcpyadqnd5r"; + type = "gem"; + }; + version = "0.1.0.pre11"; + }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 73d6b6c88571..d018474b9609 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -11,8 +11,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "1f225fa60e2cd580596aedd65d0fe76acd221c92"; - sha256 = "sha256-S51VoXqwcnRYuahfjA1eeonPgy2OZdhiEhlo+zzu//U="; + rev = "0f5749ca6443d63999f78ed8eac49dead1b322bc"; + sha256 = "sha256-QquREAexMJjza+TtDveqJ3/sgjPCziv2oje4fKL6uz4="; }; meta = { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; 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 af827a3d6d95..d4a4f2e2e263 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -10,8 +10,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "9da0e79ef30544a626bc65c3697ef5c9005b01d2"; - sha256 = "sha256-jq2tFzNshYZQRpiKsENB5dnKSlBgTjBQpMd4CPu7LIU="; + rev = "14d2328911c3b7ed5b38c4713c52cd835793be5a"; + sha256 = "sha256-GpNh+7091Lj0JW+RB9EOgxFNOCkFVvpPd0vbbpFcvcE="; }; 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 db5b11411cf4..f40aea26be30 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 @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "ba5e374a8d3b05b40f98585e664769fa50677e64"; - sha256 = "sha256-hQufTeIG40Txtiit+XL338P2Hu6TX1E6b/Xcr3SbSbY="; + rev = "d13a708d33fc24bb6cc111e8d84fb896caf81ef4"; + sha256 = "sha256-3hnmtHR1k1bZKH3ezauQPr7pfbQYRTbGV8a39w6m6F8="; }; meta = { homepage = "https://github.com/discourse/discourse-saved-searches"; 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 fa0e325642fe..6e023a571438 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 @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "218e7290fc32a04d94bb4da29d9c4a8dbd9cc88e"; - sha256 = "sha256-rRMwZw34vodYi3sFIk52GN/gztZkJHc4JGckH2WeBCQ="; + rev = "7e7df7878212ad976031cbbc17a0dd4ca1d55def"; + sha256 = "sha256-+6CmXgXEyQb6CNSqaVqbfXQCc+XJQGDQnw9vgAlse0g="; }; meta = { 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 c760cd699d31..18ecc0c61e5e 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -53,6 +53,7 @@ gem "http_accept_language", require: false gem "discourse-fonts", require: "discourse_fonts" gem "discourse-emojis", require: "discourse_emojis" +gem "discourse_math_bundle" gem "message_bus" @@ -63,7 +64,7 @@ gem "fastimage" gem "aws-sdk-s3", require: false gem "aws-sdk-sns", require: false gem "aws-sdk-mediaconvert", require: false -gem "excon", require: false +gem "excon" gem "unf", require: false gem "email_reply_trimmer" @@ -113,7 +114,6 @@ gem "addressable" gem "json_schemer" gem "net-smtp", require: false -gem "net-imap", require: false gem "net-pop", require: false gem "digest", require: false @@ -290,6 +290,7 @@ end gem "dry-initializer", "~> 3.1" gem "parallel" +gem "tty-prompt", require: false # for discourse-zendesk-plugin gem "inflection", require: false diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 1a03e260dab6..01df10a128c3 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -122,7 +122,7 @@ GEM cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.4) - crack (1.0.0) + crack (1.0.1) bigdecimal rexml crass (1.0.6) @@ -143,13 +143,14 @@ GEM discourse-seed-fu (2.3.12) activerecord (>= 3.1) activesupport (>= 3.1) - discourse_ai-tokenizers (0.4.2) + discourse_ai-tokenizers (0.4) activesupport (>= 6.0) tiktoken_ruby (~> 0.0.15) tokenizers (~> 0.6.3) discourse_dev_assets (0.0.6) faker (~> 3.5.1) literate_randomizer + discourse_math_bundle (1.0.1) docile (1.4.1) drb (2.2.3) dry-initializer (3.2.0) @@ -157,7 +158,7 @@ GEM email_reply_trimmer (0.2.0) erb (6.0.0) erubi (1.13.1) - excon (1.2.5) + excon (1.3.2) logger exifr (1.4.1) extralite-bundle (2.13) @@ -398,6 +399,8 @@ GEM parser (3.3.10.0) ast (~> 2.4.1) racc + pastel (0.8.0) + tty-color (~> 0.5) pdf-reader (2.15.0) Ascii85 (>= 1.0, < 3.0, != 2.0.0) afm (>= 0.2.1, < 2) @@ -510,10 +513,10 @@ GEM io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - rexml (3.4.2) + rexml (3.4.4) rinku (2.0.6) rotp (6.3.0) - rouge (4.6.1) + rouge (4.7.0) rqrcode (3.1.1) chunky_png (~> 1.0) rqrcode_core (~> 2.0) @@ -700,6 +703,16 @@ GEM tsort (0.2.0) ttfunk (1.8.0) bigdecimal (~> 3.1) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2025.2) @@ -723,6 +736,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.9.2) + wisper (2.0.1) xpath (3.2.0) nokogiri (~> 1.8) yaml-lint (0.1.2) @@ -789,6 +803,7 @@ DEPENDENCIES discourse-seed-fu discourse_ai-tokenizers discourse_dev_assets + discourse_math_bundle dry-initializer (~> 3.1) ed25519 email_reply_trimmer @@ -834,7 +849,6 @@ DEPENDENCIES multipart-post mustache net-http - net-imap net-pop net-smtp nokogiri @@ -906,6 +920,7 @@ DEPENDENCIES tokenizers trilogy ttfunk + tty-prompt tzinfo-data unf unicorn @@ -959,7 +974,7 @@ CHECKSUMS connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad cose (1.3.1) sha256=d5d4dbcd6b035d513edc4e1ab9bc10e9ce13b4011c96e3d1b8fe5e6413fd6de5 cppjieba_rb (0.4.4) sha256=319a7ab57b6ec28a8d1b223487ecd114432f1930d7740db2f99c1991e6c8faaf - crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49 + crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d css_parser (1.21.1) sha256=6cfd3ffc0a97333b39d2b1b49c95397b05e0e3b684d68f77ec471ba4ec2ef7c7 csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f @@ -973,8 +988,9 @@ CHECKSUMS discourse-emojis (1.0.44) sha256=63425a32379fb471d58f5eac9a1e931fc5a94efb7d327f71f1580af4dfe4edb3 discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033 discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4 - discourse_ai-tokenizers (0.4.2) sha256=61c2f254582a3ae69255115b2b072904361003612b5b0f52aa64773817aae413 + discourse_ai-tokenizers (0.4) sha256=54d7ddcc5479f3bb3057b90f4a85106b4602a07336b51d372c1a1dd8f08104c5 discourse_dev_assets (0.0.6) sha256=4dfe7946927aa3d61a4ba89b5aef39d6daaeb70e35d7125dc481806a5c0aea4e + discourse_math_bundle (1.0.1) sha256=c7d82fa65c9680cab2f77daeba32c1b89e500faccd2269e050ab27d5e1bc8337 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3 @@ -982,7 +998,7 @@ CHECKSUMS email_reply_trimmer (0.2.0) sha256=05843fa5ee1a2037235f1f3c876e922f613e2b4406fea5bb14212d1708d6c525 erb (6.0.0) sha256=2730893f9d8c9733f16cab315a4e4b71c1afa9cabc1a1e7ad1403feba8f52579 erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9 - excon (1.2.5) sha256=ca040bb61bc0059968f34a17115a00d2db8562e3c0c5c5c7432072b551c85a9d + excon (1.3.2) sha256=a089babe98638e58042a7d542b2bbd183304527e33d612b6dde22fa491a544a5 exifr (1.4.1) sha256=768374cc6b6ff3743acba57c1c35229bdd8c6b9fbc1285952047fc1215c4b894 extralite-bundle (2.13) sha256=0d00338dd3b348f44a02bb9e93db3714231e7240a48320f1ee3a1db5197db3cc fabrication (3.0.0) sha256=a6a0bfad9071348ad3cb1701df788524b888c0cdd044b988893e7509f7463be3 @@ -1108,6 +1124,7 @@ CHECKSUMS parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130 parallel_tests (5.5.0) sha256=783c1e4da27c4096a7b360f080ae03cf1122cb0dfdb4fe827013e0521642f666 parser (3.3.10.0) sha256=ce3587fa5cc55a88c4ba5b2b37621b3329aadf5728f9eafa36bbd121462aabd6 + pastel (0.8.0) sha256=481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75 pdf-reader (2.15.0) sha256=c5025750bec8de7b11cfd1d1ccc2b944d2782c3638cd15b5ee1531d1206c0886 pg (1.6.2) sha256=58614afd405cc9c2c9e15bffe8432e0d6cfc58b722344ad4a47c73a85189c875 pg (1.6.2-aarch64-linux) sha256=0503c6be5b0ca5ca3aaf91f2ed638f90843313cb81e8e7d7b60ad4bb62c3d131 @@ -1160,10 +1177,10 @@ CHECKSUMS regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4 reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835 request_store (1.7.0) sha256=e1b75d5346a315f452242a68c937ef8e48b215b9453a77a6c0acdca2934c88cb - rexml (3.4.2) sha256=1384268554a37af5da5279431ca3f2f37d46f09ffdd6c95e17cc84c83ea7c417 + rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142 rinku (2.0.6) sha256=8b60670e3143f3db2b37efa262971ce3619ec23092045498ef9f077d82828d7d rotp (6.3.0) sha256=75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854 - rouge (4.6.1) sha256=5075346d5797d6864be93f7adc75a16047a7dbfa572c63c502419ffa582c77de + rouge (4.7.0) sha256=dba5896715c0325c362e895460a6d350803dbf6427454f49a47500f3193ea739 rqrcode (3.1.1) sha256=4c2e1e36dab80720062388cfc827986ab622dc652437214a5fb6382985b6f00f rqrcode_core (2.0.1) sha256=52f76d97ec837fa91b15a15a95c5c2740b22d722db5d6b071f76d4b40a3ba98a rrule (0.7.0) sha256=816b6ac33c5705addfe25de3c3de05003ae68ae2ca02cf5c0e805ee387851f87 @@ -1250,6 +1267,11 @@ CHECKSUMS trilogy (2.9.0) sha256=a2d63b663ba68a4758e15d1f9afb228f5d16efc7fe7cea68699e1c106ef6067f tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca + tty-color (0.6.0) sha256=6f9c37ca3a4e2367fb2e6d09722762647d6f455c111f05b59f35730eeb24332a + tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 + tty-prompt (0.23.1) sha256=fcdbce905238993f27eecfdf67597a636bc839d92192f6a0eef22b8166449ec8 + tty-reader (0.9.0) sha256=c62972c985c0b1566f0e56743b6a7882f979d3dc32ff491ed490a076f899c2b1 + tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b tzinfo-data (1.2025.2) sha256=a92375a1fbb47d38fe88fd514c40a38cc8f97d168da2a6479f15185e86470939 unf (0.2.0) sha256=e6bcc2e101d80e3f9459753db747d5926aada1aaaf61e629e93359da9a5b04ab @@ -1263,6 +1285,7 @@ CHECKSUMS web-push (3.0.1) sha256=5b4dd2f2bba3bd8951da6416492fe920a6f203d14d3080f943c5d01c0cc4b18d webmock (3.25.1) sha256=ab9d5d9353bcbe6322c83e1c60a7103988efc7b67cd72ffb9012629c3d396323 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 + wisper (2.0.1) sha256=ce17bc5c3a166f241a2e6613848b025c8146fce2defba505920c1d1f3f88fae6 xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e yaml-lint (0.1.2) sha256=e3960b171766ae187338a169815e99fe10fcb0d9c22b1c539e8d57e114324c8a yard (0.9.38) sha256=721fb82afb10532aa49860655f6cc2eaa7130889df291b052e1e6b268283010f diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 5d2512d63def..2d77c94cb35b 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -636,10 +636,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8"; + sha256 = "0zjcdl5i6lw508r01dym05ibhkc784cfn93m1d26c7fk1hwi0jpz"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; crass = { groups = [ @@ -808,10 +808,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04z4m8bkhxv4m990ynrbc41i0dh4543jnnqian9fcfiab1ag5hk1"; + sha256 = "1i84h7qdh78s5hvivd9nffh04ikb222ll3xrawqbpwvrak6dvmsl"; type = "gem"; }; - version = "0.4.2"; + version = "0.4"; }; discourse_dev_assets = { dependencies = [ @@ -830,6 +830,16 @@ }; version = "0.0.6"; }; + discourse_math_bundle = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dw3pkhxa9xba3h6j8ndmh7m17mqq4rbmbkxyyrcm04nbjk2zn67"; + type = "gem"; + }; + version = "1.0.1"; + }; docile = { groups = [ "default" @@ -928,10 +938,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a"; + sha256 = "19a4ln8s8bz2vnv15mikgr908cqqplmjnm3x5825i3k3k2zbm2d0"; type = "gem"; }; - version = "1.2.5"; + version = "1.3.2"; }; exifr = { groups = [ "default" ]; @@ -2213,6 +2223,17 @@ }; version = "3.3.10.0"; }; + pastel = { + dependencies = [ "tty-color" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; pdf-reader = { dependencies = [ "Ascii85" @@ -2893,10 +2914,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05y4lwzci16c2xgckmpxkzq4czgkyaiiqhvrabdgaym3aj2jd10k"; + sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; - version = "3.4.2"; + version = "3.4.4"; }; rinku = { groups = [ "default" ]; @@ -2933,10 +2954,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah"; + sha256 = "0fd77qcz603mli4lyi97cjzkv02hsfk60m495qv5qcn02mkqk9fv"; type = "gem"; }; - version = "4.6.1"; + version = "4.7.0"; }; rqrcode = { dependencies = [ @@ -3765,6 +3786,65 @@ }; version = "1.8.0"; }; + tty-color = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-cursor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-prompt = { + dependencies = [ + "pastel" + "tty-reader" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; + type = "gem"; + }; + version = "0.23.1"; + }; + tty-reader = { + dependencies = [ + "tty-cursor" + "tty-screen" + "wisper" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-screen = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; + type = "gem"; + }; + version = "0.8.2"; + }; tzinfo = { dependencies = [ "concurrent-ruby" ]; groups = [ @@ -3948,6 +4028,16 @@ }; version = "1.9.2"; }; + wisper = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; xpath = { dependencies = [ "nokogiri" ]; groups = [ diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 4db0e88fe970..d86ec9c439a5 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -42,10 +42,10 @@ class DiscourseVersion: """Take either a tag or version number, calculate the other.""" if version.startswith('v'): self.tag = version - self.version = version.lstrip('v') + self.version = version.lstrip('v').rstrip("-latest") else: self.tag = 'v' + version - self.version = version + self.version = version.rstrip("-latest") self._version = Version(self.version) @@ -247,7 +247,7 @@ def update(rev): old_pnpm_hash = _nix_eval('discourse.assets.pnpmDeps.outputHash') new_pnpm_hash = _get_build_lock_hash() if new_pnpm_hash is not None: - click.echo(f"Updating yarn lock hash: {old_pnpm_hash} -> {new_pnpm_hash}") + click.echo(f"Updating pnpm lock hash: {old_pnpm_hash} -> {new_pnpm_hash}") with open(Path(__file__).parent / "default.nix", 'r+') as f: content = f.read()