From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] rename socat.scm to networking.scm. Date: Wed, 29 Apr 2015 16:32:02 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnT27-0007hq-Gk for guix-devel@gnu.org; Wed, 29 Apr 2015 10:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnT22-0003mx-Nn for guix-devel@gnu.org; Wed, 29 Apr 2015 10:32:15 -0400 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:53956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnT22-0003mi-Aj for guix-devel@gnu.org; Wed, 29 Apr 2015 10:32:10 -0400 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id C8144380AA9 for ; Wed, 29 Apr 2015 16:32:08 +0200 (CEST) Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 703P8-MRxvIf for ; Wed, 29 Apr 2015 16:32:02 +0200 (CEST) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Wed, 29 Apr 2015 16:32:02 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch; charset="utf-8" Content-Disposition: inline; filename="0001-gnu-rename-gnu-packages-socat-to-gnu-packages-networ.patch" Content-Transfer-Encoding: quoted-printable >From e66acd5c9f50e675a2d7543ac028b2fdbb7d12da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 =3D \ 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 =3D \ 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 =C2=A9 2014 Ludovic Court=C3=A8s +;;; +;;; 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 (a= t +;;; 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 . + +(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 indep= endent +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 inter= face +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 cl= ient +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 =C2=A9 2014 Ludovic Court=C3=A8s -;;; -;;; 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 (a= t -;;; 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 . - -(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 indep= endent -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 inter= face -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 cl= ient -or server shell scripts with network connections. ") - (license license:gpl2))) --=20 2.1.0 --=-=-=--