flake reorg

.github/workflows/docker.yaml

@@ -3,8 +3,8 @@ name: docker-build
 on:
   push:
     branches:
-      - 'master'
+      - "master"
-      - 'main'
+      - "main"
   repository_dispatch:
     types: [build]
 

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 description = "RSS feed for Docker Hub images"
 license = "MIT OR Apache-2.0"
-repository = "https://github.com/icewind1991/docker-hub-rss"
+repository = "https://codeberg.org/icewind/docker-hub-rss"
 
 [dependencies]
 tokio = { version = "1.20.0", features = ["macros", "rt-multi-thread", "signal"] }

flake.lock

@@ -1,67 +1,104 @@
 {
   "nodes": {
-    "flake-utils": {
+    "crane": {
       "locked": {
-        "lastModified": 1656928814,
+        "lastModified": 1742394900,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
         "type": "github"
       }
     },
-    "naersk": {
+    "flakelight": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1655042882,
+        "lastModified": 1749473391,
-        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
+        "narHash": "sha256-NkkS2d7OvXL9VJS1pae+txd43vUIMWtxlIBdsKCRtYg=",
         "owner": "nix-community",
-        "repo": "naersk",
+        "repo": "flakelight",
-        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
+        "rev": "22c8488d41c4e4678d32538f855bc05b3ba5142e",
         "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": 1749481047,
+        "narHash": "sha256-5VnLJdD91sTcJNvCaxH5r46Yl+RmyCcLftScxkEqP3k=",
+        "ref": "refs/heads/main",
+        "rev": "642a7528ddea74bbe649913c5c3bb630eea02ecb",
+        "revCount": 52,
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
+        "lastModified": 1749237914,
-        "narHash": "sha256-URmf0O2cQ/3heg2DJOeLyU/JmfVMqG4X5t9crQXMaeY=",
+        "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
-        "path": "/nix/store/35wga4qglxf9rm8ki22ry3clwv1k2a7l-source",
+        "owner": "NixOS",
-        "type": "path"
+        "repo": "nixpkgs",
-      },
+        "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
-      "original": {
+        "type": "github"
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-URmf0O2cQ/3heg2DJOeLyU/JmfVMqG4X5t9crQXMaeY=",
-        "path": "/nix/store/35wga4qglxf9rm8ki22ry3clwv1k2a7l-source",
-        "type": "path"
       },
       "original": {
         "id": "nixpkgs",
+        "ref": "nixos-25.05",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flakelight": "flakelight",
-        "naersk": "naersk",
+        "mill-scale": "mill-scale",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "mill-scale",
+          "flakelight",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742697269,
+        "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,28 +1,15 @@
 {
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "nixpkgs/nixos-25.05";
-    naersk.url = "github:nix-community/naersk";
+    flakelight = {
+      url = "github:nix-community/flakelight";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-
+    mill-scale = {
-  outputs = { self, nixpkgs, flake-utils, naersk }:
+      url = "git+https://codeberg.org/icewind/mill-scale";
-    flake-utils.lib.eachDefaultSystem (
+      inputs.flakelight.follows = "flakelight";
-      system: let
-        pkgs = nixpkgs.legacyPackages."${system}";
-        naersk-lib = naersk.lib."${system}";
-      in
-        rec {
-          # `nix build`
-          packages.docker-hub-rss = naersk-lib.buildPackage {
-            pname = "docker-hub-rss";
-            root = ./.;
     };
-          defaultPackage = packages.docker-hub-rss;
-          defaultApp = packages.docker-hub-rss;
-
-          # `nix develop`
-          devShell = pkgs.mkShell {
-            nativeBuildInputs = with pkgs; [ rustc cargo bacon cargo-edit cargo-outdated ];
   };
-        }
+  outputs = {mill-scale, ...}:
-    );
+    mill-scale ./. {};
 }

src/main.rs

@@ -31,6 +31,7 @@ async fn main() -> Result<()> {
 }
 
 #[derive(Debug)]
+#[allow(dead_code)]
 struct ReportRejection(Report);
 
 impl Reject for ReportRejection {}