Unverified Commit 97b6cd2b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #291587 from ehmry/discourse

discourse: 3.1.0 <- 3.2.0.beta1
parents 66114260 859a5819
Loading
Loading
Loading
Loading
+3 −21
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
, gzip
, gnutar
, git
, esbuild
, cacert
, util-linux
, gawk
@@ -47,13 +46,13 @@
}@args:

let
  version = "3.2.0.beta1";
  version = "3.1.0";

  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse";
    rev = "v${version}";
    sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk=";
    sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";
  };

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

    # Misc required system utils
    which
@@ -204,7 +202,7 @@ let

    yarnOfflineCache = fetchYarnDeps {
      yarnLock = src + "/app/assets/javascripts/yarn.lock";
      sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2";
      sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";
    };

    nativeBuildInputs = runtimeDeps ++ [
@@ -217,7 +215,6 @@ let
      nodejs_18
      jq
      moreutils
      esbuild
    ];

    outputs = [ "out" "javascripts" ];
@@ -241,12 +238,6 @@ 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
@@ -279,7 +270,6 @@ let
      popd &>/dev/null

      redis-server >/dev/null &
      REDIS_PID=$!

      initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null
      postgres -D $NIX_BUILD_TOP/postgres -k $NIX_BUILD_TOP >/dev/null &
@@ -305,8 +295,6 @@ let

      bundle exec rake db:migrate >/dev/null
      chmod -R +w tmp

      kill $REDIS_PID
    '';

    buildPhase = ''
@@ -363,12 +351,6 @@ 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 = ''
+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse-assign";
    rev = "e9c7cb5c3f90109bc47223b0aa4054d681e9cc04";
    sha256 = "sha256-w1h1dCSyOml+AT7lPKENYfawm6BU2De5CyBHrDnDcrM=";
    rev = "0cbf10b8055370445bd36536e51986bf48bdc57e";
    sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo=";
  };
  meta = with lib; {
    homepage = "https://github.com/discourse/discourse-docs";
+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse-bbcode-color";
    rev = "79ed22b3a3352adbd20f7e2222b9dbdb9fbaf7fe";
    sha256 = "sha256-AHgny9BW/ssmv0U2lwzVWgYKPsvWHD6kgU3mBMFX4Aw=";
    rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7";
    sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs=";
  };
  meta = with lib; {
    homepage = "https://github.com/discourse/discourse-bbcode-color";
+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ DEPENDENCIES
  rrule (= 0.4.4)

BUNDLED WITH
   2.4.17
   2.4.13
+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
  src = fetchFromGitHub {
    owner = "discourse";
    repo = "discourse-calendar";
    rev = "4d4fe40d09f7232b1348e1ff910b37b2cec0835d";
    sha256 = "sha256-w1sqE3KxwrE8SWqZUtPVhjITOPFXwlj4iPyPZeSfvtI=";
    rev = "afc2ee684de41601d6cecc46713d139760f176a6";
    sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI=";
  };
  meta = with lib; {
    homepage = "https://github.com/discourse/discourse-calendar";
Loading