test

.github/workflows/build.yml

@@ -0,0 +1,73 @@
+name: "Build packages"
+on:
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: "Comma-separated attributes to build"
+        type: string
+jobs:
+  test:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Check out the PR at the test merge commit
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Install Nix
+        uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
+
+      - name: Build package
+        run: |
+           nix build -L --impure --expr '{ packages }:
+             let
+               pkgs = import ./. {
+                 config = {
+                   allowUnfree = true;
+                   allowInsecurePredicate = x: true;
+                   allowAliases = false;
+                 };
+               };
+               lib = pkgs.lib;
+               packageList = lib.strings.splitString "," packages;
+               packageAttrs = map (package: lib.splitString "." package) packageList;
+               pkgsAndTests = map (packageAttr:
+                 let
+                   pkg = lib.attrByPath packageAttr null pkgs;
+                   tests = lib.attrByPath (packageAttr ++ ["tests"]) null pkgs;
+                   evalResult = builtins.tryEval "${pkg}";
+                 in if evalResult.success then [ pkg tests ] else []
+               ) packageAttrs;
+             in pkgsAndTests' --argstr packages '${{ inputs.packages }}'
+
+      - name: Post build status comment if part of a pull request
+        uses: actions/github-script@4020e461acd7a80762cdfff123a1fde368246fa4
+        with:
+          script: |
+            const { context, github } = require('@actions/github');
+            const branch = context.ref.replace('refs/heads/', '');
+            const { data: pulls } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: `${context.repo.owner}:${branch}`
+            });
+            const pr = pulls.length > 0 ? pulls[0] : null;
+            if (pr) {
+              const status = context.payload.workflow_run.conclusion;
+              const run_id = context.runId;
+              const repo = context.repo.repo;
+              const owner = context.repo.owner;
+              const build_url = `https://github.com/${owner}/${repo}/actions/runs/${run_id}`;
+              const packages = context.payload.inputs.packages;
+              const os = context.runner.os;
+              const comment = `Build status: ${status}\nOS: ${os}\nPackages: ${packages}\n[Build logs](${build_url})`;
+              const issue_number = pr.number;
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number,
+                body: comment
+              });
+            }

.github/workflows/eval.yml

@@ -12,6 +12,11 @@ on:
       - haskell-updates
       - python-updates
 
+# Cancel previous if someone pushed an update
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -86,6 +91,25 @@ jobs:
           name: paths
           path: result/*
 
+  eval-aliases:
+    name: Eval nixpkgs with aliases enabled
+    runs-on: ubuntu-latest
+    needs: attrs
+    steps:
+      - name: Check out the PR at the test merge commit
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ needs.attrs.outputs.mergedSha }}
+          path: nixpkgs
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
+
+      - name: Query nixpkgs with aliases enabled to check for basic syntax errors
+        id: systems
+        run: |
+          time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --meta --option restrict-eval true --option allow-import-from-derivation false >/dev/null
+
   outpaths:
     name: Outpaths
     runs-on: ubuntu-latest
@@ -210,7 +234,7 @@ jobs:
             --arg beforeResultDir ./baseResult \
             --arg afterResultDir ./prResult \
             -o comparison
-
+          cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
           # TODO: Request reviews from maintainers for packages whose files are modified in the PR
 
       - name: Upload the combined results

.github/workflows/rebase-fork.yml

@@ -0,0 +1,22 @@
+name: Upgrade nixpkgs fork
+
+on:
+  repository_dispatch:
+  workflow_dispatch:
+  schedule:
+    - cron:  '51 2 * * 0'
+jobs:
+  rebase-branches:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Git rebase
+        run: |
+          git fetch https://github.com/NixOS/nixpkgs nixos-unstable:nixos-unstable
+          git config --global user.email "[email protected]"
+          git config --global user.name "Jörg Thalheim"
+          git rebase nixos-unstable
+          git push --force origin main

README.md

@@ -1,3 +1,4 @@
+test
 <p align="center">
   <a href="https://nixos.org">
     <picture>

ci/default.nix

@@ -9,9 +9,10 @@ in
 let
   nixpkgs' =
     if nixpkgs == null then
-      fetchTarball {
-        url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz";
-        sha256 = pinnedNixpkgs.sha256;
+      builtins.fetchGit {
+        url = "https://github.com/NixOS/nixpkgs";
+        rev = pinnedNixpkgs.rev;
+        shallow = true;
       }
     else
       nixpkgs;

ci/eval/changed-paths-markdown.jq

@@ -0,0 +1,14 @@
+def truncate(xs; n):
+  if xs | length > n then xs[:n] + ["..."]
+  else xs
+  end;
+
+def itemize_packages(xs):
+  truncate(xs; 3000) | map("- \(. )") | join("\n");
+
+def section(title; xs):
+  "## " + title + " (" + (xs | length | tostring) + ")\n" + itemize_packages(xs)
+
+section("Added"; .attrdiff.added) + "\n\n" +
+section("Removed"; .attrdiff.removed) + "\n\n" +
+section("Changed"; .attrdiff.changed)

ci/eval/default.nix

@@ -256,12 +256,18 @@ let
       }
       ''
         mkdir $out
-        jq -n -f ${./compare.jq} \
+        jq -n -f ${./compare-outpaths.jq} \
           --slurpfile before ${beforeResultDir}/outpaths.json \
           --slurpfile after ${afterResultDir}/outpaths.json \
           > $out/changed-paths.json
 
-        # TODO: Compare eval stats
+        jq -n -f ${./compare-eval-stats.jq} \
+          --slurpfile before ${beforeResultDir}/outpaths.json \
+          --slurpfile after ${afterResultDir}/outpaths.json \
+          > $out/changed-paths.json
+
+        jq -n -f ${./changed-paths-markdown.jq} < $out/changed-paths.json > $out/step-summary.md
+        jq -n -f ${./eval-stats-markdown.jq} < $out/changed-paths.json >> $out/step-summary.md
       '';
 
   full =

lib/default.nix

@@ -171,6 +171,7 @@ let
       mergeAttrsByFuncDefaultsClean mergeAttrBy
       fakeHash fakeSha256 fakeSha512
       nixType imap;
+    inherit (callLibs ./halalify.nix) halalify haramify;
     inherit (self.versions)
       splitVersion;
   });

lib/halalify.nix

@@ -0,0 +1,5 @@
+{ lib }:
+{
+  halalify = drv: drv.overrideAttrs (_old: { meta = _old.meta // { license = lib.licenses.free; }; });
+  haramify = drv: drv.overrideAttrs (_old: { meta = _old.meta // { license = lib.licenses.unfree; }; });
+}

nixos/doc/manual/development/running-nixos-tests-interactively.section.md

@@ -51,7 +51,7 @@ In the terminal where the test driver is running, connect to this server by
 using:
 
 ```py
->>> machine.shell_interact("tcp:127.0.0.1:4444")
+>>> machine.shell_interact("tcp:127.0.0.1:4444,forever,interval=2")
 ```
 
 Once the connection is established, you can enter commands in the socat terminal