cccb/sanic
cccb/sanic
11
1
Fork 0
Code Issues 5 Pull requests Projects 1 Releases Packages Activity

update flake

Browse source
This commit is contained in:
XenGi 2025-12-25 13:02:51 +01:00
parent 9721499489
commit 55bea85611
Signed by: xengi
SSH key fingerprint: SHA256:jxWM2RTHvxxcncXycwwWkP7HCWb4VREN05UGJTbIPZg
3 changed files with 122 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756047880, "lastModified": 1763982521,
"narHash": "sha256-JeuGh9kA1SPL70fnvpLxkIkCWpTjtoPaus3jzvdna0k=", "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=",
"owner": "tweag", "owner": "tweag",
"repo": "gomod2nix", "repo": "gomod2nix",
"rev": "47d628dc3b506bd28632e47280c6b89d3496909d", "rev": "02e63a239d6eabd595db56852535992c898eba72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756823642, "lastModified": 1766601203,
"narHash": "sha256-5n3gG2zESe1xNeoccFe8sHtBNneShfCt+NqWsn6KpR4=", "narHash": "sha256-iCAUuJRNgRoxlcBfH6pFZLU0TDzfBczpliP5iLJYujk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "549bb173b0aea5dc66da4d9443710e08f9cb5556", "rev": "c0532e48685132432f0d6fa751cc2bda0381b8dd",
"type": "github" "type": "github"
}, },
"original": { "original": {

56
flake.nix
View file

@ -1,23 +1,33 @@
{ {
description = "sanic - chaos music control"; description = "sanic - chaos music control";
inputs = { inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable-small; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
flake-utils.url = github:numtide/flake-utils; flake-utils.url = "github:numtide/flake-utils";
gomod2nix = { gomod2nix = {
url = github:tweag/gomod2nix; url = "github:tweag/gomod2nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
}; };
outputs = { self, nixpkgs, flake-utils, gomod2nix }: flake-utils.lib.eachDefaultSystem (system: outputs =
{
self,
nixpkgs,
flake-utils,
gomod2nix,
}:
flake-utils.lib.eachDefaultSystem (
system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ gomod2nix.overlays.default ]; overlays = [ gomod2nix.overlays.default ];
}; };
golang = pkgs.go_1_25;
sanic = pkgs.buildGoApplication { sanic = pkgs.buildGoApplication {
pname = "sanic"; pname = "sanic";
version = "0.0.1"; version = "0.0.1";
go = golang;
src = ./.; src = ./.;
modules = ./gomod2nix.toml; modules = ./gomod2nix.toml;
}; };
@ -27,7 +37,7 @@
src = ./.; src = ./.;
doCheck = true; doCheck = true;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
go golang
writableTmpDirAsHomeHook writableTmpDirAsHomeHook
]; ];
checkPhase = '' checkPhase = ''
@ -43,12 +53,14 @@
src = ./.; src = ./.;
doCheck = true; doCheck = true;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
golangci-lint #golangci-lint
go golang
go-tools
writableTmpDirAsHomeHook writableTmpDirAsHomeHook
]; ];
checkPhase = '' checkPhase = ''
golangci-lint run #golangci-lint run
staticcheck -f stylish ./...
''; '';
installPhase = '' installPhase = ''
mkdir "$out" mkdir "$out"
@ -56,28 +68,48 @@
}; };
in in
{ {
apps = {
test = {
type = "app";
program = "${pkgs.writeShellScript "test" ''
${golang}/bin/go test -v ./...
''}";
};
lint = {
type = "app";
program = "${pkgs.writeShellScript "lint" ''
${pkgs.go-tools}/bin/staticcheck -f stylish ./...
''}";
};
};
checks = { inherit go-test go-lint; }; checks = { inherit go-test go-lint; };
formatter = pkgs.nixpkgs-fmt; formatter = pkgs.nixfmt-tree;
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
go golang
go-tools # staticcheck go-tools # staticcheck
gomod2nix.packages.${system}.default gomod2nix.packages.${system}.default
]; ];
packages = with pkgs; [ packages = with pkgs; [
mpd mpd
mpc-cli mpc
mkcert mkcert
]; ];
}; };
packages = { packages = {
default = sanic; default = sanic;
container = pkgs.dockerTools.buildImage { container_old = pkgs.dockerTools.buildImage {
name = "sanic"; name = "sanic";
config = { config = {
Cmd = [ "${sanic}/bin/sanic" ]; Cmd = [ "${sanic}/bin/sanic" ];
}; };
}; };
container = pkgs.dockerTools.buildLayeredImage {
name = "sanic";
tag = sanic.version;
contents = [ sanic ];
config.Cmd = [ "${sanic}/bin/sanic" ];
};
}; };
nixosModules.default = import ./option.nix; nixosModules.default = import ./option.nix;
} }

14
option.nix
View file

@ -1,8 +1,14 @@
{ config, lib, pkgs, options, ... }: {
config,
lib,
pkgs,
options,
...
}:
let let
cfg = config.services.sanic; cfg = config.services.sanic;
configFile = pkgs.writeText "config.ini" (pkgs.lib.generators.toINI {} cfg); configFile = pkgs.writeText "config.ini" (pkgs.lib.generators.toINI { } cfg);
execCommand = "${cfg.package}/bin/sanic -c '${configFile}'"; execCommand = "${cfg.package}/bin/sanic -c '${configFile}'";
in in
{ {
@ -11,7 +17,9 @@ in
package = lib.mkOption { package = lib.mkOption {
description = "Package to use."; description = "Package to use.";
type = lib.types.package; type = lib.types.package;
default = sanic; default = lib.literalExpression ''
pkgs.sanic
'';
}; };
ui = lib.mkOption { ui = lib.mkOption {
description = "Setting for HTTP(S) UI."; description = "Setting for HTTP(S) UI.";