flake update

This commit is contained in:
Robin Appelman 2026-03-27 21:41:37 +01:00
commit cc5ac92510
5 changed files with 35 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": 1748868585, "lastModified": 1774271954,
"narHash": "sha256-DrrbahOQAwvNM8l5EuGxxkVS7X5/S59zcG0N9ZWQFhk=", "narHash": "sha256-FbvMOykx7f7uEPdRVzUSABnLjqCdEp22wa0nDkuEd3s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flakelight", "repo": "flakelight",
"rev": "dfbecd12d99c1bf82906521a6a7d5b75d2aa1ca2", "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" "url": "https://codeberg.org/icewind/mill-scale"
}, },
@ -59,16 +59,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748708770, "lastModified": 1774388614,
"narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a59eb7800787c926045d51b70982ae285faa2346", "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "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-25.05"; 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";
@ -12,7 +12,13 @@
}; };
outputs = {mill-scale, ...}: outputs = {mill-scale, ...}:
mill-scale ./. { mill-scale ./. {
packages.mitemp-prometheus = import ./package.nix; withOverlays = [
(import ./nix/overlay.nix)
];
packages = {
mitemp-prometheus = pkgs: pkgs.mitemp-prometheus;
};
nixosModules = {outputs, ...}: { nixosModules = {outputs, ...}: {
default = { default = {
@ -21,7 +27,7 @@
lib, lib,
... ...
}: { }: {
imports = [./module.nix]; imports = [./nix/module.nix];
config = lib.mkIf config.services.mitemp.enable { config = lib.mkIf config.services.mitemp.enable {
nixpkgs.overlays = [outputs.overlays.default]; nixpkgs.overlays = [outputs.overlays.default];
services.mitemp.package = lib.mkDefault pkgs.mitemp-prometheus; services.mitemp.package = lib.mkDefault pkgs.mitemp-prometheus;

3
nix/overlay.nix Normal file
View file

@ -0,0 +1,3 @@
final: prev: {
mitemp-prometheus = final.callPackage ./package.nix {};
}

View file

@ -7,8 +7,8 @@
}: let }: let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
inherit (builtins) fromTOML readFile; inherit (builtins) fromTOML readFile;
src = sourceByRegex ./. ["Cargo.*" "(src)(/.*)?"]; src = sourceByRegex ../. ["Cargo.*" "(src)(/.*)?"];
cargoToml = (fromTOML (readFile ./Cargo.toml)).package; cargoToml = (fromTOML (readFile ../Cargo.toml)).package;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = cargoToml.name; pname = cargoToml.name;
@ -26,10 +26,12 @@ in
preInstall = '' preInstall = ''
mkdir -p $out/share/dbus-1/system.d mkdir -p $out/share/dbus-1/system.d
cp ${./dbus-bluetooth.xml} $out/share/dbus-1/system.d/dbus-bluetooth.conf cp ${../dbus-bluetooth.xml} $out/share/dbus-1/system.d/dbus-bluetooth.conf
''; '';
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ../Cargo.lock;
}; };
meta.mainProgram = "mitemp-prometheus";
} }