[PATCH] rename socat.scm to networking.scm.

[PATCH] rename socat.scm to networking.scm.

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

Hi Guix,

I'm packaging zeromq and would like to place it in a networking module.
As we already have socat and tcpdump, I think it makes sense to put them
all into the same networking module.

Attached is a patch to rename socat.scm.  If that's okay I'll place my
zeromq package definition there.

~~ Ricardo


[-- Attachment #2: 0001-gnu-rename-gnu-packages-socat-to-gnu-packages-networ.patch --]
[-- Type: text/x-patch, Size: 6789 bytes --]

From e66acd5c9f50e675a2d7543ac028b2fdbb7d12da Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 29 Apr 2015 16:26:34 +0200
Subject: [PATCH] gnu: rename (gnu packages socat) to (gnu packages
 networking).

* gnu/packages/socat.scm: Rename this ...
* gnu/packages/networking.scm: ... to this.
* gnu-system.am (GNU_SYSTEM_MODULES): Change socat.scm to networking.scm.
---
 gnu-system.am               |  2 +-
 gnu/packages/networking.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/socat.scm      | 55 ---------------------------------------------
 3 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 gnu/packages/networking.scm
 delete mode 100644 gnu/packages/socat.scm

diff --git a/gnu-system.am b/gnu-system.am
index 617e8bb..ef12b4f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -217,6 +217,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/ncurses.scm			\
   gnu/packages/netpbm.scm			\
   gnu/packages/nettle.scm			\
+  gnu/packages/networking.scm			\
   gnu/packages/ninja.scm			\
   gnu/packages/node.scm				\
   gnu/packages/noweb.scm			\
@@ -273,7 +274,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/slang.scm			\
   gnu/packages/slim.scm				\
   gnu/packages/smalltalk.scm			\
-  gnu/packages/socat.scm			\
   gnu/packages/ssh.scm				\
   gnu/packages/stalonetray.scm			\
   gnu/packages/statistics.scm			\
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
new file mode 100644
index 0000000..5429535
--- /dev/null
+++ b/gnu/packages/networking.scm
@@ -0,0 +1,55 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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 networking)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages openssl))
+
+;; XXX: Group with other networking tools like tcpdump in a module?
+(define-public socat
+  (package
+    (name "socat")
+    (version "1.7.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.dest-unreach.org/socat/download/socat-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "028yjka2zr6j1i8pmfmvzqki8ajczdl1hnry1x31xbbg3j83jxsb"))))
+    (build-system gnu-build-system)
+    (arguments '(#:tests? #f))                    ;no 'check' phase
+    (inputs `(("openssl" ,openssl)))
+    (home-page "http://www.dest-unreach.org/socat/")
+    (synopsis
+     "Open bidirectional communication channels from the command line")
+    (description
+     "socat is a relay for bidirectional data transfer between two independent
+data channels---files, pipes, devices, sockets, etc.  It can create
+\"listening\" sockets, named pipes, and pseudo terminals.
+
+socat can be used, for instance, as TCP port forwarder, as a shell interface
+to UNIX sockets, IPv6 relay, for redirecting TCP oriented programs to a serial
+line, to logically connect serial lines on different computers, or to
+establish a relatively secure environment (su and chroot) for running client
+or server shell scripts with network connections. ")
+    (license license:gpl2)))
diff --git a/gnu/packages/socat.scm b/gnu/packages/socat.scm
deleted file mode 100644
index 7c0bc3d..0000000
--- a/gnu/packages/socat.scm
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; 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 socat)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages openssl))
-
-;; XXX: Group with other networking tools like tcpdump in a module?
-(define-public socat
-  (package
-    (name "socat")
-    (version "1.7.2.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://www.dest-unreach.org/socat/download/socat-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "028yjka2zr6j1i8pmfmvzqki8ajczdl1hnry1x31xbbg3j83jxsb"))))
-    (build-system gnu-build-system)
-    (arguments '(#:tests? #f))                    ;no 'check' phase
-    (inputs `(("openssl" ,openssl)))
-    (home-page "http://www.dest-unreach.org/socat/")
-    (synopsis
-     "Open bidirectional communication channels from the command line")
-    (description
-     "socat is a relay for bidirectional data transfer between two independent
-data channels---files, pipes, devices, sockets, etc.  It can create
-\"listening\" sockets, named pipes, and pseudo terminals.
-
-socat can be used, for instance, as TCP port forwarder, as a shell interface
-to UNIX sockets, IPv6 relay, for redirecting TCP oriented programs to a serial
-line, to logically connect serial lines on different computers, or to
-establish a relatively secure environment (su and chroot) for running client
-or server shell scripts with network connections. ")
-    (license license:gpl2)))
-- 
2.1.0

Re: [PATCH] rename socat.scm to networking.scm.

[Ludovic Courtès]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> From e66acd5c9f50e675a2d7543ac028b2fdbb7d12da Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Wed, 29 Apr 2015 16:26:34 +0200
> Subject: [PATCH] gnu: rename (gnu packages socat) to (gnu packages
>  networking).
>
> * gnu/packages/socat.scm: Rename this ...
> * gnu/packages/networking.scm: ... to this.
> * gnu-system.am (GNU_SYSTEM_MODULES): Change socat.scm to networking.scm.

OK!

Ludo'.