Merge branch 'master' into qt-add-kio

.git-blame-ignore-revs

@@ -215,3 +215,9 @@ adb9714bd909df283c66bbd641bd631ff50a4260
 
 # treewide: incus packages
 9ab59bb5fb943ad6740f64f5a79eae9642fb8211
+
+# treewide nixfmt reformat pass 1, master, staging and staging-next
+4f0dadbf38ee4cf4cc38cbc232b7708fddf965bc
+667d42c00d566e091e6b9a19b365099315d0e611
+84d4f874c2bac9f3118cb6907d7113b3318dcb5e
+

.github/workflows/backport.yml

@@ -28,7 +28,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
       - name: Create backport PRs
-        uses: korthout/backport-action@bd410d37cdcae80be6d969823ff5a225fe5c833f # v3.0.2
+        uses: korthout/backport-action@be567af183754f6a5d831ae90f648954763f17f5 # v3.1.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'

ci/eval/compare/default.nix

@@ -0,0 +1,53 @@
+{
+  lib,
+  jq,
+  runCommand,
+  writeText,
+  supportedSystems,
+  ...
+}:
+{ beforeResultDir, afterResultDir }:
+let
+  inherit (import ./utils.nix { inherit lib; })
+    diff
+    groupByKernel
+    extractPackageNames
+    getLabels
+    uniqueStrings
+    ;
+
+  getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json");
+  beforeAttrs = getAttrs beforeResultDir;
+  afterAttrs = getAttrs afterResultDir;
+
+  diffAttrs = diff beforeAttrs afterAttrs;
+
+  changed-paths =
+    let
+      rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
+
+      rebuildsByKernel = groupByKernel rebuilds;
+      rebuildCountByKernel = lib.mapAttrs (
+        kernel: kernelRebuilds: lib.length kernelRebuilds
+      ) rebuildsByKernel;
+    in
+    writeText "changed-paths.json" (
+      builtins.toJSON {
+        attrdiff = lib.mapAttrs (_: v: extractPackageNames v) diffAttrs;
+        inherit rebuildsByKernel rebuildCountByKernel;
+        labels = getLabels rebuildCountByKernel;
+      }
+    );
+in
+runCommand "compare"
+  {
+    nativeBuildInputs = [ jq ];
+  }
+  ''
+    mkdir $out
+
+    cp ${changed-paths} $out/changed-paths.json
+
+    jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md
+    # TODO: Compare eval stats
+  ''

ci/eval/compare/utils.nix

@@ -0,0 +1,132 @@
+{ lib, ... }:
+rec {
+  # Borrowed from https://github.com/NixOS/nixpkgs/pull/355616
+  uniqueStrings = list: builtins.attrNames (builtins.groupBy lib.id list);
+
+  _processSystemPath =
+    packageSystemPath:
+    let
+      # python312Packages.torch.aarch64-linux -> ["python312Packages" "torch" "aarch64-linux"]
+      # splittedPath = lib.splitString "." attrName;
+      splittedPath = lib.splitString "." packageSystemPath;
+
+      # ["python312Packages" "torch" "aarch64-linux"] -> ["python312Packages" "torch"]
+      packagePath = lib.sublist 0 (lib.length splittedPath - 1) splittedPath;
+    in
+    {
+      # "python312Packages.torch"
+      name = lib.concatStringsSep "." packagePath;
+
+      # "aarch64-linux"
+      system = lib.last splittedPath;
+    };
+
+  # Turns
+  # [
+  #   "hello.aarch64-linux"
+  #   "hello.x86_64-linux"
+  #   "hello.aarch64-darwin"
+  #   "hello.x86_64-darwin"
+  #   "bye.x86_64-darwin"
+  #   "bye.aarch64-darwin"
+  # ]
+  #
+  # into
+  #
+  # [
+  #   "hello"
+  #   "bye"
+  # ]
+  extractPackageNames =
+    packageSystemPaths:
+    builtins.attrNames (
+      builtins.removeAttrs (builtins.groupBy (
+        packageSystemPath: (_processSystemPath packageSystemPath).name
+      ) packageSystemPaths) [ "" ]
+    );
+
+  # Computes a diff between two attrs
+  # {
+  #   added: [ <keys only in the second object> ],
+  #   removed: [ <keys only in the first object> ],
+  #   changed: [ <keys with different values between the two objects> ],
+  # }
+  #
+  diff =
+    let
+      filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
+    in
+    old: new: {
+      added = filterKeys (n: _: !(old ? ${n})) new;
+      removed = filterKeys (n: _: !(new ? ${n})) old;
+      changed = filterKeys (
+        n: v:
+        # Filter out attributes that don't exist anymore
+        (new ? ${n})
+
+        # Filter out attributes that are the same as the new value
+        && (v != (new.${n}))
+      ) old;
+    };
+
+  # Turns
+  # [
+  #   "hello.aarch64-linux"
+  #   "hello.x86_64-linux"
+  #   "hello.aarch64-darwin"
+  #   "hello.x86_64-darwin"
+  #   "bye.x86_64-darwin"
+  #   "bye.aarch64-darwin"
+  # ]
+  #
+  # into
+  #
+  # {
+  #   linux = [
+  #     "hello"
+  #   ];
+  #   darwin = [
+  #     "hello"
+  #     "bye"
+  #   ];
+  # }
+  groupByKernel =
+    systemPaths:
+    let
+      systemPaths' = builtins.map _processSystemPath systemPaths;
+
+      filterKernel =
+        kernel:
+        builtins.attrNames (
+          builtins.groupBy (systemPath: systemPath.name) (
+            builtins.filter (systemPath: lib.hasSuffix kernel systemPath.system) systemPaths'
+          )
+        );
+    in
+    lib.genAttrs [ "linux" "darwin" ] filterKernel;
+
+  getLabels = lib.mapAttrs (
+    kernel: rebuildCount:
+    let
+      number =
+        if rebuildCount == 0 then
+          "0"
+        else if rebuildCount <= 10 then
+          "1-10"
+        else if rebuildCount <= 100 then
+          "11-100"
+        else if rebuildCount <= 500 then
+          "101-500"
+        else if rebuildCount <= 1000 then
+          "501-1000"
+        else if rebuildCount <= 2500 then
+          "1001-2500"
+        else if rebuildCount <= 5000 then
+          "2501-5000"
+        else
+          "5001+";
+
+    in
+    "10.rebuild-${kernel}: ${number}"
+  );
+}