flake update

This commit is contained in:
Robin Appelman 2026-03-26 22:54:55 +01:00
commit 5a6d7006e0
5 changed files with 24 additions and 24 deletions

34
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1742394900, "lastModified": 1774313767,
"narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748263617, "lastModified": 1774271954,
"narHash": "sha256-O1xypYFWzYlfiyO3fUZuzRhYac5DGptP+ZhocY9L5tQ=", "narHash": "sha256-FbvMOykx7f7uEPdRVzUSABnLjqCdEp22wa0nDkuEd3s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flakelight", "repo": "flakelight",
"rev": "65c783ba2b85910df5a053cb1451e9eb13794c12", "rev": "c90878b309508083094f465d6aa11b3963f48b9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1748205441, "lastModified": 1774538603,
"narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=", "narHash": "sha256-IG0fOFNUjselW61zc/jOZU3abmt7FjcRdES9SXeHun4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b", "rev": "0ef9ce3384617243e1b9e94a7057f879f621f014",
"revCount": 49, "revCount": 69,
"type": "git", "type": "git",
"url": "https://codeberg.org/icewind/mill-scale.git" "url": "https://codeberg.org/icewind/mill-scale.git"
}, },
@ -59,16 +59,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748037224, "lastModified": 1774388614,
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.11", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742697269, "lastModified": 1774535687,
"narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", "narHash": "sha256-dpKS/8+uB0EoI4mCrpio+xs8Xxry6ZhLLwV8VIbbfrs=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", "rev": "75900435aa883f84b038316864b3f60956681523",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs.url = "nixpkgs/nixos-25.11";
flakelight = { flakelight = {
url = "github:nix-community/flakelight"; url = "github:nix-community/flakelight";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -13,7 +13,7 @@
outputs = {mill-scale, ...}: outputs = {mill-scale, ...}:
mill-scale ./. { mill-scale ./. {
extraFilesRegex = [".*\.html"]; extraFilesRegex = [".*\.html"];
withOverlays = [(import ./overlay.nix)]; withOverlays = [(import ./nix/overlay.nix)];
packages = { packages = {
ugc-api-server = pkgs: pkgs.ugc-api-server; ugc-api-server = pkgs: pkgs.ugc-api-server;
ugc-api-archiver = pkgs: pkgs.ugc-api-archiver; ugc-api-archiver = pkgs: pkgs.ugc-api-archiver;
@ -34,9 +34,9 @@
lib, lib,
... ...
}: { }: {
imports = [./module.nix]; imports = [./nix/module.nix];
config = lib.mkIf config.services.ugc-api-server.enable { 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; services.ugc-api-server.package = lib.mkDefault pkgs.ugc-api-server;
}; };
}; };

View file

@ -6,8 +6,8 @@
}: let }: let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
inherit (builtins) fromTOML readFile; inherit (builtins) fromTOML readFile;
src = sourceByRegex ./. ["Cargo.*" "((types|api-server|)/?(src)?)(/.*)?" "README.md"]; src = sourceByRegex ../. ["Cargo.*" "((types|api-server|)/?(src)?)(/.*)?" "README.md"];
version = (fromTOML (readFile api-server/Cargo.toml)).package.version; version = (fromTOML (readFile ../api-server/Cargo.toml)).package.version;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ugc-api-server"; pname = "ugc-api-server";
@ -28,6 +28,6 @@ in
doCheck = false; doCheck = false;
cargoLock = { cargoLock = {
lockFile = ./api-server/Cargo.lock; lockFile = ../api-server/Cargo.lock;
}; };
} }