git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119596 from talyz/discourse-2.6.5

discourse: 2.6.3 -> 2.6.5, module fixes

commit7124e24a47d3c3f3329e80ca7a143ee9f37a6817 authorKim Lindberger <kim.lindberger@gmail.com> dateFri 16 Apr 2021, 16:06 (6 years ago) parent2e6b1f57310dd0
2 files changed+7−5
nixos/modules/services/web-apps/discourse.nix+5−3 pkgs/servers/web-apps/discourse/default.nix+2−2
nixos/modules/services/web-apps/discourse.nix+5−3
@@ -702,7 +702,7 @@ in
702702 cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
703703 cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
704704 cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/
705− ${lib.concatMapStrings (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins}
705+ ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins}
706706 ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
707707 ln -sf /var/lib/discourse/backups /run/discourse/public/backups
708708
@@ -726,7 +726,8 @@ in
726726 export ADMIN_EMAIL="${cfg.admin.email}"
727727 export ADMIN_NAME="${cfg.admin.fullName}"
728728 export ADMIN_USERNAME="${cfg.admin.username}"
729− export ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})"
729+ ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})"
730+ export ADMIN_PASSWORD
730731 discourse-rake admin:create_noninteractively
731732
732733 discourse-rake themes:update
@@ -938,7 +939,8 @@ in
938939 set -o errexit -o pipefail -o nounset -o errtrace
939940 shopt -s inherit_errexit
940941
941− export api_key=$(<'${apiKeyPath}')
942+ api_key=$(<'${apiKeyPath}')
943+ export api_key
942944
943945 jq <${mail-receiver-json} \
944946 '.DISCOURSE_API_KEY = $ENV.api_key' \
pkgs/servers/web-apps/discourse/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88let
9− version = "2.6.3";
9+ version = "2.6.5";
1010
1111 src = fetchFromGitHub {
1212 owner = "discourse";
1313 repo = "discourse";
1414 rev = "v${version}";
15− sha256 = "sha256-lAIhVxvmjxEiru1KNxbFV+eDMLUGza/Dma3WU0ex0xs=";
15+ sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw=";
1616 };
1717
1818 runtimeDeps = [