From 0e3c2a3b9efa91c65e6ff802a76fdb5a03811565 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 24 Jul 2021 13:57:19 +0200 Subject: [PATCH] Update accentor --- flake.lock | 6 ++--- modules/services/accentor/Gemfile | 2 +- modules/services/accentor/Gemfile.lock | 8 +++--- modules/services/accentor/default.nix | 4 +-- modules/services/accentor/gemset.nix | 12 ++++----- modules/services/accentor/package.json | 6 ++--- modules/services/accentor/update.sh | 8 +++--- modules/services/accentor/yarn.lock | 36 +++++++++++++------------- modules/services/accentor/yarn.nix | 32 +++++++++++------------ 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 6a7625d1..7d7a5bb3 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1627088262, - "narHash": "sha256-08/bLnIvlActZM2GASLU4jeldhFb4bZH76T7fgYYH4A=", + "lastModified": 1627117072, + "narHash": "sha256-HOsnsguL9HBPsXRTzmx55KKpBgGUm4MSnkorTcInjDI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f37b084e6f483df1f0a9c0cd01c87b1671f3cd81", + "rev": "0772ac0f16bc09c470d002fd2c2b7f3fa6044204", "type": "github" }, "original": { diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 1625bcfa..1a1ea94b 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -54,7 +54,7 @@ group :development do gem 'rubocop-minitest', '~> 0.14.0' gem 'rubocop-rails', '~> 2.11' - gem 'listen', '>= 3.1.5', '< 3.6' + gem 'listen', '>= 3.1.5', '< 3.7' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', '~> 2.1' gem 'spring-watcher-listen', '~> 2.0' diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index 9866b88b..7dbfa370 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -96,7 +96,7 @@ GEM railties (>= 5.0.0) faker (2.18.0) i18n (>= 1.6, < 2) - ffi (1.15.0) + ffi (1.15.3) globalid (0.4.2) activesupport (>= 4.2.0) has_scope (0.8.0) @@ -108,7 +108,7 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) jsonapi-renderer (0.2.2) - listen (3.5.1) + listen (3.6.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.10.0) @@ -170,7 +170,7 @@ GEM thor (~> 1.0) rainbow (3.0.0) rake (13.0.3) - rb-fsevent (0.10.4) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) regexp_parser (2.1.1) @@ -239,7 +239,7 @@ DEPENDENCIES faker (~> 2.18) has_scope (~> 0.8) image_processing (~> 1.12.1) - listen (>= 3.1.5, < 3.6) + listen (>= 3.1.5, < 3.7) mocha (~> 1.13.0) pg (>= 1.2.3, < 2.0) puma (~> 5.3) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index bdd10859..35ecbb71 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -31,7 +31,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "02pxpiyjhjx3b40ms4b186yfmad5rml6s6z4ic1vkjywf4c6mw0b"; + sha256 = "187fyb7kbv99nszhcgad63xr8sn6xzzggbpzyfxh27v8wsncaadg"; }; }); webPackage = (pkgs.accentor-web.override { @@ -43,7 +43,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "1diskihd334q39h9zm9c63y95zlx6d95gk6lg3qh42yf3h74ljgr"; + sha256 = "1sgj0ny0iiq1mx3x0nqb6dk67k03bbvahvn9xay3nl34kl5f1lgr"; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 790cbc9e..66772f92 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -337,10 +337,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; globalid = { dependencies = [ "activesupport" ]; @@ -402,10 +402,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; loofah = { dependencies = [ "crass" "nokogiri" ]; @@ -694,10 +694,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; + sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.0"; }; rb-inotify = { dependencies = [ "ffi" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 3f62bd0f..583182fb 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -20,7 +20,7 @@ "vue-meta": "^2.4.0", "vue-router": "^3.5.2", "vuedraggable": "^2.24.3", - "vuetify": "^2.5.6", + "vuetify": "^2.5.7", "vuex": "^3.6.2", "vuex-persist": "^3.1.3" }, @@ -33,10 +33,10 @@ "babel-eslint": "^10.1.0", "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-vue": "^7.13.0", + "eslint-plugin-vue": "^7.14.0", "eslint-plugin-vuetify": "^1.0.1", "prettier": "^2.3.2", - "sass": "^1.35.2", + "sass": "^1.36.0", "sass-loader": "^10.1.1", "vue-cli-plugin-i18n": "^2.1.0", "vue-cli-plugin-vuetify": "^2.4.1", diff --git a/modules/services/accentor/update.sh b/modules/services/accentor/update.sh index 3a346384..391dfe89 100755 --- a/modules/services/accentor/update.sh +++ b/modules/services/accentor/update.sh @@ -1,8 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -p curl yarn2nix bundix -i bash -curl -L -O https://github.com/accentor/api/raw/develop/Gemfile -curl -L -O https://github.com/accentor/api/raw/develop/Gemfile.lock -curl -L -O https://github.com/accentor/web/raw/develop/package.json -curl -L -O https://github.com/accentor/web/raw/develop/yarn.lock +curl -L -O https://github.com/accentor/api/raw/main/Gemfile +curl -L -O https://github.com/accentor/api/raw/main/Gemfile.lock +curl -L -O https://github.com/accentor/web/raw/main/package.json +curl -L -O https://github.com/accentor/web/raw/main/yarn.lock yarn2nix --lockfile yarn.lock --no-patch > yarn.nix bundix -l diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 55cc8c6e..7fb51a8b 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -3472,15 +3472,15 @@ eslint-plugin-prettier@^3.4.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-vue@^7.0.0, eslint-plugin-vue@^7.13.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz#6f3d232bf1fcd0428353b0d581ebaca1c5dbc17a" - integrity sha512-u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg== +eslint-plugin-vue@^7.0.0, eslint-plugin-vue@^7.14.0: + version "7.14.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz#8c00f211064bd2708fc1aa4abd0592538fbb2cb1" + integrity sha512-IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" - semver "^7.3.2" - vue-eslint-parser "^7.8.0" + semver "^6.3.0" + vue-eslint-parser "^7.9.0" eslint-plugin-vuetify@^1.0.1: version "1.0.1" @@ -7194,10 +7194,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.35.2: - version "1.35.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821" - integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw== +sass@^1.36.0: + version "1.36.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz#5912ef9d5d16714171ba11cb17edb274c4bbc07e" + integrity sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg== dependencies: chokidar ">=3.0.0 <4.0.0" @@ -8331,10 +8331,10 @@ vue-cli-plugin-vuetify@^2.4.1: semver "^7.1.2" shelljs "^0.8.3" -vue-eslint-parser@^7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz#43850bf856c9a69d62c0e12769609c338423684b" - integrity sha512-ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ== +vue-eslint-parser@^7.9.0: + version "7.9.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz#5eeedc71f22ebc7b18b957d1ab171acf29a41e64" + integrity sha512-QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg== dependencies: debug "^4.1.1" eslint-scope "^5.1.1" @@ -8440,10 +8440,10 @@ vuetify-loader@^1.7.2: file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@^2.5.6: - version "2.5.6" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.6.tgz#9cbb1eacece6c42028216312b9be23e35a7f5cf4" - integrity sha512-2T8ML5PYuJ/AdMVH3ZIvzHnsM0nX8t4Xzj+0HFFGfLT7jLlptCFpG+JE8+kyrgGZlbUgulyOwCUu8hJkVsReFA== +vuetify@^2.5.7: + version "2.5.7" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.7.tgz#0c7cfa143bffa6a14ef3ca5cfd8f2135713f4360" + integrity sha512-3Hn7X6FFtQetc6qy8GcMDKbZRKbiBMDBsYuUjDS4EdpDvHBDTMySpzBWqBNuPjPHRaT3XSrQfoYN84vGDg87Ug== vuex-persist@^3.1.3: version "3.1.3" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 8c749b22..91c3129b 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -3530,11 +3530,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_7.13.0.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.14.0.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz"; - sha1 = "6f3d232bf1fcd0428353b0d581ebaca1c5dbc17a"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; + sha1 = "8c00f211064bd2708fc1aa4abd0592538fbb2cb1"; }; } { @@ -7778,11 +7778,11 @@ }; } { - name = "sass___sass_1.35.2.tgz"; + name = "sass___sass_1.36.0.tgz"; path = fetchurl { - name = "sass___sass_1.35.2.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz"; - sha1 = "b732314fcdaf7ef8d0f1698698adc378043cb821"; + name = "sass___sass_1.36.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz"; + sha1 = "5912ef9d5d16714171ba11cb17edb274c4bbc07e"; }; } { @@ -9066,11 +9066,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.8.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.9.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.8.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz"; - sha1 = "43850bf856c9a69d62c0e12769609c338423684b"; + name = "vue_eslint_parser___vue_eslint_parser_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; + sha1 = "5eeedc71f22ebc7b18b957d1ab171acf29a41e64"; }; } { @@ -9178,11 +9178,11 @@ }; } { - name = "vuetify___vuetify_2.5.6.tgz"; + name = "vuetify___vuetify_2.5.7.tgz"; path = fetchurl { - name = "vuetify___vuetify_2.5.6.tgz"; - url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.6.tgz"; - sha1 = "9cbb1eacece6c42028216312b9be23e35a7f5cf4"; + name = "vuetify___vuetify_2.5.7.tgz"; + url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.7.tgz"; + sha1 = "0c7cfa143bffa6a14ef3ca5cfd8f2135713f4360"; }; } {