From 11055e6fb44c7a7312955c0642986814bd9f4abc Mon Sep 17 00:00:00 2001 From: Bad Manners Date: Sat, 17 Jan 2026 19:50:46 -0300 Subject: [PATCH] Clean up Nix builder and release 0.1.1 --- Dockerfile | 2 +- README.md | 10 ---------- default.nix | 18 +++++++++++------- shell.nix | 1 + 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6cc7637..826cbff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM rust:1.86.0-alpine3.21 AS builder +FROM --platform=$BUILDPLATFORM rust:1.92.0-alpine3.22 AS builder ENV PKGCONFIG_SYSROOTDIR=/ RUN apk add --no-cache musl-dev perl build-base zig RUN cargo install --locked cargo-zigbuild diff --git a/README.md b/README.md index 879aef7..06044f8 100644 --- a/README.md +++ b/README.md @@ -15,16 +15,6 @@ Still very much an early WIP. - Post pools. - RSS feeds. -### Possible roadmap - -- [ ] Display thumbnails on post selection -- [ ] Text media -- [ ] Testing -- [ ] Improve CSS -- [ ] User management -- [ ] Lossless compression -- [ ] Migrate to Cot...? - ## Running ### Dependencies diff --git a/default.nix b/default.nix index faf6e77..fbec818 100644 --- a/default.nix +++ b/default.nix @@ -11,6 +11,7 @@ let crate-info = fromTOML (builtins.readFile ./Cargo.toml); pname = crate-info.package.name; version = crate-info.package.version; + description = crate-info.package.description; docker-image = "badmanners/${pname}"; cargo-deps-hash = "sha256-PD/ZR/sdmqA18xcOi9AnwQtDYVyELPS6GBF/pzcJzkE="; @@ -62,7 +63,7 @@ let mkRustPkg = targetTriple: - stdenv.mkDerivation { + (stdenv.mkDerivation { inherit pname version @@ -89,6 +90,12 @@ let mkdir -p $out/bin cp ./target/${targetTriple}/release/${pname} $out/bin/ ''; + }) + // { + meta = { + inherit description; + mainProgram = pname; + }; }; mkDocker = @@ -107,16 +114,13 @@ let crossSystem = system; }); rust-package = mkRustPkg targetTriple; + ffmpeg = pkgs.ffmpeg_8-headless; in pkgs-cross.dockerTools.buildLayeredImage { name = docker-image; inherit tag; - contents = [ - pkgs.ffmpeg-headless - ]; - config.Entrypoint = [ - "${rust-package}/bin/${pname}" - ]; + contents = [ ffmpeg ]; + config.Entrypoint = [ (lib.getExe rust-package) ]; }; currentTargetTriple = diff --git a/shell.nix b/shell.nix index c0480f6..1455189 100644 --- a/shell.nix +++ b/shell.nix @@ -10,6 +10,7 @@ in pkgs.mkShell { packages = [ pkgs.bacon + pkgs.ffmpeg_8-headless pkgs.just pkgs.rust-bin.stable.latest.default pkgs.sea-orm-cli