4 files changed, 24 insertions(+), 52 deletions(-)

M gnu/local.mk
M gnu/packages/engineering.scm
D gnu/packages/microcom.scm
M po/packages/POTFILES.in

@@ 478,7 478,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/messaging.scm			\
   %D%/packages/minetest.scm			\
   %D%/packages/mingw.scm			\
-  %D%/packages/microcom.scm			\
   %D%/packages/mold.scm				\
   %D%/packages/motti.scm			\
   %D%/packages/monitoring.scm			\

@@ 5,6 5,7 @@
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
+;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>


@@ 1577,6 1578,29 @@ use on a given system.")
 replacement for the OpenDWG libraries.")
     (license license:gpl3+)))
 
+(define-public microcom
+  (package
+    (name "microcom")
+    (version "2019.01.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.pengutronix.de/git/tools/microcom.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "0rf4qdkbhknrrqn4rpb737l0km8yn5f498zapks4akf6yjh5aq8y"))))
+    (build-system gnu-build-system)
+    (inputs (list readline))
+    (native-inputs (list automake autoconf))
+    (home-page  "https://git.pengutronix.de/?p=tools/microcom.git")
+    (synopsis "Minimalistic serial line terminal program")
+ (description "Microcom is a minimalistic terminal program for accessing
+devices via a serial connection.  It features connection via RS232 serial
+interfaces (including setting of transfer rates) as well as in @code{telnetmode}
+as specified in rfc2217 and a (Linux specific) CAN mode.")
+    (license license:gpl2+)))
+
 (define-public minicom
   (package
     (name "minicom")

@@ 1,50 0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington <jmd@gnu.org>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages microcom)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix git-download)
-  #:use-module (guix download)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages readline)
-  #:use-module (guix build-system gnu))
-
-(define-public microcom
-  (package
-    (name "microcom")
-    (version "2019.01.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.pengutronix.de/git/tools/microcom.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "0rf4qdkbhknrrqn4rpb737l0km8yn5f498zapks4akf6yjh5aq8y"))))
-    (build-system gnu-build-system)
-    (inputs (list readline))
-    (native-inputs (list automake autoconf))
-    (home-page  "https://git.pengutronix.de/?p=tools/microcom.git")
-    (synopsis "Minimalistic serial line terminal program")
- (description "Microcom is a minimalistic terminal program for accessing
-devices via a serial connection.  It features connection via RS232 serial
-interfaces (including setting of transfer rates) as well as in @code{telnetmode}
-as specified in rfc2217 and a (Linux specific) CAN mode.")
-    (license gpl2+)))

@@ 260,7 260,6 @@ gnu/packages/markup.scm
 gnu/packages/maven.scm
 gnu/packages/mc.scm
 gnu/packages/mcrypt.scm
-gnu/packages/microcom.scm
 gnu/packages/minetest.scm
 gnu/packages/monitoring.scm
 gnu/packages/moreutils.scm