pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #139201 from talyz/discourse-2.7.8

discourse: 2.7.7 -> 2.7.8, update plugins

authored by

Kim Lindberger and committed by
GitHub 454f253a c553f344

+31 -44
unified split
+6 -7
pkgs/servers/web-apps/discourse/default.nix
··· 2 2 , fetchFromGitHub, bundlerEnv, callPackage 3 3 4 4 , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk 5 - , imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, libpsl 6 - , redis, postgresql, which, brotli, procps, rsync, nodePackages, v8 5 + , imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead 6 + , libpsl, redis, postgresql, which, brotli, procps, rsync 7 + , nodePackages, v8 7 8 8 9 , plugins ? [] 9 10 }@args: 10 11 11 12 let 12 - version = "2.7.7"; 13 + version = "2.7.8"; 13 14 14 15 src = fetchFromGitHub { 15 16 owner = "discourse"; 16 17 repo = "discourse"; 17 18 rev = "v${version}"; 18 - sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U="; 19 + sha256 = "sha256-p4eViEvzIU6W89FZRtMBXsT7bvf2H12bTPZ/h3iD8rA="; 19 20 }; 20 21 21 22 runtimeDeps = [ ··· 41 42 jpegoptim 42 43 gifsicle 43 44 nodePackages.svgo 45 + jhead 44 46 ]; 45 47 46 48 runtimeEnv = { ··· 241 243 242 244 # Add a noninteractive admin creation task 243 245 ./admin_create.patch 244 - 245 - # Disable jhead, which is currently marked as vulnerable 246 - ./disable_jhead.patch 247 246 248 247 # Add the path to the CA cert bundle to make TLS work 249 248 ./action_mailer_ca_cert.patch
-12
pkgs/servers/web-apps/discourse/disable_jhead.patch
··· 1 - diff --git a/lib/file_helper.rb b/lib/file_helper.rb 2 - index d87da5a85e..f5323292d7 100644 3 - --- a/lib/file_helper.rb 4 - +++ b/lib/file_helper.rb 5 - @@ -127,6 +127,7 @@ class FileHelper 6 - jpegrecompress: false, 7 - # Skip looking for gifsicle, svgo binaries 8 - gifsicle: false, 9 - + jhead: false, 10 - svgo: false 11 - ) 12 - end
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
··· 1 1 GEM 2 2 remote: https://rubygems.org/ 3 3 specs: 4 - activesupport (6.1.4) 4 + activesupport (6.1.4.1) 5 5 concurrent-ruby (~> 1.0, >= 1.0.2) 6 6 i18n (>= 1.6, < 2) 7 7 minitest (>= 5.1) ··· 24 24 rrule (= 0.4.2) 25 25 26 26 BUNDLED WITH 27 - 2.2.20 27 + 2.2.24
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
··· 6 6 src = fetchFromGitHub { 7 7 owner = "discourse"; 8 8 repo = "discourse-calendar"; 9 - rev = "519cf403ae3003291de20145aca243e2ffbcb4a2"; 10 - sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4"; 9 + rev = "2f76cdd3064735d484be1df77f43100aca21aea6"; 10 + sha256 = "1skpc8p5br1jkii1rksha1q95ias6xxyvi5bnli3q41w7fz1h5j2"; 11 11 }; 12 12 meta = with lib; { 13 13 homepage = "https://github.com/discourse/discourse-calendar";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
··· 5 5 platforms = []; 6 6 source = { 7 7 remotes = ["https://rubygems.org"]; 8 - sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; 8 + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; 9 9 type = "gem"; 10 10 }; 11 - version = "6.1.4"; 11 + version = "6.1.4.1"; 12 12 }; 13 13 concurrent-ruby = { 14 14 groups = ["default"];
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-canned-replies"; 8 - rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d"; 9 - sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7"; 8 + rev = "1bb77ebbe0577f257bc16783dc8b7bbf2d915092"; 9 + sha256 = "0qvx8k9jsxjllqsqpf4k0j4niv1k2sggy6ak067wigs8ha3dkcr0"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-canned-replies";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-checklist"; 8 - rev = "6e7b9c5040c55795c7fd4db9569b3e93dad092c2"; 9 - sha256 = "sha256-2KAVBrfAvhLZC9idi+ijbVqOCq9rSXbDVEOZS+mWJ10="; 8 + rev = "48855d81b7c3a3274f7f78a64312125c344d92d1"; 9 + sha256 = "0139v5wpyglfzvd07ka6gic1ssfysisgfiq09dsbjy519gnc9kjw"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-checklist";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
··· 3 3 specs: 4 4 addressable (2.8.0) 5 5 public_suffix (>= 2.0.2, < 5.0) 6 - faraday (1.7.0) 6 + faraday (1.8.0) 7 7 faraday-em_http (~> 1.0) 8 8 faraday-em_synchrony (~> 1.0) 9 9 faraday-excon (~> 1.1) ··· 40 40 sawyer (= 0.8.2) 41 41 42 42 BUNDLED WITH 43 - 2.2.20 43 + 2.2.24
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
··· 6 6 src = fetchFromGitHub { 7 7 owner = "discourse"; 8 8 repo = "discourse-github"; 9 - rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1"; 10 - sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6"; 9 + rev = "9aaf4350968fb758f9bff3588f78e3ad24ddb4b0"; 10 + sha256 = "0nmpkh1rr0jv68a655f5610v2mn09xriiqv049a0gklap2lgv7p8"; 11 11 }; 12 12 meta = with lib; { 13 13 homepage = "https://github.com/discourse/discourse-github";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
··· 16 16 platforms = []; 17 17 source = { 18 18 remotes = ["https://rubygems.org"]; 19 - sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; 19 + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; 20 20 type = "gem"; 21 21 }; 22 - version = "1.7.0"; 22 + version = "1.8.0"; 23 23 }; 24 24 faraday-em_http = { 25 25 groups = ["default"];
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-math"; 8 - rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276"; 9 - sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z"; 8 + rev = "d7d0180352dd5a7dcb76c0817bfbb08c2a0f08c7"; 9 + sha256 = "0y72impvnq965ibbfc9877hr78fxkrwav1xmgyy3r9w87952vcwa"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-math";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-solved"; 8 - rev = "8bf54370200fe9d94541f69339430a7dc1019d62"; 9 - sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh"; 8 + rev = "55cb184f7ef2954326561cc44fc8134798b8a9e0"; 9 + sha256 = "0pv5i216zn0v8xfwlndvhvr06vkmxaynj8xjfnc5amy1sp6k76w7"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-solved";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-spoiler-alert"; 8 - rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4"; 9 - sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp"; 8 + rev = "0b93227ea8e2c72afe72029382081ebff89c3638"; 9 + sha256 = "0x0dxb41ss15sv5ph7z7q55ayf8a7r22bgkmr17924mny5440b5a"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-spoiler-alert";
+2 -2
pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
··· 5 5 src = fetchFromGitHub { 6 6 owner = "discourse"; 7 7 repo = "discourse-yearly-review"; 8 - rev = "95149df2282d62eebeb265b4895df15a2b259d03"; 9 - sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7"; 8 + rev = "cb040562f6af3163d70e8932867b530c6640ab9a"; 9 + sha256 = "07h6nq4bafs27ly2f5chkn5vb1wdy909qffwkgp5k1fanhbqvhvs"; 10 10 }; 11 11 meta = with lib; { 12 12 homepage = "https://github.com/discourse/discourse-yearly-review";
+1 -1
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
··· 590 590 yaml-lint 591 591 592 592 BUNDLED WITH 593 - 2.2.20 593 + 2.2.24