flake reorg

.github/workflows/ci.yml

@@ -4,61 +4,27 @@ on:
   push:
 
 jobs:
-  check:
+  checks:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v27
       - uses: icewind1991/attic-action@v1
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
-      - run: nix build .#check
+      - run: nix flake check --keep-going
-
-  clippy:
-    runs-on: ubuntu-latest
-    needs: 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 .#clippy
-
-  test:
-    runs-on: ubuntu-latest
-    needs: 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 .#test
 
   semver:
     runs-on: ubuntu-latest
-    needs: check
+    needs: checks
     steps:
       - uses: actions/checkout@v4
-      - name: Check semver
+      - uses: cachix/install-nix-action@v27
-        uses: obi1kenobi/cargo-semver-checks-action@v2
-
-  msrv:
-    runs-on: ubuntu-latest
-    needs: 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 }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
-      - run: nix build .#msrv
+      - run: nix run .#semver-checks

flake.lock

@@ -1,63 +1,98 @@
 {
   "nodes": {
-    "naersk": {
+    "crane": {
+      "locked": {
+        "lastModified": 1733688869,
+        "narHash": "sha256-KrhxxFj1CjESDrL5+u/zsVH0K+Ik9tvoac/oFPoxSB8=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "604637106e420ad99907cae401e13ab6b452e7d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "flakelight": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1698420672,
+        "lastModified": 1739191238,
-        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
+        "narHash": "sha256-DRuhQDWscKWXAZcatFDLQ0+pMKmGZ9lEZdxygq8rVSU=",
         "owner": "nix-community",
-        "repo": "naersk",
+        "repo": "flakelight",
-        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
+        "rev": "5656e7f5fda93676642d199fd9eb47b970d6139e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "naersk",
+        "repo": "flakelight",
+        "type": "github"
+      }
+    },
+    "mill-scale": {
+      "inputs": {
+        "crane": "crane",
+        "flakelight": [
+          "flakelight"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1735052218,
+        "narHash": "sha256-I30wh6G8fSUO4EseexxiDXcxyUhXR6C8BvEeKn6xyfE=",
+        "owner": "icewind1991",
+        "repo": "mill-scale",
+        "rev": "7e45bb598ff63a8416ee3c26743b20644563bd93",
+        "type": "github"
+      },
+      "original": {
+        "owner": "icewind1991",
+        "repo": "mill-scale",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702346276,
+        "lastModified": 1739484910,
-        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
+        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
+        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
-        "naersk": "naersk",
+        "flakelight": "flakelight",
-        "nixpkgs": "nixpkgs",
+        "mill-scale": "mill-scale",
-        "rust-overlay": "rust-overlay",
+        "nixpkgs": "nixpkgs"
-        "utils": "utils"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "utils"
-        ],
         "nixpkgs": [
+          "mill-scale",
+          "flakelight",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1702520151,
+        "lastModified": 1733884434,
-        "narHash": "sha256-jxJWosN7hgcW+dFT8V3EBDCYUOjv5tpjEBRmlakS7tU=",
+        "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d6a1d8f80dbcda4c13993b859a3574c3dde61072",
+        "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2",
         "type": "github"
       },
       "original": {
@@ -65,39 +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"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,102 +1,18 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
-    utils.url = "github:numtide/flake-utils";
+    flakelight = {
-    naersk.url = "github:nix-community/naersk";
+      url = "github:nix-community/flakelight";
-    naersk.inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    rust-overlay.url = "github:oxalica/rust-overlay";
-    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
-    rust-overlay.inputs.flake-utils.follows = "utils";
     };
-
+    mill-scale = {
-  outputs = {
+      url = "github:icewind1991/mill-scale";
-    self,
+      inputs.flakelight.follows = "flakelight";
-    nixpkgs,
-    utils,
-    naersk,
-    rust-overlay,
-  }:
-    utils.lib.eachDefaultSystem (system: let
-      overlays = [(import rust-overlay)];
-      pkgs = (import nixpkgs) {
-        inherit system overlays;
-      };
-      inherit (pkgs) lib callPackage rust-bin mkShell;
-      inherit (lib.sources) sourceByRegex;
-
-      msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
-      inherit (builtins) fromTOML readFile;
-      toolchain = rust-bin.stable.latest.default;
-      msrvToolchain = rust-bin.stable."${msrv}".default;
-
-      naersk' = callPackage naersk {
-        rustc = toolchain;
-        cargo = toolchain;
-      };
-      msrvNaersk = callPackage naersk {
-        rustc = msrvToolchain;
-        cargo = msrvToolchain;
-      };
-
-      src = sourceByRegex ./. ["Cargo.*" "(src|derive|benches|tests|examples|koth_bagel.*)(/.*)?"];
-      nearskOpt = {
-        pname = "vmt-parser";
-        root = src;
-      };
-    in rec {
-      packages = {
-        check = naersk'.buildPackage (nearskOpt
-          // {
-            mode = "check";
-          });
-        clippy = naersk'.buildPackage (nearskOpt
-          // {
-            mode = "clippy";
-          });
-        test = naersk'.buildPackage (nearskOpt
-          // {
-            release = false;
-            mode = "test";
-          });
-        msrv = msrvNaersk.buildPackage (nearskOpt
-          // {
-            mode = "check";
-          });
-      };
-
-      devShells = let
-        tools = with pkgs; [
-          bacon
-          cargo-edit
-          cargo-outdated
-          cargo-audit
-          cargo-msrv
-          cargo-semver-checks
-          cargo-insta
-          (writeShellApplication {
-            name = "cargo-fuzz";
-            runtimeInputs = [cargo-fuzz toolchain];
-            text = ''
-              # shellcheck disable=SC2068
-              RUSTC_BOOTSTRAP=1 cargo-fuzz $@
-            '';
-          })
-          (writeShellApplication {
-            name = "cargo-expand";
-            runtimeInputs = [cargo-expand toolchain];
-            text = ''
-              # shellcheck disable=SC2068
-              RUSTC_BOOTSTRAP=1 cargo-expand $@
-            '';
-          })
-        ];
-      in {
-        default = mkShell {
-          nativeBuildInputs = [toolchain] ++ tools;
-        };
-        msrv = mkShell {
-          nativeBuildInputs = [msrvToolchain] ++ tools;
     };
   };
-    });
+  outputs = {mill-scale, ...}:
+    mill-scale ./. {
+      extraPaths = [./tests/data ./tests/snapshots];
+      tools = pkgs: with pkgs; [cargo-insta];
+    };
 }