Merge pull request #12907 from NixOS/revert-nixpkgs-unstable

Revert to Nixpkgs 24.11 [2.28]

Author: mergify[bot]

flake.lock

@@ -1,7 +1,7 @@
 {
   description = "The purely functional package manager";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
 
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
   inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

flake.nix

@@ -44,11 +44,10 @@ static void downloadToSink(
 
 static std::string getLfsApiToken(const ParsedURL & url)
 {
-    auto [status, output] = runProgram(
-        RunOptions{
-            .program = "ssh",
-            .args = {*url.authority, "git-lfs-authenticate", url.path, "download"},
-        });
+    auto [status, output] = runProgram(RunOptions{
+        .program = "ssh",
+        .args = {*url.authority, "git-lfs-authenticate", url.path, "download"},
+    });
 
     if (output.empty())
         throw Error(

src/libfetchers/git-lfs-fetch.cc

@@ -14,9 +14,8 @@ Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary()
                 return gen::just((OutputsSpec) OutputsSpec::All{});
             case 1:
                 return gen::map(
-                    gen::nonEmpty(
-                        gen::container<StringSet>(
-                            gen::map(gen::arbitrary<StorePathName>(), [](StorePathName n) { return n.name; }))),
+                    gen::nonEmpty(gen::container<StringSet>(
+                        gen::map(gen::arbitrary<StorePathName>(), [](StorePathName n) { return n.name; }))),
                     [](StringSet names) { return (OutputsSpec) OutputsSpec::Names{names}; });
             default:
                 assert(false);

src/libstore-test-support/outputs-spec.cc

@@ -45,14 +45,14 @@
         client.succeed("chmod 600 /root/.ssh/id_ed25519")
 
         # Install the SSH key on the builders.
-        client.wait_for_unit("network-addresses-eth1.service")
+        client.wait_for_unit("network-online.target")
 
         remote.succeed("mkdir -p -m 700 /root/.ssh")
         remote.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
         remote.wait_for_unit("sshd")
         remote.wait_for_unit("multi-user.target")
-        remote.wait_for_unit("network-addresses-eth1.service")
-        client.wait_for_unit("network-addresses-eth1.service")
+        remote.wait_for_unit("network-online.target")
+        client.wait_for_unit("network-online.target")
         client.succeed(f"ssh -o StrictHostKeyChecking=no {remote.name} 'echo hello world'")
 
         remote.succeed("""

tests/nixos/git-submodules.nix

@@ -187,9 +187,9 @@ in
            github.succeed("cat /var/log/httpd/*.log >&2")
 
       github.wait_for_unit("httpd.service")
-      github.wait_for_unit("network-addresses-eth1.service")
+      github.wait_for_unit("network-online.target")
 
-      client.wait_for_unit("network-addresses-eth1.service")
+      client.wait_for_unit("network-online.target")
       client.succeed("curl -v https://github.com/ >&2")
       out = client.succeed("nix registry list")
       print(out)

tests/nixos/github-flakes.nix

@@ -70,9 +70,9 @@ in
       server.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
       server.wait_for_unit("sshd")
       server.wait_for_unit("multi-user.target")
-      server.wait_for_unit("network-addresses-eth1.service")
+      server.wait_for_unit("network-online.target")
 
-      client.wait_for_unit("network-addresses-eth1.service")
+      client.wait_for_unit("network-online.target")
       client.succeed(f"ssh -o StrictHostKeyChecking=no {server.name} 'echo hello world'")
 
       # Copy the closure of package A from the client to the server.

tests/nixos/nix-copy-closure.nix

@@ -79,9 +79,9 @@ in
 
       server.wait_for_unit("sshd")
       server.wait_for_unit("multi-user.target")
-      server.wait_for_unit("network-addresses-eth1.service")
+      server.wait_for_unit("network-online.target")
 
-      client.wait_for_unit("network-addresses-eth1.service")
+      client.wait_for_unit("network-online.target")
       client.wait_for_unit("[email protected]")
       # Either the prompt: ]#
       # or an OCR misreading of it: 1#

tests/nixos/nix-copy.nix

@@ -61,7 +61,7 @@ in
     { nodes }:
     ''
       cache.wait_for_unit("harmonia.service")
-      cache.wait_for_unit("network-addresses-eth1.service")
+      cache.wait_for_unit("network-online.target")
 
       machine.succeed("mkdir -p /etc/containers")
       machine.succeed("""echo '{"default":[{"type":"insecureAcceptAnything"}]}' > /etc/containers/policy.json""")

tests/nixos/nix-docker.nix

@@ -145,15 +145,15 @@ in
   testScript =
     { nodes, ... }:
     ''
-      http_dns.wait_for_unit("network-addresses-eth1.service")
+      http_dns.wait_for_unit("network-online.target")
       http_dns.wait_for_unit("nginx")
       http_dns.wait_for_open_port(80)
       http_dns.wait_for_unit("unbound")
       http_dns.wait_for_open_port(53)
 
       client.start()
       client.wait_for_unit('multi-user.target')
-      client.wait_for_unit('network-addresses-eth1.service')
+      client.wait_for_unit('network-online.target')
 
       with subtest("can fetch data from a remote server outside sandbox"):
           client.succeed("nix --version >&2")