flake: nixpkgs: 24.11 -> nixos-unstable

flake.nix

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

src/libfetchers/git-lfs-fetch.cc

@@ -44,10 +44,11 @@ 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/libstore-test-support/outputs-spec.cc

@@ -14,8 +14,9 @@ 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);

tests/nixos/git-submodules.nix

@@ -45,14 +45,14 @@
         client.succeed("chmod 600 /root/.ssh/id_ed25519")
 
         # Install the SSH key on the builders.
-        client.wait_for_unit("network-online.target")
+        client.wait_for_unit("network-addresses-eth1.service")
 
         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-online.target")
-        client.wait_for_unit("network-online.target")
+        remote.wait_for_unit("network-addresses-eth1.service")
+        client.wait_for_unit("network-addresses-eth1.service")
         client.succeed(f"ssh -o StrictHostKeyChecking=no {remote.name} 'echo hello world'")
 
         remote.succeed("""

tests/nixos/github-flakes.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-online.target")
+      github.wait_for_unit("network-addresses-eth1.service")
 
-      client.wait_for_unit("network-online.target")
+      client.wait_for_unit("network-addresses-eth1.service")
       client.succeed("curl -v https://github.com/ >&2")
       out = client.succeed("nix registry list")
       print(out)

tests/nixos/nix-copy-closure.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-online.target")
+      server.wait_for_unit("network-addresses-eth1.service")
 
-      client.wait_for_unit("network-online.target")
+      client.wait_for_unit("network-addresses-eth1.service")
       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.nix

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

tests/nixos/nix-docker.nix

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

tests/nixos/nss-preload.nix

@@ -145,15 +145,15 @@ in
   testScript =
     { nodes, ... }:
     ''
-      http_dns.wait_for_unit("network-online.target")
+      http_dns.wait_for_unit("network-addresses-eth1.service")
       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-online.target')
+      client.wait_for_unit('network-addresses-eth1.service')
 
       with subtest("can fetch data from a remote server outside sandbox"):
           client.succeed("nix --version >&2")

tests/nixos/remote-builds-ssh-ng.nix

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

tests/nixos/remote-builds.nix

@@ -123,12 +123,12 @@ in
         client.succeed("chmod 600 /root/.ssh/id_ed25519")
 
         # Install the SSH key on the builders.
-        client.wait_for_unit("network-online.target")
+        client.wait_for_unit("network-addresses-eth1.service")
         for builder in [builder1, builder2]:
           builder.succeed("mkdir -p -m 700 /root/.ssh")
           builder.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
           builder.wait_for_unit("sshd")
-          builder.wait_for_unit("network-online.target")
+          builder.wait_for_unit("network-addresses-eth1.service")
           # Make sure the builder can handle our login correctly
           builder.wait_for_unit("multi-user.target")
           # Make sure there's no funny business on the client either

tests/nixos/s3-binary-cache-store.nix

@@ -67,14 +67,14 @@ in
 
       # Create a binary cache.
       server.wait_for_unit("minio")
-      server.wait_for_unit("network-online.target")
+      server.wait_for_unit("network-addresses-eth1.service")
 
       server.succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4")
       server.succeed("mc mb minio/my-cache")
 
       server.succeed("${env} nix copy --to '${storeUrl}' ${pkgA}")
 
-      client.wait_for_unit("network-online.target")
+      client.wait_for_unit("network-addresses-eth1.service")
 
       # Test fetchurl on s3:// URLs while we're at it.
       client.succeed("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"s3://my-cache/nix-cache-info?endpoint=http://server:9000&region=eu-west-1\"; }'")

tests/nixos/sourcehut-flakes.nix

@@ -139,8 +139,8 @@ in
       start_all()
 
       sourcehut.wait_for_unit("httpd.service")
-      sourcehut.wait_for_unit("network-online.target")
-      client.wait_for_unit("network-online.target")
+      sourcehut.wait_for_unit("network-addresses-eth1.service")
+      client.wait_for_unit("network-addresses-eth1.service")
 
       client.succeed("curl -v https://git.sr.ht/ >&2")
       client.succeed("nix registry list | grep nixpkgs")