Merge remote-tracking branch 'origin/staging-next' into staging

NixOS · Oct 6, 2024 · 84fce7e · 84fce7e
2 parents 0ad0760 + 7ab01e0
commit 84fce7e
Show file tree

Hide file tree

Showing 108 changed files with 6,785 additions and 6,249 deletions.
diff --git a/doc/hooks/desktop-file-utils.section.md b/doc/hooks/desktop-file-utils.section.md
@@ -0,0 +1,5 @@
+# desktop-file-utils {#desktop-file-utils}
+
+This setup hook removes the MIME cache (located at `$out/share/applications/mimeinfo.cache`) in the `preFixupPhase`.
+
+This hook is necessary because `mimeinfo.cache` can be created when a package uses `desktop-file-utils`, resulting in collisions if multiple packages are installed that contain this file (as in [#48295](https://github.com/NixOS/nixpkgs/issues/48295)).
diff --git a/doc/hooks/index.md b/doc/hooks/index.md
@@ -12,6 +12,7 @@ bmake.section.md
 breakpoint.section.md
 cernlib.section.md
 cmake.section.md
+desktop-file-utils.section.md
 gdk-pixbuf.section.md
 ghc.section.md
 gnome.section.md

diff --git a/nixos/modules/services/networking/quorum.nix b/nixos/modules/services/networking/quorum.nix
@@ -201,11 +201,11 @@ in {
             --syncmode ${cfg.syncmode} \
             ${optionalString (cfg.permissioned)
             "--permissioned"} \
-            --mine --minerthreads 1 \
+            --mine --miner.threads 1 \
             ${optionalString (cfg.rpc.enable)
             "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \
             ${optionalString (cfg.ws.enable)
-            "--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \
+            "--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \
             --emitcheckpoints \
             --datadir ${dataDir} \
             --port ${toString cfg.port}'';

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
@@ -896,7 +896,7 @@ in
       typesHashMaxSize = mkOption {
         type = types.ints.positive;
         default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024;
-        defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
+        defaultText = literalExpression ''if config.services.nginx.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
         description = ''
           Sets the maximum size of the types hash tables (`types_hash_max_size`).
           It is recommended that the minimum size possible size is used.

diff --git a/nixos/tests/dnsdist.nix b/nixos/tests/dnsdist.nix
@@ -64,7 +64,10 @@ in
         networking.firewall.allowedTCPPorts = [ 443 ];
         networking.firewall.allowedUDPPorts = [ 443 ];
         services.dnsdist.dnscrypt.enable = true;
-        services.dnsdist.dnscrypt.providerKey = "${./dnscrypt-wrapper/secret.key}";
+        services.dnsdist.dnscrypt.providerKey = pkgs.runCommand "dnscrypt-secret.key" {} ''
+          echo 'R70+xqm7AaDsPtDgpSjSG7KHvEqVf6u6PZ+E3cGPbOwUQdg6/
+                RIIpK6pHkINhrv7nxwIG5c7b/m5NJVT3A1AXQ==' | base64 -id > "$out"
+        '';
       }
     ];
 

diff --git a/nixos/tests/non-default-filesystems.nix b/nixos/tests/non-default-filesystems.nix
@@ -82,8 +82,9 @@ with pkgs.lib;
         machine.wait_for_unit("multi-user.target")
 
         with subtest("BTRFS filesystems are mounted correctly"):
-          machine.succeed("grep -E '/dev/vda / btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
-          machine.succeed("grep -E '/dev/vda /home btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
+          print("output of \"grep -E '/dev/vda' /proc/mounts\":\n" + machine.execute("grep -E '/dev/vda' /proc/mounts")[1])
+          machine.succeed("grep -E '/dev/vda / btrfs rw,.*subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
+          machine.succeed("grep -E '/dev/vda /home btrfs rw,.*subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
       '';
     };
 

diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
@@ -26,7 +26,10 @@ with pkgs; {
     start_all()
     master.wait_for_unit("postgresql")
     master.succeed(
-        "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql"
+        "${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
+    )
+    master.succeed(
+        "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"
     )
   '';
 })
diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix
@@ -62,6 +62,7 @@ in
               "0x0000000000000000000000000000000000000000000000000000000000000000";
             eip155Block = 1;
             eip158Block = 1;
+            homesteadBlock = 1;
             isQuorum = true;
             istanbul = {
               epoch = 30000;

diff --git a/nixos/tests/tmate-ssh-server.nix b/nixos/tests/tmate-ssh-server.nix
@@ -52,6 +52,7 @@ in
     server.succeed("scp ${sshOpts} /tmp/tmate.conf client:/tmp/tmate.conf")
 
     client.wait_for_file("/tmp/tmate.conf")
+    client.wait_until_tty_matches("1", "login:")
     client.send_chars("root\n")
     client.sleep(2)
     client.send_chars("tmate -f /tmp/tmate.conf\n")
@@ -62,7 +63,8 @@ in
     client.wait_for_file("/tmp/ssh_command")
     ssh_cmd = client.succeed("cat /tmp/ssh_command")
 
-    client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -p 2223 server > ~/.ssh/known_hosts")
+    client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -4 -p 2223 server > ~/.ssh/known_hosts")
+    client2.wait_until_tty_matches("1", "login:")
     client2.send_chars("root\n")
     client2.sleep(2)
     client2.send_chars(ssh_cmd.strip() + "\n")

diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix
@@ -8,6 +8,8 @@ let
     maintainers = [ oddlama rnhmjoj ];
   };
 
+  naughtyPassphrase = ''!,./;'[]\-=<>?:"{}|_+@$%^&*()`~ # ceci n'est pas un commentaire'';
+
   runConnectionTest = name: extraConfig: runTest {
     name = "wpa_supplicant-${name}";
     inherit meta;
@@ -28,7 +30,7 @@ let
               ssid = "nixos-test-sae";
               authentication = {
                 mode = "wpa3-sae";
-                saePasswords = [ { password = "reproducibility"; } ];
+                saePasswords = [ { password = naughtyPassphrase; } ];
               };
               bssid = "02:00:00:00:00:00";
             };
@@ -37,16 +39,16 @@ let
               authentication = {
                 mode = "wpa3-sae-transition";
                 saeAddToMacAllow = true;
-                saePasswordsFile = pkgs.writeText "password" "reproducibility";
-                wpaPasswordFile = pkgs.writeText "password" "reproducibility";
+                saePasswordsFile = pkgs.writeText "password" naughtyPassphrase;
+                wpaPasswordFile = pkgs.writeText "password" naughtyPassphrase;
               };
               bssid = "02:00:00:00:00:01";
             };
             wlan0-2 = {
               ssid = "nixos-test-wpa2";
               authentication = {
                 mode = "wpa2-sha256";
-                wpaPassword = "reproducibility";
+                wpaPassword = naughtyPassphrase;
               };
               bssid = "02:00:00:00:00:02";
             };
@@ -66,7 +68,7 @@ let
 
           # secrets
           secretsFile = pkgs.writeText "wpa-secrets" ''
-            psk_nixos_test=reproducibility
+            psk_nixos_test=${naughtyPassphrase}
           '';
         }
         extraConfig

diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix
@@ -11,15 +11,15 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.4.1";
   pname = "jacktrip";
 
   src = fetchFromGitHub {
     owner = "jacktrip";
     repo = "jacktrip";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64=";
+    hash = "sha256-KxpoY7g5oKN2j8rOcFcJf/29xTELxhBn5KBvKB5kL8M=";
   };
 
   preConfigure = ''

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0=";
+    hash = "sha256-PcCZkY1+ks9J5JaDJLVgiJuXgRxIvUZHI00gatjeVbA=";
   };
 
   nativeBuildInputs = [