Unverified Commit beee2842 authored by MTRNord's avatar MTRNord
Browse files

discourse: 3.1.0.beta4 -> 3.2.0.beta4

parent 12d9af93

pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb

index 3fee4259af9..53cc3107f46 100644

--- a/lib/discourse_js_processor.rb

+++ b/lib/discourse_js_processor.rb

@@ -111,8 +111,6 @@ class DiscourseJsProcessor

 

     def self.generate_js_processor

       Discourse::Utils.execute_command(

-        "yarn",

-        "--silent",

         "esbuild",

         "--log-level=warning",

         "--bundle",

pkgs/servers/web-apps/discourse/default.nix

+18 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
, gzip

, gnutar

, git

, esbuild

, cacert

, util-linux

, gawk
@@ -46,13 +47,13 @@ 
}@args:



let

  version = "3.1.0";

  version = "3.2.0.beta1";



  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse";

    rev = "v${version}";

    sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";

    sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk=";

  };



  ruby = ruby_3_2;
@@ -65,6 +66,7 @@ let 
    gnutar

    git

    brotli

    esbuild



    # Misc required system utils

    which
@@ -202,7 +204,7 @@ let 


    yarnOfflineCache = fetchYarnDeps {

      yarnLock = src + "/app/assets/javascripts/yarn.lock";

      sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";

      sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2";

    };



    nativeBuildInputs = runtimeDeps ++ [
@@ -215,6 +217,7 @@ let 
      nodejs_18

      jq

      moreutils

      esbuild

    ];



    outputs = [ "out" "javascripts" ];
@@ -238,6 +241,12 @@ let 
      # hasn't been `patchShebangs`-ed yet. So instead we just use

      # `patch-package` from `nativeBuildInputs`.

      ./asserts_patch-package_from_path.patch



      # `lib/discourse_js_processor.rb`

      # tries to call `../node_modules/.bin/esbuild`, which

      # hasn't been `patchShebangs`-ed yet. So instead we just use

      # `esbuild` from `nativeBuildInputs`.

      ./assets_esbuild_from_path.patch

    ];



    # We have to set up an environment that is close enough to
@@ -351,6 +360,12 @@ let 


      # Make sure the notification email setting applies

      ./notification_email.patch



      # `lib/discourse_js_processor.rb`

      # tries to call `../node_modules/.bin/esbuild`, which

      # hasn't been `patchShebangs`-ed yet. So instead we just use

      # `esbuild` from `nativeBuildInputs`.

      ./assets_esbuild_from_path.patch

    ];



    postPatch = ''

pkgs/servers/web-apps/discourse/rubyEnv/Gemfile

+8 −3
Original line number Diff line number Diff line
@@ -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 = "7.0.5.1"

  rails_version = "7.0.7"

  gem "actionmailer", rails_version

  gem "actionpack", rails_version

  gem "actionview", rails_version
@@ -141,10 +141,10 @@ group :test do 
  gem "fakeweb", require: false

  gem "minitest", require: false

  gem "simplecov", require: false

  gem "selenium-webdriver", require: false

  gem "selenium-webdriver", "~> 4.11", require: false

  gem "test-prof"

  gem "webdrivers", require: false

  gem "rails-dom-testing", require: false

  gem "minio_runner", require: false

end



group :test, :development do
@@ -259,6 +259,11 @@ if ENV["IMPORT"] == "1" 
  gem "parallel", require: false

end



if ENV["GENERIC_IMPORT"] == "1"

  gem "sqlite3"

  gem "redcarpet"

end



gem "web-push"

gem "colored2", require: false

gem "maxminddb"

pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock

+66 −67
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ GIT 


GIT

  remote: https://github.com/thoughtbot/shoulda-matchers.git

  revision: 783a90554053002017510285bc736099b2749c22

  revision: 68f76ce13e9892339f90c4928339dfd769cfa613

  specs:

    shoulda-matchers (5.3.0)

      activesupport (>= 5.2.0)
@@ -17,47 +17,47 @@ GIT 
GEM

  remote: https://rubygems.org/

  specs:

    actionmailer (7.0.5.1)

      actionpack (= 7.0.5.1)

      actionview (= 7.0.5.1)

      activejob (= 7.0.5.1)

      activesupport (= 7.0.5.1)

    actionmailer (7.0.7)

      actionpack (= 7.0.7)

      actionview (= 7.0.7)

      activejob (= 7.0.7)

      activesupport (= 7.0.7)

      mail (~> 2.5, >= 2.5.4)

      net-imap

      net-pop

      net-smtp

      rails-dom-testing (~> 2.0)

    actionpack (7.0.5.1)

      actionview (= 7.0.5.1)

      activesupport (= 7.0.5.1)

    actionpack (7.0.7)

      actionview (= 7.0.7)

      activesupport (= 7.0.7)

      rack (~> 2.0, >= 2.2.4)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.2.0)

    actionview (7.0.5.1)

      activesupport (= 7.0.5.1)

    actionview (7.0.7)

      activesupport (= 7.0.7)

      builder (~> 3.1)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.1, >= 1.2.0)

    actionview_precompiler (0.2.3)

    actionview_precompiler (0.3.0)

      actionview (>= 6.0.a)

    active_model_serializers (0.8.4)

      activemodel (>= 3.0)

    activejob (7.0.5.1)

      activesupport (= 7.0.5.1)

    activejob (7.0.7)

      activesupport (= 7.0.7)

      globalid (>= 0.3.6)

    activemodel (7.0.5.1)

      activesupport (= 7.0.5.1)

    activerecord (7.0.5.1)

      activemodel (= 7.0.5.1)

      activesupport (= 7.0.5.1)

    activesupport (7.0.5.1)

    activemodel (7.0.7)

      activesupport (= 7.0.7)

    activerecord (7.0.7)

      activemodel (= 7.0.7)

      activesupport (= 7.0.7)

    activesupport (7.0.7)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      tzinfo (~> 2.0)

    addressable (2.8.4)

    addressable (2.8.5)

      public_suffix (>= 2.0.2, < 6.0)

    annotate (3.2.0)

      activerecord (>= 3.2, < 8.0)
@@ -82,6 +82,7 @@ GEM 
      aws-sigv4 (~> 1.1)

    aws-sigv4 (1.5.0)

      aws-eventstream (~> 1, >= 1.0.2)

    base64 (0.1.1)

    better_errors (2.10.1)

      erubi (>= 1.0.0)

      rack (>= 0.9.0)
@@ -109,7 +110,7 @@ GEM 
    cgi (0.3.6)

    chunky_png (1.4.0)

    coderay (1.1.3)

    colored2 (3.1.2)

    colored2 (4.0.0)

    concurrent-ruby (1.2.2)

    connection_pool (2.4.1)

    cose (1.3.0)
@@ -119,7 +120,7 @@ GEM 
    crack (0.4.5)

      rexml

    crass (1.0.6)

    css_parser (1.14.0)

    css_parser (1.16.0)

      addressable

    dartsass-ruby (3.0.1)

      sass-embedded (~> 1.54)
@@ -144,8 +145,8 @@ GEM 
    docile (1.4.0)

    email_reply_trimmer (0.1.13)

    erubi (1.12.0)

    excon (0.100.0)

    execjs (2.8.1)

    excon (0.102.0)

    execjs (2.9.0)

    exifr (1.4.0)

    fabrication (2.30.0)

    faker (2.23.0)
@@ -163,9 +164,9 @@ GEM 
    ffi (1.15.5)

    fspath (3.1.2)

    gc_tracer (1.5.1)

    globalid (1.1.0)

      activesupport (>= 5.0)

    google-protobuf (3.23.4)

    globalid (1.2.1)

      activesupport (>= 6.1)

    google-protobuf (3.24.3)

    guess_html_encoding (0.0.11)

    hana (1.3.7)

    hashdiff (1.0.1)
@@ -188,7 +189,7 @@ GEM 
    json (2.6.3)

    json-schema (3.0.0)

      addressable (>= 2.8)

    json_schemer (1.0.3)

    json_schemer (2.0.0)

      hana (~> 1.3)

      regexp_parser (~> 2.0)

      simpleidn (~> 0.2)
@@ -222,19 +223,20 @@ GEM 
    matrix (0.4.2)

    maxminddb (0.1.22)

    memory_profiler (1.0.1)

    message_bus (4.3.7)

    message_bus (4.3.8)

      rack (>= 1.1.3)

    method_source (1.0.0)

    mini_mime (1.1.2)

    mini_mime (1.1.5)

    mini_portile2 (2.8.4)

    mini_racer (0.8.0)

      libv8-node (~> 18.16.0.0)

    mini_scheduler (0.16.0)

      sidekiq (>= 4.2.3, < 7.0)

    mini_sql (1.4.0)

    mini_sql (1.5.0)

    mini_suffix (0.3.3)

      ffi (~> 1.9)

    minitest (5.19.0)

    minio_runner (0.1.1)

    minitest (5.20.0)

    mocha (2.1.0)

      ruby2_keywords (>= 0.0.5)

    msgpack (1.7.2)
@@ -253,7 +255,7 @@ GEM 
    net-smtp (0.3.3)

      net-protocol

    nio4r (2.5.9)

    nokogiri (1.15.3)

    nokogiri (1.15.4)

      mini_portile2 (~> 2.8.2)

      racc (~> 1.4)

    oauth (1.1.0)
@@ -268,7 +270,7 @@ GEM 
      multi_json (~> 1.3)

      multi_xml (~> 0.5)

      rack (>= 1.2, < 4)

    oj (3.15.1)

    oj (3.16.1)

    omniauth (1.9.2)

      hashie (>= 3.4.6)

      rack (>= 1.6.2, < 3)
@@ -296,7 +298,7 @@ GEM 
      openssl (> 2.0)

    optimist (3.1.0)

    parallel (1.23.0)

    parallel_tests (4.2.1)

    parallel_tests (4.2.2)

      parallel

    parser (3.2.2.3)

      ast (~> 2.4.1)
@@ -313,17 +315,17 @@ GEM 
    pry-rails (0.3.9)

      pry (>= 0.10.4)

    public_suffix (5.0.3)

    puma (6.3.0)

    puma (6.3.1)

      nio4r (~> 2.0)

    racc (1.7.1)

    rack (2.2.8)

    rack-mini-profiler (3.1.0)

    rack-mini-profiler (3.1.1)

      rack (>= 1.2.0)

    rack-protection (3.0.6)

      rack

    rack-protection (3.1.0)

      rack (~> 2.2, >= 2.2.4)

    rack-test (2.1.0)

      rack (>= 1.3)

    rails-dom-testing (2.1.1)

    rails-dom-testing (2.2.0)

      activesupport (>= 5.0.0)

      minitest

      nokogiri (>= 1.6)
@@ -337,9 +339,9 @@ GEM 
    rails_multisite (5.0.0)

      activerecord (>= 6.0)

      railties (>= 6.0)

    railties (7.0.5.1)

      actionpack (= 7.0.5.1)

      activesupport (= 7.0.5.1)

    railties (7.0.7)

      actionpack (= 7.0.7)

      activesupport (= 7.0.7)

      method_source

      rake (>= 12.2)

      thor (~> 1.0)
@@ -363,7 +365,7 @@ GEM 
      rack (>= 1.4)

    rexml (3.2.6)

    rinku (2.0.6)

    rotp (6.2.2)

    rotp (6.3.0)

    rouge (4.1.3)

    rqrcode (2.2.0)

      chunky_png (~> 1.0)
@@ -393,7 +395,7 @@ GEM 
      rspec-mocks (~> 3.12)

      rspec-support (~> 3.12)

    rspec-support (3.12.1)

    rss (0.2.9)

    rss (0.3.0)

      rexml

    rswag-specs (2.10.1)

      activesupport (>= 3.1, < 7.1)
@@ -402,7 +404,8 @@ GEM 
      rspec-core (>= 2.14)

    rtlcss (0.2.1)

      mini_racer (>= 0.6.3)

    rubocop (1.55.1)

    rubocop (1.56.3)

      base64 (~> 0.1.1)

      json (~> 2.3)

      language_server-protocol (>= 3.17.0)

      parallel (~> 1.10)
@@ -422,7 +425,7 @@ GEM 
      rubocop-rspec (>= 2.0.0)

    rubocop-factory_bot (2.23.1)

      rubocop (~> 1.33)

    rubocop-rspec (2.23.0)

    rubocop-rspec (2.23.2)

      rubocop (~> 1.33)

      rubocop-capybara (~> 2.17)

      rubocop-factory_bot (~> 2.22)
@@ -436,10 +439,10 @@ GEM 
    sanitize (6.0.2)

      crass (~> 1.0.2)

      nokogiri (>= 1.12.0)

    sass-embedded (1.64.1)

    sass-embedded (1.66.1)

      google-protobuf (~> 3.23)

      rake (>= 13.0.0)

    selenium-webdriver (4.10.0)

    selenium-webdriver (4.12.0)

      rexml (~> 3.2, >= 3.2.5)

      rubyzip (>= 1.2.2, < 3.0)

      websocket (~> 1.0)
@@ -462,7 +465,7 @@ GEM 
      actionpack (>= 5.2)

      activesupport (>= 5.2)

      sprockets (>= 3.0.0)

    sshkey (2.0.0)

    sshkey (3.0.0)

    stackprof (0.2.25)

    syntax_tree (6.1.1)

      prettier_print (>= 1.2.0)
@@ -491,11 +494,7 @@ GEM 
      hkdf (~> 1.0)

      jwt (~> 2.0)

      openssl (~> 3.0)

    webdrivers (5.3.1)

      nokogiri (~> 1.6)

      rubyzip (>= 1.3.0)

      selenium-webdriver (~> 4.0, < 4.11)

    webmock (3.18.1)

    webmock (3.19.1)

      addressable (>= 2.8.0)

      crack (>= 0.3.2)

      hashdiff (>= 0.4.0, < 2.0.0)
@@ -504,20 +503,20 @@ GEM 
      nokogiri (~> 1.8)

    yaml-lint (0.1.2)

    yard (0.9.34)

    zeitwerk (2.6.10)

    zeitwerk (2.6.11)



PLATFORMS

  ruby



DEPENDENCIES

  actionmailer (= 7.0.5.1)

  actionpack (= 7.0.5.1)

  actionview (= 7.0.5.1)

  actionmailer (= 7.0.7)

  actionpack (= 7.0.7)

  actionview (= 7.0.7)

  actionview_precompiler

  active_model_serializers (~> 0.8.3)

  activemodel (= 7.0.5.1)

  activerecord (= 7.0.5.1)

  activesupport (= 7.0.5.1)

  activemodel (= 7.0.7)

  activerecord (= 7.0.7)

  activesupport (= 7.0.7)

  addressable

  annotate

  aws-sdk-s3
@@ -577,6 +576,7 @@ DEPENDENCIES 
  mini_scheduler

  mini_sql

  mini_suffix

  minio_runner

  minitest

  mocha

  multi_json
@@ -604,7 +604,7 @@ DEPENDENCIES 
  rails-dom-testing

  rails_failover

  rails_multisite

  railties (= 7.0.5.1)

  railties (= 7.0.7)

  rake

  rb-fsevent

  rbtrace
@@ -625,7 +625,7 @@ DEPENDENCIES 
  ruby-readability

  rubyzip

  sanitize

  selenium-webdriver

  selenium-webdriver (~> 4.11)

  shoulda-matchers!

  sidekiq

  simplecov
@@ -642,10 +642,9 @@ DEPENDENCIES 
  unf

  unicorn

  web-push

  webdrivers

  webmock

  yaml-lint

  yard



BUNDLED WITH

   2.4.13
 
   2.4.17

pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix

+98 −89

File changed.

Preview size limit exceeded, changes collapsed.