Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b183c239b3 | |||
| 4b48f20371 | |||
| 5ef48d262b | |||
| 1d68d0f91f | |||
| 65bc08f033 | |||
| f8db5d68cc |
@@ -66,7 +66,7 @@ const otherSkills: OtherSkill[] = [
|
|||||||
{
|
{
|
||||||
title: "Some of the relevant Frameworks/Tooling",
|
title: "Some of the relevant Frameworks/Tooling",
|
||||||
description:
|
description:
|
||||||
"Terraform, Prometheus, Grafana, React, Webpack, Rollup, Esbuild, deep understanding of Git",
|
"Terraform, Prometheus, Grafana, Nix shell, React, Webpack, Rollup, Esbuild, deep understanding of Git",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "Software Development",
|
title: "Software Development",
|
||||||
|
|||||||
+28
-2
@@ -47,7 +47,7 @@ let
|
|||||||
cp -a dist $out
|
cp -a dist $out
|
||||||
'';
|
'';
|
||||||
npmInstallFlags = "--no-audit --no-progress --no-fund";
|
npmInstallFlags = "--no-audit --no-progress --no-fund";
|
||||||
npmDepsHash = "sha256-dnUbw0kfAA50ZaQ91q/fC+gZhAGNo6vrSQBz6Qf2ngo=";
|
npmDepsHash = "sha256-p4rTpy0t8aajbubvtF1TA83/FFqvfKEOPBb5T0ZRfQY=";
|
||||||
npmPackFlags = [ "--ignore-scripts" ];
|
npmPackFlags = [ "--ignore-scripts" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ let
|
|||||||
CGO_ENABLED = 0;
|
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}";
|
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" ];
|
subPackages = [ "app/server" ];
|
||||||
vendorSha256 = "sha256-BkwXD8n62+p639vTLwXpCiY8cqYtCjWxaa5tuw78u5g=";
|
vendorSha256 = "sha256-44xcyVk5KcurQLkVJv1MeAj+Pfcu53664pvVgHdyv3E=";
|
||||||
overrideModAttrs = (_: {
|
overrideModAttrs = (_: {
|
||||||
impureEnvVars = pkgs.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" "GOPROXY" ];
|
impureEnvVars = pkgs.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" "GOPROXY" ];
|
||||||
});
|
});
|
||||||
@@ -89,6 +89,7 @@ in
|
|||||||
packages = [
|
packages = [
|
||||||
go
|
go
|
||||||
golangci-lint
|
golangci-lint
|
||||||
|
pkgs.prefetch-npm-deps
|
||||||
|
|
||||||
nodejs
|
nodejs
|
||||||
|
|
||||||
@@ -116,6 +117,31 @@ in
|
|||||||
npm --prefix app/frontend run fix
|
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";
|
||||||
|
command = ''
|
||||||
|
cd ''$PRJ_ROOT
|
||||||
|
golangci-lint run --sort-results --out-format tab --fix
|
||||||
|
npm --prefix ''$PRJ_ROOT/app/frontend run fix
|
||||||
|
|
||||||
|
update-npm-deps-hash
|
||||||
|
'';
|
||||||
|
}
|
||||||
{
|
{
|
||||||
name = "dev";
|
name = "dev";
|
||||||
help = "Starts the javascript project in dev";
|
help = "Starts the javascript project in dev";
|
||||||
|
|||||||
Reference in New Issue
Block a user