diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
| commit | 93be4e8e6c6b82a5825b56cce991563bf19aaaf2 (patch) | |
| tree | 2b48c1c88f046ee6e1d59636d1f6e8fbbd1660c2 /gnu/packages/web.scm | |
| parent | a068dba78bde9c83a69c755df1131c286d065850 (diff) | |
| parent | e1509174957bd9eba777bec86ea290fb44a4bce3 (diff) | |
| download | guix-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar guix-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 419e531fb6..5296c43c53 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> @@ -49,14 +49,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.6") + (version "2.4.12") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "1sig08xxq1kqxr2a42ndwr9g4mm6zdqnxldhxraym2y0xcjkd7yw")))) + "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd")))) (build-system gnu-build-system) (inputs `(("apr" ,apr) ("apr-util" ,apr-util) @@ -799,3 +799,23 @@ select or poll.") server). It was primarily designed to be used by one person or a small group of people.") (license l:expat))) + +(define-public libyaml + (package + (name "libyaml") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append + "http://pyyaml.org/download/libyaml/yaml-" + version ".tar.gz")) + (sha256 + (base32 + "1vrv5ly58bkmcyc049ad180f2m8iav6l9h3v8l2fqdmrny7yx1zs")))) + (build-system gnu-build-system) + (home-page "http://pyyaml.org/wiki/LibYAML") + (synopsis "YAML 1.1 parser and emitter written in C") + (description + "LibYAML is a YAML 1.1 parser and emitter written in C.") + (license l:expat))) |