01/01: gnu: Move sparsehash to datastructures module.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit f7f55db8f6d049225898d4ebcd7bc1d53623f32d
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Dec 11 15:57:45 2015 +0100

    gnu: Move sparsehash to datastructures module.
    
    * gnu/packages/crypto.scm (sparsehash): Move variable to...
    * gnu/packages/datastructures.scm: ...new file.
    * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am                                   |    1 +
 gnu/packages/crypto.scm                         |   25 ---------------------
 gnu/packages/{crypto.scm => datastructures.scm} |   27 ++--------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index ec9f63c..8ffc671 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -80,6 +80,7 @@ GNU_SYSTEM_MODULES =                          \
   gnu/packages/cyrus-sasl.scm                  \
   gnu/packages/databases.scm                   \
   gnu/packages/datamash.scm                    \
+  gnu/packages/datastructures.scm              \
   gnu/packages/dc.scm                          \
   gnu/packages/debug.scm                       \
   gnu/packages/dejagnu.scm                     \
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 08af95f..d4742ca 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -43,28 +43,3 @@
 communication, encryption, decryption, signatures, etc.")
     (license isc)
     (home-page "http://libsodium.org";)))
-
-(define-public sparsehash
-  (package
-    (name "sparsehash")
-    (version "2.0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/sparsehash/sparsehash/";
-                                  "archive/sparsehash-" version ".tar.gz"))
-              (sha256
-               (base32
-                "133szz0ldwch0kd91l0sa57qsnl020njn622szd9cxrjqyjqds85"))))
-    (build-system gnu-build-system)
-    (synopsis "Memory-efficient hashtable implementations")
-    (description
-     "This library contains several hash-map implementations, similar in API
-to SGI's @code{hash_map} class, but with different performance
-characteristics.  @code{sparse_hash_map} uses very little space overhead, 1-2
-bits per entry.  @code{dense_hash_map} is very fast, particulary on lookup.
address@hidden and @code{dense_hash_set} are the set versions of these
-routines.  All these implementation use a hashtable with internal quadratic
-probing.  This method is space-efficient -- there is no pointer overhead --
-and time-efficient for good hash functions.")
-    (home-page "https://github.com/sparsehash/sparsehash";)
-    (license bsd-3)))
diff --git a/gnu/packages/crypto.scm b/gnu/packages/datastructures.scm
similarity index 71%
copy from gnu/packages/crypto.scm
copy to gnu/packages/datastructures.scm
index 08af95f..3614900 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/datastructures.scm
@@ -1,5 +1,4 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 David Thompson <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -17,33 +16,13 @@
 ;;; 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 crypto)
+(define-module (gnu packages datastructures)
   #:use-module (gnu packages)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
 
-(define-public libsodium
-  (package
-    (name "libsodium")
-    (version "1.0.0")
-    (source (origin
-            (method url-fetch)
-            (uri (string-append
-                  "http://download.libsodium.org/libsodium/releases/libsodium-";
-                  version ".tar.gz"))
-            (sha256
-             (base32
-              "19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"))))
-    (build-system gnu-build-system)
-    (synopsis "Portable NaCl-based crypto library")
-    (description
-     "Sodium is a new easy-to-use high-speed software library for network
-communication, encryption, decryption, signatures, etc.")
-    (license isc)
-    (home-page "http://libsodium.org";)))
-
 (define-public sparsehash
   (package
     (name "sparsehash")
@@ -67,4 +46,4 @@ routines.  All these implementation use a hashtable with 
internal quadratic
 probing.  This method is space-efficient -- there is no pointer overhead --
 and time-efficient for good hash functions.")
     (home-page "https://github.com/sparsehash/sparsehash";)
-    (license bsd-3)))
+    (license license:bsd-3)))