nckx pushed a commit to branch master
in repository guix.
commit 205df739400ee08da4ad72c91b082516ecbfa394
Author: Tobias Geerinckx-Rice <[email protected]>
Date: Thu Mar 14 16:28:11 2019 +0100
gnu: Move libconfuse to (gnu packages textutils).
* gnu/packages/wm.scm (libconfuse): Move…
* gnu/packages/textutils.scm (libconfuse): …to here.
Adjust all imports.
---
gnu/packages/genimage.scm | 4 ++--
gnu/packages/networking.scm | 1 -
gnu/packages/terminals.scm | 1 -
gnu/packages/textutils.scm | 22 ++++++++++++++++++++++
gnu/packages/wm.scm | 23 +----------------------
5 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index 792bddf..fdf686f 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -35,8 +35,8 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages mtools)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages virtualization)
- #:use-module (gnu packages wm))
+ #:use-module (gnu packages textutils)
+ #:use-module (gnu packages virtualization))
(define-public genimage
(package
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 7d7fce7..eeabc3d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -99,7 +99,6 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages web)
- #:use-module (gnu packages wm)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml)
#:use-module (ice-9 match))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 536a489..3839aa1 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -70,7 +70,6 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages ssh)
#:use-module (gnu packages textutils)
- #:use-module (gnu packages wm)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index d55f27f..78050f3 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -188,6 +188,28 @@ normalization, case-folding, and other operations for data
in the UTF-8
encoding, supporting Unicode version 9.0.0.")
(license license:expat)))
+(define-public libconfuse
+ (package
+ (name "libconfuse")
+ (version "3.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/martinh/libconfuse/";
+ "releases/download/v" version
+ "/confuse-" version ".tar.xz"))
+ (sha256
+ (base32 "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959"))))
+ (build-system gnu-build-system)
+ (home-page "https://github.com/martinh/libconfuse";)
+ (synopsis "Configuration file parser library")
+ (description "libconfuse is a configuration file parser library. It
+supports sections and (lists of) values (strings, integers, floats, booleans
+or other sections), as well as some other features (such as
+single/double-quoted strings, environment variable expansion, functions and
+nested include statements).")
+ (license license:isc)))
+
(define-public libgtextutils
(package
(name "libgtextutils")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 4a6fc62..abd51f6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -83,31 +83,10 @@
#:use-module (gnu packages video)
#:use-module (gnu packages version-control)
#:use-module (gnu packages man)
+ #:use-module (gnu packages textutils)
#:use-module (guix download)
#:use-module (guix git-download))
-(define-public libconfuse
- (package
- (name "libconfuse")
- (version "3.2.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/martinh/libconfuse/";
- "releases/download/v" version
- "/confuse-" version ".tar.xz"))
- (sha256
- (base32
- "02r1mmzik2m0iigbc2da3y754vj24i18r3ml5p2wzs027mjhn959"))))
- (build-system gnu-build-system)
- (home-page "https://github.com/martinh/libconfuse";)
- (synopsis "Configuration file parser library")
- (description "libconfuse is a configuration file parser library. It
-supports sections and (lists of) values (strings, integers, floats, booleans
-or other sections), as well as some other features (such as
-single/double-quoted strings, environment variable expansion, functions and
-nested include statements).")
- (license license:isc)))
-
(define-public bspwm
(package
(name "bspwm")
