Skip to content

Comments

stdenv: add uutils-coreutils stdenv #2#407301

Open
SuperSandro2000 wants to merge 4 commits intoNixOS:stagingfrom
SuperSandro2000:uutils-coreutils-stdenv
Open

stdenv: add uutils-coreutils stdenv #2#407301
SuperSandro2000 wants to merge 4 commits intoNixOS:stagingfrom
SuperSandro2000:uutils-coreutils-stdenv

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented May 15, 2025 •
edited
Loading

see #116274

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@SuperSandro2000 SuperSandro2000 requested a review from siraben May 15, 2025 09:06
@SuperSandro2000 SuperSandro2000 mentioned this pull request May 15, 2025
Merged
27 tasks
@nix-owners nix-owners bot requested a review from Ericson2314 May 15, 2025 09:08
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels May 15, 2025
@nyabinary
Copy link
Contributor

nyabinary commented May 15, 2025

Fails nixpkgs vet

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 15, 2025
@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented May 16, 2025

I don't plan to move coreutils, so I am currently planning to just ignore that one time 😅

Ericson2314
Ericson2314 requested changes May 16, 2025
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please test cross compilation of this first. It doesn't look to me like you have yet?

pkgs/top-level/all-packages.nix
uutils-coreutils = pkgs.uutils-coreutils-minimal;
bintools = wrapBintoolsWith {
bintools = stdenv.cc.bintools.bintools;
coreutils = uutils-coreutils;
Copy link
Member

@Ericson2314 Ericson2314 May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
coreutils = uutils-coreutils;
coreutils = buildPackages.uutils-coreutils;

pkgs/top-level/all-packages.nix
in
stdenv.override {
cc = stdenv.cc.override {
coreutils = uutils-coreutils;
Copy link
Member

@Ericson2314 Ericson2314 May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
coreutils = uutils-coreutils;
coreutils = buildPackages.uutils-coreutils;

pkgs/top-level/all-packages.nix
inherit bintools;
};

initialPath = (lib.remove coreutils stdenv.initialPath) ++ [ uutils-coreutils ];
Copy link
Member

@Ericson2314 Ericson2314 May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
initialPath = (lib.remove coreutils stdenv.initialPath) ++ [ uutils-coreutils ];
initialPath = (lib.remove buildPackages.coreutils stdenv.initialPath) ++ [ buildPackages.uutils-coreutils ];

pkgs/top-level/all-packages.nix
Comment on lines +111 to +120
(lib.remove [
bintools
expand-response-params
coreutils
] rs)
++ [
bintools
expand-response-params
uutils-coreutils
]
Copy link
Member

@Ericson2314 Ericson2314 May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(lib.remove [
bintools
expand-response-params
coreutils
] rs)
++ [
bintools
expand-response-params
uutils-coreutils
]
(lib.remove [
buildPackages.bintools
buildPackages.expand-response-params
buildPackages.coreutils
] rs)
++ [
buildPackages.bintools
buildPackages.expand-response-params
buildPackages.uutils-coreutils
]

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented May 16, 2025

Please test cross compilation of this first. It doesn't look to me like you have yet?

No, I haven't at all 😅

@tobim
Copy link
Contributor

tobim commented May 18, 2025

What problem does this address? What's the motivation?

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented May 18, 2025

#116274

@siraben
Copy link
Member

siraben commented May 19, 2025

@SuperSandro2000 please add the comments to help with cross.

@Ericson2314
Copy link
Member

Ericson2314 commented May 19, 2025

Hopefully my suggestions are sufficient, but we'll see

@siraben
Copy link
Member

siraben commented May 22, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 407301 --package pkgsCross.riscv64.uutils-coreutils --package pkgsCross.aarch64-multiplatform.uutils-coreutils

x86_64-linux

❌ 1 package failed to build:
  • pkgsCross.riscv64.uutils-coreutils
✅ 1 package built:
  • pkgsCross.aarch64-multiplatform.uutils-coreutils

@Ericson2314
Copy link
Member

Ericson2314 commented May 22, 2025

Note the failure I am talking about it is not cross-compiling uutils-coreutils, but cross compiling with (native, at build time) uutils-coreutils.

@siraben
Copy link
Member

siraben commented May 29, 2025

This needs a rebase.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 9, 2025
@nixpkgs-ci nixpkgs-ci bot added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Jun 25, 2025
@siraben
Copy link
Member

siraben commented Sep 1, 2025

In particular, variants are now moved out of pkgs/top-level/stage.nix, see #400351

@siraben siraben mentioned this pull request Sep 1, 2025
Draft
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Ericson2314 requested changes

@siraben siraben siraben approved these changes

@fpletz fpletz Awaiting requested review from fpletz

@edolstra edolstra Awaiting requested review from edolstra

@prusnak prusnak Awaiting requested review from prusnak

@adevress adevress Awaiting requested review from adevress

@bjornfor bjornfor Awaiting requested review from bjornfor

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@amiloradovsky amiloradovsky Awaiting requested review from amiloradovsky

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@SuperSandro2000 @nyabinary @tobim @siraben @Ericson2314 @wegank