tensamin/omikron
Watch
6
0
Fork
You've already forked omikron
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

[Clean] Remove legacy TTP flake configuration

Browse source
This commit is contained in:
Alois 2026-07-20 18:56:48 +02:00
commit 0e3795b981
2 changed files with 65 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.lock generated
View file

@ -53,8 +53,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay"
"ttp": "ttp"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -76,22 +75,6 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
},
"ttp": {
"flake": false,
"locked": {
"lastModified": 1780494955,
"narHash": "sha256-i2VRRF6yNips3c4JHgfvmvMxb0HTkTCn69lmsKZLHRw=",
"ref": "refs/heads/main",
"rev": "23438fa8f884e6ad0d32ca1004c0dedcce0cc8d2",
"revCount": 125,
"type": "git",
"url": "https://git.methanium.net/tensamin/ttp.git"
},
"original": {
"type": "git",
"url": "https://git.methanium.net/tensamin/ttp.git"
}
} }
}, },
"root": "root", "root": "root",

100
flake.nix
View file

@ -8,13 +8,16 @@
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ttp = {
url = "git+https://git.methanium.net/tensamin/ttp.git";
flake = false;
};
}; };
outputs = inputs@{ self, nixpkgs, flake-parts, rust-overlay, ttp, ... }: outputs =
inputs@{
self,
nixpkgs,
flake-parts,
rust-overlay,
...
}:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
@ -23,14 +26,25 @@
"aarch64-darwin" "aarch64-darwin"
]; ];
perSystem = { self', pkgs, system, ... }: perSystem =
{
self',
pkgs,
system,
...
}:
let let
rustPkgs = import nixpkgs { rustPkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ (import rust-overlay) ]; overlays = [ (import rust-overlay) ];
}; };
rustToolchain = rustPkgs.rust-bin.stable.latest.default.override { rustToolchain = rustPkgs.rust-bin.stable.latest.default.override {
extensions = [ "rust-src" "rust-analyzer" "clippy" "rustfmt" ]; extensions = [
"rust-src"
"rust-analyzer"
"clippy"
"rustfmt"
];
}; };
in in
{ {
@ -44,28 +58,41 @@
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
allowBuiltinFetchGit = true; allowBuiltinFetchGit = true;
}; };
nativeBuildInputs = with pkgs; [ cmake perl pkg-config ]; nativeBuildInputs = with pkgs; [
cmake
perl
pkg-config
];
buildInputs = with pkgs; [ openssl ]; buildInputs = with pkgs; [ openssl ];
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
preConfigure = ''
if [ -d ../cargo-vendor-dir/ttp-core-0.1.0 ]; then
cp ${ttp}/ttp-codec.json ../cargo-vendor-dir/ttp-codec.json
fi
'';
}; };
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ rustToolchain git cmake perl pkg-config ]; nativeBuildInputs = with pkgs; [
rustToolchain
git
cmake
perl
pkg-config
];
buildInputs = with pkgs; [ openssl ]; buildInputs = with pkgs; [ openssl ];
}; };
}; };
flake = { flake = {
nixosModules.default = { config, pkgs, lib, ... }: nixosModules.default =
{
config,
pkgs,
lib,
...
}:
let let
cfg = config.services.omikron; cfg = config.services.omikron;
defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default or (throw "omikron: no pre-built package for system ${pkgs.stdenv.hostPlatform.system}"); defaultPackage =
self.packages.${pkgs.stdenv.hostPlatform.system}.default
or (throw "omikron: no pre-built package for system ${pkgs.stdenv.hostPlatform.system}");
in in
{ {
options.services.omikron = { options.services.omikron = {
@ -113,12 +140,6 @@
description = "Port the Omikron server listens on for incoming QUIC connections."; description = "Port the Omikron server listens on for incoming QUIC connections.";
}; };
ttpBind = lib.mkOption {
type = lib.types.str;
default = "0.0.0.0";
description = "IP address to bind the TTP/QUIC server to.";
};
omegaHost = lib.mkOption { omegaHost = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "tensamin.net"; default = "tensamin.net";
@ -163,7 +184,6 @@
environment = { environment = {
RHO_PORT = toString cfg.rhoPort; RHO_PORT = toString cfg.rhoPort;
TTP_BIND = cfg.ttpBind;
OMEGA_HOST = cfg.omegaHost; OMEGA_HOST = cfg.omegaHost;
OMEGA_PORT = toString cfg.omegaPort; OMEGA_PORT = toString cfg.omegaPort;
}; };
@ -183,19 +203,27 @@
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
ExecStartPre = [ ExecStartPre = [
("+" + pkgs.writeShellScript "omikron-setup-certs" (if cfg.acmeCertDir != null then '' (
mkdir -p ${cfg.dataDir}/certs "+"
cp ${cfg.acmeCertDir}/fullchain.pem ${cfg.dataDir}/certs/cert.pem + pkgs.writeShellScript "omikron-setup-certs" (
${pkgs.openssl}/bin/openssl pkcs8 -topk8 -nocrypt \ if cfg.acmeCertDir != null then
-in ${cfg.acmeCertDir}/key.pem \ ''
-out ${cfg.dataDir}/certs/key.pem mkdir -p ${cfg.dataDir}/certs
chown -R omikron:omikron ${cfg.dataDir} cp ${cfg.acmeCertDir}/fullchain.pem ${cfg.dataDir}/certs/cert.pem
'' else '' ${pkgs.openssl}/bin/openssl pkcs8 -topk8 -nocrypt \
mkdir -p ${cfg.dataDir}/certs -in ${cfg.acmeCertDir}/key.pem \
ln -sf ${cfg.certFile} ${cfg.dataDir}/certs/cert.pem -out ${cfg.dataDir}/certs/key.pem
ln -sf ${cfg.keyFile} ${cfg.dataDir}/certs/key.pem chown -R omikron:omikron ${cfg.dataDir}
chown -R omikron:omikron ${cfg.dataDir} ''
'')) else
''
mkdir -p ${cfg.dataDir}/certs
ln -sf ${cfg.certFile} ${cfg.dataDir}/certs/cert.pem
ln -sf ${cfg.keyFile} ${cfg.dataDir}/certs/key.pem
chown -R omikron:omikron ${cfg.dataDir}
''
)
)
]; ];
ProtectSystem = "strict"; ProtectSystem = "strict";