Merge branch 'master' into staging-next

flake.nix

@@ -47,7 +47,7 @@
       checks = forAllSystems (system: {
         tarball = jobs.${system}.tarball;
         # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
-      } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) {
+      } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) {
         # Test that ensures that the nixosSystem function can accept a lib argument
         # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules
         #       alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>`

lib/tests/test-with-nix.nix

@@ -33,7 +33,7 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" {
   nativeBuildInputs = [
     nix
     pkgs.gitMinimal
-  ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools;
+  ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools;
   strictDeps = true;
 } ''
   datadir="${nix}/share"

maintainers/scripts/convert-to-import-cargo-lock/shell.nix

@@ -13,5 +13,5 @@ mkShell {
       clippy
       rustfmt
     ]
-    ++ lib.optional stdenv.isDarwin pkgs.libiconv;
+    ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv;
 }

nixos/modules/config/fonts/fontconfig.nix

@@ -52,7 +52,7 @@ let
         ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
         <!-- Pre-generated font caches -->
         <cachedir>${cache}</cachedir>
-        ${lib.optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''
+        ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) ''
           <cachedir>${cache32}</cachedir>
         ''}
         ''}

nixos/modules/config/ldso.nix

@@ -32,7 +32,7 @@ in {
 
   config = {
     assertions = [
-      { assertion = isNull config.environment.ldso32 || pkgs.stdenv.isx86_64;
+      { assertion = isNull config.environment.ldso32 || pkgs.stdenv.hostPlatform.isx86_64;
         message = "Option environment.ldso32 currently only works on x86_64.";
       }
     ];
@@ -44,7 +44,7 @@ in {
         "d /${libDir} 0755 root root - -"
         "L+ /${libDir}/${ldsoBasename} - - - - ${config.environment.ldso}"
       ]
-    ) ++ optionals pkgs.stdenv.isx86_64 (
+    ) ++ optionals pkgs.stdenv.hostPlatform.isx86_64 (
       if isNull config.environment.ldso32 then [
         "r /${libDir32}/${ldsoBasename32} - - - - -"
       ] else [

nixos/modules/config/pulseaudio.nix

@@ -12,7 +12,7 @@ let
 
   # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps
   # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
+  enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
 
 
   myConfigFile =

nixos/modules/config/stub-ld.nix

@@ -49,7 +49,7 @@ in {
 
   config = mkIf cfg.enable {
     environment.ldso = mkDefault stub-ld;
-    environment.ldso32 = mkIf pkgs.stdenv.isx86_64 (mkDefault stub-ld32);
+    environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32);
   };
 
   meta.maintainers = with lib.maintainers; [ tejing ];

nixos/modules/hardware/graphics.nix

@@ -100,7 +100,7 @@ in
   config = lib.mkIf cfg.enable {
     assertions = [
       {
-        assertion = cfg.enable32Bit -> pkgs.stdenv.isx86_64;
+        assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64;
         message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system.";
       }
       {
@@ -112,7 +112,7 @@ in
     systemd.tmpfiles.settings.graphics-driver = {
       "/run/opengl-driver"."L+".argument = toString driversEnv;
       "/run/opengl-driver-32" =
-        if pkgs.stdenv.isi686 then
+        if pkgs.stdenv.hostPlatform.isi686 then
           { "L+".argument = "opengl-driver"; }
         else if cfg.enable32Bit then
           { "L+".argument = toString driversEnv32; }

nixos/modules/profiles/all-hardware.nix

@@ -52,7 +52,7 @@ in
       # VMware support.
       "mptspi" "vmxnet3" "vsock"
     ] ++ lib.optional platform.isx86 "vmw_balloon"
-    ++ lib.optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
+    ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [
       "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
 
       # Hyper-V support.
@@ -68,7 +68,7 @@ in
 
       # Broadcom
       "vc4"
-    ] ++ lib.optionals pkgs.stdenv.isAarch64 [
+    ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [
       # Most of the following falls into two categories:
       #  - early KMS / early display
       #  - early storage (e.g. USB) support

nixos/modules/profiles/base.nix

@@ -19,13 +19,7 @@
     pkgs.cryptsetup # needed for dm-crypt volumes
 
     # Some text editors.
-    (pkgs.vim.customize {
-      name = "vim";
-      vimrcConfig.packages.default = {
-        start = [ pkgs.vimPlugins.vim-nix ];
-      };
-      vimrcConfig.customRC = "syntax on";
-    })
+    pkgs.vim
 
     # Some networking tools.
     pkgs.fuse

nixos/modules/services/audio/jack.nix

@@ -8,7 +8,7 @@ let
   pcmPlugin = cfg.jackd.enable && cfg.alsa.enable;
   loopback = cfg.jackd.enable && cfg.loopback.enable;
 
-  enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null;
+  enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null;
 
   umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12";
   bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12";

nixos/modules/services/audio/snapserver.nix

@@ -30,12 +30,12 @@ let
         lib.optionalString (val != null) "${val}";
       os' = prefix: val:
         lib.optionalString (val != null) (prefix + "${val}");
-      flatten = key: value:
+      toQueryString = key: value:
         "&${key}=${value}";
     in
       "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name
         + os' "&sampleformat=" opt.sampleFormat + os' "&codec=" opt.codec
-        + lib.concatStrings (lib.mapAttrsToList lib.flatten opt.query) + "\"";
+        + lib.concatStrings (lib.mapAttrsToList toQueryString opt.query) + "\"";
 
   optionalNull = val: ret:
     lib.optional (val != null) ret;

nixos/modules/services/desktops/pipewire/pipewire.nix

@@ -19,7 +19,7 @@ let
   '';
   cfg = config.services.pipewire;
   enable32BitAlsaPlugins = cfg.alsa.support32Bit
-                           && pkgs.stdenv.isx86_64
+                           && pkgs.stdenv.hostPlatform.isx86_64
                            && pkgs.pkgsi686Linux.pipewire != null;
 
   # The package doesn't output to $out/lib/pipewire directly so that the

nixos/modules/services/logging/promtail.nix

@@ -80,7 +80,7 @@ in {
         PrivateUsers = true;
 
         SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";
-      } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64
+      } // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) { # FIXME: figure out why this breaks on aarch64
         SystemCallFilter = "@system-service";
       });
     };

nixos/modules/services/misc/mame.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.services.mame;
-  mame = "mame${lib.optionalString pkgs.stdenv.is64bit "64"}";
+  mame = "mame${lib.optionalString pkgs.stdenv.hostPlatform.is64bit "64"}";
 in
 {
   options = {

nixos/modules/services/misc/tabby.nix

@@ -71,7 +71,7 @@ in
 
           - nixpkgs.config.cudaSupport
           - nixpkgs.config.rocmSupport
-          - if stdenv.isDarwin && stdenv.isAarch64
+          - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
 
           IFF multiple acceleration methods are found to be enabled or if you
           haven't set either `cudaSupport or rocmSupport` you will have to

nixos/modules/services/networking/cjdns.nix

@@ -274,7 +274,7 @@ in
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
         # Doesn't work on i686, causing service to fail
-        MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
+        MemoryDenyWriteExecute = !pkgs.stdenv.hostPlatform.isi686;
         ProtectHome = true;
         PrivateTmp = true;
       };

nixos/modules/services/networking/nsd.nix

@@ -603,8 +603,8 @@ in
 
     reuseport = mkOption {
       type = types.bool;
-      default = pkgs.stdenv.isLinux;
-      defaultText = literalExpression "pkgs.stdenv.isLinux";
+      default = pkgs.stdenv.hostPlatform.isLinux;
+      defaultText = literalExpression "pkgs.stdenv.hostPlatform.isLinux";
       description = ''
         Whether to enable SO_REUSEPORT on all used sockets. This lets multiple
         processes bind to the same port. This speeds up operation especially

nixos/modules/services/video/frigate.nix

@@ -518,7 +518,7 @@ in
         libva-utils
         procps
         radeontop
-      ] ++ lib.optionals (!stdenv.isAarch64) [
+      ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [
         # not available on aarch64-linux
         intel-gpu-tools
       ];

nixos/modules/services/web-apps/pretalx.nix

@@ -294,6 +294,15 @@ in
       '')
     ];
 
+    services.logrotate.settings.pretalx = {
+      files = "${cfg.settings.filesystem.logs}/*.log";
+      su = "${cfg.user} ${cfg.group}";
+      frequency = "weekly";
+      rotate = "12";
+      copytruncate = true;
+      compress = true;
+    };
+
     services = {
       nginx = lib.mkIf cfg.nginx.enable {
         enable = true;

nixos/modules/services/web-apps/pretix.nix

@@ -403,6 +403,15 @@ in
       '')
     ];
 
+    services.logrotate.settings.pretix = {
+      files = "${cfg.settings.pretix.logdir}/*.log";
+      su = "${cfg.user} ${cfg.group}";
+      frequency = "weekly";
+      rotate = "12";
+      copytruncate = true;
+      compress = true;
+    };
+
     services = {
       nginx = mkIf cfg.nginx.enable {
         enable = true;

nixos/modules/system/boot/stage-1.nix

@@ -327,7 +327,7 @@ let
 
     setHostId = optionalString (config.networking.hostId != null) ''
       hi="${config.networking.hostId}"
-      ${if pkgs.stdenv.isBigEndian then ''
+      ${if pkgs.stdenv.hostPlatform.isBigEndian then ''
         echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid
       '' else ''
         echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid

nixos/modules/system/boot/systemd.nix

@@ -679,7 +679,7 @@ in
 
     # Increase numeric PID range (set directly instead of copying a one-line file from systemd)
     # https://github.com/systemd/systemd/pull/12226
-    boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304);
+    boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.hostPlatform.is64bit (lib.mkDefault 4194304);
 
     services.logrotate.settings = {
       "/var/log/btmp" = mapAttrs (_: mkDefault) {

nixos/modules/tasks/network-interfaces.nix

@@ -438,7 +438,7 @@ let
 
   hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
       hi="${cfg.hostId}"
-      ${if pkgs.stdenv.isBigEndian then ''
+      ${if pkgs.stdenv.hostPlatform.isBigEndian then ''
         echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
       '' else ''
         echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out

nixos/modules/virtualisation/docker.nix

@@ -244,7 +244,7 @@ in
       };
 
       assertions = [
-        { assertion = cfg.enableNvidia && pkgs.stdenv.isx86_64 -> config.hardware.graphics.enable32Bit or false;
+        { assertion = cfg.enableNvidia && pkgs.stdenv.hostPlatform.isx86_64 -> config.hardware.graphics.enable32Bit or false;
           message = "Option enableNvidia on x86_64 requires 32-bit support libraries";
         }];
 

nixos/modules/virtualisation/xen-dom0.nix

@@ -605,7 +605,7 @@ in
   config = lib.modules.mkIf cfg.enable {
     assertions = [
       {
-        assertion = pkgs.stdenv.isx86_64;
+        assertion = pkgs.stdenv.hostPlatform.isx86_64;
         message = "Xen is currently not supported on ${pkgs.stdenv.hostPlatform.system}.";
       }
       {

nixos/tests/filesender.nix

@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "filesender";
   meta = {
     maintainers = with lib.maintainers; [ nhnn ];
-    broken = pkgs.stdenv.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64
+    broken = pkgs.stdenv.hostPlatform.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64
   };
 
   nodes.filesender = { ... }: let

nixos/tests/freetube.nix

@@ -24,7 +24,7 @@ let
       nodes = { "${name}" = machine; };
       meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ];
       # time-out on ofborg
-      meta.broken = pkgs.stdenv.isAarch64;
+      meta.broken = pkgs.stdenv.hostPlatform.isAarch64;
       enableOCR = true;
 
       testScript = ''

nixos/tests/installed-tests/gdk-pixbuf.nix

@@ -6,7 +6,7 @@ makeInstalledTest {
   testConfig = {
     # Tests allocate a lot of memory trying to exploit a CVE
     # but qemu-system-i386 has a 2047M memory limit
-    virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
+    virtualisation.memorySize = if pkgs.stdenv.hostPlatform.isi686 then 2047 else 4096;
   };
 
   testRunnerFlags = [ "--timeout" "1800" ];

nixos/tests/k3s/multi-node.nix

@@ -189,7 +189,7 @@ import ../make-test-python.nix (
           m.start()
           m.wait_for_unit("k3s")
 
-      is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1"
+      is_aarch64 = "${toString pkgs.stdenv.hostPlatform.isAarch64}" == "1"
 
       # wait for the agent to show up
       server.wait_until_succeeds("k3s kubectl get node agent")

nixos/tests/libvirtd.nix

@@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
 
   testScript = let
     nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system};
-    virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy";
+    virshShutdownCmd = if pkgs.stdenv.hostPlatform.isx86_64 then "shutdown" else "destroy";
   in ''
     start_all()
 

nixos/tests/pulseaudio.nix

@@ -40,7 +40,7 @@ let
             };
 
             environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ]
-              ++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32;
+              ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 testers.testPlay32;
           } // lib.optionalAttrs systemWide {
             users.users.alice.extraGroups = [ "pulse-access" ];
             systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ];
@@ -54,7 +54,7 @@ let
 
           machine.send_chars("testPlay \n")
           machine.wait_for_file("/tmp/testPlay_success")
-          ${lib.optionalString pkgs.stdenv.isx86_64 ''
+          ${lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
             machine.send_chars("testPlay32 \n")
             machine.wait_for_file("/tmp/testPlay32_success")
           ''}

nixos/tests/stub-ld.nix

@@ -18,7 +18,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     libDir = pkgs.stdenv.hostPlatform.libDir;
     ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
 
-    check32 = pkgs.stdenv.isx86_64;
+    check32 = pkgs.stdenv.hostPlatform.isx86_64;
     pkgs32 = pkgs.pkgsi686Linux;
 
     libDir32 = pkgs32.stdenv.hostPlatform.libDir;

nixos/tests/sunshine.nix

@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "sunshine";
   meta = {
     # test is flaky on aarch64
-    broken = pkgs.stdenv.isAarch64;
+    broken = pkgs.stdenv.hostPlatform.isAarch64;
     maintainers = [ lib.maintainers.devusb ];
   };
 

nixos/tests/wine.nix

@@ -43,7 +43,7 @@ let
 in
 listToAttrs (
   map (makeWineTest "winePackages" [ hello32 ]) variants
-  ++ optionals pkgs.stdenv.is64bit
+  ++ optionals pkgs.stdenv.hostPlatform.is64bit
     (map (makeWineTest "wineWowPackages" [ hello32 hello64 ])
          # This wayland combination times out after spending many hours.
          # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux

pkgs/applications/audio/ario/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     taglib
   ];
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for file in $out/lib/ario/plugins/*.dylib; do
       ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so
     done

pkgs/applications/audio/ashuffle/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   dontUseCmakeConfigure = true;
   nativeBuildInputs = [ cmake pkg-config meson ninja ];
   buildInputs = [ libmpdclient yaml-cpp ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ];
 
   mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];