/cc @copumpkin @LnL7

I'm not sure it's even true anymore that we don't have xz in the bootstrap, right?

I don't really like this being conditional, we can allow xz if the linux stdenv already depends on it.

Yeah, sorry, what I meant is that I think that curl http2 support being conditioned on !darwin is based on ancient information that stopped being true when we merged pure-darwin a couple of years ago.

Yeah, that may be true. xz is named in darwin/make-bootstrap-tools.nix. How would I test and confirm this?

@bdarnell I think if you just remove the !stdenv.isDarwin from curl's top level expression, that might rebuild a bunch of stuff but should get the curl to be equivalent on all platforms.

OK, I've made that change. nix-shell -I nixpkgs=. -p curl builds correctly; do I need to do anything else to test the bootstrapping environment?

Nah, I'd mostly just repoint this PR against staging (GitHub lets you edit the PR base branch now) since it's a mass rebuild, but I don't expect it to break much. Thanks!

OK, changed base to staging.

Looks good, thanks!

Not urgent, but stdenv bootstrap tools for darwin got broken by this: https://hydra.nixos.org/build/68787762

So should this be reverted and replaced by the original version that only adds http2 support to curlFull, or is there some other fix for the bootstrap tools? (It's unclear to me how the linux version works since it doesn't seem to do anything specific to make nghttp2 available)

I don't think there's any curl in Linux bootstrap tools.

I expect the easiest way would be to override the bootstrapping curl not to support http2, as it's of little use in there.

Probably

--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -15,8 +15,8 @@ in rec {
   # Avoid debugging larger changes for now.
   bzip2_ = bzip2.override (args: { linkStatic = true; });
 
-  # Avoid messing with libkrb5.
-  curl_ = curl.override (args: { gssSupport = false; });
+  # Avoid messing with libkrb5 and libnghttp2.
+  curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
 
   build = stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools";

but I don't have a Darwin machine at hand.

Looks like that works (with nix-build pkgs/stdenv/darwin/make-bootstrap-tools.nix -A test ). I'll send a PR.

I can push it directly, if it works.

OK, go ahead.