From 5a6d7006e0cceaa741826112510d1b3f97e968fe Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 26 Mar 2026 22:54:55 +0100
Subject: [PATCH] flake update

---
 flake.lock                     | 34 +++++++++++++++++-----------------
 flake.nix                      |  8 ++++----
 module.nix => nix/module.nix   |  0
 overlay.nix => nix/overlay.nix |  0
 package.nix => nix/package.nix |  6 +++---
 5 files changed, 24 insertions(+), 24 deletions(-)
 rename module.nix => nix/module.nix (100%)
 rename overlay.nix => nix/overlay.nix (100%)
 rename package.nix => nix/package.nix (68%)

diff --git a/flake.lock b/flake.lock
index 20652dd..7c42556 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1742394900,
-        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
+        "lastModified": 1774313767,
+        "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
+        "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748263617,
-        "narHash": "sha256-O1xypYFWzYlfiyO3fUZuzRhYac5DGptP+ZhocY9L5tQ=",
+        "lastModified": 1774271954,
+        "narHash": "sha256-FbvMOykx7f7uEPdRVzUSABnLjqCdEp22wa0nDkuEd3s=",
         "owner": "nix-community",
         "repo": "flakelight",
-        "rev": "65c783ba2b85910df5a053cb1451e9eb13794c12",
+        "rev": "c90878b309508083094f465d6aa11b3963f48b9f",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1748205441,
-        "narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=",
+        "lastModified": 1774538603,
+        "narHash": "sha256-IG0fOFNUjselW61zc/jOZU3abmt7FjcRdES9SXeHun4=",
         "ref": "refs/heads/main",
-        "rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b",
-        "revCount": 49,
+        "rev": "0ef9ce3384617243e1b9e94a7057f879f621f014",
+        "revCount": 69,
         "type": "git",
         "url": "https://codeberg.org/icewind/mill-scale.git"
       },
@@ -59,16 +59,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748037224,
-        "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
+        "lastModified": 1774388614,
+        "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
+        "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.11",
         "type": "indirect"
       }
     },
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742697269,
-        "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
+        "lastModified": 1774535687,
+        "narHash": "sha256-dpKS/8+uB0EoI4mCrpio+xs8Xxry6ZhLLwV8VIbbfrs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
+        "rev": "75900435aa883f84b038316864b3f60956681523",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0d2f3f4..3d8b918 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.11";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
     flakelight = {
       url = "github:nix-community/flakelight";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,7 +13,7 @@
   outputs = {mill-scale, ...}:
     mill-scale ./. {
       extraFilesRegex = [".*\.html"];
-      withOverlays = [(import ./overlay.nix)];
+      withOverlays = [(import ./nix/overlay.nix)];
       packages = {
         ugc-api-server = pkgs: pkgs.ugc-api-server;
         ugc-api-archiver = pkgs: pkgs.ugc-api-archiver;
@@ -34,9 +34,9 @@
           lib,
           ...
         }: {
-          imports = [./module.nix];
+          imports = [./nix/module.nix];
           config = lib.mkIf config.services.ugc-api-server.enable {
-            nixpkgs.overlays = [(import ./overlay.nix)];
+            nixpkgs.overlays = [(import ./nix/overlay.nix)];
             services.ugc-api-server.package = lib.mkDefault pkgs.ugc-api-server;
           };
         };
diff --git a/module.nix b/nix/module.nix
similarity index 100%
rename from module.nix
rename to nix/module.nix
diff --git a/overlay.nix b/nix/overlay.nix
similarity index 100%
rename from overlay.nix
rename to nix/overlay.nix
diff --git a/package.nix b/nix/package.nix
similarity index 68%
rename from package.nix
rename to nix/package.nix
index 17dd441..d9b036c 100644
--- a/package.nix
+++ b/nix/package.nix
@@ -6,8 +6,8 @@
 }: let
   inherit (lib.sources) sourceByRegex;
   inherit (builtins) fromTOML readFile;
-  src = sourceByRegex ./. ["Cargo.*" "((types|api-server|)/?(src)?)(/.*)?" "README.md"];
-  version = (fromTOML (readFile api-server/Cargo.toml)).package.version;
+  src = sourceByRegex ../. ["Cargo.*" "((types|api-server|)/?(src)?)(/.*)?" "README.md"];
+  version = (fromTOML (readFile ../api-server/Cargo.toml)).package.version;
 in
   rustPlatform.buildRustPackage rec {
     pname = "ugc-api-server";
@@ -28,6 +28,6 @@ in
     doCheck = false;
 
     cargoLock = {
-      lockFile = ./api-server/Cargo.lock;
+      lockFile = ../api-server/Cargo.lock;
     };
   }