From 7e0c09e12ed914d5803a6c301f578a56b72559ce Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 29 Mar 2024 16:01:40 +0400
Subject: mbusd: 0.5.1 → 0.5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/mbusd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/mbusd/default.nix b/pkgs/servers/mbusd/default.nix
index 51441f6514cdb..318caea30bfff 100644
--- a/pkgs/servers/mbusd/default.nix
+++ b/pkgs/servers/mbusd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mbusd";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "3cky";
     repo = "mbusd";
     rev = "v${version}";
-    hash = "sha256-vYYaJKcnREng+2UsDIZ28hvANkQCHVixQIxo82m7MQs=";
+    hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
-- 
cgit 1.4.1


From 854f5dbff2a4cc390543b6de3757dfeca87bf29c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 29 Mar 2024 16:01:45 +0400
Subject: mbusd: migrate to by-name

---
 pkgs/by-name/mb/mbusd/package.nix | 25 +++++++++++++++++++++++++
 pkgs/servers/mbusd/default.nix    | 25 -------------------------
 pkgs/top-level/all-packages.nix   |  2 --
 3 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/by-name/mb/mbusd/package.nix
 delete mode 100644 pkgs/servers/mbusd/default.nix

(limited to 'pkgs')

diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
new file mode 100644
index 0000000000000..318caea30bfff
--- /dev/null
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "mbusd";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "3cky";
+    repo = "mbusd";
+    rev = "v${version}";
+    hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  meta = with lib; {
+    description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
+    homepage = "https://github.com/3cky/mbusd";
+    changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+    mainProgram = "mbusd";
+  };
+}
diff --git a/pkgs/servers/mbusd/default.nix b/pkgs/servers/mbusd/default.nix
deleted file mode 100644
index 318caea30bfff..0000000000000
--- a/pkgs/servers/mbusd/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
-
-stdenv.mkDerivation rec {
-  pname = "mbusd";
-  version = "0.5.2";
-
-  src = fetchFromGitHub {
-    owner = "3cky";
-    repo = "mbusd";
-    rev = "v${version}";
-    hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  meta = with lib; {
-    description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
-    homepage = "https://github.com/3cky/mbusd";
-    changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
-    mainProgram = "mbusd";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a2eb37fa0ca4..6ab6e113b5b59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26207,8 +26207,6 @@ with pkgs;
 
   mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
 
-  mbusd = callPackage ../servers/mbusd { };
-
   memcached = callPackage ../servers/memcached { };
 
   merecat = callPackage ../servers/http/merecat { };
-- 
cgit 1.4.1