From 3146aab7a8d5529599d755fe42ff37965b3415e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 09:05:53 +0200 Subject: gnu: r-minimal: Add tcl/tk support. * gnu/packages/statistics.scm (r-minimal)[inputs]: Add tcl and tk. [arguments]: Add configure flags to enable tcl and tk support. --- gnu/packages/statistics.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b9ac3e6dc7..38d253b1ce 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -61,6 +61,7 @@ (define-module (gnu packages statistics) #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages ssh) + #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -216,7 +217,7 @@ (define-public r-minimal (add-after 'build 'install-info (lambda _ (zero? (system* "make" "install-info"))))) #:configure-flags - '(;; Do not build the recommended packages. The build system creates + `(;; Do not build the recommended packages. The build system creates ;; random temporary directories and embeds their names in some ;; package files. We build these packages with the r-build-system ;; instead. @@ -227,6 +228,13 @@ (define-public r-minimal "--with-jpeglib" "--with-libtiff" "--with-ICU" + "--with-tcltk" + ,(string-append "--with-tcl-config=" + (assoc-ref %build-inputs "tcl") + "/lib/tclConfig.sh") + ,(string-append "--with-tk-config=" + (assoc-ref %build-inputs "tk") + "/lib/tkConfig.sh") "--enable-R-shlib" "--enable-BLAS-shlib" "--with-system-tre"))) @@ -265,6 +273,8 @@ (define-public r-minimal ;; This avoids a reference to the ungraftable static bash. R uses the ;; detected shell for the "system" procedure. ("bash" ,bash-minimal) + ("tcl" ,tcl) + ("tk" ,tk) ("which" ,which) ("zlib" ,zlib))) (native-search-paths -- cgit v1.2.3 From 125916734870928f428cdeb666e09928c42a725f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 09:06:57 +0200 Subject: gnu: Add r-analytics. * gnu/packages/cran.scm (r-analytics): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4ec2e9d23..96044e114a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4026,3 +4026,37 @@ (define-public r-learnr Markdown. Use a combination of narrative, figures, videos, exercises, and quizzes to create self-paced tutorials for learning about R and R packages.") (license license:asl2.0))) + +(define-public r-analytics + (package + (name "r-analytics") + (version "2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "analytics" version)) + (sha256 + (base32 + "1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6")))) + (build-system r-build-system) + (propagated-inputs + `(("r-car" ,r-car) + ("r-cluster" ,r-cluster) + ("r-fractal" ,r-fractal) + ("r-lmtest" ,r-lmtest) + ("r-mass" ,r-mass) + ("r-np" ,r-np) + ("r-powerplus" ,r-powerplus) + ("r-robust" ,r-robust) + ("r-trend" ,r-trend) + ("r-tsa" ,r-tsa) + ("r-urca" ,r-urca))) + (home-page "https://cran.r-project.org/web/packages/analytics/") + (synopsis "Collection of data analysis tools") + (description + "This package is a collection of data analysis tools. It includes tools +for regression outlier detection in a fitted linear model, stationary +bootstrap using a truncated geometric distribution, a comprehensive test for +weak stationarity, column means by group, weighted biplots, and a heuristic to +obtain a better initial configuration in non-metric MDS.") + (license license:gpl2))) -- cgit v1.2.3 From fd29faa8d6fe579096ebf1eab85f8aa50da7bba0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 10:59:00 +0200 Subject: gnu: Add emacs-desktop-environment. * gnu/packages/emacs.scm (emacs-desktop-environment): New variable. --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ca3c077399..fc7f52a327 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10523,3 +10523,28 @@ (define-public emacs-esh-autosuggest autosuggestions with: @code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}") (license license:gpl3+))) + +(define-public emacs-desktop-environment + (package + (name "emacs-desktop-environment") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DamienCassou/desktop-environment.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r")))) + (build-system emacs-build-system) + (home-page "https://gitlab.petton.fr/DamienCassou/desktop-environment") + (synopsis "Control your GNU/Linux desktop environment from Emacs") + (description + "This package helps you control your GNU/Linux desktop from Emacs. +With @code{desktop-environment}, you can control the brightness and volume as +well as take screenshots and lock your screen. The package depends on the +availability of shell commands to do the hard work for us. These commands can +be changed by customizing the appropriate variables.") + (license license:gpl3+))) -- cgit v1.2.3 From f035e5d0bcf84aa4051ae894d30ec97fb27c1145 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 24 May 2018 12:03:39 +0200 Subject: gnu: weston: Update to 4.0.0. * gnu/packages/freedesktop.scm (weston): Update to 4.0.0. [arguments]: Disable tests. --- gnu/packages/freedesktop.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 05b12789af..63c3a93957 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017, 2018 Marius Bakke -;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -490,7 +490,7 @@ (define-public wayland-protocols (define-public weston (package (name "weston") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append @@ -498,7 +498,7 @@ (define-public weston "weston-" version ".tar.xz")) (sha256 (base32 - "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd")))) + "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -524,6 +524,7 @@ (define-public weston (string-append "--with-xserver-path=" (assoc-ref %build-inputs "xorg-server-xwayland") "/bin/Xwayland")) + #:tests? #f ; FIXME: Tests randomly fail. #:phases (modify-phases %standard-phases (add-before 'configure 'use-elogind -- cgit v1.2.3 From 04e7cd8d80b7326ebf737f44dd42c260e31a49bc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 12:04:16 +0200 Subject: gnu: qjackctl: Update to 0.5.1. * gnu/packages/audio.scm (qjackctl): Update to 0.5.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b7c2b15148..cf294f58a4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1988,14 +1988,14 @@ (define-public patchage (define-public qjackctl (package (name "qjackctl") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s")))) + "0jw1s4qh4qjxnysddjv3j2lchwlslj9p4iisv9i89d3m7pf1svs4")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 217af8ae719250c352644e4d356c9d3a88e03c46 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 12:07:49 +0200 Subject: gnu: qsynth: Update to 0.5.1. * gnu/packages/audio.scm (qsynth): Update to 0.5.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cf294f58a4..a0f21d4dac 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2741,7 +2741,7 @@ (define-public portaudio (define-public qsynth (package (name "qsynth") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -2749,7 +2749,7 @@ (define-public qsynth "/qsynth-" version ".tar.gz")) (sha256 (base32 - "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584")))) + "0kpk1rnhbifbvm4xvw8i0d4ksk78pf505qvg08k89kqkg32494ap")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase -- cgit v1.2.3 From 26bcd2a2b2a2d44e71750159486bfd3b0d8230ad Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 24 May 2018 15:11:36 +0200 Subject: gnu: weston: Disable parallel tests. * gnu/packages/freedesktop.scm (weston): Disable parallel tests. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63c3a93957..57af63cfc2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -524,7 +524,7 @@ (define-public weston (string-append "--with-xserver-path=" (assoc-ref %build-inputs "xorg-server-xwayland") "/bin/Xwayland")) - #:tests? #f ; FIXME: Tests randomly fail. + #:parallel-tests? #f ; Parallel tests cause failures. #:phases (modify-phases %standard-phases (add-before 'configure 'use-elogind -- cgit v1.2.3 From a1b802454a6dd9178e9cb0c061d9050bb4d92e78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 24 May 2018 17:49:09 +0200 Subject: gnu: Add fastp. * gnu/packages/bioinformatics.scm (fastp): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1315127343..3168291f48 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3450,6 +3450,42 @@ (define-public fastqc @end itemize\n") (license license:gpl3+))) +(define-public fastp + (package + (name "fastp") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenGene/fastp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r6ms5zbf5rps4rgp4z73nczadl00b5rqylw8f684isfz27dp0xh")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:make-flags + (list (string-append "BINDIR=" (assoc-ref %outputs "out") "/bin")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'create-target-dir + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/OpenGene/fastp/") + (synopsis "All-in-one FastQ preprocessor") + (description + "Fastp is a tool designed to provide fast all-in-one preprocessing for +FastQ files. This tool has multi-threading support to afford high +performance.") + (license license:expat))) + (define-public htslib (package (name "htslib") -- cgit v1.2.3 From c10679f5f1af6a825612fb3c59a81bca7c5d0f02 Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Wed, 23 May 2018 19:09:34 +0000 Subject: gnu: gnurl: Update to 7.60.0. * gnu/packages/gnunet.scm (gnurl): Update to 7.60.0. Signed-off-by: Leo Famulari --- gnu/packages/gnunet.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 880fb9f09e..1286f4d462 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -186,16 +186,13 @@ (define-public libmicrohttpd (define-public gnurl (package (name "gnurl") - (version "7.59.0") + (version "7.60.0") (source (origin (method url-fetch) - (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"))) + (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "0fdwqxs4crzj1nbq3lz0xbqjiiqpq16vpll09gryyq4c1y6lbyib")))) + "0klf3h339dznbm903474mjjysrarz09s1wiypnbai3xnfjamha99")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages -- cgit v1.2.3 From 109f022e9d8937eeaaada5fd0350b77b888b3949 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 24 May 2018 22:12:37 +0200 Subject: gnu: gdal: Fix configure flags. * gnu/packages/geo.scm (gdal)[arguments]: Fix configure flags. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9995ff3e88..2b655c22cf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -656,7 +656,7 @@ (define-public gdal (with "--with-png" "libpng") (with "--with-webp" "libwebp") (with "--with-gif" "giflib") - (with "--with-jpeg" "libjpeg") + (with "--with-jpeg" "libjpeg-turbo") (with "--with-libtiff" "libtiff") (with "--with-geotiff" "libgeotiff") (with "--with-libz" "zlib") -- cgit v1.2.3 From 914205214cd906044411e6438be69c700e355b0d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 23 May 2018 14:42:36 +0200 Subject: gnu: ntfs-3g: Link 'mount.ntfs' to 'mount.ntfs-3g'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (ntfs-3g)[arguments]: Add #:phases. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ec62853e9..70e612995e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3432,7 +3432,19 @@ (define-public ntfs-3g "--with-fuse=external" ;use our own FUSE "--enable-mount-helper" "--enable-posix-acls" - "--enable-xattr-mappings"))) + "--enable-xattr-mappings") + #:phases + (modify-phases %standard-phases + ;; If users install ntfs-3g, they probably want to make it the + ;; default driver as well, so we opt for sensible defaults and link + ;; mount.ntfs to mount.ntfs-3g. (libmount tries to run mount.ntfs to + ;; mount NTFS filesystems.) + (add-after 'install 'install-link + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin"))) + (symlink "mount.ntfs-3g" + (string-append sbin "/mount.ntfs")))))))) (home-page "https://www.tuxera.com/community/open-source-ntfs-3g/") (synopsis "Read-write access to NTFS file systems") (description -- cgit v1.2.3 From 655ca71329ebdc44d78c3ee1f7b68d29ff6b273b Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Sat, 12 May 2018 15:28:35 +0000 Subject: gnu: Add xsimd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (xsimd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3e9c39df61..80ffc1ea2c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -124,3 +124,30 @@ (define-public dashel It also allows a server application to wait for any activity on any combination of these streams.") (license license:bsd-3))) + +(define-public xsimd + (package + (name "xsimd") + (version "4.1.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/QuantStack/xsimd/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0x05l4xpqr9b66sm6lkf48n6x7999ks921x6k2hzkkg6mh3gqd46")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/QuantStack/xsimd") + (build-system cmake-build-system) + (arguments + `(#:test-target "xtest")) + (native-inputs + `(("googletest" ,googletest))) + (synopsis "C++ wrappers for SIMD intrinsics and math implementations") + (description "xsimd provides a unified means for using SIMD features for +library authors. Namely, it enables manipulation of batches of numbers with +the same arithmetic operators as for single values. It also provides +accelerated implementation of common mathematical functions operating on +batches.") + (license license:bsd-3))) -- cgit v1.2.3 From c75c9b05e1536ec22a38122efbe3c13ed6ccd75e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 23 May 2018 20:32:44 +0200 Subject: gnu: mrustc: Update to 0.0.0-3.b5b7089. * gnu/packages/rust.scm (mrustc): Update to 0.0.0-3.b5b7089. --- gnu/packages/rust.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6c6e91a2fb..674114e70a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -272,8 +272,8 @@ (define (rust-bootstrapped-package base-rust version checksum) (package-native-inputs base-rust)))))) (define-public mrustc - (let ((commit "ee65f12f4aeb27238c8a2fc07fbe84eceafdde26") - (revision "2") + (let ((commit "b5b70897015ee70d62ddda9711c256ca7c720e0f") + (revision "3") (rustc-version "1.19.0")) (package (name "mrustc") @@ -286,7 +286,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "0rdjzxfwhrpzf44afpm0i7b8fiqvriccn93z22sys8pxw22pkp0d")))) + "1d6jr6agiy598ab8lax0h9dfn9n67wg906y1f46l1c27sz3w82lb")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 1ceca46b0605426885caf4f7f7321203261a4789 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 23 May 2018 10:02:22 +0200 Subject: gnu: Add python2-oauth2client. * gnu/packages/python-web.scm (python2-oauth2client): New variable. --- gnu/packages/python-web.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8ebae2e4b7..dc1f9a15ac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2017 Mark Meyer ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Nicolas Goaziou +;;; Copyright © 2018 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -2090,6 +2091,9 @@ (define-public python-oauth2client library for Python") (license license:asl2.0))) +(define-public python2-oauth2client + (package-with-python2 python-oauth2client)) + (define-public python-flask-oidc (package (name "python-flask-oidc") -- cgit v1.2.3 From 961bcdf5aca36bd8d1fcd856a569fedd10cb91c5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 23 May 2018 10:06:25 +0200 Subject: gnu: Add python-google-api-client. * gnu/packages/python-web.scm (python-google-api-client): New variable, (python2-google-api-client): new variable. --- gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dc1f9a15ac..4868baa928 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2624,3 +2624,30 @@ (define-public python-yarl (description "@code{yarl} module provides handy @code{URL} class for URL parsing and changing.") (license license:asl2.0))) + +(define-public python-google-api-client + (package + (name "python-google-api-client") + (version "1.6.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "google-api-python-client" version)) + (sha256 + (base32 + "1wpbbbxfpy9mwxdy3kn352cb590ladv574j1aa2l4grjdqw3ln05")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; tests require internet access + (native-inputs + `(("python-httplib2" ,python-httplib2) + ("python-six" ,python-six) + ("python-oauth2client" ,python-oauth2client) + ("python-uritemplate" ,python-uritemplate))) + (home-page "https://github.com/google/google-api-python-client") + (synopsis "Core Python library for accessing Google APIs") + (description "Python client library for Google's discovery based APIs") + (license license:asl2.0))) + +(define-public python2-google-api-client + (package-with-python2 python-google-api-client)) -- cgit v1.2.3 From b5a9f49b495a810d4ffb9bbd24054acbeaab894e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 23 May 2018 10:09:26 +0200 Subject: gnu: Add python-gipc. * gnu/packages/python.scm (python-gipc): New variable, (python2-gipc): new variable. --- gnu/packages/python.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 31310ce753..50bfc8d8da 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017, 2018 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2018 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau @@ -13339,3 +13339,30 @@ (define-public python-glob2 (define-public python2-glob2 (package-with-python2 python-glob2)) + +(define-public python-gipc + (package + (name "python-gipc") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gipc" version ".zip")) + (sha256 + (base32 + "0pd9by719qh882hqs6xpby61sn1x5h98hms5p2p8yqnycrf1s0h2")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (propagated-inputs + `(("python-gevent" ,python-gevent))) + (home-page "http://gehrcke.de/gipc") + (synopsis "Child process management in the context of gevent") + (description "Usage of Python's multiprocessing package in a +gevent-powered application may raise problems. With @code{gipc}, +process-based child processes can safely be created anywhere within a +gevent-powered application.") + (license license:expat))) + +(define-public python2-gipc + (package-with-python2 python-gipc)) -- cgit v1.2.3 From a037a59f83bbc7fabca9b4d6ccaa1e1657be3009 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 23 May 2018 10:10:14 +0200 Subject: gnu: Add python-fusepy. * gnu/packages/python.scm (python-fusepy): New variable, (python2-fusepy): new variable. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 50bfc8d8da..27deaebdb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13366,3 +13366,36 @@ (define-public python-gipc (define-public python2-gipc (package-with-python2 python-gipc)) + +(define-public python-fusepy + (package + (name "python-fusepy") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fusepy" version)) + (sha256 + (base32 + "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-library-file-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((fuse (assoc-ref inputs "fuse"))) + (substitute* "fuse.py" + (("find_library\\('fuse'\\)") + (string-append "'" fuse "/lib/libfuse.so'"))) + #t)))))) + (propagated-inputs + `(("fuse" ,fuse))) + (home-page "https://github.com/fusepy/fusepy") + (synopsis "Simple ctypes bindings for FUSE") + (description "Python module that provides a simple interface to FUSE and +MacFUSE. The binding is created using the standard @code{ctypes} library.") + (license license:isc))) + +(define-public python2-fusepy + (package-with-python2 python-fusepy)) -- cgit v1.2.3 From 4806d390cb5ffd867dae663f71ea766d44378a2c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 23 May 2018 10:26:49 +0200 Subject: gnu: Add python2-gdrivefs. * gnu/packages/python.scm (python2-gdrivefs): New variable. --- gnu/packages/python.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 27deaebdb8..4cda7192fd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13399,3 +13399,44 @@ (define-public python-fusepy (define-public python2-fusepy (package-with-python2 python-fusepy)) + +(define-public python2-gdrivefs + (package + (name "python2-gdrivefs") + (version "0.14.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gdrivefs" version)) + (sha256 + (base32 + "0v9sp2cfg4ki3wagkwf3rnfpjhvgf845anz3757il9z95yvvcvb7")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-setup-py + (lambda _ + ;; Update requirements from dependency==version + ;; to dependency>=version + (substitute* "gdrivefs/resources/requirements.txt" + (("==") ">=")) + #t))))) + (native-inputs + `(("python2-gipc" ,python2-gipc) + ("python2-gevent" ,python2-gevent) + ("python2-greenlet" ,python2-greenlet) + ("python2-httplib2" ,python2-httplib2) + ("python2-uritemplate" ,python2-uritemplate) + ("python2-oauth2client" ,python2-oauth2client) + ("python2-six" ,python2-six))) + (propagated-inputs + `(("python2-dateutil" ,python2-dateutil) + ("python2-fusepy" ,python2-fusepy) + ("python2-google-api-client" ,python2-google-api-client))) + (home-page "https://github.com/dsoprea/GDriveFS") + (synopsis "Mount Google Drive as a local file system") + (description "@code{gdrivefs} provides a FUSE wrapper for Google Drive +under Python 2.7.") + (license license:gpl2))) -- cgit v1.2.3 From 0921eff2a8b1f370379aa0cdd40be6de01f9d744 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 May 2018 17:52:42 +0200 Subject: gnu: superlu-dist: Update to 5.3.0. * gnu/packages/maths.scm (superlu-dist): Update to 5.3.0. [source](snippet): Adapt file name and function names to new version. Remove 'delete-file' call. --- gnu/packages/maths.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c1ef67f3de..73c79c3f81 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2109,35 +2109,34 @@ (define-public superlu (define-public superlu-dist (package (name "superlu-dist") - (version "3.3") + (version "5.3.0") (source (origin (method url-fetch) (uri (string-append "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/" "superlu_dist_" version ".tar.gz")) (sha256 - (base32 "1hnak09yxxp026blq8zhrl7685yip16svwngh1wysqxf8z48vzfj")) - (modules '((guix build utils))) + (base32 "0ja5ihqivkda1wd58y4lmzvmwssm9g91f70c5q0fzwhng6580h6y")) + (modules '((guix build utils))) (snippet ;; Replace the non-free implementation of MC64 with a stub '(begin (use-modules (ice-9 regex) (ice-9 rdelim)) - (call-with-output-file "SRC/mc64ad.c" + (call-with-output-file "SRC/mc64ad_dist.c" (lambda (port) (display " #include #include -void mc64id_(int *a) { +void mc64id_dist(int *a) { fprintf (stderr, \"SuperLU_DIST: non-free MC64 not available. Aborting.\\n\"); abort (); } -void mc64ad_ (int *a, int *b, int *c, int *d, int *e, double *f, int *g, +void mc64ad_dist (int *a, int *b, int *c, int *d, int *e, double *f, int *g, int *h, int *i, int *j, int *k, double *l, int *m, int *n) { fprintf (stderr, \"SuperLU_DIST: non-free MC64 not available. Aborting.\\n\"); abort (); }\n" port))) - (delete-file "SRC/mc64ad.f.bak") (substitute* "SRC/util.c" ;adjust default algorithm (("RowPerm[[:blank:]]*=[[:blank:]]*LargeDiag") "RowPerm = NOROWPERM")))) -- cgit v1.2.3 From 6df2a50ac4172b7109e4b86656ffd989e98184d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 May 2018 17:53:54 +0200 Subject: gnu: openmpi: Update to 3.0.1. * gnu/packages/mpi.scm (openmpi): Update to 3.0.1. [arguments]: In 'remove-absolute' phase, adjust romio file name. * gnu/packages/maths.scm (scalapack)[arguments]: Add 'set-test-environment' phase. (slepc-openmpi)[arguments]: Likewise. (mumps-openmpi)[arguments]: Likewise. (superlu-dist)[arguments]: In 'check' phase, set 'OMPI_MCA_plm_rsh_agent'. (scotch)[arguments]: In 'build-esmumps', likewise. (p4est)[arguments]: Add 'set-test-environment' phase. (hypre-openmpi)[arguments]: Likewise. --- gnu/packages/maths.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++------ gnu/packages/mpi.scm | 8 +++--- 2 files changed, 70 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 73c79c3f81..a36d2333e6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -554,7 +554,16 @@ (define-public scalapack ("fortran" ,gfortran) ("lapack" ,lapack))) ;for testing only (arguments - `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES"))) + `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") + #:phases (modify-phases %standard-phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because + ;; 'ssh' could not be found in $PATH. Define this + ;; variable to placate Open MPI without adding a + ;; dependency on OpenSSH (the agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t))))) (home-page "http://www.netlib.org/scalapack/") (synopsis "Library for scalable numerical linear algebra") (description @@ -1786,6 +1795,18 @@ (define-public slepc-complex (define-public slepc-openmpi (package (inherit slepc) (name "slepc-openmpi") + (arguments + (substitute-keyword-arguments (package-arguments slepc) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (inputs `(("mpi" ,openmpi) ("arpack" ,arpack-ng-openmpi) @@ -1955,11 +1976,18 @@ (define-public mumps-openmpi (substitute-keyword-arguments (package-arguments mumps) ((#:phases phases) `(modify-phases ,phases - (replace - 'check - (lambda _ - ((assoc-ref ,phases 'check) - #:exec-prefix '("mpirun" "-n" "2")))))))) + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)) + (replace 'check + (lambda _ + ((assoc-ref ,phases 'check) + #:exec-prefix '("mpirun" "-n" "2")))))))) (synopsis "Multifrontal sparse direct solver (with MPI)"))) (define-public mumps-metis-openmpi @@ -2201,6 +2229,11 @@ (define-public superlu-dist #t)) (replace 'check (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to placate + ;; Open MPI without adding a dependency on OpenSSH (the agent + ;; isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) (with-directory-excursion "EXAMPLE" (and (zero? (system* "mpirun" "-n" "2" @@ -2295,6 +2328,12 @@ (define-public scotch (add-after 'build 'build-esmumps (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to placate + ;; Open MPI without adding a dependency on OpenSSH (the agent + ;; isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + (zero? (system* "make" (format #f "-j~a" (parallel-job-count)) "esmumps")))) @@ -2474,7 +2513,16 @@ (define-public p4est " -lopenblas") ,(string-append "LAPACK_LIBS=-L" (assoc-ref %build-inputs "lapack") - " -llapack")))) + " -llapack")) + #:phases (modify-phases %standard-phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because + ;; 'ssh' could not be found in $PATH. Define this + ;; variable to placate Open MPI without adding a + ;; dependency on OpenSSH (the agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t))))) (home-page "http://www.p4est.org") (synopsis "Adaptive mesh refinement on forests of octrees") (description @@ -3531,7 +3579,17 @@ (define-public hypre-openmpi (substitute-keyword-arguments (package-arguments hypre) ((#:configure-flags flags) ``("--with-MPI" - ,@(delete "--without-MPI" ,flags))))) + ,@(delete "--without-MPI" ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (synopsis "Parallel solvers and preconditioners for linear equations") (description "HYPRE is a software library of high performance preconditioners and diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 5dfb26ae75..5496ea9c9e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -153,7 +153,7 @@ (define-public hwloc-2.0 (define-public openmpi (package (name "openmpi") - (version "1.10.7") + (version "3.0.1") (source (origin (method url-fetch) @@ -162,7 +162,7 @@ (define-public openmpi "/downloads/openmpi-" version ".tar.bz2")) (sha256 (base32 - "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0")))) + "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36")))) (build-system gnu-build-system) (inputs `(("hwloc" ,hwloc "lib") @@ -205,8 +205,8 @@ (define-public openmpi (("_ABSOLUTE") "")) ;; Avoid valgrind (which pulls in gdb etc.). (substitute* - '("./ompi/mca/io/romio/src/io_romio_component.c") - (("MCA_io_romio_COMPLETE_CONFIGURE_FLAGS") + '("./ompi/mca/io/romio314/src/io_romio314_component.c") + (("MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS") "\"[elided to reduce closure]\"")) #t)) (add-before 'build 'scrub-timestamps ;reproducibility -- cgit v1.2.3 From a560641a604c4766acfa2ff015a10c9465a721eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 25 May 2018 12:11:41 +0200 Subject: gnu: openmpi: Reintroduce PSM (Intel TrueScale) support. Fixes a regression introduced in 9129804230a3a4272731609f6418b876ba450575 whereby PSM would never be added as an input. * gnu/packages/mpi.scm (openmpi)[inputs]: Re-add PSM on supported systems. --- gnu/packages/mpi.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 5496ea9c9e..e8d28d6060 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -168,10 +168,10 @@ (define-public openmpi `(("hwloc" ,hwloc "lib") ("gfortran" ,gfortran) ("libfabric" ,libfabric) - ,@(match (%current-system) - ((member (package-supported-systems psm)) - `(("psm" ,psm))) - (_ `())) + ,@(if (and (not (%current-target-system)) + (member (%current-system) (package-supported-systems psm))) + `(("psm" ,psm)) + '()) ("rdma-core" ,rdma-core) ("valgrind" ,valgrind))) (native-inputs -- cgit v1.2.3 From fbe1b85b63a77d3a239b511b82021a48496360b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 25 May 2018 13:41:59 +0200 Subject: gnu: openmpi: Add PSM2 (Intel OmniPath) support. * gnu/packages/mpi.scm (openmpi)[inputs]: Add PSM2 on supported systems. --- gnu/packages/mpi.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e8d28d6060..f34b08e4ca 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -172,6 +172,10 @@ (define-public openmpi (member (%current-system) (package-supported-systems psm))) `(("psm" ,psm)) '()) + ,@(if (and (not (%current-target-system)) + (member (%current-system) (package-supported-systems psm2))) + `(("psm2" ,psm2)) + '()) ("rdma-core" ,rdma-core) ("valgrind" ,valgrind))) (native-inputs -- cgit v1.2.3 From e7ca985973e63543ff209e333c8b062ed5fdb9e5 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 10 May 2018 19:48:25 +0200 Subject: gnu: footswitch: Update to ca43d53f. * gnu/packages/accessibility.scm (footswitch): Update to ca43d53f. --- gnu/packages/accessibility.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index c9d9b099c5..d399f98f09 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -83,7 +83,7 @@ (define-public florence (license license:gpl2+))) (define-public footswitch - (let ((commit "deedd87fd90fad90ce342aeabafd4a3198d7d3d4") + (let ((commit "ca43d53fc2002520cc825d119702afc124303e73") (revision "2")) (package (name "footswitch") @@ -95,7 +95,8 @@ (define-public footswitch (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1ys90wqyz62kffa8m3hgaq1dl7f29x3mrc3zqfjrkbn2ps0k6ps0")))) + (base32 + "14pyzc4ws1mj859xs9n4x83wzxxvd3bh5bdxzr6nv267xwx1mq68")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -112,6 +113,7 @@ (define-public footswitch (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (install-file "footswitch" bin) + (install-file "scythe" bin) #t)))))) (home-page "https://github.com/rgerganov/footswitch") (synopsis "Command line utility for PCsensor foot switch") -- cgit v1.2.3 From c53fa8c83af82c528fab993fb22dbe5da9a33c44 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sat, 5 May 2018 16:18:24 +0200 Subject: gnu: mps-youtube: Update to 0.2.8. * gnu/packages/video.scm (mps-youtube): Update to 0.2.8. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7df318edfc..b8d0d456d5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2193,7 +2193,7 @@ (define-public libaacs (define-public mps-youtube (package (name "mps-youtube") - (version "0.2.7.1") + (version "0.2.8") (source (origin (method url-fetch) @@ -2202,7 +2202,7 @@ (define-public mps-youtube (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s7h35yx6f0szf8mm8612ic913w3v05m2kwphjfcxnpq0ammhyci")))) + "0x7cmfh199q9j396v7bz81nnvanfllhsg86489i5dw2p3yyc9wnm")))) (build-system python-build-system) (arguments ;; Tests need to be disabled until #556 upstream is fixed. It reads as if the -- cgit v1.2.3 From 43a776e294dc1995bcaa1a988d76cf5e092c6a4a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 25 May 2018 19:52:15 +0200 Subject: gnu: mpfrcx: Update to 0.5. * gnu/packages/algebra.scm (mpfrcx): Update to 0.5 and change licence to lgpl3+. --- gnu/packages/algebra.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 03a61be471..210b734b9c 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -60,15 +60,15 @@ (define-module (gnu packages algebra) (define-public mpfrcx (package (name "mpfrcx") - (version "0.4.2") + (version "0.5") (source (origin (method url-fetch) (uri (string-append - "http://www.multiprecision.org/mpfrcx/download/mpfrcx-" + "http://www.multiprecision.org/downloads/mpfrcx-" version ".tar.gz")) (sha256 (base32 - "0grw66b255r574lvll1bqccm5myj2m8ajzsjaygcyq9zjnnbnhhy")))) + "1s968480ymv6w0rnvfp9mxvx98hvi29fkvw8nk4ggzc6azxgwybs")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp) @@ -82,7 +82,7 @@ (define-public mpfrcx implement the floating point approach to complex multiplication are implemented. On the other hand, these comprise asymptotically fast multiplication routines such as Toom–Cook and the FFT.") - (license license:lgpl2.1+) + (license license:lgpl3+) (home-page "http://mpfrcx.multiprecision.org/"))) (define-public cm -- cgit v1.2.3 From 4c40ed9d3791e95561da8f9e0d08ee77b09bf4a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 25 May 2018 00:34:46 +0200 Subject: gnu: Add scummvm. * gnu/packages/emulators.scm (scummvm): New variable. --- gnu/packages/emulators.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4415a5aa9c..c354386bd7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2018 David Thompson ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Rutger Helling ;;; @@ -33,6 +33,7 @@ (define-module (gnu packages emulators) #:use-module (guix svn-download) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -55,6 +56,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages libedit) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -1109,3 +1111,59 @@ (define-public retroarch reference frontend for the libretro API, currently used by most as a modular multi-system game/emulator system.") (license license:gpl3+))) + +(define-public scummvm + (package + (name "scummvm") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.scummvm.org/frs/scummvm/" version + "/scummvm-" version ".tar.xz")) + (sha256 + (base32 + "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;require "git" + #:configure-flags (list "--enable-release") ;for optimizations + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; configure does not work followed by both "SHELL=..." and + ;; "CONFIG_SHELL=..."; set environment variables instead + (lambda* (#:key outputs configure-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (which "bash")) + (flags `(,(string-append "--prefix=" out) + ,@configure-flags))) + (setenv "SHELL" bash) + (setenv "CONFIG_SHELL" bash) + (apply invoke "./configure" flags))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("faad2" ,faad2) + ("fluidsynth" ,fluidsynth) + ("freetype" ,freetype) + ("libflac" ,flac) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libmad" ,libmad) + ("libmpeg2" ,libmpeg2) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libtheora" ,libtheora) + ("libvorbis" ,libvorbis) + ("nasm" ,nasm) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page "https://www.scummvm.org/") + (synopsis "Engine for several graphical adventure games") + (description "ScummVM is a program which allows you to run certain +classic graphical point-and-click adventure games, provided you +already have their data files. The clever part about this: ScummVM +just replaces the executables shipped with the games, allowing you to +play them on systems for which they were never designed!") + (license license:gpl2+))) -- cgit v1.2.3 From 84fbe00a8b56d9b53fc5abb63118b87c07a0c284 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 26 May 2018 16:38:59 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.9. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.9. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 99d262dcf9..f447e236a2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -223,7 +223,7 @@ (define-public wine64 (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.8") + (version "3.9") (source (origin (method url-fetch) @@ -232,7 +232,7 @@ (define-public wine-staging-patchset-data (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1z1a9zlhcglyzfxdilrsz558qpn69b4mzp086s364jqgzj930sja")))) + "0akccqrp1ymjrra2c99f6hxlaa77jyihfs3q8x93vkgb9c0lq5xx")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 385f8a0930d3ed2d8628b2006aa11dd52902e04d Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 26 May 2018 16:39:51 +0200 Subject: gnu: wine-staging: Update to 3.9. * gnu/packages/wine.scm (wine-staging): Update to 3.9. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index f447e236a2..d9346e2524 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -278,7 +278,7 @@ (define-public wine-staging (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0l8dqb8r72i6n7yh2bmx738i8ss0lmsj07hvgrqsnfwbjin0rc02")))) + "0ddphvlp9lsjyqc6zckinc36bggpkg925v0x2vqr8nkdjs0w5bfc")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From b3884bbfc5c2d137b78d3f0ae87ec82c9be377bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 May 2018 14:51:05 +0200 Subject: gnu: rust: Fix typo. * gnu/packages/rust.scm (rust-bootstrap)[description]: s/manaer/manager. --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 674114e70a..51d4f6c040 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -138,7 +138,7 @@ (define rust-bootstrap (home-page "https://www.rust-lang.org") (synopsis "Prebuilt rust compiler and cargo package manager") (description "This package provides a pre-built @command{rustc} compiler -and a pre-built @command{cargo} package manaer, which can +and a pre-built @command{cargo} package manager, which can in turn be used to build the final Rust.") (license license:asl2.0))) -- cgit v1.2.3 From bbb56dc7b6d52ff4a5d59729d34115ee931604d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 15:57:50 +0200 Subject: gnu: feh: Update to 2.26.3. * gnu/packages/image-viewers.scm (feh): Update to 2.26.3. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 68f1148908..5abcdf9a2a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-module (gnu packages image-viewers) (define-public feh (package (name "feh") - (version "2.26.2") + (version "2.26.3") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public feh name "-" version ".tar.bz2")) (sha256 (base32 - "07hn5d5m1jsqp6qb2d3lah1js8382hrf225y0q8776m2k3vzylk3")))) + "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 80746f97f148d58c012b8479fca3eac3ced67de6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 16:08:09 +0200 Subject: gnu: vte: Update to 0.52.2. * gnu/packages/gnome.scm (vte): Update to 0.52.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9455ed5c77..befb7dc9ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2064,7 +2064,7 @@ (define-public vala (define-public vte (package (name "vte") - (version "0.52.1") + (version "0.52.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2072,7 +2072,7 @@ (define-public vte name "-" version ".tar.xz")) (sha256 (base32 - "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh")))) + "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6ce76bdc313f8c71c2e016aa1e279e27c139ee42 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 16:08:33 +0200 Subject: gnu: whois: Update to 5.3.1. * gnu/packages/networking.scm (whois): Update to 5.3.1. [inputs]: Change from LIBIDN to LIBIDN2. --- gnu/packages/networking.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9793620e14..a95f5d10e0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -500,7 +500,7 @@ (define-public iodine (define-public whois (package (name "whois") - (version "5.3.0") + (version "5.3.1") (source (origin (method url-fetch) @@ -508,7 +508,7 @@ (define-public whois name "_" version ".tar.xz")) (sha256 (base32 - "08sp2gzv09rar1a5mnfmbc24pqvhpqqmz2hnmv436n7v7d09qy2d")))) + "0gl98l26dcgmlap0pxllbv4b9n2fr5b7zml3ijf8sf3a60qsskpg")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite @@ -522,8 +522,7 @@ (define-public whois (setenv "HAVE_ICONV" "1") #t))))) (inputs - ;; TODO: Switch to libidn2 when >= 2.0.3 is ungrafted in master. - `(("libidn" ,libidn))) + `(("libidn2" ,libidn2))) (native-inputs `(("gettext" ,gettext-minimal) ("perl" ,perl) -- cgit v1.2.3 From 26633cb8b305ea25a2cdeb14fd47842d5a9940f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 17:00:51 +0200 Subject: gnu: samba: Update to 4.8.2. * gnu/packages/samba.scm (samba): Update to 4.8.2. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d12ca8f6e8..2f69fab690 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -148,14 +148,14 @@ (define (install dir) (define-public samba (package (name "samba") - (version "4.8.1") + (version "4.8.2") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "17bqgxyv34hjnb4hfamag75gwhqipp6mpvba5xg7lszi0xskdxwf")))) + "08mz29jmjxqvyyhm6pa388paagw1i2i21lc7pd2aprj9dllm5rb2")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From d5c472a21685b73947653cc3758d71109d7ee7b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 17:03:07 +0200 Subject: gnu: p11-kit: Update to 0.23.11. * gnu/packages/tls.scm (p11-kit): Update to 0.23.11. [arguments]: Add #:phases. Drop new "runtime" test. --- gnu/packages/tls.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 45a36db5c2..5e17a15db6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; @@ -125,7 +125,7 @@ (define-public asn1c (define-public p11-kit (package (name "p11-kit") - (version "0.23.10") + (version "0.23.11") (source (origin (method url-fetch) @@ -133,7 +133,7 @@ (define-public p11-kit "download/" version "/p11-kit-" version ".tar.gz")) (sha256 (base32 - "0hxfwnyb5yllvlsh0cj6favcph36gm94b6df7zhl7xay48zjl8gr")))) + "0asaxbypvns5xf9hb5jy0kijz0b3hp1s8likhywmry3klpdchhxj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -141,7 +141,17 @@ (define-public p11-kit `(("libffi" ,libffi) ("libtasn1" ,libtasn1))) (arguments - `(#:configure-flags '("--without-trust-paths"))) + `(#:configure-flags '("--without-trust-paths") + #:phases (modify-phases %standard-phases + (add-before 'check 'prepare-tests + (lambda _ + ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up + ;; and looks for .cache and other directories (only). + ;; For simplicity just drop it since it is irrelevant + ;; in the build container. + (substitute* "Makefile" + (("test-runtime\\$\\(EXEEXT\\)") "")) + #t))))) (home-page "https://p11-glue.freedesktop.org/p11-kit.html") (synopsis "PKCS#11 library") (description -- cgit v1.2.3 From b9d562284ca6f97facbcbe2fe4db7dcb2c1ebe00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 May 2018 17:13:20 +0200 Subject: gnu: x265: Update to 2.8. * gnu/packages/video.scm (x265): Update to 2.8. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b8d0d456d5..9ed0f4baed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -380,7 +380,7 @@ (define-public mkvtoolnix (define-public x265 (package (name "x265") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) @@ -388,7 +388,7 @@ (define-public x265 "x265_" version ".tar.gz")) (sha256 (base32 - "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym")) + "0qx8mavwdzdpkkby7n29i9av7zsnklavacwfz537mf62q2pzjnbf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From dc70ff2a86262f134c4b14fe88cc3a92bbf68c7d Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Sat, 26 May 2018 18:11:11 +0200 Subject: gnu: Add xonotic. * gnu/packages/games.scm (xonotic, xonotic-data): New variables. Signed-off-by: Rutger Helling --- gnu/packages/games.scm | 242 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bc4abd7b71..8d84a367a6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -90,6 +90,7 @@ (define-module (gnu packages games) #:use-module (gnu packages haskell) #:use-module (gnu packages mp3) #:use-module (gnu packages music) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) @@ -4911,3 +4912,244 @@ (define-public fortune-mod (description "Fortune is a command-line utility which displays a random quotation from a collection of quotes.") (license license:bsd-4))) + +(define xonotic-data + (package + (name "xonotic-data") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://dl.xonotic.org/xonotic-" + version ".zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2")))) + (build-system trivial-build-system) + (native-inputs + `(("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (xonotic (string-append out "/share/xonotic")) + (source (assoc-ref %build-inputs "source")) + (unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) + (copy-file source (string-append ,name "-" ,version ".zip")) + (invoke unzip (string-append ,name "-" ,version ".zip")) + (mkdir-p out) + (mkdir-p xonotic) + (chdir "Xonotic") + (copy-recursively "data" + (string-append xonotic "/data")) + (copy-recursively "server" + (string-append xonotic "/server")) + (install-file "key_0.d0pk" xonotic))))) + (home-page "http://xonotic.org") + (synopsis "Data files for Xonotic") + (description + "Xonotic-data provides the data files required by the game Xonotic.") + (license (list license:gpl2+ + license:x11)))) ; server/rcon.pl + +(define-public xonotic + (package + (name "xonotic") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://dl.xonotic.org/xonotic-" + version "-source.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "--prefix=" + (assoc-ref %outputs "out")) + "--disable-rijndael") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'make-darkplaces + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sharedir (string-append out "/share/xonotic/"))) + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + sharedir) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "cl-release") + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + sharedir) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "sdl-release") + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + sharedir) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "sv-release")))) + (add-before 'configure 'bootstrap + (lambda _ + (chdir "source/d0_blind_id") + (invoke "sh" "autogen.sh"))) + (add-after 'build 'install-desktop-entry + (lambda* (#:key outputs #:allow-other-keys) + ;; Add .desktop files for the 2 variants and the symlink + (let* ((output (assoc-ref outputs "out")) + (apps (string-append output "/share/applications"))) + (mkdir-p apps) + (with-output-to-file + (string-append apps "/xonotic-glx.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic-glx~@ + Comment=Xonotic glx~@ + Exec=~a/bin/xonotic-glx~@ + TryExec=~@*~a/bin/xonotic-glx~@ + Icon=~@ + Type=Application~%" + output))) + (with-output-to-file + (string-append apps "/xonotic-sdl.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic-sdl~@ + Comment=Xonotic sdl~@ + Exec=~a/bin/xonotic-sdl~@ + TryExec=~@*~a/bin/xonotic-sdl~@ + Icon=~@ + Type=Application~%" + output))) + (with-output-to-file + (string-append apps "/xonotic.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic~@ + Comment=Xonotic~@ + Exec=~a/bin/xonotic-glx~@ + TryExec=~@*~a/bin/xonotic~@ + Icon=~@ + Type=Application~%" + output))) + #t))) + (add-after 'install-desktop-entry 'install-icons + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "../../misc/logos/icons_png/" + (for-each + (lambda (file) + (let* ((size (string-filter char-numeric? file)) + (icons (string-append out "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file file (string-append icons "/xonotic.png")))) + '("xonotic_16.png" "xonotic_22.png" "xonotic_24.png" + "xonotic_32.png" "xonotic_48.png" "xonotic_64.png" + "xonotic_128.png" "xonotic_256.png" "xonotic_512.png")))))) + (add-after 'install-icons 'install-binaries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (define (install src dst) + (let ((dst (string-append out dst))) + (mkdir-p (dirname dst)) + (copy-file src dst))) + (mkdir-p (string-append out "/bin")) + (install "../darkplaces/darkplaces-dedicated" + "/bin/xonotic-dedicated") + (install "../darkplaces/darkplaces-glx" + "/bin/xonotic-glx") + (install "../darkplaces/darkplaces-sdl" + "/bin/xonotic-sdl") + ;; Provide a default xonotic executable, defaulting to SDL. + (symlink (string-append out "/bin/xonotic-sdl") + (string-append out "/bin/xonotic")) + #t))) + (add-after 'install-binaries 'install-data + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (data (assoc-ref inputs "xonotic-data"))) + (copy-recursively (string-append data "/share/xonotic") + (string-append out "/share/xonotic")) + #t))) + (add-after 'install-binaries 'wrap-binaries + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Curl and libvorbis need to be wrapped so that we get + ;; sound and networking. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/xonotic")) + (bin-sdl (string-append out "/bin/xonotic-sdl")) + (bin-glx (string-append out "/bin/xonotic-glx")) + (bin-dedicated (string-append out "/bin/xonotic-dedicated")) + (curl (assoc-ref inputs "curl")) + (vorbis (assoc-ref inputs "libvorbis"))) + (wrap-program bin + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-sdl + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-glx + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-dedicated + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + #t)))))) + (inputs + `(("xonotic-data" ,xonotic-data) + ("alsa-lib" ,alsa-lib) + ("curl" ,curl) + ("libjpeg" ,libjpeg) + ("libmodplug" ,libmodplug) + ("libvorbis" ,libvorbis) + ("libogg" ,libogg) + ("libxpm" ,libxpm) + ("libxxf86dga" ,libxxf86dga) + ("libxxf86vm" ,libxxf86vm) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp) + ("mesa" ,mesa) + ("glu" ,glu) + ("freetype" ,freetype) + ("sdl2" ,sdl2) + ("libpng" ,libpng) + ("hicolor-icon-theme" ,hicolor-icon-theme))) + (native-inputs + `(("unzip" ,unzip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("gmp" ,gmp))) + (home-page "http://xonotic.org") + (synopsis "Fast-paced first-person shooter game") + (description + "Xonotic is a free, fast-paced first-person shooter. +The project is geared towards providing addictive arena shooter +gameplay which is all spawned and driven by the community itself. +Xonotic is a direct successor of the Nexuiz project with years of +development between them, and it aims to become the best possible +open-source FPS of its kind.") + (license (list license:gpl2+ + license:bsd-3 ; /source/d0_blind_id folder and others + license:x11-style)))) -- cgit v1.2.3 From e0f415b2b56ed9319fda7f182a91692a36368c40 Mon Sep 17 00:00:00 2001 From: Adam Massmann Date: Sun, 20 May 2018 18:50:03 -0400 Subject: gnu: xapers: Fix recommended packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/search.scm (xapers): [inputs]: remove python, poppler [propagated-inputs]: add poppler, xclip, xdg-utils. [arguments]: modify-phases to disable x-terminal options. Signed-off-by: Ludovic Courtès --- gnu/packages/search.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 02deb5c4ae..5c8539d561 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -32,12 +32,14 @@ (define-module (gnu packages search) #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #: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 xdisorg) #:use-module (gnu packages xml)) (define-public xapian @@ -326,27 +328,52 @@ (define-public xapers "0ykz6hn3qj46w3c99d6q0pi5ncq2894simcl7vapv047zm3cylmd")))) (build-system python-build-system) (propagated-inputs - `(("python-urwid" ,python-urwid))) - (inputs `(("poppler" ,poppler) - ("python" ,python) - ("python-latexcodec" ,python-latexcodec) + ("python-urwid" ,python-urwid) + ("xclip" ,xclip) + ("xdg-utils" ,xdg-utils))) + (inputs + `(("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 + `(#:modules ((ice-9 rdelim) + (guix build python-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) + (define (purge-term-support input output) + (let loop ((line (read-line input))) + (if (string-prefix? "if [[ \"$term\"" line) + (begin (display "eval \"$cmd\"\n" output) + #t) + (begin (display (string-append line "\n") output) + (loop (read-line input)))))) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) + (adder-out (string-append bin "/xapers-adder")) (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))))))) + ;; below is equivalent to setting --no-term option + ;; permanently on; this is desirable to avoid imposing + ;; an x-terminal installation on the user but breaks + ;; some potential xapers-adder uses like auto browser + ;; pdf handler, but user could instead still use + ;; e.g. "xterm -e xapers-adder %F" for same use. + ;; alternatively we could propagate xterm as an input + ;; and replace 'x-terminal-emulator' with 'xterm' + (call-with-input-file "bin/xapers-adder" + (lambda (input) + (call-with-output-file adder-out + (lambda (output) + (purge-term-support input output))))) + (chmod adder-out #o555))))))) (home-page "https://finestructure.net/xapers/") (synopsis "Personal document indexing system") (description -- cgit v1.2.3 From 719871771d4fd6482878d1fedc3505c5d54c6622 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 18 May 2018 00:51:09 +0200 Subject: gnu: Add ucl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (ucl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/compression.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1cb0d208aa..4ce481ad19 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Joshua Sierles, Nextjournal +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -2151,3 +2152,25 @@ (define-public google-brotli The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (license license:expat))) + +(define-public ucl + (package + (name "ucl") + (version "1.03") + (source (origin + (method url-fetch) + (uri (string-append "http://www.oberhumer.com/opensource/" + name "/download/" name "-" version ".tar.gz")) + (sha256 + (base32 + "0j036lkwsxvm15gr29n8wn07cqq79dswjs9k54939ms5zngjjrdq")))) + (build-system gnu-build-system) + (home-page "http://www.oberhumer.com/opensource/ucl/") + (synopsis "Portable lossless data compression library") + (description "UCL implements a number of compression algorithms that +achieve an excellent compression ratio while allowing fast decompression. +Decompression requires no additional memory. + +Compared to LZO, the UCL algorithms achieve a better compression ratio but +decompression is a little bit slower.") + (license license:gpl2+))) -- cgit v1.2.3 From 5735256d0b5161ae99ad6e531748fce2d1bfa1b0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 26 May 2018 22:10:57 +0200 Subject: gnu: Add upx. * gnu/packages/compression.scm (upx): New variable. --- gnu/packages/compression.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4ce481ad19..29518b115d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2174,3 +2174,53 @@ (define-public ucl Compared to LZO, the UCL algorithms achieve a better compression ratio but decompression is a little bit slower.") (license license:gpl2+))) + +(define-public upx + (package + (name "upx") + (version "3.94") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/upx/upx/releases/download/v" + version "/" name "-" version "-src.tar.xz")) + (sha256 + (base32 + "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1")))) + (build-system gnu-build-system) + (native-inputs `(("perl" ,perl) + ("ucl" ,ucl))) + (inputs `(("zlib" ,zlib))) + (arguments + `(#:make-flags + (list "all" + ;; CHECK_WHITESPACE does not seem to work. + ;; See https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/upx. + "CHECK_WHITESPACE=true") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (delete 'install) + (add-before 'build 'patch-exec-bin-sh + (lambda _ + (substitute* (find-files "Makefile") + (("/bin/sh") (which "sh"))) + (substitute* "src/Makefile" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'build 'install-upx + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "src/upx.out" (string-append bin "/upx"))) + #t)) + ))) + (home-page "https://upx.github.io/") + (synopsis "Compression tool for executables") + (description + "The Ultimate Packer for eXecutables (UPX) is an executable file +compressor. UPX typically reduces the file size of programs and shared +libraries by around 50%--70%, thus reducing disk space, network load times, +download times, and other distribution and storage costs.") + (license license:gpl2+))) -- cgit v1.2.3 From 0d529a7c6a4ee47ce6ed2153697219318ab16703 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 20 May 2018 14:09:13 +0200 Subject: gnu: gifsicle: New variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (gifsicle): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/image.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b88f6cf9de..d6c39e5c7e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -1400,3 +1401,50 @@ (define-public r-jpeg images stored in the JPEG format with R. It can read and write both files and in-memory raw vectors.") (license license:gpl2+))) + +(define-public gifsicle + (package + (name "gifsicle") + (version "1.91") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.lcdf.org/gifsicle/gifsicle-" + version ".tar.gz")) + (sha256 + (base32 + "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda _ + (substitute* "test/testie" + (("/usr/bin/perl") + (which "perl")) + (("/bin/sh") + (which "sh")) + (("/bin/rm") + (which "rm"))) + #t))))) + (native-inputs `(("perl" ,perl))) ; Only for tests. + (inputs `(("libx11" ,libx11))) + (home-page "http://www.lcdf.org/gifsicle/") + (synopsis "Edit GIF images and animations") + (description "Gifsicle is a command-line GIF image manipulation tool that: + +@itemize +@item Provides a batch mode for changing GIFs in place. +@item Prints detailed information about GIFs, including comments. +@item Control over interlacing, comments, looping, transparency, etc. +@item Creates well-behaved GIFs: removes redundant colors, only uses local color +tables, etc. +@item Shrinks colormaps and change images to use the Web-safe palette. +@item Optimizes GIF animations, or unoptimizes them for easier editing. +@end itemize + +Two other programs are included with Gifsicle: @command{gifview} is a +lightweight animated-GIF viewer, and @command{gifdiff} compares two GIFs for +identical visual appearance.") + (license license:gpl2+))) -- cgit v1.2.3 From e8f4d53e037df2b88d8cadd9f933c03f27e8d0ab Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Sat, 12 May 2018 14:53:56 +0000 Subject: gnu: Add pybind11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (pybind11): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4cda7192fd..39a367aec8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13440,3 +13440,32 @@ (define-public python2-gdrivefs (description "@code{gdrivefs} provides a FUSE wrapper for Google Drive under Python 2.7.") (license license:gpl2))) + +(define-public pybind11 + (package + (name "pybind11") + (version "2.2.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/pybind/pybind11/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "1sj0x4fwsbnwdai5sxpw1l1vh8m5hpbkfk3zanxcbcgs39jpnfrs")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python) + ("python-pytest" ,python-pytest))) + (arguments + `(#:test-target "check")) + (home-page "https://github.com/pybind/pybind11/") + (synopsis "Seamless operability between C++11 and Python") + (description "pybind11 is a lightweight header-only library that exposes +C++ types in Python and vice versa, mainly to create Python bindings of +existing C++ code. Its goals and syntax are similar to the excellent +Boost.Python library by David Abrahams: to minimize boilerplate code in +traditional extension modules by inferring type information using compile-time +introspection.") + (license license:expat))) -- cgit v1.2.3 From ab7da7bc39004cb1d2d09ce9b0c34ee7993fc141 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 27 May 2018 01:20:01 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.133. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.133. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 70e612995e..990d2c9d98 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -419,8 +419,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.132" - "012nmbvvi8sg0iav5aibk8qx189iwqjadnr4h5jv65gzi7i79li9" + (make-linux-libre "4.4.133" + "05qc9smcvxd68d46l5gjhvihhnidkiymqh4fv4nyagzv555q7na7" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From ce9484d85101338d2aa7194155ae232722a9b0f4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 27 May 2018 01:21:55 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.103. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.103. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 990d2c9d98..eadc1ad639 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.102" - "1y32rc2zi2is4yl184i1vbbvc7gvkyr15r325g2syascxqzxarn0" + (make-linux-libre "4.9.103" + "00g58y92pmb6xf9lhjrab2jrjv3naw3857pf9s43dvh6fwlbccbf" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 52a13798140590c2aa2e5e78ad8866fdb742bc7e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 27 May 2018 01:22:36 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.44. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.44. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index eadc1ad639..7bf591ab7e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,8 +403,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.43") -(define %linux-libre-4.14-hash "0mqgxp0001j11m5s82s7j4398443zx474a5kpzql7cqf3aljfybm") +(define %linux-libre-4.14-version "4.14.44") +(define %linux-libre-4.14-hash "0w89y22by17yqk89l1mmhlvz0i4dkp1mjc347nq3zy1llbwiwvnf") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From a4e45acdc07fc3faf2844b3658ee31ebc538bd1c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 27 May 2018 01:23:26 -0400 Subject: gnu: linux-libre: Update to 4.16.12. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.12. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7bf591ab7e..dae0d806d8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,8 +394,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux" "a ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.16.11") -(define %linux-libre-hash "0dc6kwpzncg2a8haf081i5si4ry9y3x6m39bjblbx9c809hdls6g") +(define %linux-libre-version "4.16.12") +(define %linux-libre-hash "1zjq16z5cdcpa4acqdilavjjv2xbqnh3fmn400n9hd5pzyll817m") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3