nur-packages

commit ba00e395a62c8c795ecfab7893a766887a81c801
parent 9f4f64fb0bc82ae70f7c3c624769657120cf0c66
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Fri, 28 Mar 2025 04:28:23 +0400

Up

Diffstat:
M
modules/nixos/services/flashmq.nix
 | 
8
+++++---
M
modules/nixos/services/mbtileserver.nix
 | 
14
+++++---------
M
pkgs/gemini/agunua/default.nix
 | 
2
+-
M
pkgs/misc/modbus-tools/default.nix
 | 
2
+-
M
pkgs/mqtt/mqtt-cli/default.nix
 | 
4
++--

5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/modules/nixos/services/flashmq.nix b/modules/nixos/services/flashmq.nix
@@ -9,22 +9,24 @@ with lib;
 
 let
   cfg = config.services.flashmq;
+  description = "FlashMQ MQTT server";
 in
 {
   options.services.flashmq = {
-    enable = mkEnableOption "flashmq";
+    enable = mkEnableOption description;
+    package = mkPackageOption pkgs "flashmq" { };
   };
 
   config = mkIf cfg.enable {
     systemd.services.flashmq = {
-      description = "FlashMQ MQTT server";
+      inherit description;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         DynamicUser = true;
         LogsDirectory = "flashmq";
         LimitNOFILE = "infinity";
-        ExecStart = "${cfg.flashmq}/bin/flashmq -c ${configFile}";
+        ExecStart = "${lib.getExe cfg.package} -c ${configFile}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
         RestartSec = "5s";
diff --git a/modules/nixos/services/mbtileserver.nix b/modules/nixos/services/mbtileserver.nix
@@ -9,16 +9,12 @@ with lib;
 
 let
   cfg = config.services.mbtileserver;
+  description = "MBTiles server";
 in
 {
   options.services.mbtileserver = {
-    enable = mkEnableOption "mbtileserver";
-    package = mkOption {
-      type = types.package;
-      default = pkgs.mbtileserver;
-      defaultText = literalMD "pkgs.mbtileserver";
-      description = "Which mbtileserver package to use.";
-    };
+    enable = mkEnableOption description;
+    package = mkPackageOption pkgs "mbtileserver" { };
     address = mkOption {
       type = types.str;
       default = "127.0.0.1";
@@ -62,14 +58,14 @@ in
   config = mkIf cfg.enable (mkMerge [
     {
       systemd.services.mbtileserver = {
-        description = "MBTiles server";
+        inherit description;
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.TILE_DIR = cfg.tileDir;
         serviceConfig = {
           DynamicUser = true;
           LogsDirectory = "mbtileserver";
-          ExecStart = "${getBin cfg.package}/bin/mbtileserver --enable-fs-watch --tiles-only --host ${cfg.address} --port ${toString cfg.port}";
+          ExecStart = "${getExe cfg.package} --enable-fs-watch --tiles-only --host ${cfg.address} --port ${toString cfg.port}";
           Restart = "always";
         };
       };
diff --git a/pkgs/gemini/agunua/default.nix b/pkgs/gemini/agunua/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
     domain = "framagit.org";
     owner = "bortzmeyer";
     repo = "agunua";
-    rev = "release-${version}";
+    tag = "release-${version}";
     hash = "sha256-sVZ4HrFH3bL6FHn8B43rsya3vggIuCXdx6rPh+LG7MA=";
   };
 
diff --git a/pkgs/misc/modbus-tools/default.nix b/pkgs/misc/modbus-tools/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "alexs-sh";
     repo = "modbus-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PA8EuZa2jKkd/pn6UGGJ6f7jac1bN2sS2fX3qmYVduQ=";
   };
 
diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mqtt-cli";
-  version = "4.37.0";
+  version = "4.38.0";
 
   src = fetchfromgh {
     owner = "hivemq";
     repo = "mqtt-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FT0ZVgTwgNEcJpF9ley0ncU7qyYRmb1i1suBwz2HkSg=";
+    hash = "sha256-OEUnSL+hA9FR4HQyEqdOr1cwazBjMx6BWhSd8XNO8b8=";
     name = "mqtt-cli-${finalAttrs.version}.jar";
   };