From e049c438a985eca2c9e2c6bf35fd6e3ea8b655ac Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 13 Apr 2025 17:37:01 +0000 Subject: [PATCH] anubis: 1.15.2 -> 1.16.0 (#397605) --- pkgs/by-name/an/anubis/package.nix | 52 +++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 9282a3bb13e0..8741d9877d48 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -1,22 +1,56 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, nix-update-script, stdenv, + + esbuild, + brotli, + zstd, }: -buildGoModule (finalAttrs: { +let pname = "anubis"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; - tag = "v${finalAttrs.version}"; - hash = "sha256-5OqpmuRTrM+hseIhR2sTb+K01Co6X+Rhb6mN+U54NAI="; + tag = "v${version}"; + hash = "sha256-/7GMf0QGR0rtz05vHN/yYYuzxN25NhqidITdAf6jSXY="; }; - vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k="; + anubisXess = buildNpmPackage { + inherit version src; + pname = "${pname}-xess"; + + npmDepsHash = "sha256-QrW0grgNRZRum2mCec86Za1UV4R5QSRlhjVYFsZDwY8="; + + buildPhase = '' + runHook preBuild + npx postcss ./xess/xess.css -o xess.min.css + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp xess.min.css $out + runHook postInstall + ''; + }; +in +buildGoModule (finalAttrs: { + inherit pname version src; + + vendorHash = "sha256-D0+SDJIagAPqd71fIHCh29vPMVL0ZZAFg0rmgW2EaGw="; + + nativeBuildInputs = [ + esbuild + brotli + zstd + ]; subPackages = [ "cmd/anubis" @@ -32,6 +66,14 @@ buildGoModule (finalAttrs: { "-extldflags=-static" ]; + postPatch = '' + patchShebangs ./web/build.sh + ''; + + preBuild = '' + go generate ./... && ./web/build.sh && cp -r ${anubisXess}/xess.min.css ./xess + ''; + preCheck = '' export DONT_USE_NETWORK=1 '';