From 6e90af1757ffe4e783ccec56bdf45d74821d1c28 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Fri, 20 Jun 2025 14:19:45 +0100 Subject: [PATCH] nix: add htmx-ws as a dependency Signed-off-by: oppiliappan --- flake.lock | 13 +++++++++++++ flake.nix | 9 +++++++-- go.mod | 3 +++ go.sum | 2 ++ nix/pkgs/appview.nix | 4 +++- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 43987c9c..394e00a0 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,18 @@ "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" } }, + "htmx-ws-src": { + "flake": false, + "locked": { + "narHash": "sha256-XbUFiv94ZPB6VVULoTWOsje5Gq1I+IT72lMc4CpUYrY=", + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/ext/ws.js" + }, + "original": { + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/ext/ws.js" + } + }, "ibm-plex-mono-src": { "flake": false, "locked": { @@ -107,6 +119,7 @@ "inputs": { "gitignore": "gitignore", "htmx-src": "htmx-src", + "htmx-ws-src": "htmx-ws-src", "ibm-plex-mono-src": "ibm-plex-mono-src", "indigo": "indigo", "inter-fonts-src": "inter-fonts-src", diff --git a/flake.nix b/flake.nix index 089d3d9a..4530767c 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,10 @@ url = "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"; flake = false; }; + htmx-ws-src = { + url = "https://unpkg.com/htmx.org@2.0.4/dist/ext/ws.js"; + flake = false; + }; lucide-src = { url = "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"; flake = false; @@ -38,6 +42,7 @@ nixpkgs, indigo, htmx-src, + htmx-ws-src, lucide-src, gitignore, inter-fonts-src, @@ -56,7 +61,7 @@ overlays.default = final: prev: let goModHash = "sha256-G+59ZwQwBbnO9ZjAB5zMEmWZbeG4k7ko/lPz+ceqYKs="; appviewDeps = { - inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource; + inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource; }; knotDeps = { inherit goModHash gitignoreSource; @@ -119,7 +124,7 @@ ]; shellHook = '' mkdir -p appview/pages/static/{fonts,icons} - cp -f ${htmx-src} appview/pages/static/htmx.min.js + ${pkgs.uglify-js}/bin/uglifyjs ${htmx-src} ${htmx-ws-src} -c -m > appview/pages/static/htmx.min.js cp -rf ${lucide-src}/*.svg appview/pages/static/icons/ cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/ cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/ diff --git a/go.mod b/go.mod index 02803847..4ea6d158 100644 --- a/go.mod +++ b/go.mod @@ -82,6 +82,7 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect + github.com/hpcloud/tail v1.0.0 // indirect github.com/ipfs/bbloom v0.0.4 // indirect github.com/ipfs/boxo v0.30.0 // indirect github.com/ipfs/go-block-format v0.2.1 // indirect @@ -150,6 +151,8 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect google.golang.org/grpc v1.72.1 // indirect google.golang.org/protobuf v1.36.6 // indirect + gopkg.in/fsnotify.v1 v1.4.7 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gotest.tools/v3 v3.5.2 // indirect lukechampine.com/blake3 v1.4.1 // indirect diff --git a/go.sum b/go.sum index b0ee232a..6ecfbfbd 100644 --- a/go.sum +++ b/go.sum @@ -182,6 +182,7 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hiddeco/sshsig v0.2.0 h1:gMWllgKCITXdydVkDL+Zro0PU96QI55LwUwebSwNTSw= github.com/hiddeco/sshsig v0.2.0/go.mod h1:nJc98aGgiH6Yql2doqH4CTBVHexQA40Q+hMMLHP4EqE= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= @@ -577,6 +578,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/nix/pkgs/appview.nix b/nix/pkgs/appview.nix index 64b7a03a..4a9d39aa 100644 --- a/nix/pkgs/appview.nix +++ b/nix/pkgs/appview.nix @@ -2,6 +2,7 @@ buildGoModule, stdenv, htmx-src, + htmx-ws-src, lucide-src, inter-fonts-src, ibm-plex-mono-src, @@ -9,6 +10,7 @@ sqlite-lib, goModHash, gitignoreSource, + uglify-js, }: buildGoModule { inherit stdenv; @@ -20,7 +22,7 @@ buildGoModule { postUnpack = '' pushd source mkdir -p appview/pages/static/{fonts,icons} - cp -f ${htmx-src} appview/pages/static/htmx.min.js + ${uglify-js}/bin/uglifyjs ${htmx-src} ${htmx-ws-src} -c -m > appview/pages/static/htmx.min.js cp -rf ${lucide-src}/*.svg appview/pages/static/icons/ cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/ cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/ -- 2.51.2