From d257b22f91b9e572ed39ccf23e342906b8495a52 Mon Sep 17 00:00:00 2001 From: Igor Ramazanov Date: Sun, 27 Jul 2025 02:18:50 +0000 Subject: [PATCH] chore: nix: `nix fmt` --- flake.nix | 4 +-- nix/package.nix | 73 ++++++++++++++++++++++++------------------------- nix/wasm.nix | 56 +++++++++++++++++++------------------ 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/flake.nix b/flake.nix index afe0e4f..c1c43e1 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ rec { formatter = pkgs.alejandra; packages = { 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 {}; }; checks.default = pkgs.symlinkJoin { @@ -63,7 +63,7 @@ rec { // { overlays.default = final: prev: { 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 {}; }; nixosModules.headplane = import ./nix/module.nix; diff --git a/nix/package.nix b/nix/package.nix index 2208f51..f3e2c9c 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -7,50 +7,49 @@ stdenv, hp_ssh_wasm, ... -}: -let +}: let pkg = builtins.fromJSON (builtins.readFile ../package.json); pname = pkg.name; version = pkg.version; src = ../.; in -stdenv.mkDerivation (finalAttrs: { - pname = pname; - version = version; - src = src; + stdenv.mkDerivation (finalAttrs: { + pname = pname; + version = version; + src = src; - nativeBuildInputs = [ - makeWrapper - nodejs_22 - pnpm_10.configHook - git - ]; + nativeBuildInputs = [ + makeWrapper + nodejs_22 + pnpm_10.configHook + git + ]; - dontCheckForBrokenSymlinks = true; + dontCheckForBrokenSymlinks = true; - pnpmDeps = pnpm_10.fetchDeps { - inherit pname version src; - hash = "sha256-GNSpFqPobX6MDPUXxz2XwdZ2Wt7boN8aok52pGgpGoM="; - }; + pnpmDeps = pnpm_10.fetchDeps { + inherit pname version src; + hash = "sha256-GNSpFqPobX6MDPUXxz2XwdZ2Wt7boN8aok52pGgpGoM="; + }; - buildPhase = '' - runHook preBuild - cp ${hp_ssh_wasm}/hp_ssh.wasm app/hp_ssh.wasm - cp ${hp_ssh_wasm}/wasm_exec.js app/wasm_exec.js - pnpm build - runHook postBuild - ''; + buildPhase = '' + runHook preBuild + cp ${hp_ssh_wasm}/hp_ssh.wasm app/hp_ssh.wasm + cp ${hp_ssh_wasm}/wasm_exec.js app/wasm_exec.js + pnpm build + runHook postBuild + ''; - installPhase = '' - runHook preInstall - mkdir -p $out/{bin,share/headplane} - cp -r build $out/share/headplane/ - cp -r node_modules $out/share/headplane/ - cp -r drizzle $out/share/headplane/ - sed -i "s;$PWD;../..;" $out/share/headplane/build/server/index.js - makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \ - --chdir $out/share/headplane \ - --add-flags $out/share/headplane/build/server/index.js - runHook postInstall - ''; -}) + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/headplane} + cp -r build $out/share/headplane/ + cp -r node_modules $out/share/headplane/ + cp -r drizzle $out/share/headplane/ + sed -i "s;$PWD;../..;" $out/share/headplane/build/server/index.js + makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \ + --chdir $out/share/headplane \ + --add-flags $out/share/headplane/build/server/index.js + runHook postInstall + ''; + }) diff --git a/nix/wasm.nix b/nix/wasm.nix index e53b37e..d74c4c3 100644 --- a/nix/wasm.nix +++ b/nix/wasm.nix @@ -1,35 +1,37 @@ -{ buildGoModule, go, lib, ... }: - -let +{ + buildGoModule, + go, + lib, + ... +}: let pkg = builtins.fromJSON (builtins.readFile ../package.json); pname = "hp_ssh-wasm"; version = pkg.version; wasmExecJs = - if builtins.pathExists "${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 - "${go}/lib/wasm/wasm_exec.js" - else - "${go}/share/go/misc/wasm/wasm_exec.js"; + if builtins.pathExists "${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 "${go}/lib/wasm/wasm_exec.js" + else "${go}/share/go/misc/wasm/wasm_exec.js"; in -buildGoModule rec { - inherit pname version; - src = ../.; - subPackages = [ "cmd/hp_ssh" ]; - vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac="; - env.CGO_ENABLED = 0; + buildGoModule rec { + inherit pname version; + src = ../.; + subPackages = ["cmd/hp_ssh"]; + vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac="; + env.CGO_ENABLED = 0; - nativeBuildInputs = [ go ]; + nativeBuildInputs = [go]; - buildPhase = '' - export GOOS=js - export GOARCH=wasm - go build -o hp_ssh.wasm ./cmd/hp_ssh - ''; + buildPhase = '' + export GOOS=js + export GOARCH=wasm + go build -o hp_ssh.wasm ./cmd/hp_ssh + ''; - installPhase = '' - mkdir -p $out - cp hp_ssh.wasm $out/ - cp ${wasmExecJs} $out/wasm_exec.js - ''; -} + installPhase = '' + mkdir -p $out + cp hp_ssh.wasm $out/ + cp ${wasmExecJs} $out/wasm_exec.js + ''; + }