From 4bcb6f45494eab4ea049652eb6b6c7bf9bcffcae Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Sun, 7 Jun 2026 15:30:37 -0700 Subject: [PATCH] teos: migrate to by-name --- .../applications/blockchains/teos/default.nix | 50 ------------------- pkgs/by-name/te/teos/package.nix | 41 +++++++++++++++ .../blockchains => by-name/te}/teos/update.sh | 0 pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 41 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/blockchains/teos/default.nix create mode 100644 pkgs/by-name/te/teos/package.nix rename pkgs/{applications/blockchains => by-name/te}/teos/update.sh (100%) diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix deleted file mode 100644 index fefef995a6ce..000000000000 --- a/pkgs/applications/blockchains/teos/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - protobuf, - rustfmt, - pkg-config, - openssl, -}: - -let - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "talaia-labs"; - repo = "rust-teos"; - rev = "v${version}"; - hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; - }; - - meta = { - homepage = "https://github.com/talaia-labs/rust-teos"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ seberm ]; - }; - updateScript = ./update.sh; -in -{ - teos = rustPlatform.buildRustPackage { - pname = "teos"; - inherit version src; - - cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; - - buildAndTestSubdir = "teos"; - - nativeBuildInputs = [ - protobuf - rustfmt - ]; - - passthru.updateScript = updateScript; - - __darwinAllowLocalNetworking = true; - - meta = meta // { - description = "Lightning watchtower compliant with BOLT13, written in Rust"; - }; - }; -} diff --git a/pkgs/by-name/te/teos/package.nix b/pkgs/by-name/te/teos/package.nix new file mode 100644 index 000000000000..707d9adc2949 --- /dev/null +++ b/pkgs/by-name/te/teos/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + protobuf, + rustfmt, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "teos"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "talaia-labs"; + repo = "rust-teos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; + }; + + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; + + buildAndTestSubdir = "teos"; + + nativeBuildInputs = [ + protobuf + rustfmt + ]; + + passthru.updateScript = ./update.sh; + + __darwinAllowLocalNetworking = true; + + meta = { + homepage = "https://github.com/talaia-labs/rust-teos"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ seberm ]; + description = "Lightning watchtower compliant with BOLT13, written in Rust"; + }; +}) diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/by-name/te/teos/update.sh similarity index 100% rename from pkgs/applications/blockchains/teos/update.sh rename to pkgs/by-name/te/teos/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc3d31f9367..e5b183bf0ad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10234,10 +10234,6 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - inherit (callPackages ../applications/blockchains/teos { }) - teos - ; - vertcoind = vertcoin.override { withGui = false; };