diff --git a/flake.lock b/flake.lock index 1d9a4df..2419e7d 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": 1748868585, - "narHash": "sha256-DrrbahOQAwvNM8l5EuGxxkVS7X5/S59zcG0N9ZWQFhk=", + "lastModified": 1774271954, + "narHash": "sha256-FbvMOykx7f7uEPdRVzUSABnLjqCdEp22wa0nDkuEd3s=", "owner": "nix-community", "repo": "flakelight", - "rev": "dfbecd12d99c1bf82906521a6a7d5b75d2aa1ca2", + "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" }, @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "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 79a6c84..8cc75f7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; flakelight = { url = "github:nix-community/flakelight"; inputs.nixpkgs.follows = "nixpkgs"; @@ -12,7 +12,13 @@ }; outputs = {mill-scale, ...}: mill-scale ./. { - packages.mitemp-prometheus = import ./package.nix; + withOverlays = [ + (import ./nix/overlay.nix) + ]; + + packages = { + mitemp-prometheus = pkgs: pkgs.mitemp-prometheus; + }; nixosModules = {outputs, ...}: { default = { @@ -21,7 +27,7 @@ lib, ... }: { - imports = [./module.nix]; + imports = [./nix/module.nix]; config = lib.mkIf config.services.mitemp.enable { nixpkgs.overlays = [outputs.overlays.default]; services.mitemp.package = lib.mkDefault pkgs.mitemp-prometheus; diff --git a/module.nix b/nix/module.nix similarity index 100% rename from module.nix rename to nix/module.nix diff --git a/nix/overlay.nix b/nix/overlay.nix new file mode 100644 index 0000000..00dfd4c --- /dev/null +++ b/nix/overlay.nix @@ -0,0 +1,3 @@ +final: prev: { + mitemp-prometheus = final.callPackage ./package.nix {}; +} diff --git a/package.nix b/nix/package.nix similarity index 62% rename from package.nix rename to nix/package.nix index f5b46db..d42d8c8 100644 --- a/package.nix +++ b/nix/package.nix @@ -7,8 +7,8 @@ }: let inherit (lib.sources) sourceByRegex; inherit (builtins) fromTOML readFile; - src = sourceByRegex ./. ["Cargo.*" "(src)(/.*)?"]; - cargoToml = (fromTOML (readFile ./Cargo.toml)).package; + src = sourceByRegex ../. ["Cargo.*" "(src)(/.*)?"]; + cargoToml = (fromTOML (readFile ../Cargo.toml)).package; in rustPlatform.buildRustPackage rec { pname = cargoToml.name; @@ -26,10 +26,12 @@ in preInstall = '' 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 = { - lockFile = ./Cargo.lock; + lockFile = ../Cargo.lock; }; + + meta.mainProgram = "mitemp-prometheus"; }