Rename package directories to match t3code outputs

- Move server and desktop Nix packages under `packages/t3code-*`
- Update flake outputs and README references to the new names
This commit is contained in:
2026-04-25 12:49:38 +03:00
parent 0cf92db43b
commit d13dbbaedd
6 changed files with 29 additions and 31 deletions
+19 -19
View File
@@ -8,35 +8,29 @@ This repository does not rely on upstream Nix packaging. It fetches the upstream
For each supported system, the flake exports: For each supported system, the flake exports:
- `packages.<system>.t3code-server`
- `packages.<system>.t3code-desktop`
- `packages.<system>.default`
- `apps.<system>.t3code-server`
- `apps.<system>.t3code-desktop`
- `apps.<system>.default` - `apps.<system>.default`
- `checks.<system>.t3code-server` - `apps.<system>.t3code-desktop`
- `apps.<system>.t3code-server`
- `packages.<system>.default`
- `packages.<system>.t3code-desktop`
- `packages.<system>.t3code-server`
- `checks.<system>.t3code-desktop` - `checks.<system>.t3code-desktop`
- `checks.<system>.t3code-server`
Current `default` points to the desktop package/app. Current `default` points to the `t3code-desktop`.
## Usage ## Usage
Build the server package:
```bash
nix build .#t3code-server
```
Build the desktop package: Build the desktop package:
```bash ```bash
nix build .#t3code-desktop nix build .#t3code-desktop
``` ```
Run the server app: Build the server package:
```bash ```bash
nix run .#t3code-server nix build .#t3code-server
``` ```
Run the desktop app: Run the desktop app:
@@ -45,6 +39,12 @@ Run the desktop app:
nix run .#t3code-desktop nix run .#t3code-desktop
``` ```
Run the server app:
```bash
nix run .#t3code-server
```
Inspect the flake surface: Inspect the flake surface:
```bash ```bash
@@ -63,11 +63,11 @@ nix flake show --all-systems
├── scripts ├── scripts
│ ├── canonicalize-node-modules.ts │ ├── canonicalize-node-modules.ts
│ └── normalize-bun-binaries.ts │ └── normalize-bun-binaries.ts
├── desktop ├── t3code-desktop
│ ├── build-nix-desktop-package.mjs │ ├── build-nix-desktop-package.mjs
│ ├── default.nix │ ├── default.nix
│ └── desktop-nix-autoupdate.patch │ └── desktop-nix-autoupdate.patch
└── server └── t3code-server
└── default.nix └── default.nix
``` ```
@@ -75,6 +75,6 @@ nix flake show --all-systems
- `packages/common.nix` contains the shared Bun workspace and `node-pty` setup used by both packages. - `packages/common.nix` contains the shared Bun workspace and `node-pty` setup used by both packages.
- `packages/scripts/*.ts` contains the Bun install-tree normalization helpers used by `packages/common.nix`. - `packages/scripts/*.ts` contains the Bun install-tree normalization helpers used by `packages/common.nix`.
- `packages/desktop/build-nix-desktop-package.mjs` is local packaging glue carried by this repo. - `packages/t3code-desktop/build-nix-desktop-package.mjs` is local packaging glue carried by this repo.
- `packages/desktop/desktop-nix-autoupdate.patch` is a downstream patch for desktop auto-update messaging in package-managed installs. - `packages/t3code-desktop/desktop-nix-autoupdate.patch` is a downstream patch for desktop auto-update messaging in package-managed installs.
- Upstream source is pinned in `flake.lock` via the `t3code` input. - Upstream source is pinned in `flake.lock` via the `t3code` input.
+10 -12
View File
@@ -3,10 +3,8 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
t3code = { t3code.url = "github:pingdotgg/t3code";
url = "github:pingdotgg/t3code"; t3code.flake = false;
flake = false;
};
}; };
outputs = { outputs = {
@@ -27,30 +25,30 @@
packages = forAllSystems ( packages = forAllSystems (
system: let system: let
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
t3code-server = pkgs.callPackage ./packages/server {src = t3code;}; t3code-desktop = pkgs.callPackage ./packages/t3code-desktop {src = t3code;};
t3code-desktop = pkgs.callPackage ./packages/desktop {src = t3code;}; t3code-server = pkgs.callPackage ./packages/t3code-server {src = t3code;};
in { in {
inherit t3code-server t3code-desktop; inherit t3code-desktop t3code-server;
default = t3code-desktop; default = t3code-desktop;
} }
); );
apps = forAllSystems (system: rec { apps = forAllSystems (system: rec {
t3code-server = {
type = "app";
program = lib.getExe self.packages.${system}.t3code-server;
};
t3code-desktop = { t3code-desktop = {
type = "app"; type = "app";
program = lib.getExe self.packages.${system}.t3code-desktop; program = lib.getExe self.packages.${system}.t3code-desktop;
}; };
t3code-server = {
type = "app";
program = lib.getExe self.packages.${system}.t3code-server;
};
default = t3code-desktop; default = t3code-desktop;
}); });
checks = forAllSystems ( checks = forAllSystems (
system: { system: {
t3code-server = self.packages.${system}.t3code-server;
t3code-desktop = self.packages.${system}.t3code-desktop; t3code-desktop = self.packages.${system}.t3code-desktop;
t3code-server = self.packages.${system}.t3code-server;
} }
); );
}; };