From d8f99c1c29af06aa3e50263838e46fe03b7c4b02 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 8 Jul 2025 15:19:04 +0200 Subject: [PATCH] attic-client: remove `with lib;` --- pkgs/by-name/at/attic-client/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 5ba0bab1690c..3546ef4750d9 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -10,11 +10,13 @@ installShellFiles, crates ? [ "attic-client" ], }: + let # Only the attic-client crate builds against the Nix C++ libs # This derivation is also used to build the server needNixInclude = lib.elem "attic-client" crates; in + rustPlatform.buildRustPackage { pname = "attic"; version = "0-unstable-2025-07-01"; @@ -31,9 +33,7 @@ rustPlatform.buildRustPackage { installShellFiles ]; - buildInputs = lib.optional needNixInclude nixVersions.nix_2_24 ++ [ - boost - ]; + buildInputs = lib.optional needNixInclude nixVersions.nix_2_24 ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; @@ -61,22 +61,20 @@ rustPlatform.buildRustPackage { ''; passthru = { - tests = { - inherit (nixosTests) atticd; - }; + tests = { inherit (nixosTests) atticd; }; updateScript = ./update.sh; }; - meta = with lib; { + meta = { description = "Multi-tenant Nix Binary Cache"; homepage = "https://github.com/zhaofengli/attic"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ zhaofengli aciceri ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "attic"; }; }