diff --git a/flake.lock b/flake.lock index d0baee66..070911d8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1642794634, - "narHash": "sha256-PGWzyTyNQcNGM9qu2vcamvxgMOiyXZGpryCouKpehUo=", + "lastModified": 1642847920, + "narHash": "sha256-Biz+1Se49klp1ntyqt1y41iow3F+0uIHjKvhfWJhL3s=", "owner": "accentor", "repo": "flake", - "rev": "3019d24aae75f9a90e13c54a1624a31806c80f8e", + "rev": "f6250dcbf00bfe7a2eed7fd36f60816ddaac09b1", "type": "github" }, "original": { diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index aeb4ee9c..58fafe86 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '~> 3.0.2' +ruby '~> 3.1.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.1' diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index ffc31809..765e298a 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -70,8 +70,8 @@ GEM rake (>= 10.4, < 14.0) ast (2.4.2) bcrypt (3.1.16) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.10.2) + msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) case_transform (0.2) @@ -82,10 +82,10 @@ GEM crass (1.0.6) delayed_cron_job (0.9.0) fugit (>= 1.5) - delayed_job (4.1.9) - activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.6) - activerecord (>= 3.0, < 6.2) + delayed_job (4.1.10) + activesupport (>= 3.0, < 8.0) + delayed_job_active_record (4.1.7) + activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) docile (1.4.0) erubi (1.10.0) @@ -128,7 +128,7 @@ GEM mini_portile2 (2.7.1) minitest (5.15.0) mocha (1.13.0) - msgpack (1.4.2) + msgpack (1.4.4) nio4r (2.5.8) nokogiri (1.13.1) mini_portile2 (~> 2.7.0) @@ -262,7 +262,7 @@ DEPENDENCIES will_paginate (~> 3.3) RUBY VERSION - ruby 3.0.2p107 + ruby 3.1.0p0 BUNDLED WITH - 2.2.22 + 2.3.3 diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 71dce3b7..83e382b9 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -35,7 +35,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "/j5YIpuaT4Io8gH0HgZYH2M2vrgqPO9mcNDSRR+cCfg="; + sha256 = "SnA8YC+RAZKcjy68kgl0CusvXWowj3LCqjLxqrB+h5w="; }; }); webPackage = (pkgs.accentor-web.override { @@ -47,7 +47,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "I303AVzZAmw9sT4t3DGUlhkx6uRUb/IDMZmo6cl4p5Q="; + sha256 = "qSnenPKb2GZilIp1CGg8SKObjMKZfJ7s8w9UuhbX8h4="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 605dbd33..b0b85aad 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -168,10 +168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "18j6zbw26y9kf4b2ihprg380jzw97mm9h17nhd8jvsmdxhvz4yvv"; type = "gem"; }; - version = "1.9.4"; + version = "1.10.2"; }; builder = { groups = [ "default" "development" "test" ]; @@ -263,10 +263,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19ym3jw2jj1pxm6p22x2mpf69sdxiw07ddr69v92ccgg6d7q87rh"; + sha256 = "1f1vzxi1xcm1mq7nw3xr9j4q6a5pr5xply15s0n1hl1gahsgnlfa"; type = "gem"; }; - version = "4.1.9"; + version = "4.1.10"; }; delayed_job_active_record = { dependencies = [ "activerecord" "delayed_job" ]; @@ -274,10 +274,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n6wjvk0yfkp1z19kvma7piasw1xgjh5ls51sf24c8g1jlmkmvdh"; + sha256 = "0wh1146hg0b85zv336dn00jx9mzw5ma0maj67is7bvz5l35hd6yk"; type = "gem"; }; - version = "4.1.6"; + version = "4.1.7"; }; docile = { groups = [ "default" "test" ]; @@ -526,10 +526,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; + sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.4"; }; nio4r = { groups = [ "default" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 44866fa2..50b7c460 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -1,6 +1,6 @@ { "name": "accentor", - "version": "0.29.0", + "version": "0.30.0", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -9,7 +9,7 @@ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" }, "dependencies": { - "@accentor/api-client-js": "^0.16.0", + "@accentor/api-client-js": "^0.17.0", "@mdi/font": "^6.5.95", "@mdi/svg": "^6.5.95", "fetch-retry": "^5.0.1", @@ -19,7 +19,7 @@ "roboto-fontface": "^0.10.0", "vue": "^2.6.14", "vue-global-events": "^1.2.1", - "vue-i18n": "^8.26.8", + "vue-i18n": "^8.27.0", "vue-meta": "^2.4.0", "vue-router": "^3.5.3", "vuedraggable": "^2.24.3", @@ -39,7 +39,7 @@ "eslint-plugin-vue": "^8.3.0", "eslint-plugin-vuetify": "^1.1.0", "prettier": "^2.5.1", - "sass": "^1.48.0", + "sass": "^1.49.0", "sass-loader": "^10.1.1", "vue-cli-plugin-i18n": "^2.3.1", "vue-cli-plugin-vuetify": "^2.4.5", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index dd859ed1..ca97154e 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@accentor/api-client-js@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.16.0.tgz#1d6b8efe8b5d28cab0cfd6cb9b50cbf622801ee6" - integrity sha512-DUTDstzKGqMv4VKe4Hx81svGTkQ/0NC89euGjm1OOJy0dlzjTtDgUuI0mxHz6gvg1V1jx4n6fx0LKwoneE3sTA== +"@accentor/api-client-js@^0.17.0": + version "0.17.0" + resolved "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.17.0.tgz#00da18459362e025d3897dde21ff5eeb222c137a" + integrity sha512-AcbgwmleguHmk6uQ7fXrpFUgPy9TDZy7ksX7UryplAm9TJfreNuzAAz9ho1ChmEPBggHBALoU8a33OL+v/dC/g== dependencies: fetch-retry "^4.1.1" @@ -7337,10 +7337,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.48.0: - version "1.48.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.48.0.tgz#b53cfccc1b8ab4be375cc54f306fda9d4711162c" - integrity sha512-hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw== +sass@^1.49.0: + version "1.49.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078" + integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -8534,10 +8534,10 @@ vue-i18n-extract@1.0.2: is-valid-glob "^1.0.0" yargs "^13.2.2" -vue-i18n@^8.17.0, vue-i18n@^8.26.8: - version "8.26.8" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.26.8.tgz#afe936adbf96ff0e9808e04845b8f41cc21c666f" - integrity sha512-BN2OXolO15AKS95yNF8oOtARibaO6RxyKkAYNV4XpOmL7S4eVZYMIDtyvDv+XGZaiUmBJSH9mdNqzexvGMnK2A== +vue-i18n@^8.17.0, vue-i18n@^8.27.0: + version "8.27.0" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.0.tgz#3e3b3ed2c107ccbd7f20dbdd7a96763a9990253e" + integrity sha512-SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw== "vue-loader-v16@npm:vue-loader@^16.1.0": version "16.2.0" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 6f828dc6..d078a1cb 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -2,11 +2,11 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_accentor_api_client_js___api_client_js_0.16.0.tgz"; + name = "_accentor_api_client_js___api_client_js_0.17.0.tgz"; path = fetchurl { - name = "_accentor_api_client_js___api_client_js_0.16.0.tgz"; - url = "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.16.0.tgz"; - sha512 = "DUTDstzKGqMv4VKe4Hx81svGTkQ/0NC89euGjm1OOJy0dlzjTtDgUuI0mxHz6gvg1V1jx4n6fx0LKwoneE3sTA=="; + name = "_accentor_api_client_js___api_client_js_0.17.0.tgz"; + url = "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.17.0.tgz"; + sha512 = "AcbgwmleguHmk6uQ7fXrpFUgPy9TDZy7ksX7UryplAm9TJfreNuzAAz9ho1ChmEPBggHBALoU8a33OL+v/dC/g=="; }; } { @@ -7938,11 +7938,11 @@ }; } { - name = "sass___sass_1.48.0.tgz"; + name = "sass___sass_1.49.0.tgz"; path = fetchurl { - name = "sass___sass_1.48.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.48.0.tgz"; - sha512 = "hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw=="; + name = "sass___sass_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz"; + sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; }; } { @@ -9282,11 +9282,11 @@ }; } { - name = "vue_i18n___vue_i18n_8.26.8.tgz"; + name = "vue_i18n___vue_i18n_8.27.0.tgz"; path = fetchurl { - name = "vue_i18n___vue_i18n_8.26.8.tgz"; - url = "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.26.8.tgz"; - sha512 = "BN2OXolO15AKS95yNF8oOtARibaO6RxyKkAYNV4XpOmL7S4eVZYMIDtyvDv+XGZaiUmBJSH9mdNqzexvGMnK2A=="; + name = "vue_i18n___vue_i18n_8.27.0.tgz"; + url = "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.0.tgz"; + sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; }; } { diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix index 55978278..05707c22 100644 --- a/shells/accentor-api.nix +++ b/shells/accentor-api.nix @@ -6,7 +6,7 @@ pkgs.mkShell { ffmpeg imagemagick postgresql - ruby_3_0 + ruby_3_1 taglib zlib (