diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/web-apps/discourse')
33 files changed, 432 insertions, 439 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index dbd515de5659..58eabadfb6e2 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -37,8 +37,7 @@ , yarn , fixup_yarn_lock , nodePackages -, nodejs_16 -, dart-sass-embedded +, nodejs_18 , jq , moreutils , terser @@ -47,13 +46,13 @@ }@args: let - version = "3.1.0.beta4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE="; + sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY="; }; ruby = ruby_3_2; @@ -163,9 +162,9 @@ let cd ../.. mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ - ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a + ln -s "${nodejs_18.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a - ln -s ${nodejs_16.libv8}/include vendor/v8/include + ln -s ${nodejs_18.libv8}/include vendor/v8/include mkdir -p ext/libv8-node echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml @@ -190,20 +189,6 @@ let cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so ''; }; - sass-embedded = gems.sass-embedded // { - dontBuild = false; - # `sass-embedded` depends on `dart-sass-embedded` and tries to - # fetch that as `.tar.gz` from GitHub releases. That `.tar.gz` - # can also be specified via `SASS_EMBEDDED`. But instead of - # compressing our `dart-sass-embedded` just to decompress it - # again, we simply patch the Rakefile to symlink that path. - patches = [ - ./rubyEnv/sass-embedded-static.patch - ]; - postPatch = '' - export SASS_EMBEDDED=${dart-sass-embedded}/bin - ''; - }; }; groups = [ @@ -217,7 +202,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk"; + sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj"; }; nativeBuildInputs = runtimeDeps ++ [ @@ -227,7 +212,7 @@ let terser nodePackages.patch-package yarn - nodejs_16 + nodejs_18 jq moreutils ]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 9e859795298e..68cd69dcc3a6 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80"; - sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY="; + rev = "0cbf10b8055370445bd36536e51986bf48bdc57e"; + sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index 4e5ea7be8e65..266c43e4f8e2 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "f9ebbf016c8c5c763473ff36cc30fdcdf8fcf480"; - sha256 = "sha256-7iCKhMdVlFdHMXxU8mQMU1vFiAbr1qKvG29VdAki+14="; + rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7"; + sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 5c69ae645aa5..183ead8d51d4 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4.3) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) concurrent-ruby (1.2.2) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - minitest (5.18.0) + minitest (5.20.0) rrule (0.4.4) activesupport (>= 2.3) tzinfo (2.0.6) @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.4.10 + 2.4.13 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 1ec357e301cc..7a6bd7f69270 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "d85e8e288d69788e0c3202bb3dab9c3450a98914"; - sha256 = "sha256-mSn2gGidH4iSZ0fhf3UPh9pwMQurK0YGW2OAtdEWFBQ="; + rev = "afc2ee684de41601d6cecc46713d139760f176a6"; + sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 8c06a78e3733..2e9b15ee5b9e 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.8"; }; concurrent-ruby = { groups = ["default"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.0"; + version = "5.20.0"; }; rrule = { dependencies = ["activesupport"]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 8fb400507d05..d5628fed4003 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/nixpkgs/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 = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b"; - sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk="; + rev = "732598b6cdc86c74622bb15bfeaebb05611bbc25"; + sha256 = "sha256-t0emNsPT8o0ralUedt33ufH0VLl4/12lVBBCnzfdRxE="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 40475dbcfa94..499d2e6447bd 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/nixpkgs/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 = "9647c7afc0df42b8e2b5ae585afaf51f107fa195"; - sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA="; + rev = "70fea6b66b68868aa4c00b45a169436deaa142a8"; + sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 7c402028d660..f3fdd5459432 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "4a7f3df360a8e4ff3bbebfed33ea545b1c72506e"; - sha256 = "sha256-lu8Ry3sUsKnr1nMfR29hbhsfJXLaN5NPuz8iGfsfHTc="; + rev = "d94e58c3060ee7ca0fe76339215ed9456d5f4ea4"; + sha256 = "sha256-zTMkU8NRqxLQ3/ghYTmEhRqbCgdYsYaImHdGu7WwuFk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index b824a2dec2fb..39320637ddcd 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/nixpkgs/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 = "f99b3af7ed4a21474f35223e83013ee3e8ad7002"; - sha256 = "sha256-3bBKBSc/+yF9ogNj3J6HXM3ynoAoUZeHhZOOhTfbxDw="; + rev = "e4f8d3924a18b303c2bb7da9472cf0c060060e4e"; + sha256 = "sha256-K+GPszO3je6NmnhIRSqSEhylUK5oEByaS0bLfAGjvB4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index a60ad45e298f..3dcd2b86a969 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "0b4d2f3691048b6e0e257a1ac9ed01f66f662ba8"; - sha256 = "sha256-HeIUCTbMNpuo6zeaDClsGrUOz4m0L+4UK7AwPsrKIHY="; + rev = "a4b203274b88c5277d0b5b936de0bc0e0016726c"; + sha256 = "sha256-R+VP/gsb2Oa6lPVMhRoGZzOBx5C7kRSxqwYpWE10GHw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index e63a9486d30f..3640cbc601da 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - faraday (2.7.4) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.1) + public_suffix (5.0.3) ruby2_keywords (0.0.5) sawyer (0.9.2) addressable (>= 2.3.5) @@ -24,4 +24,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.4.10 + 2.4.13 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index e0868aad42ed..50a59136ecf5 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3"; - sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0="; + rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f"; + sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index b25a91671cbd..87599999d894 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; faraday = { dependencies = ["faraday-net_http" "ruby2_keywords"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; ruby2_keywords = { groups = ["default"]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index d15a962c19d8..3a07b4bfd342 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "69494ca5a4d708e16e35f1daebeaa53e3edbca2c"; - sha256 = "sha256-C0iVUwj+Lbe6TGfkbu6WxdCeMWVjBaejUh6fXVTqq08="; + rev = "529ad1fe6da924da378a60bec48c35657bb01a68"; + sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 4c6c3bab9987..75a9a363b6cc 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -23,4 +23,4 @@ DEPENDENCIES unix-crypt (= 1.3.0) BUNDLED WITH - 2.4.6 + 2.4.13 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index c0c89d98be2c..ee8d03e66ca8 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "f78774242eb9bf49a72d2800a39a24eeaa3b401a"; - sha256 = "sha256-QJO+ei9/l7ye+kWE9VmiIuNCiOH66kd3vds49qlIztY="; + rev = "a95ae6bca4126172186fafcd2315f51a4504c23b"; + sha256 = "sha256-lr2xHz+8q4XnHc/7KLX0Z2m0KMffLgGYk36zxGG9X5o="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index 372899afd8e0..a467f4d17b39 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/nixpkgs/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 = "a16d5edd386f4099064753a4eed72ecb9c1bb1a8"; - sha256 = "sha256-9Fuu/UFmU4Gpkm5cRKOgDK0bt7nD545X18wtue+IrN8="; + rev = "b1df541ad29f6f6098a1008b83393b2d400986ed"; + sha256 = "sha256-afRd/9M0nQGkS14Q8BJhcJwMCkOku3Fr0uHxcRl44vQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile index 9753a02ce094..54a39883d060 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" # gem "rails" gem "webrick", "1.7.0" -gem "prometheus_exporter", File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip +gem "prometheus_exporter", "2.0.6" diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 25e4e031c01f..88a3a3c8d654 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES webrick (= 1.7.0) BUNDLED WITH - 2.4.10 + 2.4.13 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index b5c2ef7c6e84..95bf4c5a679a 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e"; - sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw="; + rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f"; + sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc="; }; patches = [ diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/spec-import-fix-abi-version.patch b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/spec-import-fix-abi-version.patch index 7b1159d0a800..de3a5c718f00 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/spec-import-fix-abi-version.patch +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/spec-import-fix-abi-version.patch @@ -1,16 +1,20 @@ diff --git a/bin/collector b/bin/collector -index 4fec65e..e59eac7 100755 +index 6bd04a8caffb..119526fc6ea3 100644 --- a/bin/collector +++ b/bin/collector -@@ -3,8 +3,10 @@ +@@ -3,12 +3,14 @@ Process.setproctitle("discourse prometheus-collector") +# We need the ABI version {MAJOR}.{MINOR}.0 here. +abi_version = ENV['GEM_PATH'].split("/")[-1] - version = File.read(File.expand_path("../../prometheus_exporter_version", __FILE__)).strip --spec_file = File.expand_path("../../gems/#{RUBY_VERSION}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__) -+spec_file = File.expand_path("../../gems/#{abi_version}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__) - - spec = Gem::Specification.load spec_file - spec.activate + [ + "webrick-#{ENV["WEBRICK_VERSION"]}", + "prometheus_exporter-#{ENV["PROMETHEUS_EXPORTER_VERSION"]}", + ].each do |spec_name| + spec_file = +- File.expand_path("../../gems/#{RUBY_VERSION}/specifications/#{spec_name}.gemspec", __FILE__) ++ File.expand_path("../../gems/#{abi_version}/specifications/#{spec_name}.gemspec", __FILE__) + spec = Gem::Specification.load(spec_file) + spec.activate + end diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix index 28505b6f40b5..36e4ac19c4bd 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-reactions"; - rev = "01aca15b2774c088f3673118e92e9469f37d2fb6"; - sha256 = "sha256-txQ1G2pBcl4bMBwv3vTs9dwBGKp2uEBvK7BuqQ1O8xg="; + rev = "643f807a3a2195f08211064301f0350d9f51604f"; + sha256 = "sha256-4FdiYUNysSuOJ664G3YvlUHx/J7MLUS3kVBdXT47oEw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-reactions"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index c92e54d4c43d..32709666189e 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/nixpkgs/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 = "5c6d1b6c186c5c96bb92bd6de62d3bc2da6a5b68"; - sha256 = "sha256-Z9wWwf9gH/Iainxx089J4eT7MpQeHpFXgTU40p/IcYY="; + rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a"; + sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 2e393f5c59c8..ed47f9e15e92 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "29a991e60f3ca3bb44d382d675e4458794a683f3"; - sha256 = "sha256-6flXuGA7SdIlGLYzyY5AXzQF/cEs39XfeptoBia8SHw="; + rev = "b5d487d6a5bfe2571d936eec5911d02a5f3fcc32"; + sha256 = "sha256-Tt7B9PcsV8E7B+m8GnJw+MBz9rGYtojKt6NjBFMQvOM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index c5fa6f823951..23ce34dcd694 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/nixpkgs/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 = "0ee68da1fe1d029685a373df7fc874fcd2e50991"; - sha256 = "sha256-z+0RL7HAJ92TyI1z2DBpirYN7IWzV7iGejs8Howo2+s="; + rev = "65989714af08eda44196cca3a0afe85c9e9443f9"; + sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 6574cece9505..a311dbcfbfcf 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "d9cab9664263e75d46533fb83586ce88cb2b6cfe"; - sha256 = "sha256-cKbsc2ZPXaU4CAzM+oqwbs93l3NMrOGw4IBZLVZIDyw="; + rev = "6449fc15658d972e20086a3f1fae3dbac9cd9eeb"; + sha256 = "sha256-f04LpVeodCVEB/t5Ic2dketp542Nrc0rZWbQ6hrC22g="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index fa9158395042..979398f7394b 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/nixpkgs/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 = "af7e294d04ca7b0c64dd604d19a553500accee51"; - sha256 = "sha256-ioUJqLe/sUDKKa106hGY4OhwOgC+96YFQ4Lqr/CFF7Y="; + rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f"; + sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 72cc4660cb0f..647aefea8ada 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = "7.0.4.3" + rails_version = "7.0.5.1" gem "actionmailer", rails_version gem "actionpack", rails_version gem "actionview", rails_version @@ -96,8 +96,7 @@ gem "omniauth-oauth2", require: false gem "omniauth-google-oauth2" -# pending: https://github.com/ohler55/oj/issues/789 -gem "oj", "3.13.14" +gem "oj" gem "pg" gem "mini_sql" @@ -145,6 +144,7 @@ group :test do gem "selenium-webdriver", require: false gem "test-prof" gem "webdrivers", require: false + gem "rails-dom-testing", require: false end group :test, :development do @@ -158,7 +158,7 @@ group :test, :development do gem "rspec-rails" - gem "shoulda-matchers", require: false + gem "shoulda-matchers", require: false, github: "thoughtbot/shoulda-matchers" gem "rspec-html-matchers" gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri gem "rubocop-discourse", require: false @@ -272,9 +272,6 @@ gem "faraday-retry" # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 gem "net-http" -# workaround for prometheus-client -gem "webrick", require: false - # Workaround until Ruby ships with cgi version 0.3.6 or higher. gem "cgi", ">= 0.3.6", require: false diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 22bf3b726468..0b93bf23d097 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -7,28 +7,35 @@ GIT concurrent-ruby (~> 1.0) rack (> 1, < 3) +GIT + remote: https://github.com/thoughtbot/shoulda-matchers.git + revision: 783a90554053002017510285bc736099b2749c22 + specs: + shoulda-matchers (5.3.0) + activesupport (>= 5.2.0) + GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailer (7.0.5.1) + actionpack (= 7.0.5.1) + actionview (= 7.0.5.1) + activejob (= 7.0.5.1) + activesupport (= 7.0.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.3) - actionview (= 7.0.4.3) - activesupport (= 7.0.4.3) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.5.1) + actionview (= 7.0.5.1) + activesupport (= 7.0.5.1) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.4.3) - activesupport (= 7.0.4.3) + actionview (7.0.5.1) + activesupport (= 7.0.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -37,15 +44,15 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.0.4.3) - activesupport (= 7.0.4.3) + activejob (7.0.5.1) + activesupport (= 7.0.5.1) globalid (>= 0.3.6) - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) - activesupport (7.0.4.3) + activemodel (7.0.5.1) + activesupport (= 7.0.5.1) + activerecord (7.0.5.1) + activemodel (= 7.0.5.1) + activesupport (= 7.0.5.1) + activesupport (7.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -75,10 +82,10 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) - better_errors (2.9.1) - coderay (>= 1.0.0) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bootsnap (1.16.0) @@ -88,7 +95,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) - capybara (3.39.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -104,7 +111,7 @@ GEM coderay (1.1.3) colored2 (3.1.2) concurrent-ruby (1.2.2) - connection_pool (2.4.0) + connection_pool (2.4.1) cose (1.3.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) @@ -135,32 +142,30 @@ GEM faker (~> 2.16) literate_randomizer docile (1.4.0) - ecma-re-validator (0.4.0) - regexp_parser (~> 2.2) email_reply_trimmer (0.1.13) erubi (1.12.0) - excon (0.99.0) + excon (0.100.0) execjs (2.8.1) - exifr (1.3.10) + exifr (1.4.0) fabrication (2.30.0) faker (2.23.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (2.7.4) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - faraday-retry (2.1.0) + faraday-retry (2.2.0) faraday (~> 2.0) fast_blank (1.0.1) fast_xs (0.8.0) - fastimage (2.2.6) + fastimage (2.2.7) ffi (1.15.5) fspath (3.1.2) gc_tracer (1.5.1) globalid (1.1.0) activesupport (>= 5.0) - google-protobuf (3.22.3) + google-protobuf (3.23.4) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.0.1) @@ -169,7 +174,7 @@ GEM hkdf (1.0.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) @@ -177,25 +182,25 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.2.0) + image_size (3.3.0) in_threads (1.6.0) jmespath (1.6.2) json (2.6.3) json-schema (3.0.0) addressable (>= 2.8) - json_schemer (0.2.23) - ecma-re-validator (~> 0.3) + json_schemer (1.0.3) hana (~> 1.3) regexp_parser (~> 2.0) - uri_template (~> 0.7) - jwt (2.7.0) + simpleidn (~> 0.2) + jwt (2.7.1) kgio (2.11.4) - libv8-node (16.10.0.0) + language_server-protocol (3.17.0.3) + libv8-node (18.16.0.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) - lograge (0.12.0) + lograge (0.13.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -204,9 +209,9 @@ GEM logstash-logger (0.26.1) logstash-event (~> 1.2) logster (2.12.2) - loofah (2.20.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) lru_redux (1.1.0) lz4-ruby (0.3.3) mail (2.8.1) @@ -217,28 +222,28 @@ GEM matrix (0.4.2) maxminddb (0.1.22) memory_profiler (1.0.1) - message_bus (4.3.2) + message_bus (4.3.7) rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) - mini_racer (0.6.3) - libv8-node (~> 16.10.0.0) - mini_scheduler (0.15.0) + mini_portile2 (2.8.4) + mini_racer (0.8.0) + libv8-node (~> 18.16.0.0) + mini_scheduler (0.16.0) sidekiq (>= 4.2.3, < 7.0) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.18.0) - mocha (2.0.2) + minitest (5.19.0) + mocha (2.1.0) ruby2_keywords (>= 0.0.5) - msgpack (1.7.0) + msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) net-http (0.3.2) uri - net-imap (0.3.4) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) @@ -248,8 +253,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -263,7 +268,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - oj (3.13.14) + oj (3.15.1) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -289,12 +294,13 @@ GEM openssl (3.1.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) - optimist (3.0.1) - parallel (1.22.1) - parallel_tests (4.2.0) + optimist (3.1.0) + parallel (1.23.0) + parallel_tests (4.2.1) parallel - parser (3.2.2.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc pg (1.4.6) prettier_print (1.2.1) progress (3.6.0) @@ -306,32 +312,34 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.1) - puma (6.2.1) + public_suffix (5.0.3) + puma (6.3.0) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.6.4) + racc (1.7.1) + rack (2.2.8) rack-mini-profiler (3.1.0) rack (>= 1.2.0) rack-protection (3.0.6) rack rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - rails_failover (1.0.0) - activerecord (> 6.0, < 7.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rails_failover (2.0.1) + activerecord (>= 6.1, <= 7.1) concurrent-ruby - railties (> 6.0, < 7.1) - rails_multisite (4.0.1) - activerecord (> 5.0, < 7.1) - railties (> 5.0, < 7.1) - railties (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + railties (>= 6.1, <= 7.1) + rails_multisite (5.0.0) + activerecord (>= 6.0) + railties (>= 6.0) + railties (7.0.5.1) + actionpack (= 7.0.5.1) + activesupport (= 7.0.5.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -348,15 +356,16 @@ GEM optimist (>= 3.0.0) rchardet (1.8.0) redis (4.8.1) - redis-namespace (1.10.0) + redis-namespace (1.11.0) redis (>= 4) - regexp_parser (2.8.0) + regexp_parser (2.8.1) request_store (1.5.1) rack (>= 1.4) - rexml (3.2.5) + rexml (3.2.6) rinku (2.0.6) rotp (6.2.2) - rqrcode (2.1.2) + rouge (4.1.3) + rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -364,75 +373,77 @@ GEM rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.1) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rss (0.2.9) rexml - rswag-specs (2.8.0) + rswag-specs (2.10.1) activesupport (>= 3.1, < 7.1) json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) rspec-core (>= 2.14) - rtlcss (0.2.0) - mini_racer (~> 0.6.3) - rubocop (1.50.2) + rtlcss (0.2.1) + mini_racer (>= 0.6.3) + rubocop (1.55.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.17.1) + rubocop-capybara (2.18.0) rubocop (~> 1.41) - rubocop-discourse (3.2.0) + rubocop-discourse (3.3.0) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.19.0) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) - ruby-prof (1.6.1) + rubocop-factory_bot (~> 2.22) + ruby-prof (1.6.3) ruby-progressbar (1.13.0) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.0.1) + sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass-embedded (1.62.0) - google-protobuf (~> 3.21) - rake (>= 10.0.0) - selenium-webdriver (4.8.6) + sass-embedded (1.64.1) + google-protobuf (~> 3.23) + rake (>= 13.0.0) + selenium-webdriver (4.10.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - shoulda-matchers (5.3.0) - activesupport (>= 5.2.0) - sidekiq (6.5.8) + sidekiq (6.5.9) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) @@ -442,6 +453,8 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + simpleidn (0.2.1) + unf (~> 0.1.4) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) @@ -454,10 +467,10 @@ GEM syntax_tree (6.1.1) prettier_print (>= 1.2.0) syntax_tree-disable_ternary (1.0.0) - test-prof (1.2.1) - thor (1.2.1) - tilt (2.1.0) - timeout (0.3.2) + test-prof (1.2.2) + thor (1.2.2) + tilt (2.2.0) + timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2023.3) @@ -472,41 +485,39 @@ GEM kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) - uri (0.12.1) - uri_template (0.7.0) - version_gem (1.1.2) + uri (0.12.2) + version_gem (1.1.3) web-push (3.0.0) hkdf (~> 1.0) jwt (~> 2.0) openssl (~> 3.0) - webdrivers (5.2.0) + webdrivers (5.3.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) + selenium-webdriver (~> 4.0, < 4.11) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) websocket (1.2.9) xpath (3.2.0) nokogiri (~> 1.8) yaml-lint (0.1.2) yard (0.9.34) - zeitwerk (2.6.7) + zeitwerk (2.6.10) PLATFORMS ruby DEPENDENCIES - actionmailer (= 7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) + actionmailer (= 7.0.5.1) + actionpack (= 7.0.5.1) + actionview (= 7.0.5.1) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 7.0.4.3) - activerecord (= 7.0.4.3) - activesupport (= 7.0.4.3) + activemodel (= 7.0.5.1) + activerecord (= 7.0.5.1) + activesupport (= 7.0.5.1) addressable annotate aws-sdk-s3 @@ -575,7 +586,7 @@ DEPENDENCIES net-pop net-smtp nokogiri - oj (= 3.13.14) + oj omniauth omniauth-facebook omniauth-github @@ -590,9 +601,10 @@ DEPENDENCIES rack rack-mini-profiler rack-protection + rails-dom-testing rails_failover rails_multisite - railties (= 7.0.4.3) + railties (= 7.0.5.1) rake rb-fsevent rbtrace @@ -614,7 +626,7 @@ DEPENDENCIES rubyzip sanitize selenium-webdriver - shoulda-matchers + shoulda-matchers! sidekiq simplecov sprockets! @@ -632,9 +644,8 @@ DEPENDENCIES web-push webdrivers webmock - webrick yaml-lint yard BUNDLED WITH - 2.4.10 + 2.4.13 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index d407a53befc6..fc7b71f0c030 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112ga1x7y5l0fmammlwajzqxp0fbg1ciw7f6ad9a55wrb0n3hk3y"; + sha256 = "1pz26qpdx1xncpy5h8k4afw0npnh6wn580yvwv2cf857zrzvr1pm"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd"; + sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z"; + sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08xawfj8lkxlfwnmx3f7324w126rli6mqdx9j6ybz2ks9vxz0x3w"; + sha256 = "11wkxf16zdb9gsnc94x4hyj89wjks06gnk4fbl7gp5vkbl744n83"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v"; + sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv"; + sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -206,7 +206,7 @@ version = "1.5.0"; }; better_errors = { - dependencies = ["coderay" "erubi" "rack"]; + dependencies = ["erubi" "rack" "rouge"]; groups = ["development"]; platforms = [{ engine = "maglev"; @@ -215,10 +215,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.1"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -287,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.39.0"; + version = "3.39.2"; }; cbor = { groups = ["default"]; @@ -371,10 +371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -543,17 +543,6 @@ }; version = "1.4.0"; }; - ecma-re-validator = { - dependencies = ["regexp_parser"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kqci9ixr1jfp2aaq5lsyz5lkn37z2k94ww9d2hyrd8ncrhrhx8f"; - type = "gem"; - }; - version = "0.4.0"; - }; email_reply_trimmer = { groups = ["default"]; platforms = []; @@ -583,10 +572,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; + sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867"; type = "gem"; }; - version = "0.99.0"; + version = "0.100.0"; }; execjs = { groups = ["assets" "default"]; @@ -603,10 +592,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08fmmswa9fwymwsa2gzlm856ak3y9kjxdzm4zdrcrfyxs2p8yqwc"; + sha256 = "11v201jljn327fwjqcsglrbdnyhivnj7j6nh6wym5zjqgrwxy3kn"; type = "gem"; }; - version = "1.3.10"; + version = "1.4.0"; }; fabrication = { groups = ["development" "test"]; @@ -645,10 +634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -666,10 +655,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n"; + sha256 = "1ia19zgni6cw96rvsr0s004vjs9m2r6la4s00zcff36xaia4m0l0"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; fast_blank = { groups = ["default"]; @@ -708,10 +697,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr"; + sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx"; type = "gem"; }; - version = "2.2.6"; + version = "2.2.7"; }; ffi = { groups = ["default" "development" "test"]; @@ -767,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9"; + sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj"; type = "gem"; }; - version = "3.22.3"; + version = "3.23.4"; }; guess_html_encoding = { groups = ["default"]; @@ -858,10 +847,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -879,10 +868,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10slvvyam8gkdjzlhb3wb21hp46ay18miyh1advwvyny660rmdsb"; + sha256 = "19fspid6610sm4x0mql7iny7k0d7f21xgxqmsca0irvlvazwm4vn"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; in_threads = { groups = ["default"]; @@ -926,25 +915,25 @@ version = "3.0.0"; }; json_schemer = { - dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; + dependencies = ["hana" "regexp_parser" "simpleidn"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a5y4xh2w31plcx779jghbjgp1hf3wpwkdmcaa4na6ck8sknw4i2"; + sha256 = "1mbf7v8bzmxyk413y16drnww68bgyzknlqmaqvj785iakja7in7x"; type = "gem"; }; - version = "0.2.23"; + version = "1.0.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; kgio = { groups = ["default"]; @@ -962,15 +951,25 @@ }; version = "2.11.4"; }; + language_server-protocol = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; + }; libv8-node = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102ixp1626b4zjh98h3jxhwv0sdbkgijz38wyb1ffgxqr47c7s0w"; + sha256 = "0n2kakfa4nmkkmjimkg2z4fsni9v0qbwkwn9hcm2xp69xqfcmxiq"; type = "gem"; }; - version = "16.10.0.0"; + version = "18.16.0.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -999,10 +998,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; + sha256 = "01kdw5dbzimb89rq4zf44zf8990czb5qxvib0hzja1l4hrha8cki"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; logstash-event = { groups = ["default"]; @@ -1041,10 +1040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.3"; }; lru_redux = { groups = ["default"]; @@ -1123,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07acv6l89b1c0d3dfq84jb0vzbv489agcw60n7rnvk10y4x58bn5"; + sha256 = "1ppqgch8xxccpmccdx37lb00112ayqjb80zz5m3w3298vdzb1kn4"; type = "gem"; }; - version = "4.3.2"; + version = "4.3.7"; }; method_source = { groups = ["default" "development" "test"]; @@ -1153,10 +1152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1164,10 +1163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4vbb1549rxbl8a35yaizfkbh28nxby5mcwri5mz3x19yg3p6r8"; + sha256 = "0zjf3jsbara8fpfky28z1f64ymk5qsq40i527fxdnw061hlm4izy"; type = "gem"; }; - version = "0.6.3"; + version = "0.8.0"; }; mini_scheduler = { dependencies = ["sidekiq"]; @@ -1175,10 +1174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ng6hgb13jddharcnkcx6v2ycbfz1nx0n8i88n06pa29lfqgqrn"; + sha256 = "19c72wlr0zsrg1fiak61h0z1b3glv2l23041xvlwv2i71fw5xavy"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; mini_sql = { groups = ["default"]; @@ -1206,10 +1205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.0"; + version = "5.19.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -1217,10 +1216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg"; + sha256 = "0lsll8iba8612dypk718l9kx73m9syiscb2rhciljys1krc5g1zr"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; msgpack = { groups = ["default"]; @@ -1231,10 +1230,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -1283,10 +1282,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.7"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1337,10 +1336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.3"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1380,10 +1379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbbncvkqxbbi608vq2v7b3zzgrqac3syk403zhhbwrg352mv88q"; + sha256 = "1vzcrsv6w5k90l75gy83dlfkv2z9pvnr82mz1nhnijmcg3rgqaz8"; type = "gem"; }; - version = "3.13.14"; + version = "3.15.1"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1492,20 +1491,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + sha256 = "0q4jqq3v1bxlfr9jgqmahnygkvl81lr6s1rhm8qg66c9xr9nz241"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; parallel = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parallel_tests = { dependencies = ["parallel"]; @@ -1513,21 +1512,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11lf8vsh6kxzp7k3xzkxdmb31b01phaz5z8a7sjpq9hh6ab30k8l"; + sha256 = "04y02j0kyhfww41dnnjawn2gpp24smq0x21dvaa5z6pnq0fvmahv"; type = "gem"; }; - version = "4.2.0"; + version = "4.2.1"; }; parser = { - dependencies = ["ast"]; + dependencies = ["ast" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"; + sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; - version = "3.2.2.0"; + version = "3.2.2.3"; }; pg = { groups = ["default"]; @@ -1597,10 +1596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -1608,20 +1607,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5"; + sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; type = "gem"; }; - version = "6.2.1"; + version = "6.3.0"; }; racc = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.1"; }; rack = { groups = ["default" "development" "test"]; @@ -1632,10 +1631,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.8"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1671,26 +1670,26 @@ version = "2.1.0"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1698,10 +1697,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0zi64m9njfgk4xs4invqlimkgiy4fsivfmbpz33bg0w5yyzazi"; + sha256 = "102v7928nyl1w1cmi70zbx42nw25v842r84gwchwijwnd2f30gvy"; type = "gem"; }; - version = "1.0.0"; + version = "2.0.1"; }; rails_multisite = { dependencies = ["activerecord" "railties"]; @@ -1709,10 +1708,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08fa5yq73ws536nhzd55bjx4gfvh6986zvw33rkg6ql6i8rga68y"; + sha256 = "0hilr3yhnzvzn3p2cl77im9ypvbfjk1vw7f72i1j7fi2bmq1h2hi"; type = "gem"; }; - version = "4.0.1"; + version = "5.0.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -1720,10 +1719,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq"; + sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1823,20 +1822,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; request_store = { dependencies = ["rack"]; @@ -1854,10 +1853,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rinku = { groups = ["default"]; @@ -1879,16 +1878,30 @@ }; version = "6.2.2"; }; + rouge = { + groups = ["default" "development"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw"; + type = "gem"; + }; + version = "4.1.3"; + }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.0"; }; rqrcode_core = { groups = ["default"]; @@ -1917,10 +1930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.12.1"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1928,10 +1941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.12.2"; + version = "3.12.3"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -1950,10 +1963,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.5"; + version = "3.12.6"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1961,20 +1974,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rss = { dependencies = ["rexml"]; @@ -1993,10 +2006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsxj0dfnncfnx7v9p4pzwp95wpc57cn0bijn0wx3b0pd68i6zhj"; + sha256 = "0p0blh8p6zj8vsiw585wiy6zpyn8p3ksn0z92ijfzaw7afvcvl8j"; type = "gem"; }; - version = "2.8.0"; + version = "2.10.1"; }; rtlcss = { dependencies = ["mini_racer"]; @@ -2004,21 +2017,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nnc1qdr4vdr91406ga1nnw5xk27ii2yzk325ixrf2qca3zl213k"; + sha256 = "0q5zlx1k4gqyq0rvnfkljvrwa73ysycxc5m5ly9py9k1pw05lg91"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; + sha256 = "0s9p5qaqq68h5s3ys8xlk9swccma7arjif1w58987n6gicrsprrm"; type = "gem"; }; - version = "1.50.2"; + version = "1.55.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2026,10 +2039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.28.0"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2037,10 +2050,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n"; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; type = "gem"; }; - version = "2.17.1"; + version = "2.18.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2048,21 +2061,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jfpi8wd6gxd626kp27n20ja1yj68478dqbc1fiyzj4mr8nw8nsl"; + sha256 = "1sycsgagz7iq4j4aflzkzjlclvsck9yacjlj1pzzmfpjbbka34x8"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; + type = "gem"; + }; + version = "2.23.1"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8yh0nzlz0g8igmj5smnxq71qmi2b005nkl25wkpjkwvzn2wfdx"; + sha256 = "0l364y00bw1zcs3grdxcxpn48vfrjds2khsiaxjqq3r9grvbprfy"; type = "gem"; }; - version = "2.19.0"; + version = "2.23.0"; }; ruby-prof = { groups = ["development"]; @@ -2073,10 +2097,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "106i9m62a20xaipp3vsq4rsnggddfgdvb8xqhvi264slvmac85zq"; + sha256 = "13fsfw43zx9pcix1fzxb95g09yadqjvc8971k74krrjz81vbyh51"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.3"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2125,10 +2149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; + sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; sass-embedded = { dependencies = ["google-protobuf" "rake"]; @@ -2136,10 +2160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fprlazlld0yr4g8aq9qh4lxjxpvzl2s3fp8f9ydwsrchzj95rbh"; + sha256 = "15k44qn8vk8ap8khkmpsiw40pywm9pkx4a5yhm8vfi2rgqci9k90"; type = "gem"; }; - version = "1.62.0"; + version = "1.64.1"; }; selenium-webdriver = { dependencies = ["rexml" "rubyzip" "websocket"]; @@ -2147,19 +2171,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfaz3srv9c420jkmhr19fmdisnjylwpwyjsr8fsw2ggw35ryhrz"; + sha256 = "0hwxxvx6j95ln82pjmrgyzg6qmf511dkcp5q79n6m5m8z4way8m3"; type = "gem"; }; - version = "4.8.6"; + version = "4.10.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; groups = ["development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "11igjgh16dl5pwqizdmclzlzpv7mbmnh8fx7m9b5kfsjhwxqdfpn"; - type = "gem"; + fetchSubmodules = false; + rev = "783a90554053002017510285bc736099b2749c22"; + sha256 = "10rw7ksi462fxamap6kimdy7hpdgx8477r6zs1kgrbakx24dm3wx"; + type = "git"; + url = "https://github.com/thoughtbot/shoulda-matchers.git"; }; version = "5.3.0"; }; @@ -2169,10 +2195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; + sha256 = "0iv7vgqyrpymiwvc3ca24sl4lda8m627p657p0v4xzdpzincrnbr"; type = "gem"; }; - version = "6.5.8"; + version = "6.5.9"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2205,6 +2231,17 @@ }; version = "0.1.4"; }; + simpleidn = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m"; + type = "gem"; + }; + version = "0.2.1"; + }; snaky_hash = { dependencies = ["hashie" "version_gem"]; groups = ["default"]; @@ -2290,40 +2327,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa"; + sha256 = "08j5456rdpgxvv8bs44x81jrxzpxb79wxfxdq4fqwxyircxzi2jj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; thor = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2421,30 +2458,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; - type = "gem"; - }; - version = "0.12.1"; - }; - uri_template = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "0.7.0"; + version = "0.12.2"; }; version_gem = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dza601x34ln5yvmyaj42gnbij9pifx12frp5vak6n19q9j941r0"; + sha256 = "0q6zs0wgcrql9671fw6lmbvgh155snaak4fia24iji5wk9klpfh7"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; web-push = { dependencies = ["hkdf" "jwt" "openssl"]; @@ -2463,10 +2490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxk9719nyk7vsc15mz2hxc8whciihcs40skpn2rncnzsppbv1w3"; + sha256 = "19aaxhawzv7315rh285gd1fg6m6wbrn3w3kilyibci1wphgm7mfp"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.1"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; @@ -2479,16 +2506,6 @@ }; version = "3.18.1"; }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; - }; websocket = { groups = ["default" "test"]; platforms = []; @@ -2535,9 +2552,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; + sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j"; type = "gem"; }; - version = "2.6.7"; + version = "2.6.10"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch b/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch deleted file mode 100644 index af9ada13cbe0..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile -index 77ced01..1e60ab0 100644 ---- a/ext/sass/Rakefile -+++ b/ext/sass/Rakefile -@@ -18,15 +18,7 @@ file 'protoc.exe' do |t| - end - - file 'sass_embedded' do |t| -- archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded }) -- unarchive archive -- rm archive -- -- if ENV.key?('NIX_BINTOOLS') -- sh 'patchelf', -- '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp, -- (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) }) -- end -+ symlink(ENV.fetch(t.name.upcase), 'sass_embedded') - end - - file 'embedded.rb' => %w[sass_embedded] do |t| diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/nixpkgs/pkgs/servers/web-apps/discourse/update.py index dee31918eac9..9b300d1d4959 100755 --- a/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -322,7 +322,7 @@ def update_plugins(): for [discourse_version, plugin_rev] in [line.split(':') for line - in compatibility_spec.splitlines()]] + in compatibility_spec.splitlines() if line != '']] discourse_version = DiscourseVersion(_get_current_package_version('discourse')) versions = list(filter(lambda ver: ver[0] >= discourse_version, versions)) if versions == []: |