From a560026ecd7901765856790721a48bd867628845 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:15 +0000 Subject: [PATCH 01/22] linux: 4.14.247 -> 4.14.248 (cherry picked from commit b0f3a99f00efe85145a5c537a2d25865e3f39a53) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8c044c2b2ec..f0e7ffccc36 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.247"; + version = "4.14.248"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7"; + sha256 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 6195899398fa683bea71ae4e07268d12809738bc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:19 +0000 Subject: [PATCH 02/22] linux: 4.19.207 -> 4.19.208 (cherry picked from commit 7fad98993cd0da2f14ea30e895f168c7eebfba40) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index cf771bbff46..dd700a9a467 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.207"; + version = "4.19.208"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym"; + sha256 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From d1df9958b64444ccc224e2d1d0219ce2b3f179b8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:23 +0000 Subject: [PATCH 03/22] linux: 4.4.284 -> 4.4.285 (cherry picked from commit bae26c4e05ddb2cf032e875c4a8d2ba06e44e4c0) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5d8f535fe4f..33afb0f9852 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.284"; + version = "4.4.285"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf"; + sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 05e033d6f12ad728716f63c01bc61877671b165e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:30 +0000 Subject: [PATCH 04/22] linux: 4.9.283 -> 4.9.284 (cherry picked from commit bb9a54d5ee3c1d28e64ff0a05cd0960a4313cf93) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 552fe143448..6128c35eb4b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.283"; + version = "4.9.284"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm"; + sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 27e5593772c63f7b5e43caddee0d1c87795d71f6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:36 +0000 Subject: [PATCH 05/22] linux: 5.10.68 -> 5.10.69 (cherry picked from commit bba95d376306c37e535e3ab5555ac2f9279afaa5) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 10984ce9638..8ecad893e58 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.68"; + version = "5.10.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv"; + sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From eaccf16f0500b2cc409d17778507e9ea58c26b98 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:44 +0000 Subject: [PATCH 06/22] linux: 5.14.7 -> 5.14.8 (cherry picked from commit 10fee833c9220242961d9f7b7d3a82c0a3a1a407) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 45d39795db6..35e03223d31 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.7"; + version = "5.14.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg"; + sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na"; }; } // (args.argsOverride or { })) From 7da735d2048b2392758c889819ead208c0bf1ef8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:51 +0000 Subject: [PATCH 07/22] linux: 5.4.148 -> 5.4.149 (cherry picked from commit fa3a7105266abd6f9302d8864dbd60283204a314) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ba3ff00df78..2158d69d20f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.148"; + version = "5.4.149"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6"; + sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 422b30ce66219145bc62f5fe70a2ac9e919d073e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:26 +0000 Subject: [PATCH 08/22] linux/hardened/patches/4.14: 4.14.246-hardened1 -> 4.14.247-hardened1 (cherry picked from commit 7b29a72e545ee913dbdb07b8379d7d7ccd08b173) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 832e516e6ef..01ab331713e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.246-hardened1.patch", - "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" + "name": "linux-hardened-4.14.247-hardened1.patch", + "sha256": "0k3ii26ry0cszxs5n4ljll61p1kdi3dn5cvzjr8zb78bfrk7lbra", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.247-hardened1/linux-hardened-4.14.247-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 8a0a9f3597f6a0f55b608e01c33f55ce9c0665b6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:27 +0000 Subject: [PATCH 09/22] linux/hardened/patches/4.19: 4.19.206-hardened1 -> 4.19.207-hardened1 (cherry picked from commit b754a3c355b21bd2d4503d0f1b5b7c98448e5496) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 01ab331713e..ce46ff5a66b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.206-hardened1.patch", - "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" + "name": "linux-hardened-4.19.207-hardened1.patch", + "sha256": "1yn6c8axvnmck1ignw4k3pi458x0m2qm7g5vjwf2rw8cnzskrs48", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.207-hardened1/linux-hardened-4.19.207-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 1febaecabb897afb5c981aef61b844f8d84a1bff Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:28 +0000 Subject: [PATCH 10/22] linux/hardened/patches/5.10: 5.10.67-hardened1 -> 5.10.68-hardened1 (cherry picked from commit 34fe5d827ca5a1cee89b5abfde73a540977f3722) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ce46ff5a66b..f09db85b47f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.67-hardened1.patch", - "sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch" + "name": "linux-hardened-5.10.68-hardened1.patch", + "sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch" }, "5.13": { "extra": "-hardened1", From 4b3fd66a5b0c0db44ec8f4625258bf09698f3df1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:29 +0000 Subject: [PATCH 11/22] linux/hardened/patches/5.14: 5.14.6-hardened1 -> 5.14.7-hardened1 (cherry picked from commit 5b71d92f9ad21a39b8ed957b1d5d54ecb5536da6) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f09db85b47f..1c7e87dc386 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.6-hardened1.patch", - "sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch" + "name": "linux-hardened-5.14.7-hardened1.patch", + "sha256": "18i0qxhzga2vg0kal5ifsks0vra6gj21q6whcjry9sglxandn2vg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.7-hardened1/linux-hardened-5.14.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 74d0889655183378822f042673ee05900141712a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:30 +0000 Subject: [PATCH 12/22] linux/hardened/patches/5.4: 5.4.147-hardened1 -> 5.4.148-hardened1 (cherry picked from commit bb21f231cf1556318346f7476a2ae4cc234c2cd6) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1c7e87dc386..36c7b557818 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.147-hardened1.patch", - "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch" + "name": "linux-hardened-5.4.148-hardened1.patch", + "sha256": "0kb2d9csm8bbjark2ii0n1jpfcr6avdr8r5g97awzbg9jxkfs0j4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.148-hardened1/linux-hardened-5.4.148-hardened1.patch" } } From cb502f9b100ea3cb4f9439f0531fc5a58ad1627c Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:46:23 +0200 Subject: [PATCH 13/22] discourse: 2.7.7 -> 2.7.8 (cherry picked from commit 73e8eb91c122699e5ede88980f7c7ef727b29896) --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 59e3d4b18e9..17f79f75054 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -9,13 +9,13 @@ }@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 = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 1f7a3641caa..f7fca7dae77 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -590,4 +590,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.2.20 + 2.2.24 From 1d1a2bbf2b0096488d93701d57e2c03f9b7410c2 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:47:43 +0200 Subject: [PATCH 14/22] discourse.plugins.discourse-calendar: Update (cherry picked from commit d62ea8705b22c8163fcbc6dcb7c70a42e7e745fe) --- .../discourse/plugins/discourse-calendar/Gemfile.lock | 4 ++-- .../web-apps/discourse/plugins/discourse-calendar/default.nix | 4 ++-- .../web-apps/discourse/plugins/discourse-calendar/gemset.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index d5622c0ac37..d31b4afe519 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -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 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index b610a5c21a1..a437f293fa6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -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"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 26db0e6fd10..4f1e4c100c0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -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"]; From 394d86a424a15f155ae3aa72cc10c93373cdf3e2 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:49:48 +0200 Subject: [PATCH 15/22] discourse.plugins.discourse-canned-replies: Update (cherry picked from commit 1e62b64b9036a3e9332b60c838f658ee35fa0a5a) --- .../discourse/plugins/discourse-canned-replies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index f90fabc0574..7ec87636d1c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -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"; From 125bceeb25d21e52a5fe13c16ffc8f83a8187b66 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:50:11 +0200 Subject: [PATCH 16/22] discourse.plugins.discourse-checklist: Update (cherry picked from commit d583001723e9ad4588c5b54c9f27c111758fe105) --- .../discourse/plugins/discourse-checklist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 89edb3f71d7..2bcf88da150 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -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"; From 9c26876e2b39758e2c7318aeb15a643de94d6400 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:51:06 +0200 Subject: [PATCH 17/22] discourse.plugins.discourse-github: Update (cherry picked from commit 97034cfa1c3b455f1114fea8d302925014dd4bd8) --- .../web-apps/discourse/plugins/discourse-github/Gemfile.lock | 4 ++-- .../web-apps/discourse/plugins/discourse-github/default.nix | 4 ++-- .../web-apps/discourse/plugins/discourse-github/gemset.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index b6ebd834a53..3404b8a22a1 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -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 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 63488de18ff..0ea57071ebe 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -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"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 90009a3beb8..5b9b4e09853 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -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"]; From cb35abb6c183dc481dfcbfc1b70db6c9c5f34c2f Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:51:29 +0200 Subject: [PATCH 18/22] discourse.plugins.discourse-math: Update (cherry picked from commit b1aa7efd36d1e8c9df8f97602038b98533f84cf9) --- .../web-apps/discourse/plugins/discourse-math/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 0e751c1dc54..812ea88d040 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -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"; From 61fab89e087d0a5cc327d9d2780ffee17f09c8ae Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:51:42 +0200 Subject: [PATCH 19/22] discourse.plugins.discourse-solved: Update (cherry picked from commit fd084acb95f3e80a80405924e44002e2e4f6dd0e) --- .../web-apps/discourse/plugins/discourse-solved/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index c92c5a1016a..b66aa1a7fab 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -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"; From df8becc53fe841743adcf079b17f1f985748af5a Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:51:57 +0200 Subject: [PATCH 20/22] discourse.plugins.discourse-spoiler-alert: Update (cherry picked from commit 957eaf8237a44f6849716739d35057b7ceaba84c) --- .../discourse/plugins/discourse-spoiler-alert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index da47dbf182c..5b745cbd603 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -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"; From e93c033a3bff59e6bb2b7c794009a91eccf9d50a Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 18:52:15 +0200 Subject: [PATCH 21/22] discourse.plugins.discourse-yearly-review: Update (cherry picked from commit e4ed6b5929d56328e79ad8792568790f6c077251) --- .../discourse/plugins/discourse-yearly-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index b20e16118c7..ea48d9997bb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -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"; From ec588badc473f33a442913d68b0d2c5387bcf6b5 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 23 Sep 2021 20:52:28 +0200 Subject: [PATCH 22/22] discourse: Enable jhead, which is no longer marked vulnerable (cherry picked from commit ed8c4e01d985d115f8821106318afc65fc7eaf5f) --- pkgs/servers/web-apps/discourse/default.nix | 9 ++++----- pkgs/servers/web-apps/discourse/disable_jhead.patch | 12 ------------ 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 pkgs/servers/web-apps/discourse/disable_jhead.patch diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 17f79f75054..07bab2c9aa2 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -2,8 +2,9 @@ , 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: @@ -41,6 +42,7 @@ let jpegoptim gifsicle nodePackages.svgo + jhead ]; runtimeEnv = { @@ -241,9 +243,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 diff --git a/pkgs/servers/web-apps/discourse/disable_jhead.patch b/pkgs/servers/web-apps/discourse/disable_jhead.patch deleted file mode 100644 index a7ee56ff185..00000000000 --- a/pkgs/servers/web-apps/discourse/disable_jhead.patch +++ /dev/null @@ -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