chore: nix: nix fmt

This commit is contained in:
Igor Ramazanov
2025-07-27 02:18:50 +00:00
committed by Aarnav Tale
parent 441e31690b
commit d257b22f91
3 changed files with 67 additions and 66 deletions
+2 -2
View File
@@ -30,7 +30,7 @@ rec {
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
packages = { packages = {
hp_ssh_wasm = pkgs.callPackage ./nix/wasm.nix {}; hp_ssh_wasm = pkgs.callPackage ./nix/wasm.nix {};
headplane = pkgs.callPackage ./nix/package.nix { hp_ssh_wasm = packages.hp_ssh_wasm; }; headplane = pkgs.callPackage ./nix/package.nix {hp_ssh_wasm = packages.hp_ssh_wasm;};
headplane-agent = pkgs.callPackage ./nix/agent.nix {}; headplane-agent = pkgs.callPackage ./nix/agent.nix {};
}; };
checks.default = pkgs.symlinkJoin { checks.default = pkgs.symlinkJoin {
@@ -63,7 +63,7 @@ rec {
// { // {
overlays.default = final: prev: { overlays.default = final: prev: {
hp_ssh_wasm = final.callPackage ./nix/wasm.nix {}; hp_ssh_wasm = final.callPackage ./nix/wasm.nix {};
headplane = final.callPackage ./nix/package.nix { hp_ssh_wasm = final.hp_ssh_wasm; }; headplane = final.callPackage ./nix/package.nix {hp_ssh_wasm = final.hp_ssh_wasm;};
headplane-agent = final.callPackage ./nix/agent.nix {}; headplane-agent = final.callPackage ./nix/agent.nix {};
}; };
nixosModules.headplane = import ./nix/module.nix; nixosModules.headplane = import ./nix/module.nix;
+36 -37
View File
@@ -7,50 +7,49 @@
stdenv, stdenv,
hp_ssh_wasm, hp_ssh_wasm,
... ...
}: }: let
let
pkg = builtins.fromJSON (builtins.readFile ../package.json); pkg = builtins.fromJSON (builtins.readFile ../package.json);
pname = pkg.name; pname = pkg.name;
version = pkg.version; version = pkg.version;
src = ../.; src = ../.;
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = pname; pname = pname;
version = version; version = version;
src = src; src = src;
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
nodejs_22 nodejs_22
pnpm_10.configHook pnpm_10.configHook
git git
]; ];
dontCheckForBrokenSymlinks = true; dontCheckForBrokenSymlinks = true;
pnpmDeps = pnpm_10.fetchDeps { pnpmDeps = pnpm_10.fetchDeps {
inherit pname version src; inherit pname version src;
hash = "sha256-GNSpFqPobX6MDPUXxz2XwdZ2Wt7boN8aok52pGgpGoM="; hash = "sha256-GNSpFqPobX6MDPUXxz2XwdZ2Wt7boN8aok52pGgpGoM=";
}; };
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
cp ${hp_ssh_wasm}/hp_ssh.wasm app/hp_ssh.wasm cp ${hp_ssh_wasm}/hp_ssh.wasm app/hp_ssh.wasm
cp ${hp_ssh_wasm}/wasm_exec.js app/wasm_exec.js cp ${hp_ssh_wasm}/wasm_exec.js app/wasm_exec.js
pnpm build pnpm build
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/{bin,share/headplane} mkdir -p $out/{bin,share/headplane}
cp -r build $out/share/headplane/ cp -r build $out/share/headplane/
cp -r node_modules $out/share/headplane/ cp -r node_modules $out/share/headplane/
cp -r drizzle $out/share/headplane/ cp -r drizzle $out/share/headplane/
sed -i "s;$PWD;../..;" $out/share/headplane/build/server/index.js sed -i "s;$PWD;../..;" $out/share/headplane/build/server/index.js
makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \ makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \
--chdir $out/share/headplane \ --chdir $out/share/headplane \
--add-flags $out/share/headplane/build/server/index.js --add-flags $out/share/headplane/build/server/index.js
runHook postInstall runHook postInstall
''; '';
}) })
+29 -27
View File
@@ -1,35 +1,37 @@
{ buildGoModule, go, lib, ... }: {
buildGoModule,
let go,
lib,
...
}: let
pkg = builtins.fromJSON (builtins.readFile ../package.json); pkg = builtins.fromJSON (builtins.readFile ../package.json);
pname = "hp_ssh-wasm"; pname = "hp_ssh-wasm";
version = pkg.version; version = pkg.version;
wasmExecJs = wasmExecJs =
if builtins.pathExists "${go}/share/go/lib/wasm/wasm_exec.js" then if builtins.pathExists "${go}/share/go/lib/wasm/wasm_exec.js"
"${go}/share/go/lib/wasm/wasm_exec.js" then "${go}/share/go/lib/wasm/wasm_exec.js"
else if builtins.pathExists "${go}/lib/wasm/wasm_exec.js" then else if builtins.pathExists "${go}/lib/wasm/wasm_exec.js"
"${go}/lib/wasm/wasm_exec.js" then "${go}/lib/wasm/wasm_exec.js"
else else "${go}/share/go/misc/wasm/wasm_exec.js";
"${go}/share/go/misc/wasm/wasm_exec.js";
in in
buildGoModule rec { buildGoModule rec {
inherit pname version; inherit pname version;
src = ../.; src = ../.;
subPackages = [ "cmd/hp_ssh" ]; subPackages = ["cmd/hp_ssh"];
vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac="; vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;
nativeBuildInputs = [ go ]; nativeBuildInputs = [go];
buildPhase = '' buildPhase = ''
export GOOS=js export GOOS=js
export GOARCH=wasm export GOARCH=wasm
go build -o hp_ssh.wasm ./cmd/hp_ssh go build -o hp_ssh.wasm ./cmd/hp_ssh
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp hp_ssh.wasm $out/ cp hp_ssh.wasm $out/
cp ${wasmExecJs} $out/wasm_exec.js cp ${wasmExecJs} $out/wasm_exec.js
''; '';
} }