diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index d8deb6cfbc8c..6fdd4b5cadd3 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -36,6 +36,9 @@ buildImage { WorkingDir = "/data"; Volumes = { "/data" = { }; }; }; + + diskSize = 1024; + buildVMMemorySize = 512; } ``` @@ -59,6 +62,10 @@ The above example will build a Docker image `redis/latest` from the given base i - `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +- `diskSize` is used to specify the disk size of the VM used to build the image in megabytes. By default it's 1024 MiB. + +- `buildVMMemorySize` is used to specify the memory size of the VM to build the image in megabytes. By default it's 512 MiB. + After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. At the end of the process, only one new single layer will be produced and added to the resulting image. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a849fcfec77..8a8df700330e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -639,6 +639,7 @@ ./services/misc/sonarr.nix ./services/misc/sourcehut ./services/misc/spice-vdagentd.nix + ./services/misc/spice-webdavd.nix ./services/misc/ssm-agent.nix ./services/misc/sssd.nix ./services/misc/subsonic.nix diff --git a/nixos/modules/services/misc/spice-webdavd.nix b/nixos/modules/services/misc/spice-webdavd.nix new file mode 100644 index 000000000000..bfb5b262ee1a --- /dev/null +++ b/nixos/modules/services/misc/spice-webdavd.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.spice-webdavd; +in +{ + options = { + services.spice-webdavd = { + enable = mkEnableOption "the spice guest webdav proxy daemon"; + + package = mkOption { + default = pkgs.phodav; + defaultText = literalExpression "pkgs.phodav"; + type = types.package; + description = "spice-webdavd provider package to use."; + }; + }; + }; + + config = mkIf cfg.enable { + # ensure the webdav fs this exposes can actually be mounted + services.davfs2.enable = true; + + # add the udev rule which starts the proxy when the spice socket is present + services.udev.packages = [ cfg.package ]; + + systemd.services.spice-webdavd = { + description = "spice-webdav proxy daemon"; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/spice-webdavd -p 9843"; + Restart = "on-success"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 20ad653429a5..1e2326d81801 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -6,7 +6,7 @@ let cfg = config.services.discourse; opt = options.services.discourse; - # Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5 + # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/slim.Dockerfile#L5 upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; postgresqlPackage = if config.services.postgresql.enable then @@ -604,7 +604,6 @@ in cors_origin = ""; serve_static_assets = false; sidekiq_workers = 5; - rtl_css = false; connection_reaper_age = 30; connection_reaper_interval = 30; relative_url_root = null; @@ -940,7 +939,6 @@ in proxy_cache discourse; proxy_cache_key "$scheme,$host,$request_uri"; proxy_cache_valid 200 301 302 7d; - proxy_cache_valid any 1m; ''; }; "/message-bus/" = proxy { diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 39008df74f17..7468f056005a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -205,6 +205,7 @@ rec { , fromImageName ? null , fromImageTag ? null , diskSize ? 1024 + , buildVMMemorySize ? 512 , preMount ? "" , postMount ? "" , postUmount ? "" @@ -218,6 +219,7 @@ rec { destination = "./image"; }; inherit fromImage fromImageName fromImageTag; + memSize = buildVMMemorySize; nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ]; } '' @@ -407,6 +409,8 @@ rec { fromImageTag ? null , # How much disk to allocate for the temporary virtual machine. diskSize ? 1024 + , # How much memory to allocate for the temporary virtual machine. + buildVMMemorySize ? 512 , # Commands (bash) to run on the layer; these do not require sudo. extraCommands ? "" }: @@ -418,7 +422,7 @@ rec { runWithOverlay { name = "docker-layer-${name}"; - inherit fromImage fromImageName fromImageTag diskSize; + inherit fromImage fromImageName fromImageTag diskSize buildVMMemorySize; preMount = lib.optionalString (copyToRoot != null && copyToRoot != [ ]) '' echo "Adding contents..." @@ -517,6 +521,8 @@ rec { runAsRoot ? null , # Size of the virtual machine disk to provision when building the image. diskSize ? 1024 + , # Size of the virtual machine memory to provision when building the image. + buildVMMemorySize ? 512 , # Time of creation of the image. created ? "1970-01-01T00:00:01Z" , # Deprecated. @@ -563,7 +569,7 @@ rec { mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag - keepContentsDirlinks runAsRoot diskSize + keepContentsDirlinks runAsRoot diskSize buildVMMemorySize extraCommands; copyToRoot = rootContents; }; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index d8010cdc63b4..ba7950d72561 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,15 +13,16 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # for demo src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80="; + sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + "-Dexamples=true" ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index f3adfdc87a9d..5bf61789e83a 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql"; - inherit (graphql_parser) version useDune2 src; + inherit (graphql_parser) version src; propagatedBuildInputs = [ graphql_parser rresult yojson ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 187856da0d61..8fd6abfb8fb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql-lwt"; - inherit (graphql) version useDune2 src; + inherit (graphql) version src; propagatedBuildInputs = [ graphql ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index 62f8ca1ef129..feea74f67807 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -1,16 +1,14 @@ -{ lib, buildDunePackage, fetchurl, alcotest, fmt, menhir, re }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt, menhir, re }: buildDunePackage rec { pname = "graphql_parser"; - version = "0.13.0"; + version = "0.14.0"; - useDune2 = true; - - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; - sha256 = "0gb5y99ph0nz5y3pc1gxq1py4wji2hyf2ydbp0hv23v00n50hpsm"; + sha256 = "sha256-v4v1ueF+NV7LvYIVinaf4rE450Z1P9OiMAito6/NHAY="; }; nativeBuildInputs = [ menhir ]; @@ -18,7 +16,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/andreas/ocaml-graphql-server"; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 03c8f1eca291..3074cfd368e1 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -24,6 +24,7 @@ buildDunePackage rec { meta = irmin.meta // { description = "GraphQL server for Irmin"; + broken = true; # Not compatible with graphql 0.14 }; } diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index d309bc71731b..052120d893d0 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,15 +24,22 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.6"; + version = "1.27.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA="; + sha256 = "sha256-Qz8kYXu2NmcgtW8GbmLPfB4BOearEycE6EMmQRXmWeI="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "attrs>=19.3.0,<21.5.0" "attrs" \ + --replace "pip>=9,<22.2" "pip" \ + --replace "typing==3.6.4" "typing" + ''; + propagatedBuildInputs = [ attrs botocore @@ -58,13 +65,6 @@ buildPythonPackage rec { websocket-client ]; - postPatch = '' - sed -i setup.py -e "/pip>=/c\'pip'," - substituteInPlace setup.py \ - --replace "typing==3.6.4" "typing" \ - --replace "jmespath>=0.9.3,<1.0.0" "jmespath>=0.9.3,<2.0.0" - ''; - disabledTestPaths = [ # Don't check the templates and the sample app "chalice/templates" diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index e492677d138b..ca7e2d920107 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchFromGitHub , substituteAll -, fetchpatch , gdb , django , flask @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +26,7 @@ buildPythonPackage rec { owner = "Microsoft"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jcokiAZ2WwyIvsXNIUzvMIrRttR76RwDSE7gk0xHExc="; + sha256 = "sha256-ERsqs+pCJfYQInOWPBhM/7hC5TTfQAksYJwFCcd+vlk="; }; patches = [ @@ -52,13 +51,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Fix compiling attach library from source - # https://github.com/microsoft/debugpy/pull/978 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/08b3b13cba9035f4ab3308153aef26e3cc9275f9.patch"; - sha256 = "sha256-8E+Y40mYQou9T1ozWslEK2XNQtuy5+MBvPvDLt4eQak="; - }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 73dc7403b25f..d2827d7f2194 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,62 +1,49 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, configparser -, enum34 +, fetchFromGitHub , mccabe , pycodestyle , pyflakes -, functools32 -, typing , importlib-metadata -, mock +, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "flake8"; - version = "4.0.1"; + version = "5.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0"; + disabled = pythonOlder "3.6"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "flake8"; + rev = version; + hash = "sha256-Os8HIoM07/iOBMm+0WxdQj32pJJOJ8mkh+yLHpqkLXg="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "mccabe>=0.6.0,<0.7.0" "mccabe>=0.7.0,<0.8.0" - ''; - propagatedBuildInputs = [ - pyflakes - pycodestyle mccabe - ] ++ lib.optionals (pythonOlder "3.2") [ - configparser - functools32 - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 - ] ++ lib.optionals (pythonOlder "3.5") [ - typing + pycodestyle + pyflakes ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Tests fail on Python 3.7 due to importlib using a deprecated interface - doCheck = !(pythonOlder "3.8"); + doCheck = pythonAtLeast "3.7"; checkInputs = [ - mock pytestCheckHook ]; - disabled = pythonOlder "3.6"; - meta = with lib; { description = "Flake8 is a wrapper around pyflakes, pycodestyle and mccabe."; homepage = "https://github.com/pycqa/flake8"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 16af840b036b..a7852afb7082 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -5,7 +5,6 @@ , pytestCheckHook , isPy27 , enum34 -, pytest-flake8 }: buildPythonPackage rec { @@ -19,13 +18,16 @@ buildPythonPackage rec { sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398"; }; + postPatch = '' + sed -i '/addopts/d' tox.ini + ''; + propagatedBuildInputs = [ marshmallow ] ++ lib.optionals isPy27 [ enum34 ]; checkInputs = [ pytestCheckHook - pytest-flake8 ]; disabledTests = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index c32b85190191..2471df794fc0 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,6 @@ , pytestCheckHook , isodate , jsonschema -, pytest-flake8 , pytest-cov , rfc3339-validator , six @@ -30,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 865c1febddcf..9904353bfccd 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, pythonOlder , fetchPypi , lib , python @@ -6,26 +7,30 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.8.0"; + version = "2.9.1"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"; + sha256 = "2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"; }; - dontUseSetuptoolsCheck = true; - - # https://github.com/PyCQA/pycodestyle/blob/2.5.0/tox.ini#L14 + # https://github.com/PyCQA/pycodestyle/blob/2.9.1/tox.ini#L13 checkPhase = '' - ${python.interpreter} pycodestyle.py --max-doc-length=72 --testsuite testsuite - ${python.interpreter} pycodestyle.py --statistics pycodestyle.py - ${python.interpreter} pycodestyle.py --max-doc-length=72 --doctest + ${python.interpreter} -m pycodestyle --statistics pycodestyle.py + ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite + ${python.interpreter} -m pycodestyle --max-doc-length=72 --doctest ${python.interpreter} -m unittest discover testsuite -vv ''; + pythonImportsCheck = [ "pycodestyle" ]; + meta = with lib; { - description = "Python style guide checker (formerly called pep8)"; - homepage = "https://pycodestyle.readthedocs.io"; + description = "Python style guide checker"; + homepage = "https://pycodestyle.pycqa.org/"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index f8e00b20e726..64f554a00efd 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,23 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyflakes"; - version = "2.4.0"; + version = "2.5.0"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"; + sha256 = "491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"; }; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytestCheckHook + ]; - # some tests are output dependent, which have changed slightly - doCheck = pythonOlder "3.9"; + pythonImportsCheck = [ "pyflakes" ]; meta = with lib; { - homepage = "https://launchpad.net/pyflakes"; + homepage = "https://github.com/PyCQA/pyflakes"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${version}/NEWS.rst"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index be3854d1352e..41e2b86202d7 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -17,7 +17,7 @@ let pylama = buildPythonPackage rec { pname = "pylama"; - version = "8.3.8"; + version = "8.4.1"; format = "setuptools"; @@ -26,7 +26,7 @@ let pylama = buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-g6Lq5NaieUI/alxqoVFfL5VaCHwB/jLcp02/N1W69yE="; + hash = "sha256-WOGtZ412tX3YH42JCd5HIngunluwtMmQrOSUZp23LPU="; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 231ddf97c948..7d1b29fbd34b 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,38 +1,37 @@ -{lib, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch, pytest, flake8}: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, flake8 +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.7"; + version = "1.1.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - # although pytest is a runtime dependency, do not add it as - # propagatedBuildInputs in order to allow packages depend on another version - # of pytest more easily - checkInputs = [ pytest ]; - propagatedBuildInputs = [ flake8 ]; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b"; + sha256 = "ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e"; }; - # see https://github.com/tholo/pytest-flake8/pull/82/commits - patches = [ - (fetchpatch { - url = "https://github.com/tholo/pytest-flake8/commit/eda4ef74c0f25b856fe282742ea206b21e94c24c.patch"; - sha256 = "0kq0wshds00rk6wvkn6ccjrjyqxg7m9l7dlyaqw974asizw6byci"; - }) + propagatedBuildInputs = [ + flake8 ]; - checkPhase = '' - pytest . - ''; + checkInputs = [ + pytestCheckHook + ]; meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; + broken = true; # https://github.com/tholo/pytest-flake8/issues/87 }; } diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d0c630ab488e..a31a95671c1e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , go-md2man @@ -32,8 +33,9 @@ buildGoModule rec { nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ - btrfs-progs gpgme + ] ++ lib.optionals stdenv.isLinux [ + btrfs-progs libapparmor libseccomp libselinux @@ -43,7 +45,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - make bin/buildah GIT_COMMIT="unknown" + make bin/buildah make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" runHook postBuild ''; @@ -62,6 +64,5 @@ buildGoModule rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index a31dece7df5e..66cb060a8180 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , buildah , runc # Default container runtime @@ -20,6 +21,7 @@ let preferLocalBuild = true; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 85031b3aad70..12133f6daa87 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.14.0"; + version = "1.15.0"; in buildGoModule { pname = "sqlc"; @@ -11,18 +11,18 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-+JkNuN5Hv1g1+UpJEBZpf7QV/3A85IVzMa5cfeRSQRo="; + sha256 = "sha256-Ufa5A+lsFSyxe7s0DbLhWW298Y1yaSCazMjGBryyMYY="; }; proxyVendor = true; - vendorSha256 = "sha256-QG/pIsK8krBaO5IDgln10jpCnlw3XC8sIYyzuwYjTs0="; + vendorSha256 = "sha256-KatF4epCzyQCoAGk1verjAYNrFcmcLiVyDI2542Vm3k="; subPackages = [ "cmd/sqlc" ]; - meta = with lib; { + meta = { description = "Generate type-safe code from SQL"; homepage = "https://sqlc.dev/"; - license = licenses.mit; - maintainers = [ maintainers.adisbladis ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.adisbladis ]; }; } diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 7ce8b93e613e..66ac8c66096d 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -16,15 +16,6 @@ stdenv.mkDerivation rec { strictDeps = true; - patches = - # This patch fixes a MIPS-specific bug in patchelf; we want Hydra - # to generate a bootstrap-files tarball for MIPS that includes - # this fix. The patches below can be dropped on the next version bump. - lib.optionals stdenv.targetPlatform.isMips [ - # https://github.com/NixOS/patchelf/pull/380 - ./patches/380.patch - ]; - setupHook = [ ./setup-hook.sh ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 850ad6ca298b..d231f764a91f 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.12"; - vendorSha256 = "sha256-P83dH+4vcf+UWphsqqJs03oJ47JLwUYt1cgnuCaM5lA="; + version = "5.4.13"; + vendorSha256 = "sha256-/HJgMCRfSS3ln/bW7pb6x9ugece8MFHTLHARTNMHNEU="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-8cJqcvBXjyy9Sk5ZYw0LZs1zPVWrc6udL3qKdIjTklI="; + sha256 = "sha256-yTCq+kx86TGjDZ9Cx4d4ni1Q8yvgXSmJP3YD1owrLN8="; }; postInstall = '' diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8f5240b42eb1..90f747370f8e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.64.0"; + version = "1.65.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hybl63hbhuUYnMi03z0Yp7L4n0x01z5uR8r5ZwHzgfI="; + sha256 = "sha256-Kn5o6RKR3mMHvACPiMvIGKmjkAwdjcw6EY6MJXKKeAE="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 493f067f0f92..c32e1ef450cf 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "zhFc6BAurjrp0pHa48Eb8Iypww6o6YXPXp2ba2CXB6Q="; + sha256 = "1AcjcE57ttjypnLU/+qpPsvApiuJfSX0qbPEQKOWfIM="; }; buildInputs = [ olm ]; - vendorSha256 = "EiaQDEsysTiXNHKhbfGVgVdMKgfdUHm48eooGR1rtQg="; + vendorSha256 = "4CA/kDGohoJfdiXALN8M8fuPHQUrU2REHqVI7kKMnoY="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c25c34c125a9..54a1dd620ee1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.7"; + version = "9.1.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-rmcoyYBTT1po0TphmoGSoiS13W98LvjBhizKkhZVMzE="; + sha256 = "sha256-idwoecfAm6bbiC0sXwz/b/KXA+f9GRtDZjMR5Ff4yt4="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-9mXmot/UjMNrfDQ1MXSQvjn6cBBNQ4gP7bJvpBqBIKc="; + sha256 = "sha256-TFGgwdZRz77bSimbhGsD06Wi9RwWJ1dNm9RPAnIZ9gE="; }; - vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; + vendorSha256 = "sha256-6mf49PWp3htCDvXIQuc/mmqqFXFJcP8jDoDSQGi4rKc="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 20447d1c315f..5f5bd6503e01 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "openldap_exporter"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "tomcz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ok2fTYz1oQiNdTPsssPb/VuFqny1i8nKTngSpKgCpC4="; + sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; }; vendorSha256 = null; diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index a8251b1c42e1..e5531dc2665e 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-8Y6I6vitkgIV6WMXF1YXzgRfhJd/O6hcdpC9yZLpDA4="; - arm64-linux_hash = "sha256-OXbJbwjNDd3GNL4bvuZLwNOjfAp8YBnJiylid0w8kLI="; - x64-osx_hash = "sha256-BoYqplC8ahMhpgntZVozyPCp08YqmiZ3ED7TgKlXPXc="; + x64-linux_hash = "sha256-7l9NT0brk6c7H3oqe9IjTY+5Ji2c5a4vB4vomqmv7x8="; + arm64-linux_hash = "sha256-UKVCpFS4m2DMkgG62V7uSQyLG/Zt6z3GSogd30A/4nY="; + x64-osx_hash = "sha256-xUu4nsAzBDCKUJWmim3UXVgFzwa6fg9mj/eD3OW1ILY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.16.12"; + version = "4.22.5"; sourceRoot = "."; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index ed7544e7b2e2..b812454fc4c5 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.37.0"; + version = "0.37.3"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "0rcc5b3v5d9v4y78z5fnjbn1k10xy8cpgxjhqc7j22k9wkic05mh"; + sha256 = "sha256-zXt1Xo6xq1g1putx4q6z7SEXK4lNGRgRnNPXajL5Znw="; }; - vendorSha256 = "0pi230xcaf0wkphfn3s4h3riviihxlqwyb9lzfdvh8h5dpizxwc9"; + vendorSha256 = "sha256-E1x1QTagXkL4NQ7REDuTHpUaadiz72e3jMLPVquSSV4="; ldflags = [ "-s" "-w" diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 19860ad7886d..6986cf5271e7 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta4"; + version = "2.9.0.beta9"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4="; + sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52"; + sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0"; }; assets = stdenv.mkDerivation { @@ -177,6 +177,8 @@ let nodejs-14_x ]; + outputs = [ "out" "javascripts" ]; + patches = [ # Use the Ruby API version in the plugin gem path, to match the # one constructed by bundlerEnv @@ -253,6 +255,10 @@ let mv public/assets $out + rm -r app/assets/javascripts/plugins + mv app/assets/javascripts $javascripts + ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins + runHook postInstall ''; @@ -301,7 +307,10 @@ let # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the # state directory. - find config -type f -execdir sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -type f -name "*.rb" -execdir \ + sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -maxdepth 1 -type f -name "*.rb" -execdir \ + sed -Ei "s,require_relative (\"|')([[:alnum:]].*)(\"|'),require_relative '$out/share/discourse/config/\2'," {} \; ''; buildPhase = '' @@ -322,9 +331,10 @@ let ln -sf /var/log/discourse $out/share/discourse/log ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config - ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public ln -sf ${assets} $out/share/discourse/public.dist/assets + rm -r $out/share/discourse/app/assets/javascripts + ln -sf ${assets.javascripts} $out/share/discourse/app/assets/javascripts ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} runHook postInstall 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 3cf491a2f42d..8dc8377ac95e 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 = "7a854fe5046783bcff6cc24fca818056e1b9414a"; - sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI="; + rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e"; + sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8="; }; 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 4a4ff3b0e178..4de4b6e42dde 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) concurrent-ruby (1.1.10) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - minitest (5.15.0) + minitest (5.16.2) rrule (0.4.4) activesupport (>= 2.3) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) PLATFORMS 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 d935b37b5a11..922adc60b618 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 = "eb8bc3e864c6f735fa5a005e854f8c37411b6288"; - sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28="; + rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0"; + sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo="; }; 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 69f2648831ce..e2db1930298d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3.1"; }; concurrent-ruby = { groups = ["default"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; rrule = { dependencies = ["activesupport"]; @@ -58,9 +58,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; } 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 07e58652d9fe..07d1afb2da49 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 = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3"; - sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY="; + rev = "faa586b095a9ec5b0088bdfa7b04a3aba9f44521"; + sha256 = "sha256-f/9JtPtYZsRIzk3cBlXAtdG25oep7/Kl74JsGkoP4PI="; }; 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 f96348e6f273..6f70efa90ab1 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 = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c"; - sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng="; + rev = "c68fde5d2bbb92cad24a35ff61586453d67264f5"; + sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4="; }; 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 d1bcd57fc66a..e8de49349f0c 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 = "68941e370e132c17fc2aa21ac40c033df72c9771"; - sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs="; + rev = "8763292e9a02fc2fed6d39c59c3cf5401dcdd950"; + sha256 = "sha256-xUsTjoG25efIumrf6XX8rAKWjfcAhZiqQz9pfnG3pQU="; }; 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 8073d89df817..198b1e5aba52 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 = "baaac7ce671e716559329ae756988cc395d7079e"; - sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ="; + rev = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e"; + sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo="; }; 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 071b1eb5dd9b..3587c9ef2a13 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 = "72b2e87e84221588bc2ff08961a492044f1f8237"; - sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY="; + rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f"; + sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index ba0516980977..b31ad9452c4d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.10.0) + faraday (1.10.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -19,14 +19,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - multipart-post (2.1.1) + multipart-post (2.2.3) octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) 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 f9ccaed863ef..e53ac21892b0 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 = "36cbacdd32916435391b4700c024074da3bcbe74"; - sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw="; + rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069"; + sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 7bab2858b652..ab21dcdc72fb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; faraday-em_http = { groups = ["default"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -127,10 +127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; 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 d65087cca737..b18bf07789b0 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 = "b875a21b4d5225b61cb525531d30eaf852db6237"; - sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q="; + rev = "bcaccbd845825e99c39060e3898e8d5ea1bba927"; + sha256 = "sha256-c/4oVDBhDiPrLSooU9TgDQJSij8i+QYCoNqDCicXPJk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index 0fcdf01d56f9..a00258a7e5af 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -2,5 +2,9 @@ source "https://rubygems.org" +# gem "rails" gem 'bcrypt', '3.1.3' gem 'unix-crypt', '1.3.0' +gem 'ffi', '1.15.5', require: false +gem 'ffi-compiler', '1.0.1', require: false +gem 'argon2', '2.1.1' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 2c9fb9049304..255d3f2d2401 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -1,15 +1,26 @@ GEM remote: https://rubygems.org/ specs: + argon2 (2.1.1) + ffi (~> 1.14) + ffi-compiler (~> 1.0) bcrypt (3.1.3) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + rake (13.0.6) unix-crypt (1.3.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES + argon2 (= 2.1.1) bcrypt (= 3.1.3) + ffi (= 1.15.5) + ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.2.20 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 4c46dfb181e7..962c10ad7db5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "91d6a008de91853becca01846aa4662bd227670e"; - sha256 = "sha256-aKj0zXyXDnG20qVdhGvn4fwXiBeHFj2pv4bTUP81MP0="; + rev = "7d33a57b4bd2a37badc64d5eca57d7ca01d62937"; + sha256 = "sha256-BDBXgsLVHYiSSjvN4Y13ffwfWk6nuVLoJE1YKgGmLTA="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 22b4053bbd4e..00877ed48199 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -1,4 +1,15 @@ { + argon2 = { + dependencies = ["ffi" "ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + type = "gem"; + }; + version = "2.1.1"; + }; bcrypt = { groups = ["default"]; platforms = []; @@ -9,6 +20,37 @@ }; version = "3.1.3"; }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; unix-crypt = { groups = ["default"]; platforms = []; 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 e3c52319d279..e4624104179b 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 = "e897702139b9c0dca40b9385427ba8bad0e1eae9"; - sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o="; + rev = "6534ceb4529f86499b4a77300c851a7f69f016e0"; + sha256 = "sha256-25vVNH9HRddDTiwqPtFo2JdE1Fo3hNMjXn5GMWA1jzs="; }; 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 e5d7259099ad..07c942303e7f 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 = "43536e4a4977718972a673dc2475ae07df9a0a45"; - sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4="; + rev = "e8caf83e0bcbb55effb86e99324aa15259f608cc"; + sha256 = "sha256-X3VU4TUth/6j/x9hVpw2GLRZHDCnDfxLbveZUQrFfVU="; }; 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 682032bb9d0f..ad9c2f91c837 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 = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c"; - sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE="; + rev = "836981c3d5c51353165a2dad05de5054fe7a1b77"; + sha256 = "sha256-UisVi+JKZovge0SFFlgxX4WXLOtWKX/RDMVR7Vrc8so="; }; 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 ebec54bc6e5d..5eaf0e18a6a6 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 = "17ba805a06ddfc27c6435eb20c0f8466f1708be8"; - sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s="; + rev = "e6cce5486df906ede74aa1b17ab308a145a99b88"; + sha256 = "sha256-hgoCPMlE5qJbdftwOW/zRcp8C7S0h/W2XrfFjLrNpgw="; }; 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 b4f7e000fd64..6b0a203c232f 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 = "4a07519cf9d7ac713f5e21ba770adb127524a22d"; - sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA="; + rev = "a1e4d543e1bafeb11cbb9d09a887ce210b7eecb8"; + sha256 = "sha256-lZUT+ix1mLomeIdYIOz1vgY6sLVSPOhM85/FkXZFfWc="; }; 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 4d0f71fdd7f6..ea5c172e6141 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 = "1da667721269ca01ef53c35ec0470486b490e72c"; - sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY="; + rev = "b6118e9e50a2bec6bbb995db235657c7097bfaa9"; + sha256 = "sha256-dXJS5ZcyBstE8mSTukUDg0H1ytEJs679wvVuojoUPY4="; }; 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 e38aa7f83571..bd4dbc6bd137 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 = "ef4855f6afa16ef86013bba7da8e50a63e11b493"; - sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y="; + rev = "76b35ac9b20725250140602e5d12a82b31383d35"; + sha256 = "sha256-RtmnRXh8AbKSe+kuBcORv5FcKYez7WU2owcW16LFCns="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 2766c3feadc0..b2116cc8ac3e 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/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 = '6.1.4.7' + rails_version = '7.0.3.1' gem 'actionmailer', rails_version gem 'actionpack', rails_version gem 'actionview', rails_version @@ -31,7 +31,9 @@ end gem 'json' -gem 'sprockets' +# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals +# This is a desired upgrade we should get to. +gem 'sprockets', '3.7.2' # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master @@ -39,7 +41,7 @@ gem 'actionview_precompiler', require: false gem 'seed-fu' -gem 'mail', git: 'https://github.com/discourse/mail.git', require: false +gem 'mail', git: 'https://github.com/discourse/mail.git' gem 'mini_mime' gem 'mini_suffix' @@ -66,7 +68,7 @@ gem 'http_accept_language', require: false gem 'discourse-ember-rails', '0.18.6', require: 'ember-rails' gem 'discourse-ember-source', '~> 3.12.2' gem 'ember-handlebars-template', '0.8.0' -gem 'discourse-fonts' +gem 'discourse-fonts', require: 'discourse_fonts' gem 'barber' @@ -103,7 +105,8 @@ gem 'omniauth-oauth2', require: false gem 'omniauth-google-oauth2' -gem 'oj' +# pending: https://github.com/ohler55/oj/issues/789 +gem 'oj', '3.13.14' gem 'pg' gem 'mini_sql' @@ -143,7 +146,6 @@ end # Allow everywhere for now cause we are allowing asset debugging in production group :assets do gem 'uglifier' - gem 'rtlit', require: false # for css rtling end group :test do @@ -168,7 +170,7 @@ group :test, :development do gem 'shoulda-matchers', require: false gem 'rspec-html-matchers' gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem "rubocop-discourse", require: false + gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse' gem 'parallel_tests' gem 'rswag-specs' @@ -188,7 +190,7 @@ if ENV["ALLOW_DEV_POPULATE"] == "1" gem 'discourse_dev_assets' gem 'faker', "~> 2.16" else - group :development do + group :development, :test do gem 'discourse_dev_assets' gem 'faker', "~> 2.16" end @@ -266,3 +268,7 @@ gem 'colored2', require: false gem 'maxminddb' gem 'rails_failover', require: false + +# workaround for faraday-net_http, see +# https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 +gem 'net-http' diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 4e832c8abdb1..95c706acab3f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -5,25 +5,36 @@ GIT mail (2.8.0.edge) mini_mime (>= 0.1.1) +GIT + remote: https://github.com/discourse/rubocop-discourse.git + revision: a5aea6e5f150b1eb7765a805bec0ff618cb718b3 + specs: + rubocop-discourse (2.5.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + GEM remote: https://rubygems.org/ specs: - actionmailer (6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -32,20 +43,19 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.1.4.7) - activesupport (= 6.1.4.7) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activesupport (6.1.4.7) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.2.0) @@ -53,23 +63,23 @@ GEM rake (>= 10.4, < 14.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.516.0) - aws-sdk-core (3.121.2) + aws-partitions (1.583.0) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) barber (0.12.2) ember-source (>= 1.0, < 3.1) @@ -80,10 +90,10 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.11.1) + bootsnap (1.13.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -94,7 +104,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.10) connection_pool (2.2.5) - cose (1.2.0) + cose (1.2.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.2) @@ -105,7 +115,8 @@ GEM addressable debug_inspector (1.1.0) diff-lcs (1.5.0) - diffy (3.4.0) + diffy (3.4.2) + digest (3.1.0) discourse-ember-rails (0.18.6) active_model_serializers ember-data-source (>= 1.0.0.beta.5) @@ -115,7 +126,7 @@ GEM railties (>= 3.1) discourse-ember-source (3.12.2.3) discourse-fonts (0.0.9) - discourse_dev_assets (0.0.3) + discourse_dev_assets (0.0.4) faker (~> 2.16) literate_randomizer docile (1.4.0) @@ -128,12 +139,12 @@ GEM barber (>= 0.11.0) sprockets (>= 3.3, < 4.1) ember-source (2.18.2) - erubi (1.10.0) - excon (0.92.2) + erubi (1.11.0) + excon (0.92.4) execjs (2.8.1) exifr (1.3.9) - fabrication (2.28.0) - faker (2.20.0) + fabrication (2.30.0) + faker (2.22.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) faraday (1.10.0) @@ -152,8 +163,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -175,7 +186,7 @@ GEM hkdf (0.3.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) @@ -183,23 +194,22 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.0.1) + image_size (3.0.2) in_threads (1.6.0) - ipaddr (1.2.4) jmespath (1.6.1) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.1) + json (2.6.2) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.20) + json_schemer (0.2.21) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.3.0) + jwt (2.4.1) kgio (2.11.4) libv8-node (16.10.0.0) listen (3.7.1) @@ -214,8 +224,8 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.0) - loofah (2.16.0) + logster (2.11.2) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -229,30 +239,46 @@ GEM mini_portile2 (2.8.0) mini_racer (0.6.2) libv8-node (~> 16.10.0.0) - mini_scheduler (0.13.0) + mini_scheduler (0.14.0) sidekiq (>= 4.2.3) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.15.0) - mocha (1.13.0) - msgpack (1.5.1) + minitest (5.16.2) + mocha (1.14.0) + msgpack (1.5.4) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.2.3) mustache (1.1.1) + net-http (0.2.2) + uri + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) - nokogiri (1.13.4) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oauth (0.5.8) + oauth (0.5.10) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.13.11) + oj (3.13.14) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -275,17 +301,16 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (2.2.1) - ipaddr - openssl-signature_algorithm (1.1.1) - openssl (~> 2.0) + openssl (3.0.0) + openssl-signature_algorithm (1.2.1) + openssl (> 2.0, < 3.1) optimist (3.0.1) parallel (1.22.1) - parallel_tests (3.8.1) + parallel_tests (3.11.1) parallel - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) - pg (1.3.5) + pg (1.4.3) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -300,17 +325,17 @@ GEM nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) - rack (2.2.3) + rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (2.2.0) + rack-protection (2.2.2) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails_failover (0.8.1) activerecord (> 6.0, < 7.1) @@ -319,12 +344,13 @@ GEM rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) raindrops (0.20.0) rake (13.0.6) @@ -336,16 +362,16 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.5.1) + redis (4.7.1) redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.3.0) + regexp_parser (2.5.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rqrcode (2.1.1) + rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -358,13 +384,13 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-html-matchers (0.9.4) + rspec-html-matchers (0.10.0) nokogiri (~> 1) - rspec (>= 3.0.0.a, < 4) + rspec (>= 3.0.0.a) rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.1) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -379,23 +405,20 @@ GEM activesupport (>= 3.1, < 7.1) json-schema (~> 2.2) railties (>= 3.1, < 7.1) - rtlit (0.0.5) - rubocop (1.27.0) + rubocop (1.34.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) ruby-prof (1.4.3) ruby-progressbar (1.11.0) ruby-readability (0.7.0) @@ -420,17 +443,17 @@ GEM activesupport (>= 3.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.1) + sidekiq (6.5.4) connection_pool (>= 2.2.2) rack (~> 2.0) - redis (>= 4.2.0) + redis (>= 4.5.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (4.0.3) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -438,46 +461,49 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.19) - test-prof (1.0.8) + stackprof (0.2.20) + strscan (3.0.4) + test-prof (1.0.9) thor (1.2.1) - tilt (2.0.10) - tzinfo (2.0.4) + tilt (2.0.11) + timeout (0.3.0) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.2.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) + uri (0.11.0) uri_template (0.7.0) - webmock (3.14.0) + webmock (3.17.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webpush (1.1.0) hkdf (~> 0.2) jwt (~> 2.0) - xorcist (1.1.2) + xorcist (1.1.3) yaml-lint (0.0.10) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - actionmailer (= 6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.1.4.7) - activerecord (= 6.1.4.7) - activesupport (= 6.1.4.7) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) addressable annotate aws-sdk-s3 @@ -537,8 +563,9 @@ DEPENDENCIES mocha multi_json mustache + net-http nokogiri - oj + oj (= 3.13.14) omniauth omniauth-facebook omniauth-github @@ -556,7 +583,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 6.1.4.7) + railties (= 7.0.3.1) rake rb-fsevent rbtrace @@ -571,8 +598,7 @@ DEPENDENCIES rspec-rails rss rswag-specs - rtlit - rubocop-discourse + rubocop-discourse! ruby-prof ruby-readability rubyzip @@ -583,7 +609,7 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets + sprockets (= 3.7.2) sprockets-rails sshkey stackprof diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 84f4c37dfb22..95a0d999a981 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1,14 +1,14 @@ { actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; + sha256 = "1wdh4av6w6calnvvms6r8w3k3gaw0xy1lgsrjjf5d5gxq09nk7y7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.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 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; + sha256 = "1f9y1qjnrwbwab3hf6nzlpr4v1fr1wq39l6dw3i1y3i6n8w04sb5"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; + sha256 = "1csycx6zlzrp6pw58s4nkm2qaz720cdhgxjkwjsd0qla75kvsyln"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; + sha256 = "03hn978lx6lasac267mincy6wwcir5gyix7gwrbvvk7rg7bsbmbk"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; + sha256 = "0s9gjs1a49n7rfhz84glw6w62swlrqdqjhs8421kaa72iwxavq16"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,21 +82,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; + sha256 = "1lb838wvarms8bs8hvfkccdsp4cjc0y9wjsxvw71h4ir3mys4jqg"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -145,10 +145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; + sha256 = "0bg0v08n9mgvpnvkx8aznrax25lkrfsi5sjfdlccm7dadnada5fg"; type = "gem"; }; - version = "1.516.0"; + version = "1.583.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -156,10 +156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc"; + sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; type = "gem"; }; - version = "3.121.2"; + version = "3.130.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm"; + sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; type = "gem"; }; - version = "1.44.0"; + version = "1.56.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -178,10 +178,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.96.1"; + version = "1.114.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2ggpwg7v0s0f4bw3887r5y92cbnrjld53lm69irqmx0h7q2564"; + sha256 = "0d3fhll3hqc23fvj7p0ncjrr0fri7spy21r0hfkqjhijm0q1xqg9"; type = "gem"; }; - version = "1.46.0"; + version = "1.53.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; barber = { dependencies = ["ember-source" "execjs"]; @@ -252,10 +252,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; + sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; type = "gem"; }; - version = "1.11.1"; + version = "1.13.0"; }; builder = { groups = ["default" "development" "test"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q90zk8di7a12by3d81nl78yy90rdml77vi3waxmgzqhvs6na4vj"; + sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2"; }; byebug = { groups = ["development" "test"]; @@ -372,10 +372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gx239d2fracq9az74wfdwmp5zm7zpzkcgchwnv2ng33d8r33p3m"; + sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; cppjieba_rb = { groups = ["default"]; @@ -444,10 +444,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; + sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.2"; + }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; }; discourse-ember-rails = { dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; @@ -482,14 +492,14 @@ }; discourse_dev_assets = { dependencies = ["faker" "literate_randomizer"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c6cxrf6kvv4pg6fsig71dn5nrzy7jxbxmyi8206m1ijgpj8nddg"; + sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1"; type = "gem"; }; - version = "0.0.3"; + version = "0.0.4"; }; docile = { groups = ["default" "test"]; @@ -563,20 +573,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba"; + sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; type = "gem"; }; - version = "0.92.2"; + version = "0.92.4"; }; execjs = { groups = ["assets" "default"]; @@ -603,21 +613,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; + sha256 = "0bxssmjp49whzq2zv7w751gr4nkdaiwcxd1vda0byigwyrnj6f5q"; type = "gem"; }; - version = "2.28.0"; + version = "2.30.0"; }; faker = { dependencies = ["i18n"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; + sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; type = "gem"; }; - version = "2.20.0"; + version = "2.22.0"; }; fakeweb = { groups = ["test"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -918,10 +928,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -939,10 +949,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130yn87pcnr5sblssm88hnvg8hc76isgrnhlf1d9355zhv4i2hsz"; + sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; in_threads = { groups = ["default"]; @@ -954,16 +964,6 @@ }; version = "1.6.0"; }; - ipaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; - type = "gem"; - }; - version = "1.2.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -980,20 +980,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkhm8lan1vnyl3ll0ks2q06576pdils8a1dr354vfc1y5dqw15i"; + sha256 = "0fdbln0w43n2b2kwhmm6w302iydgkd2hvw8pp0hnj0dykmy9vf54"; type = "gem"; }; - version = "4.4.0"; + version = "4.5.0"; }; json = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; type = "gem"; }; - version = "2.6.1"; + version = "2.6.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1012,20 +1012,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88"; + sha256 = "11dsw41f1zai3k8kxxjhmjlycwg67irqaqmiw4jbw12wdc6cxa6d"; type = "gem"; }; - version = "0.2.20"; + version = "0.2.21"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; kgio = { groups = ["default"]; @@ -1111,10 +1111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mamk8hgdhjcd33jf1w3j2kayvpyyscysvnmbhq3mw5kjji89cam"; + sha256 = "15kcv5agmash3szsl4aj5ns4daxp439w8czw0fvq4qgf92y4fi8s"; type = "gem"; }; - version = "2.11.0"; + version = "2.11.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; lru_redux = { groups = ["default"]; @@ -1248,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cy9c2wv19m4h2sv9fs66hh1an7hq3y9513678dzx43vm3kjvhz5"; + sha256 = "0g8mi0l90kkdvh45xz1gcmv3yzpj7d4dvgrhk8lg7lwn82d06yzw"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; mini_sql = { groups = ["default"]; @@ -1279,20 +1279,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; mocha = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; + sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; msgpack = { groups = ["default"]; @@ -1303,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.4"; }; multi_json = { groups = ["default"]; @@ -1333,10 +1333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; mustache = { groups = ["default"]; @@ -1348,6 +1348,61 @@ }; version = "1.1.1"; }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j4f0wgyps0qyms4p6fjqva63xy13wvy7bx5qg5gmzzwm3kqs1fr"; + type = "gem"; + }; + version = "0.2.2"; + }; + net-imap = { + dependencies = ["digest" "net-protocol" "strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + type = "gem"; + }; + version = "0.2.3"; + }; + net-pop = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + type = "gem"; + }; + version = "0.1.1"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; + net-smtp = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + type = "gem"; + }; + version = "0.3.1"; + }; nio4r = { groups = ["default"]; platforms = []; @@ -1364,20 +1419,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.13.4"; + version = "1.13.8"; }; oauth = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6nfg2pibc17fch0795d4bcy41a92im5zrsrgs31zdhrl6zf4w0"; + sha256 = "1asrxrbgzgzf1r9rb0c785zyyaq9v5z7v3k1avsais2sh9q1y763"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.10"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1395,10 +1450,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; + sha256 = "0bbbncvkqxbbi608vq2v7b3zzgrqac3syk403zhhbwrg352mv88q"; type = "gem"; }; - version = "3.13.11"; + version = "3.13.14"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1478,15 +1533,14 @@ version = "1.4.0"; }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; + sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1494,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173p9agv45hj62fdgl9bzqr9f6xg7hi2sf5iyd3ahiwbv220x332"; + sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; optimist = { groups = ["default"]; @@ -1529,10 +1583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7"; + sha256 = "1jgqdwfgd4g3mfi854f2n0v615z3n59l24nya7v6cdnaixn5x02y"; type = "gem"; }; - version = "3.8.1"; + version = "3.11.1"; }; parser = { dependencies = ["ast"]; @@ -1540,20 +1594,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; + sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.3"; }; progress = { groups = ["default"]; @@ -1648,10 +1702,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1670,10 +1724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; rack-test = { dependencies = ["rack"]; @@ -1681,10 +1735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1703,10 +1757,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1731,15 +1785,15 @@ version = "4.0.1"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; + sha256 = "0lnrhx0sdixz5xm2vi482ngs4alh8l725kh96v6mfk0x0qlbdsaw"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1828,10 +1882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw"; + sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; type = "gem"; }; - version = "4.5.1"; + version = "4.7.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -1849,10 +1903,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; request_store = { dependencies = ["rack"]; @@ -1901,10 +1955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; + sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rqrcode_core = { groups = ["default"]; @@ -1955,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0883rqv77n2wawnk5lp3la48l7pckyz8l013qddngzmksi5p1v3f"; + sha256 = "1bp9q28qw4xmxknrrp3ppcr08bbcnnand6r9prw4920407mvy96l"; type = "gem"; }; - version = "0.9.4"; + version = "0.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1977,10 +2031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; rspec-support = { groups = ["default" "development" "test"]; @@ -2014,26 +2068,16 @@ }; version = "2.5.1"; }; - rtlit = { - groups = ["assets"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0srfh7cl95srjiwbyc9pmn3w739zlvyj89hyj0bm7g92zrsd27qm"; - type = "gem"; - }; - version = "0.0.5"; - }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; + sha256 = "1n08wns7qaxja8g5fnixicybj1rdq3cjli33l7v1856saizp9lpf"; type = "gem"; }; - version = "1.27.0"; + version = "1.34.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2041,19 +2085,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; + sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g"; - type = "gem"; + fetchSubmodules = false; + rev = "a5aea6e5f150b1eb7765a805bec0ff618cb718b3"; + sha256 = "1h25i2ykp1m0j07ij0gq2p632ri01lnykwl3lcishmxncddcz247"; + type = "git"; + url = "https://github.com/discourse/rubocop-discourse.git"; }; version = "2.5.0"; }; @@ -2063,10 +2109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; + sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; type = "gem"; }; - version = "2.9.0"; + version = "2.12.1"; }; ruby-prof = { groups = ["development"]; @@ -2184,10 +2230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f"; + sha256 = "1zyq0faxkrk9jxqchzjlazpycjh8fg33h84qi654yv9c7a146r2z"; type = "gem"; }; - version = "6.4.1"; + version = "6.5.4"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2226,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "4.0.3"; + version = "3.7.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -2261,20 +2307,30 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19rnk17rz0lhf7l9awy0s7xxyw91ydcqxlx0576xvwyi79jh6a2m"; + sha256 = "17ih8nb2v4adihb8fihmja72f55dm0ds92j8asadsjm9mpci4bgc"; type = "gem"; }; - version = "0.2.19"; + version = "0.2.20"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00ip0m5ad5ywkj4na07qxcyi9wgdh6b877s0ibx5al23abzkxak9"; + type = "gem"; + }; + version = "3.0.4"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05"; + sha256 = "1xxw3w131mymawr94zkw5y5wgywix53rakfm0bq8s9ccqdx9mm9v"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; thor = { groups = ["default" "development" "test"]; @@ -2291,10 +2347,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; + type = "gem"; + }; + version = "0.3.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2302,10 +2368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; uglifier = { dependencies = ["execjs"]; @@ -2334,20 +2400,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; unicode-display_width = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2376,6 +2442,16 @@ }; version = "1.16.0"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w00162maixmqp7nwm8mmbvwnnpmjilwbim8yk2ypxy3x3ih6l69"; + type = "gem"; + }; + version = "0.11.0"; + }; uri_template = { groups = ["default"]; platforms = []; @@ -2392,10 +2468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk"; + sha256 = "06jbjl78szxkri3wx0mzsdhx2z2af11kp35k5rsrppchbssgagcj"; type = "gem"; }; - version = "3.14.0"; + version = "3.17.1"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -2413,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7hr3qyn1hczv9fglqc2cbaax0fb37gjjr0y24x19mmp817csdn"; + sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; yaml-lint = { groups = ["development"]; @@ -2433,9 +2509,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 64f374bad703..9fc14b177114 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -407,6 +407,7 @@ def update_plugins(): gemfile_text = '' for line in repo.get_file('plugin.rb', rev).splitlines(): if 'gem ' in line: + line = ','.join(filter(lambda x: ":require_name" not in x, line.split(','))) gemfile_text = gemfile_text + line + os.linesep version_file_match = version_file_regex.match(line) diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 284159dfc9ab..fb2fce8bdeb1 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; + # We need to do this in pre-configure before the data/ folder disappears. + preConfigure = '' + install -vDt $out/lib/udev/rules.d/ data/*-spice-webdavd.rules + ''; + meta = with lib; { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 90d4e0f509b9..c3eb53c3b207 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -13,6 +13,11 @@ python3Packages.buildPythonApplication rec { sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--flake8" "" + ''; + outputs = [ "out" "doc" "man" ]; nativeBuildInputs = [ ronn ]; @@ -20,7 +25,6 @@ python3Packages.buildPythonApplication rec { freezegun pytest pytest-cov - pytest-flake8 ]; propagatedBuildInputs = [