From 7801b951804fc25515bc53fc6b0cc6d748f02d50 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 5 Jul 2025 04:58:05 +0200 Subject: [PATCH 1/5] lightning-terminal: add passthru.updateScript --- .../by-name/li/lightning-terminal/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index f656f0670ead..a5fdb18c61cd 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -13,6 +13,11 @@ testers, curl, lightning-terminal, + _experimental-update-script-combinators, + gitUpdater, + nurl, + gitMinimal, + writeShellScript, }: buildGoModule rec { @@ -113,6 +118,48 @@ buildGoModule rec { ''; }; + # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { + rev-prefix = "v"; + ignoredVersions = ".*rc.*"; + }) + { + command = [ + (writeShellScript "update-hashes.sh" '' + set -euxo pipefail + + . ${stdenv}/setup + PATH="${ + lib.makeBinPath [ + gitMinimal + nurl + ] + }:$PATH" + + nixpkgs="$(git rev-parse --show-toplevel)" + packageVersion=$(nix --extra-experimental-features nix-command eval --impure --raw -f "$nixpkgs" "$UPDATE_NIX_ATTR_PATH.version") + if [ x"$UPDATE_NIX_OLD_VERSION" != x"$packageVersion" ]; then + vendorHashOld=${lightning-terminal.vendorHash} + vendorHashNew=$(nurl -e "(import $nixpkgs/. { }).$UPDATE_NIX_ATTR_PATH.goModules") + yarnOfflineCacheHashOld=${lightning-app.yarnOfflineCache.outputHash} + yarnOfflineCacheHashNew=$(nurl -e "let pkgs = (import $nixpkgs/. { }); in \ + pkgs.fetchYarnDeps \ + { yarnLock = pkgs.$UPDATE_NIX_ATTR_PATH.src + \"/app/yarn.lock\"; \ + hash = pkgs.lib.fakeHash; \ + }") + + substituteInPlace \ + "$nixpkgs"/pkgs/by-name/li/lightning-terminal/package.nix \ + --replace-fail "$vendorHashOld" "$vendorHashNew" \ + --replace-fail "$yarnOfflineCacheHashOld" "$yarnOfflineCacheHashNew" + fi + '') + ]; + supportedFeatures = [ "silent" ]; + } + ]; + lightning-app = stdenv.mkDerivation { pname = "lightning-app"; src = "${src}/app"; From 23ab7d05b2ff6636dbf872b5b70c4ba156d4c8df Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 5 Jul 2025 16:47:07 +0000 Subject: [PATCH 2/5] lightning-terminal: 0.14.1-alpha -> 0.15.0-alpha --- pkgs/by-name/li/lightning-terminal/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index a5fdb18c61cd..0d14db4f9380 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { pname = "lightning-terminal"; - version = "0.14.1-alpha"; + version = "0.15.0-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lightning-terminal"; tag = "v${version}"; - hash = "sha256-sv/NsjAAF0vwD2xjRuGwHwV0L1gjCFQEw0SVp14Zyz0="; + hash = "sha256-g+pf2o0JFEFny/w5yn9KQswajw3gEBTPQjBY5ocdk0k="; leaveDotGit = true; # Populate values that require us to use git. postFetch = '' @@ -40,7 +40,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Gbx4uz6q9Ef4QNv6DpIoCACjhT66iZ7GPNpd/g9MgKQ="; + vendorHash = "sha256-eGqM0cIC55/bZB1rcD9fKZ/CrP6w3HCZyZvFeUWnDZo="; buildInputs = [ lightning-app ]; postUnpack = '' @@ -166,7 +166,7 @@ buildGoModule rec { version = "0.0.1"; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/app/yarn.lock"; - hash = "sha256-ulOgKQRLG4cRi1N1DajmbZ0L7d08g5cYDA9itXu+Esw="; + hash = "sha256-FYRWyZxTPo4YwN5AiXsuubZoCVRcOeCrsUU/+ON4gx4="; }; # Remove this command from package.json. It requires Git and it is not From 7a63ea33e6330d52ca5018456080435afed7dec5 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 6 Jul 2025 20:56:56 +0200 Subject: [PATCH 3/5] lightning-terminal: sandboxes tests.litd-app --- .../by-name/li/lightning-terminal/package.nix | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index 0d14db4f9380..5b0441063f8d 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -10,7 +10,7 @@ fetchYarnDeps, go, versionCheckHook, - testers, + runCommandWith, curl, lightning-terminal, _experimental-update-script-combinators, @@ -99,24 +99,28 @@ buildGoModule rec { versionCheckHook ]; - passthru.tests.litd-app = testers.runCommand { - name = "test-litd-app"; - nativeBuildInputs = [ - curl - lightning-terminal - ]; - script = '' - litd \ - --uipassword=12345678 \ - --insecure-httplisten=127.0.0.1:8080 \ - --httpslisten= & - sleep 2 - GETindexHTTPCode=$(curl -o /dev/null -w "%{http_code}" -Lvs 127.0.0.1:8080/index.html) - if [ "$GETindexHTTPCode" = 200 ]; then - touch $out - fi - ''; - }; + passthru.tests.litd-app = + runCommandWith + { + name = "test-litd-app"; + derivationArgs = { + nativeBuildInputs = [ + curl + lightning-terminal + ]; + }; + } + '' + litd \ + --uipassword=12345678 \ + --insecure-httplisten=127.0.0.1:8080 \ + --httpslisten= & + sleep 2 + GETindexHTTPCode=$(curl -o /dev/null -w "%{http_code}" -Lvs 127.0.0.1:8080/index.html) + if [ "$GETindexHTTPCode" = 200 ]; then + touch $out + fi + ''; # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true passthru.updateScript = _experimental-update-script-combinators.sequence [ From f9f521f25323aff6419841e0a889b60f565ec017 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 19 Jul 2025 22:33:03 +0200 Subject: [PATCH 4/5] lightning-terminal: add nix to passthru.updateScript --- pkgs/by-name/li/lightning-terminal/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index 5b0441063f8d..99427ae8edef 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -16,6 +16,7 @@ _experimental-update-script-combinators, gitUpdater, nurl, + nix, gitMinimal, writeShellScript, }: @@ -137,6 +138,7 @@ buildGoModule rec { PATH="${ lib.makeBinPath [ gitMinimal + nix nurl ] }:$PATH" From ad63ad7005af611d7c9ce28f779c1ff7b54be6e6 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 19 Jul 2025 20:42:35 +0000 Subject: [PATCH 5/5] lightning-terminal: 0.15.0-alpha -> 0.15.1-alpha --- pkgs/by-name/li/lightning-terminal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index 99427ae8edef..9d221a2bcd93 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { pname = "lightning-terminal"; - version = "0.15.0-alpha"; + version = "0.15.1-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lightning-terminal"; tag = "v${version}"; - hash = "sha256-g+pf2o0JFEFny/w5yn9KQswajw3gEBTPQjBY5ocdk0k="; + hash = "sha256-aCZ1dzbj1SYBYQ6ysnk9MQs4V6ysljZYOYp0gOw0WFQ="; leaveDotGit = true; # Populate values that require us to use git. postFetch = '' @@ -41,7 +41,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-eGqM0cIC55/bZB1rcD9fKZ/CrP6w3HCZyZvFeUWnDZo="; + vendorHash = "sha256-tjNF6Llsaba/IlhtrOU4ebzSRHGVy+LPzwhBsS5xJgQ="; buildInputs = [ lightning-app ]; postUnpack = ''