Merge staging-next into staging

Author: github-actions[bot]

maintainers/maintainer-list.nix

@@ -7199,6 +7199,14 @@
     githubId = 345808;
     name = "Jakub Okoński";
   };
+  fauxmight = {
+    email = "nix@ivories.org";
+    matrix = "@fauxmight:matrix.ivories.org";
+    github = "fauxmight";
+    githubId = 53975399;
+    name = "A Frederick Christensen";
+    keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC  4E94 9EEF 4142 5355 8AC4"; } ];
+  };
   fbeffa = {
     email = "beffa@fbengineering.ch";
     github = "fedeinthemix";
@@ -9677,6 +9685,13 @@
     githubId = 37965;
     name = "Léo Stefanesco";
   };
+  inexcode = {
+    name = "Inex Code";
+    email = "nixpkgs@inex.dev";
+    matrix = "@inexcode:inex.rocks";
+    github = "inexcode";
+    githubId = 13254627;
+  };
   infinidoge = {
     name = "Infinidoge";
     email = "infinidoge@inx.moe";
@@ -11848,6 +11863,12 @@
     github = "kira-bruneau";
     githubId = 382041;
   };
+  kiranshila = {
+    email = "me@kiranshila.com";
+    name = "Kiran Shila";
+    github = "kiranshila";
+    githubId = 6305359;
+  };
   kirelagin = {
     email = "kirelagin@gmail.com";
     matrix = "@kirelagin:matrix.org";
@@ -23005,6 +23026,12 @@
     githubId = 4044033;
     name = "Thomas Sowell";
   };
+  TsubakiDev = {
+    email = "i@tsubakidev.cc";
+    github = "TsubakiDev";
+    githubId = 132794625;
+    name = "Daniel Wang";
+  };
   ttrei = {
     email = "reinis.taukulis@gmail.com";
     github = "ttrei";

nixos/modules/programs/git.nix

@@ -60,6 +60,8 @@ in
         enable = lib.mkEnableOption "git-lfs (Large File Storage)";
 
         package = lib.mkPackageOption pkgs "git-lfs" { };
+
+        enablePureSSHTransfer = lib.mkEnableOption "Enable pure SSH transfer in server side by adding git-lfs-transfer to environment.systemPackages";
       };
     };
   };
@@ -72,7 +74,10 @@ in
       };
     })
     (lib.mkIf (cfg.enable && cfg.lfs.enable) {
-      environment.systemPackages = [ cfg.lfs.package ];
+      environment.systemPackages = lib.mkMerge [
+        [ cfg.lfs.package ]
+        (lib.mkIf cfg.lfs.enablePureSSHTransfer [ pkgs.git-lfs-transfer ])
+      ];
       programs.git.config = {
         filter.lfs = {
           clean = "git-lfs clean -- %f";

nixos/modules/services/monitoring/librenms.nix

@@ -5,7 +5,7 @@ let
   settingsFormat = pkgs.formats.json { };
   configJson = settingsFormat.generate "librenms-config.json" cfg.settings;
 
-  package = pkgs.librenms.override {
+  package = cfg.package.override {
     logDir = cfg.logDir;
     dataDir = cfg.dataDir;
   };
@@ -60,6 +60,18 @@ in
   options.services.librenms = with lib; {
     enable = mkEnableOption "LibreNMS network monitoring system";
 
+    package = lib.mkPackageOption pkgs "librenms" { };
+
+    finalPackage = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = package;
+      defaultText = lib.literalExpression "package";
+      description = ''
+        The final package used by the module. This is the package that has all overrides.
+      '';
+    };
+
     user = mkOption {
       type = types.str;
       default = "librenms";
@@ -526,13 +538,25 @@ in
         User = cfg.user;
         Group = cfg.group;
         ExecStartPre = lib.mkIf cfg.database.createLocally [
-          "!${pkgs.writeShellScript "librenms-db-init" ''
-          DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n')
-          echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
-          ${lib.optionalString cfg.useDistributedPollers ''
-            echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
-          ''}
-        ''}"
+          "!${
+            pkgs.writeShellScript "librenms-db-init" (
+              if !isNull cfg.database.socket then
+                ''
+                  echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED VIA unix_socket;" | ${pkgs.mariadb}/bin/mysql --socket='${cfg.database.socket}'
+                  ${lib.optionalString cfg.useDistributedPollers ''
+                    echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED VIA unix_socket;" | ${pkgs.mariadb}/bin/mysql --socket='${cfg.database.socket}'
+                  ''}
+                ''
+              else
+                ''
+                  DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n')
+                  echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
+                  ${lib.optionalString cfg.useDistributedPollers ''
+                    echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
+                  ''}
+                ''
+            )
+          }"
         ];
       };
       script = ''
@@ -567,6 +591,7 @@ in
         then ''
           # use socket connection
           echo "DB_SOCKET=${cfg.database.socket}" >> ${cfg.dataDir}/.env
+          echo "DB_PASSWORD=null" >> ${cfg.dataDir}/.env
         ''
         else ''
           # use TCP connection

nixos/modules/services/networking/dhcpcd.nix

@@ -249,7 +249,8 @@ in
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             Restart = "always";
             AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];
-            ReadWritePaths = [ "/proc/sys/net/ipv4" "/proc/sys/net/ipv6" ]
+            ReadWritePaths = [ "/proc/sys/net/ipv4" ]
+              ++ lib.optional cfgN.enableIPv6 "/proc/sys/net/ipv6"
               ++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles);
             DeviceAllow = "";
             LockPersonality = true;

nixos/modules/tasks/filesystems/zfs.nix

@@ -129,7 +129,8 @@ let
         "systemd-ask-password-console.service"
       ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
       requiredBy = let
-        noauto = lib.all (fs: lib.elem "noauto" fs.options) (getPoolFilesystems pool);
+        poolFilesystems = getPoolFilesystems pool;
+        noauto = poolFilesystems != [ ] && lib.all (fs: lib.elem "noauto" fs.options) poolFilesystems;
       in getPoolMounts prefix pool ++ lib.optional (!noauto) "zfs-import.target";
       before = getPoolMounts prefix pool ++ [ "shutdown.target" "zfs-import.target" ];
       conflicts = [ "shutdown.target" ];

nixos/tests/all-tests.nix

@@ -135,7 +135,7 @@ in {
   archi = handleTest ./archi.nix {};
   aria2 = handleTest ./aria2.nix {};
   armagetronad = handleTest ./armagetronad.nix {};
-  artalk = handleTest ./artalk.nix {};
+  artalk = runTest ./artalk.nix;
   atd = handleTest ./atd.nix {};
   atop = handleTest ./atop.nix {};
   atticd = runTest ./atticd.nix;

nixos/tests/artalk.nix

@@ -1,28 +1,56 @@
-import ./make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
+{ lib, pkgs, ... }:
+{
 
-    name = "artalk";
+  name = "artalk";
 
-    meta = {
-      maintainers = with lib.maintainers; [ moraxyc ];
-    };
+  meta = {
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        environment.systemPackages = [ pkgs.curl ];
-        services.artalk = {
-          enable = true;
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [
+        pkgs.curl
+        pkgs.artalk
+        pkgs.sudo
+      ];
+      services.artalk = {
+        enable = true;
+        settings = {
+          cache.enabled = true;
+          admin_users = [
+            {
+              name = "admin";
+              email = "admin@example.org";
+              # md5 for 'password'
+              password = "(md5)5F4DCC3B5AA765D61D8327DEB882CF99";
+            }
+          ];
         };
       };
+    };
+
+  testScript = ''
+    import json
+    machine.wait_for_unit("artalk.service")
+
+    machine.wait_for_open_port(23366)
 
-    testScript = ''
-      machine.wait_for_unit("artalk.service")
+    assert '${pkgs.artalk.version}' in machine.succeed("curl --fail --max-time 10 http://127.0.0.1:23366/api/v2/version")
 
-      machine.wait_for_open_port(23366)
+    # Get token
+    result = json.loads(machine.succeed("""
+      curl --fail -X POST --json '{
+              "email": "admin@example.org",
+              "password": "password"
+              }' 'http://127.0.0.1:23366/api/v2/auth/email/login'
+      """))
+    token = result['token']
 
-      machine.succeed("curl --fail --max-time 10 http://127.0.0.1:23366/")
-    '';
-  }
-)
+    # Test admin
+    machine.succeed(f"""
+      curl --fail -X POST --header 'Authorization: {token}' 'http://127.0.0.1:23366/api/v2/cache/flush'
+      """)
+  '';
+}

pkgs/applications/audio/strawberry/default.nix

@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "strawberry";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    hash = "sha256-X752GsP2b7rumQHzw52zI7PeE8tdM9Scgl3nHVcpO/s=";
+    hash = "sha256-90gnPw21oBHrRslJmB2hUId0WI7Gf+I4bvdS+dvAHdI=";
   };
 
   # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

pkgs/applications/editors/jetbrains/patches/bump-jackson-core-in-source.patch

@@ -0,0 +1,11 @@
+--- a/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
++++ b/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt
+@@ -35,7 +35,7 @@
+   "org.jdom:jdom2:2.0.6.1",*/
+ )
+ 
+-private val mavenTelemetryDependencies = listOf("com.fasterxml.jackson.core:jackson-core:2.16.0")
++private val mavenTelemetryDependencies = listOf("com.fasterxml.jackson.core:jackson-core:2.17.0")
+ 
+ object BundledMavenDownloader {
+   private val mutex = Mutex()

pkgs/applications/editors/jetbrains/patches/no-download.patch

@@ -46,11 +46,11 @@
      return URI.create("${base}/${groupStr}/${artifactId}/${version}/${artifactId}-${version}${classifierStr}.${packaging}")
 --- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
 +++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt
-@@ -33,11 +33,7 @@
-   }
-
-   suspend fun getJdkHome(communityRoot: BuildDependenciesCommunityRoot, os: OS, arch: Arch, infoLog: (String) -> Unit): Path {
--    val jdkUrl = getUrl(communityRoot = communityRoot, os = os, arch = arch)
+@@ -55,11 +55,7 @@
+     variation: String? = null,
+     infoLog: (String) -> Unit,
+   ): Path {
+-    val jdkUrl = getUrl(communityRoot = communityRoot, os = os, arch = arch, jdkBuildNumber = jdkBuildNumber, variation = variation)
 -    val jdkArchive = downloadFileToCacheLocation(url = jdkUrl.toString(), communityRoot = communityRoot)
 -    val jdkExtracted = BuildDependenciesDownloader.extractFileToCacheLocation(communityRoot = communityRoot,
 -                                                                              archiveFile = jdkArchive,
@@ -72,15 +72,15 @@
     * Set both properties if a .snap package should be produced.
 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt
 +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt
-@@ -45,7 +45,7 @@
-       withContext(Dispatchers.IO) {
+@@ -50,7 +50,7 @@
          val distBinDir = targetPath.resolve("bin")
          val sourceBinDir = context.paths.communityHomeDir.resolve("bin/linux")
--        copyFileToDir(NativeBinaryDownloader.downloadRestarter(context = context, os = OsFamily.LINUX, arch = arch), distBinDir)
+         addNativeLauncher(distBinDir, targetPath, arch)
+-        copyFileToDir(NativeBinaryDownloader.getRestarter(context, OsFamily.LINUX, arch), distBinDir)
 +        copyFileToDir(sourceBinDir.resolve("${arch.dirName}/restarter"), distBinDir)
          copyFileToDir(sourceBinDir.resolve("${arch.dirName}/fsnotifier"), distBinDir)
-         copyFileToDir(sourceBinDir.resolve("${arch.dirName}/libdbm.so"), distBinDir)
          generateBuildTxt(context, targetPath)
+         copyDistFiles(context, targetPath, OsFamily.LINUX, arch)
 @@ -85,6 +85,8 @@
          }
        }
@@ -90,6 +90,16 @@
        val runtimeDir = context.bundledRuntime.extract(os = OsFamily.LINUX, arch = arch)
        updateExecutablePermissions(runtimeDir, executableFileMatchers)
        val tarGzPath = buildTarGz(arch = arch, runtimeDir = runtimeDir, unixDistPath = osAndArchSpecificDistPath, suffix = suffix(arch))
+@@ -383,7 +385,8 @@
+   }
+ 
+   private suspend fun addNativeLauncher(distBinDir: Path, targetPath: Path, arch: JvmArchitecture) {
+-    val (execPath, licensePath) = NativeBinaryDownloader.getLauncher(context, OsFamily.LINUX, arch)
++    val execPath = Path.of("XPLAT_LAUNCHER_PREBUILT_PATH_HERE/Linux-${arch.archName}/xplat-launcher")
++    val licensePath = Path.of("XPLAT_LAUNCHER_PREBUILT_PATH_HERE/license/xplat-launcher-third-party-licenses.html")
+     copyFile(execPath, distBinDir.resolve(context.productProperties.baseFileName))
+     copyFile(licensePath, targetPath.resolve("license/launcher-third-party-libraries.html"))
+   }
 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
 +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt
 @@ -9,6 +9,8 @@
@@ -137,7 +147,7 @@
 -    // Ideal solution would be to move compilation to other process altogether and do not modify current process classpath
 -    println(" * Downloading $kotlinJpsPluginUrl")
 -    val tmpLocation = Files.createTempFile(cacheLocation.parent, cacheLocation.name, ".tmp")
--    suspendingRetryWithExponentialBackOff {
+-    retryWithExponentialBackOff {
 -      FileUtils.copyURLToFile(kotlinJpsPluginUrl.toURL(), tmpLocation.toFile())
 -    }
 -    Files.move(tmpLocation, cacheLocation, StandardCopyOption.ATOMIC_MOVE)