flake reorg

.github/workflows/docker.yml

@@ -3,7 +3,7 @@ name: docker-build
 on:
   push:
     branches:
-      - 'master'
+      - "master"
 
 jobs:
   docker:
@@ -25,4 +25,4 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: echo ${{ steps.docker_build.outputs.digest }}

.sqlx/query-bcd0843c15afc0443df1ab40d7d0c5632ab9d025cdcf3646f4e9d5872b7c8c89.json

@@ -4,10 +4,7 @@
   "describe": {
     "columns": [],
     "parameters": {
-      "Left": [
+      "Left": ["Int4", "Jsonb"]
-        "Int4",
-        "Jsonb"
-      ]
     },
     "nullable": []
   },

.sqlx/query-e4dfb1fbca2c91ac837d11aff64e035ccce38867e3503653ec2ef28eeeb8907d.json

@@ -12,9 +12,7 @@
     "parameters": {
       "Left": []
     },
-    "nullable": [
+    "nullable": [null]
-      null
-    ]
   },
   "hash": "e4dfb1fbca2c91ac837d11aff64e035ccce38867e3503653ec2ef28eeeb8907d"
 }

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2018"
 
 [dependencies]
-sqlx = { version = "0.7.3", default_features = false, features = ["macros", "postgres", "json", "runtime-tokio-rustls"] }
+sqlx = { version = "0.7.3", default-features = false, features = ["macros", "postgres", "json", "runtime-tokio-rustls"] }
 dotenvy = "0.15.7"
 main_error = "0.1.2"
 tokio = { version = "1.36.0", features = ["macros", "time", "rt-multi-thread"] }

flake.lock

@@ -1,56 +1,103 @@
 {
   "nodes": {
-    "flake-utils": {
+    "crane": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1742394900,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
         "type": "github"
       }
     },
+    "flakelight": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748263617,
+        "narHash": "sha256-O1xypYFWzYlfiyO3fUZuzRhYac5DGptP+ZhocY9L5tQ=",
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "rev": "65c783ba2b85910df5a053cb1451e9eb13794c12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "type": "github"
+      }
+    },
+    "mill-scale": {
+      "inputs": {
+        "crane": "crane",
+        "flakelight": [
+          "flakelight"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1748205441,
+        "narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=",
+        "ref": "refs/heads/main",
+        "rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b",
+        "revCount": 49,
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale.git"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707650010,
+        "lastModified": 1748638332,
-        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
+        "narHash": "sha256-s2U9GJgLUohD4sK0w+H/NT+B+m50jxURZNkGXwEbZ4M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
+        "rev": "a627748de5a6aa694e9a143df95655b7b52f242c",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "release-23.11",
+        "ref": "release-25.05",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flakelight": "flakelight",
+        "mill-scale": "mill-scale",
         "nixpkgs": "nixpkgs"
       }
     },
-    "systems": {
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "mill-scale",
+          "flakelight",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1742697269,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
-        "owner": "nix-systems",
+        "owner": "oxalica",
-        "repo": "default",
+        "repo": "rust-overlay",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "owner": "oxalica",
-        "repo": "default",
+        "repo": "rust-overlay",
         "type": "github"
       }
     }

flake.nix

@@ -1,54 +1,37 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/release-23.11";
+    nixpkgs.url = "nixpkgs/release-25.05";
-    flake-utils.url = "github:numtide/flake-utils";
+    flakelight = {
+      url = "github:nix-community/flakelight";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    mill-scale = {
+      url = "git+https://codeberg.org/icewind/mill-scale.git";
+      inputs.flakelight.follows = "flakelight";
+    };
   };
 
-  outputs = {
+  outputs = {mill-scale, ...}:
-    self,
+    mill-scale ./. {
-    nixpkgs,
+      withOverlays = [
-    flake-utils,
+        (import ./nix/overlay.nix)
-  }:
+      ];
-    flake-utils.lib.eachDefaultSystem (
+      extraPaths = [
-      system: let
+        ./.sqlx
-        overlays = [
+      ];
-          (import ./overlay.nix)
-        ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-      in rec {
-        packages = rec {
-          inherit (pkgs) log-archiver;
-          default = log-archiver;
-        };
 
-        devShells.default = pkgs.mkShell {
+      nixosModules = {outputs, ...}: {
-          nativeBuildInputs = with pkgs; [
+        default = {
-            rustc
+          pkgs,
-            cargo
+          config,
-            bacon
+          lib,
-            clippy
+          ...
-            cargo-edit
+        }: {
-            cargo-outdated
+          imports = [./nix/module.nix];
-            cargo-insta
+          config = lib.mkIf config.services.dropstf.enable {
-            sqlx-cli
+            nixpkgs.overlays = [outputs.overlays.default];
-          ];
+            services.log-archiver.package = lib.mkDefault pkgs.log-archiver;
-        };
+          };
-      }
-    )
-    // {
-      overlays.default = import ./overlay.nix;
-      nixosModules.default = {
-        pkgs,
-        config,
-        lib,
-        ...
-      }: {
-        imports = [./module.nix];
-        config = lib.mkIf config.services.log-archiver.enable {
-          nixpkgs.overlays = [self.overlays.default];
-          services.log-archiver.package = lib.mkDefault pkgs.log-archiver;
         };
       };
     };

nix/module.nix

@@ -17,7 +17,7 @@ in {
 
     databaseUrlFile = mkOption {
       type = types.str;
-      description = "file containg DATABASE_URL variable";
+      description = "file containing DATABASE_URL variable";
     };
 
     baseUrl = mkOption {

nix/package.nix

@@ -1,10 +1,9 @@
 {
-  stdenv,
   rustPlatform,
   lib,
 }: let
   inherit (lib.sources) sourceByRegex;
-  src = sourceByRegex ./. ["Cargo.*" "(src|tests|.sqlx)(/.*)?"];
+  src = sourceByRegex ../. ["Cargo.*" "(src|tests|.sqlx)(/.*)?"];
 in
   rustPlatform.buildRustPackage rec {
     pname = "log-archiver";
@@ -15,6 +14,6 @@ in
     inherit src;
 
     cargoLock = {
-      lockFile = ./Cargo.lock;
+      lockFile = ../Cargo.lock;
     };
   }

src/main.rs

@@ -44,7 +44,7 @@ async fn main() -> Result<(), MainError> {
 
 async fn get_last_demo(client: &Client, api_host: &str) -> Result<i32, MainError> {
     let response: Response = client
-        .get(&format!("{}/api/v1/log?limit=100", api_host))
+        .get(format!("{}/api/v1/log?limit=100", api_host))
         .send()
         .await?;
     let listing: LogListing = serde_json::from_str(&response.text().await?)?;
@@ -85,7 +85,7 @@ async fn archive(database_url: &str, api_host: &str, log_target: &Path) -> Resul
         sleep(Duration::from_millis(500)).await;
 
         let response: Response = client
-            .get(&format!("{}/api/v1/log/{}", api_host, last_archived))
+            .get(format!("{}/api/v1/log/{}", api_host, last_archived))
             .send()
             .await?;
         let body: Value = serde_json::from_str(&response.text().await?)?;
@@ -111,7 +111,7 @@ async fn download_log(
     id: i32,
 ) -> Result<(), MainError> {
     let log_zip = client
-        .get(&format!("{}/logs/log_{}.log.zip", api_host, id))
+        .get(format!("{}/logs/log_{}.log.zip", api_host, id))
         .send()
         .await?
         .bytes()