Merge pull request NixOS#25 from NixOS/merge_upstream_post_0.27.0_again

Merge upstream post 0.27.0

.cargo/config.toml

@@ -1,2 +1,2 @@
 [build]
-rustflags=["--cfg", "tokio_unstable"]
+rustflags=["--cfg", "tokio_unstable"]

.dockerignore

@@ -1 +1 @@
-target
+target

.editorconfig

@@ -0,0 +1,42 @@
+root = true
+
+# Unix-style newlines with a newline ending every file, utf-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# Rust
+[*.rs]
+indent_style = space
+
+# Misc
+[*.{yaml,yml,nix,json,sh,service,socket,toml,te}]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.md]
+insert_final_newline = true
+indent_style = space
+
+[*.plist]
+indent_style = tab
+
+[*.ps1]
+indent_style = space
+indent_size = 4
+
+[Cargo.lock]
+indent_style = space
+indent_size = 1
+
+# selinux
+[*.pp]
+charset = unset
+end_of_line = unset
+indent_size = unset
+indent_style = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset

.envrc

@@ -1 +1 @@
-use flake
+use flake

.github/workflows/build-aarch64-darwin.yml

@@ -21,9 +21,11 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
+        with:
+          determinate: false
       - uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           use-flakehub: false

.github/workflows/build-aarch64-linux.yml

@@ -10,7 +10,7 @@ on:
       runs-on:
         type: string
         required: true
-        default: namespace-profile-default-arm64
+        default: UbuntuLatest32Cores128GArm
 
 jobs:
   build-aarch64-linux:
@@ -21,9 +21,11 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
+        with:
+          determinate: false
       - uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           use-flakehub: false

.github/workflows/build-x86_64-darwin.yml

@@ -21,9 +21,11 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
+        with:
+          determinate: false
       - uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           use-flakehub: false

.github/workflows/build-x86_64-linux.yml

@@ -21,9 +21,11 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
+        with:
+          determinate: false
       - uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           use-flakehub: false