;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
-;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
+;;; Copyright © 2016, 2017, 2018
, 2019 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages kerberos)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
(define-public httpd
(package
(name "httpd")
- (version "2.4.37")
+ (version "2.4.38")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/httpd/httpd-"
version ".tar.bz2"))
(sha256
(base32
- "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l"))))
+ "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"))))
(build-system gnu-build-system)
(native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config'
(inputs `(("apr" ,apr)
(name "mod-wsgi")
(version "4.5.22")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/GrahamDumpleton/mod_wsgi/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/GrahamDumpleton/mod_wsgi.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q"))))
+ "1q90xw2cbhka5gcd6yc69iir73x4gm7fm75qpkins2ryfl6w1q3f"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ;; TODO: Can't figure out if there are tests
+ '(#:tests? #f ; TODO: can't figure out if there are tests
#:make-flags (list
(string-append "DESTDIR="
(assoc-ref %outputs "out"))
(define-public nginx
(package
(name "nginx")
- ;; Consider updating the nginx-documentation package if the nginx package is
- ;; updated.
- (version "1.14.2")
+ ;; Track the ‘mainline’ branch. Upstream considers it more reliable than
+ ;; ’stable’ and recommends that “in general you deploy the NGINX mainline
+ ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
+ ;; Consider updating the nginx-documentation package together with this one.
+ (version "1.15.9")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
- "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80"))))
+ "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"))))
(build-system gnu-build-system)
(inputs `(("openssl" ,openssl)
("pcre" ,pcre)
(license l:bsd-2))))
(define-public nginx-documentation
- ;; This documentation should be relevant for nginx@1.13.11.
- (let ((revision 2131)
- (changeset "dbaf3950f8e9"))
+ ;; This documentation should be relevant for nginx@1.15.9.
+ (let ((revision 2345)
+ (changeset "7ef11708457e"))
(package
(name "nginx-documentation")
(version
- (simple-format #f "2018-04-04-~A-~A" revision changeset))
+ (simple-format #f "2019-03-01-~A-~A" revision changeset))
(source
(origin (method hg-fetch)
(uri (hg-reference
(file-name (string-append name "-" version))
(sha256
(base32
- "0acdjsdaqixzh9g9s6db552v4pan4nqrllyqapay9ns9yzh1hrp7"))))
+ "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
;; banner.
(substitute* "xslt/style.xslt"
(("#banner \\{ background: black;")
- "#banner { background: black;
- display: none;"))
+ "#banner { display: none;"))
(invoke "make")
#t)))
(replace 'install
(version "1.1.0")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/gnosek/fcgiwrap/"
- "archive/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gnosek/fcgiwrap.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac"))))
+ (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests included
+ `(#:tests? #f ; no tests included
#:make-flags (list "CC=gcc")))
(native-inputs
`(("autoconf" ,autoconf)
(define-public jansson
(package
(name "jansson")
- (version "2.11")
+ (version "2.12")
(source (origin
(method url-fetch)
(uri
(string-append "http://www.digip.org/jansson/releases/jansson-"
- version ".tar.gz"))
+ version ".tar.bz2"))
(sha256
(base32
- "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf"))))
+ "1lp1mv8pjp5yziws66cy0dhpcam4bbjqhffk13v4vgdybp674pb4"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--disable-static")))
(home-page "http://www.digip.org/jansson/")
(synopsis "JSON C library")
(description
(name "qjson")
(version "0.9.0")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/flavio/qjson/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/flavio/qjson.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8"))))
+ "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs"))))
(build-system cmake-build-system)
(arguments
- ;; The tests require a X server
+ ;; The tests require a running X server.
`(#:configure-flags '("-DQJSON_BUILD_TESTS=ON"
"-DCMAKE_CXX_FLAGS=-std=gnu++11 -fPIC")
#:phases
(name "rapidjson")
(version "1.1.0")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/miloyip/rapidjson/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove code using the problematic JSON license (see
- ;; <https://www.gnu.org/licenses/license-list.html#JSON>).
- (delete-file-recursively "bin/jsonchecker")
- #t))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Tencent/rapidjson.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove code using the problematic JSON license (see
+ ;; <https://www.gnu.org/licenses/license-list.html#JSON>).
+ (delete-file-recursively "bin/jsonchecker")
+ #t))))
(build-system cmake-build-system)
(arguments
- `(,@(if (string-prefix? "aarch64" (or (%current-target-system)
- (%current-system)))
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-aarch-march-detection
- (lambda _
- (substitute* (find-files "." "^CMakeLists\\.txt$")
- (("native") "armv8-a"))
- #t))))
- '())))
- (home-page "https://github.com/miloyip/rapidjson")
+ (if (string-prefix? "aarch64" (or (%current-target-system)
+ (%current-system)))
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-aarch-march-detection
+ (lambda _
+ (substitute* (find-files "." "^CMakeLists\\.txt$")
+ (("native") "armv8-a"))
+ #t))))
+ ;; Disable CPU optimization for reproducibility.
+ '(#:configure-flags '("-DRAPIDJSON_ENABLE_INSTRUMENTATION_OPT=OFF"))))
+ (home-page "https://github.com/Tencent/rapidjson")
(synopsis "JSON parser/generator for C++ with both SAX/DOM style API")
(description
"RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM
(name "libyajl")
(version "2.1.0")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/lloyd/yajl/"
- "archive/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lloyd/yajl.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0nmcqpaiq4pv7dymyg3n3jsd57yhp5npxl26a1hzw3m3lmj37drz"))))
+ "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"))))
(build-system cmake-build-system)
(arguments
'(#:phases
(name "websockify")
(version "0.8.0")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/novnc/websockify/archive/v"
- version "/archive.tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/novnc/websockify.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1kjq6gibsvbb6zx5gi8hgh7110x62pbwcqkwapf3k7s27w5y907h"))))
+ "0pcic8qs0gdwrfjgfaf893jyddaw97wcjm2mmvwn0xyhmy8mbmw1"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; FIXME: 2 out of 6 tests fail with "ImportError: No module
;; bundled CuTest framework uses a different non-copyleft license.
(license (list l:asl2.0 (l:non-copyleft "file://test/CuTest-README.txt")))))
+(define-public libsass
+ (package
+ (name "libsass")
+ (version "3.5.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sass/libsass.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'bootstrap 'set-LIBSASS_VERSION
+ (lambda _
+ (setenv "LIBSASS_VERSION" ,version)
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (home-page "https://sass-lang.com/libsass")
+ (synopsis "SASS Compiler, implemented as a C/C++ library")
+ (description
+ "LibSass is a @acronym{SASS,Syntactically awesome style sheets} compiler
+library designed for portability and efficiency. To actually compile SASS
+stylesheets, you'll need to use another program that uses this library,
+@var{sassc} for example.")
+ (license l:expat)))
+
(define-public sassc
- ;; libsass must be statically linked and it isn't included in the sassc
- ;; release tarballs, hence this odd package recipe.
- (let* ((version "3.4.5")
- (libsass
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/sass/libsass/archive/"
- version ".tar.gz"))
- (file-name (string-append "libsass-" version ".tar.gz"))
- (sha256
- (base32
- "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x")))))
- (package
- (name "sassc")
- (version version)
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/sass/sassc/archive/"
- version ".tar.gz"))
- (file-name (string-append "sassc-" version ".tar.gz"))
- (sha256
- (base32
- "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"))))
- (build-system gnu-build-system)
- (arguments
- `(#:make-flags
- (list "CC=gcc"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:test-target "test"
- ;; FIXME: "make test" rebuilds the application and gets lost in a
- ;; non-existing directory.
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'bootstrap)
- (delete 'configure)
- (add-after 'unpack 'unpack-libsass-and-set-path
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke "tar" "xvf" (assoc-ref inputs "libsass"))
- (setenv "SASS_LIBSASS_PATH"
- (string-append (getcwd) "/libsass-" ,version))
- #t)))))
- (inputs
- `(("libsass" ,libsass)))
- (synopsis "CSS pre-processor")
- (description "SassC is a compiler written in C for the CSS pre-processor
+ (package
+ (name "sassc")
+ (version "3.5.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sass/sassc.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jsfz1zg4gwk0dq8i92ll12axs3s70wsdsmdyi71zx8zmvib5nl6"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ (list "CC=gcc"
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ ;; I don't believe sassc contains any tests
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-Makefile
+ (lambda _
+ (substitute* "Makefile"
+ (("build-shared: \\$\\(RESOURCES\\) \\$\\(OBJECTS\\) \\$\\(LIB_SHARED\\)")
+ "build-shared: $(RESOURCES) $(OBJECTS)")
+ (("\\$\\(SASSC_EXE\\): libsass build")
+ "$(SASSC_EXE): build")
+ (("install: libsass-install-\\$\\(BUILD\\) \\\\")
+ "install: \\"))
+ #t))
+ ;; This phase fails for some reason
+ (delete 'bootstrap)
+ ;; There is no configure script
+ (delete 'configure)
+ (add-before 'build 'setup-environment
+ (lambda _
+ (setenv "BUILD" "shared")
+ (setenv "SASSC_VERSION" ,version)
+ #t)))))
+ (inputs
+ `(("libsass" ,libsass)))
+ (synopsis "CSS pre-processor")
+ (description "SassC is a compiler written in C for the CSS pre-processor
language known as SASS.")
- (home-page "http://sass-lang.com/libsass")
- (license l:expat))))
+ (home-page "http://sass-lang.com/libsass")
+ (license l:expat)))
\f
(define-public perl-apache-logformat-compiler
(package
(name "perl-apache-logformat-compiler")
- (version "0.33")
+ (version "0.35")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/K/KA/KAZEBURO/"
"Apache-LogFormat-Compiler-" version ".tar.gz"))
(sha256
- (base32
- "17blk3zhp05azgypn25ydxf3d7fyfgr9bxyiv7xkchhqma96vwqv"))))
+ (base32 "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n"))))
(build-system perl-build-system)
(native-inputs
`(("perl-http-message" ,perl-http-message)
- ("perl-module-build" ,perl-module-build)
+ ("perl-module-build-tiny" ,perl-module-build-tiny)
("perl-test-mocktime" ,perl-test-mocktime)
("perl-try-tiny" ,perl-try-tiny)
("perl-uri" ,perl-uri)))
(propagated-inputs
`(("perl-posix-strftime-compiler" ,perl-posix-strftime-compiler)))
- (arguments `(#:tests? #f)) ;TODO: Timezone test failures
+ (arguments `(#:tests? #f)) ; TODO: Timezone test failures
(home-page "https://metacpan.org/release/Apache-LogFormat-Compiler")
(synopsis "Compile a log format string to perl-code")
(description "This module provides methods to compile a log format string
(define-public perl-catalyst-action-rest
(package
(name "perl-catalyst-action-rest")
- (version "1.20")
+ (version "1.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
"Catalyst-Action-REST-" version ".tar.gz"))
(sha256
(base32
- "1mpa64p61f3dp24xnhdraswch4sqj5vyv1iivcvvh5h0xi0haiy0"))))
+ "086bykggzalbjfk0islac4b48g9s2ypj7y81d6ns1lq0aax1py6c"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-requires" ,perl-test-requires)
(define-public perl-catalyst-plugin-session
(package
(name "perl-catalyst-plugin-session")
- (version "0.40")
+ (version "0.41")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
"Catalyst-Plugin-Session-" version ".tar.gz"))
(sha256
- (base32
- "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"))))
+ (base32 "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-install" ,perl-module-install)
(define-public perl-cgi-simple
(package
(name "perl-cgi-simple")
- (version "1.15")
+ (version "1.21")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/"
"CGI-Simple-" version ".tar.gz"))
(sha256
- (base32
- "013dcy9k4sj9alkksk5aqz65ryxw0rxgg71c7w666y941gd8n46q"))))
+ (base32 "1wzc2igs4khmj7zfahvs87c24p9ks8hnqhhsyviyiix53xx2y6sg"))))
(build-system perl-build-system)
(native-inputs
`(("perl-io-stringy" ,perl-io-stringy) ; for IO::Scalar
(define-public perl-html-lint
(package
(name "perl-html-lint")
- (version "2.26")
+ (version "2.32")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/P/PE/PETDANCE/"
"HTML-Lint-" version ".tar.gz"))
(sha256
- (base32
- "02vi1s4sw3hjnndxd6s91cp54iw5pg8n5kl9v0109dfxzn1n9bnl"))))
+ (base32 "0lk02xpfxcg7ij4dvpsa4wjlzhmiizj0jfr3rwmdpbj69nvc93br"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-html-parser" ,perl-html-parser)
(define-public perl-libwww
(package
(name "perl-libwww")
- (version "6.35")
+ (version "6.37")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.gz"))
(sha256
(base32
- "0lsrr8r61b67f9wrynkhdhldw5yic4d7cd78zi52q59jgf6mg8nx"))))
+ "04a24cx9gs070rvlwf5kanz03y7nnq9k2nmpr01plnm059iprvf6"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)
(define-public perl-plack-middleware-methodoverride
(package
(name "perl-plack-middleware-methodoverride")
- (version "0.11")
+ (version "0.20")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/D/DW/DWHEELER/"
+ (uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/"
"Plack-Middleware-MethodOverride-"
version ".tar.gz"))
(sha256
- (base32
- "1hb8dx7i4vs74n0p737wrvpdnnw6argxrjpr6kj6432zabp8325z"))))
+ (base32 "1wdmmav3rbhv49zpw311zrxxqmg1fz3f3q9src0ypgs8zcp5myyv"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
(define-public perl-test-www-mechanize-catalyst
(package
(name "perl-test-www-mechanize-catalyst")
- (version "0.60")
+ (version "0.62")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
+ (uri (string-append "mirror://cpan/authors/id/M/MS/MSTROUT/"
"Test-WWW-Mechanize-Catalyst-" version ".tar.gz"))
(sha256
- (base32
- "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"))))
+ (base32 "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"))))
(build-system perl-build-system)
(native-inputs
`(("perl-catalyst-plugin-session" ,perl-catalyst-plugin-session)
(define-public perl-uri-template
(package
(name "perl-uri-template")
- (version "0.23")
+ (version "0.24")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-"
version ".tar.gz"))
(sha256
(base32
- "0nnijyv4n5qfg7l94j7fmvqy9cbq3gl9sz9anmgsiprmkmpk419j"))))
+ "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8"))))
(build-system perl-build-system)
(inputs
`(("perl-uri" ,perl-uri)))
(define-public perl-www-mechanize
(package
(name "perl-www-mechanize")
- (version "1.89")
+ (version "1.91")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/"
"WWW-Mechanize-" version ".tar.gz"))
(sha256
- (base32
- "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"))))
+ (base32 "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"))))
(build-system perl-build-system)
(native-inputs ;only for tests
`(("perl-cgi" ,perl-cgi)
(define-public uwsgi
(package
(name "uwsgi")
- (version "2.0.17.1")
+ (version "2.0.18")
(source (origin
(method url-fetch)
(uri (string-append "https://projects.unbit.it/downloads/uwsgi-"
version ".tar.gz"))
(sha256
(base32
- "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj"))))
+ "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(arguments
(base32
"163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6"))))
(build-system glib-or-gtk-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'check 'use-empty-ssl-cert-file
- (lambda _
- ;; Search for ca-certificates.crt files
- ;; during the check phase.
- (setenv "SSL_CERT_FILE" "/dev/null")
- #t)))))
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
;; For check phase.
(define-public stunnel
(package
(name "stunnel")
- (version "5.48")
+ (version "5.50")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.stunnel.org/downloads/stunnel-"
version ".tar.gz"))
(sha256
- (base32
- "1pxqn9ixl80nrhfq12igyi874653jclji56hh9w24snf0aixa48h"))))
+ (base32 "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm"))))
(build-system gnu-build-system)
(native-inputs
;; For tests.
(package
(name "varnish")
(home-page "https://varnish-cache.org/")
- (version "6.0.0")
+ (version "6.2.0")
(source (origin
(method url-fetch)
(uri (string-append home-page "_downloads/varnish-" version ".tgz"))
(sha256
(base32
- "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7"))))
+ "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
(("/bin/sh") (which "sh")))
(substitute* "bin/varnishd/mgt/mgt_shmem.c"
(("rm -rf") (string-append (which "rm") " -rf")))
+ (substitute* "bin/varnishtest/vtc_main.c"
+ (("/bin/rm") (which "rm")))
#t))
(add-before 'install 'patch-Makefile
(lambda _
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("python-sphinx" ,python-sphinx)
("rst2man" ,python-docutils)))
(inputs
`(("jemalloc" ,jemalloc)
(version "2.3.15")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/xinetd-org/xinetd/archive/xinetd-"
- (string-join (string-split version #\.) "-") ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xinetd-org/xinetd.git")
+ (commit (string-append "xinetd-"
+ (string-join (string-split version #\.)
+ "-")))))
+ (file-name (git-file-name name version))
(patches (search-patches "xinetd-CVE-2013-4342.patch"
"xinetd-fix-fd-leak.patch"))
(sha256
- (base32
- "0k59x52cbzp5fw0n8zn0y54j1ps0x9b72y8k5grzswjdmgs2a2v2"))))
+ (base32 "0wjai6qagcgxpa1khh639ih7kswgkryc7ll1i4hxhs29sc7irdcn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-loadavg")
(define-public hiawatha
(package
(name "hiawatha")
- (version "10.8.3")
+ (version "10.9")
(source
(origin
(method url-fetch)
(snippet '(begin
;; We use packaged libraries, so delete the bundled copies.
(for-each delete-file-recursively
- (list "nghttp2" "mbedtls"))
+ (list "extra/nghttp2.tgz" "mbedtls"))
#t))
(sha256
- (base32
- "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s"))))
+ (base32 "1f2j2x1ziawz8ijg3s3izqpyzpiwfyhlsvbv0szxvhvj4a0l7pbl"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests included
(define-public jo
(package
(name "jo")
- (version "1.1")
+ (version "1.2")
(source
(origin
(method url-fetch)
- (uri (string-append "https://github.com/jpmens/jo/releases/download/v"
+ (uri (string-append "https://github.com/jpmens/jo/releases/download/"
version "/jo-" version ".tar.gz"))
(sha256
(base32
- "0pysickpxrbl53c122h6swvz8sck68q3j0ql38wvbz70q9k4gvb3"))))
+ "1bmdck53jslrl3anqqpm6iyjdxrz445qzcc4fr37hr3wjg22zv1n"))))
(build-system gnu-build-system)
(home-page "https://github.com/jpmens/jo")
(synopsis "Output JSON from a shell")
(define-public rss-bridge
(package
(name "rss-bridge")
- (version "2018-11-10")
+ (version "2019-01-13")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/RSS-Bridge/rss-bridge/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/RSS-Bridge/rss-bridge")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1l9a82smh6k37bjvzbmkdlssxywlmr40ig4cykgsns1iiszwv4ia"))))
+ "1m0dq491954f0d7k4508ddlywk09whcz9j21rc4yk3lbwpf0nd4c"))))
(build-system trivial-build-system)
- (native-inputs
- `(("gzip" ,gzip)
- ("tar" ,tar)))
(arguments
'(#:modules ((guix build utils))
#:builder
(ice-9 match))
(let* ((out (assoc-ref %outputs "out"))
(share-rss-bridge (string-append out "/share/rss-bridge")))
- (set-path-environment-variable
- "PATH" '("bin") (map (match-lambda ((_ . input) input))
- %build-inputs))
(mkdir-p share-rss-bridge)
- (invoke "tar" "xvf" (assoc-ref %build-inputs "source")
- "--strip-components" "1" "-C" share-rss-bridge)))))
+ (copy-recursively (assoc-ref %build-inputs "source") share-rss-bridge)
+ #t))))
(home-page "https://github.com/RSS-Bridge/rss-bridge")
(synopsis "Generate Atom feeds for social networking websites")
(description "rss-bridge generates Atom feeds for social networking
(define-public java-tomcat
(package
(name "java-tomcat")
- (version "8.5.32")
+ (version "8.5.38")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/tomcat/tomcat-8/v"
version "/src/apache-tomcat-" version "-src.tar.gz"))
(sha256
(base32
- "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6"))
+ "13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2"))
(modules '((guix build utils)))
;; Delete bundled jars.
(snippet
(modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
- (chdir "jetty-test-helper")))
+ (chdir "jetty-test-helper")
+ #t))
(add-before 'build 'fix-paths
(lambda _
;; TODO:
(modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
- (chdir "jetty-http"))))))
+ (chdir "jetty-http")
+ #t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
(define-public geomyidae
(package
(name "geomyidae")
- (version "0.31")
+ (version "0.34")
(source
(origin
- (method url-fetch)
- (uri (string-append "http://git.r-36.net/geomyidae/snapshot/"
- "geomyidae-" version ".tar.bz2"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://r-36.net/geomyidae")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "1ih7220c6mgq4r7blm4kx3pxbl53sph58lqgwci6cmi3c0sq5c3x"))))
+ (base32 "02afgrk36wkdkflyqr2xgh49v9zq6ma454jshk7igvhpxfb5l3ks"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "CC=gcc"
(string-append "PREFIX="
(assoc-ref %outputs "out")))
- #:tests? #f ;no tests
+ #:tests? #f ; no tests
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (home-page "http://git.r-36.net/geomyidae")
+ (home-page "http://r-36.net/scm/geomyidae/file/README.html")
(synopsis "Small Gopher server")
(description
"Geomyidae is a server for distributed hypertext protocol Gopher. Its
(define-public nghttp2
(package
(name "nghttp2")
- (version "1.32.0")
+ (version "1.35.1")
(source
(origin
(method url-fetch)
name "-" version ".tar.xz"))
(sha256
(base32
- "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh"))))
+ "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv"))))
(build-system gnu-build-system)
(outputs (list "out"
"lib")) ; only libnghttp2
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later
;; Required by tests.
("cunit" ,cunit)
(("@prefix@")
(assoc-ref outputs "lib")))
#t))
+ (add-before 'configure 'work-around-bug-30756
+ (lambda _
+ (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t))
(add-before 'check 'set-timezone-directory
(lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")
HCoop / jackhill / guix / guix.git / blobdiff