C3C/cv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: C3C:5ef48d262b9d3967cbac3f64dcbe37943a854468
Branches Tags
C3C:main
C3C:v2024.10.5
C3C:v2024.10.4
C3C:v2024.10.3
C3C:v2024.10.2
C3C:v2024.10.1
C3C:2024.10.0
C3C:2023.06.1
C3C:2023.06.0
...
compare: C3C:b183c239b3d467f6e73b7a032e36d5360deec693
Branches Tags
C3C:main
C3C:v2024.10.5
C3C:v2024.10.4
C3C:v2024.10.3
C3C:v2024.10.2
C3C:v2024.10.1
C3C:2024.10.0
C3C:2023.06.1
C3C:2023.06.0

2 Commits
5ef48d262b ... b183c239b3

Author SHA1 Message Date
Arnie
b183c239b3 Extract npm deps hash calculation to a separate command 2023-06-02 14:24:29 +02:00
Arnie
4b48f20371 Update vendor sha for golang 2023-06-02 14:24:14 +02:00
1 changed files with 16 additions and 9 deletions
Show Stats Expand all files Collapse all files

25
default.nix
View File

@ -65,7 +65,7 @@ let
CGO_ENABLED = 0;
ldflags = "-s -w -X gopkg.c3c.cz/cv/app/server/internal/version.Tag=${version} -X gopkg.c3c.cz/cv/app/server/internal/version.Commit=${rev} -X gopkg.c3c.cz/cv/app/server/internal/version.commitTime=${commitTime} -X gopkg.c3c.cz/cv/app/server/internal/version.repoUrl=${repoUrl}";
subPackages = [ "app/server" ];
vendorSha256 = "sha256-BkwXD8n62+p639vTLwXpCiY8cqYtCjWxaa5tuw78u5g=";
vendorSha256 = "sha256-44xcyVk5KcurQLkVJv1MeAj+Pfcu53664pvVgHdyv3E=";
overrideModAttrs = (_: {
impureEnvVars = pkgs.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" "GOPROXY" ];
});
@ -117,6 +117,20 @@ in
npm --prefix app/frontend run fix
'';
}
{
name = "update-npm-deps-hash";
help = "Calculates and updates the npmDepsHash in default.nix";
command = ''
echo "Calculating npm deps"
# STDERR is poluted by the installed nodules, silencing
HASH=''$(prefetch-npm-deps ''$PRJ_ROOT/app/frontend/package-lock.json 2> /dev/null)
[[ ''$HASH = sha256* ]] && echo "Hash is ''$HASH"
[[ ''$HASH != sha256* ]] && echo "Failed" && exit 137
# Replace the first occurence of npmDepsHash with the new calculated hash in this file
sed -i "0,/npmDepsHash =/{s@npmDepsHash = .*@npmDepsHash = \"''$HASH\";@}" ''$PRJ_ROOT/default.nix
'';
}
{
name = "pre-commit";
help = "Format and fix found issues";
@ -125,14 +139,7 @@ in
golangci-lint run --sort-results --out-format tab --fix
npm --prefix ''$PRJ_ROOT/app/frontend run fix
echo "Calculating npm deps"
HASH=''$(prefetch-npm-deps ''$PRJ_ROOT/app/frontend/package-lock.json 2> /dev/null)
[[ ''$HASH = sha256* ]] && echo "Hash is ''$HASH"
[[ ''$HASH != sha256* ]] && echo "Failed" && exit 137
# Replace the first occurence of npmDepsHash with the new calculated hash in this file
sed -i "0,/npmDepsHash =/{s@npmDepsHash = .*@npmDepsHash = \"''$HASH\";@}" ''$PRJ_ROOT/default.nix
update-npm-deps-hash
'';
}
{