diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix similarity index 75% rename from pkgs/tools/misc/uutils-coreutils/default.nix rename to pkgs/by-name/uu/uutils-coreutils/package.nix index 3c0c6aa8738a..bc86e8166077 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -4,9 +4,10 @@ fetchFromGitHub, rustPlatform, cargo, - sphinx, - Security, - libiconv, + python3Packages, + versionCheckHook, + nix-update-script, + prefix ? "uutils-", buildMulticallBinary ? true, }: @@ -30,17 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook - sphinx - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - libiconv + python3Packages.sphinx ]; makeFlags = [ - "CARGO=${cargo}/bin/cargo" + "CARGO=${lib.getExe cargo}" "PREFIX=${placeholder "out"}" "PROFILE=release" "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" @@ -51,6 +47,21 @@ stdenv.mkDerivation rec { # too many impure/platform-dependent tests doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = + let + prefix' = lib.optionalString (prefix != null) prefix; + in + "${placeholder "out"}/bin/${prefix'}ls"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 147d5b23b31b..ec2549d240d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3170,11 +3170,6 @@ with pkgs; uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi; - uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { - inherit (python3Packages) sphinx; - inherit (darwin.apple_sdk.frameworks) Security; - }; - uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; vorta = qt6Packages.callPackage ../applications/backup/vorta { };