Unverified Commit d30fde09 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #250735 from TheNeikos/fix/discourse 

discourse: update 3.1.0.beta4 -> 3.1.0
parents 407c4acd bbdccb8e

nixos/tests/discourse.nix

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ import ./make-test-python.nix ( 
        request = builtins.toJSON {

          title = "Private message";

          raw = "This is a test message.";

          target_usernames = admin.username;

          target_recipients = admin.username;

          archetype = "private_message";

        };

      in ''

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

+7 −22
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
, yarn

, fixup_yarn_lock

, nodePackages

, nodejs_16

, dart-sass-embedded

, nodejs_18

, jq

, moreutils

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



let

  version = "3.1.0.beta4";

  version = "3.1.0";



  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse";

    rev = "v${version}";

    sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";

    sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";

  };



  ruby = ruby_3_2;
@@ -163,9 +162,9 @@ let 
                cd ../..



                mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/

                ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a

                ln -s "${nodejs_18.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a



                ln -s ${nodejs_16.libv8}/include vendor/v8/include

                ln -s ${nodejs_18.libv8}/include vendor/v8/include



                mkdir -p ext/libv8-node

                echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
@@ -190,20 +189,6 @@ let 
              cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so

            '';

          };

          sass-embedded = gems.sass-embedded // {

            dontBuild = false;

            # `sass-embedded` depends on `dart-sass-embedded` and tries to

            # fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`

            # can also be specified via `SASS_EMBEDDED`. But instead of

            # compressing our `dart-sass-embedded` just to decompress it

            # again, we simply patch the Rakefile to symlink that path.

            patches = [

              ./rubyEnv/sass-embedded-static.patch

            ];

            postPatch = ''

              export SASS_EMBEDDED=${dart-sass-embedded}/bin

            '';

          };

        };



    groups = [
@@ -217,7 +202,7 @@ let 


    yarnOfflineCache = fetchYarnDeps {

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

      sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";

      sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";

    };



    nativeBuildInputs = runtimeDeps ++ [
@@ -227,7 +212,7 @@ let 
      terser

      nodePackages.patch-package

      yarn

      nodejs_16

      nodejs_18

      jq

      moreutils

    ];

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

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin { 
  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse-assign";

    rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80";

    sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY=";

    rev = "0cbf10b8055370445bd36536e51986bf48bdc57e";

    sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo=";

  };

  meta = with lib; {

    homepage = "https://github.com/discourse/discourse-docs";

pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ mkDiscoursePlugin { 
  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse-bbcode-color";

    rev = "f9ebbf016c8c5c763473ff36cc30fdcdf8fcf480";

    sha256 = "sha256-7iCKhMdVlFdHMXxU8mQMU1vFiAbr1qKvG29VdAki+14=";

    rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7";

    sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs=";

  };

  meta = with lib; {

    homepage = "https://github.com/discourse/discourse-bbcode-color";

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock

+4 −4
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    activesupport (7.0.4.3)

    activesupport (7.0.8)

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

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      tzinfo (~> 2.0)

    concurrent-ruby (1.2.2)

    i18n (1.13.0)

    i18n (1.14.1)

      concurrent-ruby (~> 1.0)

    minitest (5.18.0)

    minitest (5.20.0)

    rrule (0.4.4)

      activesupport (>= 2.3)

    tzinfo (2.0.6)
@@ -22,4 +22,4 @@ DEPENDENCIES 
  rrule (= 0.4.4)



BUNDLED WITH

   2.4.10
 
   2.4.13