alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mastodon: 3.4.0 -> 3.4.1

Browse source 
update.sh --ver v3.4.1 --patches ./resolutions.patch
This commit is contained in:
Kerstin Humm 2021-06-03 22:48:58 +02:00 committed by erictapen
parent 97ee9d357c
commit 7c9a0fb960
7 changed files with 670 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
pkgs/servers/mastodon/gemset.nix
View file

@ -230,10 +230,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";
type = "gem";
};
version = "1.452.0";
version = "1.465.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -263,10 +263,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9";
sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv";
type = "gem";
};
version = "1.94.1";
version = "1.95.1";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -875,10 +875,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6";
sha256 = "1hwir9b9zy0asy0vap7zfqv75lbws4a1pmh74lhqd2rndv32vfc5";
type = "gem";
};
version = "2.17.0";
version = "2.18.0";
};
faraday = {
dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
@ -1170,10 +1170,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mq67if5lq388raxa5rh43z6g5zlqh9yixcja4s81p9dzrsj4i3x";
sha256 = "1dr7cj8km01kjsiwrx7n3qxr264ga13ll15s4h9dbbyj5m8kxqd2";
type = "gem";
};
version = "1.4.3";
version = "1.5.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
@ -1524,14 +1524,15 @@
version = "1.0.3";
};
mini_portile2 = {
dependencies = ["net-ftp"];
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
sha256 = "0a2y04km3aciybk12yimkqn0ycrzy23iygl116n7addix9xdii3s";
type = "gem";
};
version = "2.5.1";
version = "2.5.2";
};
minitest = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@ -1573,6 +1574,17 @@
};
version = "2.1.1";
};
net-ftp = {
dependencies = ["net-protocol" "time"];
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gx09b00k454fgn7q41r9xs5j5v9qj8xhfxnm650cns1ywcmzkil";
type = "gem";
};
version = "0.1.2";
};
net-ldap = {
groups = ["default"];
platforms = [];
@ -1583,6 +1595,16 @@
};
version = "0.17.0";
};
net-protocol = {
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01wxv9sl2lcf5212vqzblw9k241ga54cppi4dk5y9ylhllbqag8a";
type = "gem";
};
version = "0.1.0";
};
net-scp = {
dependencies = ["net-ssh"];
groups = ["default" "development"];
@ -1620,10 +1642,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
type = "gem";
};
version = "1.11.3";
version = "1.11.6";
};
nokogumbo = {
dependencies = ["nokogiri"];
@ -1927,10 +1949,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
type = "gem";
};
version = "5.3.0";
version = "5.3.2";
};
pundit = {
dependencies = ["activesupport"];
@ -2332,10 +2354,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0chjr6i0g7frbp7dhi4d83ppf7akkdaw7mcgcwbxd6a9mairafpp";
sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
type = "gem";
};
version = "1.14.0";
version = "1.15.0";
};
rubocop-ast = {
dependencies = ["parser"];
@ -2493,10 +2515,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dzwz30gr2mjdr70gnz2mmplhfqldz0jhdw1n3ric0y3yj81m02d";
sha256 = "1m8l8mwvbf6cdd7jqy0l6cg2zxi1qs8ya78jail8pvi4ay7hglm1";
type = "gem";
};
version = "7.0.9";
version = "7.0.11";
};
simple-navigation = {
dependencies = ["activesupport"];
@ -2504,10 +2526,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pkj5z48k90v9v53gckl1b0jsix08kpl6qkgsd4pkc7cva8dbqid";
sha256 = "0izbisjc4ng77v79x6jv1z3a8fkpdb5isgjcrx60d8vl743x7hab";
type = "gem";
};
version = "4.1.0";
version = "4.3.0";
};
simple_form = {
dependencies = ["actionpack" "activemodel"];
@ -2688,6 +2710,16 @@
};
version = "2.0.10";
};
time = {
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ayfwm8b0c6n0z34vwfpmy83lf1gd0mq7jbybzarkqp2ylmdlzvy";
type = "gem";
};
version = "0.1.0";
};
tpm-key_attestation = {
dependencies = ["bindata" "openssl-signature_algorithm"];
groups = ["default"];
@ -2853,10 +2885,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0";
sha256 = "0zd5aid4ya47xlfsaf1mlf83vkyljpnsvgwqhchf0cs7353kdss9";
type = "gem";
};
version = "3.12.2";
version = "3.13.0";
};
webpacker = {
dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"];
@ -2864,10 +2896,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xpjdbcnsapk9y1hbryxan3a0yks37j59l3ifpmlfrqfxp08anvr";
sha256 = "0bs6m6annfb2pazb5wb2l3lbnkaa4438ixldnamlx9hg7z3j646h";
type = "gem";
};
version = "5.3.0";
version = "5.4.0";
};
webpush = {
dependencies = ["hkdf" "jwt"];

38
pkgs/servers/mastodon/package.json
View file

@ -1,5 +1,5 @@
{
"version": "3.4.0",
"version": "3.4.1",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
@ -60,11 +60,11 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-decorators": "^7.13.15",
"@babel/core": "^7.14.3",
"@babel/plugin-proposal-decorators": "^7.14.2",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.1",
"@babel/plugin-transform-runtime": "^7.14.3",
"@babel/preset-env": "^7.14.4",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@gamestdio/websocket": "^0.3.2",
@ -85,11 +85,11 @@
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
"css-loader": "^5.2.4",
"css-loader": "^5.2.6",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
"dotenv": "^9.0.1",
"emoji-mart": "Gargron/emoji-mart#build",
"dotenv": "^9.0.2",
"emoji-mart": "^3.0.1",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
@ -138,9 +138,9 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^4.3.0",
"react-select": "^4.3.1",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.9",
"react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.2",
"react-toggle": "^4.1.2",
"redis": "^3.1.2",
@ -152,8 +152,8 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.32.12",
"sass-loader": "^10.1.1",
"sass": "^1.34.0",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
"substring-trie": "^1.0.2",
@ -165,23 +165,23 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
"ws": "^7.4.5",
"ws": "^7.4.6",
"kind-of": "^6.0.3"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@testing-library/react": "^11.2.7",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.26.0",
"eslint-plugin-import": "~2.22.1",
"babel-jest": "^27.0.2",
"eslint": "^7.27.0",
"eslint-plugin-import": "~2.23.4",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~5.1.0",
"eslint-plugin-react": "~7.23.2",
"eslint-plugin-react": "~7.24.0",
"jest": "^26.6.3",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",

14
pkgs/servers/mastodon/resolutions.patch
View file

@ -1,13 +1,13 @@
diff --git a/package.json b/package.json
index 5bc1f6bf3..8cc22a403 100644
index f485b1370..ce8e42699 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,8 @@
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
- "ws": "^7.4.5"
+ "ws": "^7.4.5",
- "ws": "^7.4.6"
+ "ws": "^7.4.6",
+ "kind-of": "^6.0.3"
},
"devDependencies": {
@ -23,12 +23,12 @@ index 5bc1f6bf3..8cc22a403 100644
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.5"
diff --git a/yarn.lock b/yarn.lock
index 6c8bcf549..bda3adbe8 100644
index b8ea0f369..32e929c0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0:
@@ -5939,6 +5939,11 @@ is-boolean-object@^1.1.0:
dependencies:
binary-extensions "^2.0.0"
call-bind "^1.0.2"
+is-buffer@^1.1.5:
+ version "1.1.6"
@ -38,7 +38,7 @@ index 6c8bcf549..bda3adbe8 100644
is-callable@^1.1.4, is-callable@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
@@ -6769,7 +6774,26 @@ killable@^1.0.1:
@@ -6971,7 +6976,26 @@ killable@^1.0.1:
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==

4
pkgs/servers/mastodon/source.nix
View file

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/tootsuite/mastodon.git";
rev = "v3.4.0";
sha256 = "0wa1j4iin6nlb1p5lxzgldzgr0vhrmm835gj2zqadw37vpsxdis3";
rev = "v3.4.1";
sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5";
};
in applyPatches {
inherit src;

2
pkgs/servers/mastodon/version.nix
View file

@ -1 +1 @@
"3.4.0"
"3.4.1"

2
pkgs/servers/mastodon/version.patch
View file

@ -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.0",
+ "version": "3.4.1",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {

944
pkgs/servers/mastodon/yarn.nix
View file

File diff suppressed because it is too large Load diff