rsp2k/headplane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: nix: rename hp_ssh_wasm to headplane-ssh-wasm for consistency

Browse Source
This commit is contained in:
Igor Ramazanov 2025-07-27 02:19:45 +00:00 committed by Aarnav Tale
parent d257b22f91
commit 89e38e1356
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -29,9 +29,9 @@ rec {
in rec { in rec {
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
packages = { packages = {
hp_ssh_wasm = pkgs.callPackage ./nix/wasm.nix {}; headplane = pkgs.callPackage ./nix/package.nix {headplane-ssh-wasm = packages.headplane-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 {};
headplane-ssh-wasm = pkgs.callPackage ./nix/ssh-wasm.nix {};
}; };
checks.default = pkgs.symlinkJoin { checks.default = pkgs.symlinkJoin {
name = "headplane-with-agent"; name = "headplane-with-agent";
@ -62,9 +62,9 @@ rec {
}) })
// { // {
overlays.default = final: prev: { overlays.default = final: prev: {
hp_ssh_wasm = final.callPackage ./nix/wasm.nix {}; headplane = final.callPackage ./nix/package.nix {headplane-ssh-wasm = final.headplane-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 {};
headplane-ssh-wasm = final.callPackage ./nix/ssh-wasm.nix {};
}; };
nixosModules.headplane = import ./nix/module.nix; nixosModules.headplane = import ./nix/module.nix;
}; };

7
nix/package.nix
View File

@ -1,12 +1,11 @@
{ {
git, git,
headplane-ssh-wasm,
lib, lib,
makeWrapper, makeWrapper,
nodejs_22, nodejs_22,
pnpm_10, pnpm_10,
stdenv, stdenv,
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;
@ -34,8 +33,8 @@ in
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
cp ${hp_ssh_wasm}/hp_ssh.wasm app/hp_ssh.wasm cp ${headplane-ssh-wasm}/hp_ssh.wasm app/hp_ssh.wasm
cp ${hp_ssh_wasm}/wasm_exec.js app/wasm_exec.js cp ${headplane-ssh-wasm}/wasm_exec.js app/wasm_exec.js
pnpm build pnpm build
runHook postBuild runHook postBuild
''; '';

10
nix/wasm.nix → nix/ssh-wasm.nix
View File

@ -1,12 +1,7 @@
{ {
buildGoModule, buildGoModule,
go, go,
lib,
...
}: let }: let
pkg = builtins.fromJSON (builtins.readFile ../package.json);
pname = "hp_ssh-wasm";
version = pkg.version;
wasmExecJs = wasmExecJs =
if builtins.pathExists "${go}/share/go/lib/wasm/wasm_exec.js" if builtins.pathExists "${go}/share/go/lib/wasm/wasm_exec.js"
then "${go}/share/go/lib/wasm/wasm_exec.js" then "${go}/share/go/lib/wasm/wasm_exec.js"
@ -14,8 +9,9 @@
then "${go}/lib/wasm/wasm_exec.js" then "${go}/lib/wasm/wasm_exec.js"
else "${go}/share/go/misc/wasm/wasm_exec.js"; else "${go}/share/go/misc/wasm/wasm_exec.js";
in in
buildGoModule rec { buildGoModule {
inherit pname version; pname = "headplane-ssh-wasm";
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
src = ../.; src = ../.;
subPackages = ["cmd/hp_ssh"]; subPackages = ["cmd/hp_ssh"];
vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac="; vendorHash = "sha256-3hZzDORAH+D4FW6SkOv3Enddd+q36ZALryvCPD9E5Ac=";