diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 3e04d42b8724..1a43ed4ae530 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -7,7 +7,7 @@ python3Packages, versionCheckHook, nix-update-script, - withDocs ? true, + prefix ? "uutils-", buildMulticallBinary ? true, }: @@ -23,19 +23,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OZ9AsCJmQmn271OzEmqSZtt1OPn7zHTScQiiqvPhqB0="; }; - postPatch = '' - # don't enforce the building of the man page - substituteInPlace GNUmakefile \ - --replace 'install: build' 'install:' - ''; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "uutils-coreutils-${finalAttrs.version}"; hash = "sha256-DsVLp2Y15k+KQI7S6A4hylOhJN016MEdEWx9VQIQEgQ="; }; - nativeBuildInputs = [ rustPlatform.cargoSetupHook ] ++ lib.optional withDocs python3Packages.sphinx; + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + python3Packages.sphinx + ]; makeFlags = [ @@ -45,11 +42,7 @@ stdenv.mkDerivation (finalAttrs: { "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] - ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ] - ++ lib.optionals (!withDocs) [ - "build-coreutils" - "build-pkgs" - ]; + ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; # too many impure/platform-dependent tests doCheck = false; @@ -76,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; + changelog = "https://github.com/uutils/coreutils/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ siraben ]; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ecee7caf8c6f..6eac0fd18393 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -25,10 +25,6 @@ stdenv.mkDerivation rec { hash = "sha256-uohcExlXjWyU1G6bDc60AUyq/iSQ5Deg28o/JwoiP1o="; }; - patches = [ - ./uutils-mkdirp.patch - ]; - strictDeps = true; nativeBuildInputs = [ m4 diff --git a/pkgs/development/tools/misc/autoconf/uutils-mkdirp.patch b/pkgs/development/tools/misc/autoconf/uutils-mkdirp.patch deleted file mode 100644 index caecc81d6cb1..000000000000 --- a/pkgs/development/tools/misc/autoconf/uutils-mkdirp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4 -index 8226a7c..3b231b9 100644 ---- a/lib/autoconf/programs.m4 -+++ b/lib/autoconf/programs.m4 -@@ -701,7 +701,8 @@ if test -z "$MKDIR_P"; then - case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir ('*'coreutils) '* | \ - *'BusyBox '* | \ -- 'mkdir (fileutils) '4.1*) -+ 'mkdir (fileutils) '4.1* | \ -+ 'mkdir 0.0.'*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext - break 3;; - esac diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 950f071d210b..00ad066671b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -91,36 +91,6 @@ with pkgs; gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; - stdenvUutilsCoreutils = - let - uutils-coreutils = pkgs.uutils-coreutils-minimal; - bintools = wrapBintoolsWith { - bintools = stdenv.cc.bintools.bintools; - coreutils = uutils-coreutils; - }; - in - stdenv.override { - cc = stdenv.cc.override { - coreutils = uutils-coreutils; - inherit bintools; - }; - - initialPath = (lib.remove coreutils stdenv.initialPath) ++ [ uutils-coreutils ]; - allowedRequisites = lib.mapNullable ( - rs: - (lib.remove [ - bintools - expand-response-params - coreutils - ] rs) - ++ [ - bintools - expand-response-params - uutils-coreutils - ] - ) (stdenv.allowedRequisites or null); - }; - # For convenience, allow callers to get the path to Nixpkgs. path = ../..; @@ -2750,15 +2720,13 @@ with pkgs; llvmPackages = llvmPackages_13; }; - coreutils = - if stdenv.hostPlatform.useUutilsCoreutils or false then uutils-coreutils else gnu-coreutils; - gnu-coreutils = callPackage ../tools/misc/coreutils { }; + coreutils = callPackage ../tools/misc/coreutils { }; # The coreutils above are built with dependencies from # bootstrapping. We cannot override it here, because that pulls in # openssl from the previous stage as well. - coreutils-full = gnu-coreutils.override { minimal = false; }; - coreutils-prefixed = gnu-coreutils.override { + coreutils-full = callPackage ../tools/misc/coreutils { minimal = false; }; + coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; @@ -2920,11 +2888,6 @@ with pkgs; uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; - uutils-coreutils-minimal = pkgs.uutils-coreutils.override { - prefix = null; - withDocs = false; - }; - vorta = qt6Packages.callPackage ../applications/backup/vorta { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -3025,10 +2988,7 @@ with pkgs; inherit (windows) libgnurx; }; - findutils = callPackage ../tools/misc/findutils { - coreutils = - if stdenv.hostPlatform.useUutilsCoreutils or false then uutils-coreutils-minimal else gnu-coreutils; - }; + findutils = callPackage ../tools/misc/findutils { }; bsd-fingerd = bsd-finger.override { buildProduct = "daemon"; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index caf1dd68668f..7bca60a4caa5 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -285,21 +285,6 @@ let else throw "Musl libc only supports 64-bit Linux systems."; - pkgsUutils = - if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then - nixpkgsFun { - overlays = [ - (self': super': { - pkgsUutils = super'; - }) - ] ++ overlays; - ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { - config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); - }; - } - else - throw "uutils only supports 64-bit Linux systems."; - # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux =