dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #139201 from talyz/discourse-2.7.8

Browse Source 
discourse: 2.7.7 -> 2.7.8, update plugins
This commit is contained in:
Kim Lindberger 2021-09-27 15:33:48 +02:00 committed by GitHub
commit 454f253acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/web-apps/discourse/default.nix
View File

@ -2,20 +2,21 @@
, fetchFromGitHub, bundlerEnv, callPackage
, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, libpsl
, redis, postgresql, which, brotli, procps, rsync, nodePackages, v8
, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead
, libpsl, redis, postgresql, which, brotli, procps, rsync
, nodePackages, v8
, plugins ? []
}@args:
let
version = "2.7.7";
version = "2.7.8";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U=";
sha256 = "sha256-p4eViEvzIU6W89FZRtMBXsT7bvf2H12bTPZ/h3iD8rA=";
};
runtimeDeps = [
@ -41,6 +42,7 @@ let
jpegoptim
gifsicle
nodePackages.svgo
jhead
];
runtimeEnv = {
@ -242,9 +244,6 @@ let
# Add a noninteractive admin creation task
./admin_create.patch
# Disable jhead, which is currently marked as vulnerable
./disable_jhead.patch
# Add the path to the CA cert bundle to make TLS work
./action_mailer_ca_cert.patch

12
pkgs/servers/web-apps/discourse/disable_jhead.patch
View File

@ -1,12 +0,0 @@
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index d87da5a85e..f5323292d7 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -127,6 +127,7 @@ class FileHelper
jpegrecompress: false,
# Skip looking for gifsicle, svgo binaries
gifsicle: false,
+ jhead: false,
svgo: false
)
end

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

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.4)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -24,4 +24,4 @@ DEPENDENCIES
rrule (= 0.4.2)
BUNDLED WITH
2.2.20
2.2.24

4
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
rev = "519cf403ae3003291de20145aca243e2ffbcb4a2";
sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4";
rev = "2f76cdd3064735d484be1df77f43100aca21aea6";
sha256 = "1skpc8p5br1jkii1rksha1q95ias6xxyvi5bnli3q41w7fz1h5j2";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";

4
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
concurrent-ruby = {
groups = ["default"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-canned-replies";
rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d";
sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7";
rev = "1bb77ebbe0577f257bc16783dc8b7bbf2d915092";
sha256 = "0qvx8k9jsxjllqsqpf4k0j4niv1k2sggy6ak067wigs8ha3dkcr0";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-canned-replies";

4
pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-checklist";
rev = "6e7b9c5040c55795c7fd4db9569b3e93dad092c2";
sha256 = "sha256-2KAVBrfAvhLZC9idi+ijbVqOCq9rSXbDVEOZS+mWJ10=";
rev = "48855d81b7c3a3274f7f78a64312125c344d92d1";
sha256 = "0139v5wpyglfzvd07ka6gic1ssfysisgfiq09dsbjy519gnc9kjw";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-checklist";

4
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
View File

@ -3,7 +3,7 @@ GEM
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
faraday (1.7.0)
faraday (1.8.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@ -40,4 +40,4 @@ DEPENDENCIES
sawyer (= 0.8.2)
BUNDLED WITH
2.2.20
2.2.24

4
pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1";
sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6";
rev = "9aaf4350968fb758f9bff3588f78e3ad24ddb4b0";
sha256 = "0nmpkh1rr0jv68a655f5610v2mn09xriiqv049a0gklap2lgv7p8";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";

4
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
View File

@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb";
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
type = "gem";
};
version = "1.7.0";
version = "1.8.0";
};
faraday-em_http = {
groups = ["default"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-math";
rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276";
sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z";
rev = "d7d0180352dd5a7dcb76c0817bfbb08c2a0f08c7";
sha256 = "0y72impvnq965ibbfc9877hr78fxkrwav1xmgyy3r9w87952vcwa";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-math";

4
pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
rev = "8bf54370200fe9d94541f69339430a7dc1019d62";
sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh";
rev = "55cb184f7ef2954326561cc44fc8134798b8a9e0";
sha256 = "0pv5i216zn0v8xfwlndvhvr06vkmxaynj8xjfnc5amy1sp6k76w7";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved";

4
pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-spoiler-alert";
rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4";
sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp";
rev = "0b93227ea8e2c72afe72029382081ebff89c3638";
sha256 = "0x0dxb41ss15sv5ph7z7q55ayf8a7r22bgkmr17924mny5440b5a";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-spoiler-alert";

4
pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
rev = "95149df2282d62eebeb265b4895df15a2b259d03";
sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7";
rev = "cb040562f6af3163d70e8932867b530c6640ab9a";
sha256 = "07h6nq4bafs27ly2f5chkn5vb1wdy909qffwkgp5k1fanhbqvhvs";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review";

2
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
View File

@ -590,4 +590,4 @@ DEPENDENCIES
yaml-lint
BUNDLED WITH
2.2.20
2.2.24