From f528262028f8a61c2c0d1cdb0e134b8279243169 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 21 Nov 2024 05:02:58 +0800 Subject: [PATCH 1/2] uutils-coreutils: format --- pkgs/tools/misc/uutils-coreutils/default.nix | 57 +++++++++++--------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index a71567b59038..27a027258483 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, cargo -, sphinx -, Security -, libiconv -, prefix ? "uutils-" -, buildMulticallBinary ? true +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + cargo, + sphinx, + Security, + libiconv, + prefix ? "uutils-", + buildMulticallBinary ? true, }: stdenv.mkDerivation rec { @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; }; @@ -27,30 +28,38 @@ stdenv.mkDerivation rec { hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; }; - nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + sphinx + ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + Security + libiconv + ]; - makeFlags = [ - "CARGO=${cargo}/bin/cargo" - "PREFIX=${placeholder "out"}" - "PROFILE=release" - "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" - ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] - ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; + makeFlags = + [ + "CARGO=${cargo}/bin/cargo" + "PREFIX=${placeholder "out"}" + "PROFILE=release" + "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" + ] + ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] + ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; # too many impure/platform-dependent tests doCheck = false; - meta = with lib; { + meta = { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ siraben ]; - license = licenses.mit; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ siraben ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } From 5e463841f559d624fc55dcd8acb4f453f1a6eaeb Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:48:22 +0800 Subject: [PATCH 2/2] uutils-coreutils: 0.0.27 -> 0.0.28 --- pkgs/tools/misc/uutils-coreutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 27a027258483..6d08d31d78e2 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = "refs/tags/${version}"; - hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; + hash = "sha256-Gwks+xTkwK5dgV9AkSthIrhBNwq/WvM9SNr0wR/SBSM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "uutils-coreutils-${version}"; - hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; + hash = "sha256-i7RvsgtmkH8og8lkRQURWLrzrhPkxans+KME2Ili0wM="; }; nativeBuildInputs = [