build: scope inherited nix package pins

Author: darwin67

.github/scripts/clang-tidy-nix.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: AGPL-3.0-or-later OR Apache-2.0
+
 set -euo pipefail
 
 extra_args=()

.github/workflows/build-kuebikodb.yaml

@@ -20,7 +20,6 @@ jobs:
   build:
     runs-on: depot-ubuntu-24.04-8
     env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_MAXSIZE: 2G
       CCACHE_BASEDIR: ${{ github.workspace }}
       CCACHE_NOHASHDIR: true
@@ -36,7 +35,7 @@ jobs:
         if: ${{ inputs.enable_ccache }}
         uses: actions/cache@v4
         with:
-          path: ${{ env.CCACHE_DIR }}
+          path: ${{ github.workspace }}/.ccache
           key: ccache-${{ runner.os }}-build-kuebikodb-${{ inputs.build_mode }}-${{ hashFiles('flake.nix', 'flake.lock', 'configure.py', 'CMakeLists.txt', 'cmake/**', '.gitmodules') }}-${{ github.run_id }}
           restore-keys: |
             ccache-${{ runner.os }}-build-kuebikodb-${{ inputs.build_mode }}-${{ hashFiles('flake.nix', 'flake.lock', 'configure.py', 'CMakeLists.txt', 'cmake/**', '.gitmodules') }}-
@@ -45,12 +44,15 @@ jobs:
       - name: Configure ccache
         if: ${{ inputs.enable_ccache }}
         run: |
+          echo "CCACHE_DIR=$GITHUB_WORKSPACE/.ccache" >> "$GITHUB_ENV"
+          export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
           mkdir -p "$CCACHE_DIR"
           nix develop .#cpp -c ccache --max-size="$CCACHE_MAXSIZE"
           nix develop .#cpp -c ccache --zero-stats
       - name: Generate the building system
         run: |
           git config --global --add safe.directory $GITHUB_WORKSPACE
+          # The .#cpp shell's compiler wrappers use ccache when CCACHE_DIR is set.
           nix develop .#cpp -c ./configure.py --mode ${{ inputs.build_mode }} --with scylla
       - run: |
           nix develop .#cpp -c ninja build/${{ inputs.build_mode }}/scylla

default.nix

@@ -26,6 +26,11 @@
 # shell env will want to add stuff to the environment, and the way
 # for it to do so is to pass us a function with this signatire:
 , devInputs ? ({ pkgs, llvm }: [])
+
+# Compatibility pins for the inherited C++ build. Keep these local to this
+# expression so tooling packages in dev shells can still use current nixpkgs.
+, antlr3Package ? pkgs.antlr3
+, fmtPackage ? pkgs.fmt
 }:
 
 let
@@ -77,9 +82,10 @@ in derive ({
   # "aspirational" all the way to "cargo cult ritual" -- i.e. not
   # expected to be actually correct or verifiable.  but it's the
   # thought that counts!
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
+    antlr3Package
+  ] ++ (with pkgs; [
     ant
-    antlr3
     boost
     cargo
     cmake
@@ -113,15 +119,16 @@ in derive ({
     ragel
     rustc
     stow
-  ] ++ (devInputs { inherit pkgs llvm; });
+  ]) ++ (devInputs { inherit pkgs llvm; });
 
-  buildInputs = with pkgs; [
+  buildInputs = [
+    antlr3Package
+    fmtPackage
+  ] ++ (with pkgs; [
     abseil-cpp
-    antlr3
     boost
     c-ares
     cryptopp
-    fmt
     gmp
     gnutls
     hwloc
@@ -155,7 +162,7 @@ in derive ({
     xxHash
     zlib
     zstd
-  ];
+  ]);
 
   JAVA8_HOME = "${pkgs.openjdk8_headless}/lib/openjdk";
   JAVA_HOME = "${pkgs.openjdk11_headless}/lib/openjdk";

docs/relicensing/inventory.md

@@ -6,15 +6,15 @@ It is an audit starting point, not a legal conclusion.
 - Source: tracked files in the current working tree
 - Generator: `docs/relicensing/generate-inventory.py`
 - Complete per-file inventory: `inventory.tsv`
-- Tracked files scanned: `5953`
+- Tracked files scanned: `5954`
 
 ## License Classes
 
 | Category        | Files |
 |-----------------|-------|
 | AGPL-only       | 1694  |
 | Apache-only     | 39    |
-| dual-licensed   | 371   |
+| dual-licensed   | 372   |
 | unknown-license | 3849  |
 
 ## File Flags

docs/relicensing/inventory.tsv

@@ -10,6 +10,7 @@ path	license_class	spdx	copyright	flags	binary
 .github/mergify.yml	unknown-license				no
 .github/pull_request_template.md	unknown-license				no
 .github/scripts/auto-backport.py	unknown-license				no
+.github/scripts/clang-tidy-nix.sh	dual-licensed	AGPL-3.0-or-later OR Apache-2.0			no
 .github/scripts/label_promoted_commits.py	unknown-license				no
 .github/scripts/sync_labels.py	unknown-license				no
 .github/workflows/build-kuebikodb.yaml	unknown-license				no

flake.nix

@@ -28,8 +28,6 @@
             (final: prev: {
               # default.nix predates current nixpkgs and still references
               # package names that have been removed from unstable.
-              antlr3 = prev.antlr3_4;
-              fmt = prev.fmt_10;
               llvmPackages_15 = prev.llvmPackages;
               boost175 = prev.boost181;
               libyamlcpp = prev.yaml-cpp;
@@ -109,6 +107,14 @@
               flake = true;
               shell = true;
               srcPath = self;
+              antlr3Package = pkgs.antlr3_4;
+              fmtPackage = pkgs.fmt_10.overrideAttrs (old: {
+                cmakeFlags = (old.cmakeFlags or [ ]) ++ [
+                  "-DFMT_TEST=OFF"
+                ];
+                doCheck = false;
+                doInstallCheck = false;
+              });
               devInputs =
                 { pkgs, llvm }:
                 with pkgs;