diff options
| author | Kerstin Humm <kerstin@erictapen.name> | 2022-02-03 14:13:43 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-02-03 13:31:30 +0000 |
| commit | e35e1ea3480d4e7febaff46fe680b854afcbb1da (patch) | |
| tree | f7287170bc171c892d339786704face91d783702 | |
| parent | Merge pull request #157979 from NixOS/backport-157968-to-release-21.11 (diff) | |
| download | nixpkgs-origin/backport-157986-to-release-21.11.tar.gz | |
mastodon: 3.4.5 -> 3.4.6origin/backport-157986-to-release-21.11
fixes CVE-2022-24307
(cherry picked from commit a4944d382745fbbfab97882fbe441f8d7b5a298e)
| -rw-r--r-- | pkgs/servers/mastodon/package.json | 2 | ||||
| -rw-r--r-- | pkgs/servers/mastodon/source.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mastodon/version.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mastodon/version.patch | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json index fd7321fae529..4c3e64141fd3 100644 --- a/pkgs/servers/mastodon/package.json +++ b/pkgs/servers/mastodon/package.json @@ -1,5 +1,5 @@ { - "version": "3.4.5", + "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 66be9c5d34a9..921066e5df60 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.5"; - sha256 = "04zqvamlsrbmizjagkd1jqk474lqk13hh7cswc31f2mdw7zn8n6k"; + rev = "v3.4.6"; + sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 2e14fc68d209..77b242e89770 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.5" +"3.4.6" diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch index 4b04dc8280bf..2182de89b827 100644 --- a/pkgs/servers/mastodon/version.patch +++ b/pkgs/servers/mastodon/version.patch @@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag +++ b/package.json @@ -1,4 +1,5 @@ { -+ "version": "3.4.5", ++ "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { |