Update accentor
This commit is contained in:
parent
4b25432b47
commit
372ab3b693
4 changed files with 7 additions and 29 deletions
|
@ -216,8 +216,8 @@ GEM
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
rubocop (>= 1.7.0, < 2.0)
|
rubocop (>= 1.7.0, < 2.0)
|
||||||
ruby-progressbar (1.11.0)
|
ruby-progressbar (1.11.0)
|
||||||
ruby-vips (2.0.17)
|
ruby-vips (2.1.4)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.12)
|
||||||
simplecov (0.21.2)
|
simplecov (0.21.2)
|
||||||
docile (~> 1.1)
|
docile (~> 1.1)
|
||||||
simplecov-html (~> 0.11)
|
simplecov-html (~> 0.11)
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
owner = "accentor";
|
owner = "accentor";
|
||||||
repo = "api";
|
repo = "api";
|
||||||
rev = "main";
|
rev = "main";
|
||||||
sha256 = "JfvnTbDE8pfaSf8QFuvqmKnq4EW0Vq8hxKnLIf34ovA=";
|
sha256 = "sOZeIo/bg8rnWGiIJtcPL/4otXjROJMdKyHa0jTdEDU=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
webPackage = (pkgs.accentor-web.override {
|
webPackage = (pkgs.accentor-web.override {
|
||||||
|
@ -43,13 +43,12 @@
|
||||||
yarnLock = ./yarn.lock;
|
yarnLock = ./yarn.lock;
|
||||||
yarnNix = ./yarn.nix;
|
yarnNix = ./yarn.nix;
|
||||||
}).overrideAttrs (old: {
|
}).overrideAttrs (old: {
|
||||||
IN_NIX = "true";
|
SKIP_CACHE = "true";
|
||||||
patches = (old.patches or [ ]) ++ [ ./no_caching_in_nix.patch ];
|
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "accentor";
|
owner = "accentor";
|
||||||
repo = "web";
|
repo = "web";
|
||||||
rev = "main";
|
rev = "main";
|
||||||
sha256 = "alEGPio1uS5pFQ+riR2TWV2BIDYMRGgz1YHonhSECy4=";
|
sha256 = "34HD86HUw+oq2KL521JUD0Dd4y290KfxW7TA1biuOwk=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -854,10 +854,10 @@
|
||||||
platforms = [ ];
|
platforms = [ ];
|
||||||
source = {
|
source = {
|
||||||
remotes = [ "https://rubygems.org" ];
|
remotes = [ "https://rubygems.org" ];
|
||||||
sha256 = "0lk124dixshf8mmrjpsy9avnaygni3cwki25g8nm5py4d2f5fwwa";
|
sha256 = "19pzpx406rr9s3qk527rn9y3b76sjq5pi7y0xzqiy50q3k0hhg7g";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.0.17";
|
version = "2.1.4";
|
||||||
};
|
};
|
||||||
simplecov = {
|
simplecov = {
|
||||||
dependencies = [ "docile" "simplecov-html" "simplecov_json_formatter" ];
|
dependencies = [ "docile" "simplecov-html" "simplecov_json_formatter" ];
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
diff --git a/vue.config.js b/vue.config.js
|
|
||||||
index 5ec914b..4d09b24 100644
|
|
||||||
--- a/vue.config.js
|
|
||||||
+++ b/vue.config.js
|
|
||||||
@@ -14,7 +14,16 @@ module.exports = {
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
+ configureWebpack: config => {
|
|
||||||
+ config.cache = process.env.IN_NIX !== "true";
|
|
||||||
+ },
|
|
||||||
chainWebpack: (config) => {
|
|
||||||
+ config.module.rule("js").use("babel-loader").tap((opt) =>
|
|
||||||
+ Object.assign(opt, { cacheDirectory: process.env.IN_NIX !== "true" })
|
|
||||||
+ );
|
|
||||||
+ config.plugin("eslint").tap((args) =>
|
|
||||||
+ [Object.assign(args[0], { cache: process.env.IN_NIX !== "true" })]
|
|
||||||
+ );
|
|
||||||
["vue-modules", "vue", "normal-modules", "normal"].forEach((match) => {
|
|
||||||
config.module
|
|
||||||
.rule("scss")
|
|
Loading…
Add table
Add a link
Reference in a new issue