git.iko.soy/typeable/nixpkgs
on master help sign in
discourse: 2.8.0.beta10 -> 2.8.0.beta11

https://meta.discourse.org/t/2-8-0-beta11-user-will-not-be-mentioned-warning-updated-emoji-and-more/214752 Small fix to a patch but otherwise I just ran the update scripts.

commit3d2cb0d6a2871f3a2b6f21a0766b58eedd6d1f34 authorRyan Mulligan <ryan@ryantm.com> dateThu 13 Jan 2022, 15:08 (5 years ago) parent55da8d7
25 files changed+160−110
pkgs/servers/web-apps/discourse/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock+1−1 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock+8−4 pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix+24−3 pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix+2−2 pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix+2−2 pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock+28−24 pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix+58−37 pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch+3−3
pkgs/servers/web-apps/discourse/default.nix+2−2
@@ -10,13 +10,13 @@
1010}@args:
1111
1212let
13− version = "2.8.0.beta10";
13+ version = "2.8.0.beta11";
1414
1515 src = fetchFromGitHub {
1616 owner = "discourse";
1717 repo = "discourse";
1818 rev = "v${version}";
19− sha256 = "sha256-mlTOsHR8p0mTdhZHBESyDAa1XtMJ4uIht0VUcGD6Ses=";
19+ sha256 = "sha256-dTem4or0SunXCJFpNkeM0CSXY+58AeQAuMaLzhfGMY0=";
2020 };
2121
2222 runtimeDeps = [
pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-assign";
8− rev = "920503f5fc2cbec1b3ba4d431cffda2281e12509";
9− sha256 = "sha256-qMUlJwETu99Qmbh4sn/1Vn7Xgaj3Jhi+/E8ecIbnVH8=";
8+ rev = "a52da2396c5787a07c2746890bb44a0921a149e9";
9+ sha256 = "sha256-UzpDesqxC20teyKYwqizYvjvR47zApyLporCU71RNvk=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-docs";
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock+1−1
@@ -1,7 +1,7 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− activesupport (7.0.0)
4+ activesupport (7.0.1)
55 concurrent-ruby (~> 1.0, >= 1.0.2)
66 i18n (>= 1.6, < 2)
77 minitest (>= 5.1)
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix+2−2
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
66 src = fetchFromGitHub {
77 owner = "discourse";
88 repo = "discourse-calendar";
9− rev = "9c5516ff039225be04b1302c5c67837ce64fba9c";
10− sha256 = "sha256-tfQWhkQvHrIUl0+tIv8X65MvoUhUnKD7KHwQbBm3p7U=";
9+ rev = "f3b64f7b8c009f18bdc16def7c7299f747ea08ab";
10+ sha256 = "sha256-ACbPMfqyFj9877r56qr+wxHEln+L1sAuQg/YUDGpuds=";
1111 };
1212 meta = with lib; {
1313 homepage = "https://github.com/discourse/discourse-calendar";
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix+2−2
@@ -5,10 +5,10 @@
55 platforms = [];
66 source = {
77 remotes = ["https://rubygems.org"];
8− sha256 = "04bsr3420wb8y5pagg3s0rkx44fix47wrjvfby2d205l9bq6azyk";
8+ sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6";
99 type = "gem";
1010 };
11− version = "7.0.0";
11+ version = "7.0.1";
1212 };
1313 concurrent-ruby = {
1414 groups = ["default"];
pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-canned-replies";
8− rev = "dbbb8740287e44b5e9f0d8c968e3d237154e1f3c";
9− sha256 = "sha256-o4yZaXiQpt7Bb29kVKJOiIdNgcSEOnSiFAIhZtiX6ys=";
8+ rev = "598946bc92171426792f120f0a68ad4ecaae1c91";
9+ sha256 = "sha256-HLrmj/dHj6wWUEqsFAh8gIPaZCIaXN1kZo17UHJwP70=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-canned-replies";
pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-chat-integration";
8− rev = "46b2c05cbd00dbc49bff87d78f8e1ec4fdd43735";
9− sha256 = "sha256-G17obAc03FR3Qzn/IR++Y5Z1TkpP6lY5UDJsm4Lmj0M=";
8+ rev = "45a16e2c40f9b79a351e52b905c7816ddbd29bb3";
9+ sha256 = "sha256-cu9JhBB4ggsVzKlxe9x2WQVgwzwAA5U6OEKhbiRQACU=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-chat-integration";
pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-checklist";
8− rev = "b4e14bdac40131bd70a698015b35a111a18c9f88";
9− sha256 = "sha256-okxcLu6gXvEY37ylnhit5B+LwCdV5gMKBpC/m/PaGtc=";
8+ rev = "80d448b92173398530643ee07a40d6c60e4a3a5e";
9+ sha256 = "sha256-FJtb7s4UQ6A4SEezB/58pmvpN+f1gVBY/G4GUzE20ME=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-checklist";
pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-data-explorer";
8− rev = "f77f5999069dbe98c49302566c82e5f77bb72db2";
9− sha256 = "sha256-N9LmFnza1pA3JRBE9bT9b/NhdYMKoF5GOUpq9XYdokY=";
8+ rev = "58cfe737f7eb3d401a059edc8d24ed0ec22fa2f7";
9+ sha256 = "sha256-pwzW+HCby2HD5SsnFCi8kUqN/dQuZiVkdmqQ2P2XQ2c=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-data-explorer";
pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-docs";
8− rev = "e56816eb502b5ea37606f65a8df188e233f77240";
9− sha256 = "sha256-qvuoFsVXKa2IZgjVeqCca7X9jfohEBaoieZRsSFJCto=";
8+ rev = "f8ac536160c662f29c49111beb5b18b70dbe8cd9";
9+ sha256 = "sha256-pU5Dl+G2HRKfWi+W+P4ZP6A8EMqi9xaIYXx1xUg9I54=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-docs";
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock+8−4
@@ -3,25 +3,29 @@ GEM
33 specs:
44 addressable (2.8.0)
55 public_suffix (>= 2.0.2, < 5.0)
6− faraday (1.8.0)
6+ faraday (1.9.3)
77 faraday-em_http (~> 1.0)
88 faraday-em_synchrony (~> 1.0)
99 faraday-excon (~> 1.1)
10− faraday-httpclient (~> 1.0.1)
10+ faraday-httpclient (~> 1.0)
11+ faraday-multipart (~> 1.0)
1112 faraday-net_http (~> 1.0)
12− faraday-net_http_persistent (~> 1.1)
13+ faraday-net_http_persistent (~> 1.0)
1314 faraday-patron (~> 1.0)
1415 faraday-rack (~> 1.0)
15− multipart-post (>= 1.2, < 3)
16+ faraday-retry (~> 1.0)
1617 ruby2_keywords (>= 0.0.4)
1718 faraday-em_http (1.0.0)
1819 faraday-em_synchrony (1.0.0)
1920 faraday-excon (1.1.0)
2021 faraday-httpclient (1.0.1)
22+ faraday-multipart (1.0.3)
23+ multipart-post (>= 1.2, < 3)
2124 faraday-net_http (1.0.1)
2225 faraday-net_http_persistent (1.2.0)
2326 faraday-patron (1.0.0)
2427 faraday-rack (1.0.0)
28+ faraday-retry (1.0.3)
2529 multipart-post (2.1.1)
2630 octokit (4.21.0)
2731 faraday (>= 0.9)
pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix+2−2
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
66 src = fetchFromGitHub {
77 owner = "discourse";
88 repo = "discourse-github";
9− rev = "9fae5e365c1330bc25265e3bb2a06d29adb38266";
10− sha256 = "sha256-0HUrhO78XbTr6ygNFT+Uh70n2z9dFpimawh4u8fpNjg=";
9+ rev = "f4635f94f8c1eaf38f7b025d1fc236e404a39414";
10+ sha256 = "sha256-kd8iCgLuFxFbu8HR9ttzmVFF4AK0P7cbo1q15kD9Dp4=";
1111 };
1212 meta = with lib; {
1313 homepage = "https://github.com/discourse/discourse-github";
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix+24−3
@@ -11,15 +11,15 @@
1111 version = "2.8.0";
1212 };
1313 faraday = {
14− dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
14+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
1515 groups = ["default"];
1616 platforms = [];
1717 source = {
1818 remotes = ["https://rubygems.org"];
19− sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
19+ sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
2020 type = "gem";
2121 };
22− version = "1.8.0";
22+ version = "1.9.3";
2323 };
2424 faraday-em_http = {
2525 groups = ["default"];
@@ -61,6 +61,17 @@
6161 };
6262 version = "1.0.1";
6363 };
64+ faraday-multipart = {
65+ dependencies = ["multipart-post"];
66+ groups = ["default"];
67+ platforms = [];
68+ source = {
69+ remotes = ["https://rubygems.org"];
70+ sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
71+ type = "gem";
72+ };
73+ version = "1.0.3";
74+ };
6475 faraday-net_http = {
6576 groups = ["default"];
6677 platforms = [];
@@ -101,6 +112,16 @@
101112 };
102113 version = "1.0.0";
103114 };
115+ faraday-retry = {
116+ groups = ["default"];
117+ platforms = [];
118+ source = {
119+ remotes = ["https://rubygems.org"];
120+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
121+ type = "gem";
122+ };
123+ version = "1.0.3";
124+ };
104125 multipart-post = {
105126 groups = ["default"];
106127 platforms = [];
pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix+2−2
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
66 src = fetchFromGitHub {
77 owner = "jonmbake";
88 repo = "discourse-ldap-auth";
9− rev = "1c10221836393c3cfac470a7b08de6f31150c802";
10− sha256 = "sha256-IiAl3OTADXSUnL+OKKHJY9Xqd4zCNJ2wOrgTN3nm5Yw=";
9+ rev = "fe014176bd635e7df24ee2978d356e1f87d8daed";
10+ sha256 = "sha256-1Cx+65rJx292sTfPUfbzSfJAU71V1pKWvWdLNCq8M8A=";
1111 };
1212 meta = with lib; {
1313 homepage = "https://github.com/jonmbake/discourse-ldap-auth";
pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-math";
8− rev = "3de98fc75b7d06d06651edc48449b1bb71d2171b";
9− sha256 = "sha256-HDhy6uvfmBxJq9UobLhAUdFcYULFvPZbb5vT1Sg7ung=";
8+ rev = "33662c4b1d8a3faa6138261bd6a6043b4d9ac037";
9+ sha256 = "sha256-UMGj2KqYHs7MtVHBGLUgUKA7wzhX32160b4OihiwgCI=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-math";
pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix+2−2
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
66 src = fetchFromGitHub {
77 owner = "discourse";
88 repo = "discourse-openid-connect";
9− rev = "aa6a628687edc041bd6f46eb2a38e9a71644bdda";
10− sha256 = "sha256-VdaeueESr7X4gB1pW9e//nDLz62GTaZEPyFIvvCfg18=";
9+ rev = "bba36d68a44b1e1d19729d14fd04ad280fc32c58";
10+ sha256 = "sha256-9CV5A3gQzYvokTLNOwoX1jQhGaZQBn4tn5jn7bfhLS4=";
1111 };
1212 meta = with lib; {
1313 homepage = "https://github.com/discourse/discourse-openid-connect";
pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix+2−2
@@ -6,8 +6,8 @@
66 src = fetchFromGitHub {
77 owner = "discourse";
88 repo = "discourse-prometheus";
9− rev = "aaaf3eda30e5fc03c880c056c1f2388739569fb0";
10− sha256 = "sha256-8bfjPCcwDjEC7Tu0Jr9VZRpaDlP2nlIOWBH8pUQakxo=";
9+ rev = "d71565f7ee4d3fe5cef8c8831a20cec5e52a1367";
10+ sha256 = "sha256-Zn/ZzbMyHImQ9vc7KJI2gtVKYyqbWOZWK3qg7BK0xxQ=";
1111 };
1212
1313 patches = [
pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-saved-searches";
8− rev = "0c14b9080306c2e35abf32f8211076286fdfbd2f";
9− sha256 = "sha256-ahNw2WL5J4qAyUBgpYWTiS4G+QmQa+gloG2Vu67qXR8=";
8+ rev = "a10f2eb7ccbf3be037144978d0aa36d8fa44115b";
9+ sha256 = "sha256-WIqju9JUy3bij2iHHjWv/+TfODev5icYNYS5kRruLcc=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-saved-searches";
pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-solved";
8− rev = "6f50e2633545e160c01188bdfa9e57adf1d18adc";
9− sha256 = "sha256-+L4GzJrt15vYY29iYxVpPZFYhLygZJK4I5fqvhdI/HI=";
8+ rev = "d7c8c95f2dbc7fa94b09d2590d70558346f6e81e";
9+ sha256 = "sha256-utuv7JL/WJU48TE0+RIRoUpIFrcUpQGvPzfIXA2ZCL8=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-solved";
pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-spoiler-alert";
8− rev = "f9545afaa557829f8f0c17a856e028a5be7407cf";
9− sha256 = "sha256-VhA7tK+uE2r6E66yn5FbT+Mdp9Ckj92xCF3Q9Wp60T8=";
8+ rev = "0cbbaa20f5bf097a0d4ec1361534f97e4b7e1604";
9+ sha256 = "sha256-FpA1+ZC5rInUkCrWMU3HU9Hmi/58f/OrfmeXd5nowvU=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-spoiler-alert";
pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-voting";
8− rev = "c2d8b9456834796e90f2e13e7d11a08f389531e1";
9− sha256 = "sha256-z6JBsuq4nj1eqfU/xoU4xWcVNphuyr3C3iKO0chcSz4=";
8+ rev = "5011df324caaa89433f089bb9d9cfdf919457b11";
9+ sha256 = "sha256-2iPbC/nvTmJ8heqX1C8sfNnkTeO6jHn+gzEraAdJvMg=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-voting";
pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix+2−2
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
55 src = fetchFromGitHub {
66 owner = "discourse";
77 repo = "discourse-yearly-review";
8− rev = "e42f48a576b753cb1e042e9693af35214333bb0f";
9− sha256 = "sha256-8+pwiQE0Ytva0t80bRDs+7mTZ82fPpmwb7Nk9boPFt8=";
8+ rev = "69a6c2ca39a41d88ff07ebd7c38c082082415dc9";
9+ sha256 = "sha256-jrpKjINnAxfkMdK89b0OyKkgivIC4L/aL5qU4XZdgnk=";
1010 };
1111 meta = with lib; {
1212 homepage = "https://github.com/discourse/discourse-yearly-review";
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock+28−24
@@ -80,7 +80,7 @@ GEM
8080 rack (>= 0.9.0)
8181 binding_of_caller (1.0.0)
8282 debug_inspector (>= 0.0.1)
83− bootsnap (1.9.3)
83+ bootsnap (1.9.4)
8484 msgpack (~> 1.0)
8585 builder (3.2.4)
8686 bullet (7.0.0)
@@ -104,7 +104,7 @@ GEM
104104 css_parser (1.11.0)
105105 addressable
106106 debug_inspector (1.1.0)
107− diff-lcs (1.4.4)
107+ diff-lcs (1.5.0)
108108 diffy (3.4.0)
109109 discourse-ember-rails (0.18.6)
110110 active_model_serializers
@@ -119,8 +119,8 @@ GEM
119119 faker (~> 2.16)
120120 literate_randomizer
121121 docile (1.4.0)
122− ecma-re-validator (0.3.0)
123− regexp_parser (~> 2.0)
122+ ecma-re-validator (0.4.0)
123+ regexp_parser (~> 2.2)
124124 email_reply_trimmer (0.1.13)
125125 ember-data-source (3.0.2)
126126 ember-source (>= 2, < 3.0)
@@ -136,29 +136,33 @@ GEM
136136 faker (2.19.0)
137137 i18n (>= 1.6, < 2)
138138 fakeweb (1.3.0)
139− faraday (1.8.0)
139+ faraday (1.9.3)
140140 faraday-em_http (~> 1.0)
141141 faraday-em_synchrony (~> 1.0)
142142 faraday-excon (~> 1.1)
143− faraday-httpclient (~> 1.0.1)
143+ faraday-httpclient (~> 1.0)
144+ faraday-multipart (~> 1.0)
144145 faraday-net_http (~> 1.0)
145− faraday-net_http_persistent (~> 1.1)
146+ faraday-net_http_persistent (~> 1.0)
146147 faraday-patron (~> 1.0)
147148 faraday-rack (~> 1.0)
148− multipart-post (>= 1.2, < 3)
149+ faraday-retry (~> 1.0)
149150 ruby2_keywords (>= 0.0.4)
150151 faraday-em_http (1.0.0)
151152 faraday-em_synchrony (1.0.0)
152153 faraday-excon (1.1.0)
153154 faraday-httpclient (1.0.1)
155+ faraday-multipart (1.0.3)
156+ multipart-post (>= 1.2, < 3)
154157 faraday-net_http (1.0.1)
155158 faraday-net_http_persistent (1.2.0)
156159 faraday-patron (1.0.0)
157160 faraday-rack (1.0.0)
161+ faraday-retry (1.0.3)
158162 fast_blank (1.0.1)
159163 fast_xs (0.8.0)
160164 fastimage (2.2.6)
161− ffi (1.15.4)
165+ ffi (1.15.5)
162166 fspath (3.1.2)
163167 gc_tracer (1.5.1)
164168 globalid (1.0.0)
@@ -166,7 +170,7 @@ GEM
166170 guess_html_encoding (0.0.11)
167171 hana (1.3.7)
168172 hashdiff (1.0.1)
169− hashie (4.1.0)
173+ hashie (5.0.0)
170174 highline (2.0.3)
171175 hkdf (0.3.0)
172176 htmlentities (4.3.4)
@@ -182,7 +186,7 @@ GEM
182186 image_size (3.0.1)
183187 in_threads (1.5.4)
184188 ipaddr (1.2.3)
185− jmespath (1.4.0)
189+ jmespath (1.5.0)
186190 jquery-rails (4.4.0)
187191 rails-dom-testing (>= 1, < 3)
188192 railties (>= 4.2.0)
@@ -218,12 +222,12 @@ GEM
218222 lz4-ruby (0.3.3)
219223 maxminddb (0.1.22)
220224 memory_profiler (1.0.0)
221− message_bus (3.3.8)
225+ message_bus (4.0.0)
222226 rack (>= 1.1.3)
223227 method_source (1.0.0)
224228 mini_mime (1.1.2)
225229 mini_portile2 (2.6.1)
226− mini_racer (0.5.0)
230+ mini_racer (0.6.1)
227231 libv8-node (~> 16.10.0.0)
228232 mini_scheduler (0.13.0)
229233 sidekiq (>= 4.2.3)
@@ -281,7 +285,7 @@ GEM
281285 parallel (1.21.0)
282286 parallel_tests (3.7.3)
283287 parallel
284− parser (3.0.3.2)
288+ parser (3.1.0.0)
285289 ast (~> 2.4.1)
286290 pg (1.2.3)
287291 progress (3.6.0)
@@ -323,7 +327,7 @@ GEM
323327 method_source
324328 rake (>= 0.13)
325329 thor (~> 1.0)
326− rainbow (3.0.0)
330+ rainbow (3.1.1)
327331 raindrops (0.20.0)
328332 rake (13.0.6)
329333 rb-fsevent (0.11.0)
@@ -378,21 +382,21 @@ GEM
378382 json-schema (~> 2.2)
379383 railties (>= 3.1, < 7.0)
380384 rtlit (0.0.5)
381− rubocop (1.23.0)
385+ rubocop (1.24.1)
382386 parallel (~> 1.10)
383387 parser (>= 3.0.0.0)
384388 rainbow (>= 2.2.2, < 4.0)
385389 regexp_parser (>= 1.8, < 3.0)
386390 rexml
387− rubocop-ast (>= 1.12.0, < 2.0)
391+ rubocop-ast (>= 1.15.1, < 2.0)
388392 ruby-progressbar (~> 1.7)
389393 unicode-display_width (>= 1.4.0, < 3.0)
390− rubocop-ast (1.15.0)
394+ rubocop-ast (1.15.1)
391395 parser (>= 3.0.1.1)
392396 rubocop-discourse (2.5.0)
393397 rubocop (>= 1.1.0)
394398 rubocop-rspec (>= 2.0.0)
395− rubocop-rspec (2.6.0)
399+ rubocop-rspec (2.7.0)
396400 rubocop (~> 1.19)
397401 ruby-prof (1.4.3)
398402 ruby-progressbar (1.11.0)
@@ -416,7 +420,7 @@ GEM
416420 seed-fu (2.3.9)
417421 activerecord (>= 3.1)
418422 activesupport (>= 3.1)
419− shoulda-matchers (5.0.0)
423+ shoulda-matchers (5.1.0)
420424 activesupport (>= 5.2.0)
421425 sidekiq (6.3.1)
422426 connection_pool (>= 2.2.2)
@@ -438,7 +442,7 @@ GEM
438442 sshkey (2.0.0)
439443 stackprof (0.2.17)
440444 test-prof (1.0.7)
441− thor (1.1.0)
445+ thor (1.2.1)
442446 tilt (2.0.10)
443447 tzinfo (2.0.4)
444448 concurrent-ruby (~> 1.0)
@@ -448,7 +452,7 @@ GEM
448452 unf_ext
449453 unf_ext (0.0.8)
450454 unicode-display_width (2.1.0)
451− unicorn (6.0.0)
455+ unicorn (6.1.0)
452456 kgio (~> 2.6)
453457 raindrops (~> 0.7)
454458 uniform_notifier (1.14.2)
@@ -462,7 +466,7 @@ GEM
462466 jwt (~> 2.0)
463467 xorcist (1.1.2)
464468 yaml-lint (0.0.10)
465− zeitwerk (2.5.1)
469+ zeitwerk (2.5.3)
466470
467471PLATFORMS
468472 ruby
@@ -597,4 +601,4 @@ DEPENDENCIES
597601 yaml-lint
598602
599603BUNDLED WITH
600− 2.2.26
604+ 2.3.4
pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix+58−37
@@ -252,10 +252,10 @@
252252 }];
253253 source = {
254254 remotes = ["https://rubygems.org"];
255− sha256 = "18prmylz53gsw651f0sibb2mvdxgd2zzdzh6a9a1idpqhyxcnbg7";
255+ sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n";
256256 type = "gem";
257257 };
258− version = "1.9.3";
258+ version = "1.9.4";
259259 };
260260 builder = {
261261 groups = ["default" "development" "test"];
@@ -434,10 +434,10 @@
434434 platforms = [];
435435 source = {
436436 remotes = ["https://rubygems.org"];
437− sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
437+ sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
438438 type = "gem";
439439 };
440− version = "1.4.4";
440+ version = "1.5.0";
441441 };
442442 diffy = {
443443 groups = ["default"];
@@ -507,10 +507,10 @@
507507 platforms = [];
508508 source = {
509509 remotes = ["https://rubygems.org"];
510− sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6";
510+ sha256 = "1kqci9ixr1jfp2aaq5lsyz5lkn37z2k94ww9d2hyrd8ncrhrhx8f";
511511 type = "gem";
512512 };
513− version = "0.3.0";
513+ version = "0.4.0";
514514 };
515515 email_reply_trimmer = {
516516 groups = ["default"];
@@ -630,15 +630,15 @@
630630 version = "1.3.0";
631631 };
632632 faraday = {
633− dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
633+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
634634 groups = ["default"];
635635 platforms = [];
636636 source = {
637637 remotes = ["https://rubygems.org"];
638− sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
638+ sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
639639 type = "gem";
640640 };
641− version = "1.8.0";
641+ version = "1.9.3";
642642 };
643643 faraday-em_http = {
644644 groups = ["default"];
@@ -680,6 +680,17 @@
680680 };
681681 version = "1.0.1";
682682 };
683+ faraday-multipart = {
684+ dependencies = ["multipart-post"];
685+ groups = ["default"];
686+ platforms = [];
687+ source = {
688+ remotes = ["https://rubygems.org"];
689+ sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
690+ type = "gem";
691+ };
692+ version = "1.0.3";
693+ };
683694 faraday-net_http = {
684695 groups = ["default"];
685696 platforms = [];
@@ -720,6 +731,16 @@
720731 };
721732 version = "1.0.0";
722733 };
734+ faraday-retry = {
735+ groups = ["default"];
736+ platforms = [];
737+ source = {
738+ remotes = ["https://rubygems.org"];
739+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
740+ type = "gem";
741+ };
742+ version = "1.0.3";
743+ };
723744 fast_blank = {
724745 groups = ["default"];
725746 platforms = [{
@@ -771,10 +792,10 @@
771792 }];
772793 source = {
773794 remotes = ["https://rubygems.org"];
774− sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
795+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
775796 type = "gem";
776797 };
777− version = "1.15.4";
798+ version = "1.15.5";
778799 };
779800 fspath = {
780801 groups = ["default"];
@@ -846,10 +867,10 @@
846867 platforms = [];
847868 source = {
848869 remotes = ["https://rubygems.org"];
849− sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q";
870+ sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x";
850871 type = "gem";
851872 };
852− version = "4.1.0";
873+ version = "5.0.0";
853874 };
854875 highline = {
855876 groups = ["default"];
@@ -948,10 +969,10 @@
948969 platforms = [];
949970 source = {
950971 remotes = ["https://rubygems.org"];
951− sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
972+ sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
952973 type = "gem";
953974 };
954− version = "1.4.0";
975+ version = "1.5.0";
955976 };
956977 jquery-rails = {
957978 dependencies = ["rails-dom-testing" "railties" "thor"];
@@ -1175,10 +1196,10 @@
11751196 platforms = [];
11761197 source = {
11771198 remotes = ["https://rubygems.org"];
1178− sha256 = "0xf3r47qpigg661krwa8z7k4f0z0rx9r5g2mgahrrwgjn67d332l";
1199+ sha256 = "0589k3ggj6s970mr2jaz8zfcnl5b926birwi6s3b6j3ijf2nh3s3";
11791200 type = "gem";
11801201 };
1181− version = "3.3.8";
1202+ version = "4.0.0";
11821203 };
11831204 method_source = {
11841205 groups = ["default" "development" "test"];
@@ -1216,10 +1237,10 @@
12161237 platforms = [];
12171238 source = {
12181239 remotes = ["https://rubygems.org"];
1219− sha256 = "1b6lahs31m3ky4maq8s83w35lkariq0g1f6bjhnaxvwzjhhar5cf";
1240+ sha256 = "1j45mg8fs7i0g6ndbzd9qqs3fhq6wpvlp5s95k6mjn1as71l5l55";
12201241 type = "gem";
12211242 };
1222− version = "0.5.0";
1243+ version = "0.6.1";
12231244 };
12241245 mini_scheduler = {
12251246 dependencies = ["sidekiq"];
@@ -1530,10 +1551,10 @@
15301551 platforms = [];
15311552 source = {
15321553 remotes = ["https://rubygems.org"];
1533− sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
1554+ sha256 = "08q20ckhn58m49lccf93p0yv7pkc7hymmcz3di762kb658d5fd38";
15341555 type = "gem";
15351556 };
1536− version = "3.0.3.2";
1557+ version = "3.1.0.0";
15371558 };
15381559 pg = {
15391560 groups = ["default"];
@@ -1736,10 +1757,10 @@
17361757 platforms = [];
17371758 source = {
17381759 remotes = ["https://rubygems.org"];
1739− sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
1760+ sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
17401761 type = "gem";
17411762 };
1742− version = "3.0.0";
1763+ version = "3.1.1";
17431764 };
17441765 raindrops = {
17451766 groups = ["default"];
@@ -2020,10 +2041,10 @@
20202041 platforms = [];
20212042 source = {
20222043 remotes = ["https://rubygems.org"];
2023− sha256 = "03ivbqd5blsb7v5mhrzxvn23779rqpyrsm7l086pb6ihp47122qb";
2044+ sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0";
20242045 type = "gem";
20252046 };
2026− version = "1.23.0";
2047+ version = "1.24.1";
20272048 };
20282049 rubocop-ast = {
20292050 dependencies = ["parser"];
@@ -2031,10 +2052,10 @@
20312052 platforms = [];
20322053 source = {
20332054 remotes = ["https://rubygems.org"];
2034− sha256 = "0bj8ppl4143f7pkcwm4l5wcahid6yzracdlzh1w2fpss89pic2rf";
2055+ sha256 = "1xrij42166a71ixfpfr1pildqdrcmc0cb4906h2s8sk4kqdyngih";
20352056 type = "gem";
20362057 };
2037− version = "1.15.0";
2058+ version = "1.15.1";
20382059 };
20392060 rubocop-discourse = {
20402061 dependencies = ["rubocop" "rubocop-rspec"];
@@ -2053,10 +2074,10 @@
20532074 platforms = [];
20542075 source = {
20552076 remotes = ["https://rubygems.org"];
2056− sha256 = "0g7kwmb1ilmc8pfyvfh87yjp26qzij2ib7h3lqcl42cp33cg2zzk";
2077+ sha256 = "1d76haw5gjpxlfanfzicn7sb5gziyizaksm7i999p7p5dmy5vf9q";
20572078 type = "gem";
20582079 };
2059− version = "2.6.0";
2080+ version = "2.7.0";
20602081 };
20612082 ruby-prof = {
20622083 groups = ["development"];
@@ -2163,10 +2184,10 @@
21632184 platforms = [];
21642185 source = {
21652186 remotes = ["https://rubygems.org"];
2166− sha256 = "0z6v2acldnvqrnvfk70f9xq39ppw5j03kbz2hpz7s17lgnn21vx8";
2187+ sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0";
21672188 type = "gem";
21682189 };
2169− version = "5.0.0";
2190+ version = "5.1.0";
21702191 };
21712192 sidekiq = {
21722193 dependencies = ["connection_pool" "rack" "redis"];
@@ -2271,10 +2292,10 @@
22712292 platforms = [];
22722293 source = {
22732294 remotes = ["https://rubygems.org"];
2274− sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
2295+ sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
22752296 type = "gem";
22762297 };
2277− version = "1.1.0";
2298+ version = "1.2.1";
22782299 };
22792300 tilt = {
22802301 groups = ["default"];
@@ -2351,10 +2372,10 @@
23512372 }];
23522373 source = {
23532374 remotes = ["https://rubygems.org"];
2354− sha256 = "1jcm85d7j7njfgims712svlgml32zjim6qwabm99645aj5laayln";
2375+ sha256 = "1h0gma14jjxiz6piyi6p99q7lya2mxrq79l03160hascvmx9ipa5";
23552376 type = "gem";
23562377 };
2357− version = "6.0.0";
2378+ version = "6.1.0";
23582379 };
23592380 uniform_notifier = {
23602381 groups = ["default" "development"];
@@ -2423,9 +2444,9 @@
24232444 platforms = [];
24242445 source = {
24252446 remotes = ["https://rubygems.org"];
2426− sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
2447+ sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
24272448 type = "gem";
24282449 };
2429− version = "2.5.1";
2450+ version = "2.5.3";
24302451 };
24312452}
pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch+3−3
@@ -1,11 +1,11 @@
11diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
2−index ffcafcb618..31ba691983 100644
2+index e69979adfe..68cb04a036 100644
33--- a/config/unicorn.conf.rb
44+++ b/config/unicorn.conf.rb
5−@@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
5+@@ -27,17 +27,9 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
66
77 if ENV["RAILS_ENV"] != "production"
8− logger Logger.new($stdout)
8+ logger Logger.new(STDOUT)
99- # we want a longer timeout in dev cause first request can be really slow
1010- timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
1111-else