flake reorg

.github/workflows/ci.yml

@@ -1,56 +1,44 @@
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 name: CI
 
 jobs:
-  check:
+  matrix:
     runs-on: ubuntu-latest
+    outputs:
+      check-matrix: ${{ steps.set-matrix.outputs.check-matrix }}
+      cross-matrix: ${{ steps.set-matrix.outputs.cross-matrix }}
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
+      - id: set-matrix
+        run: |
+          echo "check-matrix={\"check\":$(nix eval --json '.#checks.x86_64-linux' --apply 'builtins.attrNames')}" | tee -a $GITHUB_OUTPUT
+          echo "cross-matrix={\"include\":$(nix eval --json '.#lib.crossMatrix')}" | tee -a $GITHUB_OUTPUT
+
+  checks:
+    runs-on: ubuntu-latest
+    needs: [matrix]
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.matrix.outputs.check-matrix)}}
+    name: ${{ matrix.check }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v26
       - uses: icewind1991/attic-action@v1
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#check
-
-
-  check-extractor:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#extractor
-
-  clippy:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#clippy
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
+      - run: nix build .#checks.x86_64-linux.${{ matrix.check }}
 
   build:
     runs-on: ubuntu-latest
-    needs: check
+    needs: [matrix]
     strategy:
       fail-fast: false
-      matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - x86_64-unknown-linux-musl
-          - x86_64-pc-windows-gnu
+      matrix: ${{fromJson(needs.matrix.outputs.cross-matrix)}}
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
@@ -58,16 +46,16 @@ jobs:
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
       - run: nix build .#${{ matrix.target }}
       - uses: actions/upload-artifact@v4
         with:
           name: logsmash-${{ matrix.target }}
-          path: result/bin/*
+          path: result/bin/logsmash${{ matrix.binary-suffix }}
 
   build-nixpkgs:
     runs-on: ubuntu-latest
-    needs: check
+    needs: checks
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
@@ -75,5 +63,5 @@ jobs:
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
       - run: nix build .#logsmash

.github/workflows/release.yml

@@ -2,23 +2,29 @@ name: Release
 
 on:
   release:
-    types: [ created ]
+    types: [created]
 
 permissions:
   contents: write
 
 jobs:
-  release-binaries:
-    name: Build release binaries
+  matrix:
     runs-on: ubuntu-latest
+    outputs:
+      cross-matrix: ${{ steps.set-matrix.outputs.cross-matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - id: set-matrix
+        run: |
+          echo "cross-matrix={\"include\":$(nix eval --json '.#lib.crossMatrix')}" | tee -a $GITHUB_OUTPUT
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [matrix]
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - target: x86_64-unknown-linux-musl
-            ext: ""
-          - target: x86_64-pc-windows-gnu
-            ext: ".exe"
+      matrix: ${{fromJson(needs.matrix.outputs.cross-matrix)}}
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
@@ -26,12 +32,12 @@ jobs:
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
       - run: nix build .#${{ matrix.target }}
       - name: Upload binary to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: result/bin/logsmash${{ matrix.ext }}
-          asset_name: logsmash-${{ matrix.target }}${{ matrix.ext }}
+          file: result/bin/logsmash${{ matrix.binary-suffix }}
+          asset_name: logsmash-${{ matrix.target }}${{ matrix.binary-suffix }}
           tag: ${{ github.ref }}

flake.lock

@@ -1,63 +1,59 @@
 {
   "nodes": {
-    "cross-naersk": {
+    "crane": {
+      "locked": {
+        "lastModified": 1727060013,
+        "narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "flakelight": {
       "inputs": {
-        "naersk": [
-          "naersk"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727095190,
+        "narHash": "sha256-eZfUxkPefTP5fknpr2/X+snNysEj830Ft1IaW7VafFE=",
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "rev": "9e0f7e360688187ed3d7d8b033028e0d3473aa2c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "type": "github"
+      }
+    },
+    "mill-scale": {
+      "inputs": {
+        "crane": "crane",
+        "flakelight": [
+          "flakelight"
         ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1717704286,
-        "narHash": "sha256-zrLB/FTKODEAlJjgO8TwbK7teTseYbjLESp8QJ/FJYc=",
+        "lastModified": 1727556185,
+        "narHash": "sha256-pEUzAE5WRpPGQYeG/U2mftfHAn2q4aO1pefJNY2EoVw=",
         "owner": "icewind1991",
-        "repo": "cross-naersk",
-        "rev": "9068daceb8f0d248dcf629944f60e92b81391bdb",
+        "repo": "mill-scale",
+        "rev": "823fb3493cb4838c81627821f383af918db33a7f",
         "type": "github"
       },
       "original": {
         "owner": "icewind1991",
-        "repo": "cross-naersk",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721727458,
-        "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
+        "repo": "mill-scale",
         "type": "github"
       }
     },
@@ -78,25 +74,25 @@
     },
     "root": {
       "inputs": {
-        "cross-naersk": "cross-naersk",
-        "flake-utils": "flake-utils",
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
+        "flakelight": "flakelight",
+        "mill-scale": "mill-scale",
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
+          "mill-scale",
+          "flakelight",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1721960387,
-        "narHash": "sha256-o21ax+745ETGXrcgc/yUuLw1SI77ymp3xEpJt+w/kks=",
+        "lastModified": 1727058553,
+        "narHash": "sha256-tY/UU3Qk5gP/J0uUM4DZ6wo4arNLGAVqLKBotILykfQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9cbf831c5b20a53354fc12758abd05966f9f1699",
+        "rev": "edc5b0f896170f07bd39ad59d6186fcc7859bbb2",
         "type": "github"
       },
       "original": {
@@ -104,21 +100,6 @@
         "repo": "rust-overlay",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,113 +1,24 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-24.05";
-    flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
-    naersk.inputs.nixpkgs.follows = "nixpkgs";
-    rust-overlay.url = "github:oxalica/rust-overlay";
-    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
-    cross-naersk.url = "github:icewind1991/cross-naersk";
-    cross-naersk.inputs.nixpkgs.follows = "nixpkgs";
-    cross-naersk.inputs.naersk.follows = "naersk";
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-    naersk,
-    rust-overlay,
-    cross-naersk,
-  }:
-    flake-utils.lib.eachDefaultSystem (
-      system: let
-        overlays = [
-          (import rust-overlay)
-          (import ./nix/overlay.nix)
-        ];
-        pkgs = (import nixpkgs) {
-          inherit system overlays;
-        };
-        inherit (pkgs) lib callPackage rust-bin mkShell;
-        inherit (lib.sources) sourceByRegex;
-        inherit (builtins) fromTOML readFile map;
-
-        msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
-        extractorMsrv = (fromTOML (readFile ./logging-extractor/Cargo.toml)).package.rust-version;
-        msrvToolchain = rust-bin.stable."${msrv}".default;
-        extractorMsrvToolchain = rust-bin.stable."${extractorMsrv}".default;
-
-        naersk' = callPackage naersk {};
-        msrvNaersk = callPackage naersk {
-          rustc = msrvToolchain;
-          cargo = msrvToolchain;
-        };
-        extractorMsrvNaersk = callPackage naersk {
-          rustc = extractorMsrvToolchain;
-          cargo = extractorMsrvToolchain;
-        };
-        cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;};
-
-        buildMatrix = targets: {
-          include =
-            map (target: {
-              inherit target;
-              artifactSuffix = cross-naersk'.execSufficForTarget target;
-            })
-            targets;
-        };
-
-        hostTarget = pkgs.hostPlatform.config;
-        targets = [
-          "x86_64-unknown-linux-musl"
-          "x86_64-pc-windows-gnu"
-          hostTarget
-        ];
-        releaseTargets = lib.lists.remove hostTarget targets;
-
-        src = sourceByRegex ./. ["Cargo.*" "(src|data)(/.*)?"];
-        extractorSrc = sourceByRegex ./logging-extractor ["Cargo.*" "(src)(/.*)?"];
-        nearskOpt = {
-          pname = "cloud-log-analyser";
-          root = src;
-
-          preBuild = ''
-            mkdir -p data/src/data
-            rm -r data/src/data
-            cp -r ${pkgs.extracted-logs-rust} data/src/data
-          '';
-        };
-      in rec {
-        packages =
-          lib.attrsets.genAttrs targets (target:
-            (cross-naersk'.buildPackage target) nearskOpt)
-          // {
-            inherit (pkgs) logging-extractor extracted-logs extracted-logs-rust logsmash extracted-logs-rust-mod;
-            check = msrvNaersk.buildPackage (nearskOpt
-              // {
-                mode = "check";
-              });
-            extractor = msrvNaersk.buildPackage (nearskOpt
-              // {
-                root = extractorSrc;
-              });
-            clippy = msrvNaersk.buildPackage (nearskOpt
-              // {
-                mode = "clippy";
-              });
-            default = pkgs.logsmash;
-          };
-        apps.default = packages.default;
-
-        matrix = buildMatrix targets;
-        releaseMatrix = buildMatrix releaseTargets;
-
-        devShells.default = mkShell {
-          nativeBuildInputs = with pkgs; [msrvToolchain rustc bacon cargo-msrv cargo-insta hyperfine];
-        };
-      }
-    )
-    // {
-      overlays.default = import ./nix/overlay.nix;
+    flakelight = {
+      url = "github:nix-community/flakelight";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
+    mill-scale = {
+      url = "github:icewind1991/mill-scale";
+      inputs.flakelight.follows = "flakelight";
+    };
+  };
+  outputs = { mill-scale, ... }: mill-scale ./. {
+    crossTargets = [
+      "x86_64-unknown-linux-musl"
+      "x86_64-pc-windows-gnu"
+    ];
+    withOverlays = import ./nix/overlay.nix;
+    packages = {
+      logsmash = { logsmash }: logsmash;
+      extracted-logs-rust = { extracted-logs-rust }: extracted-logs-rust;
+    };
+  };
 }

nix/data-mod.nix

@@ -1,8 +1,9 @@
-{
-  packages,
-  lib,
-  writeTextDir,
-}: let
+{ packages
+, lib
+, writeTextDir
+,
+}:
+let
   inherit (builtins) head attrNames concatStringsSep replaceStrings;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.lists) flatten last;
@@ -33,4 +34,5 @@
         }
     }
   '';
-in writeTextDir "mod.rs" code
+in
+writeTextDir "mod.rs" code

nix/extracted-logs.nix

@@ -1,17 +1,19 @@
-{
-  stdenvNoCC,
-  logging-extractor,
-  fetchzip,
-  name,
-  version,
-  url,
-  major,
-  sha256,
-  mode ? "json",
-}: let
+{ stdenvNoCC
+, logging-extractor
+, fetchzip
+, name
+, version
+, url
+, major
+, sha256
+, mode ? "json"
+,
+}:
+let
   ext = if mode == "rust" then "rs" else "json";
-  cleanedMajor = builtins.replaceStrings ["."] ["_"] major;
-in stdenvNoCC.mkDerivation rec {
+  cleanedMajor = builtins.replaceStrings [ "." ] [ "_" ] major;
+in
+stdenvNoCC.mkDerivation rec {
   pname = "extractor-logs-${name}-${cleanedMajor}";
   inherit version;
 
@@ -19,7 +21,7 @@ in stdenvNoCC.mkDerivation rec {
     inherit url sha256;
   };
 
-  nativeBuildInputs = [logging-extractor];
+  nativeBuildInputs = [ logging-extractor ];
 
   buildPhase = ''
     logging-extractor . ${mode} > logs.${ext}

nix/logging-extractor.nix

@@ -1,18 +1,19 @@
-{
-  stdenv,
-  rustPlatform,
-  lib,
-}: let
+{ stdenv
+, rustPlatform
+, lib
+,
+}:
+let
   inherit (lib.sources) sourceByRegex;
-  src = sourceByRegex ../logging-extractor ["Cargo.*" "(src|tests|test-data)(/.*)?"];
+  src = sourceByRegex ../logging-extractor [ "Cargo.*" "(src|tests|test-data)(/.*)?" ];
 in
-  rustPlatform.buildRustPackage rec {
-    pname = "logging-extractor";
-    version = "0.1.0";
+rustPlatform.buildRustPackage rec {
+  pname = "logging-extractor";
+  version = "0.1.0";
 
-    inherit src;
+  inherit src;
 
-    cargoLock = {
-      lockFile = ../logging-extractor/Cargo.lock;
-    };
-  }
+  cargoLock = {
+    lockFile = ../logging-extractor/Cargo.lock;
+  };
+}

nix/logsmash.nix

@@ -0,0 +1,30 @@
+{ stdenv
+, makeRustPlatform
+, rust-bin
+, lib
+, extracted-logs-rust
+,
+}:
+let
+  inherit (lib.sources) sourceByRegex;
+  src = sourceByRegex ../. [ "Cargo.*" "(src|data)(/.*)?" ];
+  rustPlatform = makeRustPlatform {
+    cargo = rust-bin.stable.latest.default;
+    rustc = rust-bin.stable.latest.default;
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "logsmash";
+  version = "0.1.0";
+
+  inherit src;
+
+  preBuild = ''
+    rm -r data/src/data
+    cp -r ${extracted-logs-rust} data/src/data
+  '';
+
+  cargoLock = {
+    lockFile = ../Cargo.lock;
+  };
+}

nix/overlay.nix

@@ -1,4 +1,5 @@
-final: prev: let
+final: prev:
+let
   inherit (builtins) mapAttrs attrValues map tail;
   inherit (prev) symlinkJoin;
   inherit (prev.lib) importJSON;
@@ -15,18 +16,19 @@ final: prev: let
       inherit (data) url sha256 version;
       inherit name major mode;
     }));
-in {
-  logging-extractor = final.callPackage ./logging-extractor.nix {};
+in
+{
+  logging-extractor = final.callPackage ./logging-extractor.nix { };
   extracted-logs-parts = mapAttrs (loggingFor "json") packages;
   extracted-logs-parts-rust = mapAttrs (loggingFor "rust") packages;
-  extracted-logs-rust-mod = final.callPackage ./data-mod.nix {inherit packages;};
+  extracted-logs-rust-mod = final.callPackage ./data-mod.nix { inherit packages; };
   extracted-logs = symlinkJoin {
     name = "extracted-logs";
     paths = flatten (map attrValues (attrValues final.extracted-logs-parts));
   };
   extracted-logs-rust = symlinkJoin {
     name = "extracted-logs";
-    paths = (flatten (map attrValues (attrValues final.extracted-logs-parts-rust))) ++ [final.extracted-logs-rust-mod];
+    paths = (flatten (map attrValues (attrValues final.extracted-logs-parts-rust))) ++ [ final.extracted-logs-rust-mod ];
   };
-  logsmash = final.callPackage ./package.nix {};
+  logsmash = final.callPackage ./logsmash.nix { };
 }

nix/package.nix

@@ -1,29 +0,0 @@
-{
-  stdenv,
-  makeRustPlatform,
-  rust-bin,
-  lib,
-  extracted-logs-rust,
-}: let
-  inherit (lib.sources) sourceByRegex;
-  src = sourceByRegex ../. ["Cargo.*" "(src|data)(/.*)?"];
-  rustPlatform = makeRustPlatform {
-    cargo = rust-bin.stable.latest.default;
-    rustc = rust-bin.stable.latest.default;
-  };
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "logsmash";
-    version = "0.1.0";
-
-    inherit src;
-
-    preBuild = ''
-      rm -r data/src/data
-      cp -r ${extracted-logs-rust} data/src/data
-    '';
-
-    cargoLock = {
-      lockFile = ../Cargo.lock;
-    };
-  }