nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2018-04-10 00:42:22 -04:00
parent 169c658f7f 60e1de6d95
commit f89aa1521a
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
122 changed files with 7524 additions and 2489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -81,6 +81,7 @@ MODULES = \
guix/derivations.scm \
guix/grafts.scm \
guix/gnu-maintenance.scm \
guix/self.scm \
guix/upstream.scm \
guix/licenses.scm \
guix/glob.scm \
@ -459,7 +460,7 @@ EXTRA_DIST = \
TODO \
CODE-OF-CONDUCT \
.dir-locals.el \
bin/guix.in \
scripts/guix.in \
etc/guix-install.sh \
build-aux/build-self.scm \
build-aux/compile-all.scm \
@ -467,8 +468,12 @@ EXTRA_DIST = \
build-aux/hydra/gnu-system.scm \
build-aux/hydra/guix.scm \
build-aux/hydra/guix-modular.scm \
build-aux/cuirass/gnu-system.scm \
build-aux/cuirass/guix-modular.scm \
build-aux/cuirass/hydra-to-cuirass.scm \
build-aux/check-available-binaries.scm \
build-aux/check-final-inputs-self-contained.scm \
build-aux/compile-as-derivation.scm \
build-aux/generate-authors.scm \
build-aux/test-driver.scm \
build-aux/update-guix-package.scm \
@ -534,6 +539,13 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
install-data-hook: set-bootstrap-executable-permissions
touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
# Assuming Guix is already installed and the daemon is up and running, this
# rule builds from $(srcdir), creating and building derivations.
as-derivation:
$(AM_V_at)echo "Building Guix in Guix..." ; \
$(GUILE) --no-auto-compile \
"$(top_srcdir)/build-aux/compile-as-derivation.scm" \
"$(abs_top_srcdir)"
SUBDIRS = po/guix po/packages
BUILT_SOURCES =
@ -762,7 +774,7 @@ cuirass-jobs.scm: $(GOBJECTS)
.PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
.PHONY: assert-no-store-file-names assert-binaries-available
.PHONY: assert-final-inputs-self-contained
.PHONY: clean-go make-go
.PHONY: clean-go make-go as-derivation
.PHONY: update-guix-package update-NEWS release
## -------------- ##

432
build-aux/build-self.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -19,10 +19,14 @@
(define-module (build-self)
#:use-module (gnu)
#:use-module (guix)
#:use-module (guix ui)
#:use-module (guix config)
#:use-module (guix modules)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-19)
#:use-module (rnrs io ports)
#:use-module (ice-9 match)
#:use-module (ice-9 popen)
#:export (build))
;;; Commentary:
@ -40,242 +44,256 @@
;;; Code:
;; The dependencies. Don't refer explicitly to the variables because they
;; could be renamed or shuffled around in modules over time. Conversely,
;; 'find-best-packages-by-name' is expected to always have the same semantics.
;;;
;;; Generating (guix config).
;;;
;;; This is copied from (guix self) because we cannot assume (guix self) is
;;; available at this point.
;;;
(define guix
(first (find-best-packages-by-name "guix" #f)))
(define %dependency-variables
;; (guix config) variables corresponding to dependencies.
'(%libgcrypt %libz %xz %gzip %bzip2 %nix-instantiate))
(define libgcrypt
(first (find-best-packages-by-name "libgcrypt" #f)))
(define %persona-variables
;; (guix config) variables that define Guix's persona.
'(%guix-package-name
%guix-version
%guix-bug-report-address
%guix-home-page-url))
(define zlib
(first (find-best-packages-by-name "zlib" #f)))
(define %config-variables
;; (guix config) variables corresponding to Guix configuration (storedir,
;; localstatedir, etc.)
(sort (filter pair?
(module-map (lambda (name var)
(and (not (memq name %dependency-variables))
(not (memq name %persona-variables))
(cons name (variable-ref var))))
(resolve-interface '(guix config))))
(lambda (name+value1 name+value2)
(string<? (symbol->string (car name+value1))
(symbol->string (car name+value2))))))
(define gzip
(first (find-best-packages-by-name "gzip" #f)))
(define* (make-config.scm #:key libgcrypt zlib gzip xz bzip2
(package-name "GNU Guix")
(package-version "0")
(bug-report-address "bug-guix@gnu.org")
(home-page-url "https://gnu.org/s/guix"))
(define bzip2
(first (find-best-packages-by-name "bzip2" #f)))
;; Hack so that Geiser is not confused.
(define defmod 'define-module)
(define xz
(first (find-best-packages-by-name "xz" #f)))
(scheme-file "config.scm"
#~(begin
(#$defmod (guix config)
#:export (%guix-package-name
%guix-version
%guix-bug-report-address
%guix-home-page-url
%libgcrypt
%libz
%gzip
%bzip2
%xz
%nix-instantiate))
(define (false-if-wrong-guile package)
"Return #f if PACKAGE depends on the \"wrong\" major version of Guile (e.g.,
2.0 instead of 2.2), otherwise return PACKAGE."
(let ((guile (any (match-lambda
((label (? package? dep) _ ...)
(and (string=? (package-name dep) "guile")
dep)))
(package-direct-inputs package))))
(and (or (not guile)
(string-prefix? (effective-version)
(package-version guile)))
package)))
;; XXX: Work around <http://bugs.gnu.org/15602>.
(eval-when (expand load eval)
#$@(map (match-lambda
((name . value)
#~(define-public #$name #$value)))
%config-variables)
(define (package-for-current-guile . names)
"Return the package with one of the given NAMES that depends on the current
Guile major version (2.0 or 2.2), or #f if none of the packages matches."
(let loop ((names names))
(match names
(()
#f)
((name rest ...)
(match (find-best-packages-by-name name #f)
(()
(loop rest))
((first _ ...)
(or (false-if-wrong-guile first)
(loop rest))))))))
(define %guix-package-name #$package-name)
(define %guix-version #$package-version)
(define %guix-bug-report-address #$bug-report-address)
(define %guix-home-page-url #$home-page-url)
(define guile-json
(package-for-current-guile "guile-json"
"guile2.2-json"
"guile2.0-json"))
(define %gzip
#+(and gzip (file-append gzip "/bin/gzip")))
(define %bzip2
#+(and bzip2 (file-append bzip2 "/bin/bzip2")))
(define %xz
#+(and xz (file-append xz "/bin/xz")))
(define guile-ssh
(package-for-current-guile "guile-ssh"
"guile2.2-ssh"
"guile2.0-ssh"))
(define %libgcrypt
#+(and libgcrypt
(file-append libgcrypt "/lib/libgcrypt")))
(define %libz
#+(and zlib
(file-append zlib "/lib/libz")))
(define guile-git
(package-for-current-guile "guile-git"
"guile2.0-git"))
(define %nix-instantiate ;for (guix import snix)
"nix-instantiate")))))
(define guile-bytestructures
(package-for-current-guile "guile-bytestructures"
"guile2.0-bytestructures"))
;; The actual build procedure.
;;;
;;; 'gexp->script'.
;;;
;;; This is our own variant of 'gexp->script' with an extra #:module-path
;;; parameter, which was unavailable in (guix gexp) until commit
;;; 1ae16033f34cebe802023922436883867010850f (March 2018.)
;;;
(define (top-source-directory)
"Return the name of the top-level directory of this source tree."
(and=> (assoc-ref (current-source-location) 'filename)
(lambda (file)
(string-append (dirname file) "/.."))))
(define (load-path-expression modules path)
"Return as a monadic value a gexp that sets '%load-path' and
'%load-compiled-path' to point to MODULES, a list of module names. MODULES
are searched for in PATH."
(mlet %store-monad ((modules (imported-modules modules
#:module-path path))
(compiled (compiled-modules modules
#:module-path path)))
(return (gexp (eval-when (expand load eval)
(set! %load-path
(cons (ungexp modules) %load-path))
(set! %load-compiled-path
(cons (ungexp compiled)
%load-compiled-path)))))))
(define* (gexp->script name exp
#:key (guile (default-guile))
(module-path %load-path))
"Return an executable script NAME that runs EXP using GUILE, with EXP's
imported modules in its search path."
(mlet %store-monad ((set-load-path
(load-path-expression (gexp-modules exp)
module-path)))
(gexp->derivation name
(gexp
(call-with-output-file (ungexp output)
(lambda (port)
;; Note: that makes a long shebang. When the store
;; is /gnu/store, that fits within the 128-byte
;; limit imposed by Linux, but that may go beyond
;; when running tests.
(format port
"#!~a/bin/guile --no-auto-compile~%!#~%"
(ungexp guile))
(write '(ungexp set-load-path) port)
(write '(ungexp exp) port)
(chmod port #o555))))
#:module-path module-path)))
(define (date-version-string)
"Return the current date and hour in UTC timezone, for use as a poor
person's version identifier."
;; XXX: Replace with a Git commit id.
(date->string (current-date 0) "~Y~m~d.~H"))
(define (matching-guile-2.2)
"Return a Guile 2.2 with the same version as the current one or immediately
older than then current one. This is so that we do not build ABI-incompatible
objects. See <https://bugs.gnu.org/29570>."
(let loop ((packages (find-packages-by-name "guile" "2.2"))
(best #f))
(match packages
(()
best)
((head tail ...)
(if (string=? (package-version head) (version))
head
(if best
(if (version>? (package-version head) (version))
(loop tail best)
(loop tail head))
(loop tail head)))))))
(define* (build-program source version
#:optional (guile-version (effective-version)))
"Return a program that computes the derivation to build Guix from SOURCE."
(define select?
;; Select every module but (guix config) and non-Guix modules.
(match-lambda
(('guix 'config) #f)
(('guix _ ...) #t)
(('gnu _ ...) #t)
(_ #f)))
(define (guile-for-build)
"Return a derivation for Guile 2.0 or 2.2, whichever matches the currently
running Guile."
(package->derivation (cond-expand
(guile-2.2
(canonical-package (matching-guile-2.2)))
(else
(canonical-package
(specification->package "guile@2.0"))))))
(with-imported-modules `(((guix config)
=> ,(make-config.scm
#:libgcrypt
(specification->package "libgcrypt")))
,@(source-module-closure `((guix store)
(guix self)
(guix derivations)
(gnu packages bootstrap))
(list source)
#:select? select?))
(gexp->script "compute-guix-derivation"
#~(begin
(use-modules (ice-9 match))
(eval-when (expand load eval)
;; Don't augment '%load-path'.
(unsetenv "GUIX_PACKAGE_PATH")
;; (gnu packages …) modules are going to be looked up
;; under SOURCE. (guix config) is looked up in FRONT.
(match %load-path
((#$source _ ...)
#t) ;already done
((front _ ...)
(set! %load-path (list #$source front))))
;; Only load our own modules or those of Guile.
(match %load-compiled-path
((front _ ... sys1 sys2)
(set! %load-compiled-path
(list front sys1 sys2)))))
(use-modules (guix store)
(guix self)
(guix derivations)
(srfi srfi-1))
(define (spin system)
(define spin
(circular-list "-" "\\" "|" "/" "-" "\\" "|" "/"))
(format (current-error-port)
"Computing Guix derivation for '~a'... "
system)
(let loop ((spin spin))
(display (string-append "\b" (car spin))
(current-error-port))
(force-output (current-error-port))
(sleep 1)
(loop (cdr spin))))
(match (command-line)
((_ _ system)
(with-store store
(call-with-new-thread
(lambda ()
(spin system)))
(display
(derivation-file-name
(run-with-store store
(guix-derivation #$source #$version
#$guile-version)
#:system system)))))))
#:module-path (list source))))
;; The procedure below is our return value.
(define* (build source
#:key verbose? (version (date-version-string))
#:key verbose? (version (date-version-string)) system
(guile-version (match ((@ (guile) version))
("2.2.2" "2.2.2")
(_ (effective-version))))
#:allow-other-keys
#:rest rest)
"Return a derivation that unpacks SOURCE into STORE and compiles Scheme
files."
;; The '%xxxdir' variables were added to (guix config) in July 2016 so we
;; cannot assume that they are defined. Try to guess their value when
;; they're undefined (XXX: we get an incorrect guess when environment
;; variables such as 'NIX_STATE_DIR' are defined!).
(define storedir
(if (defined? '%storedir) %storedir %store-directory))
(define localstatedir
(if (defined? '%localstatedir) %localstatedir (dirname %state-directory)))
(define sysconfdir
(if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory)))
(define builder
#~(begin
(use-modules (guix build pull))
(letrec-syntax ((maybe-load-path
(syntax-rules ()
((_ item rest ...)
(let ((tail (maybe-load-path rest ...)))
(if (string? item)
(cons (string-append item
"/share/guile/site/"
#$(effective-version))
tail)
tail)))
((_)
'()))))
(set! %load-path
(append
(maybe-load-path #$guile-json #$guile-ssh
#$guile-git #$guile-bytestructures)
%load-path)))
(letrec-syntax ((maybe-load-compiled-path
(syntax-rules ()
((_ item rest ...)
(let ((tail (maybe-load-compiled-path rest ...)))
(if (string? item)
(cons (string-append item
"/lib/guile/"
#$(effective-version)
"/site-ccache")
tail)
tail)))
((_)
'()))))
(set! %load-compiled-path
(append
(maybe-load-compiled-path #$guile-json #$guile-ssh
#$guile-git #$guile-bytestructures)
%load-compiled-path)))
;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
;; broken: libguile-ssh could not be found. Work around that.
;; FIXME: We want Guile-SSH 0.10.2 or later anyway.
#$(if (string-prefix? "0.9." (package-version guile-ssh))
#~(setenv "LTDL_LIBRARY_PATH" (string-append #$guile-ssh "/lib"))
#t)
(build-guix #$output #$source
#:system #$%system
#:storedir #$storedir
#:localstatedir #$localstatedir
#:sysconfdir #$sysconfdir
#:sbindir (string-append #$guix "/sbin")
#:package-name #$%guix-package-name
#:package-version #$version
#:bug-report-address #$%guix-bug-report-address
#:home-page-url #$%guix-home-page-url
#:libgcrypt #$libgcrypt
#:zlib #$zlib
#:gzip #$gzip
#:bzip2 #$bzip2
#:xz #$xz
;; XXX: This is not perfect, enabling VERBOSE? means
;; building a different derivation.
#:debug-port (if #$verbose?
(current-error-port)
(%make-void-port "w")))))
(unless guile-git
;; XXX: Guix before February 2017 lacks a 'guile-git' package altogether.
;; If we try to upgrade anyway, the logic in (guix scripts pull) will not
;; build (guix git), which will leave us with an unusable 'guix pull'. To
;; avoid that, fail early.
(format (current-error-port)
"\
Your installation is too old and lacks a '~a' package.
Please upgrade to an intermediate version first, for instance with:
guix pull --url=https://git.savannah.gnu.org/cgit/guix.git/snapshot/v0.13.0.tar.gz
\n"
(match (effective-version)
("2.0" "guile2.0-git")
(_ "guile-git")))
(exit 1))
(mlet %store-monad ((guile (guile-for-build)))
(gexp->derivation "guix-latest" builder
#:modules '((guix build pull)
(guix build utils)
(guix build compile)
;; Closure of (guix modules).
(guix modules)
(guix memoization)
(guix profiling)
(guix sets))
;; Arrange so that our own (guix build …) modules are
;; used.
#:module-path (list (top-source-directory))
#:guile-for-build guile)))
;; Build the build program and then use it as a trampoline to build from
;; SOURCE.
(mlet %store-monad ((build (build-program source version guile-version))
(system (if system (return system) (current-system))))
(mbegin %store-monad
(show-what-to-build* (list build))
(built-derivations (list build))
(let* ((pipe (begin
(setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive
(open-pipe* OPEN_READ
(derivation->output-path build)
source system)))
(str (get-string-all pipe))
(status (close-pipe pipe)))
(match str
((? eof-object?)
(error "build program failed" (list build status)))
((? derivation-path? drv)
(mbegin %store-monad
(return (newline (current-output-port)))
((store-lift add-temp-root) drv)
(return (read-derivation-from-file drv))))
((? string? str)
(error "invalid build result" (list build str))))))))
;; This file is loaded by 'guix pull'; return it the build procedure.
build

53
build-aux/compile-as-derivation.scm Normal file
View File

@ -0,0 +1,53 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;; Build Guix using Guix.
(use-modules (srfi srfi-26))
;; Add ~/.config/guix/latest to the search path.
(add-to-load-path
(and=> (or (getenv "XDG_CONFIG_HOME")
(and=> (getenv "HOME")
(cut string-append <> "/.config")))
(cut string-append <> "/guix/latest")))
(use-modules (guix) (guix ui)
(guix git-download)
(ice-9 match))
(match (command-line)
((program source)
(with-error-handling
(with-store store
(let* ((script (string-append source "/build-aux/build-self.scm"))
(build (primitive-load script))
(git? (git-predicate source)))
(run-with-store store
;; TODO: Extract #:version and #:commit using Guile-Git.
(mlet* %store-monad ((source (interned-file source "guix-source"
#:select? git?
#:recursive? #t))
(drv (build source)))
(mbegin %store-monad
(show-what-to-build* (list drv))
(built-derivations (list drv))
(with-monad %store-monad
(display (derivation->output-path drv))
(newline)
(return drv))))))))))

28
build-aux/cuirass/gnu-system.scm
View File

@ -21,29 +21,5 @@
;;; tool.
;;;
(include-from-path "build-aux/hydra/gnu-system.scm")
(use-modules ((guix licenses)
#:select (license? license-name license-uri license-comment)))
(define (cuirass-jobs store arguments)
"Return Cuirass jobs."
(map hydra-job->cuirass-job (hydra-jobs store arguments)))
(define (hydra-job->cuirass-job hydra-job)
(let ((name (car hydra-job))
(job ((cdr hydra-job))))
(lambda _ (acons #:job-name (symbol->string name)
(map symbol-alist-entry->keyword-alist-entry job)))))
(define (symbol-alist-entry->keyword-alist-entry entry)
(cons (symbol->keyword (car entry)) (entry->sexp-entry (cdr entry))))
(define (entry->sexp-entry o)
(match o
((? license?) `((name . (license-name o))
(uri . ,(license-uri o))
(comment . ,(license-comment o))))
((lst ...)
(map entry->sexp-entry lst))
(_ o)))
(include "../hydra/gnu-system.scm")
(include "hydra-to-cuirass.scm")

6
build-aux/cuirass/guix-modular.scm Normal file
View File

@ -0,0 +1,6 @@
;;;
;;; This file defines Cuirass build jobs to build Guix itself.
;;;
(include "../hydra/guix-modular.scm")
(include "hydra-to-cuirass.scm")

47
build-aux/cuirass/hydra-to-cuirass.scm Normal file
View File

@ -0,0 +1,47 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;;;
;;; This file defines the conversion of Hydra build jobs to Cuirass build
;;; jobs. It is meant to be included in other files.
;;;
(use-modules ((guix licenses)
#:select (license? license-name license-uri license-comment)))
(define (cuirass-jobs store arguments)
"Return Cuirass jobs."
(map hydra-job->cuirass-job (hydra-jobs store arguments)))
(define (hydra-job->cuirass-job hydra-job)
(let ((name (car hydra-job))
(job ((cdr hydra-job))))
(lambda _ (acons #:job-name (symbol->string name)
(map symbol-alist-entry->keyword-alist-entry job)))))
(define (symbol-alist-entry->keyword-alist-entry entry)
(cons (symbol->keyword (car entry)) (entry->sexp-entry (cdr entry))))
(define (entry->sexp-entry o)
(match o
((? license?) `((name . (license-name o))
(uri . ,(license-uri o))
(comment . ,(license-comment o))))
((lst ...)
(map entry->sexp-entry lst))
(_ o)))

11
build-aux/hydra/evaluate.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -79,7 +79,8 @@ Otherwise return THING."
(match (command-line)
((command file cuirass? ...)
;; Load FILE, a Scheme file that defines Hydra jobs.
(let ((port (current-output-port)))
(let ((port (current-output-port))
(real-build-things build-things))
(save-module-excursion
(lambda ()
(set-current-module %user-module)
@ -93,13 +94,15 @@ Otherwise return THING."
;; Grafts can trigger early builds. We do not want that to happen
;; during evaluation, so use a sledgehammer to catch such problems.
;; An exception, though, is the evaluation of Guix itself, which
;; requires building a "trampoline" program.
(set! build-things
(lambda (store . args)
(format (current-error-port)
"error: trying to build things during evaluation!~%")
"warning: building things during evaluation~%")
(format (current-error-port)
"'build-things' arguments: ~s~%" args)
(exit 1)))
(apply real-build-things store args)))
;; Call the entry point of FILE and print the resulting job sexp.
(pretty-print

11
build-aux/hydra/gnu-system.scm
View File

@ -24,7 +24,7 @@
(use-modules (system base compile))
(eval-when (compile load eval)
(eval-when (expand load eval)
;; Pre-load the compiler so we don't end up auto-compiling it.
(compile #t)
@ -32,6 +32,15 @@
;; Use our very own Guix modules.
(set! %fresh-auto-compile #t)
;; Ignore .go files except for Guile's. This is because our checkout in the
;; store has mtime set to the epoch, and thus .go files look newer, even
;; though they may not correspond. Use 'reverse' so that /gnu/store/…-guile
;; comes before /run/current-system/profile.
(set! %load-compiled-path
(list
(dirname (dirname (search-path (reverse %load-compiled-path)
"ice-9/boot-9.go")))))
(and=> (assoc-ref (current-source-location) 'filename)
(lambda (file)
(let ((dir (string-append (dirname file) "/../..")))

54
build-aux/hydra/guix-modular.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,35 +21,14 @@
;;; Guix as 'guix pull', which is defined in (guix self).
;;;
;; Attempt to use our very own Guix modules.
(eval-when (compile load eval)
;; Ignore any available .go, and force recompilation. This is because our
;; checkout in the store has mtime set to the epoch, and thus .go files look
;; newer, even though they may not correspond.
(set! %fresh-auto-compile #t)
(and=> (assoc-ref (current-source-location) 'filename)
(lambda (file)
(let ((dir (canonicalize-path
(string-append (dirname file) "/../.."))))
(format (current-error-port) "prepending ~s to the load path~%"
dir)
(set! %load-path (cons dir %load-path))))))
(use-modules (guix store)
(guix config)
(guix utils)
(guix grafts)
((guix packages) #:select (%hydra-supported-systems))
(guix derivations)
(guix monads)
(guix gexp)
(guix self)
((guix licenses) #:prefix license:)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 match))
;; XXX: Debugging hack: since `hydra-eval-guile-jobs' redirects the output
@ -61,11 +40,13 @@
"Return a Hydra job a list building the modular Guix derivation from SOURCE
for SYSTEM. Use VERSION as the version identifier."
(lambda ()
(define build
(primitive-load (string-append source "/build-aux/build-self.scm")))
`((derivation . ,(derivation-file-name
(parameterize ((%graft? #f))
(run-with-store store
(lower-object (compiled-guix source
#:version version))))))
(run-with-store store
(build source #:version version #:system system
#:guile-version "2.2")))) ;the latest 2.2.x
(description . "Modular Guix")
(long-description
. "This is the modular Guix package as produced by 'guix pull'.")
@ -76,29 +57,26 @@ for SYSTEM. Use VERSION as the version identifier."
(define (hydra-jobs store arguments)
"Return Hydra jobs."
(define systems
(match (filter-map (match-lambda
(('system . value) value)
(_ #f))
arguments)
((lst ..1)
lst)
(_
(list (%current-system)))))
(match (assoc-ref arguments 'systems)
(#f %hydra-supported-systems)
((lst ...) lst)
((? string? str) (call-with-input-string str read))))
(define guix-checkout
(assq-ref arguments 'guix))
(or (assq-ref arguments 'guix) ;Hydra on hydra
(assq-ref arguments 'guix-modular))) ;Cuirass on berlin
(define version
(or (assq-ref guix-checkout 'revision)
"0.unknown"))
(let ((file (assq-ref guix-checkout 'file-name)))
(format (current-error-port) "using checkout ~s (~s)~%"
guix-checkout file)
(format (current-error-port) "using checkout ~s (~s; arguments: ~s)~%"
guix-checkout file arguments)
(map (lambda (system)
(let ((name (string->symbol
(string-append "guix." system))))
`(,name
. ,(build-job store file version system))))
%hydra-supported-systems)))
systems)))

4
build-aux/hydra/guix.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,7 +22,7 @@
;;;
;; Attempt to use our very own Guix modules.
(eval-when (compile load eval)
(eval-when (expand load eval)
;; Ignore any available .go, and force recompilation. This is because our
;; checkout in the store has mtime set to the epoch, and thus .go files look

22
doc/guix.texi
View File

@ -2039,6 +2039,16 @@ variable, even though, taken individually, neither @file{foo} nor
@itemx -p @var{profile}
Use @var{profile} instead of the user's default profile.
@cindex collisions, in a profile
@cindex colliding packages in profiles
@cindex profile collisions
@item --allow-collisions
Allow colliding packages in the new profile. Use at your own risk!
By default, @command{guix package} reports as an error @dfn{collisions}
in the profile. Collisions happen when two or more different versions
or variants of a given package end up in the profile.
@item --verbose
Produce verbose output. In particular, emit the build log of the
environment on the standard error port.
@ -8325,10 +8335,10 @@ ifconfig @var{interface} up
To configure wireless networking, you can create a configuration file
for the @command{wpa_supplicant} configuration tool (its location is not
important) using one of the available text editors such as
@command{zile}:
@command{nano}:
@example
zile wpa_supplicant.conf
nano wpa_supplicant.conf
@end example
As an example, the following stanza can go to this file and will work
@ -8509,8 +8519,10 @@ builds to @file{/gnu/store} which, initially, is an in-memory file system.
Next, you have to edit a file and
provide the declaration of the operating system to be installed. To
that end, the installation system comes with three text editors: GNU nano
(@pxref{Top,,, nano, GNU nano Manual}), GNU Zile (an Emacs clone), and
that end, the installation system comes with three text editors. We
recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which
supports syntax highlighting and parentheses matching; other editors
include GNU Zile (an Emacs clone), and
nvi (a clone of the original BSD @command{vi} editor).
We strongly recommend storing that file on the target root file system, say,
as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your
@ -8526,7 +8538,7 @@ something along these lines:
@example
# mkdir /mnt/etc
# cp /etc/configuration/desktop.scm /mnt/etc/config.scm
# zile /mnt/etc/config.scm
# nano /mnt/etc/config.scm
@end example
You should pay attention to what your configuration file contains, and

3
gnu/bootloader.scm
View File

@ -146,7 +146,8 @@
"Return the list of bootloader modules."
(all-modules (map (lambda (entry)
`(,entry . "gnu/bootloader"))
%load-path)))
%load-path)
#:warn warn-about-load-error))
(define %bootloaders
;; The list of publically-known bootloaders.

5
gnu/local.mk
View File

@ -544,6 +544,7 @@ MODULES_NOT_COMPILED += \
patchdir = $(guilemoduledir)/%D%/packages/patches
dist_patch_DATA = \
%D%/packages/patches/4store-fix-buildsystem.patch \
%D%/packages/patches/4store-unset-preprocessor-directive.patch \
%D%/packages/patches/a2ps-CVE-2001-1593.patch \
%D%/packages/patches/a2ps-CVE-2014-0466.patch \
%D%/packages/patches/abiword-explictly-cast-bools.patch \
@ -589,8 +590,9 @@ dist_patch_DATA = \
%D%/packages/patches/ceph-skip-collect-sys-info-test.patch \
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
%D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/clang-libc-search-path.patch \
%D%/packages/patches/clang-3.5-libc-search-path.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clang-6.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
%D%/packages/patches/classpath-aarch64-support.patch \
@ -619,6 +621,7 @@ dist_patch_DATA = \
%D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/delly-use-system-libraries.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
%D%/packages/patches/diffutils-getopt.patch \

27
gnu/packages.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
@ -110,8 +110,25 @@ for system '~a'")
file-name system)))))))
(define %distro-root-directory
;; Absolute file name of the module hierarchy.
(dirname (search-path %load-path "guix.scm")))
;; Absolute file name of the module hierarchy. Since (gnu packages …) might
;; live in a directory different from (guix), try to get the best match.
(letrec-syntax ((dirname* (syntax-rules ()
((_ file)
(dirname file))
((_ file head tail ...)
(dirname (dirname* file tail ...)))))
(try (syntax-rules ()
((_ (file things ...) rest ...)
(match (search-path %load-path file)
(#f
(try rest ...))
(absolute
(dirname* absolute things ...))))
((_)
#f))))
(try ("gnu/packages/base.scm" gnu/ packages/)
("gnu/packages.scm" gnu/)
("guix.scm"))))
(define %package-module-path
;; Search path for package modules. Each item must be either a directory
@ -142,7 +159,9 @@ for system '~a'")
(define* (fold-packages proc init
#:optional
(modules (all-modules (%package-module-path)))
(modules (all-modules (%package-module-path)
#:warn
warn-about-load-error))
#:key (select? (negate hidden-package?)))
"Call (PROC PACKAGE RESULT) for each available package defined in one of
MODULES that matches SELECT?, using INIT as the initial value of RESULT. It

15
gnu/packages/backup.scm
View File

@ -471,13 +471,13 @@ detection, and lossless compression.")
(define-public borg
(package
(name "borg")
(version "1.1.4")
(version "1.1.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32 "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"))
(base32 "0gbdnq7ks46diz6y2pf6wpwkb9hy6hp3immi7jg3h7w72b3ycmj3"))
(modules '((guix build utils)))
(snippet
'(begin
@ -510,6 +510,17 @@ detection, and lossless compression.")
;; HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
#t)))
;; Later versions of msgpack were disallowed to some warnings and lack
;; of support for Python versions that we don't support anyways. So,
;; it's okay to to keep using more recents versions of msgpack for
;; Borg. Also see the note about msgpack in the list of inputs.
;; https://github.com/borgbackup/borg/issues/3517#issuecomment-357221978
(add-before 'build 'adjust-msgpack-dependency
(lambda _
(substitute* "setup.py"
(("msgpack-python>=0.4.6,<0.5.0")
"msgpack-python>=0.4.6"))
#t))
;; The tests need to be run after Borg is installed.
(delete 'check)
(add-after 'install 'check

32
gnu/packages/bioconductor.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,7 +22,9 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system r)
#:use-module (gnu packages))
#:use-module (gnu packages)
#:use-module (gnu packages statistics)
#:use-module (gnu packages bioinformatics))
(define-public r-hpar
(package
@ -40,3 +43,30 @@
(description "This package provides a simple interface to and data from
the Human Protein Atlas project.")
(license license:artistic2.0)))
(define-public r-regioner
(package
(name "r-regioner")
(version "1.10.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "regioneR" version))
(sha256
(base32
"1vprp3l929hwzmvgskbhawfgnrymwc9n2rxd16rgagnv1dxnjxfp"))))
(properties `((upstream-name . "regioneR")))
(build-system r-build-system)
(propagated-inputs
`(("r-memoise" ,r-memoise)
("r-genomicranges" ,r-genomicranges)
("r-bsgenome" ,r-bsgenome)
("r-rtracklayer" ,r-rtracklayer)
("r-genomeinfodb" ,r-genomeinfodb)
("r-iranges" ,r-iranges)))
(home-page "https://bioconductor.org/packages/regioneR/")
(synopsis "Association analysis of genomic regions")
(description "This package offers a statistical framework based on
customizable permutation tests to assess the association between genomic
region sets and other genomic features.")
(license license:artistic2.0)))

114
gnu/packages/bioinformatics.scm
View File

@ -2039,10 +2039,57 @@ normalized and standardized files, multiple visualizations can be created to
identify enrichments with functional annotations of the genome.")
(license license:gpl3+)))
(define-public delly
(package
(name "delly")
(version "0.7.7")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tobiasrausch/delly/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0dkwy3pyxmi6dhh1lpsr3698ri5sslw9qz67hfys0bz8dgrqwabj"))
(patches (search-patches "delly-use-system-libraries.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests to run.
#:make-flags '("PARALLEL=1") ; Allow parallel execution at run-time.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda _
(let ((bin (string-append (assoc-ref %outputs "out") "/bin"))
(templates (string-append (assoc-ref %outputs "out")
"/share/delly/templates")))
(mkdir-p bin)
(mkdir-p templates)
(copy-recursively "excludeTemplates" templates)
(install-file "src/cov" bin)
(install-file "src/delly" bin)
(install-file "src/dpe" bin)))))))
(native-inputs
`(("python" ,python-2)))
(inputs
`(("boost" ,boost)
("htslib" ,htslib)
("zlib" ,zlib)
("bzip2" ,bzip2)))
(home-page "https://github.com/tobiasrausch/delly")
(synopsis "Integrated structural variant prediction method")
(description "Delly is an integrated structural variant prediction method
that can discover and genotype deletions, tandem duplications, inversions and
translocations at single-nucleotide resolution in short-read massively parallel
sequencing data. It uses paired-ends and split-reads to sensitively and
accurately delineate genomic rearrangements throughout the genome.")
(license license:gpl3+)))
(define-public diamond
(package
(name "diamond")
(version "0.9.18")
(version "0.9.19")
(source (origin
(method url-fetch)
(uri (string-append
@ -2051,7 +2098,7 @@ identify enrichments with functional annotations of the genome.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1vi2nddmy7knrv8gsprwqp6a40k63n3f2dfvx22ipjhrg9xir96f"))))
"0c4y8l90vdxmglb0w37y0413v11qzcwg8sdmy9k0c0gr3bsq7dzs"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no "check" target
@ -3698,7 +3745,7 @@ sequencing tag position and orientation.")
(define-public mafft
(package
(name "mafft")
(version "7.313")
(version "7.394")
(source (origin
(method url-fetch)
(uri (string-append
@ -3707,7 +3754,7 @@ sequencing tag position and orientation.")
(file-name (string-append name "-" version ".tgz"))
(sha256
(base32
"0r83qmg2if8mi6jyx3xdf8ar2gcxl7r9nmj98jr7lxym97v61a2k"))))
"0bacjkxfg944p5khhyh5rd4y7wkjc9qk4v2jjj442sqlq0f8ar7b"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no automated tests, though there are tests in the read me
@ -3784,7 +3831,7 @@ sequences).")
(define-public mash
(package
(name "mash")
(version "1.1.1")
(version "2.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -3793,7 +3840,7 @@ sequences).")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"08znbvqq5xknfhmpp3wcj574zvi4p7i8zifi67c9qw9a6ikp42fj"))
"00fx14vpmgsijwxd1xql3if934l82v8ckqgjjyyhnr36qb9qrskv"))
(modules '((guix build utils)))
(snippet
'(begin
@ -3813,7 +3860,9 @@ sequences).")
(modify-phases %standard-phases
(add-after 'unpack 'fix-includes
(lambda _
(substitute* '("src/mash/Sketch.cpp" "src/mash/CommandFind.cpp")
(substitute* '("src/mash/Sketch.cpp"
"src/mash/CommandFind.cpp"
"src/mash/CommandScreen.cpp")
(("^#include \"kseq\\.h\"")
"#include \"htslib/kseq.h\""))
#t))
@ -10960,34 +11009,41 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(define-public sambamba
(package
(name "sambamba")
(version "0.6.5")
(version "0.6.7-10-g223fa20")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lomereiter/sambamba/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/lomereiter/sambamba.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"17076gijd65a3f07zns2gvbgahiz5lriwsa6dq353ss3jl85d8vy"))))
"1zb9hrxglxqh13ava9wwri30cvf85hjnbn8ccnr8l60a3k5avczn"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there is no test target
#:make-flags
'("D_COMPILER=ldc2"
;; Override "--compiler" flag only.
"D_FLAGS=--compiler=ldc2 -IBioD -g -d"
"sambamba-ldmd2-64")
`(#:tests? #f ; there is no test target
#:parallel-build? #f ; not supported
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'place-biod
(add-after 'unpack 'fix-ldc-version
(lambda _
(substitute* "gen_ldc_version_info.py"
(("/usr/bin/env.*") (which "python")))
(substitute* "Makefile"
(("\\$\\(shell which ldmd2\\)") (which "ldmd2")))
#t))
(add-after 'unpack 'place-biod-and-undead
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "biod") "BioD")
(copy-recursively (assoc-ref inputs "undead") "undeaD")
#t))
(add-after 'unpack 'unbundle-prerequisites
(lambda _
(substitute* "Makefile"
(("htslib/libhts.a lz4/lib/liblz4.a")
"-L-lhts -L-llz4")
((" htslib-static lz4-static") ""))
#t))
(replace 'install
@ -11000,8 +11056,9 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(native-inputs
`(("ldc" ,ldc)
("rdmd" ,rdmd)
("python" ,python2-minimal)
("biod"
,(let ((commit "1248586b54af4bd4dfb28ebfebfc6bf012e7a587"))
,(let ((commit "c778e4f2d8bacea7499283ce39f5577b232732c6"))
(origin
(method git-fetch)
(uri (git-reference
@ -11012,7 +11069,20 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
"-checkout"))
(sha256
(base32
"1m8hi1n7x0ri4l6s9i0x6jg4z4v94xrfdzp7mbizdipfag0m17g3")))))))
"1z90562hg47i63gx042wb3ak2vqjg5z7hwgn9bp2pdxfg3nxrw37")))))
("undead"
,(let ((commit "92803d25c88657e945511f0976a0c79d8da46e89"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dlang/undeaD.git")
(commit commit)))
(file-name (string-append "undead-"
(string-take commit 9)
"-checkout"))
(sha256
(base32
"0vq6n81vzqvgphjw54lz2isc1j8lcxwjdbrhqz1h5gwrvw9w5138")))))))
(inputs
`(("lz4" ,lz4)
("htslib" ,htslib-for-sambamba)))

24
gnu/packages/build-tools.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -23,6 +24,7 @@
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages python)
@ -68,6 +70,28 @@ from scons. While scons focuses on being 100% correct when building, bam
makes a few sacrifices to acquire fast full and incremental build times.")
(license license:bsd-3)))
(define-public bear
(package
(name "bear")
(version "2.3.11")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/rizsotto/Bear/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1m0w0wqnz983l7fpp5p9pdsqr7n3ybrzp8ywjcvn0rihsrzj65j6"))))
(build-system cmake-build-system)
(home-page "https://github.com/rizsotto/Bear")
(synopsis "Tool for generating a compilation database")
(description "A JSON compilation database is used in the Clang project to
provide information on how a given compilation unit is processed. With this,
it is easy to re-run the compilation with alternate programs. Bear is used to
generate such a compilation database.")
(license license:gpl3+)))
(define-public meson
(package
(name "meson")

29
gnu/packages/check.scm
View File

@ -273,13 +273,13 @@ format.")
(define-public cppcheck
(package
(name "cppcheck")
(version "1.82")
(version "1.83")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/danmar/cppcheck/archive/"
version ".tar.gz"))
(sha256
(base32 "0zywpd9hbsx23aj33pk5mbr0fz1ijhqzxlnqgwjfwgg6g2k48i2j"))
(base32 "15ghxwmyy09cd9mi008k4jn09c441j86qyaa4dz0is7f5dv5cdkx"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system cmake-build-system)
(home-page "http://cppcheck.sourceforge.net")
@ -2025,3 +2025,28 @@ retried.")
(define-public python2-pyhamcrest
(package-with-python2 python-pyhamcrest))
(define-public unittest-cpp
(package
(name "unittest-cpp")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/unittest-cpp/unittest-cpp/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1fgmna2la7z4pwwy2gd10gpgi2q1fk89npjfvkmzvhkxhyc231bl"))))
(arguments
`(#:tests? #f)) ; It's run after build automatically.
(build-system cmake-build-system)
(home-page "https://github.com/unittest-cpp/unittest-cpp")
(synopsis "Lightweight unit testing framework for C++")
(description "UnitTest++ is a lightweight unit testing framework for C++.
It was designed to do test-driven development on a wide variety of platforms.
Simplicity, portability, speed, and small footprint are all very important
aspects of UnitTest++. UnitTest++ is mostly standard C++ and makes minimal use
of advanced library and language features, which means it should be easily
portable to just about any platform.")
(license license:expat)))

6
gnu/packages/ci.scm
View File

@ -184,8 +184,8 @@ their dependencies.")
(license l:gpl3+))))
(define-public cuirass
(let ((commit "326264c8e9445cb94d7fb33aab5ef93dc99ffe57")
(revision "14"))
(let ((commit "f090c0f4786c789070e2eae740914e06ab0ab989")
(revision "15"))
(package
(name "cuirass")
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -197,7 +197,7 @@ their dependencies.")
(file-name (string-append name "-" version))
(sha256
(base32
"0l6433l63r1zyq9hg89q9l6zgydm7bm35xdvb0g22w1d6wvi48ls"))))
"0aj1z9svsjvjlb6gas6032ygwhv7ld4iw7g3as852x9nfd2zck98"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)

2
gnu/packages/cobol.scm
View File

@ -59,7 +59,7 @@
("ncurses" ,ncurses)
("newcob" ,(origin
(method url-fetch)
(uri "http://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z")
(uri "https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z")
(sha256
(base32
"1yb1plmv4firfnbb119r2vh1hay221w1ya34nyz0qwsxppfr56hy"))))))

70
gnu/packages/cran.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; Copyright © 2018 Sahithi Yarlagadda <sahi@swecha.net>
@ -1027,14 +1027,14 @@ or excesses over a high threshold.")
(define-public r-lmtest
(package
(name "r-lmtest")
(version "0.9-35")
(version "0.9-36")
(source
(origin
(method url-fetch)
(uri (cran-uri "lmtest" version))
(sha256
(base32
"107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"))))
"0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"))))
(build-system r-build-system)
(propagated-inputs
`(("r-zoo" ,r-zoo)))
@ -1619,14 +1619,14 @@ created using basic graphics.")
(define-public r-broom
(package
(name "r-broom")
(version "0.4.3")
(version "0.4.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "broom" version))
(sha256
(base32
"119pc2jnxvm13cvd77c7d14p3bn68f4jm310vj3yfck40101n9if"))))
"081x87sy6dmfvkgwfjrl5ax51k77ciyzg9x3xql25vdi92rmwj3m"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
@ -2601,16 +2601,16 @@ published results; and a routine for graphical display.")
(define-public r-network
(package
(name "r-network")
(version "1.13.0")
(version "1.13.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "network" version))
(sha256
(base32
"11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"))))
"1bbkbqkqf1d7irfwh08c13c2pfypir1ssvlqrln83irqns1ikdv0"))))
(build-system r-build-system)
(home-page "http://statnet.org/")
(home-page "https://statnet.org/")
(synopsis "Classes for relational data")
(description
"This package provides tools to create and modify network objects. The
@ -2632,7 +2632,7 @@ supports arbitrary vertex/edge/graph attributes.")
(properties
`((upstream-name . "statnet.common")))
(build-system r-build-system)
(home-page "http://www.statnet.org")
(home-page "https://statnet.org")
(synopsis "R scripts and utilities used by the Statnet software")
(description "This package provides non-statistical utilities used by the
software developed by the Statnet Project.")
@ -2653,7 +2653,7 @@ software developed by the Statnet Project.")
(propagated-inputs
`(("r-network" ,r-network)
("r-statnet-common" ,r-statnet-common)))
(home-page "http://www.statnet.org")
(home-page "https://statnet.org")
(synopsis "Tools for social network analysis")
(description
"This package provides a range of tools for social network analysis,
@ -3654,3 +3654,53 @@ and Eclat.")
time formats, @code{parse_date} parses dates in unspecified formats,
and @code{format_iso_8601} formats a date in ISO 8601 format.")
(license license:gpl2)))
(define-public r-abc-data
(package
(name "r-abc-data")
(version "1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "abc.data" version))
(sha256
(base32
"1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"))))
(properties `((upstream-name . "abc.data")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/abc.data/")
(synopsis "Data for Approximate Bayesian Computation (ABC) package")
(description
"This package contains data which are used by functions of the abc
package which implements several @dfn{Approximate Bayesian Computation} (ABC)
algorithms for performing parameter estimation, model selection, and
goodness-of-fit.")
(license license:gpl3+)))
(define-public r-abc
(package
(name "r-abc")
(version "2.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "abc" version))
(sha256
(base32
"0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"))))
(build-system r-build-system)
(propagated-inputs
`(("r-abc-data" ,r-abc-data)
("r-locfit" ,r-locfit)
("r-mass" ,r-mass)
("r-nnet" ,r-nnet)
("r-quantreg" ,r-quantreg)))
(home-page "https://cran.r-project.org/web/packages/abc/")
(synopsis "Tools for Approximate Bayesian Computation (ABC)")
(description
"This package implements several @dfn{Approximate Bayesian
Computation} (ABC) algorithms for performing parameter estimation, model
selection, and goodness-of-fit. Cross-validation tools are also available for
measuring the accuracy of ABC estimates, and to calculate the
misclassification probabilities of different models.")
(license license:gpl3+)))

52
gnu/packages/crypto.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
@ -34,10 +34,10 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages databases)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
@ -45,6 +45,8 @@
#:use-module (gnu packages password-utils)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages search)
#:use-module (gnu packages serialization)
@ -711,3 +713,49 @@ of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1,
SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.")
(license (license:non-copyleft "file://COPYING"))))
(define-public botan
(package
(name "botan")
(version "2.5.0")
(source (origin
(method url-fetch)
(uri (string-append "https://botan.randombit.net/releases/"
"Botan-" version ".tgz"))
(sha256
(base32
"06zvwknhwfrkdvq2sybqbqhnd2d4nq2cszlnsddql13z7vh1z8xq"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref %outputs "out"))
(lib (string-append out "/lib")))
(invoke "python" "./configure.py"
(string-append "--prefix=" out)
;; Otherwise, the `botan` executable cannot find
;; libbotan.
(string-append "--ldflags=-Wl,-rpath=" lib)
"--with-rst2man"
;; Recommended by upstream
"--with-zlib" "--with-bzip2" "--with-sqlite3"))))
(replace 'check
(lambda _ (invoke "./botan-test"))))))
(native-inputs
`(("python" ,python-minimal-wrapper)
("python-docutils" ,python-docutils)))
(inputs
`(("sqlite" ,sqlite)
("bzip2" ,bzip2)
("zlib" ,zlib)))
(synopsis "Cryptographic library in C++11")
(description "Botan is a cryptography library, written in C++11, offering
the tools necessary to implement a range of practical systems, such as TLS/DTLS,
PKIX certificate handling, PKCS#11 and TPM hardware support, password hashing,
and post-quantum crypto schemes. In addition to the C++, botan has a C89 API
specifically designed to be easy to call from other languages. A Python binding
using ctypes is included, and several other language bindings are available.")
(home-page "https://botan.randombit.net")
(license license:bsd-2)))

23
gnu/packages/databases.scm
View File

@ -12,7 +12,7 @@
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
@ -125,7 +125,8 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50"))
(patches (list (search-patch "4store-fix-buildsystem.patch")))))
(patches (search-patches "4store-unset-preprocessor-directive.patch"
"4store-fix-buildsystem.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)
@ -1650,7 +1651,7 @@ database. Various higher level database abstractions.")
(define-public perl-db-file
(package
(name "perl-db-file")
(version "1.840")
(version "1.841")
(source
(origin
(method url-fetch)
@ -1660,7 +1661,7 @@ database. Various higher level database abstractions.")
".tar.gz"))
(sha256
(base32
"1i5jz85z4hpx15lw6ix27pyvrf0ziyh4z33lii4d3wnhz83lg1mp"))))
"11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn"))))
(build-system perl-build-system)
(inputs `(("bdb" ,bdb)))
(native-inputs `(("perl-test-pod" ,perl-test-pod)))
@ -1682,14 +1683,14 @@ database. Various higher level database abstractions.")
(define-public lmdb
(package
(name "lmdb")
(version "0.9.21")
(version "0.9.22")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/LMDB/lmdb/archive/"
"LMDB_" version ".tar.gz"))
(sha256
(base32
"0ndmj07hkm2ic60z1f4rdscxs7pq45hk9fibjyv5nhfclhsvd1qi"))))
"0a7a8535csrvw71mrgx680m5d17bnxmmhcccij30idifi1cpi4pk"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -2038,10 +2039,16 @@ implementation for Python.")
(base32 "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; Tests require a network connection.
`(#:tests? #f ; Tests require a network connection.
;; TODO: Removing the libsrc/zlib source directory breaks the build.
;; This indicates that the internal zlib code may still be used.
#:configure-flags '("--without-internal-zlib"
"--with-readline")))
(inputs
`(("openssl" ,openssl)
("net-tools" ,net-tools)))
("net-tools" ,net-tools)
("readline" ,readline)
("zlib" ,zlib)))
(home-page "http://vos.openlinksw.com/owiki/wiki/VOS/")
(synopsis "Multi-model database system")
(description "Virtuoso is a scalable cross-platform server that combines

5
gnu/packages/debian.scm
View File

@ -1,4 +1,5 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
@ -111,7 +112,7 @@ contains the archive keys used for that.")
(define-public debootstrap
(package
(name "debootstrap")
(version "1.0.93")
(version "1.0.95")
(source
(origin
(method url-fetch)
@ -119,7 +120,7 @@ contains the archive keys used for that.")
name "_" version ".tar.gz"))
(sha256
(base32
"1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd"))))
"1xpd1yblcgwhri64hzgxhalpf5j8gqbmkrsm1fs0pbwiy0wdz0ry"))))
(build-system gnu-build-system)
(arguments
`(#:phases

17
gnu/packages/dictionaries.scm
View File

@ -211,7 +211,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
(define-public grammalecte
(package
(name "grammalecte")
(version "0.6.2")
(version "0.6.3.1")
(source
(origin
(method url-fetch/zipbomb)
@ -219,8 +219,21 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
"Grammalecte-fr-v" version ".zip"))
(sha256
(base32
"0pvblclvbxbfgmq0cvmpmzpf6bi6r41arndwprl7ab9kci9hi8j2"))))
"0jlzrhpx9qvjdq679w188p86x09yfjf3l0h4scjl9w26yyp53gr8"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-setup
;; Fix typos in "setup.py". In particular, add the new
;; "graphspell" module introduced in 0.6.2. Reported upstream:
;; <https://www.dicollecte.org/thread.php?prj=fr&t=709>
(lambda _
(substitute* "setup.py"
(("packages=\\['grammalecte', 'grammalecte.fr'\\],")
"packages=['grammalecte', 'grammalecte.fr', 'grammalecte.graphspell'],")
(("_dictionaries/French.bdic") "graphspell/_dictionaries/fr.bdic"))
#t)))))
(home-page "https://www.dicollecte.org")
(synopsis "French spelling and grammar checker")
(description "Grammalecte is a grammar checker dedicated to the French

23
gnu/packages/django.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -809,3 +810,25 @@ provides features like a web browseable API and authentication policies.")
"@code{django-crispy-forms} lets you easily build, customize and reuse
forms using your favorite CSS framework, without writing template code.")
(license license:expat)))
(define-public python-django-override-storage
(package
(name "python-django-override-storage")
(version "0.1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-override-storage" version))
(sha256
(base32
"0sqz1mh0yn8b1bzz2gr2azfiynljigm5gkzavp5n17zd3j2jg57x"))))
(build-system python-build-system)
(propagated-inputs
`(("python-django" ,python-django)))
(home-page
"https://github.com/danifus/django-override-storage")
(synopsis "Django test helpers to manage file storage side effects")
(description
"This project provides tools to help reduce the side effects of using
FileFields during tests.")
(license license:expat)))

159
gnu/packages/emacs.scm
View File

@ -21,7 +21,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 George Clemmer <myglc2@gmail.com>
;;; Copyright © 2017 Feng Shu <tumashu@163.com>
@ -29,9 +29,11 @@
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2017, 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -99,6 +101,7 @@
#:use-module (gnu packages fribidi)
#:use-module (gnu packages gd)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages password-utils)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
@ -383,7 +386,7 @@ when typing parentheses directly or commenting out code line by line.")
(define-public git-modes
(package
(name "emacs-git-modes")
(version "1.2.6")
(version "1.2.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -392,7 +395,7 @@ when typing parentheses directly or commenting out code line by line.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"18z04wn5ird9l0h6n6x97v0kyzdj73832bj9qakm3fjjl7vcn0pw"))))
"1mzl70s0xyysnjq1j10mc5vn9i022n5vd82kxsgp4xxqq7gc4qnx"))))
(build-system emacs-build-system)
(home-page "https://github.com/magit/git-modes")
(synopsis "Emacs major modes for Git configuration files")
@ -3911,7 +3914,7 @@ If you want to mark a folder manually as a project just create an empty
(define-public emacs-elfeed
(package
(name "emacs-elfeed")
(version "2.2.0")
(version "2.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/skeeto/elfeed/archive/"
@ -3919,7 +3922,7 @@ If you want to mark a folder manually as a project just create an empty
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0d7i93l3b0ck3iad9ddqp7sqa8w16hnamrby8bwvl316rqk4lzlf"))))
"1fd1mx0q1qb9vgdzls5ppxfriyid48blg8smgjspiazp7kxakzxv"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -4164,7 +4167,7 @@ the file buffer.")
(define-public emacs-helm
(package
(name "emacs-helm")
(version "2.8.5")
(version "2.9.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -4173,7 +4176,7 @@ the file buffer.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"15xlnjm9rsbn0xq7xc09y52h2kn41zwn7ldryammf6i46wl02kq3"))))
"1798gn0za11cxdbi436javfczv4abniccxcl0jppl463r8lzb8is"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)
@ -4193,7 +4196,7 @@ not tied in the trap of backward compatibility.")
(define-public emacs-helm-swoop
(package
(name "emacs-helm-swoop")
(version "1.7.2")
(version "1.7.4")
(source (origin
(method url-fetch)
(uri (string-append
@ -4203,7 +4206,7 @@ not tied in the trap of backward compatibility.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1z34pfi0gsk054pxr906ilaalaw0xz3s536163gf9ykkwmc2356d"))))
"1ssivsjzlnkg049cg993l8fp09l5nhpz6asj7w5c91zp5kpc6fh7"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
@ -4511,14 +4514,14 @@ passive voice.")
(name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update its sha256
;; checksum as well.
(version "20180327")
(version "9.1.9")
(source (origin
(method url-fetch)
(uri (string-append "https://orgmode.org/elpa/org-"
(uri (string-append "http://elpa.gnu.org/packages/org-"
version ".tar"))
(sha256
(base32
"0xmlzlxf15996sd3gj3naiz383d17ngjd9963p4h9kssrkjlwljy"))))
"16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl"))))
(build-system emacs-build-system)
(home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer")
@ -4532,13 +4535,14 @@ reproducible research.")
(package
(inherit emacs-org)
(name "emacs-org-contrib")
(version "20180327")
(source (origin
(method url-fetch)
(uri (string-append "https://orgmode.org/elpa/org-plus-contrib-"
(package-version emacs-org) ".tar"))
version ".tar"))
(sha256
(base32
"1nqn7m1x9w5y356ylv5hia6v62pqfz9g3rzjbiffjxyyc34xvpfm"))))
"1y1nn0bxnh9y4a3zrqng8n639j5da5387q2314sr3a8ggy1nb93s"))))
(arguments
`(#:modules ((guix build emacs-build-system)
(guix build utils)
@ -4559,8 +4563,7 @@ reproducible research.")
string=? contrib-files org+contrib-files)))
(with-directory-excursion
(string-append
out "/share/emacs/site-lisp/guix.d/org-contrib-"
,(package-version emacs-org))
out "/share/emacs/site-lisp/guix.d/org-contrib-" ,version)
(for-each delete-file duplicates))
#t))))))
(propagated-inputs
@ -7425,3 +7428,125 @@ the same values you get in a terminal.")
"Deft is an Emacs mode for quickly browsing, filtering, and editing
directories of plain text notes, inspired by Notational Velocity.")
(license license:bsd-3)))
(define-public emacs-anzu
(package
(name "emacs-anzu")
(version "0.62")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/syohex/emacs-anzu/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"16cg3897x5znbmgk7sdy0qyd0fbic9dmmz0dchq2vz5z29yhg4cz"))))
(build-system emacs-build-system)
(home-page "https://github.com/syohex/emacs-anzu")
(synopsis "Show number of matches in mode-line while searching")
(description
"Anzu provides a minor mode which displays \"current match/total
matches\" in the mode line in various search modes. This is an Emacs port of
Anzu.zim.")
(license license:gpl3+)))
(define-public emacs-emmet-mode
(package
(name "emacs-emmet-mode")
(version "1.0.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/smihica/emmet-mode"
"/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0g3p22yabfcp98cfv9dgl9il2m2pd53isq2q11vb3s7qyn31f7zj"))))
(build-system emacs-build-system)
(home-page "https://github.com/smihica/emmet-mode")
(synopsis "Unofficial Emmet's support for Emacs")
(description
"Unfold CSS-selector-like expressions to markup. It is intended to be
used with SGML-like languages: XML, HTML, XHTML, XSL, etc.")
(license license:gpl3+)))
(define-public emacs-password-store
(package
(name "emacs-password-store")
(version "1.7.1")
(source (origin
(method url-fetch)
(uri
(string-append "https://git.zx2c4.com/password-store/snapshot/"
"password-store-" version ".tar.xz"))
(sha256
(base32
"0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'extract-el-file
(lambda _
(copy-file "contrib/emacs/password-store.el" "password-store.el")
(delete-file-recursively "contrib")
(delete-file-recursively "man")
(delete-file-recursively "src")
(delete-file-recursively "tests"))))))
(propagated-inputs
`(("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s)
("password-store" ,password-store)))
(home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs")
(synopsis "Password store (pass) support for Emacs")
(description
"This package provides functions for working with pass (\"the
standard Unix password manager\").")
(license license:gpl2+)))
(define-public emacs-pass
(package
(name "emacs-pass")
(version "1.7")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/NicolasPetton/pass/archive/"
version ".tar.gz"))
(sha256
(base32
"0zlx9v6z0q3w9qhq9bq6vb7sli4c9x7qccm2wq55j0nw7bwy2yvj"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-password-store" ,emacs-password-store)
("emacs-f" ,emacs-f)))
(home-page "https://github.com/NicolasPetton/pass")
(synopsis "Major mode for @file{password-store.el}")
(description "This is a major mode for managing password-store (pass)
keychains. The keychain entries are displayed in a directory-like structure
and can be consulted and modified.")
(license license:gpl3+)))
(define-public emacs-evil-anzu
(package
(name "emacs-evil-anzu")
(version "0.03")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/syohex/emacs-evil-anzu"
"/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "032hh2946z529cizqsg8pm6cpn5qdj8lfk3qskmx6xv3g2ra56ns"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)
("emacs-anzu" ,emacs-anzu)))
(home-page "https://github.com/syohex/emacs-evil-anzu")
(synopsis "Anzu for evil-mode")
(description "@code{anzu} provides a minor mode that displays the current
match and total match information in the mode-line in various search modes.")
(license license:gpl3+)))

6
gnu/packages/emulators.scm
View File

@ -398,7 +398,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(define-public mgba
(package
(name "mgba")
(version "0.6.1")
(version "0.6.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mgba-emu/mgba/archive/"
@ -406,7 +406,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0xmq1q1j71hnpd49wm91cqq8w5zdhb921cm17jchp4qjmaqgwy3w"))
"0x7a9i1jdic3haf5fkd7x16vwqpf4jqdiw56a5fc4gx4jhn9yhi2"))
(modules '((guix build utils)))
(snippet
;; Make sure we don't use the bundled software.
@ -1061,7 +1061,7 @@ emulation community. It provides highly accurate emulation.")
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0fdribjfc5zz9brzhqcxw6m76kvyg13l67aiigszv4wsjd5j3gpz"))))
(base32 "1wykv0w0kdlh7lh0k1ig0lpk5vh4c7r19jlfa9103jmjlryrq679"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no tests

94
gnu/packages/engineering.scm
View File

@ -568,43 +568,24 @@ image, etc. Besides viewing Gerbers, you may also view Excellon drill files
as well as pick-place files.")
(license license:gpl2+)))
(define-public ao
(let ((commit "fb288c945aa7e30d9be10a564edad7e1b6a6c1ae")
(revision "1"))
(define-public libfive
(let ((commit "9d857d1923abecb0e5935b9287d22661f6efaac5")
(revision "2"))
(package
(name "ao-cad") ;XXX: really "ao", but it collides with libao
(name "libfive")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mkeeter/ao")
(url "https://github.com/libfive/libfive")
(commit commit)))
(sha256
(base32
"0syplfqiq7ng7md44yriq5cz41jp8q9z3pl2iwkkllds6p9ylyal"))
(file-name (git-file-name name version))
(patches (search-patches "ao-cad-aarch64-support.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries: Eigen, glm, and catch. TODO:
;; Unbundle efsw <https://github.com/diegostamigni/efsw>.
'(begin
(delete-file-recursively "vendor")
;; Use #include <catch.hpp>.
(substitute* (find-files "." "\\.[ch]pp$")
(("catch/catch\\.hpp")
"catch.hpp"))
#t))))
"1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(;; Have the RUNPATH of libao.so point to $libdir, where libefsw.so
;; lives.
#:configure-flags (list (string-append "-DCMAKE_SHARED_LINKER_FLAGS="
"-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))
`(#:tests? #f ; no "test" target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-native-compilation
@ -618,64 +599,29 @@ as well as pick-place files.")
(setenv "CPLUS_INCLUDE_PATH"
(string-append eigen "/include/eigen3:"
(getenv "CPLUS_INCLUDE_PATH")))
#t)))
(add-after 'install 'install-guile-bindings
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Install the Guile bindings (the build system only installs
;; libao.so.)
(let* ((out (assoc-ref outputs "out"))
(moddir (string-append out "/share/guile/site/2.0")))
(install-file "bind/libao.so"
(string-append out "/lib"))
;; Go to the source directory.
(with-directory-excursion ,(string-append "../"
name "-" version
"-checkout")
(substitute* "bind/guile/ao/sys/libao.scm"
(("\\(define libao \\(dynamic-link .*$")
(string-append "(define libao (dynamic-link \""
out "/lib/libao\")) ;")))
(copy-recursively "bind/guile/ao" (string-append moddir "/ao"))
(substitute* "bin/ao-guile"
(("\\(add-to-load-path .*")
(string-append "(add-to-load-path \"" moddir "\")")))
(install-file "bin/ao-guile"
(string-append out "/bin"))
;; Allow Ao to dlopen the relevant GL libraries. Otherwise
;; it fails with:
;; Couldn't find current GLX or EGL context.
(let ((mesa (assoc-ref inputs "mesa")))
(wrap-program (string-append out "/bin/ao-guile")
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append mesa "/lib")))))
#t)))))))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
("catch" ,catch-framework)
("libpng" ,libpng)
("glfw" ,glfw)
("libepoxy" ,libepoxy)
("mesa" ,mesa)
("qtbase" ,qtbase)
("eigen" ,eigen)
("glm" ,glm)
("guile" ,guile-2.0)))
(home-page "http://www.mattkeeter.com/projects/ao/")
("guile" ,guile-2.2)))
(home-page "https://libfive.com")
(synopsis "Tool for programmatic computer-aided design")
(description
"Ao is a tool for programmatic computer-aided design (CAD). In Ao,
solid models are defined as Scheme scripts, and there are no opaque function
calls into the geometry kernel: everything is visible to the user. Even
fundamental, primitive shapes are represented as code in the user-level
"Libfive is a tool for programmatic computer-aided design (CAD). In
libfive, solid models are defined as Scheme scripts, and there are no opaque
function calls into the geometry kernel: everything is visible to the user.
Even fundamental, primitive shapes are represented as code in the user-level
language.")
(license (list license:lgpl2.1+ ;library
license:gpl2+))))) ;Guile bindings
license:gpl2+))))) ;Guile bindings and GUI
(define-public ao
(deprecated-package "ao-cad" libfive))
;; We use kicad from a git commit, because support for boost 1.61.0 has been
;; recently added.

4
gnu/packages/fontutils.scm
View File

@ -431,13 +431,13 @@ resolution.")
(define-public libotf
(package
(name "libotf")
(version "0.9.13")
(version "0.9.16")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/m17n/libotf-"
version ".tar.gz"))
(sha256
(base32 "0239zvfan56w7vrppriwy77fzb10ag9llaz15nsraps2a2x6di3v"))))
(base32 "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

4
gnu/packages/freedesktop.scm
View File

@ -766,7 +766,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
(define-public libmbim
(package
(name "libmbim")
(version "1.12.4")
(version "1.16.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -774,7 +774,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
name "-" version ".tar.xz"))
(sha256
(base32
"0flpgzsqpjgybjkx4smbb4rjxf2w1xgd1v9gmz61rvl89qasznbv"))))
"1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"))))
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums

4
gnu/packages/game-development.scm
View File

@ -386,7 +386,7 @@ support.")
(define-public tiled
(package
(name "tiled")
(version "1.1.3")
(version "1.1.4")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
@ -394,7 +394,7 @@ support.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"08bxl6vc7ynnji4r6ij9ayr2jixvfhv4daplw5p96s0gkhdqd90k"))))
"0xb3zwcdk7khdrza6spl02g5n2xbij6nbszv8vi27vagjnmz1wxh"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)

4
gnu/packages/gnome.scm
View File

@ -2578,7 +2578,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsecret
(package
(name "libsecret")
(version "0.18.5")
(version "0.18.6")
(source (origin
(method url-fetch)
(uri (string-append
@ -2587,7 +2587,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
name "-" version ".tar.xz"))
(sha256
(base32
"1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"))))
"0vynag97a9bnnb8ipah45av8xg8jzmhd572rw3zj78s1pa8ciysy"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments

9
gnu/packages/gnunet.scm
View File

@ -186,13 +186,16 @@ authentication and support for SSL3 and TLS.")
(define-public gnurl
(package
(name "gnurl")
(version "7.58.0")
(version "7.59.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.xz"))
(uri (list (string-append "mirror://gnu/gnunet/" name "-" version ".tar.xz")
;; TODO: Remove once gnurl-7.59.0 release has synced to ftp.gnu.org
(string-append "https://ftp.n0.is/pub/releases/gnurl/"
name "-" version ".tar.xz")))
(sha256
(base32
"1yyswsz0csplqi8hlhqaxlafqn5kh5016j8k2gaxziv4cb343znx"))))
"0fdwqxs4crzj1nbq3lz0xbqjiiqpq16vpll09gryyq4c1y6lbyib"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 1.5 MiB of man3 pages

11
gnu/packages/gnupg.scm
View File

@ -38,6 +38,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
#:use-module (gnu packages emacs)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
@ -740,6 +741,16 @@ including tools for signing keys, keyring analysis, and party preparation.
(ftp-directory . "/gcrypt/pinentry")
(upstream-name . "pinentry")))))
(define-public pinentry-emacs
(package
(inherit pinentry-tty)
(name "pinentry-emacs")
(arguments
`(#:configure-flags '("--enable-pinentry-emacs")))
(description
"Pinentry provides a console and an Emacs interface that allows users to
enter a passphrase when required by @code{gpg} or other software.")))
(define-public pinentry-gtk2
(package
(inherit pinentry-tty)

4
gnu/packages/gps.scm
View File

@ -147,7 +147,7 @@ between two other data points.")
(define-public gama
(package
(name "gama")
(version "1.21")
(version "1.22")
(source
(origin
(method url-fetch)
@ -155,7 +155,7 @@ between two other data points.")
version ".tar.gz"))
(sha256
(base32
"0yy8czw5dldbw1qj5v2h2wfh397bfx5wd3lrrgs8m1qdf1njnhcq"))))
"01q3g2zi5d5r2l10hc8jwwz6w61dwkv7nyj9xd67vvq0gajw0a7r"))))
(build-system gnu-build-system)
(arguments '(#:parallel-tests? #f)) ; race condition
(native-inputs

35
gnu/packages/graphviz.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -43,6 +44,7 @@
#:use-module (gnu packages gd)
#:use-module (gnu packages swig)
#:use-module (gnu packages python)
#:use-module (gnu packages tex)
#:use-module ((guix licenses) #:prefix license:))
(define-public graphviz
@ -240,3 +242,36 @@ graphs in Graphviz's DOT language, written in pure Python.")
(define-public python2-pydot
(package-with-python2 python-pydot))
(define-public dot2tex
(package
(name "dot2tex")
(version "2.9.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "dot2tex" version))
(sha256
(base32
"0jhdwp0wv2h0xb7j2s5xiv7i8yaqgfpwwqcyrjvaxkfwsynm8gkx"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2))
(inputs
`(("texlive-latex-preview" ,texlive-latex-preview)
("graphviz" ,graphviz)))
(propagated-inputs
`(("python-pyparsing" ,python2-pyparsing)))
(home-page "https://github.com/kjellmf/dot2tex")
(synopsis "Graphviz to LaTeX converter")
(description
"The purpose of @code{dot2tex} is to give graphs generated by Graphviz a
more LaTeX friendly look and feel. This is accomplished by converting
@code{xdot} output from Graphviz to a series of PSTricks or PGF/TikZ commands.
This approach allows:
@itemize @bullet
@item Typesetting labels with LaTeX, allowing mathematical notation
@item Using native PSTricks and PGF/TikZ commands for drawing arrows
@item Using backend specific styles to customize the output
@end itemize")
(license license:expat)))

5
gnu/packages/gstreamer.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -416,7 +417,7 @@ compression formats through the use of the libav library.")
(define-public python-gst
(package
(name "python-gst")
(version "1.12.4")
(version "1.12.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -424,7 +425,7 @@ compression formats through the use of the libav library.")
"gst-python-" version ".tar.xz"))
(sha256
(base32
"1sm3dy10klf6i3w6a6mz0rnm29l2lxci5hr8346496jwc7v6mki0"))))
"1x8g9mdkf6hzhlkx6nhrrp607p8g4zkhl3crs8vh504zpbbf71ip"))))
(build-system gnu-build-system)
(arguments
;; XXX: Factorize python-sitedir with python-build-system.

9
gnu/packages/guile.scm
View File

@ -1951,8 +1951,8 @@ is not available for Guile 2.0.")
(license license:lgpl3+)))
(define-public guile-git
(let ((revision "5")
(commit "2bb9fbbf93cf93496718efc85ad9394aefa21029"))
(let ((revision "6")
(commit "36f93c174adc396c90ec3a6923487f0444fe5d69"))
(package
(name "guile-git")
(version (string-append "0.0-" revision "." (string-take commit 7)))
@ -1962,14 +1962,15 @@ is not available for Guile 2.0.")
(uri (git-reference (url home-page) (commit commit)))
(sha256
(base32
"0z3v0v89dyp35zx2h2gsq6v29lba3wbzabc5n2g4hx2fcb6q5qqy"))
"0z1dvn0scx59pbgjkpacam7p5n7630z4qm8fazim7ixq9xv3s8wx"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
;; FIXME: On i686, bytestructures miscalculates the offset
;; of the 'old-file' and 'new-file' fields within the
;; '%diff-delta' structure.
;; '%diff-delta' structure. See
;; <https://github.com/TaylanUB/scheme-bytestructures/issues/30>.
,@(if (string=? (%current-system) "x86_64-linux")
'()
'((add-before 'check 'skip-tests

31
gnu/packages/haskell-check.scm
View File

@ -27,6 +27,7 @@
(define-module (gnu packages haskell-check)
#:use-module (gnu packages)
#:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-crypto)
#:use-module (guix build-system haskell)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
@ -793,3 +794,33 @@ Haskell, inspired by the Ruby library RSpec.")
"Nanospec is a lightweight implementation of a subset of Hspec's API with
minimal dependencies.")
(license license:expat)))
(define-public ghc-crypto-cipher-tests
(package
(name "ghc-crypto-cipher-tests")
(version "0.0.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"crypto-cipher-tests-" version "/"
"crypto-cipher-tests-" version ".tar.gz"))
(sha256
(base32
"19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz"))))
(build-system haskell-build-system)
(inputs `(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-mtl" ,ghc-mtl)
("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-byteable" ,ghc-byteable)
("ghc-securemem" ,ghc-securemem)
("ghc-crypto-cipher-types" ,ghc-crypto-cipher-types)))
(home-page "https://github.com/vincenthz/hs-crypto-cipher")
(synopsis "Generic cryptography cipher tests for Haskell")
(description " This Haskell package contains generic tests for
cryptographic ciphers, and is used by the test runners of various Haskell
implementations of cryptographic ciphers.")
(license license:bsd-3)))

130
gnu/packages/haskell-crypto.scm
View File

@ -530,3 +530,133 @@ list validation.")
"This package provides a library to handle system accessors and storage
for X.509 certificates.")
(license license:bsd-3)))
(define-public ghc-crypto-cipher-types
(package
(name "ghc-crypto-cipher-types")
(version "0.0.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"crypto-cipher-types-" version "/"
"crypto-cipher-types-" version ".tar.gz"))
(sha256
(base32
"03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0"))))
(build-system haskell-build-system)
(inputs `(("ghc-byteable" ,ghc-byteable)
("ghc-securemem" ,ghc-securemem)))
(home-page "https://github.com/vincenthz/hs-crypto-cipher")
(synopsis "Generic cryptography cipher types for Haskell")
(description "This Haskell package provides basic typeclasses and types
for symmetric ciphers.")
(license license:bsd-3)))
(define-public ghc-cipher-aes
(package
(name "ghc-cipher-aes")
(version "0.2.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"cipher-aes-" version "/"
"cipher-aes-" version ".tar.gz"))
(sha256
(base32
"05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk"))))
(build-system haskell-build-system)
(inputs `(("ghc-byteable" ,ghc-byteable)
("ghc-securemem" ,ghc-securemem)
("ghc-crypto-cipher-types" ,ghc-crypto-cipher-types)))
(native-inputs `(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-crypto-cipher-tests" ,ghc-crypto-cipher-tests)))
(home-page "https://github.com/vincenthz/hs-cipher-aes")
(synopsis "AES cipher implementation with advanced mode of operations for
Haskell")
(description "This Haskell package provides AES cipher implementation.
The modes of operations available are ECB (Electronic code book), CBC (Cipher
block chaining), CTR (Counter), XTS (XEX with ciphertext stealing),
GCM (Galois Counter Mode).
The AES implementation uses AES-NI when available (on x86 and x86-64
architecture), but fallback gracefully to a software C implementation.
The software implementation uses S-Boxes, which might suffer for cache timing
issues. However do notes that most other known software implementations,
including very popular one (openssl, gnutls) also uses similar
implementation. If it matters for your case, you should make sure you have
AES-NI available, or you'll need to use a different implementation.")
(license license:bsd-3)))
(define-public ghc-crypto-random
(package
(name "ghc-crypto-random")
(version "0.0.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"crypto-random-" version "/"
"crypto-random-" version ".tar.gz"))
(sha256
(base32
"0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp"))))
(build-system haskell-build-system)
(inputs `(("ghc-securemem" ,ghc-securemem)
("ghc-vector" ,ghc-vector)))
(home-page "https://github.com/vincenthz/hs-crypto-random")
(synopsis "Simple cryptographic random related types for Haskell")
(description "Simple cryptographic random related types: a safe
abstraction for CPRNGs.")
(license license:bsd-3)))
(define-public ghc-cprng-aes
(package
(name "ghc-cprng-aes")
(version "0.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"cprng-aes-" version "/"
"cprng-aes-" version ".tar.gz"))
(sha256
(base32
"1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4"))))
(build-system haskell-build-system)
(inputs `(("ghc-byteable" ,ghc-byteable)
("ghc-crypto-random" ,ghc-crypto-random)
("ghc-cipher-aes" ,ghc-cipher-aes)))
(home-page "https://github.com/vincenthz/hs-cprng-aes")
(synopsis "Crypto Pseudo Random Number Generator using AES in counter mode
in Haskell")
(description "Simple crypto pseudo-random-number-generator with really
good randomness property.
Using ent, a randomness property maker on one 1Mb sample:
@itemize
@item Entropy = 7.999837 bits per byte.
@item Optimum compression would reduce the size of this 1048576 byte file by 0
percent.
@item Chi square distribution for 1048576 samples is 237.02.
@item Arithmbetic mean value of data bytes is 127.3422 (127.5 = random).
@item Monte Carlo value for Pi is 3.143589568 (error 0.06 percent).
@end itemize
Compared to urandom with the same sampling:
@itemize
@item Entropy = 7.999831 bits per byte.
@item Optimum compression would reduce the size of this 1048576 byte file by 0
percent.
@item Chi square distribution for 1048576 samples is 246.63.
@item Arithmetic mean value of data bytes is 127.6347 (127.5 = random).
@item Monte Carlo value for Pi is 3.132465868 (error 0.29 percent).
@end itemize")
(license license:bsd-3)))

278
gnu/packages/haskell-web.scm
View File

@ -901,3 +901,281 @@ of a JSON value into a @code{Data.Aeson.Value}.")
(synopsis "Unicode aware uri-encoding")
(description "Unicode aware uri-encoding for Haskell.")
(license license:bsd-3)))
(define-public ghc-path-pieces
(package
(name "ghc-path-pieces")
(version "0.2.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"path-pieces-" version "/"
"path-pieces-" version ".tar.gz"))
(sha256
(base32
"0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8"))))
(build-system haskell-build-system)
(inputs `(("ghc-text" ,ghc-text)))
(native-inputs `(("ghc-hunit" ,ghc-hunit)
("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "https://github.com/yesodweb/path-pieces")
(synopsis "Used in Yesod to automatically marshall data in the request path")
(description "This Haskell package provides two typeclasses for converting
Haskell data types to and from route pieces.")
(license license:bsd-3)))
(define-public ghc-skein
(package
(name "ghc-skein")
(version "1.0.9.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"skein-" version "/"
"skein-" version ".tar.gz"))
(sha256
(base32
"1jdqdk0rz2wnvw735clnj8jh0a9rkrbqjg7vk3w6wczdql6cm0pq"))))
(build-system haskell-build-system)
(inputs `(("ghc-cereal" ,ghc-cereal)
("ghc-tagged" ,ghc-tagged)
("ghc-crpto-api" ,ghc-crypto-api)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)))
(home-page "https://github.com/yesodweb/path-pieces")
(synopsis "Skein family of cryptographic hash functions for Haskell")
(description "@uref{(http://www.skein-hash.info, Skein} is a family of
fast secure cryptographic hash functions designed by Niels Ferguson, Stefan
Lucks, Bruce Schneier, Doug Whiting, Mihir Bellare, Tadayoshi Kohno, Jon
Callas and Jesse Walker.
This Haskell package uses bindings to the optimized C implementation of Skein.")
(license license:bsd-3)))
(define-public ghc-clientsession
(package
(name "ghc-clientsession")
(version "0.9.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"clientsession-" version "/"
"clientsession-" version ".tar.gz"))
(sha256
(base32
"0s6h4ykj16mpf7nlw2iqn2ji0p8g1fn5ni0s7yqaili6vv2as5ar"))))
(build-system haskell-build-system)
(inputs `(("ghc-cereal" ,ghc-cereal)
("ghc-tagged" ,ghc-tagged)
("ghc-crypto-api" ,ghc-crypto-api)
("ghc-skein" ,ghc-skein)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-entropy" ,ghc-entropy)
("ghc-cprng-aes" ,ghc-cprng-aes)
("ghc-cipher-aes" ,ghc-cipher-aes)
("ghc-crypto-random" ,ghc-crypto-random)
("ghc-setenv" ,ghc-setenv)))
(native-inputs `(("ghc-hunit" ,ghc-hunit)
("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "https://github.com/yesodweb/clientsession/tree/master")
(synopsis "Haskell library for securely store session data in a
client-side cookie")
(description "This Haskell package achieves security through AES-CTR
encryption and Skein-MAC-512-256 authentication. Uses Base64 encoding to
avoid any issues with characters.")
(license license:expat)))
(define-public ghc-yesod-core
(package
(name "ghc-yesod-core")
(version "1.4.37")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"yesod-core-" version "/"
"yesod-core-" version ".tar.gz"))
(sha256
(base32
"0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j"))))
(build-system haskell-build-system)
(inputs `(("ghc-wai" ,ghc-wai)
("ghc-extra" ,ghc-extra)
("ghc-text" ,ghc-text)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-mtl" ,ghc-mtl)
("ghc-clientsession" ,ghc-clientsession)
("ghc-random" ,ghc-random)
("ghc-cereal" ,ghc-cereal)
("ghc-old-locale" ,ghc-old-locale)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-monad-control" ,ghc-monad-control)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-cookie" ,ghc-cookie)
("ghc-http-types" ,ghc-http-types)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-parsec" ,ghc-parsec)
("ghc-vector" ,ghc-vector)
("ghc-aeson" ,ghc-aeson)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-wai-logger" ,ghc-wai-logger)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-conduit" ,ghc-conduit)
("ghc-resourcet" ,ghc-resourcet)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-data-default" ,ghc-data-default)
("ghc-safe" ,ghc-safe)
("ghc-warp" ,ghc-warp)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-exceptions" ,ghc-exceptions)
("ghc-deepseq-generics" ,ghc-deepseq-generics)
("ghc-mwc-random" ,ghc-mwc-random)
("ghc-primitive" ,ghc-primitive)
("ghc-word8" ,ghc-word8)
("ghc-auto-update" ,ghc-auto-update)
("ghc-semigroups" ,ghc-semigroups)
("ghc-byteable" ,ghc-byteable)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-hunit" ,ghc-hunit)
("ghc-hspec-expectations" ,ghc-hspec-expectations)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-network" ,ghc-network)
("ghc-async" ,ghc-async)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-wai-extra" ,ghc-wai-extra)))
(home-page "https://www.yesodweb.com")
(synopsis "Core package for the Yesod web framework")
(description "This Haskell package provides all core functionality, for
Yesod, on which other packages can be built. It provides dispatch, handler
functions, widgets, etc.")
(license license:expat)))
(define-public ghc-yesod-persistent
(package
(name "ghc-yesod-persistent")
(version "1.4.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"yesod-persistent-" version "/"
"yesod-persistent-" version ".tar.gz"))
(sha256
(base32
"0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH.
(inputs `(("ghc-yesod-core" ,ghc-yesod-core)
("ghc-persistent" ,ghc-persistent)
("ghc-persistent-template" ,ghc-persistent-template)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-conduit" ,ghc-conduit)
("ghc-resourcet" ,ghc-resourcet)
("ghc-resource-pool" ,ghc-resource-pool)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-yesod-core" ,ghc-yesod-core)
("ghc-persistent-sqlite" ,ghc-persistent-sqlite)
("ghc-text" ,ghc-text)))
(home-page "http://www.yesodweb.com/")
(synopsis "Helpers for using Persistent from Yesod")
(description "This Haskell package provides helpers for using Persistent
from Yesod.")
(license license:expat)))
(define-public ghc-yesod-form
(package
(name "ghc-yesod-form")
(version "1.4.16")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/yesod-form/yesod-form-"
version
".tar.gz"))
(sha256
(base32
"0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j"))))
(build-system haskell-build-system)
(inputs
`(("ghc-yesod-core" ,ghc-yesod-core)
("ghc-yesod-persistent" ,ghc-yesod-persistent)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-persistent" ,ghc-persistent)
("ghc-data-default" ,ghc-data-default)
("ghc-xss-sanitize" ,ghc-xss-sanitize)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-email-validate" ,ghc-email-validate)
("ghc-text" ,ghc-text)
("ghc-wai" ,ghc-wai)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-byteable" ,ghc-byteable)
("ghc-aeson" ,ghc-aeson)
("ghc-resourcet" ,ghc-resourcet)
("ghc-semigroups" ,ghc-semigroups)
("ghc-network-uri" ,ghc-network-uri)
("ghc-hspec" ,ghc-hspec)))
(home-page "https://www.yesodweb.com")
(synopsis "Form handling support for Yesod Web Framework")
(description "This Haskell package provies a set of basic form inputs such
as text, number, time, checkbox, select, textarea, etc through the
@code{Yesod.Form.Fields} module. Also, there is @code{Yesod.Form.Nic} module
providing richtext field using Nic editor. ")
(license license:expat)))
(define-public ghc-yesod
(package
(name "ghc-yesod")
(version "1.4.5")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/yesod/yesod-"
version ".tar.gz"))
(sha256
(base32
"1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16"))))
(build-system haskell-build-system)
(inputs
`(("ghc-yesod-core" ,ghc-yesod-core)
("ghc-yesod-persistent" ,ghc-yesod-persistent)
("ghc-yesod-form" ,ghc-yesod-form)
("ghc-monad-control" ,ghc-monad-control)
("ghc-wai" ,ghc-wai)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-warp" ,ghc-warp)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-aeson" ,ghc-aeson)
("ghc-data-default-class" ,ghc-data-default-class)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-yaml" ,ghc-yaml)
("ghc-text" ,ghc-text)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-resourcet" ,ghc-resourcet)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-wai-logger" ,ghc-wai-logger)
("ghc-semigroups" ,ghc-semigroups)))
(home-page "https://www.yesodweb.com")
(synopsis "Framework for creating type-safe, RESTful web applications")
(description "The Haskell package package groups together the various
Yesod related packages into one cohesive whole. This is the version of Yesod,
whereas most of the core code lives in @code{ghc-yesod-core}.")
(license license:expat)))

615
gnu/packages/haskell.scm
View File

@ -6253,7 +6253,7 @@ better for some purposes.")
(define-public ghc-conduit-extra
(package
(name "ghc-conduit-extra")
(version "1.1.13.3")
(version "1.1.14")
(source
(origin
(method url-fetch)
@ -6262,7 +6262,7 @@ better for some purposes.")
version ".tar.gz"))
(sha256
(base32
"0j3cqpkrn7lbpviv6w0gjh93fjjbh1an2sq0yz7svaawja8civy2"))))
"1ij3qcfk7q90fl6gklpy2k5ka9jgzrvs8frq0gy7gdcgyaabqfkg"))))
(build-system haskell-build-system)
(inputs
`(("ghc-conduit" ,ghc-conduit)
@ -7824,7 +7824,7 @@ bytestrings and their hexademical representation.")
(define-public ghc-psqueues
(package
(name "ghc-psqueues")
(version "0.2.2.3")
(version "0.2.6.0")
(source
(origin
(method url-fetch)
@ -7833,7 +7833,7 @@ bytestrings and their hexademical representation.")
"psqueues-" version ".tar.gz"))
(sha256
(base32
"1dd6xv1wjxj1xinx155b14hijw8fafrg4096srzdzj7xyqq7qxbd"))))
"0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hashable" ,ghc-hashable)))
@ -7844,7 +7844,7 @@ bytestrings and their hexademical representation.")
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)))
(home-page "https://github.com/bttr/psqueues")
(home-page "https://github.com/jaspervdj/psqueues")
(synopsis "Pure priority search queues")
(description "The psqueues package provides
@uref{https://en.wikipedia.org/wiki/Priority_queue, Priority Search Queues} in
@ -8001,6 +8001,7 @@ Double.")
(base32
"1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: 1 test fails.
(inputs
`(("ghc-vector" ,ghc-vector)
("ghc-vector-th-unbox" ,ghc-vector-th-unbox)))
@ -8304,7 +8305,8 @@ and regression and autocorrelation analysis.
"0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1"))))
(build-system haskell-build-system)
(inputs `(("ghc-vector" ,ghc-vector)
("ghc-semigroups" ,ghc-semigroups)))
("ghc-semigroups" ,ghc-semigroups)
("ghc-text" ,ghc-text)))
(home-page "https://github.com/snoyberg/mono-traversable")
(synopsis "Typeclasses for dealing with various chunked data
representations for Haskell")
@ -8865,4 +8867,605 @@ Foundation has the following goals:
@end enumerate\n")
(license license:bsd-3)))
(define-public ghc-stm-chans
(package
(name "ghc-stm-chans")
(version "3.0.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"stm-chans-" version "/"
"stm-chans-" version ".tar.gz"))
(sha256
(base32
"0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"))))
(build-system haskell-build-system)
(inputs `(("ghc-stm" ,ghc-stm)))
(home-page "https://hackage.haskell.org/package/stm-chans")
(synopsis "Additional types of channels for ghc-stm")
(description "This Haskell package offers a collection of channel types,
similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional
features.")
(license license:bsd-3)))
(define-public ghc-monad-loops
(package
(name "ghc-monad-loops")
(version "0.4.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"monad-loops-" version "/"
"monad-loops-" version ".tar.gz"))
(sha256
(base32
"062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky"))))
(build-system haskell-build-system)
(native-inputs `(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
(home-page "https://github.com/mokus0/monad-loops")
(synopsis "Monadic loops for Haskell")
(description "This Haskell package provides some useful control
operators for looping.")
(license license:public-domain)))
(define-public ghc-monad-logger
(package
(name "ghc-monad-logger")
(version "0.3.25.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"monad-logger-" version "/"
"monad-logger-" version ".tar.gz"))
(sha256
(base32
"0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920"))))
(build-system haskell-build-system)
(inputs `(("ghc-transformers-compat" ,ghc-transformers-compat)
("ghc-text" ,ghc-text)
("ghc-stm" ,ghc-stm)
("ghc-stm-chans" ,ghc-stm-chans)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-resourcet" ,ghc-resourcet)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-monad-control" ,ghc-monad-control)
("ghc-monad-loops" ,ghc-monad-loops)
("ghc-mtl" ,ghc-mtl)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-exceptions" ,ghc-exceptions)))
(home-page "https://github.com/kazu-yamamoto/logger")
(synopsis "Provides a class of monads which can log messages for Haskell")
(description "This Haskell package uses a monad transformer approach
for logging.
This package provides Template Haskell functions for determining source
code locations of messages.")
(license license:expat)))
(define-public ghc-shakespeare
(package
(name "ghc-shakespeare")
(version "2.0.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"shakespeare-" version "/"
"shakespeare-" version ".tar.gz"))
(sha256
(base32
"0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4"))))
(build-system haskell-build-system)
(inputs `(("ghc-parsec" ,ghc-parsec)
("ghc-text" ,ghc-text)
("ghc-aeson" ,ghc-aeson)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-exceptions" ,ghc-exceptions)
("ghc-vector" ,ghc-vector)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-scientific" ,ghc-scientific)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit)
("hspec-discover" ,hspec-discover)))
(home-page "https://www.yesodweb.com/book/shakespearean-templates")
(synopsis "Family of type-safe template languages for Haskell")
(description "This Haskell package provides a family of type-safe
templates with simple variable interpolation. Shakespeare templates can
be used inline with a quasi-quoter or in an external file and it
interpolates variables according to the type being inserted.")
(license license:expat)))
(define-public ghc-securemem
(package
(name "ghc-securemem")
(version "0.1.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"securemem-" version "/"
"securemem-" version ".tar.gz"))
(sha256
(base32
"0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy"))))
(build-system haskell-build-system)
(inputs `(("ghc-byteable" ,ghc-byteable)
("ghc-memory" ,ghc-memory)))
(home-page "https://github.com/vincenthz/hs-securemem")
(synopsis "Auto-scrubbing and const-time-eq memory chunk abstraction for
Haskell")
(description "SecureMem is similar to ByteString, except that it provides
a memory chunk that will be auto-scrubbed after it run out of scope.")
(license license:bsd-3)))
(define-public ghc-resource-pool
(package
(name "ghc-resource-pool")
(version "0.2.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"resource-pool-" version "/"
"resource-pool-" version ".tar.gz"))
(sha256
(base32
"04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6"))))
(build-system haskell-build-system)
(inputs `(("ghc-hashable" ,ghc-hashable)
("ghc-monad-control" ,ghc-monad-control)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-stm" ,ghc-stm)
("ghc-vector" ,ghc-vector)))
(home-page "https://github.com/bos/pool")
(synopsis "Striped resource pooling implementation in Haskell")
(description "This Haskell package provides striped pooling abstraction
for managing flexibly-sized collections of resources such as database
connections.")
(license license:bsd-3)))
(define-public ghc-attoparsec-iso8601
(package
(name "ghc-attoparsec-iso8601")
(version "1.0.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"attoparsec-iso8601-" version "/"
"attoparsec-iso8601-" version ".tar.gz"))
(sha256
(base32
"12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a"))))
(build-system haskell-build-system)
(inputs `(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base-compat" ,ghc-base-compat)
("ghc-text" ,ghc-text)))
(home-page "https://github.com/bos/aeson")
(synopsis "Parse ISO 8601 dates")
(description "Haskell library for parsing of ISO 8601 dates, originally
from aeson.")
(license license:bsd-3)))
(define-public ghc-th-lift-instances
(package
(name "ghc-th-lift-instances")
(version "0.1.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"th-lift-instances-" version "/"
"th-lift-instances-" version ".tar.gz"))
(sha256
(base32
"1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x"))))
(build-system haskell-build-system)
(inputs `(("ghc-th-lift" ,ghc-th-lift)
("ghc-vector" ,ghc-vector)
("ghc-text" ,ghc-text)))
(native-inputs `(("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "https://github.com/bennofs/th-lift-instances")
(synopsis "Lift instances for template-haskell for common data types")
(description "Most data types in the Haskell platform do not have Lift
instances. This package provides orphan instances for containers, text,
bytestring and vector.")
(license license:bsd-3)))
(define-public ghc-generics-sop
(package
(name "ghc-generics-sop")
(version "0.3.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"generics-sop-" version "/"
"generics-sop-" version ".tar.gz"))
(sha256
(base32
"1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7"))))
(build-system haskell-build-system)
(inputs `(("ghc-transformers-compat" ,ghc-transformers-compat)))
(home-page "https://github.com/well-typed/generics-sop")
(synopsis "Generic Programming using True Sums of Products for Haskell")
(description "This Haskell package supports the definition of generic
functions. Datatypes are viewed in a uniform, structured way: the choice
between constructors is represented using an n-ary sum, and the arguments of
each constructor are represented using an n-ary product.")
(license license:bsd-3)))
(define-public ghc-uri-bytestring
(package
(name "ghc-uri-bytestring")
(version "0.3.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"uri-bytestring-" version "/"
"uri-bytestring-" version ".tar.gz"))
(sha256
(base32
"04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9"))))
(build-system haskell-build-system)
(inputs `(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-fail" ,ghc-fail)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-th-lift-instances" ,ghc-th-lift-instances)))
(native-inputs `(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-base-compat" ,ghc-base-compat)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-semigroups" ,ghc-semigroups)
("ghc-generics-sop" ,ghc-generics-sop)))
(home-page "https://github.com/Soostone/uri-bytestring")
(synopsis "Haskell URI parsing as ByteStrings")
(description "This Haskell package aims to be an RFC3986 compliant URI
parser that uses ByteStrings for parsing and representing the URI data.")
(license license:bsd-3)))
(define-public ghc-time-locale-compat
(package
(name "ghc-time-locale-compat")
(version "0.1.1.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"time-locale-compat-" version "/"
"time-locale-compat-" version ".tar.gz"))
(sha256
(base32
"1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i"))))
(build-system haskell-build-system)
(home-page "https://github.com/khibino/haskell-time-locale-compat")
(synopsis "Compatibility of TimeLocale between old-locale and time-1.5")
(description "This Haskell package contains wrapped name module for
TimeLocale.")
(license license:bsd-3)))
(define-public ghc-http-api-data
(package
(name "ghc-http-api-data")
(version "0.3.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"http-api-data-" version "/"
"http-api-data-" version ".tar.gz"))
(sha256
(base32
"1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9
(inputs `(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601)
("ghc-hashable" ,ghc-hashable)
("ghc-http-types" ,ghc-http-types)
("ghc-text" ,ghc-text)
("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-uri-bytestring" ,ghc-uri-bytestring)
("ghc-uuid-types" ,ghc-uuid-types)))
(home-page "https://github.com/fizruk/http-api-data")
(synopsis "Convert to/from HTTP API data like URL pieces, headers and
query parameters")
(description "This Haskell package defines typeclasses used for converting
Haskell data types to and from HTTP API data.")
(license license:bsd-3)))
(define-public ghc-persistent
(package
(name "ghc-persistent")
(version "2.7.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"persistent-" version "/"
"persistent-" version ".tar.gz"))
(sha256
(base32
"1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"))))
(build-system haskell-build-system)
(inputs `(("ghc-old-locale" ,ghc-old-locale)
("ghc-text" ,ghc-text)
("ghc-conduit" ,ghc-conduit)
("ghc-resourcet" ,ghc-resourcet)
("ghc-exceptions" ,ghc-exceptions)
("ghc-monad-control" ,ghc-monad-control)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-resource-pool" ,ghc-resource-pool)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-http-api-data" ,ghc-http-api-data)
("ghc-aeson" ,ghc-aeson)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-haskell-src-meta" ,ghc-haskell-src-meta)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-silently" ,ghc-silently)
("ghc-mtl" ,ghc-mtl)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-scientific" ,ghc-scientific)
("ghc-tagged" ,ghc-tagged)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)))
(home-page "https://www.yesodweb.com/book/persistent")
(synopsis "Type-safe, multi-backend data serialization for Haskell")
(description "This Haskell package allows Haskell programs to access data
storage sytems like PostgreSQL, SQLite, MySQL and MongoDB in a type-safe
way.")
(license license:expat)))
(define-public ghc-aeson-compat
(package
(name "ghc-aeson-compat")
(version "0.3.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"aeson-compat-" version "/"
"aeson-compat-" version ".tar.gz"))
(sha256
(base32
"1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10
(inputs `(("ghc-base-compat" ,ghc-base-compat)
("ghc-aeson" ,ghc-aeson)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-attoparsec" ,ghc-attoparsec-iso8601)
("ghc-exceptions" ,ghc-exceptions)
("ghc-hashable" ,ghc-hashable)
("ghc-scientific" ,ghc-scientific)
("ghc-text" ,ghc-text)
("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-tagged" ,ghc-tagged)
("ghc-semigroups" ,ghc-semigroups)
("ghc-nats" ,ghc-nats)))
(home-page "https://github.com/phadej/aeson-compat")
(synopsis "Compatibility layer for ghc-aeson")
(description "This Haskell package provides compatibility layer for
ghc-aeson.")
(license license:bsd-3)))
(define-public ghc-persistent-template
(package
(name "ghc-persistent-template")
(version "2.5.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"persistent-template-" version "/"
"persistent-template-" version ".tar.gz"))
(sha256
(base32
"0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd"))))
(build-system haskell-build-system)
(inputs `(("ghc-persistent" ,ghc-persistent)
("ghc-monad-control" ,ghc-monad-control)
("ghc-text" ,ghc-text)
("ghc-aeson" ,ghc-aeson)
("ghc-aeson-compat" ,ghc-aeson-compat)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-tagged" ,ghc-tagged)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-http-api-data" ,ghc-http-api-data)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "https://www.yesodweb.com/book/persistent")
(synopsis "Type-safe, non-relational, multi-backend persistence")
(description "This Haskell package provides interfaces and helper
functions for the ghc-persistent package.")
(license license:expat)))
(define-public ghc-unliftio-core
(package
(name "ghc-unliftio-core")
(version "0.1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"unliftio-core-" version "/"
"unliftio-core-" version ".tar.gz"))
(sha256
(base32
"1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"))))
(build-system haskell-build-system)
(home-page
"https://github.com/fpco/unliftio/tree/master/unliftio-core#readme")
(synopsis "The MonadUnliftIO typeclass for unlifting monads to IO")
(description "This Haskell package provides the core @code{MonadUnliftIO}
typeclass, instances for base and transformers, and basic utility
functions.")
(license license:expat)))
(define-public ghc-microlens
(package
(name "ghc-microlens")
(version "0.4.8.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"microlens-" version "/"
"microlens-" version ".tar.gz"))
(sha256
(base32
"17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k"))))
(build-system haskell-build-system)
(home-page
"https://github.com/aelve/microlens")
(synopsis "Provides a tiny lens Haskell library with no dependencies")
(description "This Haskell package provides a lens library, just like
@code{ghc-lens}, but smaller. It provides essential lenses and
traversals (like @code{_1} and @code{_Just}), as well as ones which are simply
nice to have (like @code{each}, @code{at}, and @code{ix}), and some
combinators (like @code{failing} and @code{singular}), but everything else is
stripped. As the result, this package has no dependencies.")
(license license:bsd-3)))
(define-public ghc-microlens-th
(package
(name "ghc-microlens-th")
(version "0.4.1.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"microlens-th-" version "/"
"microlens-th-" version ".tar.gz"))
(sha256
(base32
"15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f"))))
(build-system haskell-build-system)
(inputs `(("ghc-microlens" ,ghc-microlens)))
(home-page
"https://github.com/aelve/microlens")
(synopsis "Automatic generation of record lenses for
@code{ghc-microlens}")
(description "This Haskell package lets you automatically generate lenses
for data types; code was extracted from the lens package, and therefore
generated lenses are fully compatible with ones generated by lens (and can be
used both from lens and microlens).")
(license license:bsd-3)))
(define-public ghc-unliftio
(package
(name "ghc-unliftio")
(version "0.2.4.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/unliftio/unliftio-"
version
".tar.gz"))
(sha256
(base32
"0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH
(inputs
`(("ghc-async" ,ghc-async)
("ghc-stm" ,ghc-stm)
("ghc-unliftio-core" ,ghc-unliftio-core)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)))
(home-page "https://github.com/fpco/unliftio")
(synopsis "Provides MonadUnliftIO typecplass for unlifting monads to
IO (batteries included)")
(description "This Haskell package provides the core @code{MonadUnliftIO}
typeclass, a number of common instances, and a collection of common functions
working with it.")
(license license:expat)))
(define-public ghc-persistent-sqlite
(package
(name "ghc-persistent-sqlite")
(version "2.6.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"persistent-sqlite-" version "/"
"persistent-sqlite-" version ".tar.gz"))
(sha256
(base32
"16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"))))
(build-system haskell-build-system)
(inputs `(("ghc-persistent" ,ghc-persistent)
("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-aeson" ,ghc-aeson)
("ghc-conduit" ,ghc-conduit)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-microlens-th" ,ghc-microlens-th)
("ghc-resourcet" ,ghc-resourcet)
("ghc-old-locale" ,ghc-old-locale)
("ghc-resource-pool" ,ghc-resource-pool)
("ghc-unordered-containers" ,ghc-unordered-containers)))
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-persistent-template" ,ghc-persistent-template)
("ghc-temporary" ,ghc-temporary)
("ghc-text" ,ghc-text)))
(home-page
"https://www.yesodweb.com/book/persistent")
(synopsis "Backend for the persistent library using sqlite3")
(description "This Haskell package includes a thin sqlite3 wrapper based
on the direct-sqlite package, as well as the entire C library, so there are no
system dependencies.")
(license license:expat)))
(define-public ghc-email-validate
(package
(name "ghc-email-validate")
(version "2.3.2.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/"
"email-validate/email-validate-"
version
".tar.gz"))
(sha256
(base32
"0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-doctest" ,ghc-doctest)))
(home-page
"https://github.com/Porges/email-validate-hs")
(synopsis "Email address validator for Haskell")
(description
"This Haskell package provides a validator that can validate an email
address string against RFC 5322.")
(license license:bsd-3)))
;;; haskell.scm ends here

6
gnu/packages/image.scm
View File

@ -337,13 +337,13 @@ official designation is ISO/IEC 29199-2). This library is an implementation of t
(define-public jpegoptim
(package
(name "jpegoptim")
(version "1.4.4")
(version "1.4.5")
(source (origin
(method url-fetch)
(uri (string-append "http://www.kokkonen.net/tjko/src/jpegoptim-"
version ".tar.gz"))
(sha256 (base32
"1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"))))
"1mngi8c4mhzwa7i4wqrqq6i80cqj4adbacblfvk6dy573wywyxmi"))))
(build-system gnu-build-system)
(inputs `(("libjpeg" ,libjpeg)))
(arguments
@ -355,7 +355,7 @@ official designation is ISO/IEC 29199-2). This library is an implementation of t
the Huffman tables) and \"lossy\" optimization based on setting
maximum quality factor.")
(license license:gpl2+)
(home-page "http://www.kokkonen.net/tjko/projects.html#jpegoptim")))
(home-page "https://www.kokkonen.net/tjko/projects.html#jpegoptim")))
(define-public libicns
(package

329
gnu/packages/java.scm
View File

@ -4193,6 +4193,66 @@ in the @code{java.lang} package. The following classes are included:
@end itemize\n")
(license license:asl2.0)))
(define-public java-commons-bsf
(package
(name "java-commons-bsf")
(version "2.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/bsf/source/bsf-src-"
version ".tar.gz"))
(sha256
(base32
"1sbamr8jl32p1jgf59nw0b2w9qivyg145954hm6ly54cfgsqrdas"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file
(find-files "." "\\.jar$"))
#t))))
(build-system ant-build-system)
(arguments
`(#:build-target "jar"
#:tests? #f; No test file
#:modules ((guix build ant-build-system)
(guix build utils)
(guix build java-utils)
(sxml simple))
#:phases
(modify-phases %standard-phases
(add-before 'build 'create-properties
(lambda _
;; This file is missing from the distribution
(call-with-output-file "build-properties.xml"
(lambda (port)
(sxml->xml
`(project (@ (basedir ".") (name "build-properties") (default ""))
(property (@ (name "project.name") (value "bsf")))
(property (@ (name "source.level") (value "1.5")))
(property (@ (name "build.lib") (value "build/jar")))
(property (@ (name "src.dir") (value "src")))
(property (@ (name "tests.dir") (value "src/org/apache/bsf/test")))
(property (@ (name "build.tests") (value "build/test-classes")))
(property (@ (name "build.dest") (value "build/classes"))))
port)))))
(replace 'install (install-jars "build")))))
(native-inputs
`(("java-junit" ,java-junit)))
(inputs
`(("java-commons-logging-minimal" ,java-commons-logging-minimal)))
(home-page "https://commons.apache.org/proper/commons-bsf")
(synopsis "Bean Scripting Framework")
(description "The Bean Scripting Framework (BSF) is a set of Java classes
which provides scripting language support within Java applications, and access
to Java objects and methods from scripting languages. BSF allows one to write
JSPs in languages other than Java while providing access to the Java class
library. In addition, BSF permits any Java application to be implemented in
part (or dynamically extended) by a language that is embedded within it. This
is achieved by providing an API that permits calling scripting language engines
from within Java, as well as an object registry that exposes Java objects to
these scripting language engines.")
(license license:asl2.0)))
(define-public java-jsr305
(package
(name "java-jsr305")
@ -5395,14 +5455,14 @@ logging framework for Java.")))
(define-public java-commons-cli
(package
(name "java-commons-cli")
(version "1.3.1")
(version "1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/cli/source/"
"commons-cli-" version "-src.tar.gz"))
(sha256
(base32
"1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl"))))
"05hgi2z01fqz374y719gl1dxzqvzci5af071zm7vxrjg9vczipm1"))))
(build-system ant-build-system)
;; TODO: javadoc
(arguments
@ -9139,6 +9199,39 @@ similar in functionality to BSD editline and GNU readline but with additional
features that bring it on par with the Z shell line editor.")
(license license:bsd-3)))
(define-public java-jline-2
(package
(inherit java-jline)
(version "2.14.5")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/jline/jline2/archive/jline-"
version ".tar.gz"))
(sha256
(base32
"1c6qa26mf0viw8hg4jnv72s7i1qb1gh1l8rrzcdvqhqhx82rkdlf"))))
(arguments
`(#:jdk ,icedtea-8
,@(package-arguments java-jline)))
(inputs
`(("java-jansi" ,java-jansi)
("java-jansi-native" ,java-jansi-native)))
(native-inputs
`(("java-powermock-modules-junit4" ,java-powermock-modules-junit4)
("java-powermock-modules-junit4-common" ,java-powermock-modules-junit4-common)
("java-powermock-api-easymock" ,java-powermock-api-easymock)
("java-powermock-api-support" ,java-powermock-api-support)
("java-powermock-core" ,java-powermock-core)
("java-powermock-reflect" ,java-powermock-reflect)
("java-easymock" ,java-easymock)
("java-jboss-javassist" ,java-jboss-javassist)
("java-objenesis" ,java-objenesis)
("java-asm" ,java-asm)
("java-hamcrest-core" ,java-hamcrest-core)
("java-cglib" ,java-cglib)
("java-junit" ,java-junit)
("java-hawtjni" ,java-hawtjni)))))
(define-public java-xmlunit
(package
(name "java-xmlunit")
@ -9241,3 +9334,235 @@ Java programmers to create two-dimensional charts and plots. The library
features an assortment of graph styles, including advanced scatter plots, bar
graphs, and pie charts.")
(license license:lgpl2.1+)))
(define-public java-commons-httpclient
(package
(name "java-commons-httpclient")
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.apache.org/dist/httpcomponents/"
"commons-httpclient/source/commons-httpclient-"
version "-src.tar.gz"))
(sha256
(base32
"1wlpn3cfy3d4inxy6g7wxcsa8p7sshn6aldk9y4ia3lb879rd97r"))))
(build-system ant-build-system)
(arguments
`(#:build-target "compile"
#:test-target "test"
#:tests? #f; requires junit-textui (junit 3)
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-accent
(lambda _
(for-each (lambda (file)
(with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* file
(("\\* @author Ortwin .*") "* @author Ortwin Glueck\n"))))
'("src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java"
"src/examples/TrivialApp.java" "src/examples/ClientApp.java"
"src/test/org/apache/commons/httpclient/TestHttps.java"
"src/test/org/apache/commons/httpclient/TestURIUtil2.java"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "ant" "dist"
(string-append "-Ddist.home=" (assoc-ref outputs "out")
"/share/java"))
#t)))))
(propagated-inputs
`(("java-commons-logging" ,java-commons-logging-minimal)
("java-commons-codec" ,java-commons-codec)))
(home-page "https://hc.apache.org")
(synopsis "HTTP/1.1 compliant HTTP agent implementation")
(description "This package contains an HTTP/1.1 compliant HTTP agent
implementation. It also provides reusable components for client-side
authentication, HTTP state management, and HTTP connection management.")
(license license:asl2.0)))
(define-public java-commons-vfs
(package
(name "java-commons-vfs")
(version "2.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/vfs/source/"
"commons-vfs2-distribution-" version "-src.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1cnq1iaghbp4cslpnvwbp83i5v234x87irssqynhwpfgw7caf1s3"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file
(find-files "." "\\.jar$"))
#t))))
(build-system ant-build-system)
(arguments
`(#:jar-name "commons-vfs.jar"
#:source-dir "commons-vfs2/src/main/java"
#:test-dir "commons-vfs2/src/test"
; FIXME: tests depend on many things: apache sshd, hadoop, ftpserver, ...
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'build 'remove-hadoop-and-webdav
; Remove these files as they are not required and depend on difficult
; packages.
(lambda _
(for-each delete-file-recursively
'("commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/webdav"
"commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs")))))))
(inputs
`(("java-commons-collections4" ,java-commons-collections4)
("java-commons-compress" ,java-commons-compress)
("java-commons-httpclient" ,java-commons-httpclient)
("java-commons-logging-minimal" ,java-commons-logging-minimal)
("java-commons-net" ,java-commons-net)
("java-jsch" ,java-jsch)))
(home-page "http://commons.apache.org/proper/commons-vfs/")
(synopsis "Java filesystem library")
(description "Commons VFS provides a single API for accessing various
different file systems. It presents a uniform view of the files from various
different sources, such as the files on local disk, on an HTTP server, or
inside a Zip archive.")
(license license:asl2.0)))
(define-public java-jakarta-oro
(package
(name "java-jakarta-oro")
(version "2.0.8")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.apache.org/dist/jakarta/oro/"
"jakarta-oro-" version ".tar.gz"))
(sha256
(base32
"0rpmnsskiwmsy8r0sckz5n5dbvh3vkxx8hpm177c754r8xy3qksc"))
(modules '((guix build utils)))
(snippet
`(begin
(delete-file (string-append "jakarta-oro-" ,version ".jar"))
#t))))
(build-system ant-build-system)
(arguments
`(#:build-target "package"
#:tests? #f; tests are run as part of the build process
#:phases
(modify-phases %standard-phases
(replace 'install
(install-jars ,(string-append "jakarta-oro-" version))))))
(home-page "https://jakarta.apache.org/oro/")
(synopsis "Text-processing for Java")
(description "The Jakarta-ORO Java classes are a set of text-processing
Java classes that provide Perl5 compatible regular expressions, AWK-like
regular expressions, glob expressions, and utility classes for performing
substitutions, splits, filtering filenames, etc. This library is the successor
of the OROMatcher, AwkTools, PerlTools, and TextTools libraries originally
from ORO, Inc.")
(license license:asl1.1)))
(define-public java-native-access
(package
(name "java-native-access")
(version "4.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/java-native-access/jna/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0zrpzkib6b905i018a9pqlzkqinphywr6y4jwv6mwp63jjqvqkd9"))
(modules '((guix build utils)))
(snippet
`(begin
(for-each delete-file (find-files "." ".*.jar"))
(delete-file-recursively "native/libffi")
(delete-file-recursively "dist")
#t))))
(build-system ant-build-system)
(arguments
`(#:tests? #f; FIXME: tests require reflections.jar
#:test-target "test"
#:make-flags (list "-Ddynlink.native=true")
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-build.xml
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "build.xml"
;; Since we removed the bundled ant.jar, give the correct path
(("lib/ant.jar") (string-append (assoc-ref inputs "ant") "/lib/ant.jar"))
;; We removed generated native libraries. We can only rebuild one
;; so don't fail if we can't find a native library for another architecture.
(("zipfileset") "zipfileset erroronmissingarchive=\"false\""))
;; Copy test dependencies
(copy-file (string-append (assoc-ref inputs "java-junit")
"/share/java/junit.jar")
"lib/junit.jar")
(copy-file (string-append (assoc-ref inputs "java-hamcrest-core")
"/share/java/hamcrest-core.jar")
"lib/hamcrest-core.jar")
;; FIXME: once reflections.jar is built, copy it to lib/test.
#t))
(add-before 'build 'build-native
(lambda _
(invoke "ant" "-Ddynlink.native=true" "native")
#t))
(replace 'install
(install-jars "build")))))
(inputs
`(("libffi" ,libffi)
("libx11" ,libx11)
("libxt" ,libxt)))
(native-inputs
`(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "https://github.com/java-native-access/jna")
(synopsis "Access to native shared libraries from Java")
(description "JNA provides Java programs easy access to native shared
libraries without writing anything but Java code - no JNI or native code is
required. JNA allows you to call directly into native functions using natural
Java method invocation.")
;; Java Native Access project (JNA) is dual-licensed under 2
;; alternative Free licenses: LGPL 2.1 or later and Apache License 2.0.
(license (list
license:asl2.0
license:lgpl2.1+))))
(define-public java-native-access-platform
(package
(inherit java-native-access)
(name "java-native-access-platform")
(arguments
`(#:test-target "test"
#:tests? #f; require jna-test.jar
#:phases
(modify-phases %standard-phases
(add-before 'build 'chdir
(lambda _
(chdir "contrib/platform")
#t))
(add-after 'chdir 'fix-ant
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "nbproject/project.properties"
(("../../build/jna.jar")
(string-append (assoc-ref inputs "java-native-access")
"/share/java/jna.jar"))
(("../../lib/hamcrest-core-.*.jar")
(string-append (assoc-ref inputs "java-hamcrest-core")
"/share/java/hamcrest-core.jar"))
(("../../lib/junit.jar")
(string-append (assoc-ref inputs "java-junit")
"/share/java/junit.jar")))
#t))
(replace 'install
(install-jars "dist")))))
(inputs
`(("java-native-access" ,java-native-access)))
(synopsis "Cross-platform mappings for jna")
(description "java-native-access-platfrom has cross-platform mappings
and mappings for a number of commonly used platform functions, including a
large number of Win32 mappings as well as a set of utility classes that
simplify native access.")))

4
gnu/packages/javascript.scm
View File

@ -373,7 +373,7 @@ means that these shams cause many ES5 methods to silently fail.")
(define-public mujs
(package
(name "mujs")
(version "1.0.2")
(version "1.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -382,7 +382,7 @@ means that these shams cause many ES5 methods to silently fail.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1angy1higk8bvh69frjhq1m6znhd75fzalaydz5rfzkdfyw52jgy"))))
"15ml3rzjl44lqdb1yxipdh8bhh0rvk2g6w6sjv667q8xywijwqv8"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases

8
gnu/packages/ldc.scm
View File

@ -138,8 +138,8 @@ and freshness without requiring additional information from the user.")
("tzdata" ,tzdata)
("zlib" ,zlib)))
(native-inputs
`(("llvm" ,llvm)
("clang" ,clang)
`(("llvm" ,llvm-3.8)
("clang" ,clang-3.8)
("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper)
("unzip" ,unzip)
@ -246,8 +246,8 @@ bootstrapping more recent compilers written in D.")
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
(native-inputs
`(("llvm" ,llvm)
("clang" ,clang)
`(("llvm" ,llvm-3.8)
("clang" ,clang-3.8)
("ldc" ,ldc-bootstrap)
("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper)

4
gnu/packages/libcanberra.scm
View File

@ -139,7 +139,7 @@ sounds for various system events.")
(source
(origin
(method url-fetch)
(uri (string-append "https://files.crash.cx/releases/"
(uri (string-append "http://ftp.n0.is/pub/releases/"
"pycanberra-" version ".tar.xz"))
(sha256
(base32
@ -152,5 +152,5 @@ sounds for various system events.")
(synopsis "Ctypes wrapper for the libcanberra API")
(description
"Pycanberra is a basic Python wrapper for libcanberra.")
(home-page "https://code.crash.cx/pycanberra/log.html")
(home-page "http://c.n0.is/ng0/pycanberra/")
(license lgpl2.1+)))

5
gnu/packages/license.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -107,7 +108,7 @@ statements and serializes in normalized format.")
(define-public licensecheck
(package
(name "licensecheck")
(version "3.0.33")
(version "3.0.34")
(source (origin
(method url-fetch)
(uri (string-append
@ -115,7 +116,7 @@ statements and serializes in normalized format.")
"v" version ".tar.gz"))
(sha256
(base32
"0wydxb2jks1k3bxkcp7p0pazh5v3awbbcf6haplvwzkkayszhgs4"))))
"0k0acybgibdqg1h6xqnba1jb0spmw7hpq0jbrs7n7gfj22wkz0vd"))))
(build-system perl-build-system)
(native-inputs
`(("perl-regexp-pattern" ,perl-regexp-pattern)

40
gnu/packages/linux.scm
View File

@ -284,6 +284,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
("bc" ,bc)
("openssl" ,openssl)
("kmod" ,kmod)
("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION
("flex" ,flex)
("bison" ,bison)
;; On x86, build with GCC-7 for full retpoline support.
;; FIXME: Remove this when our default compiler has retpoline support.
,@(match (system->linux-architecture
@ -383,8 +386,8 @@ It has been modified to remove all non-free binary blobs.")
;; supports qemu "virt" machine and possibly a large number of ARM boards.
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
(define %linux-libre-version "4.15.13")
(define %linux-libre-hash "1z9f3m44n5w9ayad08h6nvx4nihc28h2jplk4jvyaj0460v8d11f")
(define %linux-libre-version "4.15.16")
(define %linux-libre-hash "1nzdaypvw8abas6xr6ijk2wc9f0b6q72xw6ypalwx33p7sdqwrzq")
(define-public linux-libre
(make-linux-libre %linux-libre-version
@ -392,8 +395,8 @@ It has been modified to remove all non-free binary blobs.")
%linux-compatible-systems
#:configuration-file kernel-config))
(define %linux-libre-4.14-version "4.14.30")
(define %linux-libre-4.14-hash "1j1vnr4397y4js7i24jdpfq85mc50b7kjz7gz1bbbrmda6cflwig")
(define %linux-libre-4.14-version "4.14.33")
(define %linux-libre-4.14-hash "0ps9whsxc20gw5ags18rgkwgy6fzg66by70g8xjds7nijpzgl69m")
(define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version
@ -402,20 +405,20 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config))
(define-public linux-libre-4.9
(make-linux-libre "4.9.90"
"0mzy6wcxp9m9icb8mvsbywp1lrbvbv6n8rs3xszqm43dxy9zj1jd"
(make-linux-libre "4.9.93"
"0flmsh4xy7ymyzwm8y4x4id798mx6vy3d6ala7x1bq41hf00075p"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
(make-linux-libre "4.4.124"
"1368x0wki8zhk0hwz36hrkp2lr2kbm9i0fwzws201h3y85mldgh4"
(make-linux-libre "4.4.127"
"1av536sp6ancx0fy71wpmqv4r66pksrcjbnrcjggard6im4c8pjy"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.1
(make-linux-libre "4.1.50"
"1hl1pk724v2waa55bhxfmxyz9nl6pkcj4dc3l80jfvqdfgr55mm2"
(make-linux-libre "4.1.51"
"0l8lpwjpckp44hjyx5qrxqdwwi97gyyc1n6pmk66cr3fpdhnk540"
%intel-compatible-systems
#:configuration-file kernel-config))
@ -910,14 +913,15 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(define-public strace
(package
(name "strace")
(version "4.21")
(version "4.22")
(home-page "https://strace.io")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/strace/strace/releases/"
"download/v" version "/strace-" version ".tar.xz"))
(uri (string-append home-page "/files/" version
"/strace-" version ".tar.xz"))
(sha256
(base32
"0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"))))
"17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -928,7 +932,6 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(("/bin/sh") (which "sh")))
#t)))))
(native-inputs `(("perl" ,perl)))
(home-page "https://strace.io/")
(synopsis "System call tracer for Linux")
(description
"strace is a system call tracer, i.e. a debugging tool which prints out a
@ -1122,8 +1125,7 @@ configure the Linux 2.4.x and later IPv4 packet filtering ruleset
This package also includes @command{ip6tables}, which is used to configure the
IPv6 packet filter.
Both commands are targeted at system administrators.
")
Both commands are targeted at system administrators.")
(license license:gpl2+)))
(define-public ebtables
@ -1184,7 +1186,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute
(package
(name "iproute2")
(version "4.15.0")
(version "4.16.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -1192,7 +1194,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz"))
(sha256
(base32
"0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"))))
"02pfalg319jpbjz273ph725br8dnkzpfvi98azi9yd6p1w128p0c"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no test suite

103
gnu/packages/llvm.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -40,7 +41,7 @@
(define-public llvm
(package
(name "llvm")
(version "3.8.1")
(version "6.0.0")
(source
(origin
(method url-fetch)
@ -48,7 +49,7 @@
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))
"0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"))))
(build-system cmake-build-system)
(native-inputs
`(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2
@ -131,7 +132,7 @@ compiler. In LLVM this library is called \"compiler-rt\".")
(supported-systems (delete "mips64el-linux" %supported-systems))))
(define* (clang-from-llvm llvm clang-runtime hash
#:key (patches '("clang-libc-search-path.patch")))
#:key (patches '()))
(package
(name "clang")
(version (package-version llvm))
@ -176,23 +177,49 @@ compiler. In LLVM this library is called \"compiler-rt\".")
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
(compiler-rt (assoc-ref inputs "clang-runtime")))
(substitute* "lib/Driver/Tools.cpp"
;; Patch the 'getLinuxDynamicLinker' function to that
;; it uses the right dynamic linker file name.
(("/lib64/ld-linux-x86-64.so.2")
(string-append libc
,(glibc-dynamic-linker)))
(case (string->number ,(version-major
(package-version clang-runtime)))
((6)
;; Link to libclang_rt files from clang-runtime.
(substitute* "lib/Driver/ToolChain.cpp"
(("getDriver\\(\\)\\.ResourceDir")
(string-append "\"" compiler-rt "\"")))
;; Link to libclang_rt files from clang-runtime.
(("TC\\.getDriver\\(\\)\\.ResourceDir")
(string-append "\"" compiler-rt "\"")))
;; Make "LibDir" refer to <glibc>/lib so that it
;; uses the right dynamic linker file name.
(substitute* "lib/Driver/ToolChains/Linux.cpp"
(("(^[[:blank:]]+LibDir = ).*" _ declaration)
(string-append declaration "\"" libc "/lib\";\n"))
;; Same for libc's libdir, to allow crt1.o & co. to be
;; found.
(substitute* "lib/Driver/ToolChains.cpp"
(("@GLIBC_LIBDIR@")
(string-append libc "/lib")))
;; Make sure libc's libdir is on the search path, to
;; allow crt1.o & co. to be found.
(("@GLIBC_LIBDIR@")
(string-append libc "/lib"))))
((3)
(substitute* "lib/Driver/Tools.cpp"
;; Patch the 'getLinuxDynamicLinker' function so that
;; it uses the right dynamic linker file name.
(("/lib64/ld-linux-x86-64.so.2")
(string-append libc
,(glibc-dynamic-linker))))
;; Link to libclang_rt files from clang-runtime.
;; This substitution needed slight adjustment in 3.8.
(if (< 3.8 (string->number ,(version-major+minor
(package-version
clang-runtime))))
(substitute* "lib/Driver/Tools.cpp"
(("TC\\.getDriver\\(\\)\\.ResourceDir")
(string-append "\"" compiler-rt "\"")))
(substitute* "lib/Driver/ToolChain.cpp"
(("getDriver\\(\\)\\.ResourceDir")
(string-append "\"" compiler-rt "\""))))
;; Make sure libc's libdir is on the search path, to
;; allow crt1.o & co. to be found.
(substitute* "lib/Driver/ToolChains.cpp"
(("@GLIBC_LIBDIR@")
(string-append libc "/lib")))))
#t))))))
;; Clang supports the same environment variables as GCC.
@ -216,13 +243,12 @@ code analysis tools.")
(define-public clang-runtime
(clang-runtime-from-llvm
llvm
"0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"
'("clang-runtime-asan-build-fixes.patch")))
"16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"))
(define-public clang
(clang-from-llvm llvm clang-runtime
"1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"
#:patches '("clang-3.8-libc-search-path.patch")))
"0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"
#:patches '("clang-6.0-libc-search-path.patch")))
(define-public llvm-3.9.1
(package (inherit llvm)
@ -247,7 +273,31 @@ code analysis tools.")
(define-public clang-3.9.1
(clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1
"0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"
#:patches '()))
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.8
(package (inherit llvm)
(name "llvm")
(version "3.8.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))))
(define-public clang-runtime-3.8
(clang-runtime-from-llvm
llvm-3.8
"0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"
'("clang-runtime-asan-build-fixes.patch")))
(define-public clang-3.8
(clang-from-llvm llvm-3.8 clang-runtime-3.8
"1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.7
(package (inherit llvm)
@ -269,7 +319,8 @@ code analysis tools.")
(define-public clang-3.7
(clang-from-llvm llvm-3.7 clang-runtime-3.7
"0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"))
"0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.6
(package (inherit llvm)
@ -291,7 +342,8 @@ code analysis tools.")
(define-public clang-3.6
(clang-from-llvm llvm-3.6 clang-runtime-3.6
"1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"))
"1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.5
(package (inherit llvm)
@ -315,7 +367,8 @@ code analysis tools.")
(define-public clang-3.5
(clang-from-llvm llvm-3.5 clang-runtime-3.5
"0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"))
"0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-for-extempore
(package (inherit llvm-3.7)

12
gnu/packages/mail.scm
View File

@ -259,14 +259,14 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt
(package
(name "mutt")
(version "1.9.3")
(version "1.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/mutt/mutt/downloads/"
"mutt-" version ".tar.gz"))
(sha256
(base32
"1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3"))
"1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl"))
(patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system)
(inputs
@ -747,14 +747,14 @@ invoking @command{notifymuch} from the post-new hook.")
(define-public notmuch
(package
(name "notmuch")
(version "0.26")
(version "0.26.1")
(source (origin
(method url-fetch)
(uri (string-append "https://notmuchmail.org/releases/notmuch-"
version ".tar.gz"))
(sha256
(base32
"1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"))))
"0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@ -906,7 +906,7 @@ and search library.")
(define-public getmail
(package
(name "getmail")
(version "5.5")
(version "5.6")
(source
(origin
(method url-fetch)
@ -914,7 +914,7 @@ and search library.")
name "-" version ".tar.gz"))
(sha256
(base32
"0l43lbnrnyyrq8mlnw37saq6v0mh3nkirdq1dwnsrihykzjjwf70"))))
"16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; no tests

4
gnu/packages/mate.scm
View File

@ -154,7 +154,7 @@ from Mint-X-F and Faenza-Fresh icon packs.")
(define-public mate-themes
(package
(name "mate-themes")
(version "3.22.15")
(version "3.22.16")
(source (origin
(method url-fetch)
(uri (string-append "https://pub.mate-desktop.org/releases/themes/"
@ -162,7 +162,7 @@ from Mint-X-F and Faenza-Fresh icon packs.")
version ".tar.xz"))
(sha256
(base32
"0cmlbj6vlkavdirc5xnsgwmy0m11bj9yrbv1dkq46n1s23rvv6wg"))))
"1k8qp2arjv4vj8kyjhjgyj5h46jy0darlfh48l5h25623z1firdj"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)

42
gnu/packages/maths.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -56,6 +56,7 @@
#:use-module (guix build-system r)
#:use-module (guix build-system ruby)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
@ -79,6 +80,7 @@
#:use-module (gnu packages java)
#:use-module (gnu packages less)
#:use-module (gnu packages lisp)
#:use-module (gnu packages linux)
#:use-module (gnu packages logging)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
@ -95,6 +97,7 @@
#:use-module (gnu packages popt)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
@ -1345,7 +1348,11 @@ can solve two kinds of problems:
("zlib" ,zlib)
("curl" ,curl)
("texinfo" ,texinfo)
("graphicsmagick" ,graphicsmagick)))
("graphicsmagick" ,graphicsmagick)
("suitesparse" ,suitesparse)
("libsndfile" ,libsndfile)
("portaudio" ,portaudio)
("alsa-lib" ,alsa-lib)))
(native-inputs
`(("lzip" ,lzip)
("gfortran" ,gfortran)
@ -1385,6 +1392,31 @@ Work may be performed both at the interactive command-line as well as via
script files.")
(license license:gpl3+)))
(define-public qtoctave
(package (inherit octave)
(name "qtoctave")
(inputs
`(("qscintilla" ,qscintilla)
("qt" ,qtbase)
,@(package-inputs octave)))
(native-inputs
`(("qttools" , qttools) ;for lrelease
,@(package-native-inputs octave)))
(arguments
(substitute-keyword-arguments (package-arguments octave)
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'patch-qscintilla-library-name
(lambda* (#:key inputs #:allow-other-keys)
;; The QScintilla library that the Octave configure script tries
;; to link with should be named libqscintilla-qt5.so, but the
;; QScintilla input provides the shared library as
;; libqscintilla2_qt5.so.
(substitute* "configure"
(("qscintilla2-qt5")
"qscintilla2_qt5"))
#t))))))))
(define-public opencascade-oce
(package
(name "opencascade-oce")
@ -3522,7 +3554,11 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.")
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_TESTING=ON")))
'("-DBUILD_TESTING=ON"
;; By default, Vc will optimize for the CPU of the build machine.
;; Setting this to "none" makes it create portable binaries. See
;; "cmake/OptimizeForArchitecture.cmake".
"-DTARGET_ARCHITECTURE=none")))
(synopsis "SIMD vector classes for C++")
(description "Vc provides portable, zero-overhead C++ types for explicitly
data-parallel programming. It is a library designed to ease explicit

15
gnu/packages/messaging.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
@ -914,16 +914,17 @@ connect with friends and family without anyone else listening in.")
(define-public pybitmessage
(package
(name "pybitmessage")
(version "0.6.2")
(version "0.6.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/Bitmessage/"
"PyBitmessage/archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/Bitmessage/PyBitmessage.git")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1in2mhaxkp2sx8pgvifq9dk1z8b2x3imf1anr0z926vwxwjrf85w"))))
"1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"))))
(propagated-inputs
;; TODO:
;; Package "pyopencl", required in addition to numpy for OpenCL support.

17
gnu/packages/mp3.scm
View File

@ -470,21 +470,21 @@ compression format (.mpc files).")
(define-public eyed3
(package
(name "eyed3")
(version "0.8")
(version "0.8.5")
(source (origin
(method url-fetch)
(uri (string-append
"http://eyed3.nicfit.net/releases/eyeD3-"
version ".tar.gz"))
(uri (pypi-uri "eyeD3" version))
(sha256
(base32
"1dcswb0f6w3b05s1v43pq8fmavkd5g88ysndn9160wlaa1v9n40h"))))
"0rkx859z82wqnfb0dzpa1647cq43aqb39ri9rd5r3jz597qr9zdd"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; the required test data contains copyrighted material.
(propagated-inputs
`(("python-six" ,python-six)
("python-grako" ,python-grako)))
`(("python-grako" ,python-grako)
("python-magic" ,python-magic)
("python-pathlib" ,python-pathlib)
("python-six" ,python-six)))
(synopsis "MP3 tag ID3 metadata editor")
(description "eyeD3 is a Python tool for working with audio files,
specifically mp3 files containing ID3 metadata (i.e. song info). It provides a
@ -510,12 +510,13 @@ command-line tool.")
(arguments
`(#:tests? #f ; tests require googletest *sources*
;;#:configure-flags '("-DBUILD_TESTS=ON") ; for building the tests
#:configure-flags '("-DBUILD_TOOLS=ON") ; for fpcalc
#:test-target "check"))
(inputs
;; requires one of FFmpeg (prefered), FFTW3 or vDSP
;; use the same ffmpeg version as for acoustid-fingerprinter
`(("ffmpeg" ,ffmpeg)
("boots" ,boost)))
("boost" ,boost)))
(home-page "https://acoustid.org/chromaprint")
(synopsis "Audio fingerprinting library")
(description "Chromaprint is a library for calculating audio

90
gnu/packages/music.scm
View File

@ -437,19 +437,28 @@ background while you work.")
(define-public hydrogen
(package
(name "hydrogen")
(version "0.9.7")
(version "1.0.0-beta1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/hydrogen-music/hydrogen/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/hydrogen-music/hydrogen.git")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"))))
"0nv83l70j5bjz2wd6n3a8cq3bmgrvdvg6g2hjhc1g5h6xnbqsh9x"))))
(build-system cmake-build-system)
(arguments
`(#:test-target "tests"))
`(#:test-target "tests"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-data-directory
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("/usr/share/pixmaps")
(string-append (assoc-ref outputs "out")
"/share/pixmaps")))
#t)))))
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)))
@ -462,7 +471,8 @@ background while you work.")
("libsndfile" ,libsndfile)
("libtar" ,libtar)
("lrdf" ,lrdf)
("qt" ,qt-4)
("qtbase" ,qtbase)
("qtxmlpatterns" ,qtxmlpatterns)
("zlib" ,zlib)))
(home-page "http://www.hydrogen-music.org")
(synopsis "Drum machine")
@ -1256,7 +1266,7 @@ users to select LV2 plugins and run them with jalv.")
(define-public synthv1
(package
(name "synthv1")
(version "0.8.6")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri
@ -1264,7 +1274,7 @@ users to select LV2 plugins and run them with jalv.")
"/synthv1-" version ".tar.gz"))
(sha256
(base32
"141ah1gnv5r2k846v5ay15q9q90h01p74240a56vlxqh20z43g92"))))
"1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests.
@ -1290,7 +1300,7 @@ oscillators and stereo effects.")
(define-public drumkv1
(package
(name "drumkv1")
(version "0.8.6")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri
@ -1298,7 +1308,7 @@ oscillators and stereo effects.")
"/drumkv1-" version ".tar.gz"))
(sha256
(base32
"0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq"))))
"1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests.
@ -1325,7 +1335,7 @@ effects.")
(define-public samplv1
(package
(name "samplv1")
(version "0.8.6")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri
@ -1333,7 +1343,7 @@ effects.")
"/samplv1-" version ".tar.gz"))
(sha256
(base32
"035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij"))))
"0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests.
@ -1360,7 +1370,7 @@ effects.")
(define-public padthv1
(package
(name "padthv1")
(version "0.8.6")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri
@ -1368,7 +1378,7 @@ effects.")
"/padthv1-" version ".tar.gz"))
(sha256
(base32
"1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq"))))
"0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests.
@ -1760,7 +1770,19 @@ projects.")
#:build-type "Release" ; needed to have PMALSA set
#:configure-flags
(list "-DPORTMIDI_ENABLE_JAVA=Off"
"-DPORTMIDI_ENABLE_TEST=Off"))) ; tests fail linking
"-DPORTMIDI_ENABLE_TEST=Off") ; tests fail linking
#:phases
(modify-phases %standard-phases
;; Some packages, e.g., MuseScore, expect "libporttime.so" instead of
;; "libportmidi.so". Distributions get away with it by creating an
;; appropriate symlink.
(add-after 'install 'add-porttime
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
(with-directory-excursion lib
(symlink "libportmidi.so" "libporttime.so")))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)))
(native-inputs
@ -2156,14 +2178,14 @@ from the command line.")
(define-public qtractor
(package
(name "qtractor")
(version "0.8.6")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri (string-append "http://downloads.sourceforge.net/qtractor/"
"qtractor-" version ".tar.gz"))
(sha256
(base32
"0qf75bccsyplx6fcaz48k6027yp06zhl8ixhhjdbr30xgpslnjm3"))))
"03892177k3jn2bsi366dhq28rcdsc1p9v5qqc0k6hg3cnrkh23na"))))
(build-system gnu-build-system)
(arguments `(#:tests? #f)) ; no "check" target
(inputs
@ -2272,10 +2294,10 @@ analogue-like user interface.")
(license license:gpl2+)))
(define-public mod-host
;; The last release was in 2014 but since then more than 140 commits have
;; The last release was in 2014 but since then hundreds of commits have
;; been made.
(let ((commit "299a3977476e8eb0285837fbd7522cec506a11de")
(revision "2"))
(let ((commit "1726ad06b11323da7e1aaed690ff8aef91f702b5")
(revision "3"))
(package
(name "mod-host")
(version (string-append "0.10.6-" revision "." (string-take commit 9)))
@ -2286,7 +2308,7 @@ analogue-like user interface.")
(commit commit)))
(sha256
(base32
"128q7p5mph086v954rqnafalfbkyvhgwclaq6ks6swrhj45wnag6"))
"1nrd37c35w6z6ldczgrwmmd9hx1n3zyvcjcgb3mi4cygqdanvspv"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -3467,7 +3489,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(define-public musescore
(package
(name "musescore")
(version "2.1.0")
(version "2.2.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -3476,7 +3498,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0irwsq6ihfz3y3b943cwqy29g3si7gqbgxdscgw53vwv9vfvi085"))
"1ml99ayzpdyd18cypcp0lbsbasfg3abw57i5fl7ph5739vikj6i6"))
(modules '((guix build utils)))
(snippet
;; Un-bundle OpenSSL and remove unused libraries.
@ -3494,7 +3516,9 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(build-system gnu-build-system)
(arguments
`(#:make-flags
`(,(string-append "PREFIX=" (assoc-ref %outputs "out")))
`(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"USE_SYSTEM_FREETYPE=ON"
"DOWNLOAD_SOUNDFONT=OFF")
;; There are tests, but no simple target to run. The command
;; used to run them is:
;;
@ -3506,16 +3530,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
#:tests? #f
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'use-system-freetype
(lambda _
;; XXX: For the time being, we grossly insert the CMake
;; option needed to ignore bundled freetype. However,
;; there's a pending PR to have it as a regular make
;; option, in a future release.
(substitute* "Makefile"
(("cmake -DCMAKE") "cmake -DUSE_SYSTEM_FREETYPE=ON -DCMAKE"))
#t)))))
(delete 'configure))))
(inputs
`(("alsa-lib" ,alsa-lib)
("freetype" ,freetype)
@ -3526,6 +3541,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis)
("portaudio" ,portaudio)
("portmidi" ,portmidi)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)

4
gnu/packages/networking.scm
View File

@ -275,7 +275,7 @@ more.")
(define-public czmq
(package
(name "czmq")
(version "4.1.0")
(version "4.1.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -284,7 +284,7 @@ more.")
"/" name "-" version ".tar.gz"))
(sha256
(base32
"04gwf61rijwm6b2wblwv8gky1gdrbfmg1d19hf72kdc691ds7vrv"))))
"1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh"))))
(build-system gnu-build-system)
(arguments
'(;; TODO Tests fail for some reason:

6
gnu/packages/ocaml.scm
View File

@ -3498,13 +3498,13 @@ XML and Protocol Buffers formats.")
(build-system ocaml-build-system)
(native-inputs
`(("oasis" ,ocaml-oasis)
("clang" ,clang)
("clang" ,clang-3.8)
("ounit" ,ocaml-ounit)))
(propagated-inputs
`(("core-kernel" ,ocaml-core-kernel)
("ppx-driver" ,ocaml-ppx-driver)
("uri" ,ocaml-uri)
("llvm" ,llvm)
("llvm" ,llvm-3.8)
("gmp" ,gmp)
("clang-runtime" ,clang-runtime)
("fileutils" ,ocaml-fileutils)
@ -3520,7 +3520,7 @@ XML and Protocol Buffers formats.")
("bitstring" ,ocaml-bitstring)
("ppx-jane" ,ocaml-ppx-jane)
("re" ,ocaml-re)))
(inputs `(("llvm" ,llvm)))
(inputs `(("llvm" ,llvm-3.8)))
(arguments
`(#:use-make? #t
#:phases

4
gnu/packages/openstack.scm
View File

@ -646,14 +646,14 @@ from the OpenStack project.")
(define-public python-oslotest
(package
(name "python-oslotest")
(version "3.3.0")
(version "3.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslotest" version))
(sha256
(base32
"006i73w8kbc9s0av2v5mbni6mnkb91c2nq17wa0lz7bwk5zss992"))))
"1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h"))))
(build-system python-build-system)
(propagated-inputs
`(("python-fixtures" ,python-fixtures)

27
gnu/packages/package-management.scm
View File

@ -283,6 +283,33 @@ the Nix package manager.")
;; Alias for backward compatibility.
(define-public guix-devel guix)
(define-public guix-register
;; This package is for internal consumption: it allows us to quickly build
;; the 'guix-register' program, which is referred to by (guix config).
;; TODO: Remove this hack when 'guix-register' has been superseded by Scheme
;; code.
(package
(inherit guix)
(properties `((hidden? . #t)))
(name "guix-register")
(arguments
(substitute-keyword-arguments (package-arguments guix)
((#:tests? #f #f)
#f)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(replace 'build
(lambda _
(invoke "make" "nix/libstore/schema.sql.hh")
(invoke "make" "-j" (number->string
(parallel-job-count))
"guix-register")))
(delete 'copy-bootstrap-guile)
(replace 'install
(lambda _
(invoke "make" "install-sbinPROGRAMS")))
(delete 'wrap-program)))))))
(define-public guile2.0-guix
(package
(inherit guix)

49
gnu/packages/password-utils.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -67,6 +68,7 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml)
#:use-module (guix build-system python))
(define-public pwgen
@ -641,3 +643,50 @@ is the community-enhanced, \"jumbo\" version of John the Ripper.")
to encrypted files on a directory hierarchy. The information is protected
by GnuPG's symmetrical encryption.")
(license license:expat)))
(define-public fpm2
(package
(name "fpm2")
(version "0.79")
(source (origin
(method url-fetch)
(uri (string-append "https://als.regnet.cz/fpm2/download/fpm2-"
version ".tar.bz2"))
(sha256
(base32
"19sdy1lygfhkg5nxi2w9a4d9kwvw24nxp0ix0p0lz91qpvk9qpnm"))))
(build-system gnu-build-system)
(inputs `(("gtk2" ,gtk+-2)
("gnupg" ,gnupg)
("libxml2" ,libxml2)))
(native-inputs `(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
;; The file po/POTFILES.in ends up missing for some reason in
;; both nix and guix builds. Adding the file with contents
;; found during troubleshooting.
(lambda _
(call-with-output-file "po/POTFILES.in"
(lambda (port)
(format port "data/fpm2.desktop.in
data/fpm2.desktop.in.in
fpm2.glade
src/callbacks.c
src/fpm.c
src/fpm_file.c
src/interface.c
src/support.c
fpm2.glade
")))
#t)))))
(synopsis "Manage, generate and store passwords encrypted")
(description "FPM2 is GTK2 port from Figaro's Password Manager
originally developed by John Conneely, with some new enhancements.
Upstream development seems to have stopped. It is therefore recommended
to use a different password manager.")
(home-page "https://als.regnet.cz/fpm2/")
(license license:gpl2+)))

16
gnu/packages/patches/4store-unset-preprocessor-directive.patch Normal file
View File

@ -0,0 +1,16 @@
This patch removes the _XOPEN_SOURCE preprocessor directive as it does not seem to be needed.
Setting it removes the definition of strdup, which is used in filter-datatypes.c.
Patch by Roel Janssen <roel@gnu.org>
*** a/src/frontend/filter-datatypes.c 1970-01-01 01:00:00.000000000 +0100
--- b/src/frontend/filter-datatypes.c 2018-04-03 17:39:23.177905592 +0200
***************
*** 18,24 ****
* Copyright (C) 2006 Steve Harris for Garlik
*/
- #define _XOPEN_SOURCE
#include <stdlib.h>
#include <string.h>
#include <math.h>
--- 18,23 ----

0
gnu/packages/patches/clang-libc-search-path.patch → gnu/packages/patches/clang-3.5-libc-search-path.patch
View File

67
gnu/packages/patches/clang-6.0-libc-search-path.patch Normal file
View File

@ -0,0 +1,67 @@
Clang attempts to guess file names based on the OS and distro (yes!),
but unfortunately, that doesn't work for us.
This patch makes it easy to insert libc's $libdir so that Clang passes the
correct absolute file name of crt1.o etc. to 'ld'. It also disables all
the distro-specific stuff and removes the hard-coded FHS directory names
to make sure Clang also works on non-GuixSD systems.
--- cfe-6.0.0.src/lib/Driver/ToolChains/Linux.cpp
+++ cfe-6.0.0.src/lib/Driver/ToolChains/Linux.cpp
@@ -207,7 +207,9 @@
PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
GCCInstallation.getTriple().str() + "/bin")
.str());
-
+ // Comment out the distro-specific tweaks so that they don't bite when
+ // using Guix on a foreign distro.
+#if 0
Distro Distro(D.getVFS());
if (Distro.IsAlpineLinux()) {
@@ -255,6 +257,7 @@
if (IsAndroid || Distro.IsOpenSUSE())
ExtraOpts.push_back("--enable-new-dtags");
+#endif
// The selection of paths to try here is designed to match the patterns which
// the GCC driver itself uses, as this is part of the GCC-compatible driver.
@@ -329,14 +332,12 @@
addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
}
- addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
- addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
-
// Try walking via the GCC triple path in case of biarch or multiarch GCC
// installations with strange symlinks.
if (GCCInstallation.isValid()) {
+ // The following code would end up adding things like
+ // "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path.
+#if 0
addPathIfExists(D,
SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
"/../../" + OSLibDir,
@@ -349,6 +350,7 @@
BiarchSibling.gccSuffix(),
Paths);
}
+#endif
// See comments above on the multilib variant for details of why this is
// included even from outside the sysroot.
@@ -373,8 +375,9 @@
if (StringRef(D.Dir).startswith(SysRoot))
addPathIfExists(D, D.Dir + "/../lib", Paths);
- addPathIfExists(D, SysRoot + "/lib", Paths);
- addPathIfExists(D, SysRoot + "/usr/lib", Paths);
+ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o,
+ // and friends can be found.
+ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths);
}
bool Linux::HasNativeLLVMSupport() const { return true; }

56
gnu/packages/patches/delly-use-system-libraries.patch Normal file
View File

@ -0,0 +1,56 @@
--- a/Makefile 2017-04-09 12:48:15.000000000 +0200
+++ b/Makefile 2017-06-21 14:26:02.749282787 +0200
@@ -9,8 +9,8 @@
# Flags
CXX=g++
-CXXFLAGS += -isystem ${SEQTK_ROOT} -isystem ${BOOST_ROOT} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing
-LDFLAGS += -L${SEQTK_ROOT} -L${BOOST_ROOT}/stage/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time
+CXXFLAGS += -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing
+LDFLAGS += -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time
# Additional flags for release/debug
ifeq (${PARALLEL}, 1)
@@ -23,7 +23,7 @@
ifeq (${STATIC}, 1)
LDFLAGS += -static -static-libgcc -pthread -lhts -lz
else
- LDFLAGS += -lhts -lz -Wl,-rpath,${SEQTK_ROOT},-rpath,${BOOST_ROOT}/stage/lib
+ LDFLAGS += -lhts -lz
endif
ifeq (${DEBUG}, 1)
CXXFLAGS += -g -O0 -fno-inline -DDEBUG
@@ -41,29 +41,17 @@
DELLYSOURCES = $(wildcard src/*.h) $(wildcard src/*.cpp)
# Targets
-TARGETS = .htslib .bcftools .boost src/delly src/cov src/dpe
+TARGETS = src/delly src/cov src/dpe
all: $(TARGETS)
-.htslib: $(HTSLIBSOURCES)
- cd src/htslib && make && make lib-static && cd ../../ && touch .htslib
-
-.bcftools: $(HTSLIBSOURCES)
- cd src/bcftools && make && cd ../../ && touch .bcftools
-
-.boost: $(BOOSTSOURCES)
- cd src/modular-boost && ./bootstrap.sh --prefix=${PWD}/src/modular-boost --without-icu --with-libraries=iostreams,filesystem,system,program_options,date_time && ./b2 && ./b2 headers && cd ../../ && touch .boost
-
-src/delly: .htslib .bcftools .boost $(DELLYSOURCES)
- $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS)
-
-src/cov: .htslib .bcftools .boost $(DELLYSOURCES)
+src/cov: $(DELLYSOURCES)
$(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS)
-src/dpe: .htslib .bcftools .boost $(DELLYSOURCES)
+src/dpe: $(DELLYSOURCES)
$(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS)
clean:
cd src/htslib && make clean
cd src/modular-boost && ./b2 --clean-all
- rm -f $(TARGETS) $(TARGETS:=.o) .htslib .boost .bcftools
+ rm -f $(TARGETS) $(TARGETS:=.o)

6
gnu/packages/patches/libgnomeui-utf8.patch
View File

@ -8,11 +8,11 @@ make[2]: Entering directory '/tmp/guix-build-libgnomeui-2.24.5.drv-0/libgnomeui-
INFO: Reading ./gnome-marshal.list...
GEN gnome-marshal.h
Traceback (most recent call last):
File "/gnu/store/azh1is0xknn4xphwj33iqcb5ic9qhk8l-glib-2.54.2-bin/bin/glib-mkenums", line 688, in <module>
File "/gnu/store/...-glib-2.54.2-bin/bin/glib-mkenums", line 688, in <module>
process_file(fname)
File "/gnu/store/azh1is0xknn4xphwj33iqcb5ic9qhk8l-glib-2.54.2-bin/bin/glib-mkenums", line 420, in process_file
File "/gnu/store/...-glib-2.54.2-bin/bin/glib-mkenums", line 420, in process_file
line = curfile.readline()
File "/gnu/store/3lkypf5wnsnvkaidhw0pv7k3yjfh1r9g-python-3.6.3/lib/python3.6/codecs.py", line 321, in decode
File "/gnu/store/...-python-3.6.3/lib/python3.6/codecs.py", line 321, in decode
(result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf1 in position 1009: invalid continuation byte
make[2]: *** [Makefile:1109: stamp-gnometypebuiltins.h] Error 1

63
gnu/packages/patches/racket-fix-xform-issue.patch Normal file
View File

@ -0,0 +1,63 @@
050cdb59839896b41431791f8ee0ef2564231b8f
Author: Matthew Flatt <mflatt@racket-lang.org>
AuthorDate: Tue Mar 6 09:05:08 2018 -0700
Commit: Matthew Flatt <mflatt@racket-lang.org>
CommitDate: Tue Mar 6 09:05:08 2018 -0700
Parent: efb9a919fc ffi docs: clarification on `unsafe-socket->port`
Containing: master
Follows: v5.0.1 (21612)
xform: avoid problems with `__signbitf128`
Closes #1962 and uses the suggested patch there, among other changes.
2 files changed, 6 insertions(+), 3 deletions(-)
racket/collects/compiler/private/xform.rkt | 2 +-
racket/src/racket/src/number.c | 7 +++++--
diff --git a/racket/collects/compiler/private/xform.rkt b/racket/collects/compiler/private/xform.rkt
index 28a425c057..89ae848f9c 100644
--- a/collects/compiler/private/xform.rkt
+++ b/collects/compiler/private/xform.rkt
@@ -904,7 +904,7 @@
strlen cos cosl sin sinl exp expl pow powl log logl sqrt sqrtl atan2 atan2l frexp
isnan isinf fpclass signbit _signbit _fpclass __fpclassify __fpclassifyf __fpclassifyl
- _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl
+ _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl __signbitf128
__isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128
__inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl
__builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit
diff --git a/racket/src/racket/src/number.c b/racket/src/racket/src/number.c
index 71f42aaf3c..3bbad3ba83 100644
--- a/src/racket/src/number.c
+++ b/src/racket/src/number.c
@@ -1796,6 +1796,7 @@ double scheme_real_to_double(Scheme_Object *r)
}
XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
+ XFORM_SKIP_PROC
{
#ifdef MZ_IS_NEG_ZERO
return MZ_IS_NEG_ZERO(d);
@@ -1809,7 +1810,9 @@ int scheme_minus_zero_p(double d)
return minus_zero_p(d);
}
-static int rational_dbl_p(double f) {
+XFORM_NONGCING static int rational_dbl_p(double f)
+ XFORM_SKIP_PROC
+{
return !(MZ_IS_NAN(f)
|| MZ_IS_INFINITY(f));
}
@@ -1955,7 +1958,7 @@ real_p(int argc, Scheme_Object *argv[])
return (SCHEME_REALP(o) ? scheme_true : scheme_false);
}
-static int is_rational(const Scheme_Object *o)
+XFORM_NONGCING static int is_rational(const Scheme_Object *o)
{
if (SCHEME_FLOATP(o))
return rational_dbl_p(SCHEME_FLOAT_VAL(o));

351
gnu/packages/perl.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Raoul J.P. Bonnal <ilpuccio.febo@gmail.com>
@ -723,6 +723,31 @@ is captured while being passed through to the original file handles.")
to test the installed perl for compatibility with his modules.")
(license (package-license perl))))
(define-public perl-carp
(package
(name "perl-carp")
(version "1.38")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/R/RJ/RJBS/Carp-"
version ".tar.gz"))
(sha256
(base32
"00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Carp/")
(synopsis "Alternative warn and die for modules")
(description "The @code{Carp} routines are useful in your own modules
because they act like @code{die()} or @code{warn()}, but with a message
which is more likely to be useful to a user of your module. In the case
of @code{cluck}, @code{confess}, and @code{longmess} that context is a
summary of every call in the call-stack. For a shorter message you can use
@code{carp} or @code{croak} which report the error as being from where your
module was called. There is no guarantee that that is where the error was,
but it is a good educated guess.")
(license (package-license perl))))
(define-public perl-carp-always
(package
(name "perl-carp-always")
@ -3976,6 +4001,62 @@ inc directory within a distribution and are used by Makefile.PL or Build.PL.")
"Indirect warns about using the indirect method call syntax.")
(license (package-license perl))))
(define-public perl-inline
(package
(name "perl-inline")
(version "0.80")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/I/IN/INGY/Inline-"
version ".tar.gz"))
(sha256
(base32
"1xnf5hykcr54271x5jsnr61bcv1c7x39cy4kdcrkxm7bn62djavy"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-warn" ,perl-test-warn)))
(home-page "http://search.cpan.org/dist/Inline/")
(synopsis "Write Perl subroutines in other programming languages")
(description "The @code{Inline} module allows you to put source code
from other programming languages directly (inline) in a Perl script or
module. The code is automatically compiled as needed, and then loaded
for immediate access from Perl.")
(license (package-license perl))))
(define-public perl-inline-c
(package
(name "perl-inline-c")
(version "0.78")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/T/TI/TINITA/Inline-C-"
version ".tar.gz"))
(sha256
(base32
"1izv7vswd17glffh8h83bi63gdk208mmhxi17l3qd8q1bkc08y4s"))))
(build-system perl-build-system)
(native-inputs
`(("perl-file-copy-recursive" ,perl-file-copy-recursive)
("perl-file-sharedir-install" ,perl-file-sharedir-install)
("perl-test-warn" ,perl-test-warn)
("perl-yaml-libyaml" ,perl-yaml-libyaml)))
(propagated-inputs
`(("perl-inline" ,perl-inline)
("perl-parse-recdescent" ,perl-parse-recdescent)
("perl-pegex" ,perl-pegex)))
(home-page "http://search.cpan.org/dist/Inline-C/")
(synopsis "C Language Support for Inline")
(description "The @code{Inline::C} module allows you to write Perl
subroutines in C. Since version 0.30 the @code{Inline} module supports
multiple programming languages and each language has its own support module.
This document describes how to use Inline with the C programming language.
It also goes a bit into Perl C internals.")
(license (package-license perl))))
(define-public perl-io-captureoutput
(package
(name "perl-io-captureoutput")
@ -4638,7 +4719,7 @@ portions of this module couldn't be compiled on this machine.")
(define-public perl-mailtools
(package
(name "perl-mailtools")
(version "2.19")
(version "2.20")
(source
(origin
(method url-fetch)
@ -4648,7 +4729,7 @@ portions of this module couldn't be compiled on this machine.")
".tar.gz"))
(sha256
(base32
"06jykkv8mp484vzkmwd6dkicx029rl3ir5ljzrbap3paxw1dfzn1"))))
"15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-timedate" ,perl-timedate)))
@ -4680,6 +4761,64 @@ Build a Mail::Internet object, and then send it out using Mail::Mailer.
@end table")
(license perl-license)))
(define-public perl-math-bezier
(package
(name "perl-math-bezier")
(version "0.01")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/A/AB/ABW/Math-Bezier-"
version ".tar.gz"))
(sha256
(base32
"1f5qwrb7vvf8804myb2pcahyxffqm9zvfal2n6myzw7x8py1ba0i"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Math-Bezier/")
(synopsis "Solution of bezier curves")
(description "This module implements the algorithm for the solution of Bezier
curves as presented by Robert D Miller in Graphics Gems V, \"Quick and Simple
Bezier Curve Drawing\".")
(license perl-license)))
(define-public perl-math-round
(package
(name "perl-math-round")
(version "0.07")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-"
version ".tar.gz"))
(sha256
(base32
"09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Math-Round/")
(synopsis "Perl extension for rounding numbers")
(description "@code{Math::Round} provides functions to round numbers,
both positive and negative, in various ways.")
(license perl-license)))
(define-public perl-memoize
(package
(name "perl-memoize")
(version "1.03")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/M/MJ/MJD/Memoize-"
version".tgz"))
(sha256
(base32
"1wysq3wrmf1s7s3phimzn7n0dswik7x53apykzgb0l2acigwqfaj"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Memoize/")
(synopsis "Make functions faster by trading space for time")
(description "This package transparently speeds up functions by caching
return values, trading space for time.")
(license perl-license)))
(define-public perl-memoize-expirelru
(package
(name "perl-memoize-expirelru")
@ -6224,6 +6363,30 @@ collector daemon in use at Etsy.com.")
subroutine, which you can call with a value to be tested against.")
(license (package-license perl))))
(define-public perl-number-format
(package
(name "perl-number-format")
(version "1.75")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/W/WR/WRW/Number-Format-"
version ".tar.gz"))
(sha256
(base32
"1wspw9fybik76jq9w1n1gmvfixd4wvlrq6ni8kyn85s62v5mkml2"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Number-Format/")
(synopsis "Convert numbers to strings with pretty formatting")
(description "@code{Number::Format} is a library for formatting numbers.
Functions are provided for converting numbers to strings in a variety of ways,
and to convert strings that contain numbers back into numeric form. The
output formats may include thousands separators - characters inserted between
each group of three characters counting right to left from the decimal point.
The characters used for the decimal point and the thousands separator come from
the locale information or can be specified by the user.")
(license perl-license)))
(define-public perl-number-range
(package
(name "perl-number-range")
@ -6575,6 +6738,36 @@ up inheritance from those modules at the same time.")
directory specifications in a cross-platform manner.")
(license (package-license perl))))
(define-public perl-pathtools
(package
(name "perl-pathtools")
(version "3.74")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-"
version ".tar.gz"))
(sha256
(base32 "04bfjdvn5p78hirljcinpxv8djcjn8nyg5gcmnmvz8sr9k2lqwi5"))))
(build-system perl-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-pwd-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Cwd.pm"
(("'/bin/pwd'")
(string-append "'" (assoc-ref inputs "coreutils")
"/bin/pwd'"))))))))
(inputs
`(("coreutils" ,coreutils)))
(home-page "http://search.cpan.org/dist/PathTools/")
(synopsis "Tools for working with directory and file names")
(description "This package provides functions to work with directory and
file names.")
(license perl-license)))
(define-public perl-path-tiny
(package
(name "perl-path-tiny")
@ -6623,6 +6816,33 @@ PerlIO layer. Unlike Perl's default @code{:utf8} layer it checks the input
for correctness.")
(license (package-license perl))))
(define-public perl-pegex
(package
(name "perl-pegex")
(version "0.64")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/I/IN/INGY/Pegex-"
version ".tar.gz"))
(sha256
(base32
"1kb7y2cc3nibbn8i8y3vrzz1f9h3892nbf8jj88c5fdgpmj05q17"))))
(build-system perl-build-system)
(native-inputs
`(("perl-file-sharedir-install" ,perl-file-sharedir-install)
("perl-yaml-libyaml" ,perl-yaml-libyaml)))
(home-page "http://search.cpan.org/dist/Pegex/")
(synopsis "Acmeist PEG Parser Framework")
(description "Pegex is an Acmeist parser framework. It allows you to easily
create parsers that will work equivalently in lots of programming languages.
The inspiration for Pegex comes from the parsing engine upon which the
postmodern programming language Perl 6 is based on. Pegex brings this beauty
to the other justmodern languages that have a normal regular expression engine
available.")
(license (package-license perl))))
(define-public perl-pod-coverage
(package
(name "perl-pod-coverage")
@ -6920,6 +7140,25 @@ collector.")
(description "Set::Infinite is a set theory module for infinite sets.")
(license (package-license perl))))
(define-public perl-set-intspan
(package
(name "perl-set-intspan")
(version "1.19")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-"
version ".tar.gz"))
(sha256
(base32
"1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Set-IntSpan/")
(synopsis "Manage sets of integers")
(description "@code{Set::IntSpan} manages sets of integers. It is
optimized for sets that have long runs of consecutive integers.")
(license perl-license)))
(define-public perl-set-object
(package
(name "perl-set-object")
@ -7058,6 +7297,27 @@ straightforward and (perhaps someday) standard way. Spiffy borrows ideas from
other OO languages like Python, Ruby, Java and Perl 6.")
(license (package-license perl))))
(define-public perl-statistics-basic
(package
(name "perl-statistics-basic")
(version "1.6611")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-"
version ".tar.gz"))
(sha256
(base32
"1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"))))
(build-system perl-build-system)
(inputs
`(("perl-number-format" ,perl-number-format)))
(home-page "http://search.cpan.org/dist/Statistics-Basic/")
(synopsis "Collection of very basic statistics modules")
(description "This package provides basic statistics functions like
@code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}.")
(license lgpl2.0)))
(define-public perl-stream-buffered
(package
(name "perl-stream-buffered")
@ -7884,6 +8144,30 @@ faster than shelling out to a system's diff executable for small files, and
generally slower on larger files.")
(license (package-license perl))))
(define-public perl-text-format
(package
(name "perl-text-format")
(version "0.60")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-"
version ".tar.gz"))
(sha256
(base32
"1f52jak0a2gwi4qcisp4nfbniq04dmmv5j8zkvzj8ik0f0sk2kv6"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)
("perl-test-pod" ,perl-test-pod)
("perl-test-pod-coverage" ,perl-test-pod-coverage)))
(home-page "http://search.cpan.org/dist/Text-Format/")
(synopsis "Various subroutines to format text")
(description "This package provides functions to format text in various
ways like centering, paragraphing, and converting tabs to spaces and spaces
to tabs.")
(license perl-license)))
(define-public perl-text-glob
(package
(name "perl-text-glob")
@ -8040,6 +8324,23 @@ letters, the pronunciation expressed by the text in some other writing
system.")
(license (package-license perl))))
(define-public perl-threads
(package
(name "perl-threads")
(version "2.21")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-"
version ".tar.gz"))
(sha256
(base32 "047i22mdnf7fa0h9w5jhqrjbg561l5jxk8xqzwh6zbmwlac4qf98"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/threads/")
(synopsis "Perl interpreter-based threads")
(description "This module exposes interpreter threads to the Perl level.")
(license perl-license)))
(define-public perl-throwable
(package
(name "perl-throwable")
@ -8195,6 +8496,26 @@ rounded or exact terms.")
duration strings like \"2 minutes\" and \"3 seconds\" to seconds.")
(license (package-license perl))))
(define-public perl-time-hires
(package
(name "perl-time-hires")
(version "1.9758")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-"
version ".tar.gz"))
(sha256
(base32
"07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Time-HiRes/")
(synopsis "High resolution alarm, sleep, gettimeofday, interval timers")
(description "This package implements @code{usleep}, @code{ualarm}, and
@code{gettimeofday} for Perl, as well as wrappers to implement @code{time},
@code{sleep}, and @code{alarm} that know about non-integral seconds.")
(license perl-license)))
(define-public perl-time-local
(package
(name "perl-time-local")
@ -9063,6 +9384,30 @@ File::Find replacement in Perl.")
interface to File::Find::Object.")
(license (package-license perl))))
(define-public perl-font-ttf
(package
(name "perl-font-ttf")
(version "1.06")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-"
version ".tar.gz"))
(sha256
(base32
"14y29ja3lsa3yw0ll20lj96f3zz5zydjqi1c5nh9wxar8927ssab"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-io-string" ,perl-io-string)))
(home-page "http://search.cpan.org/dist/Font-TTF/")
(synopsis "TTF font support for Perl")
(description "This package provides a Perl module for TrueType/OpenType
font hacking. It supports reading, processing and writing of the following
tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, bsln, cmap, cvt, fdsc, feat,
fpgm, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, mort, name, post, prep,
prop, vhea, vmtx and the reading and writing of all other table types.")
(license artistic2.0)))
(define-public perl-libtime-parsedate
(package
(name "perl-libtime-parsedate")

4
gnu/packages/php.scm
View File

@ -62,7 +62,7 @@
(define-public php
(package
(name "php")
(version "7.2.3")
(version "7.2.4")
(home-page "https://secure.php.net/")
(source (origin
(method url-fetch)
@ -70,7 +70,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
"07v5bq5b97zdqwmig6sxqsdb50vdf04w6jzmjq5kqh9gaqdlzadk"))
"123s0lbyz4fxr3kk91r4v658mk899dym36lggxnx9pwd2jyv25kr"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "ext"

5
gnu/packages/plotutils.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -178,14 +179,14 @@ colors, styles, options and details.")
(define-public asymptote
(package
(name "asymptote")
(version "2.41")
(version "2.42")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz"))
(sha256
(base32
"1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"))))
"0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"))))
(build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not

10
gnu/packages/python-crypto.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -281,14 +281,14 @@ is used by the Requests library to verify HTTPS requests.")
(define-public python-cryptography-vectors
(package
(name "python-cryptography-vectors")
(version "2.2.1")
(version "2.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
"1zk2shzpa9kw8fgwpsbdm5cgvbjd05vh2q6r0x9jlzq5vvjg4z5y"))))
"122na0c6r24ch2ifyr4ccjyih0inpqy7bc5za77699g3pa22rd98"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
@ -303,14 +303,14 @@ is used by the Requests library to verify HTTPS requests.")
(define-public python-cryptography
(package
(name "python-cryptography")
(version "2.2.1")
(version "2.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
"1lxj3kqp552c715p0hzixpdhnz4ggd3jb7zz15q8dw534b9xknnx"))))
"0qrgip8vgcpk7v1jwf67mg50np5iprxrv8qrg8p382hkd6zrbhlz"))))
(build-system python-build-system)
(inputs
`(("openssl" ,openssl)))

71
gnu/packages/python.scm
View File

@ -48,7 +48,9 @@
;;; Copyright © 2018 Ethan R. Jones <ethanrjones97@gmail.com
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
@ -1382,9 +1384,9 @@ applications. dogtail scripts are written in Python and executed like any
other Python program.")
(license license:gpl2+)))
(define-public python2-empy
(define-public python-empy
(package
(name "python2-empy")
(name "python-empy")
(version "3.3")
(source (origin
(method url-fetch)
@ -1395,12 +1397,7 @@ other Python program.")
"01g8mmkfnvjdmlhsihwyx56lrg7r5m5d2fg6mnxsvy6g0dnl69f6"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "./test.sh")))))))
`(#:tests? #f)) ;python2 only
(home-page "http://www.alcyone.com/software/empy/")
(synopsis "Templating system for Python")
(description
@ -1417,6 +1414,9 @@ system is highly configurable via command line options and embedded
commands.")
(license license:lgpl2.1+)))
(define-public python2-empy
(package-with-python2 python-empy))
(define-public python2-element-tree
(package
(name "python2-element-tree")
@ -8705,14 +8705,14 @@ to occurrences in strings and comments.")
(define-public python-py3status
(package
(name "python-py3status")
(version "3.1")
(version "3.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "py3status" version))
(sha256
(base32
"0i283z1pivmir61z8kbiycigc94l61v33ygzkhczf1ifq7cppyds"))))
"0shxcfz4wcczj0mhwp4w0dvwd2fdd9bgprq8slim1519iiqzgwhq"))))
(build-system python-build-system)
(inputs
`(("file" ,file)))
@ -8725,8 +8725,8 @@ to occurrences in strings and comments.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((file-path (assoc-ref inputs "file")))
(substitute* "py3status/parse_config.py"
(("check_output\\(\\['file'")
(string-append "check_output(['" file-path "/bin/file'")))
(("\\['file', '-b'")
(string-append "['" file-path "/bin/file', '-b'")))
#t))))
#:tests? #f)) ; TODO: Requires many libraries not in Guix.
(home-page "https://github.com/ultrabug/py3status")
@ -13205,3 +13205,48 @@ working with iterables.")
(define-public python2-more-itertools
(package-with-python2 python-more-itertools))
(define-public python-latexcodec
(package
(name "python-latexcodec")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "latexcodec" version))
(sha256
(base32
"0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn"))))
(build-system python-build-system)
(inputs
`(("python-six" ,python-six)))
(home-page "https://readthedocs.org/projects/latexcodec/")
(synopsis "Work with LaTeX code in Python")
(description "Lexer and codec to work with LaTeX code in Python.")
(license license:expat)))
(define-public python-pybtex
(package
(name "python-pybtex")
(version "0.21")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pybtex" version))
(sha256
(base32
"00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)))
(inputs
`(("python-latexcodec" ,python-latexcodec)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)))
(arguments
`(#:test-target "nosetests"))
(home-page "https://pybtex.org/")
(synopsis "BibTeX-compatible bibliography processor")
(description "Pybtex is a BibTeX-compatible bibliography processor written
in Python. You can simply type pybtex instead of bibtex.")
(license license:expat)))

11
gnu/packages/regex.scm
View File

@ -29,17 +29,15 @@
(define-public re2
(package
(name "re2")
(version "2018-03-01")
(version "2018-04-01")
(home-page "https://github.com/google/re2")
(source (origin
(method url-fetch)
(uri
(string-append
"https://github.com/google/re2/archive/"
version ".tar.gz"))
(uri (string-append home-page "/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0y21g321a802xmxdbkfz0rkcark7ypglpb3jjqhf13m6s7lpxp2i"))))
"04n9ngikvpikpshwcrl26sxgn8qbrymy3b5wlbsyfdhknx35951g"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@ -66,7 +64,6 @@
(delete-file (string-append (assoc-ref outputs "out")
"/lib/libre2.a"))
#t)))))
(home-page "https://github.com/google/re2")
(synopsis "Fast, safe, thread-friendly regular expression engine")
(description "RE2 is a fast, safe, thread-friendly alternative to
backtracking regular expression engines like those used in PCRE, Perl and

8
gnu/packages/ruby.scm
View File

@ -109,7 +109,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.3
(package
(inherit ruby)
(version "2.3.6")
(version "2.3.7")
(source
(origin
(method url-fetch)
@ -118,7 +118,7 @@ a focus on simplicity and productivity.")
"/ruby-" version ".tar.xz"))
(sha256
(base32
"0mlz0mk7yyxia37k8fdv8m8a72h61nfbns28430h796l4an6kng0"))
"1nwfaifq5624p1ml56qq5dy5w38z37x22r0qgrbgbzrzklmqy7y6"))
(modules '((guix build utils)))
(snippet `(begin
;; Remove bundled libffi
@ -127,7 +127,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.2
(package (inherit ruby)
(version "2.2.9")
(version "2.2.10")
(source
(origin
(method url-fetch)
@ -136,7 +136,7 @@ a focus on simplicity and productivity.")
"/ruby-" version ".tar.xz"))
(sha256
(base32
"0p18xykx8dm5mmlx5n5243z67lj4vbvwr70bnc5x12am22ql8fri"))))))
"0l5nk9mc0q4769d2i9d9y1izk0pk0lms2bl8s3lclv36wsvvqxxz"))))))
(define-public ruby-2.1
(package (inherit ruby)

1375
gnu/packages/rust.scm
View File

File diff suppressed because it is too large Load Diff

4
gnu/packages/samba.scm
View File

@ -233,14 +233,14 @@ Desktops into Active Directory environments using the winbind daemon.")
(define-public talloc
(package
(name "talloc")
(version "2.1.12")
(version "2.1.13")
(source (origin
(method url-fetch)
(uri (string-append "https://www.samba.org/ftp/talloc/talloc-"
version ".tar.gz"))
(sha256
(base32
"0jv0ri9vj93fczzgl7rn7xvnfgl2kfx4x85cr8h8v52yh7v0qz4q"))))
"0iv09iv385x69gfzvassq6m3y0rd8ncylls95dm015xdy3drkww4"))))
(build-system gnu-build-system)
(arguments
'(#:phases

8
gnu/packages/scheme.scm
View File

@ -407,7 +407,7 @@ implementation techniques and as an expository tool.")
(define-public racket
(package
(name "racket")
(version "6.11")
(version "6.12")
(source (origin
(method url-fetch)
(uri (list (string-append "http://mirror.racket-lang.org/installers/"
@ -417,7 +417,11 @@ implementation techniques and as an expository tool.")
version "/racket-" version "-src.tgz")))
(sha256
(base32
"1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"))))
"0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"))
(patches (search-patches
;; See: https://github.com/racket/racket/issues/1962
;; This can be removed in whatever Racket release comes after 6.12
"racket-fix-xform-issue.patch"))))
(build-system gnu-build-system)
(arguments
'(#:phases

50
gnu/packages/search.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -26,13 +27,16 @@
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages pdf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
@ -307,4 +311,50 @@ can quickly and easily index directories of files or remote web sites and
search the generated indexes.")
(license gpl2+))) ;with exception
(define-public xapers
(package
(name "xapers")
(version "0.8.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://finestructure.net/xapers/releases/xapers-"
version ".tar.gz"))
(sha256
(base32
"0ykz6hn3qj46w3c99d6q0pi5ncq2894simcl7vapv047zm3cylmd"))))
(build-system python-build-system)
(propagated-inputs
`(("python-urwid" ,python-urwid)))
(inputs
`(("poppler" ,poppler)
("python" ,python)
("python-latexcodec" ,python-latexcodec)
("python-pybtex" ,python-pybtex)
("python-pycurl" ,python-pycurl)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-xapian-bindings" ,python-xapian-bindings)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man1 (string-append out "/share/man/man1")))
(install-file "man/man1/xapers.1" man1)
(install-file "man/man1/xapers-adder.1" man1)
(install-file "bin/xapers-adder" bin)))))))
(home-page "https://finestructure.net/xapers/")
(synopsis "Personal document indexing system")
(description
"Xapers is a personal document indexing system,
geared towards academic journal articles build on the Xapian search engine.
Think of it as your own personal document search engine, or a local cache of
online libraries. It provides fast search of document text and
bibliographic data and simple document and bibtex retrieval.")
(license gpl3+)))
;;; search.scm ends here

7
gnu/packages/ssh.scm
View File

@ -135,14 +135,14 @@ a server that supports the SSH-2 protocol.")
(define-public openssh
(package
(name "openssh")
(version "7.6p1")
(version "7.7p1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
name "-" version ".tar.gz"))
(sha256
(base32
"08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3"))))
"13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"))))
(build-system gnu-build-system)
(native-inputs `(("groff" ,groff)))
(inputs `(("openssl" ,openssl)
@ -152,6 +152,9 @@ a server that supports the SSH-2 protocol.")
("xauth" ,xauth))) ;for 'ssh -X' and 'ssh -Y'
(arguments
`(#:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and
;; fail.
#:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
#:configure-flags `("--sysconfdir=/etc/ssh"
;; Default value of 'PATH' used by sshd.

28
gnu/packages/statistics.scm
View File

@ -361,14 +361,14 @@ k-nearest neighbour, Learning Vector Quantization and Self-Organizing Maps.")
(define-public r-cluster
(package
(name "r-cluster")
(version "2.0.6")
(version "2.0.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "cluster" version))
(sha256
(base32
"1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"))))
"0nf2hnsv5rhw6399b4gk1rj5c8hfc6ajfnkh3qbwfx3cz4asrg45"))))
(build-system r-build-system)
(inputs
`(("gfortran" ,gfortran)))
@ -466,14 +466,14 @@ also flexible enough to handle most nonstandard requirements.")
(define-public r-matrix
(package
(name "r-matrix")
(version "1.2-12")
(version "1.2-13")
(source
(origin
(method url-fetch)
(uri (cran-uri "Matrix" version))
(sha256
(base32
"1wm45hg4x5ay15y03k6rmgkd1n9r01da72mszk24vafwd7pimr8n"))))
"1j4fyn2r3ds51hrxch738gn7d9qvpi4b01n0rxzw5jpv28rnpyvx"))))
(properties `((upstream-name . "Matrix")))
(build-system r-build-system)
(propagated-inputs
@ -3121,14 +3121,14 @@ analysis of large sparse or dense matrices.")
(define-public r-glmnet
(package
(name "r-glmnet")
(version "2.0-13")
(version "2.0-16")
(source
(origin
(method url-fetch)
(uri (cran-uri "glmnet" version))
(sha256
(base32
"1zdqp6wnqxzp5qn2ky47phbkrxv3cpgbwmdp896h3xxjvp58sa7k"))))
"1brr51z1fzbpyj6myyir4g6dhbp6xwl7nx4xnvrjarnf5y0csk55"))))
(build-system r-build-system)
(inputs
`(("gfortran" ,gfortran)))
@ -3544,13 +3544,13 @@ memory usage.")
(define-public r-viridis
(package
(name "r-viridis")
(version "0.5.0")
(version "0.5.1")
(source (origin
(method url-fetch)
(uri (cran-uri "viridis" version))
(sha256
(base32
"1ka6amybgzqkg3cbwfxwwqzzzpfn6q5jcia5am0bw48y5hbpg97y"))))
"060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)
@ -4312,13 +4312,13 @@ data at that region, and avoids over-plotting.")
(define-public r-ggthemes
(package
(name "r-ggthemes")
(version "3.4.0")
(version "3.4.2")
(source (origin
(method url-fetch)
(uri (cran-uri "ggthemes" version))
(sha256
(base32
"1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"))))
"0i7ygpizs00acizixc29bhbrci523ys7vzxbii9b3bcmfa3pj7i3"))))
(build-system r-build-system)
(propagated-inputs
`(("r-assertthat" ,r-assertthat)
@ -5059,14 +5059,14 @@ algorithms.")
(define-public r-lme4
(package
(name "r-lme4")
(version "1.1-15")
(version "1.1-16")
(source
(origin
(method url-fetch)
(uri (cran-uri "lme4" version))
(sha256
(base32
"0sc6rvhiizxxpkdc3wps200wg3pqc0d89crn29lzm75fk8qdd7vx"))))
"0p5x9ki4dq8058mc7k9wdnlh60z1xa3wk2nmf71wl7w59m4szh92"))))
(build-system r-build-system)
(native-inputs
`(("r-rcpp" ,r-rcpp)
@ -5139,14 +5139,14 @@ to Applied regression, Second Edition, Sage, 2011.")
(define-public r-caret
(package
(name "r-caret")
(version "6.0-78")
(version "6.0-79")
(source
(origin
(method url-fetch)
(uri (cran-uri "caret" version))
(sha256
(base32
"0h1nxzii2h80aslp1zsjczrlfmaks44sskabk4yq9c5rafc7ka6y"))))
"1i6sjw279g6mj83vz5gv99x0nljcbpy7v0nbl72lmd80sf7rjshl"))))
(build-system r-build-system)
(propagated-inputs
`(("r-foreach" ,r-foreach)

14
gnu/packages/syncthing.scm
View File

@ -28,7 +28,7 @@
(define-public syncthing
(package
(name "syncthing")
(version "0.14.45")
(version "0.14.46")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing"
@ -36,7 +36,7 @@
"/syncthing-source-v" version ".tar.gz"))
(sha256
(base32
"0nv5g9ymykl4316l2g3mnac77y2rx9ps4j2kg3pymxlq6qms2dij"))
"0h5b2mp0li0qzrz3wggzavdfqfaz9b79hx6wds84ya2i9maw80cl"))
(modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code.
(snippet '(begin
@ -1679,23 +1679,23 @@ using sh's word-splitting rules.")
(license expat))))
(define-public go-github-com-zillode-notify
(let ((commit "a8abcfb1ce88ee8d79a300ed65d94b8fb616ddb3")
(revision "2"))
(let ((commit "53dd6873a851fc377c87d82f994b1fecdf25aadb")
(revision "3"))
(package
(name "go-github-com-zillode-notify")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zillode/notify")
(url "https://github.com/calmh/notify")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"031pmbvm0xj4f4fak7im0ywmyn3hns538zlbdj4f23jj69zqdy7k"))))
"0ar6mj6s91y7hc5gdp88lz3i7xi29cqkx9f090xj899ir21a8djn"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/zillode/notify"))
'(#:import-path "github.com/Zillode/notify"))
(propagated-inputs
`(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
(synopsis "File system event notification library")

4
gnu/packages/syndication.scm
View File

@ -32,7 +32,7 @@
(define-public newsboat
(package
(name "newsboat")
(version "2.11")
(version "2.11.1")
(source
(origin
(method url-fetch)
@ -40,7 +40,7 @@
"/newsboat-" version ".tar.xz"))
(sha256
(base32
"0yh1qdk15s9k4pffiw1155whfckpffq72dpyp9rck7yxgy5ya1hx"))))
"1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)

10
gnu/packages/textutils.scm
View File

@ -293,16 +293,16 @@ input bits thoroughly but are not suitable for cryptography.")
(define-public libconfig
(package
(name "libconfig")
(version "1.5")
(version "1.7.2")
(home-page "https://hyperrealm.github.io/libconfig/")
(source (origin
(method url-fetch)
(uri (string-append "http://www.hyperrealm.com/libconfig/"
"libconfig-" version ".tar.gz"))
(uri (string-append home-page "/dist/libconfig-"
version ".tar.gz"))
(sha256
(base32
"1xh3hzk63v4y8815lc5209m3s6ms2cpgw4h5hg462i4f1lwsl7g3"))))
"1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"))))
(build-system gnu-build-system)
(home-page "http://www.hyperrealm.com/libconfig/")
(synopsis "C/C++ configuration file library")
(description
"Libconfig is a simple library for manipulating structured configuration

23
gnu/packages/tls.scm
View File

@ -449,14 +449,14 @@ required structures.")
(define-public libressl
(package
(name "libressl")
(version "2.7.1")
(version "2.7.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/LibreSSL/"
name "-" version ".tar.gz"))
(sha256
(base32
"0w3hdgcr4cq84cv7wkkg2clz9s6l2m2l92d6mfn70wxs6vi0fxck"))))
"1589f0kg7kj51j9hid542s4isb96s1azjaqsfprpy5s2qdwqfyli"))))
(build-system gnu-build-system)
(arguments
;; Do as if 'getentropy' was missing since older Linux kernels lack it
@ -493,13 +493,13 @@ netcat implementation that supports TLS.")
(package
(name "python-acme")
;; Remember to update the hash of certbot when updating python-acme.
(version "0.22.2")
(version "0.23.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "acme" version))
(sha256
(base32
"1d5d4w88aj1i8fyrs44dapmiqbmgz4bjgryn8k3mnggmd6ihxk8f"))))
"0l257dq1i2gka6ynldidpwaz1aa726643crqqckga1w5awsndh88"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -548,7 +548,7 @@ netcat implementation that supports TLS.")
(uri (pypi-uri name version))
(sha256
(base32
"1vsb8qqghxrwxr3d2l0d5cgdk0pz7b3f76bx3zrrg0z7jf967qz6"))))
"0gh5fr61c3mj5vdkn68k17wcvri9rdj506cmmz6631i2l5flrzvc"))))
(build-system python-build-system)
(arguments
`(,@(substitute-keyword-arguments (package-arguments python-acme)
@ -768,7 +768,7 @@ then ported to the GNU / Linux environment.")
(define-public mbedtls-apache
(package
(name "mbedtls-apache")
(version "2.7.0")
(version "2.7.2")
(source
(origin
(method url-fetch)
@ -778,16 +778,7 @@ then ported to the GNU / Linux environment.")
version "-apache.tgz"))
(sha256
(base32
"1vsmgxnw7dpvma51896n63yaf9sncmf885ax2jfcg89ssin6vdmf"))
;; An RFC 5114 constant was accidentally renamed in version 2.7.0.
;; See https://github.com/ARMmbed/mbedtls/pull/1362.
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "include/mbedtls/dhm.h"
(("#define MBEDTLS_DHM_RFC5114_MODP_P")
"#define MBEDTLS_DHM_RFC5114_MODP_2048_P"))
#t))))
"1mvkqlxxvl6yp1g5g9dk4l7h3wl6149p3pfwgwzgs7xybyxw4f7x"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags

4
gnu/packages/upnp.scm
View File

@ -29,14 +29,14 @@
(define-public miniupnpc
(package
(name "miniupnpc")
(version "2.0.20180222")
(version "2.0.20180406")
(source
(origin
(method url-fetch)
(uri (string-append "https://miniupnp.tuxfamily.org/files/"
name "-" version ".tar.gz"))
(sha256
(base32 "0xavcrifk8v8gwig3mj0kjkm7rvw1kbsxcs4jxrrzl39cil48yaq"))))
(base32 "15i9lyj72wr15b3kpcqsf97mr2hajkpwvf0lz9ps9r568yyjcwlc"))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python-2)))

80
gnu/packages/version-control.scm
View File

@ -139,14 +139,14 @@ as well as the classic centralized workflow.")
(name "git")
;; XXX When updating Git, check if the special 'git:src' input to cgit needs
;; to be updated as well.
(version "2.16.3")
(version "2.17.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz"))
(sha256
(base32
"0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"))))
"1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"))))
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
@ -159,7 +159,7 @@ as well as the classic centralized workflow.")
version ".tar.xz"))
(sha256
(base32
"15ckcia3bdbn1dpwlh3fifd8fzk38l1pdgxsf2yl8l8xd1z8jqaz"))))))
"09rpjj0m97h5lpzpwk47m6xsz9gb8wqf1s3dfqma3mwav2pb3njb"))))))
(inputs
`(("curl" ,curl)
("expat" ,expat)
@ -215,9 +215,6 @@ as well as the classic centralized workflow.")
(("/bin/sh") (which "sh"))
(("/usr/bin/perl") (which "perl"))
(("/usr/bin/python") (which "python")))
(substitute* "perl/Makefile"
;; Don't create timestamped 'perllocal.pod'.
(("\\$< PREFIX=") "$< NO_PERLLOCAL=1 PREFIX="))
#t))
(add-after 'configure 'add-PM.stamp
(lambda _
@ -226,42 +223,43 @@ as well as the classic centralized workflow.")
#t))
(add-before 'check 'patch-tests
(lambda _
;; These files contain some funny bytes that Guile is unable
;; to decode for shebang patching. Just delete them.
(for-each delete-file '("t/t4201-shortlog.sh"
"t/t7813-grep-icase-iso.sh"))
;; Many tests contain inline shell scripts (hooks etc).
(substitute* (find-files "t" "\\.sh$")
(("#!/bin/sh") (string-append "#!" (which "sh"))))
;; Un-do shebang patching here to prevent checksum mismatch.
(substitute* '("t/t4034/perl/pre" "t/t4034/perl/post")
(("^#!.*/bin/perl") "#!/usr/bin/perl"))
(substitute* "t/t5003-archive-zip.sh"
(("cp /bin/sh") (string-append "cp " (which "sh"))))
(substitute* "t/t6030-bisect-porcelain.sh"
(("\"/bin/sh\"") (string-append "\"" (which "sh") "\"")))
;; FIXME: This test runs `git commit` with a bogus EDITOR
;; and empty commit message, but does not fail the way it's
;; expected to. The test passes when invoked interactively.
(substitute* "t/t7508-status.sh"
(("\tcommit_template_commented") "\ttrue"))
;; More checksum mismatches due to odd shebangs.
(substitute* "t/t9100-git-svn-basic.sh"
(("\"#!/gnu.*/bin/sh") "\"#!/bin/sh"))
(substitute* "t/t9300-fast-import.sh"
(("\t#!/gnu.*/bin/sh") "\t#!/bin/sh")
(("'#!/gnu.*/bin/sh") "'#!/bin/sh"))
;; FIXME: Some hooks fail with "basename: command not found".
;; See 't/trash directory.t9164.../svn-hook.log'.
(delete-file "t/t9164-git-svn-dcommit-concurrent.sh")
(let ((store-directory (%store-directory)))
;; These files contain some funny bytes that Guile is unable
;; to decode for shebang patching. Just delete them.
(for-each delete-file '("t/t4201-shortlog.sh"
"t/t7813-grep-icase-iso.sh"))
;; Many tests contain inline shell scripts (hooks etc).
(substitute* (find-files "t" "\\.sh$")
(("#!/bin/sh") (string-append "#!" (which "sh"))))
;; Un-do shebang patching here to prevent checksum mismatch.
(substitute* '("t/t4034/perl/pre" "t/t4034/perl/post")
(("^#!.*/bin/perl") "#!/usr/bin/perl"))
(substitute* "t/t5003-archive-zip.sh"
(("cp /bin/sh") (string-append "cp " (which "sh"))))
(substitute* "t/t6030-bisect-porcelain.sh"
(("\"/bin/sh\"") (string-append "\"" (which "sh") "\"")))
;; FIXME: This test runs `git commit` with a bogus EDITOR
;; and empty commit message, but does not fail the way it's
;; expected to. The test passes when invoked interactively.
(substitute* "t/t7508-status.sh"
(("\tcommit_template_commented") "\ttrue"))
;; More checksum mismatches due to odd shebangs.
(substitute* "t/t9100-git-svn-basic.sh"
(((string-append "\"#!" store-directory ".*/bin/sh")) "\"#!/bin/sh") )
(substitute* "t/t9300-fast-import.sh"
(((string-append "\t#!" store-directory ".*/bin/sh")) "\t#!/bin/sh")
(((string-append "'#!" store-directory ".*/bin/sh")) "'#!/bin/sh"))
;; FIXME: Some hooks fail with "basename: command not found".
;; See 't/trash directory.t9164.../svn-hook.log'.
(delete-file "t/t9164-git-svn-dcommit-concurrent.sh")
;; XXX: These tests fail intermittently for unknown reasons:
;; <https://bugs.gnu.org/29546>.
(for-each delete-file
'("t/t9128-git-svn-cmd-branch.sh"
"t/t9167-git-svn-cmd-branch-subproject.sh"
"t/t9141-git-svn-multiple-branches.sh"))
#t))
;; XXX: These tests fail intermittently for unknown reasons:
;; <https://bugs.gnu.org/29546>.
(for-each delete-file
'("t/t9128-git-svn-cmd-branch.sh"
"t/t9167-git-svn-cmd-branch-subproject.sh"
"t/t9141-git-svn-multiple-branches.sh"))
#t)))
(add-after 'install 'install-shell-completion
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))

38
gnu/packages/video.scm
View File

@ -24,6 +24,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -56,6 +57,7 @@
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system waf)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
@ -2825,3 +2827,39 @@ changed. Or in other words, it can detect motion.")
;; Some files say "version 2" and others "version 2 or later".
(license license:gpl2)))
(define-public subdl
(let ((commit "4cf5789b11f0ff3f863b704b336190bf968cd471")
(revision "1"))
(package
(name "subdl")
(version (git-version "1.0.3" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alexanderwink/subdl.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder (begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(bin (string-append out "/bin"))
(source (assoc-ref %build-inputs "source"))
(python (assoc-ref %build-inputs "python")))
(install-file (string-append source "/subdl") bin)
(patch-shebang (string-append bin "/subdl")
(list (string-append python "/bin")))))))
(inputs `(("python" ,python)))
(synopsis "Command-line tool for downloading subtitles from opensubtitles.org")
(description "Subdl is a command-line tool for downloading subtitles from
opensubtitles.org. By default, it will search for English subtitles, display
the results, download the highest-rated result in the requested language and
save it to the appropriate filename.")
(license license:gpl3+)
(home-page "https://github.com/alexanderwink/subdl"))))

10
gnu/packages/virtualization.scm
View File

@ -347,14 +347,14 @@ manage system or application containers.")
(define-public libvirt
(package
(name "libvirt")
(version "4.0.0")
(version "4.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-"
version ".tar.xz"))
(sha256
(base32
"1j6zzajh4j3zzsaqn5f5mrchm0590xcf6rzkfajvqw3bd4dcms79"))))
"0nq1iz5iic466qahp0i8dlvyd6li0b0pdrvvrz9286l12x2fm61s"))))
(build-system gnu-build-system)
(arguments
`(;; FAIL: virshtest
@ -420,7 +420,7 @@ manage system or application containers.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("polkit" ,polkit)
("python" ,python-2)))
("python" ,python)))
(home-page "https://libvirt.org")
(synopsis "Simple API for virtualization")
(description "Libvirt is a C toolkit to interact with the virtualization
@ -480,13 +480,13 @@ three libraries:
(define-public python-libvirt
(package
(name "python-libvirt")
(version "3.7.0")
(version "4.1.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "libvirt-python" version))
(sha256
(base32
"0vy0ai8z88yhzqfk1n08z1gda5flrqxcw9lg1012b3zg125qljhy"))))
"1ixqhxjkczl8vk9wjx4cknw4374cw5nnsacbd2s755kpd0ys7hny"))))
(build-system python-build-system)
(arguments
`(#:phases

4
gnu/packages/vpn.scm
View File

@ -301,14 +301,14 @@ private network between hosts on the internet.")
(define-public sshuttle
(package
(name "sshuttle")
(version "0.78.3")
(version "0.78.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa"))))
"0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h"))))
(build-system python-build-system)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)

26
gnu/packages/web.scm
View File

@ -186,14 +186,14 @@ Interface} specification.")
(name "nginx")
;; Consider updating the nginx-documentation package if the nginx package is
;; updated.
(version "1.13.10")
(version "1.13.11")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
"11a8m4lhy6h8mmrsakn73pd5gcyvhxpz1xvlr103rglh9l884q9k"))))
"01bgld6pv9sms9bsmx863yqw2hnivxhn91xs6imqklj48sbrqy9m"))))
(build-system gnu-build-system)
(inputs `(("openssl" ,openssl)
("pcre" ,pcre)
@ -317,13 +317,13 @@ documentation.")
(license l:bsd-2))))
(define-public nginx-documentation
;; This documentation should be relevant for nginx@1.13.8.
(let ((revision 2100)
(changeset "cfb7bd672d77"))
;; This documentation should be relevant for nginx@1.13.11.
(let ((revision 2131)
(changeset "dbaf3950f8e9"))
(package
(name "nginx-documentation")
(version
(simple-format #f "2018-01-22-~A-~A" revision changeset))
(simple-format #f "2018-04-04-~A-~A" revision changeset))
(source
(origin (method hg-fetch)
(uri (hg-reference
@ -332,7 +332,7 @@ documentation.")
(file-name (string-append name "-" version))
(sha256
(base32
"096fcsc0wnfr847m7dwp17rivd3alxq7v9hq9s5lkfbhylmh18vm"))))
"0acdjsdaqixzh9g9s6db552v4pan4nqrllyqapay9ns9yzh1hrp7"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
@ -3948,13 +3948,13 @@ LaTeX.")
(define-public r-curl
(package
(name "r-curl")
(version "3.1")
(version "3.2")
(source (origin
(method url-fetch)
(uri (cran-uri "curl" version))
(sha256
(base32
"15fbjya2xrf2k9hhvg3frisrram4yk5wlfz67zj1z8ahpsb2a3r7"))))
"15hmy71310hnf9yqvz0icx4cq939gv6iqaifzlfdh2ia8akawdhn"))))
(build-system r-build-system)
(arguments
`(#:phases
@ -5121,7 +5121,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread
(define-public http-parser
(package
(name "http-parser")
(version "2.8.0")
(version "2.8.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/nodejs/http-parser/"
@ -5129,7 +5129,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"17a7k3nxv2p1sp2x5d89wr51vk770753vz6qnlp2gz7nkgwwcxvj"))))
"15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -5524,7 +5524,7 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.")
(define-public rss-bridge
(package
(name "rss-bridge")
(version "2017-08-03")
(version "2018-03-11")
(source
(origin
(method url-fetch)
@ -5533,7 +5533,7 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"05s16y552hbyj91s7bnlkx1bi64s6aw0fjy29az8via3i3b21yhl"))))
"1ix15ck45yb659k63mhwxwia6qnm9nn8jw0bga85abrvk1rchjdn"))))
(build-system trivial-build-system)
(native-inputs
`(("gzip" ,gzip)

6
gnu/packages/wine.scm
View File

@ -221,7 +221,7 @@ integrate Windows applications into your desktop.")
(define-public wine-staging-patchset-data
(package
(name "wine-staging-patchset-data")
(version "3.4")
(version "3.5")
(source
(origin
(method url-fetch)
@ -230,7 +230,7 @@ integrate Windows applications into your desktop.")
(file-name (string-append name "-" version ".zip"))
(sha256
(base32
"00yzh9bqs2rjgvk78xv3gfkbv4f2bkch9vb1ii4xh883f7wvkz93"))))
"1d95gzzfx87vvj85mrzv2lgg6w0m917dccja02g6vids28kf9g30"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@ -277,7 +277,7 @@ integrate Windows applications into your desktop.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4"))))
"0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf
("gtk+" ,gtk+)
("libva" ,libva)

4
gnu/packages/wm.scm
View File

@ -102,7 +102,7 @@ nested include statements).")
(define-public bspwm
(package
(name "bspwm")
(version "0.9.3")
(version "0.9.4")
(source
(origin
(file-name (string-append name "-" version ".tar.gz"))
@ -112,7 +112,7 @@ nested include statements).")
version ".tar.gz"))
(sha256
(base32
"17dwj7w16cdj7g4s2y2f96lgj5msq1s4543dnfa3rijlazzy6mmk"))))
"0yjr0vzbj3ar8qfr6gvpvjd82ay8iy1sg2fkw2swghlqiy6ix4kw"))))
(build-system gnu-build-system)
(inputs
`(("libxcb" ,libxcb)

34
gnu/packages/xdisorg.scm
View File

@ -21,6 +21,7 @@
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marek Benc <dusxmt@gmx.com>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1241,7 +1242,7 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag
(define-public xcb-util-xrm
(package
(name "xcb-util-xrm")
(version "1.2")
(version "1.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -1249,7 +1250,7 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag
"/download/v" version "/xcb-util-xrm-" version ".tar.bz2"))
(sha256
(base32
"0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp"))
"118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"))
(modules '((guix build utils)))
(snippet
;; Drop bundled m4.
@ -1405,3 +1406,32 @@ or playing a PCM encoded WAVE file.")
System, and launches a program of your choice if there is no activity after
a user-configurable period of time.")
(license license:gpl2)))
(define-public screen-message
(package
(name "screen-message")
(version "0.25")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.joachim-breitner.de/archive/screen-message"
"/screen-message-" version ".tar.gz"))
(sha256
(base32
"1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"))))
(build-system gnu-build-system)
(inputs `(("gtk3" ,gtk+)
("gdk" ,gdk-pixbuf)
("pango" ,pango)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
;; The default configure puts the 'sm' binary in games/ instead of bin/ -
;; this fixes it:
`(#:make-flags (list (string-append "execgamesdir=" %output "/bin"))))
(synopsis "Print messages on your screen")
(description "@code{screen-message} is a tool for displaying text on
your screen. It will make the text as large as possible and display it
with black color on a white background (colors are configurable on the
commandline).")
(home-page "https://www.joachim-breitner.de/projects#screen-message")
(license license:gpl2+)))

4
gnu/packages/xorg.scm
View File

@ -5900,7 +5900,7 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
(version "2.2.5")
(version "2.2.6")
(source
(origin
(method url-fetch)
@ -5908,7 +5908,7 @@ basic eye-candy effects.")
version ".tar.xz"))
(sha256
(base32
"1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"))))
"1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz"))))
(build-system python-build-system)
(inputs `(("ffmpeg" ,ffmpeg)
("flac" ,flac)

3
gnu/services.scm
View File

@ -181,7 +181,8 @@
(define (all-service-modules)
"Return the default set of service modules."
(cons (resolve-interface '(gnu services))
(all-modules (%service-type-path))))
(all-modules (%service-type-path)
#:warn warn-about-load-error)))
(define* (fold-service-types proc seed
#:optional

22
gnu/services/certbot.scm
View File

@ -26,6 +26,7 @@
#:use-module (gnu services web)
#:use-module (gnu system shadow)
#:use-module (gnu packages tls)
#:use-module (guix i18n)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (srfi srfi-1)
@ -113,14 +114,19 @@
#$(certbot-command config))))
(define (certbot-activation config)
(match config
(($ <certbot-configuration> package webroot certificates email
rsa-key-size default-location)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(mkdir-p #$webroot)
(zero? (system* #$(certbot-command config))))))))
(let* ((certbot-directory "/var/lib/certbot")
(script (in-vicinity certbot-directory "renew-certificates"))
(message (format #f (G_ "~a may need to be run~%") script)))
(match config
(($ <certbot-configuration> package webroot certificates email
rsa-key-size default-location)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(mkdir-p #$webroot)
(mkdir-p #$certbot-directory)
(copy-file #$(certbot-command config) #$script)
(display #$message)))))))
(define certbot-nginx-server-configurations
(match-lambda

22
gnu/services/desktop.scm
View File

@ -94,6 +94,8 @@
xfce-desktop-service
xfce-desktop-service-type
x11-socket-directory-service
%desktop-services))
;;; Commentary:
@ -880,6 +882,24 @@ system as root from within a user session, after the user has authenticated
with the administrator's password."
(service xfce-desktop-service-type config))
;;;
;;; X11 socket directory service
;;;
(define x11-socket-directory-service
;; Return a service that creates /tmp/.X11-unix. When using X11, libxcb
;; takes care of creating that directory. However, when using XWayland, we
;; need to create beforehand. Thus, create it unconditionally here.
(simple-service 'x11-socket-directory
activation-service-type
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(let ((directory "/tmp/.X11-unix"))
(mkdir-p directory)
(chmod directory #o777))))))
;;;
;;; The default set of desktop services.
@ -912,6 +932,8 @@ with the administrator's password."
(ntp-service)
x11-socket-directory-service
%base-services))
;;; desktop.scm ends here

3
gnu/system/shadow.scm
View File

@ -195,6 +195,9 @@ set auto-load safe-path /gnu/store/*/lib\n")))
`((".bash_profile" ,profile)
(".bashrc" ,bashrc)
(".zlogin" ,zlogin)
(".nanorc" ,(plain-file "nanorc" "\
# Include all the syntax highlighting modules.
include /run/current-system/profile/share/nano/*.nanorc\n"))
(".Xdefaults" ,xdefaults)
(".guile" ,(plain-file "dot-guile"
"(cond ((false-if-exception (resolve-interface '(ice-9 readline)))

Some files were not shown because too many files have changed in this diff Show More