mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates
This commit is contained in:
commit
288b8fd5e9
32 changed files with 3480 additions and 1559 deletions
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com>
|
||||
|
@ -13,7 +13,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
|
||||
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
|
@ -41,6 +41,9 @@
|
|||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages gnuzilla)
|
||||
#:use-module (gnu packages haskell)
|
||||
#:use-module (gnu packages haskell-check)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -54,6 +57,7 @@
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config))
|
||||
|
||||
|
@ -935,6 +939,15 @@ Libxml2).")
|
|||
(license (license:x11-style "file://COPYING"
|
||||
"See 'COPYING' in the distribution."))))
|
||||
|
||||
(define-public xmlsec-nss
|
||||
(package
|
||||
(inherit xmlsec)
|
||||
(name "xmlsec-nss")
|
||||
(inputs
|
||||
`(("nss" ,nss)
|
||||
("libltdl" ,libltdl)))
|
||||
(synopsis "XML Security Library (using NSS instead of GnuTLS)")))
|
||||
|
||||
(define-public minixml
|
||||
(package
|
||||
(name "minixml")
|
||||
|
@ -1958,3 +1971,109 @@ outputting XML data from Java code.")
|
|||
(description "XStream is a simple library to serialize Java objects to XML
|
||||
and back again.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-hxt-charproperties
|
||||
(package
|
||||
(name "ghc-hxt-charproperties")
|
||||
(version "9.2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"hxt-charproperties/hxt-charproperties-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/UweSchmidt/hxt")
|
||||
(synopsis "Character properties and classes for XML and Unicode")
|
||||
(description
|
||||
"The modules provided by this package contain predicates for Unicode
|
||||
blocks and char properties and character predicates defined by XML. The
|
||||
supported Unicode version is 7.0.0")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-hxt-unicode
|
||||
(package
|
||||
(name "ghc-hxt-unicode")
|
||||
(version "9.0.2.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/hxt-unicode/hxt-unicode-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-hxt-charproperties" ,ghc-hxt-charproperties)))
|
||||
(home-page
|
||||
"http://www.fh-wedel.de/~si/HXmlToolbox/index.html https://github.com/UweSchmidt/hxt")
|
||||
(synopsis
|
||||
"Unicode en-/decoding functions for utf8, iso-latin-* and other encodings")
|
||||
(description
|
||||
"This package provides Unicode encoding and decoding functions for
|
||||
encodings used in the Haskell XML Toolbox. ISO Latin 1-16, utf8, utf16, ASCII
|
||||
are supported. Decoding is done with lazy functions, errors may be detected or
|
||||
ignored.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-hxt-regex-xmlschema
|
||||
(package
|
||||
(name "ghc-hxt-regex-xmlschema")
|
||||
(version "9.2.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"hxt-regex-xmlschema/hxt-regex-xmlschema-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
|
||||
("ghc-parsec" ,ghc-parsec)
|
||||
("ghc-text" ,ghc-text)
|
||||
("ghc-hunit" ,ghc-hunit)))
|
||||
(home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema")
|
||||
(synopsis "Regular expression library for W3C XML Schema regular expressions")
|
||||
(description
|
||||
"This library supports full W3C XML Schema regular expressions inclusive
|
||||
all Unicode character sets and blocks. It is implemented by the technique of
|
||||
derivations of regular expressions.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-hxt
|
||||
(package
|
||||
(name "ghc-hxt")
|
||||
(version "9.3.1.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/hxt/hxt-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-parsec" ,ghc-parsec)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
|
||||
("ghc-hxt-unicode" ,ghc-hxt-unicode)
|
||||
("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema)
|
||||
("ghc-network-uri" ,ghc-network-uri)))
|
||||
(home-page "https://github.com/UweSchmidt/hxt")
|
||||
(synopsis "Collection of tools for processing XML with Haskell")
|
||||
(description
|
||||
"The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but
|
||||
introduces a more general approach for processing XML with Haskell.")
|
||||
(license license:expat)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue