From 2052e1d67efd8be8f52f8637fbfe8e6e3c3b07a9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Aug 2026 21:34:11 +0000 Subject: [PATCH] uutils-coreutils: 0.9.0 -> 0.10.0 Diff: https://github.com/uutils/coreutils/compare/0.9.0...0.10.0 Changelog: https://github.com/uutils/coreutils/releases/tag/0.10.0 --- pkgs/by-name/uu/uutils-coreutils/package.nix | 29 ++++++-------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 97c4c1b90a42..1cec1e4189a0 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -13,21 +13,20 @@ selinuxSupport ? false, libselinux, - - acl, }: assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux; stdenv.mkDerivation (finalAttrs: { pname = "uutils-coreutils"; - version = "0.9.0"; + version = "0.10.0"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; tag = finalAttrs.version; - hash = "sha256-g+RuVQr7CNtF9eqEJb3dlgfgPO3aRwWgXWPniNmhXeA="; + hash = "sha256-bqMrYVFa21Tu3t2Y5na9gFYr6AkklSnszbX8vKxI4gg="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -37,16 +36,12 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-WoPqxO1TBt4eCOR3tlzuoXqH9u/mTHR5Dr/WnKLxyYM="; + hash = "sha256-7ROe9xrFcaXWYxoe9lfAfZxDxPcrETU8Mcj2HsdoqpA="; }; - buildInputs = - lib.optionals (lib.meta.availableOn stdenv.hostPlatform acl) [ - acl - ] - ++ lib.optionals selinuxSupport [ - libselinux - ]; + buildInputs = lib.optionals selinuxSupport [ + libselinux + ]; nativeBuildInputs = [ cargo @@ -60,19 +55,13 @@ stdenv.mkDerivation (finalAttrs: { "PROFILE=release" "SELINUX_ENABLED=${if selinuxSupport then "1" else "0"}" "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" - # Explicitly enable acl, and if requested selinux. # We cannot rely on SELINUX_ENABLED here since our explicit assignment # overrides its effect in the makefile. "BUILD_SPEC_FEATURE=${ lib.concatStringsSep "," ( - # We can always enable acl, on non-Linux, libc provides the headers, - # only in Linux we need to add the acl lib to buildInputs. - [ - "feat_acl" - ] - ++ (lib.optionals selinuxSupport [ + lib.optionals selinuxSupport [ "feat_selinux" - ]) + ] ) }" "SKIP_UTILS=${lib.optionalString stdenv.hostPlatform.isStatic "stdbuf"}"