Update accentor

This commit is contained in:
Charlotte Van Petegem 2021-01-30 12:53:31 +01:00
parent 82e35eff21
commit 6cad091611
No known key found for this signature in database
GPG key ID: 019E764B7184435A
6 changed files with 71 additions and 39 deletions

View file

@ -7,7 +7,7 @@ let
owner = "accentor"; owner = "accentor";
repo = "web"; repo = "web";
rev = "develop"; rev = "develop";
sha256 = "0amwp8zzi8mz3k8fvf50zxl88haxxxl9dkwv2ll0swzp5n2ysmks"; sha256 = "1s0wjkq33yn26nlrhjcafljg3kkckcbn646bf66c9mrq566y753i";
}; };
yarnNix = ./accentor/yarn.nix; yarnNix = ./accentor/yarn.nix;
buildPhase = '' buildPhase = ''
@ -24,7 +24,7 @@ let
owner = "accentor"; owner = "accentor";
repo = "api"; repo = "api";
rev = "develop"; rev = "develop";
sha256 = "0fqxz33cxw3k4swm2rh5q8yxmnq6wny6pv4gy467rsdqvj8h5l1f"; sha256 = "1bnmchsp37sssayqldh03nzqgi8xwdjdlxxffm1ld4ap9nhklanf";
}; };
gems = pkgs.bundlerEnv { gems = pkgs.bundlerEnv {
name = "accentor-api-env"; name = "accentor-api-env";

View file

@ -10,7 +10,7 @@ gem 'rack', '~> 2.1.4'
# Use postgresql as the database for Active Record # Use postgresql as the database for Active Record
gem 'pg', '>= 1.2.3', '< 2.0' gem 'pg', '>= 1.2.3', '< 2.0'
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 5.1' gem 'puma', '~> 5.2'
# Use ActiveModelSerializer for serializing to JSON # Use ActiveModelSerializer for serializing to JSON
gem 'active_model_serializers', '~> 0.10' gem 'active_model_serializers', '~> 0.10'
# Use Redis adapter to run Action Cable in production # Use Redis adapter to run Action Cable in production
@ -38,9 +38,9 @@ gem 'bootsnap', '>= 1.4.6', require: false
gem 'rack-cors', '~> 1.1' gem 'rack-cors', '~> 1.1'
group :test do group :test do
gem 'codecov', '~> 0.3.0', require: false gem 'codecov', '~> 0.4.2', require: false
gem 'mocha', '~> 1.12.0', require: false gem 'mocha', '~> 1.12.0', require: false
gem 'simplecov', '~> 0.20', require: false gem 'simplecov', '~> 0.21', require: false
end end
group :development, :test do group :development, :test do

View file

@ -70,13 +70,13 @@ GEM
rake (>= 10.4, < 14.0) rake (>= 10.4, < 14.0)
ast (2.4.1) ast (2.4.1)
bcrypt (3.1.16) bcrypt (3.1.16)
bootsnap (1.5.1) bootsnap (1.6.0)
msgpack (~> 1.0) msgpack (~> 1.0)
builder (3.2.4) builder (3.2.4)
byebug (11.1.3) byebug (11.1.3)
case_transform (0.2) case_transform (0.2)
activesupport activesupport
codecov (0.3.0) codecov (0.4.2)
simplecov (>= 0.15, < 0.22) simplecov (>= 0.15, < 0.22)
concurrent-ruby (1.1.7) concurrent-ruby (1.1.7)
crass (1.0.6) crass (1.0.6)
@ -125,7 +125,7 @@ GEM
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.14.3) minitest (5.14.3)
mocha (1.12.0) mocha (1.12.0)
msgpack (1.3.3) msgpack (1.4.1)
nio4r (2.5.4) nio4r (2.5.4)
nokogiri (1.11.1) nokogiri (1.11.1)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
@ -134,7 +134,7 @@ GEM
parser (3.0.0.0) parser (3.0.0.0)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.2.3) pg (1.2.3)
puma (5.1.1) puma (5.2.0)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.1.0) pundit (2.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -197,7 +197,7 @@ GEM
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-vips (2.0.17) ruby-vips (2.0.17)
ffi (~> 1.9) ffi (~> 1.9)
simplecov (0.20.0) simplecov (0.21.2)
docile (~> 1.1) docile (~> 1.1)
simplecov-html (~> 0.11) simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1) simplecov_json_formatter (~> 0.1)
@ -234,7 +234,7 @@ DEPENDENCIES
bcrypt (~> 3.1) bcrypt (~> 3.1)
bootsnap (>= 1.4.6) bootsnap (>= 1.4.6)
byebug byebug
codecov (~> 0.3.0) codecov (~> 0.4.2)
delayed_cron_job (~> 0.7) delayed_cron_job (~> 0.7)
delayed_job_active_record (~> 4.1) delayed_job_active_record (~> 4.1)
factory_bot_rails (~> 6.1) factory_bot_rails (~> 6.1)
@ -244,14 +244,14 @@ DEPENDENCIES
listen (>= 3.1.5, < 3.5) listen (>= 3.1.5, < 3.5)
mocha (~> 1.12.0) mocha (~> 1.12.0)
pg (>= 1.2.3, < 2.0) pg (>= 1.2.3, < 2.0)
puma (~> 5.1) puma (~> 5.2)
pundit (~> 2.1) pundit (~> 2.1)
rack (~> 2.1.4) rack (~> 2.1.4)
rack-cors (~> 1.1) rack-cors (~> 1.1)
rails (~> 6.1) rails (~> 6.1)
rubocop-minitest (~> 0.10.3) rubocop-minitest (~> 0.10.3)
rubocop-rails (~> 2.9) rubocop-rails (~> 2.9)
simplecov (~> 0.20) simplecov (~> 0.21)
spring (~> 2.1) spring (~> 2.1)
spring-watcher-listen (~> 2.0) spring-watcher-listen (~> 2.0)
tzinfo-data tzinfo-data

View file

@ -168,10 +168,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qx1f729bgh391agsqb4ngzn22wdn4cc6mkp0cipf0d5hsg9cpaq"; sha256 = "0jkh8qrsz3nhz759jwlfa20xkizn63yxym2db0c8ayjxzldyc77z";
type = "gem"; type = "gem";
}; };
version = "1.5.1"; version = "1.6.0";
}; };
builder = { builder = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -218,10 +218,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1a2yraa3fyvpjx56ymgzc7vzr8g3m1aqgm60svam16yqplg1b3wr"; sha256 = "0g8mqxz46rhbfvlw639bnak547p25npbsykxa2d7m53ky32gbwbc";
type = "gem"; type = "gem";
}; };
version = "0.3.0"; version = "0.4.2";
}; };
concurrent-ruby = { concurrent-ruby = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
@ -512,10 +512,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; sha256 = "0f99zvxg9q3hv69ypi08jlpc1h0jx110dgvrk22wcn3jvm6s4jyz";
type = "gem"; type = "gem";
}; };
version = "1.3.3"; version = "1.4.1";
}; };
nio4r = { nio4r = {
groups = ["default"]; groups = ["default"];
@ -575,10 +575,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; sha256 = "0fmcz4dp7ggkv1h4n51vn1gq0r4zbkw7sr2ssl4ws1khb86grkv5";
type = "gem"; type = "gem";
}; };
version = "5.1.1"; version = "5.2.0";
}; };
pundit = { pundit = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
@ -809,10 +809,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mm20dvd64w46l5k11il9z5sjgdpp0bknml76glcngvl2w03k3cb"; sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr";
type = "gem"; type = "gem";
}; };
version = "0.20.0"; version = "0.21.2";
}; };
simplecov-html = { simplecov-html = {
groups = ["default" "test"]; groups = ["default" "test"];

8
modules/accentor/update.sh Executable file
View file

@ -0,0 +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/yarn.lock
yarn2nix --lockfile yarn.lock --no-patch > yarn.nix
rm yarn.lock
bundix -l

View file

@ -2249,6 +2249,14 @@
sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
}; };
} }
{
name = "callsite___callsite_1.0.0.tgz";
path = fetchurl {
name = "callsite___callsite_1.0.0.tgz";
url = "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz";
sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
};
}
{ {
name = "callsites___callsites_2.0.0.tgz"; name = "callsites___callsites_2.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -3081,6 +3089,14 @@
sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
}; };
} }
{
name = "decache___decache_4.6.0.tgz";
path = fetchurl {
name = "decache___decache_4.6.0.tgz";
url = "https://registry.yarnpkg.com/decache/-/decache-4.6.0.tgz";
sha1 = "87026bc6e696759e82d57a3841c4e251a30356e8";
};
}
{ {
name = "decamelize___decamelize_1.2.0.tgz"; name = "decamelize___decamelize_1.2.0.tgz";
path = fetchurl { path = fetchurl {
@ -4033,6 +4049,14 @@
sha1 = "780f040f729b3d18019f20605f723e844b8a58af"; sha1 = "780f040f729b3d18019f20605f723e844b8a58af";
}; };
} }
{
name = "file_loader___file_loader_6.2.0.tgz";
path = fetchurl {
name = "file_loader___file_loader_6.2.0.tgz";
url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz";
sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d";
};
}
{ {
name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -9314,11 +9338,11 @@
}; };
} }
{ {
name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.0.9.tgz"; name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.0.9.tgz"; name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.1.0.tgz";
url = "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.9.tgz"; url = "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.1.0.tgz";
sha1 = "982991aec28e79d1f0c2eb8f6e3d62e042087ee8"; sha1 = "1261d5866bca8f5c256f1b13abad2568fbcd6bb2";
}; };
} }
{ {
@ -9378,11 +9402,11 @@
}; };
} }
{ {
name = "vue_router___vue_router_3.4.9.tgz"; name = "vue_router___vue_router_3.5.1.tgz";
path = fetchurl { path = fetchurl {
name = "vue_router___vue_router_3.4.9.tgz"; name = "vue_router___vue_router_3.5.1.tgz";
url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz"; url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz";
sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66"; sha1 = "edf3cf4907952d1e0583e079237220c5ff6eb6c9";
}; };
} }
{ {
@ -9426,11 +9450,11 @@
}; };
} }
{ {
name = "vuetify_loader___vuetify_loader_1.6.0.tgz"; name = "vuetify_loader___vuetify_loader_1.7.1.tgz";
path = fetchurl { path = fetchurl {
name = "vuetify_loader___vuetify_loader_1.6.0.tgz"; name = "vuetify_loader___vuetify_loader_1.7.1.tgz";
url = "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.6.0.tgz"; url = "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.7.1.tgz";
sha1 = "05df0805b3ab2ff0de198109d34f9da3f69da667"; sha1 = "d2fb905ee7dbd1183ea210dbd31e52756fd622fc";
}; };
} }
{ {
@ -9450,11 +9474,11 @@
}; };
} }
{ {
name = "vuex___vuex_3.6.0.tgz"; name = "vuex___vuex_3.6.2.tgz";
path = fetchurl { path = fetchurl {
name = "vuex___vuex_3.6.0.tgz"; name = "vuex___vuex_3.6.2.tgz";
url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz"; url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz";
sha1 = "95efa56a58f7607c135b053350833a09e01aa813"; sha1 = "236bc086a870c3ae79946f107f16de59d5895e71";
}; };
} }
{ {