Skip to content

nix: migrate off deprecated crane stdenv arg to stdenvSelector #2379

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.

Sign up for GitHub

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

Open
amaanq wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −9
Open

nix: migrate off deprecated crane stdenv arg to stdenvSelector #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abe4dd5
nix: migrate off deprecated crane `stdenv` arg to `stdenvSelector`
amaanq May 29, 2026
23b35c5
inputs: update crane
amaanq May 29, 2026
14b5888
Merge branch 'main' into crane-stdenvselector
MarcusSorealheis May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,19 @@
lib,
...
}: let
craneLibFor = p: (crane.mkLib p).overrideToolchain pkgs.lre.stableRustFor;
nightlyCraneLibFor = p: (crane.mkLib p).overrideToolchain pkgs.lre.nightlyRustFor;
# On Linux we build fully static musl binaries, elsewhere the default stdenv.
Copy link
Copy Markdown
Collaborator

@MarcusSorealheis MarcusSorealheis May 30, 2026

Choose a reason for hiding this comment

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

I like this but I'd like to explore giving people the option to run glibc at times when they need it. Musl is good default, though, for obvious reasons.

Copy link
Copy Markdown
Author

@amaanq amaanq May 30, 2026

Choose a reason for hiding this comment

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

Sure, that sounds reasonable. I could do that in a follow-up pr

stdenvSelectorFor = q:
if q.stdenv.targetPlatform.isLinux
then q.pkgsMusl.stdenv
else q.stdenv;
craneLibFor = p:
((crane.mkLib p).overrideToolchain pkgs.lre.stableRustFor).overrideScope (_: _: {
stdenvSelector = stdenvSelectorFor;
});
nightlyCraneLibFor = p:
((crane.mkLib p).overrideToolchain pkgs.lre.nightlyRustFor).overrideScope (_: _: {
stdenvSelector = stdenvSelectorFor;
});

src = pkgs.lib.cleanSourceWith {
src = (craneLibFor pkgs).path ./.;
Expand Down Expand Up @@ -124,10 +135,6 @@
in
{
inherit src;
stdenv = q:
if q.stdenv.targetPlatform.isLinux
then q.pkgsMusl.stdenv
else q.stdenv;
strictDeps = true;
buildInputs =
[p.cacert]
Expand Down
Loading