From 7943ba552686955b0a7b18d91eeb8957c21688c2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 19 Nov 2024 17:11:01 +0200 Subject: [PATCH] museum: modernize - No with lib; in meta. - Put `vendorHash` near `src` - to make future diffs smaller, and to make sure no reviewer will miss a `vendorHash` not updated when a version bump does trigger a change in src's hash. - Nixfmt --- pkgs/by-name/mu/museum/package.nix | 38 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index c8fac5e81d1d..994826d6d854 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -1,14 +1,14 @@ -{ lib -, fetchFromGitHub -, pkg-config -, libsodium -, buildGoModule +{ + lib, + fetchFromGitHub, + pkg-config, + libsodium, + buildGoModule, }: buildGoModule rec { - - version = "0.9.53"; pname = "museum"; + version = "0.9.53"; src = fetchFromGitHub { owner = "ente-io"; @@ -18,10 +18,16 @@ buildGoModule rec { hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k="; }; + vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY="; + sourceRoot = "${src.name}/server"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsodium ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + libsodium + ]; # fatal: "Not running tests in non-test environment" doCheck = false; @@ -34,15 +40,15 @@ buildGoModule rec { $out/share/museum ''; - meta = with lib; { + meta = { description = "API server for ente.io"; homepage = "https://github.com/ente-io/ente/tree/main/server"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ surfaceflinger pinpox ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + surfaceflinger + pinpox + ]; mainProgram = "museum"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; - vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY="; } - -