From fa89761ad92768b5aea7cbcb274cd1861616bb0d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 27 Jan 2022 16:42:23 -0800 Subject: [PATCH 1/5] discourse: 2.8.0.beta11 -> 2.9.0.beta1 (cherry picked from commit c0ddbde02fd064ae2944a82a9110e53c4f33a78c) --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- .../plugins/discourse-assign/default.nix | 4 ++-- .../plugins/discourse-calendar/Gemfile.lock | 2 +- .../plugins/discourse-calendar/default.nix | 4 ++-- .../plugins/discourse-calendar/gemset.nix | 4 ++-- .../discourse-canned-replies/default.nix | 4 ++-- .../discourse-chat-integration/default.nix | 4 ++-- .../plugins/discourse-checklist/default.nix | 4 ++-- .../discourse-data-explorer/default.nix | 4 ++-- .../plugins/discourse-docs/default.nix | 4 ++-- .../plugins/discourse-github/default.nix | 4 ++-- .../plugins/discourse-math/default.nix | 4 ++-- .../discourse-openid-connect/default.nix | 4 ++-- .../plugins/discourse-prometheus/default.nix | 4 ++-- .../discourse-saved-searches/default.nix | 4 ++-- .../plugins/discourse-solved/default.nix | 4 ++-- .../discourse-spoiler-alert/default.nix | 4 ++-- .../plugins/discourse-voting/default.nix | 4 ++-- .../discourse-yearly-review/default.nix | 4 ++-- .../web-apps/discourse/rubyEnv/Gemfile.lock | 12 +++++------ .../web-apps/discourse/rubyEnv/gemset.nix | 20 +++++++++---------- 21 files changed, 53 insertions(+), 53 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 14de87c90235..693e638dec6e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -10,13 +10,13 @@ }@args: let - version = "2.8.0.beta11"; + version = "2.9.0.beta1"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-dTem4or0SunXCJFpNkeM0CSXY+58AeQAuMaLzhfGMY0="; + sha256 = "sha256-mf2Niyv1H+Zq7RfnV93O1Ul9RdRrtmtAJMBJrb8hp3U="; }; runtimeDeps = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 006eb0ee882d..2a1970e92dd3 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "a52da2396c5787a07c2746890bb44a0921a149e9"; - sha256 = "sha256-UzpDesqxC20teyKYwqizYvjvR47zApyLporCU71RNvk="; + rev = "ffe95da7ed0cf0893a76af37498784ad92041131"; + sha256 = "sha256-FdZATO1Z6XmhForETZ2FC+6wfR437cpRg8QSFzmbsxQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; 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 d8596a5c2fa4..727fde304953 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -7,7 +7,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) concurrent-ruby (1.1.9) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) minitest (5.15.0) rrule (0.4.2) 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 ef3309652d4b..1d3e2756bb0d 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 = "f3b64f7b8c009f18bdc16def7c7299f747ea08ab"; - sha256 = "sha256-ACbPMfqyFj9877r56qr+wxHEln+L1sAuQg/YUDGpuds="; + rev = "765d16242ffeb4324c3269393d3fa81e9b751d4f"; + sha256 = "sha256-YYxspW0DX0DUBwPOcvX2pLJYmyK4b56LdjL6avLKzRs="; }; 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 a03e644d9b4e..48598802c61c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; minitest = { groups = ["default"]; 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 7d9042f67b40..43ef518a9cec 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 = "598946bc92171426792f120f0a68ad4ecaae1c91"; - sha256 = "sha256-HLrmj/dHj6wWUEqsFAh8gIPaZCIaXN1kZo17UHJwP70="; + rev = "8762b8d0fe28ffcacc427e7a683b971bf125a881"; + sha256 = "sha256-ZAm/A45vAofiOiqXS/STt4XO3FJ6XUFyVydsFaI40+k="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 48192bd4a34c..63797d3b89cc 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "45a16e2c40f9b79a351e52b905c7816ddbd29bb3"; - sha256 = "sha256-cu9JhBB4ggsVzKlxe9x2WQVgwzwAA5U6OEKhbiRQACU="; + rev = "ddee0c44179c547b2581474c3c4d0da7d8d23fe8"; + sha256 = "sha256-8AUzIu+HRHrcAqpyI/eVrgZLTKXTLgDjXFTGQbMRzxs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; 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 5bd5d6ad3101..9c61b4bcf67c 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 = "80d448b92173398530643ee07a40d6c60e4a3a5e"; - sha256 = "sha256-FJtb7s4UQ6A4SEezB/58pmvpN+f1gVBY/G4GUzE20ME="; + rev = "c2bb6b0156e411ef3c1de52aa36b38abeba801cd"; + sha256 = "sha256-p0nOdh0zg891Pe8wYhMzcbunGYJY41iVET4fFRDJt+k="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index f30f60827fad..38336973f32a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "58cfe737f7eb3d401a059edc8d24ed0ec22fa2f7"; - sha256 = "sha256-pwzW+HCby2HD5SsnFCi8kUqN/dQuZiVkdmqQ2P2XQ2c="; + rev = "2a17f49f66feb7a3068cf6f1e4ad08550f875057"; + sha256 = "sha256-LOcJle0S7Z8oGz1XgTEHiz1JNKufxege+joeinwX7xU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 52088b0fded7..3b7d5e96f077 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "f8ac536160c662f29c49111beb5b18b70dbe8cd9"; - sha256 = "sha256-pU5Dl+G2HRKfWi+W+P4ZP6A8EMqi9xaIYXx1xUg9I54="; + rev = "05678c451caf2ceb192501da91cf0d24ea44c8e8"; + sha256 = "sha256-C+3jaJ09P1PteeHFVfbAXxDgAa6d0RZwLdlp+NKuZJU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; 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 6888018b62d3..9421267d1522 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 = "f4635f94f8c1eaf38f7b025d1fc236e404a39414"; - sha256 = "sha256-kd8iCgLuFxFbu8HR9ttzmVFF4AK0P7cbo1q15kD9Dp4="; + rev = "031dc6b512ada263eb3634eae5adfe4cdb008b4b"; + sha256 = "sha256-v69RYgA5k6A3bus+Joc/NFp2DU4bwiaoCSe2xua3DgY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; 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 b3a131bc4d86..e3e52ccfea78 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 = "33662c4b1d8a3faa6138261bd6a6043b4d9ac037"; - sha256 = "sha256-UMGj2KqYHs7MtVHBGLUgUKA7wzhX32160b4OihiwgCI="; + rev = "2deef48ab16bc0a15ab5f1fef98e15261251bf32"; + sha256 = "sha256-Crt7ozasZ1DCwAzaH/Y6BQEXwpX6t9qsIrGYMlECylk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index 88ab125a2c26..c5405367ff3b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "bba36d68a44b1e1d19729d14fd04ad280fc32c58"; - sha256 = "sha256-9CV5A3gQzYvokTLNOwoX1jQhGaZQBn4tn5jn7bfhLS4="; + rev = "ab26c4eaa858bf35cb6fa6314597a50fff57baf9"; + sha256 = "sha256-Yxw1C0vNcVr+sYvmLvBWFV/XOr7yDBTW17Ohxfkv6W0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 0695b01d9556..4c23355b301d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "d71565f7ee4d3fe5cef8c8831a20cec5e52a1367"; - sha256 = "sha256-Zn/ZzbMyHImQ9vc7KJI2gtVKYyqbWOZWK3qg7BK0xxQ="; + rev = "1c3e2d75c33a0ed8563977d7c4919e3d06788dcd"; + sha256 = "sha256-tj/IYUjuUs6foV4goIm+HACccmHjAiI1/EAOKibwUMs="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 13976649bfc2..5ba948cf1d13 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "a10f2eb7ccbf3be037144978d0aa36d8fa44115b"; - sha256 = "sha256-WIqju9JUy3bij2iHHjWv/+TfODev5icYNYS5kRruLcc="; + rev = "baf1ab94317129d2ff2eb4e5e6d84fa76c40797c"; + sha256 = "sha256-6NP9TK5Wx0LPX0ZFIiaEEYJv3d9WIQ26nvODk0dU2I0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; 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 b90c54066969..8d0c1b07d960 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 = "d7c8c95f2dbc7fa94b09d2590d70558346f6e81e"; - sha256 = "sha256-utuv7JL/WJU48TE0+RIRoUpIFrcUpQGvPzfIXA2ZCL8="; + rev = "922ca15fc92bfab496088b5ee240982bd8404f28"; + sha256 = "sha256-s7XNRLDXnrsoB7FUgGaYIVfd7iO3ittIBoqSo2UaUTY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; 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 351f41b192c6..e97f1bfd06c1 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 = "0cbbaa20f5bf097a0d4ec1361534f97e4b7e1604"; - sha256 = "sha256-FpA1+ZC5rInUkCrWMU3HU9Hmi/58f/OrfmeXd5nowvU="; + rev = "5afbcb905fa2c8cb8b7156ab5df3af27d6e6b477"; + sha256 = "sha256-/Y5ATVSnJ3hMNiiqqYJzitgkQ/2zbWLaPdII9agTa10="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index df787e3835d9..4efe8aabcdcd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "5011df324caaa89433f089bb9d9cfdf919457b11"; - sha256 = "sha256-2iPbC/nvTmJ8heqX1C8sfNnkTeO6jHn+gzEraAdJvMg="; + rev = "6a4b2a306928191c9ef9f3efdafeb9b4df496bcb"; + sha256 = "sha256-OAn+NS64BcOlhmFYXV0Bq+O1B4a9FKHyN44vbHSax3Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; 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 82a34bedf2b4..a03bf7b8cdd9 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 = "69a6c2ca39a41d88ff07ebd7c38c082082415dc9"; - sha256 = "sha256-jrpKjINnAxfkMdK89b0OyKkgivIC4L/aL5qU4XZdgnk="; + rev = "5e3674201a32bf9e6c22417395bc2e052d9f217d"; + sha256 = "sha256-gkQGLJegWTSwzpjrHPYK5/Uz4QjLUCLd6OuEIRYeP/I="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 7acfba36ad12..e9964e0340c4 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -83,7 +83,7 @@ GEM bootsnap (1.9.4) msgpack (~> 1.0) builder (3.2.4) - bullet (7.0.0) + bullet (7.0.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -132,7 +132,7 @@ GEM excon (0.89.0) execjs (2.8.1) exifr (1.3.9) - fabrication (2.23.1) + fabrication (2.24.0) faker (2.19.0) i18n (>= 1.6, < 2) fakeweb (1.3.0) @@ -202,7 +202,7 @@ GEM jwt (2.3.0) kgio (2.11.4) libv8-node (16.10.0.0) - listen (3.7.0) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) @@ -357,7 +357,7 @@ GEM rspec-mocks (~> 3.10.0) rspec-core (3.10.1) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-html-matchers (0.9.4) @@ -382,9 +382,9 @@ GEM json-schema (~> 2.2) railties (>= 3.1, < 7.0) rtlit (0.0.5) - rubocop (1.24.1) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 7ed5b54e30af..9b5fbfca4a85 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w3jk595azcc9fvklrk2klkljwhgzjhnns7l5iqhnafvr8q60xnr"; + sha256 = "0q90zk8di7a12by3d81nl78yy90rdml77vi3waxmgzqhvs6na4vj"; type = "gem"; }; - version = "7.0.0"; + version = "7.0.1"; }; byebug = { groups = ["development" "test"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i4pcqmf8q0gkjzhndcbzgg8bg4rkvbpp2gapnqxc8j8gcxzi1fi"; + sha256 = "09b6gyqf76iflxh9v69k59xhxmrx1akdp2mbg8k8nb5rxy0sz0v6"; type = "gem"; }; - version = "2.23.1"; + version = "2.24.0"; }; faker = { dependencies = ["i18n"]; @@ -1059,10 +1059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ncfhdkjiwq9l1pm87ax2pa20kz2j0dz56vi74cnr5a6cfk0qb5p"; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; type = "gem"; }; - version = "3.7.0"; + version = "3.7.1"; }; literate_randomizer = { groups = ["default" "development"]; @@ -1955,10 +1955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; + sha256 = "1qrj2j9jcd3m4aksk4kbv439882yl3z1harv2jrybrgjgdzdz7zs"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -2041,10 +2041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0"; + sha256 = "141ff5mdqi8an8q00qw8kchzil7ck2dzalkk3vk176l0s6hljcbj"; type = "gem"; }; - version = "1.24.1"; + version = "1.25.0"; }; rubocop-ast = { dependencies = ["parser"]; From a2c3f741001e8d6f861162abd8f7cdcd7bf211ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Feb 2022 17:14:00 +0000 Subject: [PATCH 2/5] signal-desktop: 5.29.1 -> 5.30.0 (cherry picked from commit 40bc60f594a747dcd1c431150a07c211f1df3611) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 5ed9c192b68a..0edc9df8618d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.29.1"; # Please backport all updates to the stable channel. + version = "5.30.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1a56mnmv0lnizmd4dl8fya3mdsy0jy5qr5bqb72m9cipq0069alc"; + sha256 = "sha256-+e3QzV4WIBOSGkpy6uk6vzIcNB5NpqQ05ZZfaoi58IU="; }; nativeBuildInputs = [ From 4c4363597af9147803244131b52caa603175bc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Sun, 6 Feb 2022 11:49:35 -0300 Subject: [PATCH 3/5] maintainer: add atila (cherry picked from commit a773c4cdcf496a38905abc0cfb866e2e9592f5d4) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7474bea5230b..9d6910aff4a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1063,6 +1063,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + atila = { + name = "Átila Saraiva"; + email = "atilasaraiva@gmail.com"; + github = "AtilaSaraiva"; + githubId = 29521461; + }; atkinschang = { email = "atkinschang+nixpkgs@gmail.com"; github = "AtkinsChang"; From f873a41b5eb111d72f11069f667c2e74a6e5c6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Sun, 6 Feb 2022 11:59:38 -0300 Subject: [PATCH 4/5] btdu: init at 0.3.1 (cherry picked from commit df600977da191d485b183d842ee4fa197e8b9c66) --- pkgs/tools/misc/btdu/default.nix | 83 ++++++++++++++++++++++++++++++++ pkgs/tools/misc/btdu/update.py | 82 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 167 insertions(+) create mode 100644 pkgs/tools/misc/btdu/default.nix create mode 100755 pkgs/tools/misc/btdu/update.py diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/tools/misc/btdu/default.nix new file mode 100644 index 000000000000..d297af0d4402 --- /dev/null +++ b/pkgs/tools/misc/btdu/default.nix @@ -0,0 +1,83 @@ +{stdenv, lib, fetchurl, dub, ncurses, ldc, zlib, removeReferencesTo }: + +let + _d_ae_ver = "0.0.3100"; + _d_btrfs_ver = "0.0.12"; + _d_ncurses_ver = "0.0.149"; + _d_emsi_containers_ver = "0.9.0"; +in +stdenv.mkDerivation rec { + pname = "btdu"; + version = "0.3.1"; + + srcs = [ + (fetchurl { + url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz"; + sha256 = "760b2f0d28920a78b7967dd34c429125135688a3aefc57ab3a92d07bc3ef10cb"; + }) + (fetchurl { + url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz"; + sha256 = "86fa09ef6c1be4cbe8ad1c85729054e5d691b41ff57c7980d99937ec0f45b950"; + }) + (fetchurl { + url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz"; + sha256 = "cf2b1fa3e94a0aa239d465adbac239514838835283521d632f571948aa517f92"; + }) + (fetchurl { + url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz"; + sha256 = "2c8497f5dd93f9d3a05ca7ed57c4fcaee1e988fd25a24de106917ddf72f34646"; + }) + (fetchurl { + url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz"; + sha256 = "5e256b84bbdbd2bd625cba0472ea27a1fde6d673d37a85fe971a20d52874acaa"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv ae-${_d_ae_ver} "ae" + ''; + + + nativeBuildInputs = [ dub ldc ]; + buildInputs = [ ncurses zlib ]; + + configurePhase = '' + runHook preConfigure + mkdir home + HOME="home" dub add-local ae ${_d_ae_ver} + HOME="home" dub add-local d-btrfs-${_d_btrfs_ver} ${_d_btrfs_ver} + HOME="home" dub add-local ncurses-${_d_ncurses_ver} ${_d_ncurses_ver} + HOME="home" dub add-local containers-${_d_emsi_containers_ver} ${_d_emsi_containers_ver} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + cd ${pname}-${version} + HOME="../home" dub --skip-registry=all build -b release + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp btdu $out/bin/ + runHook postInstall + ''; + + postInstall = '' + ${removeReferencesTo}/bin/remove-references-to -t ${ldc} $out/bin/btdu + ''; + + passthru.updateScript = ./update.py; + + meta = with lib; { + description = "Sampling disk usage profiler for btrfs"; + homepage = "https://github.com/CyberShadow/btdu"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/tools/misc/btdu/update.py b/pkgs/tools/misc/btdu/update.py new file mode 100755 index 000000000000..aa3b149d733e --- /dev/null +++ b/pkgs/tools/misc/btdu/update.py @@ -0,0 +1,82 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python39Packages.requests + +import requests +import subprocess + +pkgbuild = requests.get('https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=btdu').text + +def grabDepVersions(depDict, pkgbuild=pkgbuild): + for line in pkgbuild.split('\n'): + if depDict["string"] in line: + start = len(depDict["string"]) + 1 + depDict["version"] = line[start:] + break + +def grabDepHashes(key,pkgbuild=pkgbuild): + start = pkgbuild.find(key) + len(key) + end = start+64 + hashes = [] + for i in range(5): + hashes.append(pkgbuild[start:end]) + start = pkgbuild.find("'",end+1) + 1 + end = start+64 + return hashes + +def findLine(key,derivation): + count = 0 + lines = [] + for line in derivation: + if key in line: + lines.append(count) + count += 1 + return lines + +def updateVersions(btdu,ae,btrfs,ncurses,containers,derivation): + key = "let" + line = findLine(key,derivation)[0] + 1 + derivation[line+0] = f' _d_ae_ver = "{ae["version"]}";\n' + derivation[line+1] = f' _d_btrfs_ver = "{btrfs["version"]}";\n' + derivation[line+2] = f' _d_ncurses_ver = "{ncurses["version"]}";\n' + derivation[line+3] = f' _d_emsi_containers_ver = "{containers["version"]}";\n' + + key = "version = " + line = findLine(key,derivation)[0] + derivation[line] = f' version = "{btdu["version"]}";\n' + + return derivation + +def updateHashes(btdu,ae,btrfs,ncurses,containers,derivation): + key = "sha256 = " + hashLines = findLine(key,derivation) + for i in range(len(hashes)): + derivation[hashLines[i]] = f' sha256 = "{hashes[i]}";\n' + + return derivation + +if __name__ == "__main__": + + btdu = {"string": "pkgver"} + ae = {"string": "_d_ae_ver"} + btrfs = {"string": "_d_btrfs_ver"} + ncurses = {"string": "_d_ncurses_ver"} + containers = {"string": "_d_emsi_containers_ver"} + + grabDepVersions(btdu) + grabDepVersions(ae) + grabDepVersions(btrfs) + grabDepVersions(ncurses) + grabDepVersions(containers) + + hashes = grabDepHashes("sha256sums=('") + + nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n') + btduFolder = "/pkgs/tools/misc/btdu/" + with open(nixpkgs + btduFolder + "default.nix", 'r') as arq: + derivation = arq.readlines() + + derivation = updateVersions(btdu,ae,btrfs,ncurses,containers,derivation) + derivation = updateHashes(btdu,ae,btrfs,ncurses,containers,derivation) + + with open(nixpkgs + btduFolder + "default.nix", 'w') as arq: + arq.writelines(derivation) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ba05b676dc1..3ecd9eb1f490 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -243,6 +243,8 @@ with pkgs; cen64 = callPackage ../misc/emulators/cen64 { }; + btdu = callPackage ../tools/misc/btdu { }; + uxn = callPackage ../misc/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; From 4f80d46c5e473417c238f18f7ec7d3cbe481fbb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 17:11:32 +0100 Subject: [PATCH 5/5] icecat-bin: mark as insecure This was EOL by the time it was introduced into nixpkgs and should have never gotten merged in the first place. Browsers are complex beasts, and those that haven't seen an update in two years simply cannot be secure. --- pkgs/applications/networking/browsers/icecat-bin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix index 2427570a59d0..cdcbd1fcf5e7 100644 --- a/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -126,5 +126,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.linux; + knownVulnerabilities = [ + "Binary builds of GNU Icecat have not seen an update since 2019, while Firefox has received many security advisories." + ]; }; }