summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKerstin Humm <kerstin@erictapen.name>2021-11-06 01:00:29 +0100
committerKerstin <kerstin@erictapen.name>2022-02-02 17:52:23 +0100
commit2e9c247b9f83bfa78196ee74c7fcb70a5fa4a3a6 (patch)
tree1ea2ed136726b5f1c7cccaf6d82f652db0bf7f9e
parentMerge pull request #157853 from mdlayher/release-21.11 (diff)
downloadnixpkgs-2e9c247b9f83bfa78196ee74c7fcb70a5fa4a3a6.tar.gz
mastodon: 3.4.1 -> 3.4.4
update.sh --ver v3.4.4 --patches ./resolutions.patch (cherry picked from commit e67685910d38948bf62e64142306778f20743d45)
-rw-r--r--pkgs/servers/mastodon/package.json6
-rw-r--r--pkgs/servers/mastodon/source.nix4
-rw-r--r--pkgs/servers/mastodon/version.nix2
-rw-r--r--pkgs/servers/mastodon/version.patch4
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json
index 7d5400079091..b81940521c82 100644
--- a/pkgs/servers/mastodon/package.json
+++ b/pkgs/servers/mastodon/package.json
@@ -1,6 +1,6 @@
{
- "version": "3.4.1",
- "name": "@tootsuite/mastodon",
+ "version": "3.4.4",
+ "name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=12"
@@ -19,7 +19,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/tootsuite/mastodon.git"
+ "url": "https://github.com/mastodon/mastodon.git"
},
"browserslist": [
"last 2 versions",
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index be64ff23150d..4b1cd55b5e9e 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.1";
- sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5";
+ rev = "v3.4.4";
+ sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3";
};
in applyPatches {
inherit src;
diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix
index 4ccfa7d8ebc6..852b6be5f4b3 100644
--- a/pkgs/servers/mastodon/version.nix
+++ b/pkgs/servers/mastodon/version.nix
@@ -1 +1 @@
-"3.4.1"
+"3.4.4"
diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch
index 08bc2f827a8b..2d8d60071650 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.1",
- "name": "@tootsuite/mastodon",
++ "version": "3.4.4",
+ "name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {