Skip to content

flake: drop flake-utils, refactor #7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2025
Merged

flake: drop flake-utils, refactor #7368

merged 2 commits into from
Mar 19, 2025

Conversation

bloxx12
Copy link
Contributor

@bloxx12 bloxx12 commented Feb 27, 2025

  • Refactor the flake, updating deprecated things (devShell -> devShells.default)
  • drop flake-utils, since this is really not needed here and can be replaces by a few simple lines of nix code
  • use a systems input to specify the systems, since users can override that locally, which can be very convenient

I have tested basic functionality and it should function just the same as before.

@cakebaker cakebaker requested a review from RenjiSann February 27, 2025 10:46
Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)

Copy link
Collaborator

@RenjiSann RenjiSann left a comment

Choose a reason for hiding this comment

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

Thank you for refactoring this. I'm no expert in Nix, and I'm happy to see it used and maintained.

The changes looks good to me 👍

Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
'';
RUSTC_VERSION = "1.79";
LIBCLANG_PATH = pkgsFor.${system}.lib.makeLibraryPath [pkgsFor.${system}.llvmPackages_latest.libclang.lib];

Choose a reason for hiding this comment

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

Is it possible to use rustPlatform.bindgenHook instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No idea, how would I go about doing that?

acl
];

build_deps = with pkgsFor.${system}; [
clang

Choose a reason for hiding this comment

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

Should probably use clangStdenv for this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why? What is the difference? I guess it includes more stuff which might be needed?

@sylvestre sylvestre merged commit b8779c5 into uutils:main Mar 19, 2025
66 checks passed
@NotAShelf
Copy link

A small step for uutils, but a large step for the Nix community 🎉

@sielicki
Copy link

sielicki commented Apr 8, 2025

This isn't usable under darwin, fyi.

@bloxx12
Copy link
Contributor Author

bloxx12 commented Apr 8, 2025

This isn't usable under darwin, fyi.

Please make a new issue with the problem, I'd be glad to take a look at it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants