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

ci/eval/compare/default.nix

@@ -69,7 +69,6 @@ let
     groupByPlatform
     extractPackageNames
     getLabels
-    uniqueStrings
     ;
 
   getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json");
@@ -81,7 +80,7 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = diff beforeAttrs afterAttrs;
 
-  rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
+  rebuilds = diffAttrs.added ++ diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
 
   changed-paths =
@@ -110,7 +109,7 @@ let
     );
 
   maintainers = import ./maintainers.nix {
-    changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs);
+    changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
     changedpathsjson = touchedFilesJson;
   };
 in

ci/eval/compare/maintainers.nix

@@ -11,17 +11,13 @@ let
   changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
 
   anyMatchingFile =
-    filename:
-    let
-      matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths;
-    in
-    (builtins.length matching) > 0;
+    filename: builtins.any (changed: lib.strings.hasSuffix changed filename) changedpaths;
 
-  anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0;
+  anyMatchingFiles = files: builtins.any anyMatchingFile files;
 
-  enrichedAttrs = builtins.map (path: {
-    path = path;
-    name = builtins.concatStringsSep "." path;
+  enrichedAttrs = builtins.map (name: {
+    path = lib.splitString "." name;
+    name = name;
   }) changedattrs;
 
   validPackageAttributes = builtins.filter (
@@ -45,14 +41,6 @@ let
     pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; }
   ) attrsWithPackages;
 
-  attrsWeCanPing = builtins.filter (
-    pkg:
-    if (builtins.length pkg.maintainers) > 0 then
-      true
-    else
-      builtins.trace "Package has no maintainers: ${pkg.name}" false
-  ) attrsWithMaintainers;
-
   relevantFilenames =
     drv:
     (lib.lists.unique (
@@ -88,33 +76,16 @@ let
 
   attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
-  listToPing = lib.lists.flatten (
-    builtins.map (
-      pkg:
-      builtins.map (maintainer: {
-        id = maintainer.githubId;
-        packageName = pkg.name;
-        dueToFiles = pkg.filenames;
-      }) pkg.maintainers
-    ) attrsWithModifiedFiles
-  );
+  listToPing = lib.concatMap (
+    pkg:
+    builtins.map (maintainer: {
+      id = maintainer.githubId;
+      packageName = pkg.name;
+      dueToFiles = pkg.filenames;
+    }) pkg.maintainers
+  ) attrsWithModifiedFiles;
 
-  byMaintainer = lib.lists.foldr (
-    ping: collector:
-    collector
-    // {
-      "${toString ping.id}" = [
-        { inherit (ping) packageName dueToFiles; }
-      ] ++ (collector."${toString ping.id}" or [ ]);
-    }
-  ) { } listToPing;
-
-  textForPackages =
-    packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages);
-
-  textPerMaintainer = lib.attrsets.mapAttrs (
-    maintainer: packages: "- @${maintainer} for ${textForPackages packages}"
-  ) byMaintainer;
+  byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;
 
   packagesPerMaintainer = lib.attrsets.mapAttrs (
     maintainer: packages: builtins.map (pkg: pkg.packageName) packages

pkgs/by-name/gi/gitkraken/package.nix

@@ -87,9 +87,6 @@ let
     license = licenses.unfree;
     platforms = builtins.attrNames srcs;
     maintainers = with maintainers; [
-      xnwdd
-      evanjs
-      arkivm
       nicolas-goudry
       Rishik-Y
     ];

pkgs/by-name/ne/neovim-unwrapped/package.nix

@@ -96,7 +96,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.10.3";
+    version = "0.10.4";
 
     __structuredAttrs = true;
 
@@ -104,7 +104,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-nmnEyHE/HcrwK+CyJHNoLG0BqjnWleiBy0UYcJL7Ecc=";
+      hash = "sha256-TAuoa5GD50XB4OCHkSwP1oXfedzVrCBRutNxBp/zGLY=";
     };
 
     patches = [

pkgs/by-name/we/websurfx/package.nix

@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.22.2";
+  version = "1.23.0";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-Kwf4lIY99dnF8p59qOUefHIyhQHBb/ZasidswETLICM=";
+    hash = "sha256-+29Q963+CdYgy8JmhZwG22CElliYpFyEtOj8pHZj8XY=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-DK5eYgz/+FieauE7bCXXOs7RQUQWEphq3wP8QD0S9QQ=";
+  cargoHash = "sha256-16u9pb8+qjoQPK5xipJAFCMIpebJRTiGtv1gFn3xyj8=";
 
   postPatch = ''
     substituteInPlace src/handler/mod.rs \

pkgs/development/coq-modules/ElmExtraction/default.nix

@@ -26,7 +26,7 @@ mkCoqDerivation {
         {
           cases = [
             (range "8.17" "9.0")
-            (range "1.3.1" "1.3.2")
+            (range "1.3.1" "1.3.4")
           ];
           out = "0.1.0";
         }

pkgs/development/coq-modules/RustExtraction/default.nix

@@ -26,7 +26,7 @@ mkCoqDerivation {
         {
           cases = [
             (range "8.17" "8.19")
-            (range "1.3.1" "1.3.2")
+            (range "1.3.1" "1.3.3")
           ];
           out = "0.1.0";
         }

pkgs/development/coq-modules/metacoq/default.nix

@@ -43,11 +43,11 @@ let
     }
     {
       case = "8.19";
-      out = "1.3.2-8.19";
+      out = "1.3.3-8.19";
     }
     {
       case = "8.20";
-      out = "1.3.2-8.20";
+      out = "1.3.4-8.20";
     }
   ] null;
   release = {
@@ -67,6 +67,8 @@ let
     "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64=";
     "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA=";
     "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8=";
+    "1.3.3-8.19".sha256 = "sha256-SBTv49zQXZ+oGvIqWM53hjBKru9prFgZRv8gVgls40k=";
+    "1.3.4-8.20".sha256 = "sha256-ofRP0Uo48G2LBuIy/5ZLyK+iVZXleKiwfMEBD0rX9fQ=";
   };
   releaseRev = v: "v${v}";
 

pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list

@@ -173,3 +173,4 @@
 ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
 ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
 ../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp
+../libcxx/test/libcxx/transitive_includes.sh.cpp

pkgs/development/rocm-modules/5/tensile/default.nix

@@ -12,6 +12,7 @@
   joblib,
   filelock,
   rocminfo,
+  writeText,
 }:
 
 buildPythonPackage rec {
@@ -47,6 +48,12 @@ buildPythonPackage rec {
     export ROCM_PATH=${rocminfo}
   '';
 
+  # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869
+  # does not cause issues anymore, or at least replace it with a better workaround
+  setupHook = writeText "setup-hook" ''
+    export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++";
+  '';
+
   pythonImportsCheck = [ "Tensile" ];
 
   passthru.updateScript = rocmUpdateScript {

pkgs/development/rocm-modules/6/tensile/default.nix

@@ -13,6 +13,7 @@
   joblib,
   filelock,
   rocminfo,
+  writeText,
 }:
 
 buildPythonPackage rec {
@@ -61,6 +62,12 @@ buildPythonPackage rec {
     ROCM_PATH = rocminfo;
   };
 
+  # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869
+  # does not cause issues anymore, or at least replace it with a better workaround
+  setupHook = writeText "setup-hook" ''
+    export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++";
+  '';
+
   pythonImportsCheck = [ "Tensile" ];
 
   passthru.updateScript = rocmUpdateScript {

pkgs/servers/sql/postgresql/ext/pgrouting.nix

@@ -11,7 +11,7 @@
 
 buildPostgresqlExtension rec {
   pname = "pgrouting";
-  version = "3.7.1";
+  version = "3.7.2";
 
   nativeBuildInputs = [
     cmake
@@ -23,7 +23,7 @@ buildPostgresqlExtension rec {
     owner = "pgRouting";
     repo = "pgrouting";
     rev = "v${version}";
-    hash = "sha256-tK1JLWPtFR9nn5SULsPdpC3TXdmWAqq8QGDuD0bkElc=";
+    hash = "sha256-dzt1fVqbOE37A/qcQbuQuyiZpYuCwavQhnN/ZwFy1KM=";
   };
 
   meta = with lib; {