From 1f3921e1435db7c9489f22832554ad4692434efc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 7 Mar 2018 17:39:04 +0100 Subject: doc: Explain what we mean by root in binary installation. * doc/guix.texi (Binary Installation): Add explicit instructions to become root. --- doc/guix.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index abec0c0879..d3a7908f9c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -443,7 +443,8 @@ and rerun the @code{gpg --verify} command. @c end authentication part @item -As @code{root}, run: +Now, you need to become the @code{root} user. Depending on your distribution, +you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run: @example # cd /tmp -- cgit v1.2.3 From bbf8540d43bf84349fa1c002b2d1c42ebcc02636 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:12:57 +0100 Subject: gnu: python-sympy, python2-sympy: Only run core tests. * gnu/packages/python.scm (python-sympy, python2-sympy)[arguments]: Move tests after installation; run only core tests. --- gnu/packages/python.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 73b0e91327..c454539fef 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5066,6 +5066,17 @@ (define-public python-sympy (sha256 (base32 "190n29sppw7g8ihilc5451y7jlfcaw56crqiqbf1jff43dlmfnxc")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Run the core tests after installation. By default it would run + ;; *all* tests, which take a very long time to complete and are known + ;; to be flaky. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python3" "-c" "import sympy; sympy.test(\"/core\")") + #t))))) (propagated-inputs `(("python-mpmath" ,python-mpmath))) (home-page "http://www.sympy.org/") @@ -5077,7 +5088,19 @@ (define-public python-sympy (license license:bsd-3))) (define-public python2-sympy - (package-with-python2 python-sympy)) + (package + (inherit (package-with-python2 python-sympy)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Run the core tests after installation. By default it would run + ;; *all* tests, which take a very long time to complete and are known + ;; to be flaky. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python" "-c" "import sympy; sympy.test(\"/core\")") + #t))))))) (define-public python-q (package -- cgit v1.2.3 From 1b17fdbe41053a91af07f3612094096f86c926cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:01:22 +0100 Subject: gnu: r-openssl: Update to 1.0.1. * gnu/packages/statistics.scm (r-openssl): Update to 1.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0ae4dddb64..635cf51d27 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2235,14 +2235,14 @@ (define-public r-roxygen2 (define-public r-openssl (package (name "r-openssl") - (version "1.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1j8smqrb79lnaf2n9icksjiy641fcazsbkhmgg916s3nnyjngjz3")))) + "1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30")))) (build-system r-build-system) (inputs `(("libressl" ,libressl))) -- cgit v1.2.3 From 69c38faa918c7f813a75f3499d2238b6f9ad4ff1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:01:38 +0100 Subject: gnu: r-nmf: Update to 0.21.0. * gnu/packages/statistics.scm (r-nmf): Update to 0.21.0. --- gnu/packages/statistics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 635cf51d27..ef494dab0a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3331,20 +3331,20 @@ (define-public r-bigmemory (define-public r-nmf (package (name "r-nmf") - (version "0.20.6") + (version "0.21.0") (source (origin (method url-fetch) (uri (cran-uri "NMF" version)) (sha256 (base32 - "0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z")))) + "1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v")))) (properties `((upstream-name . "NMF"))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) - ("r-bigmemory" ,r-bigmemory) - ("r-synchronicity" ,r-synchronicity) + ("r-bigmemory" ,r-bigmemory) ; suggested + ("r-synchronicity" ,r-synchronicity) ; suggested ("r-colorspace" ,r-colorspace) ("r-digest" ,r-digest) ("r-doparallel" ,r-doparallel) -- cgit v1.2.3 From b7ce825c85b474caeba67017b6e3b582f0e4c1a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:01:49 +0100 Subject: gnu: r-sfsmisc: Update to 1.1-2. * gnu/packages/statistics.scm (r-sfsmisc): Update to 1.1-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ef494dab0a..7722cb3aa0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4027,14 +4027,14 @@ (define-public r-fastcluster (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-1") + (version "1.1-2") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf")))) + "0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") -- cgit v1.2.3 From 53cc59a1d86cb31fc2505ead2bf9f80b13743ecf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:15:30 +0100 Subject: gnu: r-ape: Move to (gnu packages cran). * gnu/packages/bioinformatics.scm (r-ape): Move from here... * gnu/packages/cran.scm (r-ape): ...to here. --- gnu/packages/bioinformatics.scm | 26 -------------------------- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 73765dafe7..a5ad2c57e7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -110,32 +110,6 @@ (define-module (gnu packages bioinformatics) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -(define-public r-ape - (package - (name "r-ape") - (version "5.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "ape" version)) - (sha256 - (base32 - "0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3")))) - (build-system r-build-system) - (propagated-inputs - `(("r-lattice" ,r-lattice) - ("r-nlme" ,r-nlme) - ("r-rcpp" ,r-rcpp))) - (home-page "http://ape-package.ird.fr/") - (synopsis "Analyses of phylogenetics and evolution") - (description - "This package provides functions for reading, writing, plotting, and -manipulating phylogenetic trees, analyses of comparative data in a -phylogenetic framework, ancestral character analyses, analyses of -diversification and macroevolution, computing distances from DNA sequences, -and several other tools.") - (license license:gpl2+))) - (define-public aragorn (package (name "aragorn") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4cf394e6e..adcc178592 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Raoul Bonnal ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,32 @@ (define-module (gnu packages cran) #:use-module (gnu packages statistics) #:use-module (gnu packages web)) +(define-public r-ape + (package + (name "r-ape") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ape" version)) + (sha256 + (base32 + "0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3")))) + (build-system r-build-system) + (propagated-inputs + `(("r-lattice" ,r-lattice) + ("r-nlme" ,r-nlme) + ("r-rcpp" ,r-rcpp))) + (home-page "http://ape-package.ird.fr/") + (synopsis "Analyses of phylogenetics and evolution") + (description + "This package provides functions for reading, writing, plotting, and +manipulating phylogenetic trees, analyses of comparative data in a +phylogenetic framework, ancestral character analyses, analyses of +diversification and macroevolution, computing distances from DNA sequences, +and several other tools.") + (license license:gpl2+))) + (define-public r-colorspace (package (name "r-colorspace") -- cgit v1.2.3 From 35b0c051c51d0d582a7ba9664c2270aae7b45f6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:03 +0100 Subject: gnu: Add r-signal. * gnu/packages/cran.scm (r-signal): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index adcc178592..c096a9d037 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2951,3 +2951,26 @@ (define-public r-algdesign a candidate list, using several criteria. The blocking can be done when whole and within plot factors interact.") (license license:gpl2+))) + +(define-public r-signal + (package + (name "r-signal") + (version "0.7-6") + (source + (origin + (method url-fetch) + (uri (cran-uri "signal" version)) + (sha256 + (base32 + "1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b")))) + (build-system r-build-system) + (propagated-inputs `(("r-mass" ,r-mass))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "http://cran.r-project.org/web/packages/signal/") + (synopsis "Signal processing") + (description + "This package provides a set of signal processing functions originally +written for Matlab and GNU Octave. It includes filter generation utilities, +filtering functions, resampling routines, and visualization of filter models. +It also includes interpolation functions.") + (license license:gpl2))) -- cgit v1.2.3 From db80dd4a1d7e2371bc3c300f48b84a817adb3550 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:11 +0100 Subject: gnu: Add r-psych. * gnu/packages/cran.scm (r-psych): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c096a9d037..84b7b244d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2974,3 +2974,34 @@ (define-public r-signal filtering functions, resampling routines, and visualization of filter models. It also includes interpolation functions.") (license license:gpl2))) + +(define-public r-psych + (package + (name "r-psych") + (version "1.7.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "psych" version)) + (sha256 + (base32 + "0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k")))) + (build-system r-build-system) + (propagated-inputs + `(("r-foreign" ,r-foreign) + ("r-lattice" ,r-lattice) + ("r-mnormt" ,r-mnormt) + ("r-nlme" ,r-nlme))) + (home-page "http://cran.r-project.org/web/packages/psych") + (synopsis "Procedures for psychological, psychometric, and personality research") + (description + "This package provides a general purpose toolbox for personality, +psychometric theory and experimental psychology. The functions are primarily +for multivariate analysis and scale construction using factor analysis, +principal component analysis, cluster analysis and reliability analysis, +although others provide basic descriptive statistics. It provides functions +for analyzing data at multiple levels within and between group statistics, +including correlations and factor analysis; functions for simulating and +testing particular item and test structures are included. Several functions +serve as a useful front end for structural equation modeling.") + (license license:gpl2+))) -- cgit v1.2.3 From 3dab50d92aedeb276d7997ccf9b37535ada58454 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:19 +0100 Subject: gnu: Add r-gsubfn. * gnu/packages/cran.scm (r-gsubfn): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 84b7b244d9..ae7b442f64 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3005,3 +3005,29 @@ (define-public r-psych testing particular item and test structures are included. Several functions serve as a useful front end for structural equation modeling.") (license license:gpl2+))) + +(define-public r-gsubfn + (package + (name "r-gsubfn") + (version "0.6-6") + (source + (origin + (method url-fetch) + (uri (cran-uri "gsubfn" version)) + (sha256 + (base32 + "196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv")))) + (build-system r-build-system) + (propagated-inputs `(("r-proto" ,r-proto))) + (home-page "http://gsubfn.googlecode.com") + (synopsis "Utilities for strings and function arguments.") + (description + "This package provides @code{gsubfn} which is like @code{gsub} but can +take a replacement function or certain other objects instead of the +replacement string. Matches and back references are input to the replacement +function and replaced by the function output. @code{gsubfn} can be used to +split strings based on content rather than delimiters and for quasi-perl-style +string interpolation. The package also has facilities for translating +formulas to functions and allowing such formulas in function calls instead of +functions.") + (license license:gpl2+))) -- cgit v1.2.3 From 3a563a410ab8791dfc2a51aae4cd79c1fce1458d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:29 +0100 Subject: gnu: Add r-sqldf. * gnu/packages/cran.scm (r-sqldf): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae7b442f64..c8a4216767 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3031,3 +3031,34 @@ (define-public r-gsubfn formulas to functions and allowing such formulas in function calls instead of functions.") (license license:gpl2+))) + +(define-public r-sqldf + (package + (name "r-sqldf") + (version "0.4-11") + (source + (origin + (method url-fetch) + (uri (cran-uri "sqldf" version)) + (sha256 + (base32 + "0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff")))) + (build-system r-build-system) + (propagated-inputs + `(("r-chron" ,r-chron) + ("r-dbi" ,r-dbi) + ("r-gsubfn" ,r-gsubfn) + ("r-proto" ,r-proto) + ("r-rsqlite" ,r-rsqlite))) + (home-page "https://github.com/ggrothendieck/sqldf") + (synopsis "Manipulate R data frames using SQL") + (description + "The @code{sqldf} function is typically passed a single argument which is +an SQL select statement where the table names are ordinary R data frame names. +@code{sqldf} transparently sets up a database, imports the data frames into +that database, performs the SQL statement and returns the result using a +heuristic to determine which class to assign to each column of the returned +data frame. The @code{sqldf} or @code{read.csv.sql} functions can also be +used to read filtered files into R even if the original files are larger than +R itself can handle.") + (license license:gpl2))) -- cgit v1.2.3 From 94e46cabc1222b82f1cef091fd955b839f2493d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:36 +0100 Subject: gnu: Add r-abind. * gnu/packages/cran.scm (r-abind): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8a4216767..e7e49fd519 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3062,3 +3062,25 @@ (define-public r-sqldf used to read filtered files into R even if the original files are larger than R itself can handle.") (license license:gpl2))) + +(define-public r-abind + (package + (name "r-abind") + (version "1.4-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "abind" version)) + (sha256 + (base32 + "0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis")))) + (build-system r-build-system) + (home-page "http://cran.r-project.org/web/packages/abind/") + (synopsis "Combine multidimensional arrays") + (description + "This package provides tools to combine multidimensional arrays into a +single array. This is a generalization of @code{cbind} and @code{rbind}. It +works with vectors, matrices, and higher-dimensional arrays. It also provides +the functions @code{adrop}, @code{asub}, and @code{afill} for manipulating, +extracting and replacing data in arrays.") + (license license:lgpl2.0+))) -- cgit v1.2.3 From fc784b6672eb8d21e1cb52dda1fd32c1bc4ae9a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:16:44 +0100 Subject: gnu: Add r-prroc. * gnu/packages/cran.scm (r-prroc): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e7e49fd519..4b63c0f644 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3084,3 +3084,27 @@ (define-public r-abind the functions @code{adrop}, @code{asub}, and @code{afill} for manipulating, extracting and replacing data in arrays.") (license license:lgpl2.0+))) + +(define-public r-prroc + (package + (name "r-prroc") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "PRROC" version)) + (sha256 + (base32 + "03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc")))) + (properties `((upstream-name . "PRROC"))) + (build-system r-build-system) + (home-page "http://cran.r-project.org/web/packages/PRROC/") + (synopsis "Precision-Recall and ROC curves for weighted and unweighted data") + (description + "This package computes the areas under the @dfn{precision-recall} (PR) +and ROC curve for weighted (e.g. soft-labeled) and unweighted data. In +contrast to other implementations, the interpolation between points of the PR +curve is done by a non-linear piecewise function. In addition to the areas +under the curves, the curves themselves can also be computed and plotted by a +specific S3-method.") + (license license:gpl3))) -- cgit v1.2.3 From 661bb51e668a239372dbc4df582b73ca356e38bc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:29:15 +0100 Subject: gnu: Add r-vim. * gnu/packages/cran.scm (r-vim): New variable. --- gnu/packages/cran.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4b63c0f644..efb612e34f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3108,3 +3108,41 @@ (define-public r-prroc under the curves, the curves themselves can also be computed and plotted by a specific S3-method.") (license license:gpl3))) + +(define-public r-vim + (package + (name "r-vim") + (version "4.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "VIM" version)) + (sha256 + (base32 + "1vjcs5wvjv94ln01d94h9rs4j50d3ky4n26mm3prgh13raylrmnd")))) + (properties `((upstream-name . "VIM"))) + (build-system r-build-system) + (propagated-inputs + `(("r-car" ,r-car) + ("r-colorspace" ,r-colorspace) + ("r-data-table" ,r-data-table) + ("r-e1071" ,r-e1071) + ("r-laeken" ,r-laeken) + ("r-mass" ,r-mass) + ("r-nnet" ,r-nnet) + ("r-rcpp" ,r-rcpp) + ("r-robustbase" ,r-robustbase) + ("r-sp" ,r-sp) + ("r-vcd" ,r-vcd))) + (home-page "https://github.com/alexkowa/VIM") + (synopsis "Visualization and imputation of missing values") + (description + "This package provides tools for the visualization of missing and/or +imputed values are introduced, which can be used for exploring the data and +the structure of the missing and/or imputed values. Depending on this +structure of the missing values, the corresponding methods may help to +identify the mechanism generating the missing values and allows to explore the +data including missing values. In addition, the quality of imputation can be +visually explored using various univariate, bivariate, multiple and +multivariate plot methods.") + (license license:gpl2+))) -- cgit v1.2.3 From d10b0952ce6be1c4f172b21622184e59bb3e1020 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:29:44 +0100 Subject: gnu: Add r-fnn. * gnu/packages/cran.scm (r-fnn): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index efb612e34f..81b791d346 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3146,3 +3146,26 @@ (define-public r-vim visually explored using various univariate, bivariate, multiple and multivariate plot methods.") (license license:gpl2+))) + +(define-public r-fnn + (package + (name "r-fnn") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "FNN" version)) + (sha256 + (base32 + "1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj")))) + (properties `((upstream-name . "FNN"))) + (build-system r-build-system) + (home-page "http://cran.r-project.org/web/packages/FNN") + (synopsis "Fast nearest neighbor search algorithms and applications") + (description + "This package provides cover-tree and kd-tree fast k-nearest neighbor +search algorithms. Related applications including KNN classification, +regression and information measures are implemented.") + ;; The DESCRIPTION file erroneously states that GPL version 2.1 or + ;; later can be used. + (license license:gpl2+))) -- cgit v1.2.3 From be815dbdda155e1e920667a1c34bf264cb20f5b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:29:53 +0100 Subject: gnu: Add r-smoother. * gnu/packages/cran.scm (r-smoother): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81b791d346..4e3a036044 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3169,3 +3169,26 @@ (define-public r-fnn ;; The DESCRIPTION file erroneously states that GPL version 2.1 or ;; later can be used. (license license:gpl2+))) + +(define-public r-smoother + (package + (name "r-smoother") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "smoother" version)) + (sha256 + (base32 + "0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ttr" ,r-ttr))) + (home-page "http://cran.r-project.org/web/packages/smoother") + (synopsis "Functions relating to the smoothing of numerical data") + (description + "This package provides a collection of methods for smoothing numerical +data, commencing with a port of the Matlab gaussian window smoothing function. +In addition, several functions typically used in smoothing of financial data +are included.") + (license license:gpl2))) -- cgit v1.2.3 From 22a0c6596921b87dd8cc38dfbdf99e13ae719a7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:29:59 +0100 Subject: gnu: Add r-phangorn. * gnu/packages/bioinformatics.scm (r-phangorn): New variable. --- gnu/packages/bioinformatics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a5ad2c57e7..92549d3c75 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10853,6 +10853,34 @@ (define-public r-delayedmatrixstats memory usage and processing time is minimized.") (license license:expat))) +(define-public r-phangorn + (package + (name "r-phangorn") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "phangorn" version)) + (sha256 + (base32 + "0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-fastmatch" ,r-fastmatch) + ("r-igraph" ,r-igraph) + ("r-magrittr" ,r-magrittr) + ("r-matrix" ,r-matrix) + ("r-quadprog" ,r-quadprog) + ("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/KlausVigo/phangorn") + (synopsis "Phylogenetic analysis in R") + (description + "Phangorn is a package for phylogenetic analysis in R. It supports +estimation of phylogenetic trees and networks using Maximum Likelihood, +Maximum Parsimony, distance methods and Hadamard conjugation.") + (license license:gpl2+))) + (define-public r-dropbead (let ((commit "d746c6f3b32110428ea56d6a0001ce52a251c247") (revision "2")) -- cgit v1.2.3 From 1b5905fe689716e73ad7defc1bf8c6a13966f3c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Mar 2018 23:38:41 +0100 Subject: gnu: r-fnn: Remove duplicate definition. * gnu/packages/cran.scm (r-fnn)[home-page]: Use HTTPS. * gnu/packages/statistics.scm (r-fnn): Remove. --- gnu/packages/cran.scm | 2 +- gnu/packages/statistics.scm | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4e3a036044..9b690833ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3160,7 +3160,7 @@ (define-public r-fnn "1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj")))) (properties `((upstream-name . "FNN"))) (build-system r-build-system) - (home-page "http://cran.r-project.org/web/packages/FNN") + (home-page "https://cran.r-project.org/web/packages/FNN") (synopsis "Fast nearest neighbor search algorithms and applications") (description "This package provides cover-tree and kd-tree fast k-nearest neighbor diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7722cb3aa0..1324abd1f5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4906,27 +4906,6 @@ (define-public r-pbapply showing the progress is useful e.g. bootstrap.") (license license:gpl2))) -(define-public r-fnn - (package - (name "r-fnn") - (version "1.1") - (source - (origin - (method url-fetch) - (uri (cran-uri "FNN" version)) - (sha256 - (base32 - "1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj")))) - (properties `((upstream-name . "FNN"))) - (build-system r-build-system) - (home-page "https://cran.r-project.org/web/packages/FNN") - (synopsis "Fast nearest neighbor search algorithms and applications") - (description - "This package provides cover-tree and kd-tree fast k-nearest neighbor -search algorithms and related applications including KNN classification, -regression and information measures.") - (license license:gpl2+))) - (define-public r-minqa (package (name "r-minqa") -- cgit v1.2.3 From d8f46d52343972af6734c28cce94559e1c78481f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Mar 2018 11:20:22 +0100 Subject: gnu: hdf5: Do not record the build-time kernel version. * gnu/packages/maths.scm (hdf5)[arguments]: Patch libhdf5.settings to prevent the kernel version on the build node from affecting the output. --- gnu/packages/maths.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8d0c10697f..cf3d8ae836 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -724,7 +724,11 @@ (define-public hdf5 ;; unnecessary store references to those compilers: (substitute* "src/libhdf5.settings" (("(/gnu/store/)([a-Z0-9]*)" all prefix hash) - (string-append prefix (string-take hash 10) "..."))) + (string-append prefix (string-take hash 10) "...")) + ;; Don't record the build-time kernel version to make the + ;; settings file reproducible. + (("Uname information:.*") + "Uname information: Linux\n")) #t)) (add-after 'install 'patch-references (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From a539ad867da9d02d50330c1454e924cf3587f7c6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Mar 2018 11:40:59 +0100 Subject: gnu: r-rhdf5lib: Make build reproducible. * gnu/packages/bioinformatics.scm (r-rhdf5lib)[arguments]: Remove timestamp and host system kernel version. --- gnu/packages/bioinformatics.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92549d3c75..14e2a0daac 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10654,6 +10654,16 @@ (define-public r-rhdf5lib (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) (rename-file (string-append "hdf5-" ,(package-version hdf5)) "hdf5") + ;; Remove timestamp and host system information to make + ;; the build reproducible. + (substitute* "hdf5/src/libhdf5.settings.in" + (("Configured on: @CONFIG_DATE@") + "Configured on: Guix") + (("Uname information:.*") + "Uname information: Linux\n") + ;; Remove unnecessary store reference. + (("C Compiler:.*") + "C Compiler: GCC\n")) (rename-file "Makevars.in" "Makevars") (substitute* "Makevars" (("HDF5_CXX_LIB=.*") -- cgit v1.2.3 From 6310dff1dc3d9a6979312f93466d58650c1fe322 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 6 Mar 2018 15:42:49 +0300 Subject: services: dovecot: Copy dovecot.conf to /etc/dovecot. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many Dovecot utilities compiled with assumption of ‘/etc/dovecot/dovecot.conf’ existence. * gnu/services/mail.scm (dovecot-shepherd-service): Move config generation. Invoke ‘dovecot’ without ‘-c’ flag. (%dovecot-activation): Copy ‘dovecot.conf’ to ‘/etc/dovecot’. (dovecot-service-type): Make ‘%dovecot-activation’ non-constant. --- gnu/services/mail.scm | 147 +++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index ab90942739..573efa0433 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1435,90 +1435,91 @@ (define %dovecot-accounts (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))) -(define %dovecot-activation +(define (%dovecot-activation config) ;; Activation gexp. - #~(begin - (use-modules (guix build utils)) - (define (mkdir-p/perms directory owner perms) - (mkdir-p directory) - (chown "/var/run/dovecot" (passwd:uid owner) (passwd:gid owner)) - (chmod directory perms)) - (define (build-subject parameters) - (string-concatenate - (map (lambda (pair) - (let ((k (car pair)) (v (cdr pair))) - (define (escape-char str chr) - (string-join (string-split str chr) (string #\\ chr))) - (string-append "/" k "=" - (escape-char (escape-char v #\=) #\/)))) - (filter (lambda (pair) (cdr pair)) parameters)))) - (define* (create-self-signed-certificate-if-absent - #:key private-key public-key (owner (getpwnam "root")) - (common-name (gethostname)) - (organization-name "GuixSD") - (organization-unit-name "Default Self-Signed Certificate") - (subject-parameters `(("CN" . ,common-name) - ("O" . ,organization-name) - ("OU" . ,organization-unit-name))) - (subject (build-subject subject-parameters))) - ;; Note that by default, OpenSSL outputs keys in PEM format. This - ;; is what we want. - (unless (file-exists? private-key) - (cond - ((zero? (system* (string-append #$openssl "/bin/openssl") - "genrsa" "-out" private-key "2048")) - (chown private-key (passwd:uid owner) (passwd:gid owner)) - (chmod private-key #o400)) - (else - (format (current-error-port) - "Failed to create private key at ~a.\n" private-key)))) - (unless (file-exists? public-key) - (cond - ((zero? (system* (string-append #$openssl "/bin/openssl") - "req" "-new" "-x509" "-key" private-key - "-out" public-key "-days" "3650" - "-batch" "-subj" subject)) - (chown public-key (passwd:uid owner) (passwd:gid owner)) - (chmod public-key #o444)) - (else - (format (current-error-port) - "Failed to create public key at ~a.\n" public-key))))) - (let ((user (getpwnam "dovecot"))) - (mkdir-p/perms "/var/run/dovecot" user #o755) - (mkdir-p/perms "/var/lib/dovecot" user #o755) - (mkdir-p/perms "/etc/dovecot" user #o755) - (mkdir-p/perms "/etc/dovecot/private" user #o700) - (create-self-signed-certificate-if-absent - #:private-key "/etc/dovecot/private/default.pem" - #:public-key "/etc/dovecot/default.pem" - #:owner (getpwnam "root") - #:common-name (format #f "Dovecot service on ~a" (gethostname)))))) + (let ((config-str + (cond + ((opaque-dovecot-configuration? config) + (opaque-dovecot-configuration-string config)) + (else + (with-output-to-string + (lambda () + (serialize-configuration config + dovecot-configuration-fields))))))) + #~(begin + (use-modules (guix build utils)) + (define (mkdir-p/perms directory owner perms) + (mkdir-p directory) + (chown "/var/run/dovecot" (passwd:uid owner) (passwd:gid owner)) + (chmod directory perms)) + (define (build-subject parameters) + (string-concatenate + (map (lambda (pair) + (let ((k (car pair)) (v (cdr pair))) + (define (escape-char str chr) + (string-join (string-split str chr) (string #\\ chr))) + (string-append "/" k "=" + (escape-char (escape-char v #\=) #\/)))) + (filter (lambda (pair) (cdr pair)) parameters)))) + (define* (create-self-signed-certificate-if-absent + #:key private-key public-key (owner (getpwnam "root")) + (common-name (gethostname)) + (organization-name "GuixSD") + (organization-unit-name "Default Self-Signed Certificate") + (subject-parameters `(("CN" . ,common-name) + ("O" . ,organization-name) + ("OU" . ,organization-unit-name))) + (subject (build-subject subject-parameters))) + ;; Note that by default, OpenSSL outputs keys in PEM format. This + ;; is what we want. + (unless (file-exists? private-key) + (cond + ((zero? (system* (string-append #$openssl "/bin/openssl") + "genrsa" "-out" private-key "2048")) + (chown private-key (passwd:uid owner) (passwd:gid owner)) + (chmod private-key #o400)) + (else + (format (current-error-port) + "Failed to create private key at ~a.\n" private-key)))) + (unless (file-exists? public-key) + (cond + ((zero? (system* (string-append #$openssl "/bin/openssl") + "req" "-new" "-x509" "-key" private-key + "-out" public-key "-days" "3650" + "-batch" "-subj" subject)) + (chown public-key (passwd:uid owner) (passwd:gid owner)) + (chmod public-key #o444)) + (else + (format (current-error-port) + "Failed to create public key at ~a.\n" public-key))))) + (let ((user (getpwnam "dovecot"))) + (mkdir-p/perms "/var/run/dovecot" user #o755) + (mkdir-p/perms "/var/lib/dovecot" user #o755) + (mkdir-p/perms "/etc/dovecot" user #o755) + (copy-file #$(plain-file "dovecot.conf" config-str) + "/etc/dovecot/dovecot.conf") + (mkdir-p/perms "/etc/dovecot/private" user #o700) + (create-self-signed-certificate-if-absent + #:private-key "/etc/dovecot/private/default.pem" + #:public-key "/etc/dovecot/default.pem" + #:owner (getpwnam "root") + #:common-name (format #f "Dovecot service on ~a" (gethostname))))))) (define (dovecot-shepherd-service config) "Return a list of for CONFIG." - (let* ((config-str - (cond - ((opaque-dovecot-configuration? config) - (opaque-dovecot-configuration-string config)) - (else - (with-output-to-string - (lambda () - (serialize-configuration config - dovecot-configuration-fields)))))) - (config-file (plain-file "dovecot.conf" config-str)) - (dovecot (if (opaque-dovecot-configuration? config) - (opaque-dovecot-configuration-dovecot config) - (dovecot-configuration-dovecot config)))) + (let ((dovecot (if (opaque-dovecot-configuration? config) + (opaque-dovecot-configuration-dovecot config) + (dovecot-configuration-dovecot config)))) (list (shepherd-service (documentation "Run the Dovecot POP3/IMAP mail server.") (provision '(dovecot)) (requirement '(networking)) (start #~(make-forkexec-constructor (list (string-append #$dovecot "/sbin/dovecot") - "-F" "-c" #$config-file))) + "-F"))) (stop #~(make-forkexec-constructor (list (string-append #$dovecot "/sbin/dovecot") - "-c" #$config-file "stop"))))))) + "stop"))))))) (define %dovecot-pam-services (list (unix-pam-service "dovecot"))) @@ -1533,7 +1534,7 @@ (define dovecot-service-type (service-extension pam-root-service-type (const %dovecot-pam-services)) (service-extension activation-service-type - (const %dovecot-activation)))))) + %dovecot-activation))))) (define* (dovecot-service #:key (config (dovecot-configuration))) "Return a service that runs @command{dovecot}, a mail server that can run -- cgit v1.2.3 From a9079b488037371f90514b82961dc075ea0b3985 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 8 Mar 2018 00:27:16 +0300 Subject: tests: mail: Add test for dovecot. * gnu/tests/mail.scm (%dovecot-os, %test-dovecot): New variables. (run-dovecot-test): New procedure. --- gnu/tests/mail.scm | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index 312df9b1cd..4de13b8684 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,8 @@ (define-module (gnu tests mail) #:use-module (guix store) #:use-module (ice-9 ftw) #:export (%test-opensmtpd - %test-exim)) + %test-exim + %test-dovecot)) (define %opensmtpd-os (simple-operating-system @@ -279,3 +281,119 @@ (define %test-exim (name "exim") (description "Send an email to a running an Exim server.") (value (run-exim-test)))) + +(define %dovecot-os + (simple-operating-system + (dhcp-client-service) + (dovecot-service #:config + (dovecot-configuration + (disable-plaintext-auth? #f) + (ssl? "no") + (auth-mechanisms '("anonymous")) + (auth-anonymous-username "alice") + (mail-location + (string-append "maildir:~/Maildir" + ":INBOX=~/Maildir/INBOX" + ":LAYOUT=fs")))))) + +(define (run-dovecot-test) + "Return a test of an OS running Dovecot service." + (define vm + (virtual-machine + (operating-system (marionette-operating-system + %dovecot-os + #:imported-modules '((gnu services herd)))) + (port-forwardings '((8143 . 143))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (ice-9 iconv) + (ice-9 rdelim) + (rnrs base) + (rnrs bytevectors) + (srfi srfi-64)) + + (define marionette + (make-marionette '(#$vm))) + + (define* (message-length message #:key (encoding "iso-8859-1")) + (bytevector-length (string->bytevector message encoding))) + + (define message "From: test@example.com\n\ +Subject: Hello Nice to meet you!") + + (mkdir #$output) + (chdir #$output) + + (test-begin "dovecot") + + ;; Wait for dovecot to be up and running. + (test-eq "dovecot running" + 'running! + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'dovecot) + 'running!) + marionette)) + + ;; Check Dovecot service's PID. + (test-assert "service process id" + (let ((pid + (number->string (wait-for-file "/var/run/dovecot/master.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "accept an email" + (let ((imap (socket AF_INET SOCK_STREAM 0)) + (addr (make-socket-address AF_INET INADDR_LOOPBACK 8143))) + (connect imap addr) + ;; Be greeted. + (read-line imap) ;OK + ;; Authenticate + (write-line "a AUTHENTICATE ANONYMOUS" imap) + (read-line imap) ;+ + (write-line "c2lyaGM=" imap) + (read-line imap) ;OK + ;; Create a TESTBOX mailbox + (write-line "a CREATE TESTBOX" imap) + (read-line imap) ;OK + ;; Append a message to a TESTBOX mailbox + (write-line (format #f "a APPEND TESTBOX {~a}" + (number->string (message-length message))) + imap) + (read-line imap) ;+ + (write-line message imap) + (read-line imap) ;OK + ;; Logout + (write-line "a LOGOUT" imap) + (close imap) + #t)) + + (test-equal "mail arrived" + message + (marionette-eval + '(begin + (use-modules (ice-9 ftw) + (ice-9 match)) + (let ((TESTBOX/new "/home/alice/Maildir/TESTBOX/new/")) + (match (scandir TESTBOX/new) + (("." ".." message-file) + (call-with-input-file + (string-append TESTBOX/new message-file) + get-string-all))))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "dovecot-test" test)) + +(define %test-dovecot + (system-test + (name "dovecot") + (description "Connect to a running Dovecot server.") + (value (run-dovecot-test)))) -- cgit v1.2.3 From d5f56e9089aa743e12f54163a879c17eab48380e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 13:23:05 +0000 Subject: gnu: Add python-djangorestframework. * gnu/packages/django.scm (python-djangorestframework): New variable. --- gnu/packages/django.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index c52c812f00..f944d25b60 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -755,3 +755,27 @@ (define-public python-django-tagging (define-public python2-django-tagging (package-with-python2 python-django-tagging)) + +(define-public python-djangorestframework + (package + (name "python-djangorestframework") + (version "3.7.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "djangorestframework" version)) + (sha256 + (base32 + "11qv117gqwswxjljs7wafxg1hyzzlx3qrviwlk9hw41bsbl997lz")))) + (build-system python-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("python-django" ,python-django))) + (home-page "https://www.django-rest-framework.org") + (synopsis "Toolkit for building Web APIs with Django") + (description + "The Django REST framework is for building Web APIs with Django. It +provides features like a web browseable API and authentication policies.") + (license license:bsd-2))) -- cgit v1.2.3 From cc534f0c7102f39454edec0c2cd938bff056819e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 13:23:15 +0000 Subject: gnu: Add python-django-crispy-forms. * gnu/packages/django.scm (python-django-crispy-forms): New variable. --- gnu/packages/django.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index f944d25b60..2768ae2af1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -779,3 +779,28 @@ (define-public python-djangorestframework "The Django REST framework is for building Web APIs with Django. It provides features like a web browseable API and authentication policies.") (license license:bsd-2))) + +(define-public python-django-crispy-forms + (package + (name "python-django-crispy-forms") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-crispy-forms" version)) + (sha256 + (base32 + "16s05jx86jmimlvnwpq73kl0mqw1v9lryc8zi61a9qwl25krm6mj")))) + (build-system python-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("python-django" ,python-django))) + (home-page + "http://github.com/maraujop/django-crispy-forms") + (synopsis "Tool to control Django forms without custom templates") + (description + "@code{django-crispy-forms} lets you easily build, customize and reuse +forms using your favorite CSS framework, without writing template code.") + (license license:expat))) -- cgit v1.2.3 From da90f337b31d53d3dc293a83e069984c70cde2ad Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 13:23:38 +0000 Subject: gnu: Update python-django-filter to 1.1.0. * gnu/packages/django.scm (python-django-filter)[version]: Update from 0.14.0 to 1.1.0. [source]: Update sha256 hash. [native-inputs]: Add python-djangorestframework and python-django-crispy-forms as native inputs, as they are used in the test suite. --- gnu/packages/django.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 2768ae2af1..24d096bc0f 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -182,13 +182,13 @@ (define-public python2-pytest-django (define-public python-django-filter (package (name "python-django-filter") - (version "0.14.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "django-filter" version)) (sha256 (base32 - "0f78hmk8c903zwfzlsiw7ivgag81ymmb5hi73rzxbhnlg2v0l3fx")))) + "0slpfqfhnjrzlrb6vmswyhrzn01p84s16j2x1xib35gg4fxg23pc")))) (build-system python-build-system) (arguments '(#:phases @@ -198,6 +198,8 @@ (define-public python-django-filter (zero? (system* "python" "runtests.py"))))))) (native-inputs `(("python-django" ,python-django) + ("python-djangorestframework" ,python-djangorestframework) + ("python-django-crispy-forms", python-django-crispy-forms) ("python-mock" ,python-mock))) (home-page "https://django-filter.readthedocs.io/en/latest/") (synopsis "Reusable Django application to filter querysets dynamically") -- cgit v1.2.3 From 16bd3291a4ef84f6caa8fea9fd0f4715b3a8de97 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 13:25:32 +0000 Subject: gnu: Update python-django-gravatar2. * gnu/packages/django.scm (python-django-gravatar2)[version]: Update from 1.4.0 to 1.4.2. [source]: Update sha256 hash. [arguments]: Disable the tests, as the django project for the tests is missing. --- gnu/packages/django.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 24d096bc0f..a901af6f14 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -267,15 +267,18 @@ (define-public python2-django-allauth (define-public python-django-gravatar2 (package (name "python-django-gravatar2") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "django-gravatar2" version)) (sha256 (base32 - "1v4qyj6kms321yw0z2g1kch6b2dskmv6fjd6sfxzwr4xshq9mccl")))) + "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6")))) (build-system python-build-system) + (arguments + '(;; TODO: The django project for the tests is missing from the release. + #:tests? #f)) (inputs `(("python-django" ,python-django))) (home-page "https://github.com/twaddington/django-gravatar") -- cgit v1.2.3 From ab9ad138025bdc01e286044e5de20bf03ad1c3b9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Mar 2018 16:31:32 -0500 Subject: gnu: linux-libre@4.1: Update to 4.1.50. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.50. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d4b9d0d0b9..7e49ae6ee2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -414,8 +414,8 @@ (define-public linux-libre-4.4 #:configuration-file kernel-config)) (define-public linux-libre-4.1 - (make-linux-libre "4.1.49" - "0dklmqj6ayjlkz97b811zdvpgb3yppahinji9l9jmkz4ssi7a1gs" + (make-linux-libre "4.1.50" + "1hl1pk724v2waa55bhxfmxyz9nl6pkcj4dc3l80jfvqdfgr55mm2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 464f5447396fcec9b43f7eab71d5d42b522a157f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 9 Mar 2018 23:11:48 +0100 Subject: gnu: 'autoconf-wrapper' is no longer a procedure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Suggested by Björn Höfling . * gnu/packages/autotools.scm (autoconf-wrapper): Rename to... (make-autoconf-wrapper): ... this. Add 'properties' field. (autoconf-wrapper): New variable. * gnu/packages/gnunet.scm (guile-gnunet): Adjust accordingly. * gnu/packages/gnupg.scm (signing-party): Likewise. * gnu/packages/guile.scm (guile-ics, guile-bash): Likewise. * gnu/packages/libevent.scm (libuv): Likewise. * gnu/packages/logging.scm (glog): Likewise. * gnu/packages/mail.scm (libetpan): Likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza) (mate-screensaver): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/sawfish.scm (librep): Likewise. * gnu/packages/video.scm (motion): Likewise. * gnu/packages/zile.scm (zile-on-guile): Likewise. --- gnu/packages/autotools.scm | 16 +++++++++++----- gnu/packages/gnunet.scm | 4 ++-- gnu/packages/gnupg.scm | 4 ++-- gnu/packages/guile.scm | 4 ++-- gnu/packages/libevent.scm | 4 ++-- gnu/packages/logging.scm | 4 ++-- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 4 ++-- gnu/packages/package-management.scm | 2 +- gnu/packages/sawfish.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/zile.scm | 4 ++-- 12 files changed, 29 insertions(+), 23 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 846e318aa1..33addc11a7 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -124,8 +124,8 @@ (define-public autoconf-2.13 (string-append "--build=" build))))))))))) -(define* (autoconf-wrapper #:optional (autoconf autoconf)) - "Return an wrapper around AUTOCONF that generates `configure' scripts that +(define (make-autoconf-wrapper autoconf) + "Return a wrapper around AUTOCONF that generates `configure' scripts that use our own Bash instead of /bin/sh in shebangs. For that reason, it should only be used internally---users should not end up distributing `configure' files with a system-specific shebang." @@ -191,7 +191,13 @@ (define* (autoconf-wrapper #:optional (autoconf autoconf)) (patch-shebang "configure")) (exit (status:exit-val result)))) port))) - (chmod (string-append bin "/autoconf") #o555))))))) + (chmod (string-append bin "/autoconf") #o555))))) + + ;; Do not show it in the UI since it's meant for internal use. + (properties '((hidden? . #t))))) + +(define-public autoconf-wrapper + (make-autoconf-wrapper autoconf)) (define-public autoconf-archive (package @@ -253,7 +259,7 @@ (define-public automake (search-patches "automake-skip-amhello-tests.patch")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("perl" ,perl))) (native-search-paths (list (search-path-specification @@ -348,7 +354,7 @@ (define-public libtool ("perl" ,perl) ("help2man" ,help2man) ;because we modify ltmain.sh ("automake" ,automake) ;some tests rely on 'aclocal' - ("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te' + ("autoconf" ,autoconf-wrapper))) ;others on 'autom4te' (arguments `(;; Libltdl is provided as a separate package, so don't install it here. diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 29bfc8199f..f4eacd3023 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2014 Sree Harsha Totakura -;;; Copyright © 2015, 2017 Ludovic Courtès +;;; Copyright © 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015, 2017 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver @@ -327,7 +327,7 @@ (define-public guile-gnunet ;GSoC 2015! (lambda _ (invoke "autoreconf" "-vfi")))))) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake))) (inputs `(("guile" ,guile-2.0) ("gnunet" ,gnunet))) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index eeab5c5afd..28f5b58887 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -618,7 +618,7 @@ (define-public signing-party "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("automake" ,automake))) (inputs `(("perl" ,perl) ("perl-text-template" ,perl-text-template) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 91a440d928..bfcb32531f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -769,7 +769,7 @@ (define-public guile-ics (symlink "README.org" "README") (zero? (system* "autoreconf" "-fi"))))))) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("texinfo" ,texinfo) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. @@ -1856,7 +1856,7 @@ (define-public guile-bash (string-append "--libdir=" (assoc-ref %outputs "out") "/lib/bash")))) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 9d96e651ac..d6b70a4f17 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2015, 2017 Mark H Weaver ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 David Thompson @@ -140,7 +140,7 @@ (define-public libuv ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) - (native-inputs `(("autoconf" ,(autoconf-wrapper)) + (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 27557e1b1b..f50a2f1cbb 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -73,7 +73,7 @@ (define-public glog (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for tests - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool))) (arguments diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7d85d5208a..7986671e97 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -931,7 +931,7 @@ (define-public libetpan (sha256 (base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf")))) (build-system gnu-build-system) - (native-inputs `(("autoconf" ,(autoconf-wrapper)) + (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index b892a768d8..0281b02daa 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -135,7 +135,7 @@ (define-public mate-icon-theme-faenza (setenv "CONFIG_SHELL" (which "sh")) (invoke "sh" "autogen.sh")))))) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("intltool" ,intltool) ("icon-naming-utils" ,icon-naming-utils) @@ -1191,7 +1191,7 @@ (define-public mate-screensaver (("dbus-1") "")))))))) (native-inputs `(("automake" ,automake) - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("gettext" ,gettext-minimal) ("intltool" ,intltool) ("kbproto" ,kbproto) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6ec70b12fe..709cdfd0f7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -239,7 +239,7 @@ (define (intern tarball) ;; XXX: Keep the development inputs here even though ;; they're unnecessary, just so that 'guix environment ;; guix' always contains them. - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 9f9264457d..ede725877d 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -58,7 +58,7 @@ (define-public librep `(("makeinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool))) (inputs diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7d072009a0..dfd94f9d3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2761,7 +2761,7 @@ (define-public motion (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index c0bbafdd59..fd3d168b3d 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; @@ -102,7 +102,7 @@ (define-public zile-on-guile ,@(package-inputs zile))) (native-inputs `(("m4" ,m4) ;for 'bootstrap' - ("autoconf" ,(autoconf-wrapper)) + ("autoconf" ,autoconf-wrapper) ("automake" ,automake) ;; For some reason, 'bootstrap' insists on having these. -- cgit v1.2.3 From 8d5c14edf5a6d01f859b1aa00c836ffdb5ddecf4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 10 Mar 2018 00:15:59 +0100 Subject: linux-initrd: Skip initrd module check when 'modules.alias' can't be found. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Tomáš Čech . * gnu/system/linux-initrd.scm (check-device-initrd-modules): Call 'known-module-aliases' and catch 'system-error around it. Pass it to 'matching-modules'. --- gnu/system/linux-initrd.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 1eb5f5130d..16a8c43753 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -353,17 +353,27 @@ (define helper-packages (define (check-device-initrd-modules device linux-modules location) "Raise an error if DEVICE needs modules beyond LINUX-MODULES to operate. DEVICE must be a \"/dev\" file name." - (let ((modules (delete-duplicates - (append-map matching-modules - (device-module-aliases device))))) - (unless (every (cute member <> linux-modules) modules) - (raise (condition - (&message - (message (format #f (G_ "you may need these modules \ + (define aliases + ;; Attempt to load 'modules.alias' from the current kernel, assuming we're + ;; on GuixSD, and assuming that corresponds to the kernel we'll be + ;; installing. Skip the whole thing if that file cannot be read. + (catch 'system-error + (lambda () + (known-module-aliases)) + (const #f))) + + (when aliases + (let ((modules (delete-duplicates + (append-map (cut matching-modules <> aliases) + (device-module-aliases device))))) + (unless (every (cute member <> linux-modules) modules) + (raise (condition + (&message + (message (format #f (G_ "you may need these modules \ in the initrd for ~a:~{ ~a~}") - device modules))) - (&fix-hint - (hint (format #f (G_ "Try adding them to the + device modules))) + (&fix-hint + (hint (format #f (G_ "Try adding them to the @code{initrd-modules} field of your @code{operating-system} declaration, along these lines: @@ -373,8 +383,8 @@ (define (check-device-initrd-modules device linux-modules location) (initrd-modules (append (list~{ ~s~}) %base-initrd-modules))) @end example\n") - modules))) - (&error-location - (location (source-properties->location location)))))))) + modules))) + (&error-location + (location (source-properties->location location))))))))) ;;; linux-initrd.scm ends here -- cgit v1.2.3 From b8605720accbc7472ab213aef48f79321da16738 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Mar 2018 20:22:35 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.25. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.25. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7e49ae6ee2..390e855e6c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,8 +392,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.24") -(define %linux-libre-4.14-hash "1i14djw3rmxb6syl6vfd5w76rjksbbaviynwj2dwwp9ki1h6p1hr") +(define %linux-libre-4.14-version "4.14.25") +(define %linux-libre-4.14-hash "0lrzw51ajdkc8mj9bn0lc4yx6q9sf29lcviapapqixg5hds72b94") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From e82b61e6dda8cb979527963c913a2f72a2dfae5f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Mar 2018 20:23:24 -0500 Subject: gnu: linux-libre: Update to 4.15.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.8. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 390e855e6c..57e033f9b5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; 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.7") -(define %linux-libre-hash "1h17wc12lvva5vcm2z06cf57ywxb6i2snm9vxixw1lwibnksrb6l") +(define %linux-libre-version "4.15.8") +(define %linux-libre-hash "0178yi8k72sfv73gss2a1v7w1rmhyza3ia31jwg86gixqw74vifm") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From 0803ddf2677ead5e9d8ef698316125e0c8b9c998 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 10 Mar 2018 09:23:00 +0100 Subject: linux-initrd: Autoload known-module-aliases. * gnu/system/linux-initrd.scm: Autoload known-module-aliases. --- gnu/system/linux-initrd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 16a8c43753..410484390c 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -39,7 +39,7 @@ (define-module (gnu system linux-initrd) #:use-module (gnu system file-systems) #:use-module (gnu system mapped-devices) #:autoload (gnu build linux-modules) - (device-module-aliases matching-modules) + (device-module-aliases matching-modules known-module-aliases) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 vlist) -- cgit v1.2.3 From fd2ebe1ed0df4e65ff1d4ed8fa512da0e93a7683 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:37:47 +0100 Subject: gnu: xbitmaps: Update to 1.1.2. * gnu/packages/xorg.scm (xbitmaps): Update to 1.1.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d1671ba8c1..701992b418 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2030,7 +2030,7 @@ (define-public xbacklight (define-public xbitmaps (package (name "xbitmaps") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) @@ -2040,7 +2040,7 @@ (define-public xbitmaps ".tar.bz2")) (sha256 (base32 - "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From 04a937f00a39538416252bc2c5c5f42bc8cb6ae4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:38:10 +0100 Subject: gnu: xcursor-themes: Update to 1.0.5. * gnu/packages/xorg.scm (xcursor-themes): Update to 1.0.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 701992b418..2409e5e521 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2177,7 +2177,7 @@ (define-public xcmsdb (define-public xcursor-themes (package (name "xcursor-themes") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -2187,7 +2187,7 @@ (define-public xcursor-themes ".tar.bz2")) (sha256 (base32 - "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3")))) + "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf")))) (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) -- cgit v1.2.3 From 7c1119aa0f3f41b1e32c32733157ae7cb0d622d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:38:34 +0100 Subject: gnu: xfontsel: Update to 1.0.6. * gnu/packages/xorg.scm (xfontsel): Update to 1.0.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2409e5e521..ccacc32289 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3962,7 +3962,7 @@ (define-public xlsfonts (define-public xfontsel (package (name "xfontsel") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append @@ -3970,7 +3970,7 @@ (define-public xfontsel version ".tar.bz2")) (sha256 (base32 - "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p")))) + "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c5b9bde5b21d81fb0cab37f58ebd8ece7a8ea2b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:38:58 +0100 Subject: gnu: xrdb: Update to 1.1.1. * gnu/packages/xorg.scm (xrdb): Update to 1.1.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ccacc32289..ffcb9e79c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4180,7 +4180,7 @@ (define-public xrandr (define-public xrdb (package (name "xrdb") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) @@ -4190,7 +4190,7 @@ (define-public xrdb ".tar.bz2")) (sha256 (base32 - "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk")))) + "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) -- cgit v1.2.3 From c609ee9f551392939e03e66ea2d53f51ba0cc94b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:39:21 +0100 Subject: gnu: xrefresh: Update to 1.0.6. * gnu/packages/xorg.scm (xrefresh): Update to 1.0.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ffcb9e79c8..9224e2ba08 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4211,7 +4211,7 @@ (define-public xrdb (define-public xrefresh (package (name "xrefresh") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -4221,7 +4221,7 @@ (define-public xrefresh ".tar.bz2")) (sha256 (base32 - "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj")))) + "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11))) -- cgit v1.2.3 From fdf5257e7c412fca9da4054dfeee6953c7e5efb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:39:42 +0100 Subject: gnu: xsetroot: Update to 1.1.2. * gnu/packages/xorg.scm (xsetroot): Update to 1.1.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9224e2ba08..9ea57d4fe7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4268,7 +4268,7 @@ (define-public xset (define-public xsetroot (package (name "xsetroot") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) @@ -4278,7 +4278,7 @@ (define-public xsetroot ".tar.bz2")) (sha256 (base32 - "1nf3ii31m1knimbidaaym8p61fq3blv8rrdr2775yhcclym5s8ds")))) + "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) -- cgit v1.2.3 From 873ee8a75038af762f175b95047cd64441cf44b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:40:20 +0100 Subject: gnu: xwud: Update to 1.0.5. * gnu/packages/xorg.scm (xwud): Update to 1.0.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9ea57d4fe7..0838d931cd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4414,7 +4414,7 @@ (define-public xwininfo (define-public xwud (package (name "xwud") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -4424,7 +4424,7 @@ (define-public xwud ".tar.bz2")) (sha256 (base32 - "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn")))) + "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From 4a4570bea5998170b1f66e435e5c22bb16413bd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:40:45 +0100 Subject: gnu: xinit: Update to 1.4.0. * gnu/packages/xorg.scm (xinit): Update to 1.4.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0838d931cd..70a8b077eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5650,14 +5650,14 @@ (define-public xcb-util-wm (define-public xinit (package (name "xinit") - (version "1.3.4") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xinit-" version ".tar.bz2")) (sha256 (base32 - "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m")))) + "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From dde360ecb238e7b1fbf501bb9ee21c7307017ece Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:41:10 +0100 Subject: gnu: xmessage: Update to 1.0.5. * gnu/packages/xorg.scm (xmessage): Update to 1.0.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 70a8b077eb..78d864650f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5739,7 +5739,7 @@ (define-public xmag (define-public xmessage (package (name "xmessage") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -5749,7 +5749,7 @@ (define-public xmessage ".tar.gz")) (sha256 (base32 - "1jmcac1xbwplbxfl75sr6w3zqhx1khpdzlqippjsr31cjp1rjc48")))) + "0sw0b0cbrjl44brw7qi1jkm61xd7a1lpj04418c6iqk6mf83llwr")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From f20348549f214f2367ddad9a2c276389fe9ddfd7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:50:32 +0100 Subject: gnu: xlsclients: Update to 1.1.4. * gnu/packages/xorg.scm (xlsclients): Update to 1.1.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 78d864650f..fdaa73389c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3908,7 +3908,7 @@ (define-public xlsatoms (define-public xlsclients (package (name "xlsclients") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -3918,7 +3918,7 @@ (define-public xlsclients ".tar.bz2")) (sha256 (base32 - "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx")))) + "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb))) -- cgit v1.2.3 From a4f48cc59ad5d5ba1f8983d9169f29680efa6677 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:50:52 +0100 Subject: gnu: xwd: Update to 1.0.7. * gnu/packages/xorg.scm (xwd): Update to 1.0.7. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fdaa73389c..e10332274d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4353,7 +4353,7 @@ (define-public xvinfo (define-public xwd (package (name "xwd") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) @@ -4363,7 +4363,7 @@ (define-public xwd ".tar.bz2")) (sha256 (base32 - "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv")))) + "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) -- cgit v1.2.3 From 61c70e54857d3283e1aedd6a955e183b1d881660 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:51:15 +0100 Subject: gnu: xset: Update to 1.2.4. * gnu/packages/xorg.scm (xset): Update to 1.2.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e10332274d..46a09f089b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4239,7 +4239,7 @@ (define-public xrefresh (define-public xset (package (name "xset") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) @@ -4249,7 +4249,7 @@ (define-public xset ".tar.bz2")) (sha256 (base32 - "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3")))) + "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From 79b0f0b7cd1649d3280b596f3ea33ca7159f5c4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:51:37 +0100 Subject: gnu: xwininfo: Update to 1.1.4. * gnu/packages/xorg.scm (xwininfo): Update to 1.1.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 46a09f089b..ca877eacb2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4386,7 +4386,7 @@ (define-public xwd (define-public xwininfo (package (name "xwininfo") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -4396,7 +4396,7 @@ (define-public xwininfo ".tar.bz2")) (sha256 (base32 - "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1")))) + "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 19ec5a05a8140f684a9f2a7781b20e346f76155f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:53:27 +0100 Subject: gnu: xbacklight: Update to 1.2.2. * gnu/packages/xorg.scm (xbacklight): Update to 1.2.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ca877eacb2..b0ac4d3bcc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2000,7 +2000,7 @@ (define-public xauth (define-public xbacklight (package (name "xbacklight") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) @@ -2010,7 +2010,7 @@ (define-public xbacklight ".tar.bz2")) (sha256 (base32 - "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp")))) + "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb) -- cgit v1.2.3 From 060c82c113e550de98ffc1baa8127b08b63c5c58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:54:21 +0100 Subject: gnu: xkill: Update to 1.0.5. * gnu/packages/xorg.scm (xkill): Update to 1.0.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b0ac4d3bcc..217547da15 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3853,7 +3853,7 @@ (define-public xkeyboard-config (define-public xkill (package (name "xkill") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -3863,7 +3863,7 @@ (define-public xkill ".tar.bz2")) (sha256 (base32 - "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8")))) + "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) -- cgit v1.2.3 From cafda73f7e2804c986a892f20b09ca1e87b5fdbd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:54:45 +0100 Subject: gnu: xlsfonts: Update to 1.0.6. * gnu/packages/xorg.scm (xlsfonts): Update to 1.0.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 217547da15..c8d4d4cd2e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3935,7 +3935,7 @@ (define-public xlsclients (define-public xlsfonts (package (name "xlsfonts") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -3945,7 +3945,7 @@ (define-public xlsfonts ".tar.bz2")) (sha256 (base32 - "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0")))) + "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From 505a65dccf1c30df6c94ffa336f0f8427f7212dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:58:55 +0100 Subject: gnu: xpr: Update to 1.0.5. * gnu/packages/xorg.scm (xpr): Update to 1.0.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c8d4d4cd2e..4dda27b9f1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4094,7 +4094,7 @@ (define-public xorg-sgml-doctools (define-public xpr (package (name "xpr") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -4104,7 +4104,7 @@ (define-public xpr ".tar.bz2")) (sha256 (base32 - "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy")))) + "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From 8e3b852ad0c53612828bc1c10bf7f2014eaa5ba4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:59:18 +0100 Subject: gnu: xprop: Update to 1.2.3. * gnu/packages/xorg.scm (xprop): Update to 1.2.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4dda27b9f1..46a9a3b85f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4123,7 +4123,7 @@ (define-public xpr (define-public xprop (package (name "xprop") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -4133,7 +4133,7 @@ (define-public xprop ".tar.bz2")) (sha256 (base32 - "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv")))) + "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From 0fa4702c041a5746ec3a58b39e4276c39d18e7da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Mar 2018 22:25:40 +0100 Subject: gnu: r-minimal: Respect SOURCE_DATE_EPOCH in srcfile. Fixes . * gnu/packages/statistics.scm (r-minimal)[arguments]: Replace timestamp hack with patch to "srcfile" and "srcfilecopy". --- gnu/packages/statistics.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1324abd1f5..af69703d90 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -172,21 +172,15 @@ (define-public r-minimal ;; queries the mtime of a given file and records it in an object. ;; This is acceptable at runtime to detect stale source files, ;; but it destroys reproducibility at build time. - ;; - ;; Instead of disabling this feature, which may have unexpected - ;; consequences, we reset the mtime of generated files before - ;; passing them to the "srcfile" procedure. - (substitute* "src/library/Makefile.in" - (("@\\(cd base && \\$\\(MAKE\\) mkdesc\\)" line) - (string-append line "\n find $(top_builddir)/library/tools | xargs touch -d '1970-01-01'; \n")) - (("@\\$\\(MAKE\\) Rdobjects" line) - (string-append "@find $(srcdir)/tools | xargs touch -d '1970-01-01'; \n " - line))) - (substitute* "src/library/tools/Makefile.in" - (("@\\$\\(INSTALL_DATA\\) all.R \\$\\(top_builddir\\)/library/\\$\\(pkg\\)/R/\\$\\(pkg\\)" line) - (string-append - line - "\n find $(srcdir)/$(pkg) $(top_builddir)/library/$(pkg) | xargs touch -d \"1970-01-01\"; \n"))) + + ;; Similarly, the "srcfilecopy" procedure records the current + ;; time. We change both of them to respect SOURCE_DATE_EPOCH. + (substitute* "src/library/base/R/srcfile.R" + (("timestamp <- (timestamp.*|file.mtime.*)" _ time) + (string-append "timestamp <- \ +as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ + as.numeric(Sys.getenv(\"SOURCE_DATE_EPOCH\"))\ +} else { " time "}, origin=\"1970-01-01\")\n"))) ;; This library is installed using "install_package_description", ;; so we need to pass the "builtStamp" argument. -- cgit v1.2.3 From 936e7a5245d5b50be8b968b39760220066ae24f5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 15:05:02 +0000 Subject: services: Rework the PostgreSQL config file to use a record type. For the default config file representation. This makes it possible to more easily change the configuration file, and have dynamic content. * gnu/services/databases.scm (): New record type. (%default-postgres-config): Remove this, it's been replaced by the configuration file. (): Alter the default for the config file field. (postgresql-service): Alter the default value for the config-file parameter. --- gnu/services/databases.scm | 85 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 20 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 3ca8f471fc..7799093264 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -29,8 +29,16 @@ (define-module (gnu services databases) #:use-module (guix modules) #:use-module (guix records) #:use-module (guix gexp) + #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (postgresql-configuration + #:export ( + postgresql-config-file + postgresql-config-file? + postgresql-config-file-log-destination + postgresql-config-file-hba-file + postgresql-config-file-ident-file + postgresql-config-file-extra-config + postgresql-configuration? postgresql-service postgresql-service-type @@ -68,6 +76,60 @@ (define-module (gnu services databases) ;;; ;;; Code: +(define %default-postgres-hba + (plain-file "pg_hba.conf" + " +local all all trust +host all all 127.0.0.1/32 trust +host all all ::1/128 trust")) + +(define %default-postgres-ident + (plain-file "pg_ident.conf" + "# MAPNAME SYSTEM-USERNAME PG-USERNAME")) + +(define-record-type* + postgresql-config-file make-postgresql-config-file + postgresql-config-file? + (log-destination postgresql-config-file-log-destination + (default "syslog")) + (hba-file postgresql-config-file-hba-file + (default %default-postgres-hba)) + (ident-file postgresql-config-file-ident-file + (default %default-postgres-ident)) + (extra-config postgresql-config-file-extra-config + (default '()))) + +(define-gexp-compiler (postgresql-config-file-compiler + (file ) system target) + (match file + (($ log-destination hba-file + ident-file extra-config) + (define (quote' string) + (if string + (list "'" string "'") + '())) + + (define contents + (append-map + (match-lambda + ((key) '()) + ((key . #f) '()) + ((key values ...) `(,key " = " ,@values "\n"))) + + `(("log_destination" ,@(quote' log-destination)) + ("hba_file" ,@(quote' hba-file)) + ("ident_file" ,@(quote' ident-file)) + ,@extra-config))) + + (gexp->derivation + "postgresql.conf" + #~(call-with-output-file (ungexp output "out") + (lambda (port) + (display + (string-append #$@contents) + port))) + #:local-build? #t)))) + (define-record-type* postgresql-configuration make-postgresql-configuration postgresql-configuration? @@ -78,27 +140,10 @@ (define-record-type* (locale postgresql-configuration-locale (default "en_US.utf8")) (config-file postgresql-configuration-file - (default %default-postgres-config)) + (default (postgresql-config-file))) (data-directory postgresql-configuration-data-directory (default "/var/lib/postgresql/data"))) -(define %default-postgres-hba - (plain-file "pg_hba.conf" - " -local all all trust -host all all 127.0.0.1/32 trust -host all all ::1/128 trust")) - -(define %default-postgres-ident - (plain-file "pg_ident.conf" - "# MAPNAME SYSTEM-USERNAME PG-USERNAME")) - -(define %default-postgres-config - (mixed-text-file "postgresql.conf" - "log_destination = 'syslog'\n" - "hba_file = '" %default-postgres-hba "'\n" - "ident_file = '" %default-postgres-ident "'\n")) - (define %postgresql-accounts (list (user-group (name "postgres") (system? #t)) (user-account @@ -192,7 +237,7 @@ (define postgresql-service-type (define* (postgresql-service #:key (postgresql postgresql) (port 5432) (locale "en_US.utf8") - (config-file %default-postgres-config) + (config-file (postgresql-config-file)) (data-directory "/var/lib/postgresql/data")) "Return a service that runs @var{postgresql}, the PostgreSQL database server. -- cgit v1.2.3 From 69f7cf2bf4ca3ab792438a9e7fb46f78ef0f227a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Feb 2018 08:17:58 +0000 Subject: tests: databases: Add a system test for PostgreSQL. * gnu/tests/databases.scm (%postgresql-os, %test-postgresql): New variables. (run-postgresql-test): New procedure. --- gnu/tests/databases.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index e7097690a0..5c8ca85c13 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -30,6 +30,7 @@ (define-module (gnu tests databases) #:use-module (guix store) #:export (%test-memcached %test-mongodb + %test-postgresql %test-mysql)) (define %memcached-os @@ -207,6 +208,60 @@ (define %test-mongodb (description "Connect to a running MONGODB server.") (value (run-mongodb-test)))) + +;;; +;;; The PostgreSQL service. +;;; + +(define %postgresql-os + (simple-operating-system + (service postgresql-service-type))) + +(define (run-postgresql-test) + "Run tests in %POSTGRESQL-OS." + (define os + (marionette-operating-system + %postgresql-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (memory-size 512))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "postgresql") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'postgres)) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "postgresql-test" test)) + +(define %test-postgresql + (system-test + (name "postgresql") + (description "Start the PostgreSQL service.") + (value (run-postgresql-test)))) + ;;; ;;; The MySQL service. -- cgit v1.2.3 From 488ea71ed855ef6ee72a10751e4d57f598628393 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 4 Mar 2018 15:56:02 +0000 Subject: services: databases: Add postgresql-configuration record exports. * gnu/services/databases.scm: Export the record type, and all the field accessors. --- gnu/services/databases.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 7799093264..72927c4534 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -39,7 +39,15 @@ (define-module (gnu services databases) postgresql-config-file-ident-file postgresql-config-file-extra-config + + postgresql-configuration postgresql-configuration? + postgresql-configuration-postgresql + postgresql-configuration-port + postgresql-configuration-locale + postgresql-configuration-file + postgresql-configuration-data-directory + postgresql-service postgresql-service-type -- cgit v1.2.3 From f55aa0c7b72c6e4f08f77aa84e196895182860e7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 9 Mar 2018 20:06:39 -0500 Subject: gnu: zsh: Fix CVE-2018-{7548,7549}. * gnu/packages/patches/zsh-CVE-2018-7548.patch, gnu/packages/patches/zsh-CVE-2018-7549.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/shells.scm (zsh)[source]: Use them. --- gnu/local.mk | 4 +- gnu/packages/patches/zsh-CVE-2018-7548.patch | 48 ++++++++++++++++++++++++ gnu/packages/patches/zsh-CVE-2018-7549.patch | 56 ++++++++++++++++++++++++++++ gnu/packages/shells.scm | 2 + 4 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/zsh-CVE-2018-7548.patch create mode 100644 gnu/packages/patches/zsh-CVE-2018-7549.patch diff --git a/gnu/local.mk b/gnu/local.mk index d90d8a318d..fbf7b2a7c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1181,7 +1181,9 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ %D%/packages/patches/libyaml-CVE-2014-9130.patch \ - %D%/packages/patches/zathura-plugindir-environment-variable.patch + %D%/packages/patches/zathura-plugindir-environment-variable.patch \ + %D%/packages/patches/zsh-CVE-2018-7548.patch \ + %D%/packages/patches/zsh-CVE-2018-7549.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/patches/zsh-CVE-2018-7548.patch b/gnu/packages/patches/zsh-CVE-2018-7548.patch new file mode 100644 index 0000000000..1ee15fad73 --- /dev/null +++ b/gnu/packages/patches/zsh-CVE-2018-7548.patch @@ -0,0 +1,48 @@ +Fix CVE-2018-7548: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7548 + +Patch copied from upstream source repository: + +https://sourceforge.net/p/zsh/code/ci/110b13e1090bc31ac1352b28adc2d02b6d25a102 + +From 110b13e1090bc31ac1352b28adc2d02b6d25a102 Mon Sep 17 00:00:00 2001 +From: Joey Pabalinas +Date: Tue, 23 Jan 2018 22:28:08 -0800 +Subject: [PATCH] 42313: avoid null-pointer deref when using ${(PA)...} on an + empty array result + +--- + ChangeLog | 5 +++++ + Src/subst.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +#diff --git a/ChangeLog b/ChangeLog +#index d2ba94afc..3037edda4 100644 +#--- a/ChangeLog +#+++ b/ChangeLog +#@@ -1,3 +1,8 @@ +#+2018-01-23 Barton E. Schaefer +#+ +#+ * Joey Pabalinas: 42313: Src/subst.c: avoid null-pointer deref +#+ when using ${(PA)...} on an empty array result +#+ +# 2018-01-23 Oliver Kiddle +# +# * 42317: Completion/Linux/Command/_cryptsetup, +diff --git a/Src/subst.c b/Src/subst.c +index d027e3d83..a265a187e 100644 +--- a/Src/subst.c ++++ b/Src/subst.c +@@ -2430,7 +2430,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, + val = aval[0]; + isarr = 0; + } +- s = dyncat(val, s); ++ s = val ? dyncat(val, s) : dupstring(s); + /* Now behave po-faced as if it was always like that... */ + subexp = 0; + /* +-- +2.16.2 + diff --git a/gnu/packages/patches/zsh-CVE-2018-7549.patch b/gnu/packages/patches/zsh-CVE-2018-7549.patch new file mode 100644 index 0000000000..abefcdf2f9 --- /dev/null +++ b/gnu/packages/patches/zsh-CVE-2018-7549.patch @@ -0,0 +1,56 @@ +Fix CVE-2018-7549: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7549 + +Patch copied from upstream source repository: + +https://sourceforge.net/p/zsh/code/ci/c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd + +From c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd Mon Sep 17 00:00:00 2001 +From: Stephane Chazelas +Date: Fri, 22 Dec 2017 22:17:09 +0000 +Subject: [PATCH] Avoid crash copying empty hash table. + +Visible with typeset -p. +--- + ChangeLog | 2 ++ + Src/params.c | 11 +++++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) + +#diff --git a/ChangeLog b/ChangeLog +#index f74c26b88..e3628cfa7 100644 +#--- a/ChangeLog +#+++ b/ChangeLog +#@@ -1,5 +1,7 @@ +# 2018-01-04 Peter Stephenson +# +#+ * Stephane: 42159: Src/params.c: avoid crash copying empty hash table. +#+ +# * Sebastian: 42188: Src/Modules/system.c: It is necessary to +# close the lock descriptor in some failure cases. +# +diff --git a/Src/params.c b/Src/params.c +index 31ff0445b..de7730ae7 100644 +--- a/Src/params.c ++++ b/Src/params.c +@@ -549,10 +549,13 @@ scancopyparams(HashNode hn, UNUSED(int flags)) + HashTable + copyparamtable(HashTable ht, char *name) + { +- HashTable nht = newparamtable(ht->hsize, name); +- outtable = nht; +- scanhashtable(ht, 0, 0, 0, scancopyparams, 0); +- outtable = NULL; ++ HashTable nht = 0; ++ if (ht) { ++ nht = newparamtable(ht->hsize, name); ++ outtable = nht; ++ scanhashtable(ht, 0, 0, 0, scancopyparams, 0); ++ outtable = NULL; ++ } + return nht; + } + +-- +2.16.2 + diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index f4a38b8779..685f6d2df4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -300,6 +300,8 @@ (define-public zsh (string-append "http://www.zsh.org/pub/old/zsh-" version ".tar.gz"))) + (patches (search-patches "zsh-CVE-2018-7548.patch" + "zsh-CVE-2018-7549.patch")) (sha256 (base32 "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm")))) -- cgit v1.2.3 From 440b16290076b660347c2196a346a0538cb35577 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Mar 2018 22:55:17 +0200 Subject: gnu: enlightenment: Use 'loginctl' for system actions. * gnu/packages/enlightenment.scm (enlightenment)[arguments]: Use 'loginctl' functions when powering off, sleeping, rebooting or suspending the system. --- gnu/packages/enlightenment.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 8550a89640..a0bf841415 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -286,9 +286,10 @@ (define-public enlightenment (("/bin/mount") (string-append utils "/bin/mount")) (("/bin/umount") (string-append utils "/bin/umount")) (("/usr/bin/eject") (string-append utils "/bin/eject")) - ; TODO: Replace suspend and hibernate also. - (("/sbin/shutdown -h now") "/run/current-system/profile/sbin/halt") - (("/sbin/shutdown -r now") "/run/current-system/profile/sbin/reboot")) + (("/etc/acpi/sleep.sh force") "/run/current-system/profile/bin/loginctl suspend") + (("/etc/acpi/hibernate.sh force") "/run/current-system/profile/bin/loginctl hibernate") + (("/sbin/shutdown -h now") "/run/current-system/profile/bin/loginctl poweroff now") + (("/sbin/shutdown -r now") "/run/current-system/profile/bin/loginctl reboot now")) #t)))))) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 3c90c7ae37db57580f89e39468225d2901b2a513 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 10 Mar 2018 21:30:35 -0500 Subject: gnu: guile-syntax-highlight: Update to 0.1. * gnu/packages/guile.scm (guile-syntax-highlight): Update to 0.1. --- gnu/packages/guile.scm | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index bfcb32531f..d39285460b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2008,40 +2008,30 @@ (define-public guile2.0-git (package-for-guile-2.0 guile-git)) (define-public guile-syntax-highlight - (let ((commit "a047675e66861b647426372aa2ba7820f749616d") - (revision "0")) - (package - (name "guile-syntax-highlight") - (version (string-append "0.0." revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://dthompson.us/guile-syntax-highlight.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3")))) - (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'bootstrap - (lambda _ - (zero? (system* "sh" "bootstrap"))))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (inputs - `(("guile" ,guile-2.2))) + (package + (name "guile-syntax-highlight") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://files.dthompson.us/" + "guile-syntax-highlight/" + "guile-syntax-highlight-" + version ".tar.gz")) + (sha256 + (base32 + "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) (synopsis "General-purpose syntax highlighter for GNU Guile") (description "Guile-syntax-highlight is a general-purpose syntax highlighting library for GNU Guile. It can parse code written in various programming languages into a simple s-expression that can be converted to HTML (via SXML) or any other format for rendering.") - (home-page "http://dthompson.us/software/guile-syntax-highlight") - (license license:lgpl3+)))) + (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") + (license license:lgpl3+))) (define-public guile-sjson (package -- cgit v1.2.3 From 907254e513b8b50b0440b21d4deb34e7c4722ceb Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 10 Mar 2018 21:31:00 -0500 Subject: gnu: haunt: Update to 0.2.2. * gnu/packages/guile.scm (haunt): Update to 0.2.2. --- gnu/packages/guile.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d39285460b..1e8aca1acf 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1259,14 +1259,14 @@ (define-public guile-sqlite3 (define-public haunt (package (name "haunt") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/haunt/haunt-" version ".tar.gz")) (sha256 (base32 - "1fpaf1vm6s7j13fs35barjh5yajcc2rc3pi8r7278wpgp4i2vs3w")))) + "0nm00krmqq4zmqi2irh35dbf2cn6al58s620hijmhfvhgvdqznlp")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) @@ -1283,12 +1283,15 @@ (define-public haunt out "/share/guile/site"))) (match (scandir site) (("." ".." version) - (let ((modules (string-append site "/" version))) + (let ((modules (string-append site "/" version)) + (compiled-modules (string-append + out "/lib/guile/" version + "/site-ccache"))) (wrap-program (string-append bin "/haunt") `("GUILE_LOAD_PATH" ":" prefix (,modules)) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,modules))) + (,compiled-modules))) #t))))))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 4f55b39fa7b33646b898031be48fed761ffda4ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 00:08:12 +0100 Subject: gnu: archivemount: Update to 0.8.9. * gnu/packages/linux.scm (archivemount): Update to 0.8.9. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 57e033f9b5..e30453ba2f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1758,7 +1758,7 @@ (define-public sshfs-fuse (define-public archivemount (package (name "archivemount") - (version "0.8.7") + (version "0.8.9") (source (origin (method url-fetch) @@ -1766,7 +1766,7 @@ (define-public archivemount "archivemount-" version ".tar.gz")) (sha256 (base32 - "1diiw6pnlnrnikn6l5ld92dx59lhrxjlqms8885vwbynsjl5q127")))) + "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg")))) (build-system gnu-build-system) (inputs `(("fuse", fuse) ("libarchive", libarchive))) -- cgit v1.2.3 From 26cd470d3c568487550b82ae5776a024a14333d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 23:24:54 +0100 Subject: gnu: git-remote-gcrypt: Update to 1.0.3. * gnu/packages/version-control.scm (git-remote-gcrypt): Update to 1.0.3. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 209df2bb12..34c1852a22 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -473,7 +473,7 @@ (define-public git-crypt (define-public git-remote-gcrypt (package (name "git-remote-gcrypt") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -482,7 +482,7 @@ (define-public git-remote-gcrypt (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0kc6qi5gavziqlwnzpy7v4ah7yw860v3i8pyna6way0cfr0qnpr2")))) + "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 1bc11c5ddb3d5dde66da7d61d5fd6ac1ed20f502 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 23:40:23 +0100 Subject: gnu: sssd: Update to 1.16.1. * gnu/packages/sssd.scm (sssd): Update to 1.16.1. --- gnu/packages/sssd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 70ea5fe9e2..28a364ebd5 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,14 +81,14 @@ (define-public ding-libs (define-public sssd (package (name "sssd") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append "http://releases.pagure.org/SSSD/sssd/" "sssd-" version ".tar.gz")) (sha256 (base32 - "03wllgbxxz2zv14dcqr8d2xssppi7ibckh0rlky8gvsw6vjsd0f5")))) + "0vjh1c5960wh86zjsamdjhljls7bb5fz5jpcazgzrpmga5w6ggrd")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 387428def11c59867eb528bcf622f3144617033a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 00:03:45 +0100 Subject: gnu: gambit-c: Update to 4.8.9. * gnu/packages/scheme.scm (gambit-c): Update to 4.8.9. --- gnu/packages/scheme.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 8947509cb1..657ca875d5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -519,7 +519,7 @@ (define-public racket (define-public gambit-c (package (name "gambit-c") - (version "4.8.8") + (version "4.8.9") (source (origin (method url-fetch) @@ -529,7 +529,7 @@ (define-public gambit-c (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "1plw1id94mpg2c4y6q9z39ndcz1hbxfnp3i08szsg6794rasmgkk")))) + (base32 "16sg1s8myzxqpimj5ry6lfza0qfs157zj28bvmxwwgy89jd9m5v7")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From f2785bd657c55cd36f436b1f6ee1af5d72683162 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Mar 2018 18:35:31 +0100 Subject: gnu: icedtea-8: Build "out" reproducibly. Partially fixes . * gnu/packages/java.scm (icedtea-8)[arguments]: Add phases "patch-keystore" and "strip-jar-timestamps". [source]: Also patch DIST_ID in "configure" script. --- gnu/packages/java.scm | 146 +++++++++++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 60 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5cc4a56f81..bb20b1d464 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1591,7 +1591,8 @@ (define-public icedtea-8 (modules '((guix build utils))) (snippet '(begin - (substitute* "acinclude.m4" + (substitute* '("configure" + "acinclude.m4") ;; Do not embed build time (("(DIST_ID=\"Custom build).*$" _ prefix) (string-append prefix "\"\n")) @@ -1600,65 +1601,90 @@ (define-public icedtea-8 "DIST_NAME=\"guix\"")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments icedtea-7) - ((#:configure-flags flags) - `(let ((jdk (assoc-ref %build-inputs "jdk"))) - `(;;"--disable-bootstrap" - "--enable-bootstrap" - "--enable-nss" - "--disable-downloading" - "--disable-system-pcsc" - "--disable-system-sctp" - "--disable-tests" ;they are run in the check phase instead - "--with-openjdk-src-dir=./openjdk.src" - ,(string-append "--with-jdk-home=" jdk)))) - ((#:phases phases) - `(modify-phases ,phases - (delete 'fix-x11-extension-include-path) - (delete 'patch-paths) - (delete 'set-additional-paths) - (delete 'patch-patches) - (add-after 'unpack 'patch-jni-libs - ;; Hardcode dynamically loaded libraries. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-library (lambda (name) - (search-path - library-path - (string-append "lib" name ".so"))))) - (for-each - (lambda (file) - (catch 'decoding-error - (lambda () - (substitute* file - (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" - _ name version) - (format #f "\"~a\"" (find-library name))) - (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) - (format #f "\"~a\"" (find-library name))))) - (lambda _ - ;; Those are safe to skip. - (format (current-error-port) - "warning: failed to substitute: ~a~%" - file)))) - (find-files "openjdk.src/jdk/src/solaris/native" - "\\.c|\\.h")) - #t))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/icedtea")) - (jre (assoc-ref outputs "out")) - (jdk (assoc-ref outputs "jdk"))) - (copy-recursively "openjdk.build/docs" doc) - (copy-recursively "openjdk.build/images/j2re-image" jre) - (copy-recursively "openjdk.build/images/j2sdk-image" jdk) - ;; Install the nss.cfg file to JRE to enable SSL/TLS - ;; support via NSS. - (copy-file (string-append jdk "/jre/lib/security/nss.cfg") - (string-append jre "/lib/security/nss.cfg")) - #t))))))) + `(#:imported-modules + ((guix build ant-build-system) + (guix build syscalls) + ,@%gnu-build-system-modules) + ,@(substitute-keyword-arguments (package-arguments icedtea-7) + ((#:modules modules) + `((guix build utils) + (guix build gnu-build-system) + ((guix build ant-build-system) #:prefix ant:) + (ice-9 match) + (ice-9 popen) + (srfi srfi-19) + (srfi srfi-26))) + ((#:configure-flags flags) + `(let ((jdk (assoc-ref %build-inputs "jdk"))) + `( ;;"--disable-bootstrap" + "--enable-bootstrap" + "--enable-nss" + "--disable-downloading" + "--disable-system-pcsc" + "--disable-system-sctp" + "--disable-tests" ;they are run in the check phase instead + "--with-openjdk-src-dir=./openjdk.src" + ,(string-append "--with-jdk-home=" jdk)))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'fix-x11-extension-include-path) + (delete 'patch-paths) + (delete 'set-additional-paths) + (delete 'patch-patches) + ;; Prevent the keytool from recording the current time when + ;; adding certificates at build time. + (add-after 'unpack 'patch-keystore + (lambda _ + (substitute* "openjdk.src/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java" + (("date = new Date\\(\\);") + "\ +date = (System.getenv(\"SOURCE_DATE_EPOCH\") != null) ?\ +new Date(Long.parseLong(System.getenv(\"SOURCE_DATE_EPOCH\"))) :\ +new Date();")) + #t)) + (add-after 'unpack 'patch-jni-libs + ;; Hardcode dynamically loaded libraries. + (lambda _ + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-library (lambda (name) + (search-path + library-path + (string-append "lib" name ".so"))))) + (for-each + (lambda (file) + (catch 'decoding-error + (lambda () + (substitute* file + (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" + _ name version) + (format #f "\"~a\"" (find-library name))) + (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) + (format #f "\"~a\"" (find-library name))))) + (lambda _ + ;; Those are safe to skip. + (format (current-error-port) + "warning: failed to substitute: ~a~%" + file)))) + (find-files "openjdk.src/jdk/src/solaris/native" + "\\.c|\\.h")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/icedtea")) + (jre (assoc-ref outputs "out")) + (jdk (assoc-ref outputs "jdk"))) + (copy-recursively "openjdk.build/docs" doc) + (copy-recursively "openjdk.build/images/j2re-image" jre) + (copy-recursively "openjdk.build/images/j2sdk-image" jdk) + ;; Install the nss.cfg file to JRE to enable SSL/TLS + ;; support via NSS. + (copy-file (string-append jdk "/jre/lib/security/nss.cfg") + (string-append jre "/lib/security/nss.cfg")) + #t))) + (add-after 'install 'strip-jar-timestamps + (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) (native-inputs `(("jdk" ,icedtea-7 "jdk") ("openjdk-src" -- cgit v1.2.3 From 531afc8a892512487251a03be24d9833b86179f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Mar 2018 19:52:52 +0100 Subject: gnu: Add pigx-chipseq. * gnu/packages/bioinformatics.scm (pigx-chipseq): New variable. --- gnu/packages/bioinformatics.scm | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 14e2a0daac..50d3568987 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12725,3 +12725,69 @@ (define-public pigx-rnaseq quality control of the experiment, the pipeline produces a differential expression report comparing samples in an easily configurable manner.") (license license:gpl3+))) + +(define-public pigx-chipseq + (package + (name "pigx-chipseq") + (version "0.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" + "releases/download/v" version + "/pigx_chipseq-" version ".tar.gz")) + (sha256 + (base32 + "1jliwhifnjgl9x0z730bzpxswi2s84fyg5y8cagbyzpw509452f5")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + ;; Make sure the executable finds all R modules. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/pigx-chipseq") + `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) + `("PYTHONPATH" ":" = (,(getenv "PYTHONPATH"))))) + #t))))) + (inputs + `(("r-minimal" ,r-minimal) + ("r-argparser" ,r-argparser) + ("r-chipseq" ,r-chipseq) + ("r-data-table" ,r-data-table) + ("r-genomation" ,r-genomation) + ("r-genomicranges" ,r-genomicranges) + ("r-rtracklayer" ,r-rtracklayer) + ("r-rcas" ,r-rcas) + ("r-stringr" ,r-stringr) + ("r-jsonlite" ,r-jsonlite) + ("r-heatmaply" ,r-heatmaply) + ("r-ggplot2" ,r-ggplot2) + ("r-plotly" ,r-plotly) + ("python-wrapper" ,python-wrapper) + ("python-pyyaml" ,python-pyyaml) + ("snakemake" ,snakemake) + ("macs" ,macs) + ("multiqc" ,multiqc) + ("perl" ,perl) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) + ("fastqc" ,fastqc) + ("bowtie" ,bowtie) + ("idr" ,idr) + ("snakemake" ,snakemake) + ("samtools" ,samtools) + ("bedtools" ,bedtools) + ("kentutils" ,kentutils))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (synopsis "Analysis pipeline for ChIP sequencing experiments") + (description "PiGX ChIPseq is an analysis pipeline for preprocessing, peak +calling and reporting for ChIP sequencing experiments. It is easy to use and +produces high quality reports. The inputs are reads files from the sequencing +experiment, and a configuration file which describes the experiment. In +addition to quality control of the experiment, the pipeline enables to set up +multiple peak calling analysis and allows the generation of a UCSC track hub +in an easily configurable manner.") + (license license:gpl3+))) -- cgit v1.2.3 From fb94174fc39cfbdddf23aa58a12b1ee62674122d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Mar 2018 19:53:11 +0100 Subject: gnu: Add pigx-bsseq. * gnu/packages/bioinformatics.scm (pigx-bsseq): New variable. --- gnu/packages/bioinformatics.scm | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 50d3568987..567dd2c24b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12791,3 +12791,67 @@ (define-public pigx-chipseq multiple peak calling analysis and allows the generation of a UCSC track hub in an easily configurable manner.") (license license:gpl3+))) + +(define-public pigx-bsseq + (package + (name "pigx-bsseq") + (version "0.0.5") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/" + "releases/download/v" version + "/pigx_bsseq-" version ".tar.gz")) + (sha256 + (base32 + "1h8ma99vi7hs83nafvjpq8jmaq9977j3n11c4zd95hai0cf7zxmp")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-timezone + ;; The readr package is picky about timezones. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZ" "UTC+1") + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) + (add-after 'install 'wrap-executable + ;; Make sure the executable finds all R modules. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/pigx-bsseq") + `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) + `("PYTHONPATH" ":" = (,(getenv "PYTHONPATH"))))) + #t))))) + (native-inputs + `(("tzdata" ,tzdata))) + (inputs + `(("r-minimal" ,r-minimal) + ("r-annotationhub" ,r-annotationhub) + ("r-dt" ,r-dt) + ("r-genomation" ,r-genomation) + ("r-methylkit" ,r-methylkit) + ("r-rtracklayer" ,r-rtracklayer) + ("r-rmarkdown" ,r-rmarkdown) + ("r-bookdown" ,r-bookdown) + ("r-ggplot2" ,r-ggplot2) + ("r-ggbio" ,r-ggbio) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) + ("python-wrapper" ,python-wrapper) + ("python-pyyaml" ,python-pyyaml) + ("snakemake" ,snakemake) + ("bismark" ,bismark) + ("fastqc" ,fastqc) + ("bowtie" ,bowtie) + ("trim-galore" ,trim-galore) + ("cutadapt" ,cutadapt) + ("samtools" ,samtools))) + (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (synopsis "Bisulfite sequencing pipeline from fastq to methylation reports") + (description "PiGx BSseq is a data processing pipeline for raw fastq read +data of bisulfite experiments; it produces reports on aggregate methylation +and coverage and can be used to produce information on differential +methylation and segmentation.") + (license license:gpl3+))) -- cgit v1.2.3 From bfc007e13e055ca2d535a02aa7fc4ba7f6183150 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Mar 2018 20:02:10 +0100 Subject: gnu: java-hamcrest-all: Build with icedtea-8. * gnu/packages/java.scm (java-hamcrest-all)[arguments]: Build with icedtea-8; do not disable tests. [inputs]: Remove java-hamcrest-core. --- gnu/packages/java.scm | 49 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bb20b1d464..43a3a62889 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3886,39 +3886,30 @@ (define-public java-hamcrest-all (package (inherit java-hamcrest-core) (name "java-hamcrest-all") (arguments - (substitute-keyword-arguments (package-arguments java-hamcrest-core) - ;; FIXME: a unit test fails because org.hamcrest.SelfDescribing is not - ;; found, although it is part of the hamcrest-core library that has - ;; just been built. - ;; - ;; Fixing this one test is insufficient, though, and upstream confirmed - ;; that the latest hamcrest release fails its unit tests when built - ;; with Java 7. See https://github.com/hamcrest/JavaHamcrest/issues/30 - ((#:tests? _) #f) - ((#:build-target _) "bigjar") - ((#:phases phases) - `(modify-phases ,phases - ;; Some build targets override the classpath, so we need to patch - ;; the build.xml to ensure that required dependencies are on the - ;; classpath. - (add-after 'unpack 'patch-classpath-for-integration - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "build.xml" - ((" build/hamcrest-library-\\$\\{version\\}.jar" line) - (string-join - (cons line - (append - (find-files (assoc-ref inputs "java-hamcrest-core") "\\.jar$") - (find-files (assoc-ref inputs "java-junit") "\\.jar$") - (find-files (assoc-ref inputs "java-jmock") "\\.jar$") - (find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) - ";"))) - #t)))))) + `(#:jdk ,icedtea-8 + ,@(substitute-keyword-arguments (package-arguments java-hamcrest-core) + ((#:build-target _) "bigjar") + ((#:phases phases) + `(modify-phases ,phases + ;; Some build targets override the classpath, so we need to patch + ;; the build.xml to ensure that required dependencies are on the + ;; classpath. + (add-after 'unpack 'patch-classpath-for-integration + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.xml" + ((" build/hamcrest-library-\\$\\{version\\}.jar" line) + (string-join + (cons line + (append + (find-files (assoc-ref inputs "java-junit") "\\.jar$") + (find-files (assoc-ref inputs "java-jmock") "\\.jar$") + (find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) + ";"))) + #t))))))) (inputs `(("java-junit" ,java-junit) ("java-jmock" ,java-jmock-1) ("java-easymock" ,java-easymock) - ("java-hamcrest-core" ,java-hamcrest-core) ,@(package-inputs java-hamcrest-core))))) (define-public java-jopt-simple -- cgit v1.2.3 From 594bd3a08aeac24cf4939a4f06f2551ff8f61167 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 10 Mar 2018 11:45:36 +0100 Subject: gnu: java-jeromq: Fix tests. * gnu/packages/patches/java-jeromq-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/java.scm (java-jeromq)[source](patches): Add it. [arguments](#test-exclude): Disable more failing tests. --- gnu/local.mk | 1 + gnu/packages/java.scm | 11 +- gnu/packages/patches/java-jeromq-fix-tests.patch | 253 +++++++++++++++++++++++ 3 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/java-jeromq-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbf7b2a7c7..5c95cdae21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -785,6 +785,7 @@ dist_patch_DATA = \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ + %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43a3a62889..bdfd3fd41b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8578,7 +8578,8 @@ (define-public java-jeromq (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj")))) + "1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj")) + (patches (search-patches "java-jeromq-fix-tests.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-jeromq.jar" @@ -8592,7 +8593,13 @@ (define-public java-jeromq ;; Failures "**/DealerSpecTest.java" "**/CustomDecoderTest.java" - "**/CustomEncoderTest.java"))) + "**/CustomEncoderTest.java" + "**/ConnectRidTest.java" + "**/ReqSpecTest.java" + "**/PushPullSpecTest.java" + "**/PubSubHwmTest.java" + "**/RouterSpecTest.java" + "**/ProxyTest.java"))) (inputs `(("java-jnacl" ,java-jnacl))) (native-inputs diff --git a/gnu/packages/patches/java-jeromq-fix-tests.patch b/gnu/packages/patches/java-jeromq-fix-tests.patch new file mode 100644 index 0000000000..5466b92707 --- /dev/null +++ b/gnu/packages/patches/java-jeromq-fix-tests.patch @@ -0,0 +1,253 @@ +From 5803aadd3f209eba1ffbb2cf7bf16778019dbee1 Mon Sep 17 00:00:00 2001 +From: fredoboulo +Date: Fri, 23 Feb 2018 23:55:57 +0100 +Subject: [PATCH] Fix #524 : V1 and V2 protocol downgrades handle received data + in handshake buffer + +This patch is upstream pull request, see: +https://gihub.com/zeromq/jeromq/pull/527. + +It is merged on commit c2afa9c, and we can drop it on the +0.4.4 release. + +--- + src/main/java/zmq/io/StreamEngine.java | 21 ++++++++++-- + src/test/java/zmq/io/AbstractProtocolVersion.java | 41 +++++++++++++---------- + src/test/java/zmq/io/V0ProtocolTest.java | 12 +++++++ + src/test/java/zmq/io/V1ProtocolTest.java | 16 +++++++-- + src/test/java/zmq/io/V2ProtocolTest.java | 16 +++++++-- + 5 files changed, 81 insertions(+), 25 deletions(-) + +diff --git a/src/main/java/zmq/io/StreamEngine.java b/src/main/java/zmq/io/StreamEngine.java +index b8933c92..fe2f2d8d 100644 +--- a/src/main/java/zmq/io/StreamEngine.java ++++ b/src/main/java/zmq/io/StreamEngine.java +@@ -816,9 +816,7 @@ private boolean handshake() + assert (bufferSize == headerSize); + + // Make sure the decoder sees the data we have already received. +- greetingRecv.flip(); +- inpos = greetingRecv; +- insize = greetingRecv.limit(); ++ decodeDataAfterHandshake(0); + + // To allow for interoperability with peers that do not forward + // their subscriptions, we inject a phantom subscription message +@@ -846,6 +844,8 @@ else if (greetingRecv.get(revisionPos) == Protocol.V1.revision) { + } + encoder = new V1Encoder(errno, Config.OUT_BATCH_SIZE.getValue()); + decoder = new V1Decoder(errno, Config.IN_BATCH_SIZE.getValue(), options.maxMsgSize, options.allocator); ++ ++ decodeDataAfterHandshake(V2_GREETING_SIZE); + } + else if (greetingRecv.get(revisionPos) == Protocol.V2.revision) { + // ZMTP/2.0 framing. +@@ -859,6 +859,8 @@ else if (greetingRecv.get(revisionPos) == Protocol.V2.revision) { + } + encoder = new V2Encoder(errno, Config.OUT_BATCH_SIZE.getValue()); + decoder = new V2Decoder(errno, Config.IN_BATCH_SIZE.getValue(), options.maxMsgSize, options.allocator); ++ ++ decodeDataAfterHandshake(V2_GREETING_SIZE); + } + else { + zmtpVersion = Protocol.V3; +@@ -904,6 +906,19 @@ else if (greetingRecv.get(revisionPos) == Protocol.V2.revision) { + return true; + } + ++ private void decodeDataAfterHandshake(int greetingSize) ++ { ++ final int pos = greetingRecv.position(); ++ if (pos > greetingSize) { ++ // data is present after handshake ++ greetingRecv.position(greetingSize).limit(pos); ++ ++ // Make sure the decoder sees this extra data. ++ inpos = greetingRecv; ++ insize = greetingRecv.remaining(); ++ } ++ } ++ + private Msg identityMsg() + { + Msg msg = new Msg(options.identitySize); +diff --git a/src/test/java/zmq/io/AbstractProtocolVersion.java b/src/test/java/zmq/io/AbstractProtocolVersion.java +index e60db403..aa06b4a7 100644 +--- a/src/test/java/zmq/io/AbstractProtocolVersion.java ++++ b/src/test/java/zmq/io/AbstractProtocolVersion.java +@@ -18,15 +18,18 @@ + import zmq.SocketBase; + import zmq.ZError; + import zmq.ZMQ; ++import zmq.ZMQ.Event; + import zmq.util.Utils; + + public abstract class AbstractProtocolVersion + { ++ protected static final int REPETITIONS = 1000; ++ + static class SocketMonitor extends Thread + { +- private final Ctx ctx; +- private final String monitorAddr; +- private final List events = new ArrayList<>(); ++ private final Ctx ctx; ++ private final String monitorAddr; ++ private final ZMQ.Event[] events = new ZMQ.Event[1]; + + public SocketMonitor(Ctx ctx, String monitorAddr) + { +@@ -41,15 +44,15 @@ public void run() + boolean rc = s.connect(monitorAddr); + assertThat(rc, is(true)); + // Only some of the exceptional events could fire +- while (true) { +- ZMQ.Event event = ZMQ.Event.read(s); +- if (event == null && s.errno() == ZError.ETERM) { +- break; +- } +- assertThat(event, notNullValue()); +- +- events.add(event); ++ ++ ZMQ.Event event = ZMQ.Event.read(s); ++ if (event == null && s.errno() == ZError.ETERM) { ++ s.close(); ++ return; + } ++ assertThat(event, notNullValue()); ++ ++ events[0] = event; + s.close(); + } + } +@@ -69,11 +72,12 @@ public void run() + boolean rc = ZMQ.setSocketOption(receiver, ZMQ.ZMQ_LINGER, 0); + assertThat(rc, is(true)); + +- SocketMonitor monitor = new SocketMonitor(ctx, "inproc://monitor"); +- monitor.start(); + rc = ZMQ.monitorSocket(receiver, "inproc://monitor", ZMQ.ZMQ_EVENT_HANDSHAKE_PROTOCOL); + assertThat(rc, is(true)); + ++ SocketMonitor monitor = new SocketMonitor(ctx, "inproc://monitor"); ++ monitor.start(); ++ + rc = ZMQ.bind(receiver, host); + assertThat(rc, is(true)); + +@@ -81,17 +85,18 @@ public void run() + OutputStream out = sender.getOutputStream(); + for (ByteBuffer raw : raws) { + out.write(raw.array()); +- ZMQ.msleep(100); + } + + Msg msg = ZMQ.recv(receiver, 0); + assertThat(msg, notNullValue()); + assertThat(new String(msg.data(), ZMQ.CHARSET), is(payload)); + +- ZMQ.msleep(500); +- assertThat(monitor.events.size(), is(1)); +- assertThat(monitor.events.get(0).event, is(ZMQ.ZMQ_EVENT_HANDSHAKE_PROTOCOL)); +- assertThat((Integer) monitor.events.get(0).arg, is(version)); ++ monitor.join(); ++ ++ final Event event = monitor.events[0]; ++ assertThat(event, notNullValue()); ++ assertThat(event.event, is(ZMQ.ZMQ_EVENT_HANDSHAKE_PROTOCOL)); ++ assertThat((Integer) event.arg, is(version)); + + InputStream in = sender.getInputStream(); + byte[] data = new byte[255]; +diff --git a/src/test/java/zmq/io/V0ProtocolTest.java b/src/test/java/zmq/io/V0ProtocolTest.java +index bd547d23..1a5b7aef 100644 +--- a/src/test/java/zmq/io/V0ProtocolTest.java ++++ b/src/test/java/zmq/io/V0ProtocolTest.java +@@ -10,6 +10,18 @@ + + public class V0ProtocolTest extends AbstractProtocolVersion + { ++ @Test ++ public void testFixIssue524() throws IOException, InterruptedException ++ { ++ for (int idx = 0; idx < REPETITIONS; ++idx) { ++ if (idx % 100 == 0) { ++ System.out.print(idx + " "); ++ } ++ testProtocolVersion0short(); ++ } ++ System.out.println(); ++ } ++ + @Test(timeout = 2000) + public void testProtocolVersion0short() throws IOException, InterruptedException + { +diff --git a/src/test/java/zmq/io/V1ProtocolTest.java b/src/test/java/zmq/io/V1ProtocolTest.java +index e1045f34..764159d0 100644 +--- a/src/test/java/zmq/io/V1ProtocolTest.java ++++ b/src/test/java/zmq/io/V1ProtocolTest.java +@@ -10,7 +10,19 @@ + + public class V1ProtocolTest extends AbstractProtocolVersion + { +- @Test(timeout = 2000) ++ @Test ++ public void testFixIssue524() throws IOException, InterruptedException ++ { ++ for (int idx = 0; idx < REPETITIONS; ++idx) { ++ if (idx % 100 == 0) { ++ System.out.print(idx + " "); ++ } ++ testProtocolVersion1short(); ++ } ++ System.out.println(); ++ } ++ ++ @Test + public void testProtocolVersion1short() throws IOException, InterruptedException + { + List raws = raws(0); +@@ -25,7 +37,7 @@ public void testProtocolVersion1short() throws IOException, InterruptedException + assertProtocolVersion(1, raws, "abcdefg"); + } + +- @Test(timeout = 2000) ++ @Test + public void testProtocolVersion1long() throws IOException, InterruptedException + { + List raws = raws(0); +diff --git a/src/test/java/zmq/io/V2ProtocolTest.java b/src/test/java/zmq/io/V2ProtocolTest.java +index d5e64bce..7fda31bc 100644 +--- a/src/test/java/zmq/io/V2ProtocolTest.java ++++ b/src/test/java/zmq/io/V2ProtocolTest.java +@@ -21,7 +21,19 @@ protected ByteBuffer identity() + .put((byte) 0); + } + +- @Test(timeout = 2000) ++ @Test ++ public void testFixIssue524() throws IOException, InterruptedException ++ { ++ for (int idx = 0; idx < REPETITIONS; ++idx) { ++ if (idx % 100 == 0) { ++ System.out.print(idx + " "); ++ } ++ testProtocolVersion2short(); ++ } ++ System.out.println(); ++ } ++ ++ @Test + public void testProtocolVersion2short() throws IOException, InterruptedException + { + List raws = raws(1); +@@ -38,7 +50,7 @@ public void testProtocolVersion2short() throws IOException, InterruptedException + assertProtocolVersion(2, raws, "abcdefg"); + } + +- @Test(timeout = 2000) ++ @Test + public void testProtocolVersion2long() throws IOException, InterruptedException + { + List raws = raws(1); -- cgit v1.2.3 From b37f005c6ba0bfddb2069ed8523eaa5cd9910531 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 05:20:05 +0100 Subject: gnu: python-tqdm: Update to 4.19.6. * gnu/packages/python.scm (python-tqdm): Update to 4.19.6. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c454539fef..968ef32e30 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12080,14 +12080,14 @@ (define-public python2-pydiff (define-public python-tqdm (package (name "python-tqdm") - (version "4.19.5") + (version "4.19.6") (source (origin (method url-fetch) (uri (pypi-uri "tqdm" version)) (sha256 (base32 - "0xvkffm77nqckk29xjy5fkqvig5b97vk7nzafp3cn36w4zqyccnz")))) + "1pw0ngm0zn9papdmkwipi3yih5c3di6d0w849bdmrraq4d2d9h2y")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From 4b61374b1b6601d36a68bbbdbab47bce06cee6ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 06:01:11 +0100 Subject: gnu: python-colorama: Update to 0.3.9. * gnu/packages/python.scm (python-colorama): Update to 0.3.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 968ef32e30..aab2d3082a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7407,14 +7407,14 @@ (define-public python2-promise (define-public python-colorama (package (name "python-colorama") - (version "0.3.7") + (version "0.3.9") (source (origin (method url-fetch) (uri (pypi-uri "colorama" version)) (sha256 (base32 - "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0")))) + "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8")))) (build-system python-build-system) (synopsis "Colored terminal text rendering for Python") (description "Colorama is a Python library for rendering colored terminal -- cgit v1.2.3 From e5c98075f240343c6b611f42926cde52b41a05f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:16:48 +0100 Subject: gnu: python-rply: Update to 0.7.5. * gnu/packages/python.scm (python-rply): Update to 0.7.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aab2d3082a..e0d88f094e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7231,13 +7231,13 @@ (define-public python2-astor (define-public python-rply (package (name "python-rply") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (pypi-uri "rply" version)) (sha256 (base32 - "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj")))) + "0lv428895zxsz43968qx0q9bimwqnfykndz4dpjbq515w2gvzhjh")))) (build-system python-build-system) (propagated-inputs `(("python-appdirs" ,python-appdirs))) -- cgit v1.2.3 From cd5b6816f84fd3dfb58b9c345d0e051e0fa181ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:19:17 +0100 Subject: gnu: python-ly: Update to 0.9.5. * gnu/packages/python.scm (python-ly): Update to 0.9.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e0d88f094e..1c9848e3da 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5766,7 +5766,7 @@ (define-public python2-fonttools (define-public python-ly (package (name "python-ly") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) @@ -5775,7 +5775,7 @@ (define-public python-ly "/python-ly-" version ".tar.gz")) (sha256 (base32 - "0g6n288l83sfwavxh1aryi0aqvsr3sp7v6f903mckwqa4scpky62")))) + "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl")))) (build-system python-build-system) (arguments ;; FIXME: Some tests need network access. -- cgit v1.2.3 From 8a19a81768027ef2762b9f0ed68ca2849a7b180f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:20:12 +0100 Subject: gnu: python-jmespath: Update to 0.9.3. * gnu/packages/python.scm (python-jmespath): Update to 0.9.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1c9848e3da..828beba495 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7510,14 +7510,14 @@ (define-public python2-tox (define-public python-jmespath (package (name "python-jmespath") - (version "0.9.0") + (version "0.9.3") (source (origin (method url-fetch) (uri (pypi-uri "jmespath" version)) (sha256 (base32 - "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8")))) + "0r7wc7fsxmlwzxx9j1j7rms06c6xs6d4sysirdhz1jk2mb4x90ba")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 47772a4e3b2ffe6cde85362911f61fc03ff4d491 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:36:07 +0100 Subject: gnu: python-pycryptodome: Update to 3.5.1. * gnu/packages/python-crypto.scm (python-pycryptodome): Update to 3.5.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b898f088be..b4f75e5997 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -720,14 +720,14 @@ (define-public python2-josepy (define-public python-pycryptodome (package (name "python-pycryptodome") - (version "3.4.7") + (version "3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pycryptodome" version)) (sha256 (base32 - "1xrsd6ql4w0ypkxnsg3fivs3r3z6dd93x44lhvam7jzh3gixzn0q")))) + "15mc1h5ij1b6hcqvb048kb4k0ip64n2ky0zz0rml2s78ylv7g5dp")))) (build-system python-build-system) (home-page "https://www.pycryptodome.org") (synopsis "Cryptographic library for Python") -- cgit v1.2.3 From b9d84721238d8d6de074177fc61786f846de823b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:40:27 +0100 Subject: gnu: python-tblib: Update to 1.3.2. * gnu/packages/python.scm (python-tblib): Update to 1.3.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 828beba495..de3e659d84 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8609,12 +8609,12 @@ (define-public python-py3status (define-public python-tblib (package (name "python-tblib") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (pypi-uri "tblib" version)) (sha256 (base32 - "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi")))) + "1rsg8h069kqgncyv8fgzyj6qflk6j10cb78pa5jk34ixwq044vj3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 0fe227350621c4bc36db8a05838875d11f7372eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 16:53:54 +0100 Subject: gnu: python-markdown: Update to 2.6.11. * gnu/packages/python.scm (python-markdown): Update to 2.6.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index de3e659d84..dce67be755 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5580,14 +5580,14 @@ (define-public python2-mistune (define-public python-markdown (package (name "python-markdown") - (version "2.6.8") + (version "2.6.11") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a")))) + "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6de86fd5aa59302b027d57c5827755280de07576 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 23:20:08 +0100 Subject: gnu: python-pyaes: Update to 1.6.1. * gnu/packages/python-crypto.scm (python-pyaes): Update to 1.6.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b4f75e5997..701e23c2ac 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -510,14 +510,14 @@ (define-public python2-slowaes (define-public python-pyaes (package (name "python-pyaes") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (pypi-uri "pyaes" version)) (sha256 (base32 - "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw")))) + "13vdaff15k0jyfcss4b4xvfgm8xyv0nrbyw5n1qc7lrqbi0b3h82")))) (build-system python-build-system) (home-page "https://github.com/ricmoo/pyaes") (synopsis "Implementation of AES in Python") -- cgit v1.2.3 From a992423775323045154eefb85cbcf207a0e4a226 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 23:20:17 +0100 Subject: gnu: python-kitchen: Update to 1.2.5. * gnu/packages/python.scm (python-kitchen): Update to 1.2.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dce67be755..0fd5299702 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1935,14 +1935,14 @@ (define-public python2-schema-0.5 (define-public python-kitchen (package (name "python-kitchen") - (version "1.2.4") + (version "1.2.5") (source (origin (method url-fetch) (uri (pypi-uri "kitchen" version)) (sha256 (base32 - "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq")))) + "1zakh6l0yjvwic9p0nkvmbidpnkygkxbigh2skmb5gccyrhbp7xg")))) (build-system python-build-system) (propagated-inputs `(("python-chardet" ,python-chardet))) -- cgit v1.2.3 From 197babfb9d8ee4afe40a22e8e98fb4c6e2dd0d15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Mar 2018 23:57:13 +0100 Subject: gnu: python-ipaddress: Update to 1.0.19. * gnu/packages/python.scm (python-ipaddress): Update to 1.0.19. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0fd5299702..895a8bde3a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6132,13 +6132,13 @@ (define-public python2-pyasn1-modules (define-public python-ipaddress (package (name "python-ipaddress") - (version "1.0.18") + (version "1.0.19") (source (origin (method url-fetch) (uri (pypi-uri "ipaddress" version)) (sha256 (base32 - "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax")))) + "10agaa1cys1bk1ycpl2w8lky9vjx8h1xh1z29mg0niqx0638c390")))) (build-system python-build-system) (home-page "https://github.com/phihag/ipaddress") (synopsis "IP address manipulation library") -- cgit v1.2.3 From bb5ca93625c5a1c94a535fe946c472ecce1c89cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 18:41:34 +0100 Subject: gnu: youtube-dl: Update to 2018.03.10. * gnu/packages/video.scm (youtube-dl): Update to 2018.03.10. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dfd94f9d3b..984d2f183d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1158,7 +1158,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2018.02.26") + (version "2018.03.10") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1166,7 +1166,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "0ijjnx8qjxk07v5dbz3n5z3cvz8dlkmh7jkyvgng7inl74c29zq5")))) + "1ibmz91anli1vzkgw2i3h4wf1i8arzd74730ylwcwyg3375xryjb")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 8aaba500713df6d0ccd806caff4f24f4c9fcce49 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 22:34:07 +0100 Subject: gnu: mingw-w64: Fix home page and avoid further confusion. MinGW-w64 was forked (in rather dramatic fashion) from the original MinGW. The two projects remain distinct and MinGW-w64 seems by far the actively developed of the two. * gnu/packages/mingw.scm (mingw-w64)[home-page]: Point to the correct upstream. Use HTTPS. [description]: Expand and briefly note the relationship between the two projects. Use @dfn. --- gnu/packages/mingw.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index c7bc5c025d..cd58883b1f 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,9 +77,16 @@ (define-public mingw-w64 #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") #:tests? #f ; compiles and includes glibc headers #:strip-binaries? #f)) - (home-page "http://mingw.org") + (home-page "https://mingw-w64.org") (synopsis "Minimalist GNU for Windows") - (description "MinGW provides a complete programming tool set which is -suitable for the development of native MS-Windows applications, and which does -not depend on any 3rd-party C-Runtime dlls.") + (description + "Minimalist GNU for Windows (@dfn{MinGW}) is a complete software +development environment for creating native Microsoft Windows applications. + +It includes a set of Windows-specific header files and static import libraries +which enable the use of the Windows API. It does not rely on any third-party C +runtime dynamic-link libraries (@dfn{DLL}s). + +Mingw-w64 is an advancement of the original mingw.org project and provides +several new APIs such as DirectX and DDK, and 64-bit support.") (license license:fdl1.3+))) -- cgit v1.2.3 From 5dacc645b8830d5f65a677bb23a2c93241b165fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 23:00:00 +0100 Subject: gnu: mingw-w64: Update to 5.0.3. * gnu/packages/mingw.scm (mingw-w64): Update to 5.0.3. --- gnu/packages/mingw.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index cd58883b1f..f7f34e9dc3 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -37,14 +37,14 @@ (define %mingw-triplet (define-public mingw-w64 (package (name "mingw-w64") - (version "5.0-rc2") + (version "5.0.3") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "0imdary8j07if8ih73pfgxiclpf2ax8h3mz8mxln07i8sbbd30c9")) + (base32 "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a")) (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) (native-inputs `(("xgcc-core" ,(cross-gcc %mingw-triplet)) ("xbinutils" ,(cross-binutils %mingw-triplet)))) -- cgit v1.2.3 From bd971438bed00909def54c2114041f218e9983ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 19:35:55 +0100 Subject: gnu: criu: Update to 3.7. * gnu/packages/virtualization.scm (criu): Update to 3.7. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f8f9de16fc..24f7333cd8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -613,14 +613,14 @@ (define-public virt-manager (define-public criu (package (name "criu") - (version "3.5") + (version "3.7") (source (origin (method url-fetch) (uri (string-append "http://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 - "1w0ybla7ac0ql0jzh0vxdf2w9amqp88jcg0na3b33r3hq8acry6x")))) + "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fe0523d4579e7bdeb9771ba9527545e802598d9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 20:15:57 +0100 Subject: gnu: msgpack: Use HTTPS home page. * gnu/packages/serialization.scm (msgpack)[home-page]: Use HTTPS. --- gnu/packages/serialization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8df4841eae..a0361c76fd 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -132,7 +132,7 @@ (define-public msgpack (add-after 'unpack 'autoconf (lambda _ (system* "autoreconf" "-vfi")))))) - (home-page "http://www.msgpack.org") + (home-page "https://www.msgpack.org") (synopsis "Binary serialization library") (description "Msgpack is a library for C/C++ that implements binary serialization.") -- cgit v1.2.3 From 778fb47bcd1a595c0cd9e9d47f984f6d0bfaccf7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 20:30:44 +0100 Subject: gnu: msgpack: Update phase style. * gnu/packages/serialization.scm (msgpack)[arguments]: Substitute INVOKE for SYSTEM* and end phase with #t. --- gnu/packages/serialization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index a0361c76fd..131d68242c 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -131,7 +131,8 @@ (define-public msgpack (modify-phases %standard-phases (add-after 'unpack 'autoconf (lambda _ - (system* "autoreconf" "-vfi")))))) + (invoke "autoreconf" "-vfi") + #t))))) (home-page "https://www.msgpack.org") (synopsis "Binary serialization library") (description "Msgpack is a library for C/C++ that implements binary -- cgit v1.2.3 From 3592937550affcfe1dc1b5de46d159e834c3a74f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 20:14:47 +0100 Subject: gnu: cereal: Update phase style. * gnu/packages/serialization.scm (cereal)[arguments]: Substitute INVOKE for SYSTEM* and end phases with #t. --- gnu/packages/serialization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 131d68242c..9bbac3ac22 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -70,7 +70,8 @@ (define-public cereal (lambda _ (substitute* "doc/doxygen.in" (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (zero? (system* "doxygen" "doc/doxygen.in")))) + (invoke "doxygen" "doc/doxygen.in") + #t)) ;; There is no "install" target, so we have to provide our own ;; "install" phase. (replace 'install -- cgit v1.2.3 From a23b131c2d2e9c008fdad9fe1fe19ab61da3ac22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 23:45:50 +0100 Subject: gnu: perl-io-tty: Update to 1.12. * gnu/packages/perl.scm (perl-io-tty): Update to 1.12. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index badff6e4d1..9e3dcb1a74 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4062,14 +4062,14 @@ (define-public perl-io-stringy (define-public perl-io-tty (package (name "perl-io-tty") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-" version ".tar.gz")) (sha256 (base32 - "0lgd9xcbi4gf4gw1ka6fj94my3w1f3k1zamb4pfln0qxz45zlxx4")))) + "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2")))) (build-system perl-build-system) (home-page "http://search.cpan.org/~toddr/IO-Tty//") (synopsis "Perl interface to pseudo ttys") -- cgit v1.2.3 From 6d2f72cd58541bee77e1624555726cf525dc71e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 23:48:27 +0100 Subject: gnu: perl-json-maybexs: Update to 1.003010. * gnu/packages/perl.scm (perl-json-maybexs): Update to 1.003010. [source]: Update source URI. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9e3dcb1a74..2d0c4c3570 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4249,15 +4249,15 @@ (define-public perl-json-any (define-public perl-json-maybexs (package (name "perl-json-maybexs") - (version "1.003003") + (version "1.003010") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" + (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "JSON-MaybeXS-" version ".tar.gz")) (sha256 (base32 - "0q21wzz87drrvblxcm2py8fcvkzwx1hxzfybynz8ln7wv66vbx3f")))) + "0hs504x5zsa2vl6r7b3rvbygsak1ly24m1lg636bqp3x7jirmb30")))) (build-system perl-build-system) (native-inputs `(("perl-test-without-module" ,perl-test-without-module))) -- cgit v1.2.3 From a304f3a2c1d147ed8fcae82177f7e23404c19633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 23:55:10 +0100 Subject: gnu: perl-datetime: Update to 1.46. * gnu/packages/perl.scm (perl-datetime): Update to 1.46. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2d0c4c3570..ac65ac481c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2091,7 +2091,7 @@ (define-public perl-date-simple (define-public perl-datetime (package (name "perl-datetime") - (version "1.43") + (version "1.46") (source (origin (method url-fetch) @@ -2099,7 +2099,7 @@ (define-public perl-datetime "DateTime-" version ".tar.gz")) (sha256 (base32 - "0xgrcqs7zza7646g81j54z3fcxb8rw11ynlfm02afr436lgfnfql")))) + "1247d2q2gm912bxj88a0sr5gvj2nx4a7n6z1smkq16iy21cziz79")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From f372c9faf002028ce77d54d978c11dbe75547df2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Mar 2018 23:59:27 +0100 Subject: gnu: perl-datetime-locale: Update to 1.17. * gnu/packages/perl.scm (perl-datetime-locale): Update to 1.17. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ac65ac481c..48999dca55 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2361,7 +2361,7 @@ (define-public perl-datetime-format-strptime (define-public perl-datetime-locale (package (name "perl-datetime-locale") - (version "1.16") + (version "1.17") (source (origin (method url-fetch) @@ -2369,7 +2369,7 @@ (define-public perl-datetime-locale "DateTime-Locale-" version ".tar.gz")) (sha256 (base32 - "1zkc0wggbsczbj4qadahh197imr9fa6knxr10zl241lw2i14rbyz")))) + "1jawnci23kik5x4gln6ixvv9bxznd5f6ira024yjxsc97y5mk9hc")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir" ,perl-file-sharedir) -- cgit v1.2.3 From 6cafe347582916ad3d6c27cefd3a35f72a9eed74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:03:22 +0100 Subject: gnu: perl-datetime-timezone: Update to 2.17. * gnu/packages/perl.scm (perl-datetime-timezone): Update to 2.17. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 48999dca55..b2e8a8ab82 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2392,7 +2392,7 @@ (define-public perl-datetime-locale (define-public perl-datetime-timezone (package (name "perl-datetime-timezone") - (version "2.13") + (version "2.17") (source (origin (method url-fetch) @@ -2400,7 +2400,7 @@ (define-public perl-datetime-timezone "DateTime-TimeZone-" version ".tar.gz")) (sha256 (base32 - "1371sk4p9clygfwxzvivfqz6q9dy8gn3n4dr1424d0xqsv63jg9k")))) + "1ckhjw7h545306b02p6ra60y8zxqnbqr2lsy7c1wib8libf0l2hx")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) -- cgit v1.2.3 From ce2c11e9b19b0ba154f680e380a489638a5ac93c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:06:32 +0100 Subject: gnu: perl-getopt-long-descriptive: Update to 0.102. * gnu/packages/perl.scm (perl-getopt-long-descriptive): Update to 0.102. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b2e8a8ab82..bf558043c6 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3722,7 +3722,7 @@ (define-public perl-getopt-long (define-public perl-getopt-long-descriptive (package (name "perl-getopt-long-descriptive") - (version "0.100") + (version "0.102") (source (origin (method url-fetch) @@ -3730,7 +3730,7 @@ (define-public perl-getopt-long-descriptive "Getopt-Long-Descriptive-" version ".tar.gz")) (sha256 (base32 - "1dpz5nhg5glmrpq46nkc90dg19cfqfjspqwhfvihsqyi229yfl8l")))) + "0ii8xafvlph5vzcqp3dpc83lg7nkg3l1l2hmqdf5382a567vkm4s")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 3b6903495ae485763cd2c0811a3e8c0896093330 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:12:34 +0100 Subject: gnu: perl-io-stringy: Update to 2.111. * gnu/packages/perl.scm (perl-io-stringy): Update to 2.111. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index bf558043c6..8f2786124c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4042,7 +4042,7 @@ (define-public perl-io-string (define-public perl-io-stringy (package (name "perl-io-stringy") - (version "2.110") + (version "2.111") (source (origin (method url-fetch) @@ -4050,7 +4050,7 @@ (define-public perl-io-stringy "IO-stringy-" version ".tar.gz")) (sha256 (base32 - "1vh4n0k22hx20rwvf6h7lp25wb7spg0089shrf92d2lkncwg8g3y")))) + "178rpx0ym5l2m9mdmpnr92ziscvchm541w94fd7ygi6311kgsrwc")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/IO-stringy/") (synopsis "IO:: interface for reading/writing an array of lines") -- cgit v1.2.3 From 631efa496cc4d0983d67e6d9fb2493a78e5011fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:19:25 +0100 Subject: gnu: perl-scope-guard: Update to 0.21. * gnu/packages/perl.scm (perl-scope-guard): Update to 0.21. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8f2786124c..86c5718ea5 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6880,7 +6880,7 @@ (define-public perl-safe-isa (define-public perl-scope-guard (package (name "perl-scope-guard") - (version "0.20") + (version "0.21") (source (origin (method url-fetch) @@ -6888,7 +6888,7 @@ (define-public perl-scope-guard "Scope-Guard-" version ".tar.gz")) (sha256 (base32 - "1lsagnz6pli035zvx5c1x4qm9fabi773vns86yd8lzfpldhfv3sv")))) + "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Scope-Guard/") (synopsis "Lexically-scoped resource management") -- cgit v1.2.3 From d437a60f3ee6b4596d12b0d484a53202f5b90ff4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:24:00 +0100 Subject: gnu: perl-data-dump: Update to 1.23. * gnu/packages/perl.scm (perl-data-dump): Update to 1.23. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 86c5718ea5..1f1be8d600 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1681,7 +1681,7 @@ (define-public perl-data-uniqid (define-public perl-data-dump (package (name "perl-data-dump") - (version "1.22") + (version "1.23") (source (origin (method url-fetch) @@ -1689,7 +1689,7 @@ (define-public perl-data-dump "Data-Dump-" version ".tar.gz")) (sha256 (base32 - "1ciqlwsy1q35s94dry9bjy1pwanbq6b7q4rhxm9z8prgkzbslg2k")))) + "0r9ba52b7p8nnn6nw0ygm06lygi8g68piri78jmlqyrqy5gb0lxg")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Data-Dump/") (synopsis "Pretty printing of data structures") -- cgit v1.2.3 From 09000b6b6dd429f79e0a906dd50237cc17e51196 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:33:06 +0100 Subject: gnu: perl-path-tiny: Update to 0.104. * gnu/packages/perl.scm (perl-path-tiny): Update to 0.104. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1f1be8d600..1f8cbb291e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6577,14 +6577,14 @@ (define-public perl-path-class (define-public perl-path-tiny (package (name "perl-path-tiny") - (version "0.096") + (version "0.104") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "Path-Tiny-" version ".tar.gz")) (sha256 (base32 - "08dmr6ijjg3dp7h9dxix0nmad0fw16c6qzs4qc0hdz500gd64sr2")))) + "1vxaczi44d2acfyyzwa7p6c5gx3rgm6c36zbdl40982axg7iv7y6")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; Tests require additional test modules to be packaged -- cgit v1.2.3 From 387a8fd7d06e05faab4ac896aae32229df0bf1a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:35:47 +0100 Subject: gnu: perl-class-accessor: Update to 0.51. * gnu/packages/perl.scm (perl-class-accessor): Update to 0.51. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1f8cbb291e..457a51e738 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -831,7 +831,7 @@ (define-public perl-cddb-get (define-public perl-class-accessor (package (name "perl-class-accessor") - (version "0.34") + (version "0.51") (source (origin (method url-fetch) @@ -839,7 +839,7 @@ (define-public perl-class-accessor "Class-Accessor-" version ".tar.gz")) (sha256 (base32 - "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd")))) + "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz")))) (build-system perl-build-system) (native-inputs `(("perl-sub-name" ,perl-sub-name))) -- cgit v1.2.3 From 221ff3c0971219813d8a10b2093e2af9f45b9086 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 00:44:04 +0100 Subject: gnu: perl-ref-util-xs: Update to 0.117. * gnu/packages/perl.scm (perl-ref-util-xs): Update to 0.117. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 457a51e738..00ef99da02 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6757,7 +6757,7 @@ (define-public perl-readonly (define-public perl-ref-util-xs (package (name "perl-ref-util-xs") - (version "0.116") + (version "0.117") (source (origin (method url-fetch) @@ -6765,7 +6765,7 @@ (define-public perl-ref-util-xs "Ref-Util-XS-" version ".tar.gz")) (sha256 (base32 - "0l5dzbd71iclv8fdjk7685rq6pbfiiydh0n70br6g9l9iy2smr6f")))) + "0g33cndhj353h5xjihvgjc2h6vxwkyyzw63r4l06czvq4flcar7v")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Ref-Util-XS/") (synopsis "XS implementation for Ref::Util") -- cgit v1.2.3 From b8b7bd05ae6a48533642da2797508d39aafcac02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 03:36:10 +0100 Subject: gnu: perl-task-weaken: Update to 1.05. * gnu/packages/perl.scm (perl-task-weaken): Update to 1.05. [source]: Update source URI. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 00ef99da02..754f1fe43b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7521,15 +7521,15 @@ (define-public perl-sys-hostname-long (define-public perl-task-weaken (package (name "perl-task-weaken") - (version "1.04") + (version "1.05") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/A/AD/ADAMK/" + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Task-Weaken-" version ".tar.gz")) (sha256 (base32 - "1i7kd9v8fjsqyhr4rx4a1jv7n5vfjjm1v4agb24pizh0b72p3qk7")))) + "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5")))) (build-system perl-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 162189361e87996e2156598c3fe264fb5e918824 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 03:42:47 +0100 Subject: gnu: perl-datetime-format-strptime: Update to 1.75. * gnu/packages/perl.scm (perl-datetime-format-strptime): Update to 1.75. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 754f1fe43b..cf9f21dbc9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2332,7 +2332,7 @@ (define-public perl-datetime-format-natural (define-public perl-datetime-format-strptime (package (name "perl-datetime-format-strptime") - (version "1.73") + (version "1.75") (source (origin (method url-fetch) @@ -2340,7 +2340,7 @@ (define-public perl-datetime-format-strptime "DateTime-Format-Strptime-" version ".tar.gz")) (sha256 (base32 - "1gmjcmvh81cla6yn2pvlkr7i25bspg90pzzsizrfb0c5xc37h1vd")))) + "069wmgbchydgx3nm9klqw0g6ksnja28g61d4allgzmvr9ynb5ksg")))) (build-system perl-build-system) (propagated-inputs `(("perl-datetime" ,perl-datetime) -- cgit v1.2.3 From f6246195e57d6e50b202bba6777cd70c64b36ce2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 12 Mar 2018 10:32:45 +0100 Subject: gnu: Add wine-staging-patchset-data. * gnu/packages/wine.scm (wine-staging-patchset-data): New variable. --- gnu/packages/wine.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index e71538f1b0..df16b99280 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -26,9 +26,12 @@ (define-module (gnu packages wine) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages audio) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages cups) @@ -212,6 +215,50 @@ (define-public wine64 (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) +(define-public wine-staging-patchset-data + (package + (name "wine-staging-patchset-data") + (version "3.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/wine-staging/wine-staging/archive/v" + version ".zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "16l28vrhqn27kipqwms622jz1prfky8qkjb8pj747k3qjnm2k1g9")))) + (build-system trivial-build-system) + (native-inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (wine-staging (string-append out "/share/wine-staging")) + (source (assoc-ref %build-inputs "source")) + (sh (string-append (assoc-ref %build-inputs "bash") "/bin/bash")) + (env (string-append (assoc-ref %build-inputs "coreutils") "/bin/env")) + (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")) + (substitute* (string-append "wine-staging-" ,version + "/patches/patchinstall.sh") (("/bin/sh") sh)) + (substitute* (string-append "wine-staging-" ,version + "/patches/gitapply.sh") (("/usr/bin/env") env)) + (mkdir-p wine-staging) + (copy-recursively (string-append "wine-staging-" ,version) + wine-staging))))) + (home-page "https://github.com/wine-staging") + (synopsis "Patchset for Wine") + (description + "wine-staging-patchset-data contains the patchset to build Wine-Staging.") + (license license:lgpl2.1+))) + (define-public wine-staging (package (inherit wine) -- cgit v1.2.3 From b53b9c8dd12820a28775b295895fb0d32b8e0ed4 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 12 Mar 2018 10:40:59 +0100 Subject: gnu: wine-staging: Update to 3.3. * gnu/packages/wine.scm (wine-staging): Update to 3.3. [inputs]: Add autoconf, python, util-linux, wine-staging-patchset-data. [arguments]: Remove 'hardcode-libvulkan-path phase. Add 'patch-source-wine-staging phase. [home-page]: Change URL. --- gnu/packages/wine.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index df16b99280..836ed0666e 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -30,6 +30,7 @@ (define-module (gnu packages wine) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -50,6 +51,7 @@ (define-module (gnu packages wine) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages photo) @@ -263,30 +265,34 @@ (define-public wine-staging (package (inherit wine) (name "wine-staging") - (version "2.21") + (version (package-version wine-staging-patchset-data)) (source (origin (method url-fetch) (uri (string-append - "https://github.com/wine-compholio/wine-patched/archive/" - "staging-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + "https://dl.winehq.org/wine/source/3.x/wine-" version + ".tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1pjaxj7h3q6y356np908fvsx0bf7yx5crqvgl4hza6gfssdmsr5r")))) - (inputs `(("gtk+", gtk+) + "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505")))) + (inputs `(("autoconf" ,autoconf) ; for autoreconf + ("gtk+", gtk+) ("libva", libva) + ("python" ,python) + ("util-linux" ,util-linux) ; for hexdump ("vulkan-icd-loader" ,vulkan-icd-loader) + ("wine-staging-patchset-data" ,wine-staging-patchset-data) ,@(package-inputs wine))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'hardcode-libvulkan-path + (add-before 'configure 'patch-source-wine-staging (lambda* (#:key outputs #:allow-other-keys) - (let* ((libvulkan (string-append (assoc-ref %build-inputs - "vulkan-icd-loader") "/lib/libvulkan.so"))) - ;; Hard-code the path to libvulkan.so. - (substitute* "dlls/vulkan/vulkan_thunks.c" (("libvulkan.so") - libvulkan)) + (let* ((source (assoc-ref %build-inputs "source")) + (script (string-append (assoc-ref %build-inputs + "wine-staging-patchset-data") + "/share/wine-staging/patches/patchinstall.sh"))) + (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'configure 'patch-dlopen-paths ;; Hardcode dlopened sonames to absolute paths. @@ -308,7 +314,7 @@ (define-public wine-staging experimental features faster to end users and to give developers the possibility to discuss and improve their patches before they are integrated into the main branch.") - (home-page "https://wine-staging.com") + (home-page "https://github.com/wine-staging") ;; In addition to the regular Wine license (lgpl2.1+), Wine-Staging ;; provides Liberation and WenQuanYi Micro Hei fonts. Those use ;; different licenses. In particular, the latter is licensed under -- cgit v1.2.3 From 3139f18524334c4ba373f5f031dbab7f44c94650 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 12 Mar 2018 10:41:51 +0100 Subject: gnu: wine64-staging: Update to 3.3. * gnu/packages/wine.scm (wine64-staging): Update to 3.3. [arguments]: Remove 'hardcode-libvulkan-path phase. Add 'patch-source-wine-staging phase. --- gnu/packages/wine.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 836ed0666e..e23dcc55f1 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -334,13 +334,13 @@ (define-public wine64-staging (string-append "libdir=" %output "/lib/wine64")) #:phases (modify-phases %standard-phases - (add-before 'configure 'hardcore-libvulkan-path + (add-before 'configure 'patch-source-wine-staging (lambda* (#:key outputs #:allow-other-keys) - (let* ((libvulkan (string-append (assoc-ref %build-inputs - "vulkan-icd-loader") "/lib/libvulkan.so"))) - ;; Hard-code the path to libvulkan.so. - (substitute* "dlls/vulkan/vulkan_thunks.c" (("libvulkan.so") - libvulkan)) + (let* ((source (assoc-ref %build-inputs "source")) + (script (string-append (assoc-ref %build-inputs + "wine-staging-patchset-data") + "/share/wine-staging/patches/patchinstall.sh"))) + (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 51158d83d86d9f969c52f7baf513160a8d9fbd78 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 12 Mar 2018 11:30:30 +0100 Subject: gnu: wine-staging: Add SDL2 support. * gnu/packages/wine.scm (wine-staging)[inputs]: Add sdl2. --- gnu/packages/wine.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index e23dcc55f1..0327deaf24 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -57,6 +57,7 @@ (define-module (gnu packages wine) #:use-module (gnu packages photo) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) + #:use-module (gnu packages sdl) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) @@ -279,6 +280,7 @@ (define-public wine-staging ("gtk+", gtk+) ("libva", libva) ("python" ,python) + ("sdl2" ,sdl2) ("util-linux" ,util-linux) ; for hexdump ("vulkan-icd-loader" ,vulkan-icd-loader) ("wine-staging-patchset-data" ,wine-staging-patchset-data) -- cgit v1.2.3 From ad1d03fcf0472c88c9f63e8126274320cb0a076e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Mar 2018 15:14:01 +0100 Subject: build-system: minify: Do not import (ice-9 popen) in the build environment. The (ice-9 popen) module should not be added to the imported-modules here, because that depends on the Guile that is used on the host side. * guix/build-system/minify.scm (%minify-build-system-modules): Remove import of (ice-9 popen). --- guix/build-system/minify.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index af90a32f59..21d84a179a 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +39,6 @@ (define-module (guix build-system minify) (define %minify-build-system-modules ;; Build-side modules imported by default. `((guix build minify-build-system) - (ice-9 popen) ,@%gnu-build-system-modules)) (define (default-uglify-js) -- cgit v1.2.3 From 93f3b7762ea872e0e72d62aa14b417d324fdeed8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 12 Mar 2018 14:41:06 +0100 Subject: gnu: automake@1.16: Update to 1.16.1. * gnu/packages/autotools.scm (automake-1.16): Update to 1.16.1. --- gnu/packages/autotools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 33addc11a7..9394ee014f 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -325,14 +325,14 @@ (define-public automake-1.16 ;; Make this the default on the next rebuild cycle. (package (inherit automake) - (version "1.16") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/automake/automake-" version ".tar.xz")) (sha256 (base32 - "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr")) + "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax")) (patches (search-patches "automake-skip-amhello-tests.patch")))))) -- cgit v1.2.3 From c0edb5b5430a5278a3ebc9aeea9d3c8ae9a2e1f1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 12 Mar 2018 16:06:17 +0100 Subject: gnu: arpack-ng: Update to 3.5.0; use 3.3.0 for julia. Partly fixes . * gnu/packages/maths.scm (arpack-ng): Update to 3.5.0. [native-inputs]: New field. (arpack-ng-3.3.0): New variable. * gnu/packages/julia.scm (julia)[inputs]: Use ARPACK-NG-3.3.0. --- gnu/packages/julia.scm | 7 ++++++- gnu/packages/maths.scm | 35 +++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 41bbc66dd2..7a44abdec2 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -315,7 +315,12 @@ (define-public julia "USE_SYSTEM_OPENSPECFUN=1"))) (inputs `(("llvm" ,llvm) - ("arpack-ng" ,arpack-ng) + + ;; The bundled version is 3.3.0 so stick to that version. With other + ;; versions, we get test failures in 'linalg/arnoldi' as described in + ;; . + ("arpack-ng" ,arpack-ng-3.3.0) + ("coreutils" ,coreutils) ;for bindings to "mkdir" and the like ("lapack" ,lapack) ("openblas" ,openblas) ;Julia does not build with Atlas diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cf3d8ae836..f9e5d2c3a2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Kei Kebreau -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Paul Garlick @@ -418,18 +418,26 @@ (define-public cddlib (define-public arpack-ng (package (name "arpack-ng") - (version "3.2.0") + (version "3.5.0") + (home-page "https://github.com/opencollab/arpack-ng") (source (origin (method url-fetch) - (uri (string-append "https://github.com/opencollab/arpack-ng/archive/" - version ".tar.gz")) + (uri (string-append home-page "/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff")))) + "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh")))) (build-system gnu-build-system) - (home-page "https://github.com/opencollab/arpack-ng") + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + (invoke "autoreconf" "-vfi")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("lapack" ,lapack) ("fortran" ,gfortran))) @@ -440,6 +448,21 @@ (define-public arpack-ng (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) +(define-public arpack-ng-3.3.0 + (package + (inherit arpack-ng) + (version "3.3.0") + (name (package-name arpack-ng)) + (home-page (package-home-page arpack-ng)) + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd")))))) + (define-public arpack-ng-openmpi (package (inherit arpack-ng) (name "arpack-ng-openmpi") -- cgit v1.2.3 From f06e391338346cae54d23071f49e572b4b6e5bb3 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 12 Mar 2018 17:42:48 +0100 Subject: gnu: node: Update to 9.8.0. * gnu/packages/node.scm (node): Update to 9.8.0. [arguments]: Remove 'doc-only' workaround. Re-enable fixed tests. --- gnu/packages/node.scm | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 982d3f905c..ea98f28efd 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -41,14 +41,14 @@ (define-module (gnu packages node) (define-public node (package (name "node") - (version "9.4.0") + (version "9.8.0") (source (origin (method url-fetch) (uri (string-append "http://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0rx947ibcfpa0lf93nayfrmjls7r7svqsq87z0xmjzf8fb9361r4")))) + "1mjr1rm5w26c0yb4zq6z5yv3zbvqk18lwbswhwn1sha8hapinjp8")))) (build-system gnu-build-system) (arguments ;; TODO: Purge the bundled copies from the source. @@ -77,29 +77,13 @@ (define-public node (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) - - ;; test-make-doc needs doc-only target, which is inhibited below - (for-each delete-file - '("test/doctool/test-make-doc.js")) ;; FIXME: These tests depend on being able to install eslint. ;; See https://github.com/nodejs/node/issues/17098. (for-each delete-file - '("test/parallel/test-eslint-crypto-check.js" - "test/parallel/test-eslint-alphabetize-errors.js" + '("test/parallel/test-eslint-alphabetize-errors.js" "test/parallel/test-eslint-buffer-constructor.js" "test/parallel/test-eslint-documented-errors.js" - "test/parallel/test-eslint-inspector-check.js" - "test/parallel/test-eslint-lowercase-name-for-primitive.js" - "test/parallel/test-eslint-no-unescaped-regexp-dot.js" - "test/parallel/test-eslint-no-let-in-for-declaration.js" - "test/parallel/test-eslint-number-isnan.js" - "test/parallel/test-eslint-prefer-assert-iferror.js" - "test/parallel/test-eslint-prefer-assert-methods.js" - "test/parallel/test-eslint-prefer-common-expectserror.js" - "test/parallel/test-eslint-prefer-common-mustnotcall.js" - "test/parallel/test-eslint-prefer-util-format-errors.js" - "test/parallel/test-eslint-require-buffer.js" - "test/parallel/test-eslint-required-modules.js")) + "test/parallel/test-eslint-inspector-check.js")) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. @@ -135,14 +119,6 @@ (define-public node (string-append (assoc-ref inputs "python") "/bin/python") "configure" flags))))) - (add-before 'check 'skip-check-doc-only - (lambda _ - (substitute* "Makefile" - ;; requires js-yaml, which is not part of the distribution, - ;; and falls back to using npm to download it - (("\\$\\(MAKE\\) doc-only" all) - (string-append "#" all))) - #t)) (add-after 'patch-shebangs 'patch-npm-shebang (lambda* (#:key outputs #:allow-other-keys) (let* ((bindir (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From fe5d4f81be40e68b8cbb846595e6f40d6cdbca13 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 12 Mar 2018 17:46:03 +0100 Subject: gnu: node: Use more unbundled dependencies. * gnu/packages/node.scm (node)[inputs]: Add icu4c and nghttp2. [native-inputs]: Add pkg-config. [arguments]: Add configure flags for using system libraries. [source]: Remove bundled dependencies. --- gnu/packages/node.scm | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ea98f28efd..976d0c048a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -31,9 +31,11 @@ (define-module (gnu packages node) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) + #:use-module (gnu packages icu4c) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web)) @@ -48,16 +50,36 @@ (define-public node "/node-v" version ".tar.gz")) (sha256 (base32 - "1mjr1rm5w26c0yb4zq6z5yv3zbvqk18lwbswhwn1sha8hapinjp8")))) + "1mjr1rm5w26c0yb4zq6z5yv3zbvqk18lwbswhwn1sha8hapinjp8")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bundled software. + (for-each delete-file-recursively + '("deps/cares" + "deps/http_parser" + "deps/icu-small" + "deps/nghttp2" + "deps/openssl" + "deps/uv" + "deps/zlib")) + (substitute* "Makefile" + ;; Remove references to bundled software + (("deps/http_parser/http_parser.gyp") "") + (("deps/uv/include/\\*.h") "") + (("deps/uv/uv.gyp") "") + (("deps/zlib/zlib.gyp") "")))))) (build-system gnu-build-system) (arguments ;; TODO: Purge the bundled copies from the source. - '(#:configure-flags '("--shared-openssl" - "--shared-zlib" - "--shared-libuv" - "--shared-cares" + '(#:configure-flags '("--shared-cares" "--shared-http-parser" - "--without-snapshot") + "--shared-libuv" + "--shared-nghttp2" + "--shared-openssl" + "--shared-zlib" + "--without-snapshot" + "--with-intl=system-icu") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-files @@ -131,6 +153,7 @@ (define-public node (native-inputs `(("python" ,python-2) ("perl" ,perl) + ("pkg-config" ,pkg-config) ("procps" ,procps) ("util-linux" ,util-linux) ("which" ,which))) @@ -141,7 +164,9 @@ (define-public node (inputs `(("c-ares" ,c-ares) ("http-parser" ,http-parser) + ("icu4c" ,icu4c) ("libuv" ,libuv) + ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") -- cgit v1.2.3 From 2f17e93974416966bc2b7c1e3286a90a92ee06db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 15:39:57 +0100 Subject: gnu: gtk-vnc: Update to 0.7.1. * gnu/packages/gnome.scm (gtk-vnc): Update to 0.7.1. [native-inputs]: Add python-wrapper. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2384bf2381..48298e47cc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5600,7 +5600,7 @@ (define-public gnome-shell (define-public gtk-vnc (package (name "gtk-vnc") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) @@ -5609,7 +5609,7 @@ (define-public gtk-vnc name "-" version ".tar.xz")) (sha256 (base32 - "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw")))) + "1cdaywj5lqnl5b22qzd7k7lmacsnmk8b8rc4drk6gvqmcrlsljzk")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-gtk=3.0"))) @@ -5625,6 +5625,7 @@ (define-public gtk-vnc ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) ("vala" ,vala))) (home-page "https://wiki.gnome.org/Projects/gtk-vnc") (synopsis "VNC viewer widget for GTK+") -- cgit v1.2.3 From f63d6188d3e27fffd9f29395b189be65082ace4e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 16:53:57 +0100 Subject: gnu: ogre: Update to 1.10.11. * gnu/packages/graphics.scm (ogre): Update to 1.10.11. --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d6feab1197..8504b2f11e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis -;;; Copyright © 2017 Ben Woodcroft +;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; @@ -251,7 +251,7 @@ (define-public ilmbase (define-public ogre (package (name "ogre") - (version "1.10.7") + (version "1.10.11") (source (origin (method url-fetch) @@ -259,7 +259,7 @@ (define-public ogre "/archive/v" version ".tar.gz")) (sha256 (base32 - "1p0c91cc7zg3c00wjaibnxb0a0xm14mkg0h65pzpw93m0d6nc8wd")) + "13bdh9v4026qf8w8rbfln2rmwf0rby1a8fz55zpdvpy105i6cbpz")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From a440a6af09d530a841b814051f4efb423c65ae21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 05:15:23 +0100 Subject: gnu: nspr: Mark up description. * gnu/packages/gnuzilla.scm (nspr)[description]: Use @dfn. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 457a8fbcdc..323743d089 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -274,7 +274,7 @@ (define-public nspr (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR") (synopsis "Netscape API for system level and libc-like functions") - (description "Netscape Portable Runtime (NSPR) provides a + (description "Netscape Portable Runtime (@dfn{NSPR}) provides a platform-neutral API for system level and libc-like functions. It is used in the Mozilla clients.") (license license:mpl2.0))) -- cgit v1.2.3 From 5400fdfd5d3c2201ee3ea8ec0d55690c221a91d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 18:08:04 +0100 Subject: gnu: lrzip: Fix CVE-2017-8842. * gnu/packages/compression.scm (lrzip)[source]: Add patch. * gnu/packages/patches/lrzip-CVE-2017-8842.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 3 ++- gnu/packages/patches/lrzip-CVE-2017-8842.patch | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/lrzip-CVE-2017-8842.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5c95cdae21..97d5e00c2b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -885,6 +885,7 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-for-extempore.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ + %D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ %D%/packages/patches/lua-pkgconfig.patch \ %D%/packages/patches/lua51-liblua-so.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d44ae2d259..86efe2a40e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1017,7 +1017,8 @@ (define-public lrzip "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.bz2")) (sha256 (base32 - "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d")))) + "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d")) + (patches (search-patches "lrzip-CVE-2017-8842.patch")))) (build-system gnu-build-system) (native-inputs `(;; nasm is only required when building for 32-bit x86 platforms diff --git a/gnu/packages/patches/lrzip-CVE-2017-8842.patch b/gnu/packages/patches/lrzip-CVE-2017-8842.patch new file mode 100644 index 0000000000..89b4f2f5d9 --- /dev/null +++ b/gnu/packages/patches/lrzip-CVE-2017-8842.patch @@ -0,0 +1,23 @@ +From 38386bd482c0a8102a79958cb3eddcb97a167ca3 Mon Sep 17 00:00:00 2001 +From: Con Kolivas +Date: Fri, 9 Mar 2018 17:39:40 +1100 +Subject: [PATCH] CVE-2017-8842 Fix divide-by-zero in bufRead::get + +--- + libzpaq/libzpaq.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libzpaq/libzpaq.h b/libzpaq/libzpaq.h +index 93387da..cbe211d 100644 +--- a/libzpaq/libzpaq.h ++++ b/libzpaq/libzpaq.h +@@ -465,7 +465,8 @@ struct bufRead: public libzpaq::Reader { + + int get() { + if (progress && !(*s_len % 128)) { +- int pct = (total_len - *s_len) * 100 / total_len; ++ int pct = (total_len > 0) ? ++ (total_len - *s_len) * 100 / total_len : 100; + + if (pct / 10 != *last_pct / 10) { + int i; -- cgit v1.2.3 From a3a7eb2fe22ec7567d036d174ef65bea4011575c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Mar 2018 18:50:30 +0100 Subject: gnu: rofi: Update to 1.5.0. * gnu/packages/xdisorg.scm (rofi): Update to 1.5.0. [native-inputs]: Add GLIB:BIN. [arguments]: Add phase to create missing test files. --- gnu/packages/xdisorg.scm | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a3630b3cb9..173de8e5a2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1101,7 +1101,7 @@ (define-public xdpyprobe (define-public rofi (package (name "rofi") - (version "1.4.2") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/DaveDavenport/rofi/" @@ -1109,7 +1109,7 @@ (define-public rofi version "/rofi-" version ".tar.xz")) (sha256 (base32 - "1129cbg76g56c6ckzj5y5haf92jxhx3b71cr3qmhrb0n8g4gi38s")))) + "0li2hl55sxzdpbxxiwgxsvkhyy6bh8qd2j1r8xh8y6q8a318zsz9")))) (build-system gnu-build-system) (inputs `(("pango" ,pango) @@ -1126,6 +1126,7 @@ (define-public rofi `(("bison" ,bison) ("check" ,check) ("flex" ,flex) + ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (arguments `(#:parallel-tests? #f ; May fail in some circumstances. @@ -1136,7 +1137,29 @@ (define-public rofi (substitute* '("test/helper-expand.c") (("~root") "/root") (("~") "") - (("g_get_home_dir \\(\\)") "\"/\""))))))) + (("g_get_home_dir \\(\\)") "\"/\"")) + #t)) + (add-before 'check 'add-missing-configuration-files + (lambda _ + ;; These files are missing in the 1.5.0 release, causing a test + ;; failure: . + (with-directory-excursion "subprojects/libnkutils/tests" + (mkdir "gtk-3.0") + (call-with-output-file "gtk-3.0/settings.ini" + (lambda (port) + (format port "[Settings] +gtk-double-click-time = 300 +gtk-cursor-theme-name = gnome +"))) + (mkdir "gtk-4.0") + (call-with-output-file "gtk-4.0/settings.ini" + (lambda (port) + (format port "[Settings] +gtk-double-click-time = 300 +gtk-icon-theme-name = nothing-like-this-theme +gtk-enable-primary-paste = true +"))) + #t)))))) (home-page "https://davedavenport.github.io/rofi/") (synopsis "Application launcher") (description "Rofi is a minimalist application launcher. It memorizes which -- cgit v1.2.3 From 06229f184fad7a7e997852c58781aa4f9baa773d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 03:13:52 +0100 Subject: gnu: rofi: Update redirected home page. * gnu/packages/xdisorg.scm (rofi)[home-page]: Change to repository URL. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 173de8e5a2..07a9b390fa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1160,7 +1160,7 @@ (define-public rofi gtk-enable-primary-paste = true "))) #t)))))) - (home-page "https://davedavenport.github.io/rofi/") + (home-page "https://github.com/DaveDavenport/rofi") (synopsis "Application launcher") (description "Rofi is a minimalist application launcher. It memorizes which applications you regularly use and also allows you to search for an application -- cgit v1.2.3 From 1a5459ca23cf3198d33345d7bf269a4126e7179e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 12:42:29 +0100 Subject: gnu: i3-wm: Update to 4.15. * gnu/packages/wm.scm (i3-wm): Update to 4.15. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 888173313b..b38b3caa25 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -175,14 +175,14 @@ (define-public i3status (define-public i3-wm (package (name "i3-wm") - (version "4.14.1") + (version "4.15") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.bz2")) (sha256 (base32 - "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh")))) + "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 607d280ec82e8c4849926a380f4c717585a4ce80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Mar 2018 11:03:28 +0200 Subject: gnu: Add jetring. * gnu/packages/gnupg.scm (jetring): New variable. --- gnu/packages/gnupg.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 28f5b58887..2696e332de 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 ng0 @@ -929,3 +929,58 @@ (define-public parcimonie the Tor network, waits a bit, changes the Tor circuit being used, and starts over.") (license license:gpl1+))) + +(define-public jetring + (package + (name "jetring") + (version "0.25") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/j/" name "/" + name "_" version ".tar.xz")) + (sha256 + (base32 + "0shcnnw0h31b08vmnvf18ni33dg40w18wv9smb69vkklz3h4jhpw")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'install 'hardlink-gnupg + (lambda* (#:key inputs #:allow-other-keys) + (let ((gpg (string-append (assoc-ref inputs "gnupg") + "/bin/gpg"))) + (substitute* (find-files "." "jetring-[[:alpha:]]+$") + (("gpg -") (string-append gpg " -")) + (("\\\"gpg\\\"") (string-append "\"" gpg "\""))) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (for-each (lambda (file) + (install-file file (string-append out "/bin/"))) + (find-files "." "jetring-[[:alpha:]]+$")) + (for-each (lambda (file) + (install-file file (string-append man "/man1/"))) + (find-files "." ".*\\.1$")) + (install-file "jetring.7" (string-append man "/man7/")) + #t)))) + #:tests? #f)) ; no test phase + (inputs + `(("gnupg" ,gnupg) + ("perl" ,perl))) + (home-page "https://joeyh.name/code/jetring/") + (synopsis "GnuPG keyring maintenance using changesets") + (description + "Jetring is a collection of tools that allow for gpg keyrings to be +maintained using changesets. It was developed with the Debian keyring in mind, +and aims to solve the problem that a gpg keyring is a binary blob that's hard +for multiple people to collaboratively edit. + +With jetring, changesets can be submitted, reviewed to see exactly what they +will do, applied, and used to build a keyring. The origin of every change made +to the keyring is available for auditing, and gpg signatures can be used for +integrity guarantees.") + (license license:gpl2+))) -- cgit v1.2.3 From 8e1cd1a2c53a2944012d5b2c1670e7203cdf91b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Mar 2018 11:08:32 +0200 Subject: gnu: Add debian-archive-keyring. * gnu/packages/debian.scm (debian-archive-keyring): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/debian.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 gnu/packages/debian.scm diff --git a/gnu/local.mk b/gnu/local.mk index 97d5e00c2b..5a3ae502f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -120,6 +120,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/datastructures.scm \ %D%/packages/dav.scm \ %D%/packages/dc.scm \ + %D%/packages/debian.scm \ %D%/packages/debug.scm \ %D%/packages/dejagnu.scm \ %D%/packages/dico.scm \ diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm new file mode 100644 index 0000000000..70131ff451 --- /dev/null +++ b/gnu/packages/debian.scm @@ -0,0 +1,62 @@ +;;; Copyright © 2018 Efraim Flashner +;;; +;;; 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 . + +(define-module (gnu packages debian) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (gnu packages gnupg)) + +(define-public debian-archive-keyring + (package + (name "debian-archive-keyring") + (version "2017.7") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/d/" name "/" + name "_" version ".tar.xz")) + (sha256 + (base32 + "1pdwgipfi0y4svhxlw8arhq792f1g3vlmw4raphizy7sa65vd4ca")))) + (build-system gnu-build-system) + (arguments + '(#:test-target "verify-results" + #:parallel-build? #f ; has race conditions + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (apt (string-append out "/etc/apt/trusted.gpg.d/")) + (key (string-append out "/share/keyrings/"))) + (install-file "keyrings/debian-archive-keyring.gpg" key) + (install-file "keyrings/debian-archive-removed-keys.gpg" key) + (for-each (lambda (file) + (install-file file apt)) + (find-files "trusted.gpg" "\\.gpg$"))) + #t))))) + (native-inputs + `(("gnupg" ,gnupg) + ("jetring" ,jetring))) + (home-page "https://packages.qa.debian.org/d/debian-archive-keyring.html") + (synopsis "GnuPG archive keys of the Debian archive") + (description + "The Debian project digitally signs its Release files. This package +contains the archive keys used for that.") + (license (list license:public-domain ; the keys + license:gpl2+)))) ; see debian/copyright -- cgit v1.2.3 From b3230c287ae244df518c78cc65b5f20cdb5f0885 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Mar 2018 11:15:20 +0200 Subject: gnu: Add ubuntu-keyring. * gnu/packages/debian.scm (ubuntu-keyring): New variable. --- gnu/packages/debian.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 70131ff451..15d4429939 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -18,6 +18,9 @@ (define-module (gnu packages debian) #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages gnupg)) (define-public debian-archive-keyring @@ -60,3 +63,45 @@ (define-public debian-archive-keyring contains the archive keys used for that.") (license (list license:public-domain ; the keys license:gpl2+)))) ; see debian/copyright + +(define-public ubuntu-keyring + (package + (name "ubuntu-keyring") + (version "2018.02.28") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/ubuntu/+archive/primary/" + "+files/" name "_" version ".tar.gz")) + (sha256 + (base32 + "1zj3012cz7rlx9pm39wnwa0lmi1h38n6bkgbz81vnmcsvqsc9a3a")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (apt (string-append out "/etc/apt/trusted.gpg.d/")) + (key (string-append out "/share/keyrings/"))) + (setenv "PATH" (string-append + (assoc-ref %build-inputs "gzip") "/bin:" + (assoc-ref %build-inputs "tar") "/bin")) + (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) + (for-each (lambda (file) + (install-file file apt)) + (find-files "." "ubuntu-[^am].*\\.gpg$")) + (for-each (lambda (file) + (install-file file key)) + (find-files "." "ubuntu-[am].*\\.gpg$"))) + #t))) + (native-inputs + `(("tar" ,tar) + ("gzip" ,gzip))) + (home-page "https://launchpad.net/ubuntu/+source/ubuntu-keyring") + (synopsis "GnuPG keys of the Ubuntu archive") + (description + "The Ubuntu project digitally signs its Release files. This package +contains the archive keys used for that.") + (license (list license:public-domain ; the keys + license:gpl2+)))) ; see debian/copyright -- cgit v1.2.3 From 298a2c1e669f1782f3e3d92c96bb55e9000163ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Mar 2018 11:17:45 +0200 Subject: gnu: Add debootstrap. * gnu/packages/debian.scm (debootstrap): New variable. --- gnu/packages/debian.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 15d4429939..3c3189e073 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -21,7 +21,9 @@ (define-module (gnu packages debian) #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages gnupg)) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages perl) + #:use-module (gnu packages wget)) (define-public debian-archive-keyring (package @@ -105,3 +107,64 @@ (define-public ubuntu-keyring contains the archive keys used for that.") (license (list license:public-domain ; the keys license:gpl2+)))) ; see debian/copyright + +(define-public debootstrap + (package + (name "debootstrap") + (version "1.0.93") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/d/" name "/" + name "_" version ".tar.gz")) + (sha256 + (base32 + "1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (wget (assoc-ref inputs "wget")) + (debian (assoc-ref inputs "debian-keyring")) + (ubuntu (assoc-ref inputs "ubuntu-keyring"))) + (substitute* "Makefile" + (("/usr") "") + (("-o root -g root") "") + (("chown root.*") "\n")) + (substitute* "scripts/sid" + (("/usr") debian)) + (substitute* "scripts/gutsy" + (("/usr") ubuntu)) + (substitute* "debootstrap" + (("=/usr") (string-append "=" out))) + (substitute* "functions" + (("wget ") (string-append wget "/bin/wget "))) + #t))) + (add-after 'install 'install-man-file + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "debootstrap.8" + (string-append out "/share/man/man8")) + #t)))) + #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:tests? #f)) ; no tests + (inputs + `(("debian-keyring" ,debian-archive-keyring) + ("ubuntu-keyring" ,ubuntu-keyring) + ("wget" ,wget))) + ;; The following are required for debootstrap to work correctly + (propagated-inputs + `(("binutils" ,binutils) + ("gnupg" ,gnupg) + ("perl" ,perl))) + (home-page "https://anonscm.debian.org/cgit/d-i/debootstrap.git") + (synopsis "Bootstrap a basic Debian system") + (description "Debootstrap is used to create a Debian base system from +scratch, without requiring the availability of @code{dpkg} or @code{apt}. +It does this by downloading .deb files from a mirror site, and carefully +unpacking them into a directory which can eventually be chrooted into.") + (license license:gpl2))) -- cgit v1.2.3 From 7d20d9832699529e9dc094ea94d7b94dc360aa3b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 13 Mar 2018 08:19:45 +0100 Subject: gnu: gnome-sudoku: Update to 3.28.0. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.28.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 48298e47cc..30be123f4d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2689,7 +2689,7 @@ (define-public gnome-mines (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.26.0") + (version "3.28.0") (source (origin (method url-fetch) @@ -2698,7 +2698,7 @@ (define-public gnome-sudoku name "-" version ".tar.xz")) (sha256 (base32 - "186k2axryn3ic8blc9ddnvyrqqf88khg2hlisfa1n4wp784wfx47")))) + "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 0982e5c7f1616ecef8ce61128ddf417df609d79f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 13 Mar 2018 08:36:16 +0100 Subject: gnu: gedit: Update to 3.28.0. * gnu/packages/gnome.scm (gedit): Update to 3.28.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 30be123f4d..4eb52066c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4645,7 +4645,7 @@ (define-public gjs (define-public gedit (package (name "gedit") - (version "3.22.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4653,7 +4653,7 @@ (define-public gedit name "-" version ".tar.xz")) (sha256 (base32 - "0as9r5zvnyrxh699q6jnd0p9ddqy5qamfbxggpdjzagzixhw6yxa")))) + "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8456765772cb48a428a15719e32ab49c9d4d7a53 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 1 Mar 2018 18:51:17 +0300 Subject: gnu: Add flameshot. * gnu/packages/image.scm (flameshot): New public variable. --- gnu/packages/image.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc7..b576c508ec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -58,6 +58,7 @@ (define-module (gnu packages image) #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu packages qt) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -1250,3 +1251,45 @@ (define-public libiptcdata popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata.") (license license:lgpl2.0+))) + +(define-public flameshot + (package + (name "flameshot") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lupoDharkael/flameshot/archive/" + "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kp451bqgssvg8n3sg60s3fifplm9l5kxiij0yxkl864p2mhw8im")))) + (build-system gnu-build-system) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase))) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + "CONFIG+=packaging" + (string-append "BASEDIR=" (assoc-ref outputs "out")) + "PREFIX=/")))))) + (home-page "https://github.com/lupoDharkael/flameshot") + (synopsis "Powerful yet simple to use screenshot software") + (description "Flameshot is a screenshot program. +Features: + +@itemize +@item Customizable appearance. +@item Easy to use. +@item In-app screenshot edition. +@item DBus interface. +@item Upload to Imgur. +@end itemize\n") + (license license:gpl3+))) -- cgit v1.2.3 From 906dcb20f2847d4f886e482642e2a5d361c5c59c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 3 Mar 2018 22:02:27 +0000 Subject: gnu: Add makefile2graph. * gnu/packages/code.scm (makefile2graph): New variable. --- gnu/packages/code.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 13a89c7bcc..979c7a72b8 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -37,6 +37,7 @@ (define-module (gnu packages code) #:use-module (gnu packages databases) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) + #:use-module (gnu packages graphviz) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages perl) @@ -497,3 +498,32 @@ (define-public colormake (description "This package provides a wrapper around @command{make} to produce colored output.") (license license:gpl2+))) + +(define-public makefile2graph + (package + (name "makefile2graph") + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/lindenb/" name + "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "0h1vchkpmm9h6s87p5nf0ksjxcmsxpx8k62a508w428n570wcr4l")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + '(#:test-target "test" + #:make-flags (list "CC=gcc" (string-append "prefix=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("graphviz" ,graphviz))) + (home-page "https://github.com/lindenb/makefile2graph") + (synopsis "Creates a graph of dependencies from GNU Make") + (description + "@code{make2graph} creates a graph of dependencies from GNU Make. The +output is a graphviz-dot file, a Gexf-XML file or a list of the deepest +independent targets.") + (license license:expat))) -- cgit v1.2.3 From 64f925cb4bb726b07e1d115e1132688ca47bdefe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 19:47:32 +0200 Subject: gnu: time: Update to 1.9. * gnu/packages/time.scm (time): Update to 1.9. * tests/guix-build.sh: Update time package to 1.9. --- gnu/packages/time.scm | 6 +++--- tests/guix-build.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 59414f6d7c..c7a285079c 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2013, 2017 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2017 Leo Famulari ;;; Copyright © 2015, 2017 Cyril Roelandt ;;; Copyright © 2016 Sou Bunnbu @@ -43,7 +43,7 @@ (define-module (gnu packages time) (define-public time (package (name "time") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) @@ -51,7 +51,7 @@ (define-public time version ".tar.gz")) (sha256 (base32 - "06rfg8dn0q2r8pdq8i6brrs6rqrsgvkwbbl4kfx3a6lnal0m8bwa")))) + "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/time/") (synopsis "Run a command, then display its resource usage") diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 004a40dee2..b84723fa43 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -184,7 +184,7 @@ test "`guix build superseded -d`" = "`guix build bar -d`" # Parsing package names and versions. guix build -n time # PASS -guix build -n time@1.8 # PASS, version found +guix build -n time@1.9 # PASS, version found if guix build -n time@3.2; # FAIL, version not found then false; else true; fi if guix build -n something-that-will-never-exist; # FAIL -- cgit v1.2.3 From 671249b934728b25bc4ccc710e78273981af5c1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 19:51:41 +0200 Subject: gnu: tinyxml: Declare a source file-name. * gnu/packages/xml.scm (tinyxml)[source]: Declare a source file-name. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5f7a95463a..80933a872b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -993,6 +993,7 @@ (define-public tinyxml version "/tinyxml_" (string-join (string-split version #\.) "_") ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "14smciid19lvkxqznfig77jxn5s4iq3jpb47vh5a6zcaqp7gvg8m")) -- cgit v1.2.3 From 0efb64524bf3abaf8f4de9514fd0fb083300b2f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 19:57:14 +0200 Subject: gnu: tinyxml: Use 'invoke'. * gnu/packages/xml.scm (tinyxml)[arguments]: Replace 'system*' calls with 'invoke'. --- gnu/packages/xml.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 80933a872b..bde959a284 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Mark H Weaver -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2016, 2017 Leo Famulari @@ -1007,12 +1007,12 @@ (define-public tinyxml (delete 'configure) (add-after 'build 'build-shared-library (lambda _ - (zero? (system* "g++" "-Wall" "-O2" "-shared" "-fpic" - "tinyxml.cpp" "tinyxmlerror.cpp" - "tinyxmlparser.cpp" "tinystr.cpp" - "-o" "libtinyxml.so")))) + (invoke "g++" "-Wall" "-O2" "-shared" "-fpic" + "tinyxml.cpp" "tinyxmlerror.cpp" + "tinyxmlparser.cpp" "tinystr.cpp" + "-o" "libtinyxml.so"))) (replace 'check - (lambda _ (zero? (system "./xmltest")))) + (lambda _ (invoke "./xmltest"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 87d868cc7ca3efdfc1ec6ace076e8eb9096af4e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:01:03 +0200 Subject: gnu: gpscorrelate: Declare a source file-name. * gnu/packages/gps.scm (gpscorrelate)[source]: Declare a source file-name. --- gnu/packages/gps.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 211a33ef89..e07c9f4acb 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -108,6 +108,7 @@ (define-public gpscorrelate (uri (git-reference (url "https://github.com/freefoote/gpscorrelate") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb")))) -- cgit v1.2.3 From 4a885c650db278515fd5ae143a97cdb9d0f3b4fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:03:45 +0200 Subject: gnu: ganv-devel: Declare a source file-name. * gnu/packages/gtk.scm (ganv-devel)[source]: Declare a source file-name. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a96cb96470..0e98a7c9d5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -322,6 +322,7 @@ (define-public ganv-devel (uri (git-reference (url "http://git.drobilla.net/ganv.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1cr8w02lr6bk9mkxa12j3imq721b2an2yn4bj5wnwmpm91ddn2gi"))))))) -- cgit v1.2.3 From 6c34ad73d5190b2793a1bb80bb42eeb2850f45c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:05:27 +0200 Subject: gnu: java-jnacl: Declare a source file-name. * gnu/packages/java.scm (java-jnacl)[source]: Declare a source file-name. --- gnu/packages/java.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bdfd3fd41b..e2c4b2c1e6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7982,6 +7982,7 @@ (define-public java-jnacl (uri (git-reference (url "https://github.com/neilalexander/jnacl.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1d6g6xhn83byv5943n7935wwjsk0ibk0qdvqgr699qqgqqmwisbb")))) -- cgit v1.2.3 From 307856cdfa58d72434be06de12d79e2dce25189d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:06:29 +0200 Subject: gnu: java-snakeyaml: Declare a source file-name. * gnu/packages/java.scm (java-snakeyaml)[source]: Declare a source file-name. --- gnu/packages/java.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2c4b2c1e6..521293da48 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7307,6 +7307,7 @@ (define-public java-snakeyaml (method url-fetch) (uri (string-append "https://bitbucket.org/asomov/snakeyaml/get/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0rf5ha6w0waz50jz2479jsrbgmd0dnx0gs337m126j5z7zlmg7mg")))) -- cgit v1.2.3 From 8cf57bc1c6a938fd62deb0e4bf9ef5e460c24669 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:07:51 +0200 Subject: gnu: libusb4java: Declare a source file-name. * gnu/packages/libusb.scm (libusb4java)[source]: Declare a source file-name. --- gnu/packages/libusb.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 10a5a91db4..e5a63803d8 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -124,6 +124,7 @@ (define-public libusb4java (uri (git-reference (url "https://github.com/usb4java/libusb4java.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0wqgapalhfh9v38ycbl6i2f5lh1wpr6fzwn5dwd0rdacypkd1gml")))) -- cgit v1.2.3 From 03e8182b8ea0e5be756416198a3ef49f45b6116c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:10:08 +0200 Subject: gnu: sbcl-cl-uglify-js: Declare a source file-name. * gnu/packages/lisp.scm (sbcl-cl-uglify-js)[source]: Declare a source file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a506566a05..1cda606c20 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1370,6 +1370,7 @@ (define-public sbcl-cl-uglify-js (uri (git-reference (url "https://github.com/mishoo/cl-uglify-js.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a")))) -- cgit v1.2.3 From 7b5f8a998a7d0ab7e8509a51b32f82ddbbb70713 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:11:09 +0200 Subject: gnu: hydrogen: Declare a source file-name. * gnu/packages/music.scm (hydrogen)[source]: Declare a source file-name. --- gnu/packages/music.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f47749b380..4bd58d9733 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -441,6 +441,7 @@ (define-public hydrogen (uri (string-append "https://github.com/hydrogen-music/hydrogen/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy")))) -- cgit v1.2.3 From f45ceced511c1902133255a52f78de637d173be2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:12:24 +0200 Subject: gnu: pulsemixer: Declare a source file-name. * gnu/packages/pulseaudio.scm (pulsemixer)[source]: Declare a source file-name. --- gnu/packages/pulseaudio.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 903b22529d..8a45137a7f 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -280,6 +280,7 @@ (define-public pulsemixer (method url-fetch) (uri (string-append "https://github.com/GeorgeFilipkin/" "pulsemixer/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1lpad90ifr2xfldyf39sbwx1v85rif2gm9w774gwwpjv53zfgk1g")))) -- cgit v1.2.3 From c819558227eeb686765c116afe1d67f40d5b8066 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:13:56 +0200 Subject: gnu: python-asn1crypto: Declare a source file-name. * gnu/packages/python-crypto.scm (python-asn1crypto)[source]: Declare a source file-name. --- gnu/packages/python-crypto.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 701e23c2ac..3734b6ba10 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -538,6 +538,7 @@ (define-public python-asn1crypto (method url-fetch) (uri (string-append "https://github.com/wbond/asn1crypto/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1kn910896l3knmilla1c9ly20q181s43w1ah08lzkbm1h3j6pcz0")))) -- cgit v1.2.3 From 7896e6c219b22bf001501198b1ce574944921de8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:15:14 +0200 Subject: gnu: python-dukpy: Declare a source file-name. * gnu/packages/python.scm (python-dukpy)[source]: Declare a source file-name. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 895a8bde3a..5c7588767e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12263,6 +12263,7 @@ (define-public python-dukpy (method url-fetch) (uri (string-append "https://github.com/kovidgoyal/dukpy/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0pj39rfwlzivqm5hkrsza7gssg6ggpxlq5ivc8f3h7x5pfgc6y6c")))) -- cgit v1.2.3 From 79f450a120068ac1d2fc4e5b4b33ae938b604f95 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 20:16:20 +0200 Subject: gnu: python-mwclient: Declare a source file-name. * gnu/packages/python.scm (python-mwclient)[source]: Declare a source file-name. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c7588767e..22fbdf6720 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11015,6 +11015,7 @@ (define-public python-mwclient ;; The PyPI version wouldn't contain tests. (uri (string-append "https://github.com/mwclient/mwclient/archive/" "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1jj0yhilkjir00719fc7w133x7hdyhkxhk6xblla4asig45klsfv")))) -- cgit v1.2.3 From 0efd09acd402e1d333e21df35fe64cb9ee8d6811 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 19:57:35 +0100 Subject: gnu: Add r-riverplot. * gnu/packages/cran.scm (r-riverplot): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9b690833ce..b7126518c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3192,3 +3192,25 @@ (define-public r-smoother In addition, several functions typically used in smoothing of financial data are included.") (license license:gpl2))) + +(define-public r-riverplot + (package + (name "r-riverplot") + (version "0.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "riverplot" version)) + (sha256 + (base32 + "0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z")))) + (build-system r-build-system) + (home-page "https://logfc.wordpress.com") + (synopsis "Sankey or ribbon plots") + (description + "Sankey plots are a type of diagram that is convenient to illustrate how +flow of information, resources etc. separates and joins, much like observing +how rivers split and merge. For example, they can be used to compare +different clusterings. This package provides an implementation of Sankey +plots for R.") + (license license:gpl2+))) -- cgit v1.2.3 From 379cb3893d15ce00f76d0eb5c477670019d47b42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:21:37 +0100 Subject: gnu: Add ghc-aeson-for-pandoc-1. * gnu/packages/haskell-web.scm (ghc-aeson-for-pandoc-1): New variable. --- gnu/packages/haskell-web.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index f1b50b29bd..1190bc63a5 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -777,6 +777,18 @@ (define-public ghc-aeson naming: in Greek mythology, Aeson was the father of Jason.)") (license license:bsd-3))) +(define-public ghc-aeson-for-pandoc-1 + (package (inherit ghc-aeson) + (version "1.1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/aeson/aeson-" + version ".tar.gz")) + (sha256 + (base32 + "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) + (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") -- cgit v1.2.3 From 0f1fef71938371a24743501e267cfd8c36893d09 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:21:55 +0100 Subject: gnu: Add ghc-pandoc-types-for-pandoc-1. * gnu/packages/haskell.scm (ghc-pandoc-types-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e7401e5cf4..6c8b33ae4d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4980,6 +4980,22 @@ (define-public ghc-pandoc-types building up, manipulating and serialising @code{Pandoc} structures.") (license license:bsd-3))) +(define-public ghc-pandoc-types-for-pandoc-1 + (package (inherit ghc-pandoc-types) + (version "1.17.0.5") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pandoc-types/pandoc-types-" + version ".tar.gz")) + (sha256 + (base32 + "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8")))) + (inputs + `(("ghc-syb" ,ghc-syb) + ("ghc-aeson" ,ghc-aeson-for-pandoc-1) + ("ghc-string-qq" ,ghc-string-qq))))) + (define-public ghc-texmath (package (name "ghc-texmath") -- cgit v1.2.3 From dcf8e2ab30afd76754126a54059a60dd7c128e10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:22:09 +0100 Subject: gnu: Add ghc-texmath-for-pandoc-1. * gnu/packages/haskell.scm (ghc-texmath-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6c8b33ae4d..3359a196cf 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5029,6 +5029,27 @@ (define-public ghc-texmath it can parse and apply LaTeX macros.") (license license:gpl2+))) +(define-public ghc-texmath-for-pandoc-1 + (package (inherit ghc-texmath) + (version "0.9.4.4") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "texmath/texmath-" version ".tar.gz")) + (sha256 + (base32 + "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) + (inputs + `(("ghc-mtl" ,ghc-mtl) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) + ("ghc-parsec" ,ghc-parsec) + ("ghc-split" ,ghc-split) + ("ghc-syb" ,ghc-syb) + ("ghc-temporary" ,ghc-temporary) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-xml" ,ghc-xml))))) + (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") -- cgit v1.2.3 From f45c86b555820b4ddfe4705f052eca480da03ae1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:22:30 +0100 Subject: gnu: Add ghc-hslua-for-pandoc-1. * gnu/packages/haskell.scm (ghc-hslua-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3359a196cf..a222e1b4ae 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5703,6 +5703,27 @@ (define-public ghc-hslua described in @url{https://www.lua.org/}.") (license license:expat))) +(define-public ghc-hslua-for-pandoc-1 + (package (inherit ghc-hslua) + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslua/hslua-" version ".tar.gz")) + (sha256 + (base32 + "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid")))) + (inputs + `(("lua" ,lua-5.1) + ("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-contrib" ,ghc-hspec-contrib) + ("ghc-hunit" ,ghc-hunit) + ("hspec-discover" ,hspec-discover))))) + (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") -- cgit v1.2.3 From 6c055278514c1374a4fe6e803ab618bfc797cf58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:22:54 +0100 Subject: gnu: Add ghc-doctemplates-for-pandoc-1. * gnu/packages/haskell.scm (ghc-doctemplates-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a222e1b4ae..5cee8623f3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5981,6 +5981,29 @@ (define-public ghc-doctemplates "This package provides a simple text templating system used by pandoc.") (license license:bsd-3))) +(define-public ghc-doctemplates-for-pandoc-1 + (package (inherit ghc-doctemplates) + (version "0.1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "doctemplates/doctemplates-" + version ".tar.gz")) + (sha256 + (base32 + "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-text" ,ghc-text) + ("ghc-vector" ,ghc-vector) + ("ghc-parsec" ,ghc-parsec) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific))))) + (define-public ghc-pandoc (package (name "ghc-pandoc") -- cgit v1.2.3 From 8e3149eeb273fe66fac55119e37e96f725d99074 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:23:30 +0100 Subject: gnu: Add ghc-yaml-for-pandoc-1. * gnu/packages/haskell.scm (ghc-yaml-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5cee8623f3..12dbe2f000 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -63,7 +63,8 @@ (define-module (gnu packages haskell) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (ice-9 regex)) + #:use-module (ice-9 regex) + #:use-module ((srfi srfi-1) #:select (alist-delete))) (define-public cl-yale-haskell (let ((commit "85f94c72a16c5f70301dd8db04cde9de2d7dd270") @@ -5599,6 +5600,12 @@ (define-public ghc-yaml "This package provides a library to parse and render YAML documents.") (license license:bsd-3))) +(define-public ghc-yaml-for-pandoc-1 + (package (inherit ghc-yaml) + (inputs + `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) + ,@(alist-delete "ghc-aeson" (package-inputs ghc-yaml)))))) + (define-public ghc-filemanip (package (name "ghc-filemanip") -- cgit v1.2.3 From 08eaa0d877869d6e54ddb97a48fe9d8f90da16d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:23:46 +0100 Subject: gnu: Add ghc-skylighting-for-pandoc-1. * gnu/packages/haskell.scm (ghc-skylighting-for-pandoc-1): New variable. --- gnu/packages/haskell.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 12dbe2f000..aa8c0352b6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5957,6 +5957,57 @@ (define-public ghc-skylighting provided. Skylighting is intended to be the successor to highlighting-kate.") (license license:gpl2))) +(define-public ghc-skylighting-for-pandoc-1 + (package (inherit ghc-skylighting) + (version "0.1.1.5") + (source (origin + (method git-fetch) + ;; We take the sources from Github, because the tarball on + ;; hackage does not include the XML files. + (uri (git-reference + (url "https://github.com/jgm/skylighting.git") + (commit version))) + (file-name (string-append "ghc-skylighting-" version "-checkout")) + (sha256 + (base32 + "0z3yv8v2fqqgv6lsf0ff3ld0h2vkg97b2jiry9wn2f1rizwdqmzl")))) + (arguments + `(#:configure-flags '("-fbootstrap") + #:phases + (modify-phases %standard-phases + ;; After building the skylighting-extract tool we use it to generate + ;; syntax source files from the included XML files. These are then + ;; added to the skylighting.cabal file. + (add-after 'build 'extract-xml + (lambda _ + (make-file-writable "skylighting.cabal") + (apply invoke "./dist/build/skylighting-extract/skylighting-extract" + (find-files "xml" "\\.xml$")) + #t)) + ;; Reconfigure without bootstrap flag + (add-after 'extract-xml 'configure-again + (lambda* (#:key outputs inputs tests? #:allow-other-keys) + ((assoc-ref %standard-phases 'configure) + #:outputs outputs + #:inputs inputs + #:tests? tests? + #:configure-flags '("-f-bootstrap")))) + (add-after 'configure-again 'build-again + (assoc-ref %standard-phases 'build))))) + (inputs + `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-diff" ,ghc-diff) + ("ghc-hxt" ,ghc-hxt) + ("ghc-mtl" ,ghc-mtl) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) + ("ghc-safe" ,ghc-safe) + ("ghc-text" ,ghc-text) + ("ghc-utf8-string" ,ghc-utf8-string))))) + (define-public ghc-doctemplates (package (name "ghc-doctemplates") -- cgit v1.2.3 From 8b1e1e4c33a5b799f700759957a375d60f4ca7a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:24:00 +0100 Subject: gnu: Add ghc-pandoc-1. * gnu/packages/haskell.scm (ghc-pandoc-1): New variable. --- gnu/packages/haskell.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aa8c0352b6..c5408f8627 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6138,6 +6138,67 @@ (define-public ghc-pandoc provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) +;; This is the last version of Pandoc 1.x, which is preferred for Rmarkdown. +(define-public ghc-pandoc-1 + (package (inherit ghc-pandoc) + (version "1.19.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" + version ".tar.gz")) + (sha256 + (base32 + "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v")))) + (arguments + `(#:configure-flags (list "--allow-newer=skylighting"))) + (inputs + `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-cmark" ,ghc-cmark) + ("ghc-data-default" ,ghc-data-default) + ("ghc-deepseq-generics" ,ghc-deepseq-generics) + ("ghc-diff" ,ghc-diff) + ("ghc-doctemplates" ,ghc-doctemplates-for-pandoc-1) + ("ghc-executable-path" ,ghc-executable-path) + ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("ghc-filemanip" ,ghc-filemanip) + ("ghc-haddock-library" ,ghc-haddock-library) + ("ghc-hslua" ,ghc-hslua-for-pandoc-1) + ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-juicypixels" ,ghc-juicypixels) + ("ghc-mtl" ,ghc-mtl) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-old-time" ,ghc-old-time) + ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) + ("ghc-parsec" ,ghc-parsec) + ("ghc-random" ,ghc-random) + ("ghc-scientific" ,ghc-scientific) + ("ghc-sha" ,ghc-sha) + ("ghc-skylighting" ,ghc-skylighting-for-pandoc-1) + ("ghc-syb" ,ghc-syb) + ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-temporary" ,ghc-temporary) + ("ghc-texmath" ,ghc-texmath-for-pandoc-1) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-xml" ,ghc-xml) + ("ghc-yaml" ,ghc-yaml-for-pandoc-1) + ("ghc-zip-archive" ,ghc-zip-archive) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))))) + (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") -- cgit v1.2.3 From 5e51c268e46710b76c1d2fdb9b48ffea91f80584 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:26:14 +0100 Subject: gnu: r-rmarkdown: Use Pandoc 1. * gnu/packages/statistics.scm (r-rmarkdown)[propagated-inputs]: Replace "ghc-pandoc" with "ghc-pandoc-1". --- gnu/packages/statistics.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index af69703d90..5a7e76c21b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2592,7 +2592,11 @@ (define-public r-rmarkdown ("r-rprojroot" ,r-rprojroot) ("r-stringr" ,r-stringr) ("r-yaml" ,r-yaml) - ("ghc-pandoc" ,ghc-pandoc))) + ;; rmarkdown works with the 2.x release of Pandoc, but with degraded + ;; functionality. For example, tabbed plots do not currently work with + ;; Pandoc 2. The authors of rmarkdown recommend the use of Pandoc 1 + ;; for the time being. + ("ghc-pandoc" ,ghc-pandoc-1))) (home-page "http://rmarkdown.rstudio.com") (synopsis "Convert R Markdown documents into a variety of formats") (description -- cgit v1.2.3 From 9a7b5784633b168009ec2e7199c42ac5f789a362 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 17:55:14 +0100 Subject: gnu: r-minimal: Add bash to inputs. * gnu/packages/statistics.scm (r-minimal)[inputs]: Add bash-minimal. --- gnu/packages/statistics.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5a7e76c21b..f4a1e0545f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -39,6 +39,7 @@ (define-module (gnu packages statistics) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cran) @@ -261,6 +262,9 @@ (define-public r-minimal ("libxt" ,libxt) ("pcre" ,pcre) ("readline" ,readline) + ;; This avoids a reference to the ungraftable static bash. R uses the + ;; detected shell for the "system" procedure. + ("bash" ,bash-minimal) ("which" ,which) ("zlib" ,zlib))) (native-search-paths -- cgit v1.2.3 From 79234c0a690e9fef5e695a43aa906741c9d223fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:12:18 +0200 Subject: gnu: ocaml-qtest: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-qtest)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2ec67ba7be..d84348111d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1128,6 +1128,7 @@ (define-public ocaml-qtest (method url-fetch) (uri (string-append "https://github.com/vincent-hugot/iTeML/" "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1hw3jqir7w79payy4knc38fa3nxcvl7ap6y6hnqavrhpi8zqb59j")))) -- cgit v1.2.3 From fdb3fba30fd4d01f912bcd2914b7a10d6b1511cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:19:34 +0200 Subject: gnu: ocaml-qtest: Update to 2.8. * gnu/packages/ocaml.scm (ocaml-qtest): Update to 2.8. [source]: Update source uri, declare a source file-name. [home-page]: Update home-page. --- gnu/packages/ocaml.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d84348111d..6430310fa1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -1123,15 +1123,15 @@ (define-public ocaml-qcheck (define-public ocaml-qtest (package (name "ocaml-qtest") - (version "2.5") + (version "2.8") (source (origin (method url-fetch) - (uri (string-append "https://github.com/vincent-hugot/iTeML/" - "archive/v" version ".tar.gz")) + (uri (string-append "https://github.com/vincent-hugot/qtest/" + "archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1hw3jqir7w79payy4knc38fa3nxcvl7ap6y6hnqavrhpi8zqb59j")))) + "1ff4if64mc9c7wmhjdgnlnh6k6a713piqzr4043zzj4s5pw7smxk")))) (build-system ocaml-build-system) (native-inputs `(("findlib" ,ocaml-findlib))) @@ -1145,7 +1145,7 @@ (define-public ocaml-qtest #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "https://github.com/vincent-hugot/iTeML") + (home-page "https://github.com/vincent-hugot/qtest") (synopsis "Inline (Unit) Tests for OCaml") (description "Qtest extracts inline unit tests written using a special syntax in comments. Those tests are then run using the oUnit framework and the -- cgit v1.2.3 From b965c1ca62043495b531e3ec3d5eaa33be062334 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:21:43 +0200 Subject: gnu: ocaml-stringext: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-stringext)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6430310fa1..2fccb12a2e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1164,6 +1164,7 @@ (define-public ocaml-stringext (method url-fetch) (uri (string-append "https://github.com/rgrinberg/stringext" "/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "19g6lfn03iki9f8h91hi0yiqn0b3wkxyq08b3y23wgv6jw6mssfh")))) -- cgit v1.2.3 From 232557c1592718455977ab35e946085eeaf6cced Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:22:48 +0200 Subject: gnu: ocaml-result: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-result)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2fccb12a2e..ccf27610a7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1309,6 +1309,7 @@ (define-public ocaml-result (method url-fetch) (uri (string-append "https://github.com/janestreet/result" "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1pgpfsgvhxnh0i37fkvp9j8nadns9hz9iqgabj4dr519j2gr1xvw")))) -- cgit v1.2.3 From 597beb8a5dc20d0d21cba916df7d04134ab590a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:23:57 +0200 Subject: gnu: ocaml-piqi: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-piqi)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ccf27610a7..951cb89f42 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3451,6 +3451,7 @@ (define-public ocaml-piqi (method url-fetch) (uri (string-append "https://github.com/alavrik/piqi-ocaml/" "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv")))) -- cgit v1.2.3 From 0aee7fdc8c42a931e8741c1bd8fabd97fd896484 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:25:10 +0200 Subject: gnu: ocaml-bitstring: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-bitstring)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 951cb89f42..613baedf5c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1244,6 +1244,7 @@ (define-public ocaml-bitstring (method url-fetch) (uri (string-append "https://github.com/xguerin/bitstring" "/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8")) -- cgit v1.2.3 From 14ebf2fc5f72f5dafd8f811f6c628e33a4026689 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:26:06 +0200 Subject: gnu: ocaml-lwt: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-lwt)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 613baedf5c..be18766ba2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1682,6 +1682,7 @@ (define-public ocaml-lwt (method url-fetch) (uri (string-append "https://github.com/ocsigen/lwt/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gbw0g8a5a4b16diqrmlhc8ilnikrm4w3jjm1zq310maqg8z0zxz")))) (build-system ocaml-build-system) -- cgit v1.2.3 From 04eecf4bdb6b3002ef9951864a6fdba2c4d1675b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:27:04 +0200 Subject: gnu: ocaml-ssl: Declare a source file-name. * gnu/packages/ocaml.scm (ocaml-ssl)[source]: Declare a source file-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index be18766ba2..24f402128c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1648,6 +1648,7 @@ (define-public ocaml-ssl (method url-fetch) (uri (string-append "https://github.com/savonet/ocaml-ssl/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "15p7652cvzdrlqxc1af11mg07wasxr1fsaj44gcmmh6bmav7wfzq")))) (build-system ocaml-build-system) -- cgit v1.2.3 From 96dcb8a037e8dd4997096217f7f77110265b2ede Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:29:28 +0200 Subject: gnu: usbredir: Declare a source file-name. * gnu/packages/spice.scm (usbredir)[source]: Declare a source file-name. --- gnu/packages/spice.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 58450e6a3e..fb3b11ba2d 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -69,6 +69,7 @@ (define-public usbredir (uri (git-reference (url "https://anongit.freedesktop.org/git/spice/usbredir.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "052fywgi72j68dr5ybldncg4vk8iqfrh58la7iazyxxpph9aag1g")))) -- cgit v1.2.3 From 76b27f427a71e10895b4fb4d7b58af3404224a66 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:30:50 +0200 Subject: gnu: r-tgstat: Declare a source file-name. * gnu/packages/statistics.scm (r-tgstat)[source]: Declare a source file-name. --- gnu/packages/statistics.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f4a1e0545f..72cdf7ff3f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5450,6 +5450,7 @@ (define-public r-tgstat (uri (hg-reference (url "https://bitbucket.org/tanaylab/tgstat") (changeset changeset))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0ilkkyximy77zbncm91kdfqbxf0qyndg16pd3q3p6a3xc9qcmxvn")))) -- cgit v1.2.3 From 4510f976dcbff4b509ba635c9c8d2950660b343b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:31:49 +0200 Subject: gnu: r-tgconfig: Declare a source file-name. * gnu/packages/statistics.scm (r-tgconfig)[source]: Declare a source file-name. --- gnu/packages/statistics.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 72cdf7ff3f..b7a12d907a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5485,6 +5485,7 @@ (define-public r-tgconfig (uri (hg-reference (url "https://bitbucket.org/tanaylab/tgconfig") (changeset changeset))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0xy6c7s7mn1yx191154bwbv1bl424bnvc80syqpl1vdl28ba46rj")))) -- cgit v1.2.3 From 29a3905452a35f4e6e59c4e0eb3e9a27178d15fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:33:44 +0200 Subject: gnu: tinyxml2: Declare a source file-name. * gnu/packages/xml.scm (tinyxml2)[source]: Declare a source file-name. --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index bde959a284..729fa56a30 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1061,9 +1061,10 @@ (define-public tinyxml2 (method url-fetch) (uri (string-append "https://github.com/leethomason/tinyxml2/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "083z4r4khcndxi9k840lcr48sqxvar4gpsnf749xfdn1bkr8xcql")))) + (base32 + "083z4r4khcndxi9k840lcr48sqxvar4gpsnf749xfdn1bkr8xcql")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From da0baf117d740320b0e2733137611a8059b0abba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:35:31 +0200 Subject: gnu: mod-wsgi: Declare a source file-name. * gnu/packages/web.scm (mod-wsgi)[source]: Declare a source file-name. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f5e004eda5..3fb860a8e3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -159,6 +159,7 @@ (define-public mod-wsgi (uri (string-append "https://github.com/GrahamDumpleton/mod_wsgi/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q")))) -- cgit v1.2.3 From 716a39bcf15e2d05709d8757e994a1613cefc95e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:36:22 +0200 Subject: gnu: tidy: Declare a source file-name. * gnu/packages/web.scm (tidy)[source]: Declare a source file-name. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3fb860a8e3..1cf426b5c0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -846,6 +846,7 @@ (define-public tidy ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy") (module "tidy") (revision "2009-12-23"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb")) -- cgit v1.2.3 From 728ee9d6f7257baa51eb6fccd25d62fe2134d9fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:39:42 +0200 Subject: gnu: vpnc-scripts: Declare a source file-name. * gnu/packages/vpn.scm (vpnc-scripts)[source]: Declare a source file-name. --- gnu/packages/vpn.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 642ca1c044..0fc3197077 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -128,6 +128,7 @@ (define-public vpnc-scripts (git-reference (url "git://git.infradead.org/users/dwmw2/vpnc-scripts.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0pa36w4wlyyvfb66cayhans99wsr2j5si2fvfr7ldfm512ajwn8h")))) -- cgit v1.2.3 From d36df187e05d570b9da8e1d09be0a7ab2ac907a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:41:34 +0200 Subject: gnu: git-flow: Declare a source file-name. * gnu/packages/version-control.scm (git-flow)[source]: Declare a source file-name. --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 34c1852a22..b55ba5370a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -785,6 +785,7 @@ (define-public git-flow (uri (git-reference (url "https://github.com/nvie/gitflow/") (commit "15aab26490facf285acef56cb5d61025eacb3a69"))) + (file-name (git-file-name name version)) (sha256 (base32 "01fs97q76fdfnvmrh2cyjhywcs3pykf1dg58sy0frflnsdzs6prx")))) -- cgit v1.2.3 From 348f8c8553a0a9ae7815cfb51a1d0aed564ccb7f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:42:37 +0200 Subject: gnu: git-test-sequence: Declare a source file-name. * gnu/packages/version-control.scm (git-test-sequence)[source]: Declare a source file-name. --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b55ba5370a..a3f4a4dd4b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -903,6 +903,7 @@ (define-public git-test-sequence ;; are interested in just one for this package. (url "https://github.com/dustin/bindir") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1dcq0y16yznbv4k9h8gg90kv1gkn8r8dbvl4m2rpfd7q5nqhn617")))) -- cgit v1.2.3 From 54335b59f08b83cda22ee0ee5157528ad8833e40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:44:16 +0200 Subject: gnu: python-editdistance: Declare a source file-name. * gnu/packages/textutils.scm (python-editdistance)[source]: Declare a source file-name. --- gnu/packages/textutils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d75ba7766e..be8dd086a2 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -632,6 +632,7 @@ (define-public python-editdistance (uri (git-reference (url "https://github.com/aflc/editdistance.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1l43svsv12crvzphrgi6x435z6xg8m086c64armp8wzb4l8ccm7g")))) -- cgit v1.2.3 From 54d5b27e92d8cc4e3195ce859f3c79bb676dc9df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:46:48 +0200 Subject: gnu: python-editdistance: Use 'invoke'. * gnu/packages/textutils.scm (python-editdistance)[arguments]: Use 'invoke' instead of 'system*'. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index be8dd086a2..2d8a104d54 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -644,7 +644,7 @@ (define-public python-editdistance (lambda _ (with-directory-excursion "editdistance" (delete-file "bycython.cpp") - (zero? (system* "cython" "--cplus" "bycython.pyx")))))))) + (invoke "cython" "--cplus" "bycython.pyx"))))))) (native-inputs `(("python-cython" ,python-cython))) (home-page "https://www.github.com/aflc/editdistance") -- cgit v1.2.3 From ebd43a2a45f9ac0ce702ef5810eddafd0830db5f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 7 Mar 2018 02:05:43 +0100 Subject: gnu: Add python2-langkit. * gnu/packages/ada.scm: New file. --- gnu/packages/ada.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 gnu/packages/ada.scm diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm new file mode 100644 index 0000000000..d6cd1e9787 --- /dev/null +++ b/gnu/packages/ada.scm @@ -0,0 +1,61 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Danny Milosavljevic +;;; +;;; 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 . + +(define-module (gnu packages ada) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages python)) + +(define-public python2-langkit + (let ((commit "fe0bc8bf60dbd2937759810df76ac420d99fc15f") + (revision "0")) + (package + (name "python2-langkit") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AdaCore/langkit.git") + (commit commit))) + (sha256 + (base32 + "1abqgw2p8pb1pm54my5kkbbixfhc6l0bwajdv1xlzyrh31xki3wx")) + (file-name (string-append name "-" version "-checkout")))) + (build-system python-build-system) + (propagated-inputs + `(("python2-docutils" ,python2-docutils) + ("python2-enum34" ,python2-enum34) + ("python2-funcy" ,python2-funcy) + ("python2-mako" ,python2-mako))) + (arguments + `(#:python ,python-2 + #:tests? #f)) ; Tests would requite gprbuild (Ada). + (synopsis "Semantic analysis tool generator in Python") + (description "@code{Langkit} is a tool whose purpose is to make it easy +to create syntactic and semantic analysis engines. Write a language +specification in our Python DSL and Langkit will generate for you an +Ada library with bindings for the C and Python programming languages.") + (home-page "https://github.com/AdaCore/langkit/") + (license license:gpl3+)))) ; and gcc runtime library exception -- cgit v1.2.3 From 80b58d15bc659d5d0b4565b9fa700eabfc38fd83 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Mar 2018 21:11:48 +0100 Subject: gnu: Add python2-quex@0.67.3. * gnu/packages/python.scm (python2-quex-0.67.3): New variable. --- gnu/packages/python.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 22fbdf6720..2272f15b54 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12992,3 +12992,45 @@ (define-public python-pyinotify (define-public python2-pyinotify (package-with-python2 python-pyinotify)) + +;; Ada parser uses this version. +(define-public python2-quex-0.67.3 + (package + (name "python2-quex") + (version "0.67.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/quex/HISTORY/0.67/quex-" version ".zip")) + (sha256 + (base32 + "14gv8ll3ipqv4kyc2xiy891nrmjl4ic823zfyx8hassagyclyppw")) + (file-name (string-append name "-" version ".zip")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (arguments + `(#:python ,python-2 + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share/quex (string-append out "/share/quex")) + (bin (string-append out "/bin"))) + (copy-recursively "." share/quex) + (mkdir-p bin) + (symlink (string-append share/quex "/quex-exe.py") + (string-append bin "/quex")) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "QUEX_PATH") + (files '("share/quex"))))) + (home-page "http://quex.sourceforge.net/") + (synopsis "Lexical analyzer generator in Python") + (description "@code{quex} is a lexical analyzer generator in Python.") + (license license:lgpl2.1+))) ; Non-military -- cgit v1.2.3 From 6c7017269228c1766c62aa425d35f27870c5724c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Mar 2018 21:14:39 +0100 Subject: gnu: Add python-quex. * gnu/packages/python.scm (python-quex): New variable. --- gnu/packages/python.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2272f15b54..8db00dbf37 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13034,3 +13034,16 @@ (define-public python2-quex-0.67.3 (synopsis "Lexical analyzer generator in Python") (description "@code{quex} is a lexical analyzer generator in Python.") (license license:lgpl2.1+))) ; Non-military + +(define-public python2-quex + (package (inherit python2-quex-0.67.3) + (name "python2-quex") + (version "0.68.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/quex/DOWNLOAD/quex-" version ".tar.gz")) + (sha256 + (base32 + "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j")) + (file-name (string-append name "-" version ".tar.gz")))))) -- cgit v1.2.3 From 2cdd9729fac5d3fc1e700e55e4a6bbf93a990c8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:00:57 +0200 Subject: gnu: texlive-dvips: Declare a source file-name. * gnu/packages/tex.scm (texlive-dvips)[source]: Declare a source file-name. [native-inputs]: Declare source file-names for native-inputs. --- gnu/packages/tex.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 764f4fff15..9a6d8ec344 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -214,6 +214,7 @@ (define-public texlive-dvips %texlive-tag "/Master/texmf-dist/" "/dvips")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0fcy2hpapbj01ncpjj3v39yhr0jjxb6rm13qaxjjw66s3vydxls1")))) @@ -244,6 +245,7 @@ (define-public texlive-dvips %texlive-tag "/Master/texmf-dist/" "/fonts/map/dvips/tetex")) (revision %texlive-revision))) + (file-name (string-append "dvips-font-maps-" version "-checkout")) (sha256 (base32 "100208pg7q6lj7swiq9p9287nn6b64bl62bnlaxpjni9y2kdrqy5")))) @@ -255,6 +257,7 @@ (define-public texlive-dvips %texlive-tag "/Master/texmf-dist/" "/fonts/enc/dvips/base")) (revision %texlive-revision))) + (file-name (string-append "dvips-base-enc-" version "-checkout")) (sha256 (base32 "1xnf6ms0h87r55kxik4vicwr1907scj789lhqflqns8svvsli5iy")))))) -- cgit v1.2.3 From b8d8806b52543e7e5d7f578fb6adb632683d8b4f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:18:00 +0200 Subject: gnu: Use https for www.ctan.org. * gnu/packages/tex.scm: Use https for ctan.org. --- gnu/packages/tex.scm | 186 +++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9a6d8ec344..93788a1c50 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017 Ricardo Wurmus @@ -261,7 +261,7 @@ (define-public texlive-dvips (sha256 (base32 "1xnf6ms0h87r55kxik4vicwr1907scj789lhqflqns8svvsli5iy")))))) - (home-page "http://www.ctan.org/pkg/dvips") + (home-page "https://www.ctan.org/pkg/dvips") (synopsis "DVI to PostScript drivers") (description "This package provides files needed for converting DVI files to PostScript.") @@ -295,7 +295,7 @@ (define-public texlive-generic-unicode-data (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/unicode-data") + (home-page "https://www.ctan.org/pkg/unicode-data") (synopsis "Unicode data and loaders for TeX") (description "This bundle provides generic access to Unicode Consortium data for TeX use. It contains a set of text files provided by the Unicode @@ -368,7 +368,7 @@ (define-public texlive-generic-tex-ini-files (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://ctan.org/pkg/tex-ini-files") + (home-page "https://www.ctan.org/pkg/tex-ini-files") (synopsis "Files for creating TeX formats") (description "This bundle provides a collection of model \".ini\" files for creating TeX formats. These files are commonly used to introduced @@ -402,7 +402,7 @@ (define-public texlive-generic-hyph-utf8 (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://ctan.org/pkg/hyph-utf8") + (home-page "https://ctan.org/pkg/hyph-utf8") (synopsis "Hyphenation patterns expressed in UTF-8") (description "Modern native UTF-8 engines such as XeTeX and LuaTeX need hyphenation patterns in UTF-8 format, whereas older systems require @@ -478,7 +478,7 @@ (define-public texlive-metafont-base #t)))))) (native-inputs `(("texlive-bin" ,texlive-bin))) - (home-page "http://www.ctan.org/pkg/metafont") + (home-page "https://www.ctan.org/pkg/metafont") (synopsis "Metafont base files") (description "This package provides the Metafont base files needed to build fonts using the Metafont system.") @@ -578,7 +578,7 @@ (define-public texlive-fonts-cm (native-inputs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base))) - (home-page "http://www.ctan.org/pkg/cm") + (home-page "https://www.ctan.org/pkg/cm") (synopsis "Computer Modern fonts for TeX") (description "This package provides the Computer Modern fonts by Donald Knuth. The Computer Modern font family is a large collection of text, @@ -715,7 +715,7 @@ (define-public texlive-fonts-latex `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) ("texlive-fonts-cm" ,texlive-fonts-cm))) - (home-page "http://www.ctan.org/pkg/latex-fonts") + (home-page "https://www.ctan.org/pkg/latex-fonts") (synopsis "Collection of fonts used in LaTeX distributions") (description "This is a collection of fonts for use with standard LaTeX packages and classes. It includes invisible fonts (for use with the slides @@ -793,7 +793,7 @@ (define-public texlive-fonts-amsfonts `(("texlive-fonts-cm" ,texlive-fonts-cm) ("texlive-metafont-base" ,texlive-metafont-base) ("texlive-bin" ,texlive-bin))) - (home-page "http://www.ctan.org/pkg/amsfonts") + (home-page "https://www.ctan.org/pkg/amsfonts") (synopsis "TeX fonts from the American Mathematical Society") (description "This package provides an extended set of fonts for use in mathematics, @@ -823,7 +823,7 @@ (define-public texlive-latex-amsfonts (native-inputs `(("texlive-fonts-cm" ,texlive-fonts-cm) ("texlive-metafont-base" ,texlive-metafont-base))) - (home-page "http://www.ctan.org/pkg/amsfonts") + (home-page "https://www.ctan.org/pkg/amsfonts") (synopsis "TeX fonts from the American Mathematical Society") (description "This package provides basic LaTeX support for the symbol fonts provides @@ -1006,7 +1006,7 @@ (define-public texlive-latex-base ("texlive-fonts-cm" ,texlive-fonts-cm) ("texlive-fonts-latex" ,texlive-fonts-latex) ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib))) - (home-page "http://www.ctan.org/pkg/latex-base") + (home-page "https://www.ctan.org/pkg/latex-base") (synopsis "Base sources of LaTeX") (description "This bundle comprises the source of LaTeX itself, together with several @@ -1027,7 +1027,7 @@ (define-public texlive-latex-filecontents "0swkbxv8vg0yizadfnvrwjb4cj0pn34v9wm6v7wqq903fdav7k7q")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/filecontents")) - (home-page "http://www.ctan.org/pkg/filecontents") + (home-page "https://www.ctan.org/pkg/filecontents") (synopsis "Extended filecontents and filecontents* environments") (description "LaTeX2e's @code{filecontents} and @code{filecontents*} environments @@ -1055,7 +1055,7 @@ (define-public texlive-generic-ifxetex #:tex-format "xelatex")) (inputs `(("texlive-latex-filecontents" ,texlive-latex-filecontents))) - (home-page "http://www.ctan.org/pkg/ifxetex") + (home-page "https://www.ctan.org/pkg/ifxetex") (synopsis "Am I running under XeTeX?") (description "This is a simple package which provides an @code{\\ifxetex} conditional, @@ -1088,7 +1088,7 @@ (define-public texlive-generic-epsf (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/epsf") + (home-page "https://www.ctan.org/pkg/epsf") (synopsis "Simple macros for EPS inclusion") (description "This package provides the original (and now obsolescent) graphics @@ -1115,7 +1115,7 @@ (define-public texlive-latex-fancyvrb ;; We exclude "fvrb-ex" to avoid a dependency on texlive-luaotfload and ;; thus texlive-luatex-lualibs. #:build-targets '("fancyvrb.ins"))) - (home-page "http://www.ctan.org/pkg/fancyvrb") + (home-page "https://www.ctan.org/pkg/fancyvrb") (synopsis "Sophisticated verbatim text") (description "This package provides tools for the flexible handling of verbatim text @@ -1179,7 +1179,7 @@ (define-public texlive-latex-graphics (sha256 (base32 "0gi4qv6378nl84s8n1yx3hjqvv7r4lza7hpbymbl5rzwgw8qrnyb")))))) - (home-page "http://www.ctan.org/pkg/latex-graphics") + (home-page "https://www.ctan.org/pkg/latex-graphics") (synopsis "LaTeX standard graphics bundle") (description "This is a collection of LaTeX packages for producing color, including @@ -1202,7 +1202,7 @@ (define-public texlive-latex-xcolor "01n613s7bcrd2n4jfawm0k4nn2ny3aaifp2jjfif3lz4sbv31494")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/xcolor")) - (home-page "http://www.ctan.org/pkg/xcolor") + (home-page "https://www.ctan.org/pkg/xcolor") (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX") (description "The package starts from the basic facilities of the colorcolor package, @@ -1230,7 +1230,7 @@ (define-public texlive-latex-hyperref "1d3rmjgzh0025a1dza55zb6nzzlgd1y9snwx45wq1c1vf42m79h2")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/hyperref")) - (home-page "http://www.ctan.org/pkg/hyperref") + (home-page "https://www.ctan.org/pkg/hyperref") (synopsis "Extensive support for hypertext in LaTeX") (description "The @code{hyperref} package is used to handle cross-referencing commands @@ -1265,7 +1265,7 @@ (define-public texlive-latex-oberdiek (substitute* "oberdiek.ins" (("ifpdf.ins") "ifpdf.dtx")) #t))))) - (home-page "http://www.ctan.org/pkg/oberdiek") + (home-page "https://www.ctan.org/pkg/oberdiek") (synopsis "Bundle of packages submitted by Heiko Oberdiek") (description "The bundle comprises various LaTeX packages, providing among others: @@ -1287,7 +1287,7 @@ (define-public texlive-latex-tools (arguments '(#:tex-directory "latex/tools" #:build-targets '("tools.ins"))) - (home-page "http://www.ctan.org/pkg/latex-tools") + (home-page "https://www.ctan.org/pkg/latex-tools") (synopsis "LaTeX standard tools bundle") (description "This package is a collection of (variously) simple tools provided as @@ -1350,7 +1350,7 @@ (define-public texlive-latex-l3kernel (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3kernel")) - (home-page "http://www.ctan.org/pkg/l3kernel") + (home-page "https://www.ctan.org/pkg/l3kernel") (synopsis "LaTeX3 programmers’ interface") (description "The l3kernel bundle provides an implementation of the LaTeX3 @@ -1389,7 +1389,7 @@ (define-public texlive-latex-l3packages #t))))) (inputs `(("texlive-latex-l3kernel" ,texlive-latex-l3kernel))) - (home-page "http://www.ctan.org/pkg/l3packages") + (home-page "https://www.ctan.org/pkg/l3packages") (synopsis "High-level LaTeX3 concepts") (description "This bundle holds prototype implementations of concepts for a LaTeX @@ -1423,7 +1423,7 @@ (define-public texlive-latex-fontspec #:build-targets '("fontspec.dtx"))) (inputs `(("texlive-latex-l3kernel" ,texlive-latex-l3kernel))) - (home-page "http://www.ctan.org/pkg/fontspec") + (home-page "https://www.ctan.org/pkg/fontspec") (synopsis "Advanced font selection in XeLaTeX and LuaLaTeX") (description "Fontspec is a package for XeLaTeX and LuaLaTeX. It provides an @@ -1481,7 +1481,7 @@ (define-public texlive-latex-amsmath "178ywjpdlv78qmfzqdyn6gy14620zjsn2q9wap76fbr9s4hw6dba")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/amsmath")) - (home-page "http://www.ctan.org/pkg/amsmath") + (home-page "https://www.ctan.org/pkg/amsmath") (synopsis "AMS mathematical facilities for LaTeX") (description "This is the principal package in the AMS-LaTeX distribution. It adapts @@ -1510,7 +1510,7 @@ (define-public texlive-latex-amscls (build-system texlive-build-system) (arguments `(#:tex-directory "latex/amscls")) - (home-page "http://www.ctan.org/pkg/amscls") + (home-page "https://www.ctan.org/pkg/amscls") (synopsis "AMS document classes for LaTeX") (description "This bundle contains three AMS classes: @code{amsartamsart} (for writing @@ -1542,7 +1542,7 @@ (define-public texlive-latex-babel (substitute* "babel.ins" (("askonceonly") "askforoverwritefalse")) #t))))) - (home-page "http://www.ctan.org/pkg/babel") + (home-page "https://www.ctan.org/pkg/babel") (synopsis "Multilingual support for Plain TeX or LaTeX") (description "The package manages culturally-determined typographical (and other) @@ -1567,7 +1567,7 @@ (define-public texlive-generic-babel-english "1s404wbx91z5w65hm024kyl4h56zsa096irx18vsx8jvlmwsr5wc")))) (build-system texlive-build-system) (arguments '(#:tex-directory "generic/babel-english")) - (home-page "http://www.ctan.org/pkg/babel-english") + (home-page "https://www.ctan.org/pkg/babel-english") (synopsis "Babel support for English") (description "This package provides the language definition file for support of @@ -1589,7 +1589,7 @@ (define-public texlive-latex-cyrillic (build-system texlive-build-system) (arguments '(#:tex-directory "latex/cyrillic")) - (home-page "http://www.ctan.org/pkg/latex-cyrillic") + (home-page "https://www.ctan.org/pkg/latex-cyrillic") (synopsis "Support for Cyrillic fonts in LaTeX") (description "This bundle of macros files provides macro support (including font @@ -1610,7 +1610,7 @@ (define-public texlive-latex-psnfss "1920dcq8613yzprasbg80fh4fcjcidvvl54wkx438nimyxcri7qz")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/psnfss")) - (home-page "http://www.ctan.org/pkg/psnfss") + (home-page "https://www.ctan.org/pkg/psnfss") (synopsis "Font support for common PostScript fonts") (description "The PSNFSS collection includes a set of files that provide a complete @@ -1730,7 +1730,7 @@ (define-public texlive-latex-amsrefs "15i4k479dwrpr0kspmm70g1yn4p3dkh0whyzmr93hph9bggnh1i1")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/amsrefs")) - (home-page "http://www.ctan.org/pkg/amsrefs") + (home-page "https://www.ctan.org/pkg/amsrefs") (synopsis "LaTeX-based replacement for BibTeX") (description "Amsrefs is a LaTeX package for bibliographies that provides an archival @@ -1759,7 +1759,7 @@ (define-public texlive-latex-bigfoot (lambda _ (for-each delete-file (find-files "." "\\.drv$")) #t))))) - (home-page "http://www.ctan.org/pkg/bigfoot") + (home-page "https://www.ctan.org/pkg/bigfoot") (synopsis "Footnotes for critical editions") (description "This package aims to provide a one-stop solution to requirements for @@ -1787,7 +1787,7 @@ (define-public texlive-latex-blindtext "1jrja9b1pzdh9zgv1jh807w4xijqja58n2mqny6dkwicv8qfgbfg")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/blindtext")) - (home-page "http://www.ctan.org/pkg/blindtext") + (home-page "https://www.ctan.org/pkg/blindtext") (synopsis "Producing 'blind' text for testing") (description "The package provides the commands @code{\\blindtext} and @@ -1819,7 +1819,7 @@ (define-public texlive-latex-dinbrief (lambda _ (delete-file "dinbrief.drv") #t))))) - (home-page "http://www.ctan.org/pkg/dinbrief") + (home-page "https://www.ctan.org/pkg/dinbrief") (synopsis "German letter DIN style") (description "This package implements a document layout for writing letters according @@ -1845,7 +1845,7 @@ (define-public texlive-latex-draftwatermark "1zyl2pcz2x529gzj5m93a1s4ipymdabf7qdjl3l1673pizd4hfyv")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/draftwatermark")) - (home-page "http://www.ctan.org/pkg/draftwatermark") + (home-page "https://www.ctan.org/pkg/draftwatermark") (synopsis "Put a grey textual watermark on document pages") (description "This package provides a means to add a textual, light grey watermark on @@ -1869,7 +1869,7 @@ (define-public texlive-latex-environ "06h28b26dyjkj9shksphgqfv4130jfkwhbw737hxn7d3yvdfffyd")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/environ")) - (home-page "http://www.ctan.org/pkg/environ") + (home-page "https://www.ctan.org/pkg/environ") (synopsis "New interface for environments in LaTeX") (description "This package provides the @code{\\collect@@body} command (as in @@ -1891,7 +1891,7 @@ (define-public texlive-latex-eqparbox "0pvmhsd4xmpil0m3c7qcgwilbk266mlkzv03g0jr8r3zd8jxlyzq")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/eqparbox")) - (home-page "http://www.ctan.org/pkg/eqparbox") + (home-page "https://www.ctan.org/pkg/eqparbox") (synopsis "Create equal-widthed parboxes") (description "LaTeX users sometimes need to ensure that two or more blocks of text @@ -1927,7 +1927,7 @@ (define-public texlive-latex-expdlist (for-each delete-file (find-files "." "\\.drv$")) #t))))) - (home-page "http://www.ctan.org/pkg/expdlist") + (home-page "https://www.ctan.org/pkg/expdlist") (synopsis "Expanded description environments") (description "The package provides additional features for the LaTeX @@ -1962,7 +1962,7 @@ (define-public texlive-latex-filemod (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/filemod") + (home-page "https://www.ctan.org/pkg/filemod") (synopsis "Provide file modification times, and compare them") (description "This package provides macros to read and compare the modification dates @@ -1988,7 +1988,7 @@ (define-public texlive-latex-ifplatform "11gvvjvmdfs9b7mm19yf80zwkx49jqcbq6g8qb9y5ns1r1qvnixp")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/ifplatform")) - (home-page "http://www.ctan.org/pkg/ifplatform") + (home-page "https://www.ctan.org/pkg/ifplatform") (synopsis "Conditionals to test which platform is being used") (description "This package uses the (La)TeX extension @code{-shell-escape} to @@ -2012,7 +2012,7 @@ (define-public texlive-latex-natbib "0aqliq0nwblxyrzhwhv77pnmk7qh2y3prgq7z7qhwcbgz5kisld7")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/natbib")) - (home-page "http://www.ctan.org/pkg/natbib") + (home-page "https://www.ctan.org/pkg/natbib") (synopsis "Flexible bibliography support") (description "This bundle provides a package that implements both author-year and @@ -2036,7 +2036,7 @@ (define-public texlive-latex-psfrag "1dxbl5il7wbbsp0v45vk884xi1192wxw03849pb1g5q4x808n352")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/psfrag")) - (home-page "http://www.ctan.org/pkg/psfrag") + (home-page "https://www.ctan.org/pkg/psfrag") (synopsis "Replace strings in encapsulated PostScript figures") (description "This package allows LaTeX constructions (equations, picture @@ -2074,7 +2074,7 @@ (define-public texlive-latex-pstool ("texlive-latex-oberdiek" ,texlive-latex-oberdiek) ("texlive-latex-psfrag" ,texlive-latex-psfrag) ("texlive-latex-trimspaces" ,texlive-latex-trimspaces))) - (home-page "http://www.ctan.org/pkg/pstool") + (home-page "https://www.ctan.org/pkg/pstool") (synopsis "Process PostScript graphisc within pdfLaTeX documents") (description "This is a package for processing PostScript graphics with @code{psfrag} @@ -2099,7 +2099,7 @@ (define-public texlive-latex-seminar "0y4i651b75y6006n03x8n86bsqvjsailvvz9bhzy51dzsznqidq0")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/seminar")) - (home-page "http://www.ctan.org/pkg/seminar") + (home-page "https://www.ctan.org/pkg/seminar") (synopsis "Make overhead slides") ;; TODO: This package may need fancybox and xcomment at runtime. (description @@ -2134,7 +2134,7 @@ (define-public texlive-latex-trimspaces #t))))) (inputs `(("texlive-latex-filecontents" ,texlive-latex-filecontents))) - (home-page "http://www.ctan.org/pkg/trimspaces") + (home-page "https://www.ctan.org/pkg/trimspaces") (synopsis "Trim spaces around an argument or within a macro") (description "This very short package allows you to expandably remove spaces around a @@ -2169,7 +2169,7 @@ (define-public texlive-latex-capt-of (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/capt-of") + (home-page "https://www.ctan.org/pkg/capt-of") (synopsis "Captions on more than floats") (description "This package defines a command @code{\\captionof} for putting a caption @@ -2202,7 +2202,7 @@ (define-public texlive-latex-etoolbox (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/etoolbox") + (home-page "https://www.ctan.org/pkg/etoolbox") (synopsis "e-TeX tools for LaTeX") (description "This package is a toolbox of programming facilities geared primarily @@ -2240,7 +2240,7 @@ (define-public texlive-latex-fncychap (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/fncychap") + (home-page "https://www.ctan.org/pkg/fncychap") (synopsis "Seven predefined chapter heading styles") (description "This package provides seven predefined chapter heading styles. Each @@ -2275,7 +2275,7 @@ (define-public texlive-latex-framed (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/framed") + (home-page "https://www.ctan.org/pkg/framed") (synopsis "Framed or shaded regions that can break across pages") (description "The package creates three environments: @code{framed}, which puts an @@ -2309,7 +2309,7 @@ (define-public texlive-latex-g-brief (lambda _ (delete-file "g-brief.drv") #t))))) - (home-page "http://www.ctan.org/pkg/g-brief") + (home-page "https://www.ctan.org/pkg/g-brief") (synopsis "Letter document class") (description "This package is designed for formatting formless letters in German; it @@ -2331,7 +2331,7 @@ (define-public texlive-latex-galois "0d4l0msk8j5pi95xnmm9wygv1vbpkwkv5amx9l0km86cs79jpp1h")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/galois")) - (home-page "http://www.ctan.org/pkg/galois") + (home-page "https://www.ctan.org/pkg/galois") (synopsis "Typeset Galois connections") (description "The package deals with connections in two-dimensional style, optionally @@ -2351,7 +2351,7 @@ (define-public texlive-latex-gcite "03g9by54yrypn599y98r1xh7qw0bbbmpzq0bfwpj6j5q5rkl1mfa")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/gcite")) - (home-page "http://www.ctan.org/pkg/gcite") + (home-page "https://www.ctan.org/pkg/gcite") (synopsis "Citations in a reader-friendly style") (description "The package allows citations in the German style, which is considered by @@ -2375,7 +2375,7 @@ (define-public texlive-latex-geometry "1r2kfcwclg33yk5z8mvlagwxj7nr1mc3w4bdpmhrwv6dn8mrbvw8")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/geometry")) - (home-page "http://www.ctan.org/pkg/geometry") + (home-page "https://www.ctan.org/pkg/geometry") (synopsis "Flexible and complete interface to document dimensions") (description "This package provides an easy and flexible user interface to customize @@ -2400,7 +2400,7 @@ (define-public texlive-latex-mdwtools "0caxs74hla28hc67csf5i5ahadx97w8vxh3mdmsprxbpd1mr7ssg")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/mdwtools")) - (home-page "http://www.ctan.org/pkg/mdwtools") + (home-page "https://www.ctan.org/pkg/mdwtools") (synopsis "Miscellaneous tools by Mark Wooding") (description "This collection of tools includes: @code{atsupport} for short commands @@ -2424,7 +2424,7 @@ (define-public texlive-latex-polyglossia "09mvszd5qgqg4cfglpj5qxyzjz190ppb9p8gnsnjydwp1akvhayf")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/polyglossia")) - (home-page "http://www.ctan.org/pkg/polyglossia") + (home-page "https://www.ctan.org/pkg/polyglossia") (synopsis "Alternative to babel for XeLaTeX and LuaLaTeX") (description "This package provides a complete Babel replacement for users of LuaLaTeX @@ -2444,7 +2444,7 @@ (define-public texlive-latex-supertabular "14b2bc7cqz4ckxxycim9sw6jkrr1pahivm1rdbpz5k6hl967w1s3")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/supertabular")) - (home-page "http://www.ctan.org/pkg/supertabular") + (home-page "https://www.ctan.org/pkg/supertabular") (synopsis "Multi-page tables package") (description "This package was a predecessor of @code{longtable}; the newer @@ -2478,7 +2478,7 @@ (define-public texlive-tex-texinfo (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/texinfo") + (home-page "https://www.ctan.org/pkg/texinfo") (synopsis "TeX macros to handle Texinfo files") (description "Texinfo is the preferred format for documentation in the GNU project; @@ -2501,7 +2501,7 @@ (define-public texlive-latex-upquote "0d1050i973wnxigy0xpky5l7vn4ff7ldhkjpdqsw5s653gagwixp")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/upquote")) - (home-page "http://www.ctan.org/pkg/upquote") + (home-page "https://www.ctan.org/pkg/upquote") (synopsis "Show \"realistic\" quotes in verbatim") (description "Typewriter-style fonts are best for program listings, but Computer @@ -2541,7 +2541,7 @@ (define-public texlive-latex-anysize (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/anysize") + (home-page "https://www.ctan.org/pkg/anysize") (synopsis "Simple package to set up document margins") (description "This is a simple package to set up document margins. This package is @@ -2561,7 +2561,7 @@ (define-public texlive-latex-appendix "0rxfpr8vq3brwx5rc7qn91ixlp9zva4zrms8a579fqa1g5yva7vg")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/appendix")) - (home-page "http://www.ctan.org/pkg/appendix") + (home-page "https://www.ctan.org/pkg/appendix") (synopsis "Extra control of appendices") (description "The appendix package provides various ways of formatting the titles of @@ -2583,7 +2583,7 @@ (define-public texlive-latex-changebar "1ik4m8pzfsn1grlda6fniqqfwmgj7rfxwg63jdw0p0qv002vc7ik")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/changebar")) - (home-page "http://www.ctan.org/pkg/changebar") + (home-page "https://www.ctan.org/pkg/changebar") (synopsis "Generate changebars in LaTeX documents") (description "Identify areas of text to be marked with changebars with the @@ -2639,7 +2639,7 @@ (define-public texlive-latex-colortbl "190pmq8la2rq07xry8bn8z8yywzxv6fqyqaj7yjfj5rgw6x0mas8")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/colortbl")) - (home-page "http://www.ctan.org/pkg/colortbl") + (home-page "https://www.ctan.org/pkg/colortbl") (synopsis "Add colour to LaTeX tables") (description "This package allows rows, columns, and even individual cells in LaTeX @@ -2671,7 +2671,7 @@ (define-public texlive-latex-fancybox (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/fancybox") + (home-page "https://www.ctan.org/pkg/fancybox") (synopsis "Variants of \\fbox and other games with boxes") (description "This package provides variants of @code{\\fbox}: @code{\\shadowbox}, @@ -2705,7 +2705,7 @@ (define-public texlive-latex-fancyhdr (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/fancyhdr") + (home-page "https://www.ctan.org/pkg/fancyhdr") (synopsis "Extensive control of page headers and footers in LaTeX2e") (description "The package provides extensive facilities, both for constructing headers @@ -2725,7 +2725,7 @@ (define-public texlive-latex-float "0nbl7wylkv22fcdv4p8byhhj575fli6jnqjpkhrkbv8dzwah84nq")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/float")) - (home-page "http://www.ctan.org/pkg/float") + (home-page "https://www.ctan.org/pkg/float") (synopsis "Improved interface for floating objects") (description "This package improves the interface for defining floating objects such @@ -2748,7 +2748,7 @@ (define-public texlive-latex-footmisc "03x61wwql8nh6zrqiiiq3rb0x7m3pn48c606zapy19y21fybwdxs")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/footmisc")) - (home-page "http://www.ctan.org/pkg/footmisc") + (home-page "https://www.ctan.org/pkg/footmisc") (synopsis "Range of footnote options") (description "This is a collection of ways to change the typesetting of footnotes. @@ -2773,7 +2773,7 @@ (define-public texlive-latex-listings (arguments '(#:tex-directory "latex/listings" #:build-targets '("listings.ins"))) - (home-page "http://www.ctan.org/pkg/listings") + (home-page "https://www.ctan.org/pkg/listings") (synopsis "Typeset source code listings using LaTeX") (description "The package enables the user to typeset programs (programming code) @@ -2807,7 +2807,7 @@ (define-public texlive-latex-jknapltx (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/jknappen") + (home-page "https://www.ctan.org/pkg/jknappen") (synopsis "Miscellaneous packages by Joerg Knappen") (description "This package provides miscellaneous macros by Joerg Knappen, including: @@ -2882,7 +2882,7 @@ (define-public texlive-fonts-ec `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) ("texlive-fonts-cm" ,texlive-fonts-cm))) - (home-page "http://www.ctan.org/pkg/ec") + (home-page "https://www.ctan.org/pkg/ec") (synopsis "Computer modern fonts in T1 and TS1 encodings") (description "The EC fonts are European Computer Modern Fonts, supporting the complete @@ -2963,7 +2963,7 @@ (define-public texlive-fonts-rsfs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) ("texlive-fonts-cm" ,texlive-fonts-cm))) - (home-page "http://www.ctan.org/pkg/rsfs") + (home-page "https://www.ctan.org/pkg/rsfs") (synopsis "Ralph Smith's Formal Script font") (description "The fonts provide uppercase formal script letters for use as symbols in @@ -2986,7 +2986,7 @@ (define-public texlive-latex-eso-pic "1xvmms28mvvfpks9x7lfya2xhh5k8jy3qnlih1mzcnf156xnb89z")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/eso-pic")) - (home-page "http://www.ctan.org/pkg/eso-pic") + (home-page "https://www.ctan.org/pkg/eso-pic") (synopsis "Add picture commands (or backgrounds) to every page") (description "The package adds one or more user commands to LaTeX's @code{shipout} @@ -3019,7 +3019,7 @@ (define-public texlive-latex-eepic (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/eepic") + (home-page "https://www.ctan.org/pkg/eepic") (synopsis "Extensions to epic and the LaTeX drawing tools") (description "Extensions to @code{epic} and the LaTeX picture drawing environment, @@ -3056,7 +3056,7 @@ (define-public texlive-latex-enumitem (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/enumitem") + (home-page "https://www.ctan.org/pkg/enumitem") (synopsis "Customize basic list environments") (description "This package is intended to ease customizing the three basic list @@ -3078,7 +3078,7 @@ (define-public texlive-latex-multirow "0qlxy47f1f8plgch3jqfsnrdgpyz20sz46yp33i2jwvf9hvfczf0")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/multirow")) - (home-page "http://www.ctan.org/pkg/multirow") + (home-page "https://www.ctan.org/pkg/multirow") (synopsis "Create tabular cells spanning multiple rows") (description "The package provides tools for creating tabular cells spanning multiple @@ -3111,7 +3111,7 @@ (define-public texlive-latex-overpic (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/overpic") + (home-page "https://www.ctan.org/pkg/overpic") (synopsis "Combine LaTeX commands over included graphics") (description "The @code{overpic} environment is a cross between the LaTeX @@ -3147,7 +3147,7 @@ (define-public texlive-latex-parskip (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/parskip") + (home-page "https://www.ctan.org/pkg/parskip") (synopsis "Layout with zero \\parindent, non-zero \\parskip") (description "Simply changing @code{\\parskip} and @code{\\parindent} leaves a layout @@ -3167,7 +3167,7 @@ (define-public texlive-latex-pdfpages "06p5smfq66559ppdnmkl3hp8534x84ywbscimsiir4gllpya3i9h")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/pdfpages")) - (home-page "http://www.ctan.org/pkg/pdfpages") + (home-page "https://www.ctan.org/pkg/pdfpages") (synopsis "Include PDF documents in LaTeX") (description "This package simplifies the inclusion of external multi-page PDF @@ -3200,7 +3200,7 @@ (define-public texlive-fonts-stmaryrd (("fontdef\\}\\}" line) (string-append line "\n\\endbatchfile"))) #t))))) - (home-page "http://www.ctan.org/pkg/stmaryrd") + (home-page "https://www.ctan.org/pkg/stmaryrd") (synopsis "St Mary Road symbols for theoretical computer science") (description "The fonts were originally distributed as Metafont sources only, but @@ -3222,7 +3222,7 @@ (define-public texlive-latex-subfigure "15spcl5wb7w269qd6y596vp4yi8sa5ppcx8w4z2i9kyp02r3a0yb")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/subfigure")) - (home-page "http://www.ctan.org/pkg/subfigure") + (home-page "https://www.ctan.org/pkg/subfigure") (synopsis "Figures divided into subfigures") (description "This (deprecated) package provides support for the manipulation and @@ -3249,7 +3249,7 @@ (define-public texlive-latex-tabulary "1adkdx2zkk42g82nqf57lv1nc1z7kwl13jmy8vpcsizsa0xdnx9n")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/tabulary")) - (home-page "http://www.ctan.org/pkg/tabulary") + (home-page "https://www.ctan.org/pkg/tabulary") (synopsis "Tabular with variable width columns balanced") (description "The package defines a @code{tabular*}-like environment, @code{tabulary}, @@ -3286,7 +3286,7 @@ (define-public texlive-latex-threeparttable (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/threeparttable") + (home-page "https://www.ctan.org/pkg/threeparttable") (synopsis "Tables with captions and notes all the same width") (description "This package facilitates tables with titles (captions) and notes. The @@ -3409,7 +3409,7 @@ (define-public texlive-fonts-txfonts (sha256 (base32 "1bal5fhw0xlhl37ayv8vlnqnsn1y82kadzfjhbgr223blspp4zsj")))))) - (home-page "http://www.ctan.org/pkg/threeparttable") + (home-page "https://www.ctan.org/pkg/threeparttable") (synopsis "Times-like fonts in support of mathematics") (description "Txfonts supplies virtual text roman fonts using Adobe Times (or URW @@ -3493,7 +3493,7 @@ (define-public texlive-latex-titlesec (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/titlesec") + (home-page "https://www.ctan.org/pkg/titlesec") (synopsis "Select alternative section titles") (description "This package provides an interface to sectioning commands for selection @@ -3516,7 +3516,7 @@ (define-public texlive-latex-type1cm "1lvxrqfwcwa4p31zyfm80gr05v8c28xybv5ri79zi2ngz6834z12")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/type1cm")) - (home-page "http://www.ctan.org/pkg/type1cm") + (home-page "https://www.ctan.org/pkg/type1cm") (synopsis "Arbitrary size font selection in LaTeX") (description "LaTeX, by default, restricts the sizes at which you can use its default @@ -3544,7 +3544,7 @@ (define-public texlive-latex-lh "00gdiwh3sfhh1iimjhpja7lm7k4vzqzql2irgwnpz94qvh25zwi5")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/lh")) - (home-page "http://www.ctan.org/pkg/lh") + (home-page "https://www.ctan.org/pkg/lh") (synopsis "Cyrillic fonts that support LaTeX standard encodings") (description "The LH fonts address the problem of the wide variety of alphabets that @@ -3583,7 +3583,7 @@ (define-public texlive-metapost (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/metapost") + (home-page "https://www.ctan.org/pkg/metapost") (synopsis "Create scalable illustrations") (description "MetaPost uses a language based on that of Metafont to produce precise @@ -3604,7 +3604,7 @@ (define-public texlive-latex-acmart (file-name (string-append name "-" version "-checkout")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acmart")) - (home-page "http://www.ctan.org/pkg/acmart") + (home-page "https://www.ctan.org/pkg/acmart") (synopsis "Class for typesetting publications of ACM") (description "This package provides a class for typesetting publications of the @@ -3637,7 +3637,7 @@ (define-public texlive-latex-varwidth (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/varwidth") + (home-page "https://www.ctan.org/pkg/varwidth") (synopsis "Variable-width minipage") (description "The @code{varwidth} environment is superficially similar to @@ -3657,7 +3657,7 @@ (define-public texlive-latex-wasysym "1sgwbfwjjf70g54hh93gsd9jp9nm67w6n74x9d72a56n07jbk5hv")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/wasysym")) - (home-page "http://www.ctan.org/pkg/wasysym") + (home-page "https://www.ctan.org/pkg/wasysym") (synopsis "LaTeX support file to use the WASY2 fonts") (description "The wasy2WASY2 (Waldi Symbol) font by Roland Waldi provides many glyphs @@ -3692,7 +3692,7 @@ (define-public texlive-latex-wrapfig (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/wrapfig") + (home-page "https://www.ctan.org/pkg/wrapfig") (synopsis "Produces figures which text can flow around") (description "This package allows figures or tables to have text wrapped around them. @@ -3726,7 +3726,7 @@ (define-public texlive-latex-ucs (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/ucs") + (home-page "https://www.ctan.org/pkg/ucs") (synopsis "Extended UTF-8 input encoding support for LaTeX") (description "The bundle provides the @code{ucs} package, and @code{utf8x.def}, @@ -3760,7 +3760,7 @@ (define-public texlive-latex-preview (lambda _ (delete-file "preview.drv") #t))))) - (home-page "http://www.ctan.org/pkg/preview") + (home-page "https://www.ctan.org/pkg/preview") (synopsis "Extract bits of a LaTeX source for output") (description "The main purpose of the preview package is the extraction of selected @@ -3785,7 +3785,7 @@ (define-public texlive-latex-acronym "0jmasg40bk53zdd2jc8nc18jvdai3p2wmamy7hwli8gls4nf25qp")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acronym")) - (home-page "http://www.ctan.org/pkg/acronym") + (home-page "https://www.ctan.org/pkg/acronym") (synopsis "Expand acronyms at least once") (description "This package ensures that all acronyms used in the text are spelled out @@ -3820,7 +3820,7 @@ (define-public texlive-generic-pdftex (mkdir-p target) (copy-recursively (assoc-ref %build-inputs "source") target) #t)))) - (home-page "http://www.ctan.org/pkg/pdftex") + (home-page "https://www.ctan.org/pkg/pdftex") (synopsis "TeX extension for direct creation of PDF") (description "This package provides an extension of TeX which can be configured to -- cgit v1.2.3 From f569e9174f4a7b45619486878c4c7ab721a08c4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:19:30 +0200 Subject: gnu: texlive-generic-unicode-data: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-unicode-data)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 93788a1c50..c57ae1d6ba 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -281,6 +281,7 @@ (define-public texlive-generic-unicode-data %texlive-tag "/Master/texmf-dist/" "/tex/generic/unicode-data")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0ivrhp6jz31pl4z841g4ws41lmvdiwz4sslmhf02inlib79gz6r2")))) -- cgit v1.2.3 From ddc0bbc875aa46b3af449a020db4392fef03154e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:20:57 +0200 Subject: gnu: texlive-generic-dehyph-exptl: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-dehyph-exptl)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c57ae1d6ba..a574b01209 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -320,6 +320,7 @@ (define-public texlive-generic-dehyph-exptl %texlive-tag "/Master/texmf-dist/" "/tex/generic/dehyph-exptl")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1l9wgv99qq0ysvlxqpj4g8bl0dywbzra4g8m2kmpg2fb0i0hczap")))) -- cgit v1.2.3 From ac0529ddec796b970439d00f7a33070ff6bc7483 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:21:52 +0200 Subject: gnu: texlive-generic-tex-ini-files: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-tex-ini-files)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a574b01209..ce73dcf448 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -356,6 +356,7 @@ (define-public texlive-generic-tex-ini-files %texlive-tag "/Master/texmf-dist/" "/tex/generic/tex-ini-files")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1wh42n1lmzcvi3g6mm31nm3yd5ha5bl260xqc444jg1m9fdp3wz5")))) -- cgit v1.2.3 From a6acd6113c4c8ce2092d86f0ab9ffd5907cef853 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:23:16 +0200 Subject: gnu: texlive-generic-hyph-utf8: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-hyph-utf8)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ce73dcf448..276634a2e6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -391,6 +391,7 @@ (define-public texlive-generic-hyph-utf8 %texlive-tag "/Master/texmf-dist/" "/tex/generic/hyph-utf8")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0ghizcz7ps16dzfqf66wwg5i181assc6qsm0g7g5dbmp909931vi")))) -- cgit v1.2.3 From 1dec413ae0c731c23ec9286e56c711af7f9a4e5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:23:54 +0200 Subject: gnu: texlive-metafont-base: Declare a source file-name. * gnu/packages/tex.scm (texlive-metafont-base)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 276634a2e6..e743143be9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -448,6 +448,7 @@ (define-public texlive-metafont-base %texlive-tag "/Master/texmf-dist/" "/metafont")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1yl4n8cn5xqk2nc22zgzq6ymd7bhm6xx1mz3azip7i3ki4bhb5q5")))) -- cgit v1.2.3 From b8e213cb2f0c388f7ce41be48409ec28a5adf763 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:24:52 +0200 Subject: gnu: texlive-fontname: Fix source file-name. * gnu/packages/tex.scm (texlive-fontname)[source]: Correct source file-name. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e743143be9..bc0dc6c71b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -500,7 +500,7 @@ (define-public texlive-fontname %texlive-tag "/Master/texmf-dist/" "/fonts/map/fontname")) (revision %texlive-revision))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0cssbzcx15221dynp5sii72qh4l18mwkr14n8w1xb19j8pbaqasz")))) -- cgit v1.2.3 From a4015c206540cf3e75df592a1fbe76b94565a05b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:25:45 +0200 Subject: gnu: texlive-fonts-cm: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-cm)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bc0dc6c71b..b0211c7924 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -534,6 +534,7 @@ (define-public texlive-fonts-cm %texlive-tag "/Master/texmf-dist/" "/fonts/source/public/cm")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "045k5b9rdmbxpy1a3006l1x96z1rd18vg3cwrvnld9bqybw5qz44")))) -- cgit v1.2.3 From 6b286e424a1c7feeeb6ca581a597ab4037002f1d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:26:33 +0200 Subject: gnu: texlive-fonts-knuth-lib: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-knuth-lib)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b0211c7924..48b4d1f3bd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -603,6 +603,7 @@ (define-public texlive-fonts-knuth-lib %texlive-tag "/Master/texmf-dist/" "/fonts/source/public/knuth-lib")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0in9aqyi8jkyf9d16z0li50z5fpwj1iwgwm83gmvwqcf7chfs04y")))) -- cgit v1.2.3 From a4550e7d664b317bcaf8c4fa0d4d8642c7b96cec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:27:13 +0200 Subject: gnu: texlive-fonts-latex: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-latex)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 48b4d1f3bd..10b48f13bd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -667,6 +667,7 @@ (define-public texlive-fonts-latex %texlive-tag "/Master/texmf-dist/" "/fonts/source/public/latex-fonts")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0ypsm4xv9cw0jckk2qc7gi9hcmhf31mrg56pz3llyx3yd9vq2lps")))) -- cgit v1.2.3 From 5fe9233eb4c52b669342c74598d4480c2c20d8bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:27:54 +0200 Subject: gnu: texlive-fonts-amsfonts: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-amsfonts)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 10b48f13bd..1fedd2cb4a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -742,6 +742,7 @@ (define-public texlive-fonts-amsfonts %texlive-tag "/Master/texmf-dist/" "/fonts/source/public/amsfonts")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "07h20rvpbdb4k72hzmjkyb29426zr9wxsfp6yd4ajbbpd3vx8grb")))) -- cgit v1.2.3 From 9700a0d0a5670bc278b219847d0cd555f00314c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:29:32 +0200 Subject: gnu: texlive-latex-amsfonts: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-amsfonts)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1fedd2cb4a..ef0abaf870 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -824,6 +824,7 @@ (define-public texlive-latex-amsfonts (source (origin (method svn-fetch) (uri (texlive-ref "latex" "amsfonts")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0slzfv5h2m03b2xvm2sasznz4azh6rgi069z161dja3l8rln79hm")))) -- cgit v1.2.3 From b63aefe53ecaebfcb4088d1b3821f23e8a1b7e68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:30:18 +0200 Subject: gnu: texlive-tex-plain: Declare a source file-name. * gnu/packages/tex.scm (texlive-tex-plain)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ef0abaf870..c6f39dfa59 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -854,6 +854,7 @@ (define-public texlive-tex-plain %texlive-tag "/Master/texmf-dist/" "/tex/plain")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0mjgl3gscn3ps29yjambz1j9fg81ynnncb96vpprwx4xsijhsns0")))) -- cgit v1.2.3 From 8d514ae7538d9b0a7afbea5a3bf249c61f0d66cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:39:41 +0200 Subject: gnu: texlive-latex-base: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-base)[source]: Declare a source file-name. [native-inputs]: Add a source file-name. --- gnu/packages/tex.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c6f39dfa59..3a30777f20 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -887,6 +887,11 @@ (define-public texlive-latex-base %texlive-tag "/Master/texmf-dist/" dir)) (revision %texlive-revision))) + (file-name (string-append "texlive-generic-" + (last (string-split + (string-drop-right dir 1) #\/)) + "-" (number->string %texlive-revision) + "-checkout")) (sha256 (base32 hash)))))) (package (name "texlive-latex-base") @@ -894,6 +899,7 @@ (define-public texlive-latex-base (source (origin (method svn-fetch) (uri (texlive-ref "latex" "base")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1h9pir2hz6i9avc4lrl733p3zf4rpkg8537x1zdbhs91hvhikw9k")))) -- cgit v1.2.3 From 8d32139df0bdea0b3ac3e68592d148d23b4e5a8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:52:05 +0200 Subject: gnu: texlive-latex-base: Use 'invoke'. * gnu/packages/tex.scm (texlive-latex-base)[arguments]: Replace 'system*' with 'invoke'. --- gnu/packages/tex.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3a30777f20..05a7cd834b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -946,12 +946,10 @@ (define-public texlive-latex-base (mkdir "build") (mkdir "web2c") - (and (zero? (system* "luatex" "-ini" "-interaction=batchmode" - "-output-directory=build" - "unpack.ins")) - (zero? (system* "tex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" - "tex.ini")) + (and (invoke "luatex" "-ini" "-interaction=batchmode" + "-output-directory=build" "unpack.ins") + (invoke "tex" "-ini" "-interaction=batchmode" + "-output-directory=web2c" "tex.ini") ;; LaTeX, pdfetex/pdftex, and XeTeX require e-TeX, which ;; is enabled only in extended mode (activated with a ;; leading asterisk). We should not use luatex here, @@ -959,25 +957,25 @@ (define-public texlive-latex-base ;; incompatible with any other TeX engine. (every (lambda (format) - (zero? (system* "latex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" - "-translate-file=cp227.tcx" - (string-append "*" format ".ini")))) + (invoke "latex" "-ini" "-interaction=batchmode" + "-output-directory=web2c" + "-translate-file=cp227.tcx" + (string-append "*" format ".ini"))) '("latex" "pdflatex" "pdfetex")) (every (lambda (format) - (zero? (system* format "-ini" "-interaction=batchmode" - "-output-directory=web2c" - (string-append "*" format ".ini")))) + (invoke format "-ini" "-interaction=batchmode" + "-output-directory=web2c" + (string-append "*" format ".ini"))) '("xetex" "xelatex")) (every (lambda (format) - (zero? (system* "luatex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" - (string-append format ".ini")))) + (invoke "luatex" "-ini" "-interaction=batchmode" + "-output-directory=web2c" + (string-append format ".ini"))) '("dviluatex" "dvilualatex" "luatex" "lualatex"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 620ea2de26f9ef43e4b7a9dcc2f587a17764595a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 22:56:27 +0200 Subject: gnu: python2-quex: Parameterize the source uri. * gnu/packages/python.scm (python2-quex)[source]: Replace hard-coded version with parameterized one. Remove unnecessary file-name field. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8db00dbf37..106c040bf8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13001,11 +13001,12 @@ (define-public python2-quex-0.67.3 (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/quex/HISTORY/0.67/quex-" version ".zip")) + (uri (string-append "mirror://sourceforge/quex/HISTORY/" + (version-major+minor version) + "/quex-" version ".zip")) (sha256 (base32 - "14gv8ll3ipqv4kyc2xiy891nrmjl4ic823zfyx8hassagyclyppw")) - (file-name (string-append name "-" version ".zip")))) + "14gv8ll3ipqv4kyc2xiy891nrmjl4ic823zfyx8hassagyclyppw")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 23cdeaa97130ae908bfe9990cef85e4fe402aedf Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 13 Mar 2018 20:32:44 -0400 Subject: gnu: tiled: Update to 1.1.3. * gnu/packages/game-development.scm (tiled): Update to 1.1.3. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3025a68ec1..03a70bea49 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -386,7 +386,7 @@ (define-public python2-xsge (define-public tiled (package (name "tiled") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/bjorn/tiled/archive/v" @@ -394,7 +394,7 @@ (define-public tiled (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0l4wc10d10fi0a5spbi318kjfzlizmycpr4wwlq04sk3b5kra0w0")))) + "08bxl6vc7ynnji4r6ij9ayr2jixvfhv4daplw5p96s0gkhdqd90k")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From fdcbe78b14b8ef2f11b3ba8ff261d3972ca3ef90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 06:27:07 +0100 Subject: gnu: kurly: Update to 1.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/curl.scm (kurly): Update to 1.2.1. [arguments]: Install the man page, and put README.md in its right place. Rename ‘install-readme’ to ‘install-documentation’ to match this change. --- gnu/packages/curl.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 32509fc3fc..ccff18e632 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,7 +153,7 @@ (define-public curl-7.58.0 (define-public kurly (package (name "kurly") - (version "1.1.0") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -161,19 +162,24 @@ (define-public kurly (file-name (git-file-name name version)) (sha256 (base32 - "1q192f457sjypgvwq7grrf8gq8w272p3zf1d5ppc20mriqm0mbc3")))) + "01kp33gvzxmk6ipz7323wqwmbc90q2mwzsjig8rzpqsm4kji5hi6")))) (build-system go-build-system) (arguments `(#:import-path "github.com/davidjpeacock/kurly" #:install-source? #f #:phases (modify-phases %standard-phases - (add-after 'install 'install-readme - (lambda* (#:key outputs import-path #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (readme (string-append "src/" import-path "/README.md")) - (misc (string-append out "/share/kurly/misc/"))) - (install-file readme misc) + (add-after 'install 'install-documentation + (lambda* (#:key import-path outputs #:allow-other-keys) + (let* ((source (string-append "src/" import-path)) + (out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man (string-append out "/share/man/man1"))) + (with-directory-excursion source + (install-file "README.md" doc) + (mkdir-p man) + (copy-file "meta/kurly.man" + (string-append man "/kurly.1"))) #t)))))) (inputs `(("go-github-com-alsm-ioprogress" ,go-github-com-alsm-ioprogress) -- cgit v1.2.3 From d773fef1ce2d6f6386c8d388ce2b63ed9a264843 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 06:43:02 +0100 Subject: gnu: inkscape: Update to 0.92.3. * gnu/packages/inkscape.scm (inkscape): Update to 0.92.3. [source]: Remove patch. --- gnu/packages/inkscape.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index dc5a30b868..1e98369ea3 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -46,25 +46,15 @@ (define-module (gnu packages inkscape) (define-public inkscape (package (name "inkscape") - (version "0.92.2") + (version "0.92.3") (source (origin (method url-fetch) (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.bz2")) - (patches - (list - ;; Fix compatibility with poppler >= 0.58. - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" - "9418824967eb4c53371ef8588243fed4cab496e0.patch")) - (sha256 - (base32 - "0wwyhkqb1qyazz5f6wqrc223l6k8qnmadiw28q8gihlgvh38rvll"))))) (sha256 (base32 - "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56")))) + "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) -- cgit v1.2.3 From 5ecfa6f5659bebefabbc6ba3322faf3936358ed5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 06:44:28 +0100 Subject: gnu: r-stringi: Update to 1.1.7. * gnu/packages/statistics.scm (r-stringi): Update to 1.1.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b7a12d907a..78afb77a8b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -939,14 +939,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "122im5m8x9bqpahc0hbxmvdq6hnsmgnxwwyjpvbihyv2jq5kd44m")))) + "0nck1s2iglmkrn15ay2chrrwsy5lngcylz2sc87fxy5skxaahxdl")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 186cef9e1c023a7d0afb8a5ce796332d2ad99215 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 06:53:16 +0100 Subject: gnu: simplescreenrecorder: Update to 0.3.10. * gnu/packages/video.scm (simplescreenrecorder): Update to 0.3.10. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 984d2f183d..6c9769d9fa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2038,7 +2038,7 @@ (define-public recordmydesktop (define-public simplescreenrecorder (package (name "simplescreenrecorder") - (version "0.3.9") + (version "0.3.10") (source (origin (method url-fetch) @@ -2047,7 +2047,7 @@ (define-public simplescreenrecorder (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk")))) + "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g")))) (build-system cmake-build-system) ;; Although libx11, libxfixes, libxext are listed as build dependencies in ;; README.md, the program builds and functions properly without them. -- cgit v1.2.3 From b4bf95162777b9db3c681292942895ea308e701e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 07:00:29 +0100 Subject: gnu: masscan: Update to 1.0.5. * gnu/packages/admin.scm (masscan): Update to 1.0.5. [arguments]: Set CC to a real compiler instead of the default clang. --- gnu/packages/admin.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7623693722..ad31bc498f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2433,7 +2433,7 @@ (define-public thermald (define-public masscan (package (name "masscan") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/robertdavidgraham/masscan" @@ -2441,16 +2441,18 @@ (define-public masscan (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y9af345g00z83rliv6bmlqg37xwc7xpnx5xqdgmjikzcxgk9pji")))) + "0wxddsgyx27z45906icdhdbfsvfj8ij805208qpqjx46i0lnjs50")))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap))) (arguments '(#:test-target "regress" - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) ; There is no ./configure script + (delete 'configure) ; no ./configure script (add-after 'unpack 'patch-path (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2463,8 +2465,8 @@ (define-public masscan open ports, and also complete the TCP connection and interact with the remote application, collecting the information received.") (home-page "https://github.com/robertdavidgraham/masscan") - ;; 'src/siphash24.c' is the SipHash reference implementation, which - ;; bears a CC0 Public Domain Dedication. + ;; 'src/siphash24.c' is the SipHash reference implementation, which + ;; bears a CC0 Public Domain Dedication. (license license:agpl3+))) (define-public hungrycat -- cgit v1.2.3 From e4740d7a51177de6ca060411bde638574abf0227 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 09:10:47 +0100 Subject: gnu: calcurse: Update to 4.3.0. * gnu/packages/calcurse.scm (calcurse): Update to 4.3.0. --- gnu/packages/calcurse.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm index 93eeaf0ee6..8ee5d86e3c 100644 --- a/gnu/packages/calcurse.scm +++ b/gnu/packages/calcurse.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2017 Eric Bavier ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-module (gnu packages calcurse) (define-public calcurse (package (name "calcurse") - (version "4.2.2") + (version "4.3.0") (source (origin (method url-fetch) @@ -37,7 +38,7 @@ (define-public calcurse version ".tar.gz")) (sha256 (base32 - "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266")))) + "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (native-inputs `(("tzdata" ,tzdata-for-tests))) -- cgit v1.2.3 From 295fbbd75d753ffbb84fb78edd2d92c0275c170f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 10:21:18 +0100 Subject: gnu: geomyidae: Update to 0.31. * gnu/packages/web.scm (geomyidae): Update to 0.31. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1cf426b5c0..ceb7d9b7c7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6274,7 +6274,7 @@ (define-public perl-html-tidy (define-public geomyidae (package (name "geomyidae") - (version "0.29") + (version "0.31") (source (origin (method url-fetch) @@ -6282,7 +6282,7 @@ (define-public geomyidae "geomyidae-" version ".tar.bz2")) (sha256 (base32 - "0qxgxp6psfrgfqhndyq2z54nb1qrmvvljddnxdwp207jbz366bja")))) + "1ih7220c6mgq4r7blm4kx3pxbl53sph58lqgwci6cmi3c0sq5c3x")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From 42958b5e0feff1000ba17a353bb58fdf45f20716 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Mar 2018 22:34:43 +0100 Subject: gnu: Use patched static bash in glibc replacement. * gnu/packages/base.scm (glibc-2.26-patched): Rename... (glibc-2.26-patched-boot): ...to this. (patched-static-bash, glibc-2.26-patched): New variables. --- gnu/packages/base.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e91f7d43ef..56f79f5801 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -841,7 +841,7 @@ (define-syntax glibc ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) -(define glibc-2.26-patched +(define glibc-2.26-patched-boot (package (inherit glibc) (source (origin @@ -849,6 +849,31 @@ (define glibc-2.26-patched (patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch") (origin-patches (package-source glibc)))))))) +(define patched-static-bash + (package + (inherit static-bash) + (arguments + (substitute-keyword-arguments (package-arguments static-bash) + ((#:configure-flags flags '()) + ;; Add a '-L' flag so that the pseudo-cross-ld of + ;; BINUTILS-BOOT0 can find libc.a. + `(append ,flags + (list (string-append "LDFLAGS=-static -L" + (assoc-ref %build-inputs + "libc-patched:static") + "/lib")))))) + (native-inputs + `(("libc-patched" ,glibc-2.26-patched-boot) + ("libc-patched:static" ,glibc-2.26-patched-boot "static"))))) + +(define glibc-2.26-patched + (package + (inherit glibc-2.26-patched-boot) + (inputs `(("static-bash" ,patched-static-bash) + ,@(alist-delete + "static-bash" + (package-inputs glibc-2.26-patched-boot)))))) + (define-public glibc-2.25 (package (inherit glibc) -- cgit v1.2.3 From c4fb2b9f4e9ca1c5b586090b765b51b2a5042eff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 00:09:03 +0100 Subject: gnu: Add replacement for static-bash-for-glibc. This is needed to replace the static bash used in glibc-final. * gnu/packages/commencement.scm (patched-glibc-final-with-bootstrap-bash, patched-static-bash-for-glibc): New variables. (static-bash-for-glibc)[replacement]: Use patched-static-bash-for-glibc as a replacement. --- gnu/packages/commencement.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe9fbebcc2..94847b019a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -556,6 +556,14 @@ (define glibc-final-with-bootstrap-bash ;; because we don't want to depend on bootstrap tools. ("static-bash" ,@(assoc-ref %boot0-inputs "bash"))))))) +(define patched-glibc-final-with-bootstrap-bash + (package + (inherit glibc-final-with-bootstrap-bash) + (source (origin + (inherit (package-source glibc-final-with-bootstrap-bash)) + (patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch") + (origin-patches (package-source glibc-final-with-bootstrap-bash)))))))) + (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." @@ -632,6 +640,40 @@ (define static-bash-for-glibc ("libc:static" ,glibc-final-with-bootstrap-bash "static") ,@(fold alist-delete %boot1-inputs '("gcc" "libc"))))) + (let ((p (package-with-bootstrap-guile + (package-with-explicit-inputs bash inputs + (current-source-location) + #:guile %bootstrap-guile)))) + (package (inherit p) + (replacement patched-static-bash-for-glibc))))) + +;; Same as static-bash-for-glibc, except that it uses a patched glibc for the +;; "gcc" and "bash" packages. +(define patched-static-bash-for-glibc + ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. + (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 + patched-glibc-final-with-bootstrap-bash + (car (assoc-ref %boot1-inputs "bash")))) + (bash (package + (inherit static-bash) + (arguments + (substitute-keyword-arguments + (package-arguments static-bash) + ((#:guile _ #f) + '%bootstrap-guile) + ((#:configure-flags flags '()) + ;; Add a '-L' flag so that the pseudo-cross-ld of + ;; BINUTILS-BOOT0 can find libc.a. + `(append ,flags + (list (string-append "LDFLAGS=-static -L" + (assoc-ref %build-inputs + "libc:static") + "/lib")))))))) + (inputs `(("gcc" ,gcc) + ("libc" ,patched-glibc-final-with-bootstrap-bash) + ("libc:static" ,patched-glibc-final-with-bootstrap-bash "static") + ,@(fold alist-delete %boot1-inputs + '("gcc" "libc"))))) (package-with-bootstrap-guile (package-with-explicit-inputs bash inputs (current-source-location) -- cgit v1.2.3 From 911e66f922f2316f061656a6edf5f243342735b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 12:46:57 +0100 Subject: gnu: Add missing module to (gnu packages base). This is a follow-up to commit 42958b5e0feff1000ba17a353bb58fdf45f20716. Reported by pmikkelsen on IRC. * gnu/packages/base.scm: Use srfi-1 for alist-delete. --- gnu/packages/base.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 56f79f5801..a242baf787 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -53,6 +53,7 @@ (define-module (gnu packages base) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) #:export (glibc libiconv-if-needed)) -- cgit v1.2.3 From 2b5c5f03c2f0a84f84a5517e2e6f5fa9f276ffa5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 13:21:26 +0100 Subject: gnu: Add ada.scm to GNU_SYSTEM_MODULES. This is a follow-up to commit ebd43a2a45f9ac0ce702ef5810eddafd0830db5f. * gnu/local.mk (GNU_SYSTEM_MODULES): Add ada.scm. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index 5a3ae502f2..165b830673 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -50,6 +50,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/accessibility.scm \ %D%/packages/acct.scm \ %D%/packages/acl.scm \ + %D%/packages/ada.scm \ %D%/packages/admin.scm \ %D%/packages/adns.scm \ %D%/packages/agda.scm \ -- cgit v1.2.3 From 7c8dcd66a179c1ee89a4c821a9dc79ad264b7728 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 11:01:58 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.121. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.121. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e30453ba2f..3f4502c4d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,8 +408,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.120" - "17zk5dbpa3kilf8m8i6r2jifjgi4yjim42gyk9j6n4218jjcszv6" + (make-linux-libre "4.4.121" + "1d7djrhiib0ds9ssjkali6b5w6rzap4zgj5hf9jq1jmqpp54jkm4" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From b4c1930b2d16f9d0bebb755c4f4727723a6e513b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 11:02:36 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.87. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.87. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3f4502c4d2..8bce967f18 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -402,8 +402,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.86" - "0fqixx3yyvznianygk8bfxzfqj8zpnjcalifhpfyb7rm3dyvi3wd" + (make-linux-libre "4.9.87" + "1p8phvmxp04npzqzqcfmv8k9l5l65s7vpjcakdm0fxfkzvnswsp6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From b5a6fb3c08f9fe126691c1a967618c9074a20c5b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 11:03:12 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.26. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.26. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8bce967f18..21d18d4d06 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,8 +392,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.25") -(define %linux-libre-4.14-hash "0lrzw51ajdkc8mj9bn0lc4yx6q9sf29lcviapapqixg5hds72b94") +(define %linux-libre-4.14-version "4.14.26") +(define %linux-libre-4.14-hash "1m2zr17wpasg5riysbaa4g5i492jzr93py2jm088ki818s4a9cm3") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 9a42d5ebf2b4d8b3f214f6ca80aaf1fbf649c32d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 11:04:00 -0400 Subject: gnu: linux-libre: Update to 4.15.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.9. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 21d18d4d06..b81cb55d6b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; 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.8") -(define %linux-libre-hash "0178yi8k72sfv73gss2a1v7w1rmhyza3ia31jwg86gixqw74vifm") +(define %linux-libre-version "4.15.9") +(define %linux-libre-hash "13lcard7i6w2c1cf9rfhvmq79xk4qp2p1c1920mfi69l20yvm572") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From 9c9912cf5bffa9c7e2cb3e05ca7649ea295fa3ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 16:26:22 +0100 Subject: Revert "gnu: Add missing module to (gnu packages base)." This reverts commit 911e66f922f2316f061656a6edf5f243342735b7. --- gnu/packages/base.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a242baf787..56f79f5801 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -53,7 +53,6 @@ (define-module (gnu packages base) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (ice-9 match) - #:use-module (srfi srfi-1) #:export (glibc libiconv-if-needed)) -- cgit v1.2.3 From 48b97be90bbbdf3108e70d9e23bc8f296d4451b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 16:26:24 +0100 Subject: Revert "gnu: Add replacement for static-bash-for-glibc." This reverts commit c4fb2b9f4e9ca1c5b586090b765b51b2a5042eff. --- gnu/packages/commencement.scm | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 94847b019a..fe9fbebcc2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -556,14 +556,6 @@ (define glibc-final-with-bootstrap-bash ;; because we don't want to depend on bootstrap tools. ("static-bash" ,@(assoc-ref %boot0-inputs "bash"))))))) -(define patched-glibc-final-with-bootstrap-bash - (package - (inherit glibc-final-with-bootstrap-bash) - (source (origin - (inherit (package-source glibc-final-with-bootstrap-bash)) - (patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch") - (origin-patches (package-source glibc-final-with-bootstrap-bash)))))))) - (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." @@ -640,40 +632,6 @@ (define static-bash-for-glibc ("libc:static" ,glibc-final-with-bootstrap-bash "static") ,@(fold alist-delete %boot1-inputs '("gcc" "libc"))))) - (let ((p (package-with-bootstrap-guile - (package-with-explicit-inputs bash inputs - (current-source-location) - #:guile %bootstrap-guile)))) - (package (inherit p) - (replacement patched-static-bash-for-glibc))))) - -;; Same as static-bash-for-glibc, except that it uses a patched glibc for the -;; "gcc" and "bash" packages. -(define patched-static-bash-for-glibc - ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. - (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 - patched-glibc-final-with-bootstrap-bash - (car (assoc-ref %boot1-inputs "bash")))) - (bash (package - (inherit static-bash) - (arguments - (substitute-keyword-arguments - (package-arguments static-bash) - ((#:guile _ #f) - '%bootstrap-guile) - ((#:configure-flags flags '()) - ;; Add a '-L' flag so that the pseudo-cross-ld of - ;; BINUTILS-BOOT0 can find libc.a. - `(append ,flags - (list (string-append "LDFLAGS=-static -L" - (assoc-ref %build-inputs - "libc:static") - "/lib")))))))) - (inputs `(("gcc" ,gcc) - ("libc" ,patched-glibc-final-with-bootstrap-bash) - ("libc:static" ,patched-glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete %boot1-inputs - '("gcc" "libc"))))) (package-with-bootstrap-guile (package-with-explicit-inputs bash inputs (current-source-location) -- cgit v1.2.3 From 441010a2d1f77b15f9becfac622e9b1d76b7b1fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 16:26:24 +0100 Subject: Revert "gnu: Use patched static bash in glibc replacement." This reverts commit 42958b5e0feff1000ba17a353bb58fdf45f20716. --- gnu/packages/base.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 56f79f5801..e91f7d43ef 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -841,7 +841,7 @@ (define-syntax glibc ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) -(define glibc-2.26-patched-boot +(define glibc-2.26-patched (package (inherit glibc) (source (origin @@ -849,31 +849,6 @@ (define glibc-2.26-patched-boot (patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch") (origin-patches (package-source glibc)))))))) -(define patched-static-bash - (package - (inherit static-bash) - (arguments - (substitute-keyword-arguments (package-arguments static-bash) - ((#:configure-flags flags '()) - ;; Add a '-L' flag so that the pseudo-cross-ld of - ;; BINUTILS-BOOT0 can find libc.a. - `(append ,flags - (list (string-append "LDFLAGS=-static -L" - (assoc-ref %build-inputs - "libc-patched:static") - "/lib")))))) - (native-inputs - `(("libc-patched" ,glibc-2.26-patched-boot) - ("libc-patched:static" ,glibc-2.26-patched-boot "static"))))) - -(define glibc-2.26-patched - (package - (inherit glibc-2.26-patched-boot) - (inputs `(("static-bash" ,patched-static-bash) - ,@(alist-delete - "static-bash" - (package-inputs glibc-2.26-patched-boot)))))) - (define-public glibc-2.25 (package (inherit glibc) -- cgit v1.2.3 From cb18d21e74d86411c04577cde4f2c1b81ae8701d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Mar 2018 16:08:20 +0100 Subject: gnu: libsoup: Update to 2.62.0. * gnu/packages/gnome.scm (libsoup): Update to 2.62.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4eb52066c5..56ee1aa885 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2448,7 +2448,7 @@ (define-public rest (define-public libsoup (package (name "libsoup") - (version "2.60.3") + (version "2.62.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2456,7 +2456,7 @@ (define-public libsoup name "-" version ".tar.xz")) (sha256 (base32 - "08lawrdkkzycvpb1h0wfiqfz6dgx77jp0wxp546lxgisy9icf38v")))) + "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 9a02dcf35a137cfd0f0591ca91c4a918735e8f1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Mar 2018 16:26:09 +0100 Subject: gnu: curl: Update replacement to 7.59.0 [security fixes]. This fixes CVE-2018-1000120, CVE-2018-1000121, and CVE-2018-1000122. * gnu/packages/curl.scm (curl-7.58.0): Rename to ... (curl-7.59.0): ... this. Update source hash. (curl)[replacement]: Adjust accordingly. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index ccff18e632..fbf177d9da 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -48,7 +48,7 @@ (define-public curl (package (name "curl") (version "7.57.0") - (replacement curl-7.58.0) + (replacement curl-7.59.0) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -137,10 +137,10 @@ (define-public curl "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.58.0 +(define-public curl-7.59.0 (package (inherit curl) - (version "7.58.0") + (version "7.59.0") (source (origin (method url-fetch) @@ -148,7 +148,7 @@ (define-public curl-7.58.0 version ".tar.xz")) (sha256 (base32 - "1qz303lagxidmkyym90mxiaqnqddwi2219vzydsyn29n4iski0ba")))))) + "1z310hrjm2vmbcpkyp81dcmj9rk127zkjyawpy2pah0nz6yslkp4")))))) (define-public kurly (package -- cgit v1.2.3 From 880e2170b7ef53399d9989d9895e6ea102a0c7ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Mar 2018 16:36:05 +0100 Subject: gnu: man-db: Update to 2.8.2. * gnu/packages/man.scm (man-db): Update to 2.8.2. --- gnu/packages/man.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 6d1efcee01..257cabbbb6 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -58,14 +58,14 @@ (define-public libpipeline (define-public man-db (package (name "man-db") - (version "2.7.6.1") + (version "2.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0gqgs4zc3r87apns0k5qp689p2ylxx2596s2mkmkxjjay99brv88")))) + "0p0cvv5ykvyzq33qyfik11p2s0d2j75ans1avj9xv3c8vy3zzga5")))) (build-system gnu-build-system) (arguments `(#:phases @@ -131,6 +131,9 @@ (define-public man-db ("groff-minimal" ,groff-minimal) ("less" ,less) ("libpipeline" ,libpipeline) + ;; FIXME: 4.8 and later can use libseccomp, but it causes test + ;; failures in the build chroot. + ;;("libseccomp" ,libseccomp) ("util-linux" ,util-linux))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From aac6cbbfede0bbfafdbbeeb460f00a244333895d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Mar 2018 16:43:01 +0100 Subject: gnu: samba: Update to 4.7.6 [fixes CVE-2018-1050 and CVE-2018-1057]. * gnu/packages/samba.scm (samba): Update to 4.7.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 10b26c0ce9..d7ae5715ff 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.7.5") + (version "4.7.6") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "13gyr0sk9vx6mccr2h35ca3g92kp50cqxrlzfgrddfmskzx08v9i")))) + "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f3fda2980cd6c6cb1911c278c45e40efd81c5163 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 11:56:08 +0100 Subject: gnu: macchanger: Update to 1.7.0. * gnu/packages/networking.scm (macchanger): Update to 1.7.0. [source]: Update URI. --- gnu/packages/networking.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bf4bee2f87..395e75afa6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -87,17 +87,22 @@ (define-module (gnu packages networking) #:use-module (gnu packages xml) #:use-module (ice-9 match)) +;; The gnu.org ‘home’ for this GNU project is a directory listing with 1.6.0 as +;; the latest version. The author's git repository, mentioned in the 1.6.0 +;; README and otherwise legit-looking, contains a proper 1.7.0 release tarball +;; with many OUI updates. Use it, even though it's also several years old now. (define-public macchanger (package (name "macchanger") - (version "1.6.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsiivjjyhqcs6dyjcshrnxlgypvyfzacjz7gcjgl88xiw9lylri")))) + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/alobbs/macchanger/" + "releases/download/" version "/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1gs5m0jxyprdp00w2qkbnaqm3ilkjz0q1gqdg4nzdm8g4xy73qns")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/macchanger/") (synopsis "Viewing and manipulating MAC addresses of network interfaces") -- cgit v1.2.3 From 98516883927f39073360adbdc5ab25e16248e297 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 11:41:01 +0100 Subject: gnu: python-betamax: Update to 0.8.1. * gnu/packages/python-web.scm (python-betamax): Update to 0.8.1. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dce651246c..3b907cafcf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1693,14 +1693,14 @@ (define-public python2-cachecontrol (define-public python-betamax (package (name "python-betamax") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "betamax" version)) (sha256 (base32 - "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42")))) + "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v")))) (build-system python-build-system) (arguments '(;; Many tests fail because they require networking. -- cgit v1.2.3 From 86c9c0c11819f1e5ec6f821265a0492ddeaf83ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 10:24:35 +0100 Subject: gnu: webkitgtk: Update to 2.20.0. * gnu/packages/webkit.scm (webkitgtk): Update to 2.20.0. [arguments]: (Re-)disable WOFF2 web font support. --- gnu/packages/webkit.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 340221640c..99852aa0f3 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,14 +55,14 @@ (define-module (gnu packages webkit) (define-public webkitgtk (package (name "webkitgtk") - (version "2.18.6") + (version "2.20.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck")))) + "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests @@ -79,7 +80,12 @@ (define-public webkitgtk ;; included. More investigation is needed. For ;; now, we explicitly disable it to prevent an error ;; at configuration time. - "-DUSE_GSTREAMER_GL=OFF") + "-DUSE_GSTREAMER_GL=OFF" + + ;; XXX Disable WOFF2 ‘web fonts’. These were never + ;; supported in our previous builds. Enabling them + ;; requires building libwoff2 and possibly woff2dec. + "-DUSE_WOFF2=OFF") #:phases (modify-phases %standard-phases (add-after -- cgit v1.2.3 From 36b2cb029ecac75d651ea79cb98d883c3f50eae4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 10:36:44 +0100 Subject: gnu: webkitgtk: Use HTTPS for home page. * gnu/packages/webkitgtk.scm (webkitgtk)[home-page]: Use HTTPS. --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 99852aa0f3..df049e15a3 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -136,7 +136,7 @@ (define-public webkitgtk ("libxt" ,libxt) ("mesa" ,mesa) ("sqlite" ,sqlite))) - (home-page "http://www.webkitgtk.org/") + (home-page "https://www.webkitgtk.org/") (synopsis "Web content engine for GTK+") (description "WebKitGTK+ is a full-featured port of the WebKit rendering engine, -- cgit v1.2.3 From a76c205795a97d9126c23fa67a98bb741ac21798 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 10:11:51 -0400 Subject: gnu: icecat: Relabel patches to reflect CVE assignments. Document the fact that we include fixes for CVE-2018-5127, CVE-2018-5129, CVE-2018-5130, CVE-2018-5144, CVE-2018-5145, and 5 out of 9 changesets for CVE-2018-5125. * gnu/packages/gnuzilla.scm (icecat)[source]: Relabel patches to reflect CVE assignments. --- gnu/packages/gnuzilla.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 323743d089..fb0d6c1592 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -420,22 +420,22 @@ (define-public icecat (mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj") (mozilla-patch "icecat-bug-1411708.patch" "34c968767eb7" "0l2jy201ikj3m3h66mvlsj4y0ki7cpm7x7nnfygbwnfxg42s1sip") (mozilla-patch "icecat-bug-1375217.patch" "00fc630c9a46" "17pcprp452nslk6sac6sili0p74zh8w3g0v1wsdn0ikm9xmnphhv") - (mozilla-patch "icecat-bug-1261175.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v") - (mozilla-patch "icecat-bug-1433005.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk") - (mozilla-patch "icecat-bug-1434580.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r") + (mozilla-patch "icecat-CVE-2018-5145.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v") + (mozilla-patch "icecat-CVE-2018-5130.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk") + (mozilla-patch "icecat-CVE-2018-5125-pt1.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r") (mozilla-patch "icecat-bug-1426087.patch" "391ea77ebfdb" "1fhkvd0z6mvdkj7m0d3jlj42rsdw5r4x122c1wb1i428228ifw6n") (mozilla-patch "icecat-bug-1416307.patch" "54f2f7f93b30" "1ncjir16mqya37wgf6fy2rqki3vl433c4grjr3fypmlig6xfgg1l") - (mozilla-patch "icecat-bug-1430557.patch" "2c4d7a59041b" "178c6gid89cvw52yqs43i6x6s5w0hslj0rfa2r8b4762ij3civ92") - (mozilla-patch "icecat-bug-1416529.patch" "f87ef3774d5e" "0payf3az2w93nzl5qknqx290jbxk8v39rwhdgq7wyd5f245dywxk") - (mozilla-patch "icecat-bug-1324042.patch" "ac743923f81d" "0msyr45xr1j5q4x6ah4r907pwjngyi0k6pp9y8ixk21cnwbzrdwx") - (mozilla-patch "icecat-bug-1428947.patch" "456913d7e8b5" "0fx0s06kxxj7g4hllinaskgh41z3k48zml6yqqzxx485qk3hdh9x") + (mozilla-patch "icecat-CVE-2018-5127.patch" "2c4d7a59041b" "178c6gid89cvw52yqs43i6x6s5w0hslj0rfa2r8b4762ij3civ92") + (mozilla-patch "icecat-CVE-2018-5125-pt2.patch" "f87ef3774d5e" "0payf3az2w93nzl5qknqx290jbxk8v39rwhdgq7wyd5f245dywxk") + (mozilla-patch "icecat-CVE-2018-5125-pt3.patch" "ac743923f81d" "0msyr45xr1j5q4x6ah4r907pwjngyi0k6pp9y8ixk21cnwbzrdwx") + (mozilla-patch "icecat-CVE-2018-5129.patch" "456913d7e8b5" "0fx0s06kxxj7g4hllinaskgh41z3k48zml6yqqzxx485qk3hdh9x") (mozilla-patch "icecat-bug-1334465-pt1.patch" "f95c5b881442" "0iaddhf65jd9cycj4bw0b207n2jiqkr4q84jifzyqn4ygs75wdqd") (mozilla-patch "icecat-bug-1334465-pt2.patch" "8a4265c8fb41" "1d9zfdbrlw9wzr84b7pj7lxgy487lsx0kfd89287hjk0al8m6vrw") (mozilla-patch "icecat-bug-1398021.patch" "28855df568d8" "1kmq836gniplxpjnvq8lhbcc1aqi56al628r1mzdy94b5yb0lis3") (mozilla-patch "icecat-bug-1388020.patch" "e8ab2736499b" "0n28vcd65rxsyq3z22rfcfksryfndhm1i3g6ah3akg11jnagqf5v") - (mozilla-patch "icecat-bug-1437087.patch" "014877bf17ea" "0hk90pnf7h7kvidji6ydvva1zpyraipn03pjhvprdqr7k2fqzmsz") - (mozilla-patch "icecat-bug-1437507.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig") - (mozilla-patch "icecat-bug-1440926.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg") + (mozilla-patch "icecat-CVE-2018-5125-pt4.patch" "014877bf17ea" "0hk90pnf7h7kvidji6ydvva1zpyraipn03pjhvprdqr7k2fqzmsz") + (mozilla-patch "icecat-CVE-2018-5125-pt5.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig") + (mozilla-patch "icecat-CVE-2018-5144.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg") (mozilla-patch "icecat-bug-1430173-pt1.patch" "9124c3972e2b" "13ns5yy39yzfx7lrkv4rgwdz6s6q0z4i09wkbxdvnkfsz17cd17i") (mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl"))) (modules '((guix build utils))) -- cgit v1.2.3 From 3328132b8740a005c243c6e9f4e339b6e40528d0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Mar 2018 10:15:21 -0400 Subject: gnu: icecat: Add more fixes from upstream mozilla-esr52. Includes fixes for CVE-2018-5131 and the remaining 4 out of 9 changesets for CVE-2018-5125. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the upstream mozilla-esr52 repository. --- gnu/packages/gnuzilla.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index fb0d6c1592..f7bdd17309 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -437,7 +437,15 @@ (define-public icecat (mozilla-patch "icecat-CVE-2018-5125-pt5.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig") (mozilla-patch "icecat-CVE-2018-5144.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg") (mozilla-patch "icecat-bug-1430173-pt1.patch" "9124c3972e2b" "13ns5yy39yzfx7lrkv4rgwdz6s6q0z4i09wkbxdvnkfsz17cd17i") - (mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl"))) + (mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl") + (mozilla-patch "icecat-CVE-2018-5131.patch" "3102fbb97b32" "0kg0183v92gxjb9255xjwhxyd6gl77l9c0civx3040k975fybwlp") + (mozilla-patch "icecat-CVE-2018-5125-pt6.patch" "4904c0f4a645" "0lsq62ynksy1fbw0m87f1d741fyvrrp1vrznx5hx0l2p4g4frhv3") + (mozilla-patch "icecat-CVE-2018-5125-pt7.patch" "16b8073d5c30" "1dv94qqah1wjd3bxjvrkmjbb2f95d3d11zpm8mggdk52il575bwl") + (mozilla-patch "icecat-bug-1442127-pt1.patch" "f931f85b09da" "02s380w8a73g4w2wm810lbigh4z4rrlfy10ywwhv4lpkbk8xg7pr") + (mozilla-patch "icecat-bug-1442127-pt2.patch" "da5792b70f30" "116k9qja5ir9b3laazasp43f5jx59qq72nknmq5bn5v1ixya9r4l") + (mozilla-patch "icecat-CVE-2018-5125-pt8.patch" "62b831df8269" "109pn0hqn7s27580glv4z7qv1pmjzii9szvf3wkn97k5wybrzgkx") + (mozilla-patch "icecat-bug-1442504.patch" "8954ce68a364" "0bl65zw82bwqg0mmcri94pxqq6ibff7y5rclkzapb081p6yvf73q") + (mozilla-patch "icecat-CVE-2018-5125-pt9.patch" "8a16f439117c" "108iarql6z7h1r4rlzac6n6lrzs78x7kcdbfa0b5dbr5xc66jmgb"))) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7e353a77836245074604173ab33c5ae10d244e8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:22:43 +0200 Subject: gnu: texlive-latex-filecontents: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-filecontents)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 05a7cd834b..711ed8ea9e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1037,6 +1037,7 @@ (define-public texlive-latex-filecontents (source (origin (method svn-fetch) (uri (texlive-ref "latex" "filecontents")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0swkbxv8vg0yizadfnvrwjb4cj0pn34v9wm6v7wqq903fdav7k7q")))) -- cgit v1.2.3 From 24dbc6023b6b85fbf84db6b1cf3aceb3bd262104 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:23:42 +0200 Subject: gnu: texlive-generic-ifxetex: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-ifxetex)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 711ed8ea9e..4b1e709661 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1062,6 +1062,7 @@ (define-public texlive-generic-ifxetex (source (origin (method svn-fetch) (uri (texlive-ref "generic" "ifxetex")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0w2xj7n0szavj329kds09q626szkc378p3w0sk022q0ln4ksz86d")))) -- cgit v1.2.3 From ca61c6b323d85e46130cc53a368e6f699951e821 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:24:29 +0200 Subject: gnu: texlive-generic-epsf: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-epsf)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4b1e709661..0cb00537fa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1091,6 +1091,7 @@ (define-public texlive-generic-epsf %texlive-tag "/Master/texmf-dist/" "/tex/generic/epsf")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "14w3j81ympyvg8hkk9i1xgr8a0gfnfsb2ki8qqsk5pa051za1xcy")))) -- cgit v1.2.3 From 88e11022db4af72a0b33a0af7c71230234ce5e17 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:25:06 +0200 Subject: gnu: texlive-latex-fancyvrb: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-fancyvrb)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0cb00537fa..f0f0955949 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1124,6 +1124,7 @@ (define-public texlive-latex-fancyvrb (source (origin (method svn-fetch) (uri (texlive-ref "latex" "fancyvrb")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "03l7140y031rr14h02i4z9zqsfvrbn7wzwxbjsrjcgrk6sdr71wv")))) -- cgit v1.2.3 From f73020735cc9e7d02d1f77eeb3af1d2fae090b56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:25:50 +0200 Subject: gnu: texlive-latex-graphics: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-graphics)[source]: Declare a source file-name. [native-inputs]: Declare a source file-name for downloaded native-inputs. --- gnu/packages/tex.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f0f0955949..ae3c7b3abd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1152,6 +1152,7 @@ (define-public texlive-latex-graphics (source (origin (method svn-fetch) (uri (texlive-ref "latex" "graphics")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "07azyn0b1s49vbdlr6dmygrminxp72ndl24j1091hiiccvrjq3xc")))) @@ -1184,6 +1185,9 @@ (define-public texlive-latex-graphics (uri (git-reference (url "https://github.com/latex3/graphics-cfg.git") (commit "19d1238af17df376cd46333b229579b0f7f3a41f"))) + (file-name (string-append "graphics-cfg-" + (number->string %texlive-revision) + "-checkout")) (sha256 (base32 "12kbgbm52gmmgn8zajb74s8n5rvnxcfdvs3iyj8vcw5vrsw5i6mh")))) @@ -1195,6 +1199,9 @@ (define-public texlive-latex-graphics %texlive-tag "/Master/texmf-dist/" "/tex/latex/graphics-def")) (revision %texlive-revision))) + (file-name (string-append "graphics-def-" + (number->string %texlive-revision) + "-checkout")) (sha256 (base32 "0gi4qv6378nl84s8n1yx3hjqvv7r4lza7hpbymbl5rzwgw8qrnyb")))))) -- cgit v1.2.3 From 19389bcdc23c8c111872ad6d99ef9adf4495f9b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:30:06 +0200 Subject: gnu: texlive-latex-xcolor: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-xcolor)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ae3c7b3abd..331e1ed80c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1223,6 +1223,7 @@ (define-public texlive-latex-xcolor (source (origin (method svn-fetch) (uri (texlive-ref "latex" "xcolor")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "01n613s7bcrd2n4jfawm0k4nn2ny3aaifp2jjfif3lz4sbv31494")))) -- cgit v1.2.3 From 7dea311973430a25eafc0ecb96d653a99659026c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:30:47 +0200 Subject: gnu: texlive-latex-oberdiek: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-oberdiek)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 331e1ed80c..2bf2948fcf 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1277,6 +1277,7 @@ (define-public texlive-latex-oberdiek (source (origin (method svn-fetch) (uri (texlive-ref "latex" "oberdiek")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0aswvsxgsn709xmvpcg50d2xl7vcy1ckdxb9c1cligqqfjjvviqf")))) -- cgit v1.2.3 From f8340ab143b214f94c19fb010b135dbae5e01f10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:31:22 +0200 Subject: gnu: texlive-latex-tools: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-tools)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2bf2948fcf..11d0a1586a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1308,6 +1308,7 @@ (define-public texlive-latex-tools (source (origin (method svn-fetch) (uri (texlive-ref "latex" "tools")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "052a0pch2k5zls5jlay9xxcf93rw3i60a2x28y3ip3rhbsv3xgiz")))) -- cgit v1.2.3 From a26207f8794f0cafd0ebd18ed3a6eb8aa0746202 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:32:06 +0200 Subject: gnu: texlive-latex-url: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-url)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 11d0a1586a..b8d08b4719 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1338,6 +1338,7 @@ (define-public texlive-latex-url %texlive-tag "/Master/texmf-dist/" "/tex/latex/url")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "184s2543cwia5l7iibhlkl1ffbncfhjpv5p56zq0c15by5sghlac")))) -- cgit v1.2.3 From f4a39a5b2fbe81e994dcf73b647db197cefd5a53 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:32:50 +0200 Subject: gnu: texlive-latex-l3kernel: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-l3kernel)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b8d08b4719..06282b01d4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1374,6 +1374,7 @@ (define-public texlive-latex-l3kernel (source (origin (method svn-fetch) (uri (texlive-ref "latex" "l3kernel")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0r0wfk594j8wkdqhh21haimwsfq8x5jch4ldm21hkzk5dnmvpbg6")))) -- cgit v1.2.3 From b749aa98807b980040e478a498af9a3511b92241 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:33:25 +0200 Subject: gnu: texlive-latex-l3packages: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-l3packages)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 06282b01d4..439e7a2ec0 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1398,6 +1398,7 @@ (define-public texlive-latex-l3packages (source (origin (method svn-fetch) (uri (texlive-ref "latex" "l3packages")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "16jplkvzdysfssijq9l051nsks65c2nrarsl17k8gjhc28yznj8y")))) -- cgit v1.2.3 From 634a4a7f14eb587e5279400594be71a9c67b72cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:34:01 +0200 Subject: gnu: texlive-latex-fontspec: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-fontspec)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 439e7a2ec0..2fabbdeba1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1446,6 +1446,7 @@ (define-public texlive-latex-fontspec (source (origin (method svn-fetch) (uri (texlive-ref "latex" "fontspec")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1rx43y5xmjqvc27pjdnmqwp4pcw3czcfd6nfpmzc1gnqfl1hlc0q")))) -- cgit v1.2.3 From 01d79c306ae5da6e7ed84f964f734d44f3de91ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:35:34 +0200 Subject: gnu: texlive-luatex-lualibs: Include version in source file-name. * gnu/packages/tex.scm (texlive-luatex-lualibs)[source]: Include version in the source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2fabbdeba1..a64cb2a7ae 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1477,6 +1477,7 @@ (define-public texlive-luatex-lualibs (uri (string-append "https://github.com/lualatex/lualibs/" "releases/download/v" version "/lualibs.zip")) + (file-name (string-append name "-" version ".zip")) (sha256 (base32 "1xx9blvrmx9hyhrl345lpai9m6xxnw997261a1ahn1bm5r2j5fqy")))) -- cgit v1.2.3 From 320c771ade32da53ec9b5131d4c3d335c21f81af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:36:16 +0200 Subject: gnu: texlive-latex-amsmath: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-amsmath)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a64cb2a7ae..12c8722df2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1510,6 +1510,7 @@ (define-public texlive-latex-amsmath (source (origin (method svn-fetch) (uri (texlive-ref "latex" "amsmath")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "178ywjpdlv78qmfzqdyn6gy14620zjsn2q9wap76fbr9s4hw6dba")))) -- cgit v1.2.3 From 43059ed01a7123372919b4f319efb81f4bfb338b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:36:46 +0200 Subject: gnu: texlive-latex-amscls: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-amscls)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 12c8722df2..2b2961ddd7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1539,6 +1539,7 @@ (define-public texlive-latex-amscls (source (origin (method svn-fetch) (uri (texlive-ref "latex" "amscls")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0jmcr37mcdi7drczppvr6lmz5d5yd9m67ii79gp2nglg1xpw934j")))) -- cgit v1.2.3 From 8732493e75c59a03cecf92ffa028292dae6b289f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:37:16 +0200 Subject: gnu: texlive-latex-babel: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-babel)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2b2961ddd7..78d52f592b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1563,6 +1563,7 @@ (define-public texlive-latex-babel (source (origin (method svn-fetch) (uri (texlive-ref "latex" "babel")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1n3i5adsyy7jw0imnzrm2i8wkf73i3mjk9h3ic8cb9cd19i4r9r3")))) -- cgit v1.2.3 From 51bffe791ba26b12f30016fe8bd6446d7f388de9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:38:05 +0200 Subject: gnu: texlive-latex-cyrillic: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-cyrillic)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 78d52f592b..459d051c15 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1620,6 +1620,7 @@ (define-public texlive-latex-cyrillic (source (origin (method svn-fetch) (uri (texlive-ref "latex" "cyrillic")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1mdhl35hwas68ki56qqngzar37dwv4mm64l2canihr255bz34lbv")))) -- cgit v1.2.3 From b5b10f3b3bb765e7339b844cb1b8cbc07e06c6c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:38:57 +0200 Subject: gnu: texlive-latex-psnfss: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-psnfss)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 459d051c15..4f44b83838 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1643,6 +1643,7 @@ (define-public texlive-latex-psnfss (source (origin (method svn-fetch) (uri (texlive-ref "latex" "psnfss")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1920dcq8613yzprasbg80fh4fcjcidvvl54wkx438nimyxcri7qz")))) -- cgit v1.2.3 From 681b579d6d64672307d8538be62de5e1ec1c027a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:40:33 +0200 Subject: gnu: texlive-latex-filemod: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-filemod)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4f44b83838..ff21f3f734 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1987,6 +1987,7 @@ (define-public texlive-latex-filemod %texlive-tag "/Master/texmf-dist/" "/tex/latex/filemod")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0vpxilfw69xv78f03g0j0zw0bw4qcn36whqp8phcq48qk1ax2kr2")))) -- cgit v1.2.3 From 23ae6e65fc7f44daff50361735b4731ba5eee70e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:41:24 +0200 Subject: gnu: texlive-latex-natbib: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-natbib)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ff21f3f734..3e3f98ba60 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2047,6 +2047,7 @@ (define-public texlive-latex-natbib (source (origin (method svn-fetch) (uri (texlive-ref "latex" "natbib")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0aqliq0nwblxyrzhwhv77pnmk7qh2y3prgq7z7qhwcbgz5kisld7")))) -- cgit v1.2.3 From a74ac06bb5d54a76a1288663a20a7a98010cb349 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:42:16 +0200 Subject: gnu: texlive-latex-seminar: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-seminar)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3e3f98ba60..144f475aec 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2135,6 +2135,7 @@ (define-public texlive-latex-seminar %texlive-tag "/Master/texmf-dist/" "/tex/latex/seminar")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0y4i651b75y6006n03x8n86bsqvjsailvvz9bhzy51dzsznqidq0")))) -- cgit v1.2.3 From 70a71d19c8711df60b57204a88132afaf71f3f35 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:42:58 +0200 Subject: gnu: texlive-latex-trimspaces: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-trimspaces)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 144f475aec..39f1ddeee1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2159,6 +2159,7 @@ (define-public texlive-latex-trimspaces (source (origin (method svn-fetch) (uri (texlive-ref "latex" "trimspaces")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0da00lb32am4g63mn96625wg48p3pj3spx79lajrk17d549apwqa")))) -- cgit v1.2.3 From 88ae1921d81ee9904dc104878f6fb651e750b24c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:44:37 +0200 Subject: gnu: texlive-tex-texinfo: Declare a source file-name. * gnu/packages/tex.scm (texlive-tex-texinfo)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 39f1ddeee1..8e0d46c404 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2507,6 +2507,7 @@ (define-public texlive-tex-texinfo %texlive-tag "/Master/texmf-dist/" "/tex/texinfo")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "09zj2w3lx0y6i2syfjjgizahf86z301dw8p37ln6syfhqhzqdz46")))) -- cgit v1.2.3 From de4eb4d1c96057d6433d943342b7ab34368b5e68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:45:12 +0200 Subject: gnu: texlive-latex-anysize: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-anysize)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8e0d46c404..9f57bdd861 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2571,6 +2571,7 @@ (define-public texlive-latex-anysize %texlive-tag "/Master/texmf-dist/" "/tex/latex/anysize")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "19khwqjlvznc955sijhww3c4zbb0053rvzwv9nz738qknq7y18vb")))) -- cgit v1.2.3 From 72d5adf4d82e6cab1034bb38a836857725020148 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:45:44 +0200 Subject: gnu: texlive-latex-appendix: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-appendix)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9f57bdd861..8c4b9226b4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2601,6 +2601,7 @@ (define-public texlive-latex-appendix (source (origin (method svn-fetch) (uri (texlive-ref "latex" "appendix")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0rxfpr8vq3brwx5rc7qn91ixlp9zva4zrms8a579fqa1g5yva7vg")))) -- cgit v1.2.3 From af8aa1053a80f8333b2f5a880d8d36852fa4bdc8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:46:19 +0200 Subject: gnu: texlive-latex-changebar: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-changebar)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8c4b9226b4..ba686a582a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2624,6 +2624,7 @@ (define-public texlive-latex-changebar (source (origin (method svn-fetch) (uri (texlive-ref "latex" "changebar")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1ik4m8pzfsn1grlda6fniqqfwmgj7rfxwg63jdw0p0qv002vc7ik")))) -- cgit v1.2.3 From 4439c1dedaafb1370f3f7b4adad4529f4a570872 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:46:54 +0200 Subject: gnu: texlive-latex-colortbl: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-colortbl)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ba686a582a..805ac76c37 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2681,6 +2681,7 @@ (define-public texlive-latex-colortbl (source (origin (method svn-fetch) (uri (texlive-ref "latex" "colortbl")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "190pmq8la2rq07xry8bn8z8yywzxv6fqyqaj7yjfj5rgw6x0mas8")))) -- cgit v1.2.3 From 62ee46b9a251ef9ee5e9793df451a3cf16d5c085 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:47:39 +0200 Subject: gnu: texlive-latex-fancybox: Declare a source file-name. * gnu/pacakges/tex.scm (texlive-latex-fancybox)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 805ac76c37..0a6b858e74 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2705,6 +2705,7 @@ (define-public texlive-latex-fancybox %texlive-tag "/Master/texmf-dist/" "/tex/latex/fancybox")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0smmnaad2q8qwicay1frri990lv65l0k8cwzsvdsyp3jk8kp042w")))) -- cgit v1.2.3 From e89d5cf4fc51ccef65d2a559ebb2290b6e38a0c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:49:31 +0200 Subject: gnu: texlive-latex-fancyhdr: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-fancyhdr)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0a6b858e74..b1bca0f24f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2740,6 +2740,7 @@ (define-public texlive-latex-fancyhdr %texlive-tag "/Master/texmf-dist/" "/tex/latex/fancyhdr")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "04h430agf8aj7ziwyb46xpk95c605rjk1wzhr63m6ylipihidlgw")))) -- cgit v1.2.3 From 4fd0a59108b64d7c25537a52705fe3bbb417b89d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:50:05 +0200 Subject: gnu: texlive-latex-float: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-float)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b1bca0f24f..0cff925f0b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2770,6 +2770,7 @@ (define-public texlive-latex-float (source (origin (method svn-fetch) (uri (texlive-ref "latex" "float")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0nbl7wylkv22fcdv4p8byhhj575fli6jnqjpkhrkbv8dzwah84nq")))) -- cgit v1.2.3 From dae1d9e43627ac478ef9eb2e2f7a69fe880e40d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:50:37 +0200 Subject: gnu: texlive-latex-footmisc: Declare a source file-name. * gnu/packages/tex.smc (texlive-latex-footmisc)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0cff925f0b..5d5d3a6648 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2794,6 +2794,7 @@ (define-public texlive-latex-footmisc (source (origin (method svn-fetch) (uri (texlive-ref "latex" "footmisc")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "03x61wwql8nh6zrqiiiq3rb0x7m3pn48c606zapy19y21fybwdxs")))) -- cgit v1.2.3 From aeb135e3a1b6addb77e5149e306ac854bb60b60d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:51:09 +0200 Subject: gnu: texlive-latex-listings: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-listings)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5d5d3a6648..5d83b5a3c0 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2818,6 +2818,7 @@ (define-public texlive-latex-listings (source (origin (method svn-fetch) (uri (texlive-ref "latex" "listings")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1nsn9wp3wl12b36c0sqrim33lf33cr5wky0h4ncnw8lvqgm7h8wf")))) -- cgit v1.2.3 From aa499191b8e6672c6e45f3f6a9ab94712448940a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:51:48 +0200 Subject: gnu: texlive-latex-jknapltx: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-jknapltx)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5d83b5a3c0..035c47a8bc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2846,6 +2846,7 @@ (define-public texlive-latex-jknapltx %texlive-tag "/Master/texmf-dist/" "/tex/latex/jknapltx")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0m034x72f2g07icr50gacyxfb9g1lz2rmqh4kqr1qjb421x2kds9")))) -- cgit v1.2.3 From ca816eb3caa96a6cd4493c0a17a2881113b5844c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:53:50 +0200 Subject: gnu: texlive-fonts-ec: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-ec)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 035c47a8bc..8bb172aedc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2885,6 +2885,7 @@ (define-public texlive-fonts-ec %texlive-tag "/Master/texmf-dist/" "/fonts/source/jknappen/ec/")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "12av65fbz9xiashm09c9m1fj1mijxls5xspd7652ry1n5s0nixy4")))) -- cgit v1.2.3 From 6f2442a1fdb09d5982e163f1e87426ffc9f32d1d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:56:14 +0200 Subject: gnu: texlive-fonts-ec: Use 'invoke'. * gnu/packages/tex.scm (texlive-fonts-ec)[arguments]: Use 'invoke' in place of 'system*'. --- gnu/packages/tex.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8bb172aedc..828c70df26 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2913,13 +2913,13 @@ (define-public texlive-fonts-ec (mkdir "build") (every (lambda (font) (format #t "building font ~a\n" font) - (zero? (system* "mf" "-progname=mf" - "-output-directory=build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1; " - "batchmode; " - "input " (basename font ".mf"))))) + (invoke "mf" "-progname=mf" + "-output-directory=build" + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "batchmode; " + "input " (basename font ".mf")))) (find-files "." "[0-9]+\\.mf$")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From e26de9c928c996c157a3067b41836950baed7f02 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 20:59:25 +0200 Subject: gnu: texlive-fonts-rsfs: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-rsfs)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 828c70df26..aec74912a3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2967,6 +2967,7 @@ (define-public texlive-fonts-rsfs %texlive-tag "/Master/texmf-dist/" "/fonts/source/public/rsfs/")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0r12pn02r4a955prcvq0048nifh86ihlcgvw3pppqqvfngv34l5h")))) -- cgit v1.2.3 From d5fb4a3a9f202e0246e93a0a5537c72a92aa319e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:00:29 +0200 Subject: gnu: texlive-fonts-rsfs: Use 'invoke'. * gnu/packages/tex.scm (texlive-fonts-rsfs)[arguments]: Use 'invoke' in place of 'system*'. --- gnu/packages/tex.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index aec74912a3..da55e52b33 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2995,13 +2995,13 @@ (define-public texlive-fonts-rsfs (mkdir "build") (every (lambda (font) (format #t "building font ~a\n" font) - (zero? (system* "mf" "-progname=mf" - "-output-directory=build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1; " - "batchmode; " - "input " (basename font ".mf"))))) + (invoke "mf" "-progname=mf" + "-output-directory=build" + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "batchmode; " + "input " (basename font ".mf")))) (find-files "." "[0-9]+\\.mf$")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 2678a63b23c98cc0bc0edcdad072cfecadf16032 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:02:03 +0200 Subject: gnu: texlive-latex-eso-pic: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-eso-pic)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index da55e52b33..93efc5dddc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3037,6 +3037,7 @@ (define-public texlive-latex-eso-pic (source (origin (method svn-fetch) (uri (texlive-ref "latex" "eso-pic")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1xvmms28mvvfpks9x7lfya2xhh5k8jy3qnlih1mzcnf156xnb89z")))) -- cgit v1.2.3 From 84d636431420dd8a2a4868a2fdc8549f626f7c5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:02:42 +0200 Subject: gnu: texlive-latex-eepic: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-eepic)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 93efc5dddc..a7bed5cfaa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3062,6 +3062,7 @@ (define-public texlive-latex-eepic %texlive-tag "/Master/texmf-dist/" "/tex/latex/eepic")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1c68gvh021pvybg07apsd2xhq2ljbg80kq94wh71drdga3c2zqjw")))) -- cgit v1.2.3 From 6a9198046d3a0aa5bbb01bb9ab0bd7c89a936a38 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:03:36 +0200 Subject: gnu: texlive-latex-multirow: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-multirow)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a7bed5cfaa..16f5419a0a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3131,6 +3131,7 @@ (define-public texlive-latex-multirow (source (origin (method svn-fetch) (uri (texlive-ref "latex" "multirow")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0qlxy47f1f8plgch3jqfsnrdgpyz20sz46yp33i2jwvf9hvfczf0")))) -- cgit v1.2.3 From b2aef7219c754ee2fc2279230748a4fb1c2f79e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:04:10 +0200 Subject: gnu: texlive-latex-overpic: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-overpic)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 16f5419a0a..936bcbc018 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3156,6 +3156,7 @@ (define-public texlive-latex-overpic %texlive-tag "/Master/texmf-dist/" "/tex/latex/overpic")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0m29q9qdb00558b7g2i7iw6w62n5s46yx81j8m99qkv77magk4fm")))) -- cgit v1.2.3 From 7372ce185f6d4984d7a4253e5139ec9dcb0212b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:04:44 +0200 Subject: gnu: texlive-latex-pdfpages: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-pdfpages)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 936bcbc018..b953e7b999 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3222,6 +3222,7 @@ (define-public texlive-latex-pdfpages (source (origin (method svn-fetch) (uri (texlive-ref "latex" "pdfpages")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "06p5smfq66559ppdnmkl3hp8534x84ywbscimsiir4gllpya3i9h")))) -- cgit v1.2.3 From 19835372a2676bac4def8021a08f6412d68554b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:05:23 +0200 Subject: gnu: texlive-fonts-stmaryrd: Declare a source file-name. * gnu/packages/tex.scm (texlive-fonts-stmaryrd)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b953e7b999..5d3a476d64 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3246,6 +3246,7 @@ (define-public texlive-fonts-stmaryrd (source (origin (method svn-fetch) (uri (texlive-ref "fonts" "stmaryrd")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "08pn4ca3vl6qm9l3wm5h5iyjsrg411kkm1yana329xwg2j14s9n6")))) -- cgit v1.2.3 From e1834df6b600655503ad4424e0ae24fb8d503158 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:06:00 +0200 Subject: gnu: texlive-latex-subfigure: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-subfigure)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5d3a476d64..475300b293 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3279,6 +3279,7 @@ (define-public texlive-latex-subfigure (source (origin (method svn-fetch) (uri (texlive-ref "latex" "subfigure")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "15spcl5wb7w269qd6y596vp4yi8sa5ppcx8w4z2i9kyp02r3a0yb")))) -- cgit v1.2.3 From d57e5d412849ad5016088726747cbcbdf8ea1d91 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:06:53 +0200 Subject: gnu: texlive-latex-threeparttable: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-threeparttable)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 475300b293..fa644830bc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3335,6 +3335,7 @@ (define-public texlive-latex-threeparttable %texlive-tag "/Master/texmf-dist/" "/tex/latex/threeparttable")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "10vy9k150w2lviw8h22s2mcykff38xci653m5823s2vv44pwbmzq")))) -- cgit v1.2.3 From 0475e35c59eac4ad3f2efa8d8c25066dfea302f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:09:13 +0200 Subject: gnu: texlive-latex-titlesec: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-titlesec)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fa644830bc..0973619bf5 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3543,6 +3543,7 @@ (define-public texlive-latex-titlesec %texlive-tag "/Master/texmf-dist/" "/tex/latex/titlesec")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "04nmkhqx6jxcxx9a30zbcd5smxi5fd0cbp132bki7fnvhspnhg21")))) -- cgit v1.2.3 From de20fd6a3aedf0f2d75d02d49573477a909dca19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:09:56 +0200 Subject: gnu: texlive-latex-lh: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-lh)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0973619bf5..324161c4df 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3604,6 +3604,7 @@ (define-public texlive-latex-lh (source (origin (method svn-fetch) (uri (texlive-ref "latex" "lh")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "00gdiwh3sfhh1iimjhpja7lm7k4vzqzql2irgwnpz94qvh25zwi5")))) -- cgit v1.2.3 From b4bb2750ffa26d73a2f262561d28dc52d173ee71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:10:27 +0200 Subject: gnu: texlive-metapost: Declare a source file-name. * gnu/packages/tex.scm (texlive-metapost)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 324161c4df..e7e7f19020 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3635,6 +3635,7 @@ (define-public texlive-metapost %texlive-tag "/Master/texmf-dist/" "/metapost")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "03nvjddffiz796wll6axzmgfvynyciy2mqamv20qx252w71vwkwd")))) -- cgit v1.2.3 From 2cc9c011e856582e3da61d909885f03a4a7902e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:12:39 +0200 Subject: gnu: texlive-latex-wasysym: Declare a source file-name. * gnu/packages/tex.scm (texlive-latex-wasysym)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e7e7f19020..5871383d09 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3719,6 +3719,7 @@ (define-public texlive-latex-wasysym (source (origin (method svn-fetch) (uri (texlive-ref "latex" "wasysym")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1sgwbfwjjf70g54hh93gsd9jp9nm67w6n74x9d72a56n07jbk5hv")))) -- cgit v1.2.3 From 66e765a063f17353188670a97d818db600fd8c37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:13:34 +0200 Subject: gnu: texlive-generic-pdftex: Declare a source file-name. * gnu/packages/tex.scm (texlive-generic-pdftex)[source]: Declare a source file-name. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5871383d09..30033e1041 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3874,6 +3874,7 @@ (define-public texlive-generic-pdftex %texlive-tag "/Master/texmf-dist/" "/tex/generic/pdftex")) (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0k68zmqzs4qvrqxdwsrawbjb14hxqjfamq649azvai0jjxdpkljd")))) -- cgit v1.2.3 From dac6095d7ecec7f9fa6e270cbe86f14636c2292d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Mar 2018 21:15:14 +0200 Subject: gnu: python2-elib.intl: Declare a source file-name. * gnu/packages/python.scm (python2-elib.intl)[source]: Declare a source file-name. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 106c040bf8..135ea29706 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3806,6 +3806,7 @@ (define-public python2-elib.intl (uri (git-reference (url "https://github.com/dieterv/elib.intl.git") (commit "d09997cfef"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0y7vzff9xgbnaay7m0va1arl6g68ncwrvbgwl7jqlclsahzzb09d")))) -- cgit v1.2.3 From dba52a2bcbbc11887df47162b4dd16b46346e362 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 21:33:18 +0100 Subject: gnu: bind: Update to 9.12.1. * gnu/packages/dns.scm (isc-bind): Update to 9.12.1. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b0f6ddaec2..08304b0c4c 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -99,7 +99,7 @@ (define-public dnsmasq (define-public isc-bind (package (name "bind") - (version "9.12.0") + (version "9.12.1") (source (origin (method url-fetch) (uri (string-append @@ -107,7 +107,7 @@ (define-public isc-bind version ".tar.gz")) (sha256 (base32 - "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9")))) + "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From f8ec8d96d657f95e71e0798124cdeb2c9217c7fa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 10:25:10 +0100 Subject: tests: Do not assume the bootstrap guile tarball is available locally. Fixes . Reported by Chris Marusich . * tests/packages.scm ("package-source-derivation, snippet"): Use 'bootstrap-guile-origin' instead of assuming the bootstrap guile tarball is available locally. --- tests/packages.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/tests/packages.scm b/tests/packages.scm index b2fa21a874..9e19c3992e 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -377,24 +377,9 @@ (define read-at (unless (network-reachable?) (test-skip 1)) (test-equal "package-source-derivation, snippet" "OK" - (let* ((file (search-bootstrap-binary (match (%current-system) - ("armhf-linux" - "guile-2.0.11.tar.xz") - ("aarch64-linux" - "guile-2.0.14.tar.xz") - (_ - "guile-2.0.9.tar.xz")) - (%current-system))) - (sha256 (call-with-input-file file port-sha256)) - (fetch (lambda* (url hash-algo hash - #:optional name #:key system) - (pk 'fetch url hash-algo hash name system) - (interned-file url))) - (source (bootstrap-origin + (let* ((source (bootstrap-origin (origin - (method fetch) - (uri file) - (sha256 sha256) + (inherit (bootstrap-guile-origin (%current-system))) (patch-inputs `(("tar" ,%bootstrap-coreutils&co) ("xz" ,%bootstrap-coreutils&co) -- cgit v1.2.3 From 61b1dbbdcd87f6b37d6b87715a9a4da4e63485ab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 10:28:22 +0100 Subject: guix system: Add '--skip-checks'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Tomáš Čech . * guix/scripts/system.scm (perform-action): Add #:skip-safety-checks? and honor it. (show-help, %options): Add --skip-checks. (process-action): Pass #:skip-safety-checks? to 'perform-action'. * doc/guix.texi (Invoking guix system): Document --skip-checks. --- doc/guix.texi | 10 ++++++++++ guix/scripts/system.scm | 18 +++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d3a7908f9c..bcea89e07b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20458,6 +20458,16 @@ of the image size as a function of the size of the system declared in Make @var{file} a symlink to the result, and register it as a garbage collector root. +@item --skip-checks +Skip pre-installation safety checks. + +By default, @command{guix system init} and @command{guix system +reconfigure} perform safety checks: they make sure the file systems that +appear in the @code{operating-system} declaration actually exist +(@pxref{File Systems}), and that any Linux kernel modules that may be +needed at boot time are listed in @code{initrd-modules} (@pxref{Initial +RAM Disk}). Passing this option skips these tests altogether. + @item --on-error=@var{strategy} Apply @var{strategy} when an error occurs when reading @var{file}. @var{strategy} may be one of the following: diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index acfccce96d..f0c4a2ba1b 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -733,7 +733,8 @@ (define (bootloader-installer-derivation installer (#$installer #$bootloader #$device #$target)))))) (define* (perform-action action os - #:key install-bootloader? + #:key skip-safety-checks? + install-bootloader? dry-run? derivations-only? use-substitutes? bootloader-target target image-size file-system-type full-boot? @@ -750,7 +751,10 @@ (define* (perform-action action os building anything. When GC-ROOT is a path, also make that path an indirect root of the build -output when building a system derivation, such as a disk image." +output when building a system derivation, such as a disk image. + +When SKIP-SAFETY-CHECKS? is true, skip the file system and initrd module +static checks." (define println (cut format #t "~a~%" <>)) @@ -760,7 +764,8 @@ (define println ;; Check whether the declared file systems exist. This is better than ;; instantiating a broken configuration. Assume that we can only check if ;; running as root. - (when (memq action '(init reconfigure)) + (when (and (not skip-safety-checks?) + (memq action '(init reconfigure))) (check-mapped-devices os) (when (zero? (getuid)) (check-file-system-availability (operating-system-file-systems os)) @@ -933,6 +938,8 @@ (define (show-help) --expose=SPEC for 'vm', expose host file system according to SPEC")) (display (G_ " --full-boot for 'vm', make a full boot sequence")) + (display (G_ " + --skip-checks skip file system and initrd module safety checks")) (newline) (display (G_ " -h, --help display this help and exit")) @@ -974,6 +981,9 @@ (define %options (option '("full-boot") #f #f (lambda (opt name arg result) (alist-cons 'full-boot? #t result))) + (option '("skip-checks") #f #f + (lambda (opt name arg result) + (alist-cons 'skip-safety-checks? #t result))) (option '("share") #t #f (lambda (opt name arg result) @@ -1067,6 +1077,8 @@ (define (process-action action args opts) #:derivations-only? (assoc-ref opts 'derivations-only?) #:use-substitutes? (assoc-ref opts 'substitutes?) + #:skip-safety-checks? + (assoc-ref opts 'skip-safety-checks?) #:file-system-type (assoc-ref opts 'file-system-type) #:image-size (assoc-ref opts 'image-size) #:full-boot? (assoc-ref opts 'full-boot?) -- cgit v1.2.3 From 88cd7bbd3dc8ecb6b02435338eff1524ad7154ed Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 11:34:57 +0100 Subject: services: 'shepherd-service-type' now accepts a default value. * gnu/services/shepherd.scm (shepherd-service-type): Add a second form with an additional 'default' parameter. --- gnu/services/shepherd.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index f7c6983cb0..000e85eb86 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -104,14 +104,24 @@ (define %shepherd-root-service ;; objects. (service shepherd-root-service-type '())) -(define-syntax-rule (shepherd-service-type service-name proc) - "Return a denoting a simple shepherd service--i.e., the type -for a service that extends SHEPHERD-ROOT-SERVICE-TYPE and nothing else." - (service-type - (name service-name) - (extensions - (list (service-extension shepherd-root-service-type - (compose list proc)))))) +(define-syntax shepherd-service-type + (syntax-rules () + "Return a denoting a simple shepherd service--i.e., the type +for a service that extends SHEPHERD-ROOT-SERVICE-TYPE and nothing else. When +DEFAULT is given, use it as the service's default value." + ((_ service-name proc default) + (service-type + (name service-name) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))) + (default-value default))) + ((_ service-name proc) + (service-type + (name service-name) + (extensions + (list (service-extension shepherd-root-service-type + (compose list proc)))))))) (define %default-imported-modules ;; Default set of modules imported for a service's consumption. -- cgit v1.2.3 From bb3062ad6290223ea24144ca8aa1f4cddac8f9be Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 11:37:18 +0100 Subject: services: Add 'virtual-terminal'. Fixes . Suggested by Danny Milosavljevic . * gnu/services/base.scm (unicode-start): Remove. (virtual-terminal-service-type): New variable. (console-font-shepherd-services): Remove 'modules'; remove call to 'unicode-start'. Add 'virtual-terminal' to 'requirement'. (mingetty-shepherd-service, kmscon-service-type): Likewise. (%base-services): Add 'virtual-terminal-service-type'. * gnu/system/install.scm (%installation-services): Likewise. --- gnu/services/base.scm | 67 ++++++++++++++++++++++++++++---------------------- gnu/system/install.scm | 4 ++- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 343123a377..be1bfce578 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -62,6 +62,7 @@ (define-module (gnu services base) %default-console-font console-font-service-type console-font-service + virtual-terminal-service-type udev-configuration udev-configuration? @@ -665,22 +666,27 @@ (define (host-name-service name) "Return a service that sets the host name to @var{name}." (service host-name-service-type name)) -(define (unicode-start tty) - "Return a gexp to start Unicode support on @var{tty}." - (with-imported-modules '((guix build syscalls)) - #~(let* ((fd (open-fdes #$tty O_RDWR)) - (termios (tcgetattr fd))) - (define (set-utf8-input termios) - (set-field termios (termios-input-flags) - (logior (input-flags IUTF8) - (termios-input-flags termios)))) - - (tcsetattr fd (tcsetattr-action TCSAFLUSH) - (set-utf8-input termios)) - - ;; TODO: ioctl(fd, KDSKBMODE, K_UNICODE); - (close-fdes fd) - #t))) +(define virtual-terminal-service-type + ;; Ensure that virtual terminals run in UTF-8 mode. This is the case by + ;; default with recent Linux kernels, but this service allows us to ensure + ;; this. This service must start before any 'term-' service so that newly + ;; created terminals inherit this property. See + ;; for a discussion. + (shepherd-service-type + 'virtual-terminal + (lambda (utf8?) + (shepherd-service + (documentation "Set virtual terminals in UTF-8 module.") + (provision '(virtual-terminal)) + (requirement '(root-file-system)) + (start #~(lambda _ + (call-with-output-file + "/sys/module/vt/parameters/default_utf8" + (lambda (port) + (display 1 port))) + #t)) + (stop #~(const #f)))) + #t)) ;default to UTF-8 (define console-keymap-service-type (shepherd-service-type @@ -719,8 +725,6 @@ (define (console-font-shepherd-services tty+font) (requirement (list (symbol-append 'term- (string->symbol tty)))) - (modules '((guix build syscalls) ;for 'tcsetattr' - (srfi srfi-9 gnu))) ;for 'set-field' (start #~(lambda _ ;; It could be that mingetty is not fully ready yet, ;; which we check by calling 'ttyname'. @@ -732,16 +736,18 @@ (define (console-font-shepherd-services tty+font) (usleep 500) (loop (- i 1)))) - (and #$(unicode-start device) - ;; 'setfont' returns EX_OSERR (71) when an - ;; KDFONTOP ioctl fails, for example. Like - ;; systemd's vconsole support, let's not treat - ;; this as an error. - (case (status:exit-val - (system* #$(file-append kbd "/bin/setfont") - "-C" #$device #$font)) - ((0 71) #t) - (else #f))))) + ;; Assume the VT is already in UTF-8 mode, thanks to + ;; the 'virtual-terminal' service. + ;; + ;; 'setfont' returns EX_OSERR (71) when an + ;; KDFONTOP ioctl fails, for example. Like + ;; systemd's vconsole support, let's not treat + ;; this as an error. + (case (status:exit-val + (system* #$(file-append kbd "/bin/setfont") + "-C" #$device #$font)) + ((0 71) #t) + (else #f)))) (stop #~(const #t)) (respawn? #f))))) tty+font)) @@ -1093,7 +1099,7 @@ (define mingetty-shepherd-service ;; Since the login prompt shows the host name, wait for the 'host-name' ;; service to be done. Also wait for udev essentially so that the tty ;; text is not lost in the middle of kernel messages (XXX). - (requirement '(user-processes host-name udev)) + (requirement '(user-processes host-name udev virtual-terminal)) (start #~(make-forkexec-constructor (list #$(file-append mingetty "/sbin/mingetty") @@ -2034,7 +2040,7 @@ (define kmscon-command (shepherd-service (documentation "kmscon virtual terminal") - (requirement '(user-processes udev dbus-system)) + (requirement '(user-processes udev dbus-system virtual-terminal)) (provision (list (symbol-append 'term- (string->symbol virtual-terminal)))) (start #~(make-forkexec-constructor #$kmscon-command)) (stop #~(make-kill-destructor))))))) @@ -2044,6 +2050,7 @@ (define %base-services ;; Convenience variable holding the basic services. (list (login-service) + (service virtual-terminal-service-type) (service console-font-service-type (map (lambda (tty) (cons tty %default-console-font)) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 97f5abe0b6..920d215272 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -214,7 +214,9 @@ (define (normal-tty tty) (define bare-bones-os (load "examples/bare-bones.tmpl")) - (list (mingetty-service (mingetty-configuration + (list (service virtual-terminal-service-type) + + (mingetty-service (mingetty-configuration (tty "tty1") (auto-login "root"))) -- cgit v1.2.3 From 04953dca414788433f039e1844a6cc1c8f37be5f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 15:44:04 -0500 Subject: gnu: Add flatbuffers. * gnu/packages/serialization.scm (flatbuffers): New variable. --- gnu/packages/serialization.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 9bbac3ac22..fd61462776 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -411,3 +412,28 @@ (define-public python-cbor to generate and parse. The two primary functions are @code{cbor.loads} and @code{cbor.dumps}.") (license license:asl2.0))) + +(define-public flatbuffers + (package + (name "flatbuffers") + (version "1.8.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/google/flatbuffers/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0blc978wc5h91662vai24xj92c3bx56y6hzid90qva7il302jl64")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (list (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") + "-DCMAKE_BUILD_TYPE=Release"))) + (home-page "https://google.github.io/flatbuffers/") + (synopsis "Memory-efficient serialization library") + (description "FlatBuffers is a cross platform serialization library for C++, +C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for +game development and other performance-critical applications.") + (license license:asl2.0))) -- cgit v1.2.3 From 5f3616d612273e75334a37c3c94dec490271c7a5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 15:55:24 -0500 Subject: gnu: Add python-plotly. * gnu/packages/graph.scm (python-plotly, python2-plotly): New variables. --- gnu/packages/graph.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 19c9b2269b..6a5e0e753f 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,10 @@ (define-module (gnu packages graph) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages statistics) + #:use-module (gnu packages time) #:use-module (gnu packages xml)) (define-public igraph @@ -199,3 +203,34 @@ (define-public r-rbiofabric represented by horizontal lines, and edges are represented by vertical lines.") (license license:expat)))) + +(define-public python-plotly + (package + (name "python-plotly") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "plotly" version)) + (sha256 + (base32 + "0n18116jz6bl5n9cq23vabv1gcbh1x3yficdnfq55v0z4cwy0zlf")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; The tests are not distributed in the release + (propagated-inputs + `(("python-decorator" ,python-decorator) + ("python-nbformat" ,python-nbformat) + ("python-pytz" ,python-pytz) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (home-page "https://plot.ly/python/") + (synopsis "Interactive plotting library for Python") + (description "Plotly's Python graphing library makes interactive, +publication-quality graphs online. Examples of how to make line plots, scatter +plots, area charts, bar charts, error bars, box plots, histograms, heatmaps, +subplots, multiple-axes, polar charts, and bubble charts. ") + (license license:expat))) + +(define-public python2-plotly + (package-with-python2 python-plotly)) -- cgit v1.2.3 From 3d60f4265e3f89151aaf45bd238ce1c2c89790b5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:11:25 -0500 Subject: gnu: Add r-maps. * gnu/packages/geo.scm (r-maps): New variable. --- gnu/packages/geo.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9014cc3206..3af196bed3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages geo) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system scons) + #:use-module (guix build-system r) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -490,3 +492,22 @@ (define-public spatialite-gui construct common SQL queries, or craft your own SQL queries.") (home-page "https://www.gaia-gis.it/fossil/spatialite_gui/index") (license license:gpl3+))) + +(define-public r-maps + (package + (name "r-maps") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "maps" version)) + (sha256 + (base32 + "0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/maps") + (synopsis "Draw geographical maps") + (description "This package provies an R module for display of maps. +Projection code and larger maps are in separate packages ('mapproj' and +'mapdata').") + (license license:gpl2))) -- cgit v1.2.3 From ebc4bd5b54260082a2897669668144467b856198 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:24:09 -0500 Subject: gnu: Add r-mapproj. * gnu/packages/geo.scm (r-mapproj): New variable. --- gnu/packages/geo.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3af196bed3..e58342d62e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -511,3 +511,25 @@ (define-public r-maps Projection code and larger maps are in separate packages ('mapproj' and 'mapdata').") (license license:gpl2))) + +(define-public r-mapproj + (package + (name "r-mapproj") + (version "1.2-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "mapproj" version)) + (sha256 + (base32 + "0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk")))) + (build-system r-build-system) + (propagated-inputs `(("r-maps" ,r-maps))) + (home-page "https://cran.r-project.org/web/packages/mapproj") + (synopsis "Map projection in R") + (description "This package converts latitude/longitude into projected +coordinates.") + (license (list license:gpl2 ; The R interface + (license:non-copyleft ; The C code + "https://www.gnu.org/licenses/license-list.en.html#lucent102" + "Lucent Public License Version 1.02"))))) -- cgit v1.2.3 From 9ddf42099b398d107467bc42bb495a20f502925f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:31:41 -0500 Subject: gnu: Add Rgooglemaps. * gnu/packages/geo.scm (r-rgooglemaps): New variable. --- gnu/packages/geo.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index e58342d62e..b6b185e5cb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -533,3 +533,25 @@ (define-public r-mapproj (license:non-copyleft ; The C code "https://www.gnu.org/licenses/license-list.en.html#lucent102" "Lucent Public License Version 1.02"))))) + +(define-public r-rgooglemaps + (package + (name "r-rgooglemaps") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "RgoogleMaps" version)) + (sha256 + (base32 + "0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq")))) + (properties `((upstream-name . "RgoogleMaps"))) + (build-system r-build-system) + (propagated-inputs `(("r-png" ,r-png))) + (home-page "https://cran.r-project.org/web/packages/RgoogleMaps") + (synopsis "Use Google Maps in R") + (description "This package serves two purposes: (i) Provide a comfortable R +interface to query the Google server for static maps, and (ii) Use the map as a +background image to overlay plots within R. This requires proper coordinate +scaling.") + (license license:gpl2+))) -- cgit v1.2.3 From 24fb9a55918655cada3bd3cb070aaf02f382e109 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:42:13 -0500 Subject: gnu: Add r-geosphere. * gnu/packages/geo.scm (r-geosphere): New variable. --- gnu/packages/geo.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b6b185e5cb..29d8265eb8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -37,6 +37,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) + #:use-module (gnu packages cran) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -555,3 +556,23 @@ (define-public r-rgooglemaps background image to overlay plots within R. This requires proper coordinate scaling.") (license license:gpl2+))) + +(define-public r-geosphere + (package + (name "r-geosphere") + (version "1.5-7") + (source + (origin + (method url-fetch) + (uri (cran-uri "geosphere" version)) + (sha256 + (base32 + "186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx")))) + (build-system r-build-system) + (propagated-inputs `(("r-sp" ,r-sp))) + (home-page "https://cran.r-project.org/web/packages/geosphere") + (synopsis "Spherical trigonometry") + (description "This package computes spherical trigonometry for geographic +applications. That is, compute distances and related measures for angular +(longitude/latitude) locations.") + (license license:gpl3+))) -- cgit v1.2.3 From 41835f947e84b99d2b8aa5e32c68db2016c7437a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:47:57 -0500 Subject: gnu: Add r-subplex. gnu/packages/maths.scm (r-subplex): New variable. --- gnu/packages/maths.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f9e5d2c3a2..5382260f3c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Jan Nieuwenhuizen +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -3754,3 +3755,25 @@ (define-public mcrl2 analysed.") (home-page "http://mcrl2.org") (license license:boost1.0))) + +(define-public r-subplex + (package + (name "r-subplex") + (version "1.5-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "subplex" version)) + (sha256 + (base32 + "1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/subplex") + (synopsis "Unconstrained optimization using the subplex algorithm") + (description "This package implements the Subplex optimization algorithm. +It solves unconstrained optimization problems using a simplex method on +subspaces. The method is well suited for optimizing objective functions that +are noisy or are discontinuous at the solution.") + (license license:gpl3+))) -- cgit v1.2.3 From 799ad71bfc05f084d595ee11b608745a9c56eb10 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 16:55:07 -0500 Subject: gnu: Add r-desolve. * gnu/packages/maths.scm (r-desolve): New variable. --- gnu/packages/maths.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5382260f3c..b372ad9874 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3777,3 +3777,32 @@ (define-public r-subplex subspaces. The method is well suited for optimizing objective functions that are noisy or are discontinuous at the solution.") (license license:gpl3+))) + +(define-public r-desolve + (package + (name "r-desolve") + (version "1.20") + (source + (origin + (method url-fetch) + (uri (cran-uri "deSolve" version)) + (sha256 + (base32 + "18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan")))) + (properties `((upstream-name . "deSolve"))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://desolve.r-forge.r-project.org/") + (synopsis "Solvers for initial value problems of differential equations") + (description "This package provides functions that solve initial +value problems of a system of first-order ordinary differential equations (ODE), +of partial differential equations (PDE), of differential algebraic equations +(DAE), and of delay differential equations. The functions provide an interface +to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK collection, +to the FORTRAN functions dvode and daspk and a C-implementation of solvers of +the Runge-Kutta family with fixed or variable time steps. The package contains +routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial +differential equations (PDE) that have been converted to ODEs by numerical +differencing.") + (license license:gpl2+))) -- cgit v1.2.3 From 32cbbac11a8d8d656ed795865d88a6eeb3877dbe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 17:06:26 -0500 Subject: gnu: Add Diversitree. * gnu/packages/bioinformatics.scm (r-diversitree): New variable. --- gnu/packages/bioinformatics.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 567dd2c24b..3d754bfbfa 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -12855,3 +12856,34 @@ (define-public pigx-bsseq and coverage and can be used to produce information on differential methylation and segmentation.") (license license:gpl3+))) + +(define-public r-diversitree + (package + (name "r-diversitree") + (version "0.9-10") + (source + (origin + (method url-fetch) + (uri (cran-uri "diversitree" version)) + (sha256 + (base32 + "0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (inputs `(("fftw" ,fftw) ("gsl" ,gsl))) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-desolve" ,r-desolve) + ("r-rcpp" ,r-rcpp) + ("r-suplex" ,r-subplex))) + (home-page "https://www.zoology.ubc.ca/prog/diversitree") + (synopsis "Comparative 'phylogenetic' analyses of diversification") + (description "This package contains a number of comparative \"phylogenetic\" +methods, mostly focusing on analysing diversification and character evolution. +Contains implementations of \"BiSSE\" (Binary State Speciation and Extinction) +and its unresolved tree extensions, \"MuSSE\" (Multiple State Speciation and +Extinction), \"QuaSSE\", \"GeoSSE\", and \"BiSSE-ness\" Other included methods +include Markov models of discrete and continuous trait evolution and constant +rate speciation and extinction.") + (license license:gpl2+))) -- cgit v1.2.3 From da4dde610984c3ddb1baf2a92fe6e838cb0720c6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 17:10:29 -0500 Subject: gnu: Add r-jpeg. * gnu/packages/image.scm (r-jpeg): New variable. --- gnu/packages/image.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b576c508ec..caafb2ea70 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -1293,3 +1294,23 @@ (define-public flameshot @item Upload to Imgur. @end itemize\n") (license license:gpl3+))) + +(define-public r-jpeg + (package + (name "r-jpeg") + (version "0.1-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "jpeg" version)) + (sha256 + (base32 + "05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh")))) + (build-system r-build-system) + (inputs `(("libjpeg" ,libjpeg))) + (home-page "http://www.rforge.net/jpeg/") + (synopsis "Read and write JPEG images with R") + (description "This package provides a way to read, write and display bitmap +images stored in the JPEG format with R. It can read and write both files and +in-memory raw vectors.") + (license license:gpl2+))) -- cgit v1.2.3 From 5b19776e055c7033f72fd7291711294cc276ab1f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 17:23:38 -0500 Subject: gnu: Add r-ggmap. * gnu/packages/geo.scm (r-ggmap): New variable. --- gnu/packages/geo.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 29d8265eb8..9c7c071db0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -45,6 +45,8 @@ (define-module (gnu packages geo) #:use-module (gnu packages icu4c) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages statistics) + #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) @@ -576,3 +578,36 @@ (define-public r-geosphere applications. That is, compute distances and related measures for angular (longitude/latitude) locations.") (license license:gpl3+))) + +(define-public r-ggmap + (package + (name "r-ggmap") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggmap" version)) + (sha256 + (base32 + "0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw")))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-geosphere" ,r-geosphere) + ("r-ggplot2" ,r-ggplot2) + ("r-jpeg" ,r-jpeg) + ("r-mapproj" ,r-mapproj) + ("r-plyr" ,r-plyr) + ("r-png" ,r-png) + ("r-proto" ,r-proto) + ("r-reshape2" ,r-reshape2) + ("r-rgooglemaps" ,r-rgooglemaps) + ("r-rjson" ,r-rjson) + ("r-scales" ,r-scales))) + (home-page "https://github.com/dkahle/ggmap") + (synopsis "Spatial visualization with ggplot2") + (description "This package provides a collection of functions to visualize +spatial data and models on top of static maps from various online sources (e.g +Google Maps and Stamen Maps). It includes tools common to those tasks, +including functions for geolocation and routing.") + (license license:gpl2))) -- cgit v1.2.3 From 9f1c0e03ecfe6453f57ba9d9344dcf97c257799b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Feb 2018 17:29:53 -0500 Subject: gnu: Add r-feather. * gnu/packages/serialization.scm (r-feather): New variable. --- gnu/packages/serialization.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index fd61462776..0c07a6384c 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -33,17 +33,20 @@ (define-module (gnu packages serialization) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build-system r) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cran) #:use-module (gnu packages documentation) #:use-module (gnu packages lua) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages perl) - #:use-module (guix build-system python)) + #:use-module (gnu packages statistics)) (define-public cereal (package @@ -437,3 +440,25 @@ (define-public flatbuffers C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for game development and other performance-critical applications.") (license license:asl2.0))) + +(define-public r-feather + (package + (name "r-feather") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "feather" version)) + (sha256 + (base32 + "1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi")))) + (build-system r-build-system) + (propagated-inputs + `(("r-hms" ,r-hms) + ("r-rcpp" ,r-rcpp) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/wesm/feather") + (synopsis "R Bindings to the Feather API") + (description "Read and write feather files, a lightweight binary columnar +daa store designed for maximum speed.") + (license license:asl2.0))) -- cgit v1.2.3 From 2ed0ef2fb794de28036616c4b29e9617f0ca9425 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Feb 2018 12:18:31 -0500 Subject: gnu: Add google-brotli. * gnu/packages/compression.scm (google-brotli): New variable. --- gnu/packages/compression.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 86efe2a40e..05442024f6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -2111,3 +2112,46 @@ (define-public innoextract (description "innoextract allows extracting Inno Setup installers under non-Windows systems without running the actual installer using wine.") (license license:zlib))) + +(define-public google-brotli + (package + (name "google-brotli") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/brotli/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "08kl9gww2058p1p7j9xqmcmrabcfihhj3fq984d7fi3bchb2mky2")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'rename-static-libraries + ;; The build tools put a 'static' suffix on the static libraries, but + ;; other applications don't know how to find these. + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref %outputs "out") "/lib/"))) + (rename-file (string-append lib "libbrotlicommon-static.a") + (string-append lib "libbrotlicommon.a")) + (rename-file (string-append lib "libbrotlidec-static.a") + (string-append lib "libbrotlidec.a")) + (rename-file (string-append lib "libbrotlienc-static.a") + (string-append lib "libbrotlienc.a")) + #t)))) + #:configure-flags + (list ;; Defaults to "lib64" on 64-bit archs. + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib")))) + (home-page "https://github.com/google/brotli") + (synopsis "General-purpose lossless compression") + (description "This package provides the reference implementation of Brotli, +a generic-purpose lossless compression algorithm that compresses data using a +combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd +order context modeling, with a compression ratio comparable to the best +currently available general-purpose compression methods. It is similar in speed +with @code{deflate} but offers more dense compression. + +The specification of the Brotli Compressed Data Format is defined in RFC 7932.") + (license license:expat))) -- cgit v1.2.3 From dae7661a0da9b5a081fb2097cb5e431ad0b8443c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Feb 2018 12:19:33 -0500 Subject: gnu: Add apache-arrow. * gnu/packages/databases.scm (apache-arrow): New variable. --- gnu/packages/databases.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 87f65404f8..f2e5622731 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki +;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) @@ -92,6 +94,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -2738,3 +2741,74 @@ (define-public mongo-tools Monitor read/write activity on a mongo server @end table") (license license:asl2.0))) + +(define-public apache-arrow + (package + (name "apache-arrow") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/arrow") + (commit (string-append "apache-arrow-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'enter-source-directory + (lambda _ (chdir "cpp") #t)) + (add-after 'unpack 'set-env + (lambda _ + (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) + (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) + (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) + (setenv "JEMALLOC_HOME" (assoc-ref %build-inputs "jemalloc")) + (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) + #t))) + #:configure-flags + (list "-DCMAKE_BUILD_TYPE=Release" + "-DARROW_PYTHON=ON" + + ;; Install to PREFIX/lib (the default is + ;; PREFIX/lib64). + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") + "/lib") + + ;; XXX These Guix package offer static + ;; libraries that are not position independent, + ;; and ld fails to link them into the arrow .so + "-DARROW_WITH_SNAPPY=OFF" + "-DARROW_WITH_ZLIB=OFF" + "-DARROW_WITH_ZSTD=OFF" + "-DARROW_WITH_LZ4=OFF" + + ;; Building the tests forces on all the + ;; optional features and the use of static + ;; libraries. + "-DARROW_BUILD_TESTS=OFF" + "-DARROW_BUILD_STATIC=OFF"))) + (inputs + `(("boost" ,boost) + ("rapidjson" ,rapidjson) + ("brotli" ,google-brotli) + ("flatbuffers" ,flatbuffers) + ;; Arrow is not yet compatible with jemalloc >= 5: + ;; https://issues.apache.org/jira/browse/ARROW-1141 + ("jemalloc" ,jemalloc-4.5.0) + ("python-3" ,python) + ("python-numpy" ,python-numpy))) + (home-page "https://arrow.apache.org/") + (synopsis "Columnar in-memory analytics") + (description "Apache Arrow is a columnar in-memory analytics layer +designed to accelerate big data. It houses a set of canonical in-memory +representations of flat and hierarchical data along with multiple +language-bindings for structure manipulation. It also provides IPC and common +algorithm implementations.") + (license license:asl2.0))) -- cgit v1.2.3 From 5e5ac7102c2d28676ab1b756862ba9c02cd3ba2f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Feb 2018 12:23:03 -0500 Subject: gnu: Add python-pyarrow. * gnu/packages/databases.scm (python-pyarrow, python2-pyarrow): New variables. --- gnu/packages/databases.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f2e5622731..ab8729bde0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2812,3 +2812,49 @@ (define-public apache-arrow language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.") (license license:asl2.0))) + +(define-public python-pyarrow + (package + (name "python-pyarrow") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/arrow") + (commit (string-append "apache-arrow-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) + (build-system python-build-system) + (arguments + '(#:tests? #f ; XXX Test failures related to missing libhdfs, libhdfs3, + ; and "Unsupported numpy type 22". + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-source-directory + (lambda _ (chdir "python") #t)) + (add-after 'unpack 'set-env + (lambda _ + (setenv "ARROW_HOME" (assoc-ref %build-inputs "apache-arrow")) + #t))))) + (propagated-inputs + `(("apache-arrow" ,apache-arrow) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-six" ,python-six))) + (native-inputs + `(("cmake" ,cmake) + ("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://arrow.apache.org/docs/python/") + (synopsis "Python bindings for Apache Arrow") + (description "This library provides a Pythonic API wrapper for the reference +Arrow C++ implementation, along with tools for interoperability with pandas, +NumPy, and other traditional Python scientific computing packages.") + (license license:asl2.0))) + +(define-public python2-pyarrow + (package-with-python2 python-pyarrow)) -- cgit v1.2.3 From 8d4f34d6c9667c82f1dc136f54954fb4ccef81b1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Feb 2018 12:25:17 -0500 Subject: gnu: Add python-feather-format. * gnu/packages/serialization.scm (python-feather-format, python2-feather-format): New variables. --- gnu/packages/serialization.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0c07a6384c..3dd3a070e4 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -41,6 +41,7 @@ (define-module (gnu packages serialization) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cran) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages lua) #:use-module (gnu packages pkg-config) @@ -462,3 +463,27 @@ (define-public r-feather (description "Read and write feather files, a lightweight binary columnar daa store designed for maximum speed.") (license license:asl2.0))) + +(define-public python-feather-format + (package + (name "python-feather-format") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "feather-format" version)) + (sha256 + (base32 + "1adivm5w5ji4qv7hq7942vqlk8l2wgw87bdlsia771z14z3zp857")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pandas" ,python-pandas) + ("python-pyarrow" ,python-pyarrow))) + (home-page "https://github.com/wesm/feather") + (synopsis "Python wrapper to the Feather file format") + (description "This package provides a Python wrapper library to the +Apache Arrow-based Feather binary columnar serialization data frame format.") + (license license:asl2.0))) + +(define-public python2-feather-format + (package-with-python2 python-feather-format)) -- cgit v1.2.3 From 71f9ca53e58de6ecd4d1dcbc7647990ac4685665 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Mar 2018 11:45:04 -0400 Subject: gnu: certbot: Update to 0.22.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 0.22.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 45f5255665..bd86b2e0d9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -512,13 +512,13 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.21.1") + (version "0.22.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "02x6f37ddldaxrxzh2wjw8wmzqchxb7gl5i4i4daysas9yzqlvi9")))) + "1s2zamyb99zdyga3c75xxgnj0z2hixw8wv24v1l4p49fncnxab2a")))) (build-system python-build-system) (arguments `(#:phases @@ -567,7 +567,7 @@ (define-public certbot (uri (pypi-uri name version)) (sha256 (base32 - "1sn4wqkp6kjj9p8maf4jnjwwvb083hgakm9i10rk9273nnqfkj76")))) + "1cyb3lhxrw7ghyhrl2wc95vqhdaxz6n4pai66c573gcly7c7sc7f")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 20ecede9690cb7f75bc8fee60619a4adf82ba4d5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Mar 2018 11:31:31 -0400 Subject: gnu: shadow: Fix CVE-2018-7169. * gnu/packages/patches/shadow-CVE-2018-7169.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shadow)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/patches/shadow-CVE-2018-7169.patch | 191 ++++++++++++++++++++++++ 3 files changed, 193 insertions(+) create mode 100644 gnu/packages/patches/shadow-CVE-2018-7169.patch diff --git a/gnu/local.mk b/gnu/local.mk index 165b830673..69e4d2b7b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,6 +1082,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-test-threading.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ + %D%/packages/patches/shadow-CVE-2018-7169.patch \ %D%/packages/patches/shepherd-close-fds.patch \ %D%/packages/patches/shepherd-herd-status-sorted.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ad31bc498f..d6f4a5fabc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -360,6 +360,7 @@ (define-public shadow (uri (string-append "https://github.com/shadow-maint/shadow/releases/" "download/" version "/shadow-" version ".tar.xz")) + (patches (search-patches "shadow-CVE-2018-7169.patch")) (sha256 (base32 "0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w")))) diff --git a/gnu/packages/patches/shadow-CVE-2018-7169.patch b/gnu/packages/patches/shadow-CVE-2018-7169.patch new file mode 100644 index 0000000000..eeae5b9b71 --- /dev/null +++ b/gnu/packages/patches/shadow-CVE-2018-7169.patch @@ -0,0 +1,191 @@ +Fix CVE-2018-7169: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7169 + +Patch copied from upstream source repository: + +https://github.com/shadow-maint/shadow/commit/fb28c99b8a66ff2605c5cb96abc0a4d975f92de0 + +From fb28c99b8a66ff2605c5cb96abc0a4d975f92de0 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai +Date: Thu, 15 Feb 2018 23:49:40 +1100 +Subject: [PATCH] newgidmap: enforce setgroups=deny if self-mapping a group + +This is necessary to match the kernel-side policy of "self-mapping in a +user namespace is fine, but you cannot drop groups" -- a policy that was +created in order to stop user namespaces from allowing trivial privilege +escalation by dropping supplementary groups that were "blacklisted" from +certain paths. + +This is the simplest fix for the underlying issue, and effectively makes +it so that unless a user has a valid mapping set in /etc/subgid (which +only administrators can modify) -- and they are currently trying to use +that mapping -- then /proc/$pid/setgroups will be set to deny. This +workaround is only partial, because ideally it should be possible to set +an "allow_setgroups" or "deny_setgroups" flag in /etc/subgid to allow +administrators to further restrict newgidmap(1). + +We also don't write anything in the "allow" case because "allow" is the +default, and users may have already written "deny" even if they +technically are allowed to use setgroups. And we don't write anything if +the setgroups policy is already "deny". + +Ref: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1729357 +Fixes: CVE-2018-7169 +Reported-by: Craig Furman +Signed-off-by: Aleksa Sarai +--- + src/newgidmap.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 80 insertions(+), 9 deletions(-) + +diff --git a/src/newgidmap.c b/src/newgidmap.c +index b1e33513..59a2e75c 100644 +--- a/src/newgidmap.c ++++ b/src/newgidmap.c +@@ -46,32 +46,37 @@ + */ + const char *Prog; + +-static bool verify_range(struct passwd *pw, struct map_range *range) ++ ++static bool verify_range(struct passwd *pw, struct map_range *range, bool *allow_setgroups) + { + /* An empty range is invalid */ + if (range->count == 0) + return false; + +- /* Test /etc/subgid */ +- if (have_sub_gids(pw->pw_name, range->lower, range->count)) ++ /* Test /etc/subgid. If the mapping is valid then we allow setgroups. */ ++ if (have_sub_gids(pw->pw_name, range->lower, range->count)) { ++ *allow_setgroups = true; + return true; ++ } + +- /* Allow a process to map its own gid */ +- if ((range->count == 1) && (pw->pw_gid == range->lower)) ++ /* Allow a process to map its own gid. */ ++ if ((range->count == 1) && (pw->pw_gid == range->lower)) { ++ /* noop -- if setgroups is enabled already we won't disable it. */ + return true; ++ } + + return false; + } + + static void verify_ranges(struct passwd *pw, int ranges, +- struct map_range *mappings) ++ struct map_range *mappings, bool *allow_setgroups) + { + struct map_range *mapping; + int idx; + + mapping = mappings; + for (idx = 0; idx < ranges; idx++, mapping++) { +- if (!verify_range(pw, mapping)) { ++ if (!verify_range(pw, mapping, allow_setgroups)) { + fprintf(stderr, _( "%s: gid range [%lu-%lu) -> [%lu-%lu) not allowed\n"), + Prog, + mapping->upper, +@@ -89,6 +94,70 @@ static void usage(void) + exit(EXIT_FAILURE); + } + ++void write_setgroups(int proc_dir_fd, bool allow_setgroups) ++{ ++ int setgroups_fd; ++ char *policy, policy_buffer[4096]; ++ ++ /* ++ * Default is "deny", and any "allow" will out-rank a "deny". We don't ++ * forcefully write an "allow" here because the process we are writing ++ * mappings for may have already set themselves to "deny" (and "allow" ++ * is the default anyway). So allow_setgroups == true is a noop. ++ */ ++ policy = "deny\n"; ++ if (allow_setgroups) ++ return; ++ ++ setgroups_fd = openat(proc_dir_fd, "setgroups", O_RDWR|O_CLOEXEC); ++ if (setgroups_fd < 0) { ++ /* ++ * If it's an ENOENT then we are on too old a kernel for the setgroups ++ * code to exist. Emit a warning and bail on this. ++ */ ++ if (ENOENT == errno) { ++ fprintf(stderr, _("%s: kernel doesn't support setgroups restrictions\n"), Prog); ++ goto out; ++ } ++ fprintf(stderr, _("%s: couldn't open process setgroups: %s\n"), ++ Prog, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ ++ /* ++ * Check whether the policy is already what we want. /proc/self/setgroups ++ * is write-once, so attempting to write after it's already written to will ++ * fail. ++ */ ++ if (read(setgroups_fd, policy_buffer, sizeof(policy_buffer)) < 0) { ++ fprintf(stderr, _("%s: failed to read setgroups: %s\n"), ++ Prog, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ if (!strncmp(policy_buffer, policy, strlen(policy))) ++ goto out; ++ ++ /* Write the policy. */ ++ if (lseek(setgroups_fd, 0, SEEK_SET) < 0) { ++ fprintf(stderr, _("%s: failed to seek setgroups: %s\n"), ++ Prog, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ if (dprintf(setgroups_fd, "%s", policy) < 0) { ++ fprintf(stderr, _("%s: failed to setgroups %s policy: %s\n"), ++ Prog, ++ policy, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ ++out: ++ close(setgroups_fd); ++} ++ + /* + * newgidmap - Set the gid_map for the specified process + */ +@@ -103,6 +172,7 @@ int main(int argc, char **argv) + struct stat st; + struct passwd *pw; + int written; ++ bool allow_setgroups = false; + + Prog = Basename (argv[0]); + +@@ -145,7 +215,7 @@ int main(int argc, char **argv) + (unsigned long) getuid ())); + return EXIT_FAILURE; + } +- ++ + /* Get the effective uid and effective gid of the target process */ + if (fstat(proc_dir_fd, &st) < 0) { + fprintf(stderr, _("%s: Could not stat directory for target %u\n"), +@@ -177,8 +247,9 @@ int main(int argc, char **argv) + if (!mappings) + usage(); + +- verify_ranges(pw, ranges, mappings); ++ verify_ranges(pw, ranges, mappings, &allow_setgroups); + ++ write_setgroups(proc_dir_fd, allow_setgroups); + write_mapping(proc_dir_fd, ranges, mappings, "gid_map"); + sub_gid_close(); + +-- +2.16.2 + -- cgit v1.2.3 From b9d020056d7e5a63d1c0f81c513bfd73c790390e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 21:35:14 +0100 Subject: gnu: bind: Use INVOKE. * gnu/packages/dns.scm (isc-bind)[arguments]: Substitute INVOKE for SYSTEM* and end phase with an explicit #t. --- gnu/packages/dns.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 08304b0c4c..d093b0d9b5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -149,7 +149,8 @@ (define-public isc-bind ;; (system "bin/tests/system/ifconfig.sh up"))) (replace 'check (lambda _ - (zero? (system* "make" "force-test"))))))) + (invoke "make" "force-test") + #t))))) (synopsis "An implementation of the Domain Name System") (description "BIND is an implementation of the @dfn{Domain Name System} (DNS) protocols for the Internet. It is a reference implementation of those -- cgit v1.2.3 From cd75b642d983000717e8b73b6402b1f67d1343a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 04:45:14 +0100 Subject: gnu: perl-lingua-en-inflect-phrase: Update to 0.20. * gnu/packages/language.scm (perl-lingua-en-inflect-phrase): Update to 0.20. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 237c4bc18d..36368b594e 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -98,7 +98,7 @@ (define-public perl-lingua-en-inflect-number (define-public perl-lingua-en-inflect-phrase (package (name "perl-lingua-en-inflect-phrase") - (version "0.18") + (version "0.20") (source (origin (method url-fetch) @@ -106,7 +106,7 @@ (define-public perl-lingua-en-inflect-phrase "Lingua-EN-Inflect-Phrase-" version ".tar.gz")) (sha256 (base32 - "19prg6pkgnznrc82ymdkdi3l9schg815axjig7adca5yqa7mn2i9")))) + "1a6y1l2pjim2242wcpgz066di4pbzfgsjjdl7vg5a5wzm48qj1am")))) (build-system perl-build-system) (native-inputs `(("perl-test-nowarnings" ,perl-test-nowarnings))) -- cgit v1.2.3 From 97c794942af813965e1f0113023d1fae234d7c1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Mar 2018 04:45:52 +0100 Subject: gnu: perl-string-toidentifier-en: Update to 0.12. * gnu/packages/language.scm (perl-string-toidentifier-en): Update to 0.12. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 36368b594e..cf85c510f1 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -365,7 +365,7 @@ (define-public perl-snowball-swedish (define-public perl-string-toidentifier-en (package (name "perl-string-toidentifier-en") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) @@ -373,7 +373,7 @@ (define-public perl-string-toidentifier-en "String-ToIdentifier-EN-" version ".tar.gz")) (sha256 (base32 - "1bawghkgkkx7j3avnrj5sg3vix1z5564ks6wf9az3jc2knh8s5nh")))) + "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs")))) (build-system perl-build-system) (propagated-inputs `(("perl-lingua-en-inflect-phrase" ,perl-lingua-en-inflect-phrase) -- cgit v1.2.3 From 96b4f5adc2569c708acb48dbdcce0f578f22660d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 00:01:24 +0100 Subject: gnu: autoconf-archive: Update to 2018.03.13. * gnu/packages/autotools.scm (autoconf-archive): Update to 2018.03.13. --- gnu/packages/autotools.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 9394ee014f..0f4ecc4ab6 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,7 +203,7 @@ (define-public autoconf-wrapper (define-public autoconf-archive (package (name "autoconf-archive") - (version "2017.09.28") + (version "2018.03.13") (source (origin (method url-fetch) @@ -210,7 +211,7 @@ (define-public autoconf-archive version ".tar.xz")) (sha256 (base32 - "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw")))) + "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/autoconf-archive/") (synopsis "Collection of freely reusable Autoconf macros") -- cgit v1.2.3 From 1a7cc9efcd4fd9485195e511ac6c5974d9ba9682 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 00:08:28 +0100 Subject: gnu: cifs-utils: Update to 6.8. * gnu/packages/samba.scm (cifs-utils): Update to 6.8. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d7ae5715ff..3b1c2d4885 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -50,14 +50,14 @@ (define-module (gnu packages samba) (define-public cifs-utils (package (name "cifs-utils") - (version "6.7") + (version "6.8") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/linux-cifs/" name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj")))) + "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 47653b39332977e899e756305d6378c322c0c52c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 00:17:26 +0100 Subject: gnu: octave: Update to 4.2.2. * gnu/packages/maths.scm (octave): Update to 4.2.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b372ad9874..64fe13b9bc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1308,7 +1308,7 @@ (define-public ceres (define-public octave (package (name "octave") - (version "4.2.1") + (version "4.2.2") (source (origin (method url-fetch) @@ -1316,7 +1316,7 @@ (define-public octave version ".tar.lz")) (sha256 (base32 - "09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92")))) + "0pkkz1vazsh7ipffb09q0nc2jgx6q27pkkngygjij6jrpcly5zsp")))) (build-system gnu-build-system) (inputs `(("lapack" ,lapack) -- cgit v1.2.3 From 8027f84d8fd43d1165c02758962669f66e2a96f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 02:46:54 +0100 Subject: gnu: acpica: Update to 20180313. * gnu/packages/admin.scm (acpica): Update to 20180313. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d6f4a5fabc..9befa845e5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1206,7 +1206,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20180209") + (version "20180313") (source (origin (method url-fetch) (uri (string-append @@ -1214,7 +1214,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "04hyc5s9iiyiznvspx7q73r6ns98d51wrv8zfvqbqv52gqq8hzdh")))) + "16galaadmr37q2pvk2gyxrm8d1xldzk31djfxfq9v1c9yq4i425h")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 5ade82bbb8c768861d8dc6f12d07b661e6f92f73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 04:03:27 +0100 Subject: gnu: r-scatterplot3d: Update to 0.3-41. * gnu/packages/cran.scm (r-scatterplot3d): Update to 0.3-41. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7126518c1..9b045c122f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1809,14 +1809,14 @@ (define-public r-sdmtools (define-public r-scatterplot3d (package (name "r-scatterplot3d") - (version "0.3-40") + (version "0.3-41") (source (origin (method url-fetch) (uri (cran-uri "scatterplot3d" version)) (sha256 (base32 - "0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2")))) + "152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/scatterplot3d/") (synopsis "3D scatter plot") -- cgit v1.2.3 From 7c9b7c5c6db7d236bc9c97446ba360618ada3308 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 04:04:18 +0100 Subject: gnu: xdg-user-dirs: Update to 0.17. * gnu/packages/freedesktop.scm (xdg-user-dirs): Update to 0.17. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 3c83e668b0..366fcecea2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1087,13 +1087,13 @@ (define-public desktop-file-utils (define-public xdg-user-dirs (package (name "xdg-user-dirs") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (string-append "http://user-dirs.freedesktop.org/releases/" name "-" version ".tar.gz")) (sha256 - (base32 "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp")))) + (base32 "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 7b8d3a5e1ee0431c1c9a4e0ac72852502c89d016 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 04:06:44 +0100 Subject: gnu: gtksourceview: Update to 3.24.7. * gnu/packages/gtk.scm (gtksourceview): Update to 3.24.7. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0e98a7c9d5..f0f49bbce5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -385,7 +385,7 @@ (define-public gtksourceview-2 (define-public gtksourceview (package (name "gtksourceview") - (version "3.24.6") + (version "3.24.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -393,7 +393,7 @@ (define-public gtksourceview name "-" version ".tar.xz")) (sha256 (base32 - "1261fwjpwn3qizmvjns9z3k3a264j3ql5anyvmisfwywpkzbv9ks")))) + "1rp8zspwyw3mmdgccsas3pa6v7s0hqjaaglg6n4kcls7ccx0vhm5")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From d87d3f963e604bc5a128adfebc45f208d4cbfb67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 19:00:27 +0100 Subject: gnu: libisofs: Update to 1.4.8. * gnu/packages/cdrom.scm (libisofs): Update to 1.4.8. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 672064db12..6a2f853029 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -720,14 +720,14 @@ (define-public libburn (define-public libisofs (package (name "libisofs") - (version "1.4.6") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libisofs-" version ".tar.gz")) (sha256 (base32 - "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql")))) + "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) -- cgit v1.2.3 From 2773c244b1a814b2a80d415744b31f0031fb87ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 19:01:10 +0100 Subject: gnu: libisofs: Fix description typos. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cdrom.scm (libisofs)[description]: Spell ‘file system’ as ‘file system’. --- gnu/packages/cdrom.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 6a2f853029..e38242fb44 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -737,11 +737,11 @@ (define-public libisofs (home-page "https://dev.lovelyhq.com/libburnia/libisofs") (synopsis "Library to create ISO 9660 images") (description - "Libisofs creates ISO 9660 (also known as ECMA-119) filesystem images + "Libisofs creates ISO 9660 (also known as ECMA-119) file system images which can either be written to POSIX file objects or handed over to libburn for being written directly to optical media. It can read metadata of ISO 9660 filesystems, manipulate them, and use them -to produce new complete filesystem images or add-on images to be appended -to the read filesystem image. +to produce new complete file system images or add-on images to be appended +to the read file system image. Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.") (license gpl2+))) -- cgit v1.2.3 From 896bbb035678e994a602a2ea78b16aa5871e8e59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 19:11:07 +0100 Subject: gnu: libburn: Update to 1.4.8. * gnu/packages/cdrom.scm (libburn): Update to 1.4.8. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index e38242fb44..2e51544b05 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -698,14 +698,14 @@ (define-public ccd2cue (define-public libburn (package (name "libburn") - (version "1.4.6") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libburn-" version ".tar.gz")) (sha256 (base32 - "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx")))) + "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From fdae9718a1016b02562f38380a903261d1dd39ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 19:49:49 +0100 Subject: gnu: intel-gpu-tools: Update to 1.22. * gnu/packages/admin.scm (intel-gpu-tools): Update to 1.22. [inputs]: Add eudev. --- gnu/packages/admin.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9befa845e5..3f13210a60 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2199,7 +2199,7 @@ (define-public sedsed (define-public intel-gpu-tools (package (name "intel-gpu-tools") - (version "1.21") + (version "1.22") (source (origin (method url-fetch) (uri (string-append "https://cgit.freedesktop.org/xorg/app/" @@ -2207,7 +2207,7 @@ (define-public intel-gpu-tools "intel-gpu-tools-" version ".tar.gz")) (sha256 (base32 - "1xfy4cgimyyn5qixlrfkadgnl9qwbk30vw8k80g8vjnrcc4hx986")))) + "1jx5w5fr6jp67rcrlp5v79cn8kp9n0wgd5pbfgzamlah5cx6j3yd")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; many of the tests try to load kernel modules @@ -2219,7 +2219,8 @@ (define-public intel-gpu-tools (setenv "NOCONFIGURE" "1") (invoke "sh" "autogen.sh")))))) (inputs - `(("util-macros" ,util-macros) + `(("eudev" ,eudev) + ("util-macros" ,util-macros) ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("kmod" ,kmod) -- cgit v1.2.3 From 35edaa22aafc01496a60a7a242a94844d5618167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 20:12:57 +0100 Subject: gnu: you-get: Update to 0.4.1040. * gnu/packages/video.scm (you-get): Update to 0.4.1040. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6c9769d9fa..0979b4f4e7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1276,7 +1276,7 @@ (define-public youtube-dl-gui (define-public you-get (package (name "you-get") - (version "0.4.1025") + (version "0.4.1040") (source (origin (method url-fetch) (uri (string-append @@ -1285,7 +1285,7 @@ (define-public you-get (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10103jw1gzar85jlajzl9wslk08vw21n26hkhfcz5bvkm9lxxs2c")))) + "0257p9bn426rv0cjk2j5hsx6cg7dz5gpjwlqq0sy1axa47phis46")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From 0ab5aa056d4fdfb53de24ad416d978a5220e313d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 20:13:29 +0100 Subject: gnu: dmenu: Update to 4.8. * gnu/packages/suckless.scm (dmenu): Update to 4.8. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index c343b42274..eadc8409c2 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -138,14 +138,14 @@ (define-public dwm (define-public dmenu (package (name "dmenu") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/tools/dmenu-" version ".tar.gz")) (sha256 (base32 - "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7")))) + "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From e1d0f2aa87b8045aacb821c2406ecdfa832c7473 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 16:30:41 +0100 Subject: vm: Use 'invoke' instead of 'system*'. * gnu/build/vm.scm (load-in-linux-vm, initialize-partition-table) (create-ext-file-system, create-fat-file-system) (install-efi, make-iso9660-image): Use 'invoke' instead of (unless (zero? (system* ...)) (error ...)). --- gnu/build/vm.scm | 105 +++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 58 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index fe003ea458..7817507269 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -121,10 +121,8 @@ (define arch-specific-flags (format #t "creating ~a image of ~,2f MiB...~%" disk-image-format (/ disk-image-size (expt 2 20))) (force-output) - (unless (zero? (system* "qemu-img" "create" "-f" disk-image-format - output - (number->string disk-image-size))) - (error "qemu-img failed"))) + (invoke "qemu-img" "create" "-f" disk-image-format output + (number->string disk-image-size))) (mkdir "xchg") @@ -136,31 +134,29 @@ (define arch-specific-flags graph-files)) (_ #f)) - (unless (zero? - (apply system* qemu "-nographic" "-no-reboot" - "-m" (number->string memory-size) - "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" - "-device" "virtio-rng-pci,rng=guixsd-vm-rng" - "-virtfs" - (string-append "local,id=store_dev,path=" - (%store-directory) - ",security_model=none,mount_tag=store") - "-virtfs" - (string-append "local,id=xchg_dev,path=xchg" - ",security_model=none,mount_tag=xchg") - "-kernel" linux - "-initrd" initrd - "-append" (string-append "console=ttyS0 --load=" - builder) - (append - (if make-disk-image? - `("-device" "virtio-blk,drive=myhd" - "-drive" ,(string-append "if=none,file=" output - ",format=" disk-image-format - ",id=myhd")) - '()) - arch-specific-flags))) - (error "qemu failed" qemu)) + (apply invoke qemu "-nographic" "-no-reboot" + "-m" (number->string memory-size) + "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" + "-device" "virtio-rng-pci,rng=guixsd-vm-rng" + "-virtfs" + (string-append "local,id=store_dev,path=" + (%store-directory) + ",security_model=none,mount_tag=store") + "-virtfs" + (string-append "local,id=xchg_dev,path=xchg" + ",security_model=none,mount_tag=xchg") + "-kernel" linux + "-initrd" initrd + "-append" (string-append "console=ttyS0 --load=" + builder) + (append + (if make-disk-image? + `("-device" "virtio-blk,drive=myhd" + "-drive" ,(string-append "if=none,file=" output + ",format=" disk-image-format + ",id=myhd")) + '()) + arch-specific-flags)) ;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already. (unless make-disk-image? @@ -240,10 +236,9 @@ (define (options partitions offset) partition-size) partitions) ", ")) - (unless (zero? (apply system* "parted" "--script" - device "mklabel" label-type - (options partitions offset))) - (error "failed to create partition table")) + (apply invoke "parted" "--script" + device "mklabel" label-type + (options partitions offset)) ;; Set the 'device' field of each partition. (reverse @@ -265,15 +260,14 @@ (define* (create-ext-file-system partition type "Create an ext-family file system of TYPE on PARTITION. If LABEL is true, use that as the volume name. If UUID is true, use it as the partition UUID." (format #t "creating ~a partition...\n" type) - (unless (zero? (apply system* (string-append "mkfs." type) - "-F" partition - `(,@(if label - `("-L" ,label) - '()) - ,@(if uuid - `("-U" ,(uuid->string uuid)) - '())))) - (error "failed to create partition"))) + (apply invoke (string-append "mkfs." type) + "-F" partition + `(,@(if label + `("-L" ,label) + '()) + ,@(if uuid + `("-U" ,(uuid->string uuid)) + '())))) (define* (create-fat-file-system partition #:key label uuid) @@ -282,11 +276,8 @@ (define* (create-fat-file-system partition volume name." ;; FIXME: UUID is ignored! (format #t "creating FAT partition...\n") - (unless (zero? (apply system* "mkfs.fat" partition - (if label - `("-n" ,label) - '()))) - (error "failed to create FAT partition"))) + (apply invoke "mkfs.fat" partition + (if label `("-n" ,label) '()))) (define* (format-partition partition type #:key label uuid) @@ -388,12 +379,11 @@ (define (install-efi grub esp config-file) (setenv "TMPDIR" esp) (mkdir-p efi-directory) - (unless (zero? (system* grub-mkstandalone "-O" (car efi-targets) - "-o" (string-append efi-directory "/" - (cdr efi-targets)) - ;; Graft the configuration file onto the image. - (string-append "boot/grub/grub.cfg=" config-file))) - (error "failed to create GRUB EFI image")))) + (invoke grub-mkstandalone "-O" (car efi-targets) + "-o" (string-append efi-directory "/" + (cdr efi-targets)) + ;; Graft the configuration file onto the image. + (string-append "boot/grub/grub.cfg=" config-file)))) (define* (make-iso9660-image grub config-file os-drv target #:key (volume-id "GuixSD_image") (volume-uuid #f) @@ -416,8 +406,8 @@ (define* (make-iso9660-image grub config-file os-drv target #:deduplicate? #f)) closures)) - (unless (zero? (apply system* - `(,grub-mkrescue "-o" ,target + (apply invoke + `(,grub-mkrescue "-o" ,target ,(string-append "boot/grub/grub.cfg=" config-file) ,(string-append "gnu/store=" os-drv "/..") "etc=/tmp/root/etc" @@ -435,8 +425,7 @@ (define* (make-iso9660-image grub config-file os-drv target (not (char=? #\- value))) (iso9660-uuid->string volume-uuid))) - `())))) - (error "failed to create ISO9660 image")))) + `()))))) (define* (initialize-hard-disk device #:key -- cgit v1.2.3 From dab03baa0a4d857edf8c5752e5dd8ecaab8862a7 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Thu, 15 Mar 2018 02:19:51 +0100 Subject: gnu: qtox: Wrap executable and fix misplaced comma (unquote). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (qtox)[arguments]: Add phase "wrap-executable". [inputs]: Fix misplaced comma (unquote). Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b6323c39b2..ae489e1586 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -874,10 +874,18 @@ (define-public qtox (("__DATE__") "\"\"") (("__TIME__") "\"\"") (("TIMESTAMP") "\"\"")) - #t))))) + #t)) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/qtox") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins/")))))))))) (inputs `(("ffmpeg" ,ffmpeg) - ("filteraudio", filteraudio) + ("filteraudio" ,filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) ("libsodium" ,libsodium) -- cgit v1.2.3 From 9c7e17fd61826506a06b2bf737ebd8bbcd0ce2b5 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Wed, 7 Mar 2018 18:28:24 -0600 Subject: gnu: Add ghc-aeson-1.1.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/idris.scm (ghc-aeson-1.1.2.0): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/idris.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 6eb940c9d5..ae90676d5c 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -30,6 +30,20 @@ (define-module (gnu packages idris) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) +(define ghc-aeson-1.1.2.0 + (package (inherit ghc-aeson) + (version "1.1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/aeson/aeson-" + version + ".tar.gz")) + (sha256 + (base32 + "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) + (define-public idris (package (name "idris") -- cgit v1.2.3 From 78dc985bee57eaaa45cb9b38c93c8ac4148e908d Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Wed, 7 Mar 2018 18:29:23 -0600 Subject: gnu: Add ghc-trifecta-1.6.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/idris.scm (ghc-trifecta-1.6.2.1): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/idris.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index ae90676d5c..b67fcbccfa 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -44,6 +44,19 @@ (define ghc-aeson-1.1.2.0 (base32 "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) +(define ghc-trifecta-1.6.2.1 + (package (inherit ghc-trifecta) + (version "1.6.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/trifecta/" + "trifecta-" version ".tar.gz")) + (sha256 + (base32 + "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs")))))) + (define-public idris (package (name "idris") -- cgit v1.2.3 From 866b19086e7f294261e694b228ff05ffb129296c Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Wed, 7 Mar 2018 18:31:22 -0600 Subject: gnu: Add ghc-cheapskate-0.1.0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/idris.scm (ghc-cheapskate-0.1.0.5): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/idris.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index b67fcbccfa..c103055f50 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -57,6 +57,25 @@ (define ghc-trifecta-1.6.2.1 (base32 "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs")))))) +;; ghc-cheapskate appeared too new. This follows LTS Haskell. +(define ghc-cheapskate-0.1.0.5 + (package + (inherit ghc-cheapskate) + (version "0.1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cheapskate/cheapskate-" + version + ".tar.gz")) + (sha256 + (base32 + "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs")))) + (arguments + ;; LTS Haskell says data-default >=0.5 && <0.8 + `(#:configure-flags (list "--allow-newer=data-default"))))) + (define-public idris (package (name "idris") -- cgit v1.2.3 From d661ed521eedf4663c57e5d96e409a32a52113e0 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Wed, 7 Mar 2018 18:32:19 -0600 Subject: gnu: idris: Provide the right versions of dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously it would fail to build. See . * gnu/packages/idris.scm (idris)[inputs]: alphebetize ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson, ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun, ghc-trifecta, and ghc-zlib. Signed-off-by: Ludovic Courtès --- gnu/packages/idris.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index c103055f50..79f89d6f54 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2017 David Craven +;;; Copyright © 2018 Alex ter Weele ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,15 +93,15 @@ (define-public idris (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("ghc-aeson" ,ghc-aeson) - ("ghc-async" ,ghc-async) + ("ghc-aeson" ,ghc-aeson-1.1.2.0) ("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-async" ,ghc-async) ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cheapskate" ,ghc-cheapskate) + ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5) ("ghc-code-page" ,ghc-code-page) ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) @@ -108,23 +109,18 @@ (define-public idris ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-parsers" ,ghc-parsers) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) ("ghc-split" ,ghc-split) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden) - ("ghc-tasty-rerun" ,ghc-tasty-rerun) ("ghc-terminal-size" ,ghc-terminal-size) ("ghc-text" ,ghc-text) - ("ghc-trifecta" ,ghc-trifecta) + ("ghc-trifecta" ,ghc-trifecta-1.6.2.1) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-vector-binary-instances" ,ghc-vector-binary-instances) ("ghc-vector" ,ghc-vector) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) + ("ghc-vector-binary-instances" ,ghc-vector-binary-instances) + ("ghc-zip-archive" ,ghc-zip-archive))) (arguments `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox. #:configure-flags -- cgit v1.2.3 From 8ab10c19d72caab7459034a6e72b0117d7c5cec8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Mar 2018 23:41:31 +0100 Subject: linux-initrd: Move 'check-device-initrd-modules' elsewhere. This mostly reverts ca23693d280de5c4031058da4d3041d830080484, which introduced a circular dependency between (gnu system linux-initrd) and (gnu system mapped-devices). Reported by Eric Bavier. * gnu/system/linux-initrd.scm (check-device-initrd-modules): Move to... * gnu/system/mapped-devices.scm (check-device-initrd-modules): ... here. * po/guix/POTFILES.in: Adjust accordingly. --- gnu/system/linux-initrd.scm | 46 +--------------------------------------- gnu/system/mapped-devices.scm | 49 +++++++++++++++++++++++++++++++++++++++++-- po/guix/POTFILES.in | 2 +- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 410484390c..e0cb59c009 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -24,7 +24,6 @@ (define-module (gnu system linux-initrd) #:use-module (guix store) #:use-module (guix gexp) #:use-module (guix utils) - #:use-module (guix i18n) #:use-module ((guix store) #:select (%store-prefix)) #:use-module ((guix derivations) @@ -38,22 +37,16 @@ (define-module (gnu system linux-initrd) #:select (%guile-static-stripped)) #:use-module (gnu system file-systems) #:use-module (gnu system mapped-devices) - #:autoload (gnu build linux-modules) - (device-module-aliases matching-modules known-module-aliases) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 vlist) - #:use-module (ice-9 format) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:export (expression->initrd %base-initrd-modules raw-initrd file-system-packages - base-initrd - check-device-initrd-modules)) + base-initrd)) ;;; Commentary: @@ -350,41 +343,4 @@ (define helper-packages #:volatile-root? volatile-root? #:on-error on-error)) -(define (check-device-initrd-modules device linux-modules location) - "Raise an error if DEVICE needs modules beyond LINUX-MODULES to operate. -DEVICE must be a \"/dev\" file name." - (define aliases - ;; Attempt to load 'modules.alias' from the current kernel, assuming we're - ;; on GuixSD, and assuming that corresponds to the kernel we'll be - ;; installing. Skip the whole thing if that file cannot be read. - (catch 'system-error - (lambda () - (known-module-aliases)) - (const #f))) - - (when aliases - (let ((modules (delete-duplicates - (append-map (cut matching-modules <> aliases) - (device-module-aliases device))))) - (unless (every (cute member <> linux-modules) modules) - (raise (condition - (&message - (message (format #f (G_ "you may need these modules \ -in the initrd for ~a:~{ ~a~}") - device modules))) - (&fix-hint - (hint (format #f (G_ "Try adding them to the -@code{initrd-modules} field of your @code{operating-system} declaration, along -these lines: - -@example - (operating-system - ;; @dots{} - (initrd-modules (append (list~{ ~s~}) - %base-initrd-modules))) -@end example\n") - modules))) - (&error-location - (location (source-properties->location location))))))))) - ;;; linux-initrd.scm ends here diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index e6ac635231..279d521cac 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -25,13 +25,14 @@ (define-module (gnu system mapped-devices) #:use-module (guix i18n) #:use-module ((guix utils) #:select (source-properties->location + &fix-hint &error-location)) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system uuid) - #:use-module ((gnu system linux-initrd) - #:select (check-device-initrd-modules)) #:autoload (gnu build file-systems) (find-partition-by-luks-uuid) + #:autoload (gnu build linux-modules) + (device-module-aliases matching-modules) #:autoload (gnu packages cryptsetup) (cryptsetup-static) #:autoload (gnu packages linux) (mdadm-static) #:use-module (srfi srfi-1) @@ -55,6 +56,8 @@ (define-module (gnu system mapped-devices) device-mapping-service-type device-mapping-service + check-device-initrd-modules ;XXX: needs a better place + luks-device-mapping raid-device-mapping)) @@ -106,6 +109,48 @@ (define (device-mapping-service mapped-device) "Return a service that sets up @var{mapped-device}." (service device-mapping-service-type mapped-device)) + +;;; +;;; Static checks. +;;; + +(define (check-device-initrd-modules device linux-modules location) + "Raise an error if DEVICE needs modules beyond LINUX-MODULES to operate. +DEVICE must be a \"/dev\" file name." + (define aliases + ;; Attempt to load 'modules.alias' from the current kernel, assuming we're + ;; on GuixSD, and assuming that corresponds to the kernel we'll be + ;; installing. Skip the whole thing if that file cannot be read. + (catch 'system-error + (lambda () + (known-module-aliases)) + (const #f))) + + (when aliases + (let ((modules (delete-duplicates + (append-map (cut matching-modules <> aliases) + (device-module-aliases device))))) + (unless (every (cute member <> linux-modules) modules) + (raise (condition + (&message + (message (format #f (G_ "you may need these modules \ +in the initrd for ~a:~{ ~a~}") + device modules))) + (&fix-hint + (hint (format #f (G_ "Try adding them to the +@code{initrd-modules} field of your @code{operating-system} declaration, along +these lines: + +@example + (operating-system + ;; @dots{} + (initrd-modules (append (list~{ ~s~}) + %base-initrd-modules))) +@end example\n") + modules))) + (&error-location + (location (source-properties->location location))))))))) + ;;; ;;; Common device mappings. diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index ba09605375..d11f408d42 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -5,7 +5,7 @@ gnu/packages.scm gnu/services.scm gnu/system.scm gnu/services/shepherd.scm -gnu/system/linux-initrd.scm +gnu/system/mapped-devices.scm gnu/system/shadow.scm guix/scripts.scm guix/scripts/build.scm -- cgit v1.2.3 From 570d79c8df49142a6b0a5bf6fcd120177459563a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Mar 2018 19:16:25 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.27. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.27. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b81cb55d6b..0b609e1d21 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,8 +392,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.26") -(define %linux-libre-4.14-hash "1m2zr17wpasg5riysbaa4g5i492jzr93py2jm088ki818s4a9cm3") +(define %linux-libre-4.14-version "4.14.27") +(define %linux-libre-4.14-hash "0mgkka9niyd0lj4qliy4v7jjh9lg1a5jwlv60yw7z0s4k7ajyyrp") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 8e4ce402693d6f6fb5bbb26d7907595948669350 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Mar 2018 19:17:22 -0400 Subject: gnu: linux-libre: Update to 4.15.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.10. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b609e1d21..bd6f005719 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; 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.9") -(define %linux-libre-hash "13lcard7i6w2c1cf9rfhvmq79xk4qp2p1c1920mfi69l20yvm572") +(define %linux-libre-version "4.15.10") +(define %linux-libre-hash "10fp8jmy0fxq8l01m1nnagpq1hznl9jmhcwknk8izjmdcb5snq6c") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From 3e5783e2920dfd78f10e0e3b160fb310c6c810ca Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Mar 2018 23:08:02 -0400 Subject: linux-initrd: Autoload known-module-aliases, again. Fixes a regression introduced in 8ab10c19d72caab7459034a6e72b0117d7c5cec8. * gnu/system/mapped-devices.scm: Autoload 'known-module-aliases'. --- gnu/system/mapped-devices.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index 279d521cac..a2cca0a93b 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Andreas Enge -;;; Copyright © 2017 Mark H Weaver +;;; Copyright © 2017, 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +32,7 @@ (define-module (gnu system mapped-devices) #:use-module (gnu system uuid) #:autoload (gnu build file-systems) (find-partition-by-luks-uuid) #:autoload (gnu build linux-modules) - (device-module-aliases matching-modules) + (device-module-aliases matching-modules known-module-aliases) #:autoload (gnu packages cryptsetup) (cryptsetup-static) #:autoload (gnu packages linux) (mdadm-static) #:use-module (srfi srfi-1) -- cgit v1.2.3 From b44437c5499c7eeb66c396bc1541fa4dcc4faf76 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Mar 2018 09:59:04 +0100 Subject: gnu: kentutils: Build with mariadb. * gnu/packages/bioinformatics.scm (kentutils)[inputs]: Replace mysql with mariadb. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3d754bfbfa..989e963c57 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11420,7 +11420,7 @@ (define-public kentutils ("tcsh" ,tcsh) ("perl" ,perl) ("libpng" ,libpng) - ("mysql" ,mysql) + ("mariadb" ,mariadb) ("openssl" ,openssl))) (home-page "http://genome.cse.ucsc.edu/index.html") (synopsis "Assorted bioinformatics utilities") -- cgit v1.2.3 From 46264c73a6364e0510cbe6841a135da5d7f29dfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Mar 2018 10:59:17 +0100 Subject: gnu: Add pigx-scrnaseq. * gnu/packages/bioinformatics.scm (pigx-scrnaseq): New variable. --- gnu/packages/bioinformatics.scm | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 989e963c57..1b49cfdfbf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12857,6 +12857,83 @@ (define-public pigx-bsseq methylation and segmentation.") (license license:gpl3+))) +(define-public pigx-scrnaseq + (package + (name "pigx-scrnaseq") + (version "0.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/" + "releases/download/v" version + "/pigx_scrnaseq-" version ".tar.gz")) + (sha256 + (base32 + "03gwp83823ji59y6nvyz89i4yd3faaqpc3791qia71i91470vfsg")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "PICARDJAR=" (assoc-ref %build-inputs "java-picard") + "/share/java/picard.jar") + (string-append "DROPSEQJAR=" (assoc-ref %build-inputs "dropseq-tools") + "/share/java/dropseq.jar")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + ;; Make sure the executable finds all R modules. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/pigx-scrnaseq") + `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) + `("PYTHONPATH" ":" = (,(getenv "PYTHONPATH"))))) + #t))))) + (inputs + `(("dropseq-tools" ,dropseq-tools) + ("fastqc" ,fastqc) + ("java-picard" ,java-picard) + ("java" ,icedtea-8) + ("python-wrapper" ,python-wrapper) + ("python-pyyaml" ,python-pyyaml) + ("python-pandas" ,python-pandas) + ("python-numpy" ,python-numpy) + ("python-loompy" ,python-loompy) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) + ("snakemake" ,snakemake) + ("star" ,star) + ("r-minimal" ,r-minimal) + ("r-argparser" ,r-argparser) + ("r-cowplot" ,r-cowplot) + ("r-data-table" ,r-data-table) + ("r-delayedarray" ,r-delayedarray) + ("r-delayedmatrixstats" ,r-delayedmatrixstats) + ("r-dplyr" ,r-dplyr) + ("r-dropbead" ,r-dropbead) + ("r-dt" ,r-dt) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicfiles" ,r-genomicfiles) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-hdf5array" ,r-hdf5array) + ("r-pheatmap" ,r-pheatmap) + ("r-rmarkdown" ,r-rmarkdown) + ("r-rsamtools" ,r-rsamtools) + ("r-rtracklayer" ,r-rtracklayer) + ("r-rtsne" ,r-rtsne) + ("r-scater" ,r-scater) + ("r-scran" ,r-scran) + ("r-singlecellexperiment" ,r-singlecellexperiment) + ("r-stringr" ,r-stringr) + ("r-yaml" ,r-yaml))) + (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (synopsis "Analysis pipeline for single-cell RNA sequencing experiments") + (description "PiGX scRNAseq is an analysis pipeline for preprocessing and +quality control for single cell RNA sequencing experiments. The inputs are +read files from the sequencing experiment, and a configuration file which +describes the experiment. It produces processed files for downstream analysis +and interactive quality reports. The pipeline is designed to work with UMI +based methods.") + (license license:gpl3+))) + (define-public r-diversitree (package (name "r-diversitree") -- cgit v1.2.3 From 22d628148ce857b620f5b8e48dc7cabe004313c5 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 16 Mar 2018 13:11:09 +0100 Subject: gnu: Add emacs-exec-path-from-shell. * gnu/packages/emacs.scm (emacs-exec-path-from-shell): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c2c162c75c..fbdde863c7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7361,3 +7361,28 @@ (define-public emacs-terraform-mode @uref{https://www.terraform.io/, Terraform} configuration files. Most of the functionality is inherited from @code{hcl-mode}.") (license license:gpl3+))) + +(define-public emacs-exec-path-from-shell + (package + (name "emacs-exec-path-from-shell") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "https://stable.melpa.org/packages/exec-path-from-shell-" + version ".el")) + (sha256 + (base32 + "03qjgb81cq1l3j54lvlf98r75vmmgd06mj6qh5wa6mz4xzp4w26r")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/exec-path-from-shell") + (synopsis "Get environment variables such as @var{PATH} from the shell") + (description + "This library allows the user to set Emacs @var{exec-path} and @var{PATH} +from the shell @var{PATH}, so that @code{shell-command}, @code{compile} and +the like work as expected on systems on which Emacs is not guaranteed to +inherit a login shell's environment variables. It also allows other +environment variables to be retrieved from the shell, so that Emacs will see +the same values you get in a terminal.") + (license license:gpl3+))) -- cgit v1.2.3 From 5d818b3557cc3b546d5bd0639359c14c7c0ab685 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 16 Mar 2018 13:10:28 +0100 Subject: gnu: Add emacs-deft. * gnu/packages/emacs.scm (emacs-deft): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fbdde863c7..a6c674dfb2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7386,3 +7386,23 @@ (define-public emacs-exec-path-from-shell environment variables to be retrieved from the shell, so that Emacs will see the same values you get in a terminal.") (license license:gpl3+))) + +(define-public emacs-deft + (package + (name "emacs-deft") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://stable.melpa.org/packages/deft-" + version ".el")) + (sha256 + (base32 + "1vb9cjxskc7c0yyf9pvxy1fzypg1vrcgwnjz0m3hslinsgdyig58")))) + (build-system emacs-build-system) + (home-page "https://jblevins.org/projects/deft/") + (synopsis "Quickly browse, filter, and edit plain text notes") + (description + "Deft is an Emacs mode for quickly browsing, filtering, and editing +directories of plain text notes, inspired by Notational Velocity.") + (license license:bsd-3))) -- cgit v1.2.3 From 77166eb758ff565837db9e9a26d34ba9aaa16281 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Mar 2018 13:57:48 -0400 Subject: gnu: util-linux: Fix CVE-2018-7738. * gnu/packages/patches/util-linux-CVE-2018-7738.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (util-linux)[replacement]: New field. (util-linux/fixed): New variable. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 10 +++++ .../patches/util-linux-CVE-2018-7738.patch | 49 ++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 gnu/packages/patches/util-linux-CVE-2018-7738.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69e4d2b7b5..788b260e5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1135,6 +1135,7 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-overflow-long-fsize.patch \ %D%/packages/patches/unzip-remove-build-date.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ + %D%/packages/patches/util-linux-CVE-2018-7738.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bd6f005719..df6d7468ac 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -547,6 +547,7 @@ (define-public psmisc (define-public util-linux (package (name "util-linux") + (replacement util-linux/fixed) (version "2.31") (source (origin (method url-fetch) @@ -634,6 +635,15 @@ (define-public util-linux (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+ license:bsd-4 license:public-domain)))) +(define util-linux/fixed + (package + (inherit util-linux) + (source + (origin + (inherit (package-source util-linux)) + (patches (append (origin-patches (package-source util-linux)) + (search-patches "util-linux-CVE-2018-7738.patch"))))))) + (define-public ddate (package (name "ddate") diff --git a/gnu/packages/patches/util-linux-CVE-2018-7738.patch b/gnu/packages/patches/util-linux-CVE-2018-7738.patch new file mode 100644 index 0000000000..080e2f56ba --- /dev/null +++ b/gnu/packages/patches/util-linux-CVE-2018-7738.patch @@ -0,0 +1,49 @@ +Fix CVE-2018-7738: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7738 + +Patch copied from upstream source repository: + +https://github.com/karelzak/util-linux/commit/75f03badd7ed9f1dd951863d75e756883d3acc55 + +From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 16 Nov 2017 16:27:32 +0100 +Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in + paths + + # mount /dev/sdc1 /mnt/test/foo\ bar + # umount + +has to return "/mnt/test/foo\ bar". + +Changes: + + * don't use mount | awk output, we have findmnt + * force compgen use \n as entries separator + +Addresses: https://github.com/karelzak/util-linux/issues/539 +Signed-off-by: Karel Zak +--- + bash-completion/umount | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/bash-completion/umount b/bash-completion/umount +index d76cb9fff..98c90d61a 100644 +--- a/bash-completion/umount ++++ b/bash-completion/umount +@@ -40,9 +40,10 @@ _umount_module() + return 0 + ;; + esac +- local DEVS_MPOINTS +- DEVS_MPOINTS="$(mount | awk '{print $1, $3}')" +- COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) ) +- return 0 ++ ++ local oldifs=$IFS ++ IFS=$'\n' ++ COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) ) ++ IFS=$oldifs + } + complete -F _umount_module umount -- cgit v1.2.3 From fe52a215e53514d1857131e3a75104a081e415b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Mar 2018 15:03:02 +0100 Subject: gnu: pigx-rnaseq: Disable memory hungry test. * gnu/packages/bioinformatics.scm (pigx-rnaseq)[arguments]: Add phase to disable a memory hungry test. --- gnu/packages/bioinformatics.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1b49cfdfbf..fa4a4957b7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12677,6 +12677,13 @@ (define-public pigx-rnaseq `(#:parallel-tests? #f ; not supported #:phases (modify-phases %standard-phases + ;; "test.sh" runs STAR, which requires excessive amounts of memory. + (add-after 'unpack 'disable-resource-intensive-test + (lambda _ + (substitute* "Makefile.in" + (("(^ tests/test_trim_galore/test.sh).*" _ m) m) + (("^ test.sh") "")) + #t)) (add-after 'install 'wrap-executable ;; Make sure the executable finds all R modules. (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From c1c9cc664b600b1de7557e44a67471ef1556f793 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Mar 2018 15:40:01 +0100 Subject: gnu: Add pigx. * gnu/packages/bioinformatics.scm (pigx): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fa4a4957b7..78754793a5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12941,6 +12941,42 @@ (define-public pigx-scrnaseq based methods.") (license license:gpl3+))) +(define-public pigx + (package + (name "pigx") + (version "0.0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/BIMSBbioinfo/pigx/" + "releases/download/v" version + "/pigx-" version ".tar.gz")) + (sha256 + (base32 + "1nxb2hbp40yg3j7n56k4dhsd2fl1j8g0wpiiln56prqzljwnlgmf")))) + (build-system gnu-build-system) + (inputs + `(("python" ,python) + ("pigx-bsseq" ,pigx-bsseq) + ("pigx-chipseq" ,pigx-chipseq) + ("pigx-rnaseq" ,pigx-rnaseq) + ("pigx-scrnaseq" ,pigx-scrnaseq))) + (home-page "http://bioinformatics.mdc-berlin.de/pigx/") + (synopsis "Analysis pipelines for genomics") + (description "PiGx is a collection of genomics pipelines. It includes the +following pipelines: + +@itemize +@item PiGx BSseq for raw fastq read data of bisulfite experiments +@item PiGx RNAseq for RNAseq samples +@item PiGx scRNAseq for single cell dropseq analysis +@item PiGx ChIPseq for reads from ChIPseq experiments +@end itemize + +All pipelines are easily configured with a simple sample sheet and a +descriptive settings file. The result is a set of comprehensive, interactive +HTML reports with interesting findings about your samples.") + (license license:gpl3+))) + (define-public r-diversitree (package (name "r-diversitree") -- cgit v1.2.3 From 7f6485e70c9c5f1a35e81dc746a45c68f9319618 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Mar 2018 14:14:17 -0400 Subject: gnu: icedtea@2: Update to 2.6.13 [security fixes]. Fixes CVE-2018-{2579,2588,2599,2602,2603,2618,2629,2633,2634,2637,2641,2663, 2677,2678}. * gnu/packages/java.scm (icedtea-7): Update to 2.6.13. --- gnu/packages/java.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 521293da48..6782eaf5e6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1074,7 +1074,7 @@ (define-public icedtea-6 (license license:gpl2+))) (define-public icedtea-7 - (let* ((version "2.6.12") + (let* ((version "2.6.13") (drop (lambda (name hash) (origin (method url-fetch) @@ -1092,7 +1092,7 @@ (define-public icedtea-7 version ".tar.xz")) (sha256 (base32 - "0s0zh0mj1sab99kb516lsgq3859vsc951phc565gwix4l5g9zppk")) + "1w331rdqx1dcx2xb0fmjmrkdc71xqn20fxsgw8by4xhiblh88khh")) (modules '((guix build utils))) (snippet '(substitute* "Makefile.in" @@ -1502,25 +1502,25 @@ (define (import-cert cert) (native-inputs `(("openjdk-src" ,(drop "openjdk" - "15qf3nfidgnigh2zny6djfp8bhfwjnwk9i06mxs2jbq6na953ql2")) + "0l34ikyf62hbzlf9032alzkkqvf7bpmckz4gvirvph755w7gka8l")) ("corba-drop" ,(drop "corba" - "1phvn8fyl5mw2n2sn97f17nm442k75xsz2023bfw4h66ywzkqhqy")) + "050gv2jbg1pi6qkn8w18bwpbklfa5b0kymjvan9pncddbj8m84fz")) ("jaxp-drop" ,(drop "jaxp" - "0j4ms6lmnfa2cwfh9yfqdfg1bnn3fc40ay4x6k8zqa8yvspik5w5")) + "1k6yldwnxfzdg5926r1nlfv8d1r1j7rlp2nkz6gqh05vgyamnfhl")) ("jaxws-drop" ,(drop "jaxws" - "09sddj73k7n29s39hvdk14r130mvlknbxkpd2w58f34sq5sgpdrg")) + "110j7jlz47x2gg6f7653x12mssan5kvj9l9h1m1c8c92drfxbqyk")) ("jdk-drop" ,(drop "jdk" - "0q896zz8wyswmksy225q1k27nz3v3l27052dcvvpv20ryykz8yp7")) + "0d1mca38ksxvdskp9im3pp7fdijhj1n3lwq9w13r9s4v3qyskgdd")) ("langtools-drop" ,(drop "langtools" - "0niicyfccim4a9is4akh87jd7wbl8jrazdaab957mcv9l1x3bnqc")) + "0nq5236fzxn3p6x8cgncl56mzcmsj07q9gymysnws4c8byc6n0qj")) ("hotspot-drop" ,(drop "hotspot" - "1jw42qhbm3wfavk39304m53lmqipcllrvjqiab2f42mjs10i8gfx")) + "17bdv39n4lh8l5737c96f3xgamx4y305m067p01cywgp7zaddqws")) ("ant" ,ant-bootstrap) ("attr" ,attr) ("coreutils" ,coreutils) -- cgit v1.2.3 From 1d97d8ffd8531696b1a651419aa9e106b09bb615 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Mar 2018 14:16:45 -0400 Subject: gnu: icedtea@3: Update to 3.7.0 [security fixes]. Fixes CVE-2018-{2579,2582,2588,2599,2602,2603,2618,2629,2633,2634,2637,2641, 2663,2677,2678}. * gnu/packages/java.scm (icedtea-8): Update to 3.7.0. --- gnu/packages/java.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6782eaf5e6..5771366f66 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1570,7 +1570,7 @@ (define (import-cert cert) (license license:gpl2+)))) (define-public icedtea-8 - (let* ((version "3.6.0") + (let* ((version "3.7.0") (drop (lambda (name hash) (origin (method url-fetch) @@ -1579,7 +1579,7 @@ (define-public icedtea-8 "/icedtea8/" version "/" name ".tar.xz")) (sha256 (base32 hash)))))) (package (inherit icedtea-7) - (version "3.6.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append @@ -1587,7 +1587,7 @@ (define-public icedtea-8 version ".tar.xz")) (sha256 (base32 - "0zj192zrrxqh6j1ywc3399gk2ycay9w8pvzcvvr2kvdkb37ak86h")) + "09yqzn8rpccs7cyv89hhy5zlznpgqw5x3jz0w1ccp0cz1vgs8l5w")) (modules '((guix build utils))) (snippet '(begin @@ -1689,34 +1689,34 @@ (define-public icedtea-8 `(("jdk" ,icedtea-7 "jdk") ("openjdk-src" ,(drop "openjdk" - "0mqxh81kq05z4wydkik0yrr81ibf84xmwsdcw9n2gfrzs4f5jxnb")) + "1mj6xgmw31i6qd30qi9dmv7160fbcfq5ikz1jwjihdg2793il19p")) ("aarch32-drop" ,(drop "aarch32" - "0b207g2n6kn510zf5vwh58bsxgqrmkvrna4p20r74v9cwcwx83n2")) + "1wb8k5zm40zld0986dvmlh5xh3gyixbg9h26sl662zy92amhmyyg")) ("corba-drop" ,(drop "corba" - "0qinc1q4w01nkr9klhfyd8caxvyrrfxjrz32nd7kgyja2bj8x7dd")) + "11ma4zz0599cy70xd219v7a8vin7p96xrhhz3wsaw6cjhkzpagah")) ("jaxp-drop" ,(drop "jaxp" - "07azrp3g86vk2laybmr5xfn0yrljkxs0rlm1q48385br225bgdxi")) + "14m1y0z0fbm5z5zjw3vnq85py8dma84bi3f9cw8rhdyc6skk8q4i")) ("jaxws-drop" ,(drop "jaxws" - "018fd2hq57zp3pq06wlxy5pabqcyk36xi8hk0d6xk3a90wsjvyik")) + "09andnm6xaasnp963hgx42yiflifiljp9z7z85jrfyc5z8a5whmf")) ("jdk-drop" ,(drop "jdk" - "0vs488kq5j2cc6kplc78jbhfxwq4fn06l34xrbq4d6y17777arg8")) + "0s6lcpc0zckz2fnq98aqf28nz9y3wbi41a3kyaqqa2abwbkm1zwl")) ("langtools-drop" ,(drop "langtools" - "04f6d1wvck5jrpvrcw5gsbzxnihcry9zrf1v85czdm959q21zv9c")) + "15wizy123vhk40chl1b4p552jf2pw2hdww0myf11qab425axz4nw")) ("hotspot-drop" ,(drop "hotspot" - "1mfgpzyr6zzy9klf8nn3z6d41fydb9ghpfpqzjq3cl95axfbdl1g")) + "1ciz1w9j0kz7s1dxdhyqq71nla9icyz6qvn0b9z2zgkklqa98qmm")) ("nashorn-drop" ,(drop "nashorn" - "1a26cmzbs50gkh4rmmmxls7zljx62vfp1wq02gsfd5jqs4xvlibj")) + "19pzl3ppaw8j6r5cnyp8qiw3hxijh3hdc46l39g5yfhdl4pr4hpa")) ("shenandoah-drop" ,(drop "shenandoah" - "11hmn9mwmvryfddcanzx3qffjm8bbiv18nwv3iy9cswrvxjy010f")) + "0k33anxdzw1icn072wynfmmdjhsv50hay0j1sfkfxny12rb3vgdy")) ,@(fold alist-delete (package-native-inputs icedtea-7) '("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop" "jdk-drop" "langtools-drop" "hotspot-drop"))))))) -- cgit v1.2.3 From fe1b04df2f9dc2eb35b2bd70dd0651553384f97c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Mar 2018 19:27:43 +0100 Subject: gnu: libvorbis: Replace with 1.3.6 [fixes CVE-2018-5146]. * gnu/packages/xiph.scm (libvorbis)[replacement]: New field. (libvorbis-1.3.6): New public variable. --- gnu/packages/xiph.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index a8e7833990..2e922d2a95 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017 Efraim Flashner -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -81,6 +81,7 @@ (define libvorbis (package (name "libvorbis") (version "1.3.5") + (replacement libvorbis-1.3.6) (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/vorbis/" @@ -105,6 +106,18 @@ (define libvorbis "See COPYING in the distribution.")) (home-page "https://xiph.org/vorbis/"))) +;; For CVE-2018-5146. +(define-public libvorbis-1.3.6 + (package/inherit libvorbis + (version "1.3.6") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/vorbis/" + "libvorbis-" version ".tar.xz")) + (sha256 + (base32 + "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g")))))) + (define libtheora (package (name "libtheora") -- cgit v1.2.3 From 593681f613816a046ea3c0dd17b11d72bb8275ec Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Mar 2018 21:16:51 +0100 Subject: gnu: Add python2-libadalang. * gnu/packages/ada.scm (python2-libadalang): New variable. --- gnu/packages/ada.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm index d6cd1e9787..d60723edfa 100644 --- a/gnu/packages/ada.scm +++ b/gnu/packages/ada.scm @@ -59,3 +59,43 @@ (define-public python2-langkit Ada library with bindings for the C and Python programming languages.") (home-page "https://github.com/AdaCore/langkit/") (license license:gpl3+)))) ; and gcc runtime library exception + +(define-public python2-libadalang + (let ((commit "9b205e9bacdd50a68117727332e16fbef5f6ac49") + (revision "0")) + (package + (name "python2-libadalang") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AdaCore/libadalang.git") + (commit commit))) + (sha256 + (base32 + "06hsnzj2syqpq2yhg1bb0zil7ydbyqkdmkjbf8j9b5sdgkyh5xrp")) + (file-name (string-append name "-" version "-checkout")))) + (build-system python-build-system) + (native-inputs + `(("python2-langkit" ,python2-langkit) + ("python2-quex" ,python2-quex-0.67.3))) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "python2" "ada/manage.py" "generate") + (invoke "python2" "ada/manage.py" "build"))) + (replace 'check + (lambda _ + (invoke "python2" "ada/manage.py" "test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (invoke "python2" "ada/manage.py" "install" out))))))) + (synopsis "Semantic Analysis for Ada in Python") + (description "@code{libadalang} provides a high-performance semantic +engine for the Ada programming language.") + (home-page "https://github.com/AdaCore/libadalang") + (license license:gpl3)))) ; and gcc runtime gcc lib exception -- cgit v1.2.3 From 363be0c6db8f70be8f1b17a6003fa949c3d7104a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 16 Mar 2018 22:59:28 +0100 Subject: vm: Pass "-append ..." only once. * gnu/build/vm.scm (load-in-linux-vm): Pass "-append ..." only once. --- gnu/build/vm.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 7817507269..7f6801b9dd 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -147,8 +147,6 @@ (define arch-specific-flags ",security_model=none,mount_tag=xchg") "-kernel" linux "-initrd" initrd - "-append" (string-append "console=ttyS0 --load=" - builder) (append (if make-disk-image? `("-device" "virtio-blk,drive=myhd" -- cgit v1.2.3 From 68376f6c88865066ffa196937b4c41076d6e1044 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 17 Mar 2018 04:58:18 +0530 Subject: gnu: inkscape: Build with potrace support. From Inkscape 0.92, potrace is required for the Paintbucket and Trace Bitmap tools. * gnu/packages/inkscape.scm (inkscape)[inputs]: Add potrace. --- gnu/packages/inkscape.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1e98369ea3..ffd5f60b38 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -68,6 +68,7 @@ (define-public inkscape ("libgc" ,libgc) ("freetype" ,freetype) ("popt" ,popt) + ("potrace" ,potrace) ("python" ,python-2) ("lcms" ,lcms) ("boost" ,boost))) -- cgit v1.2.3 From 9f375a4c0f55238614e047448c8e878b9829f918 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 17 Mar 2018 00:42:15 -0400 Subject: gnu: intel-gpu-tools: Supported only on x86_64-linux and i686-linux. * gnu/packages/admin.scm (intel-gpu-tools)[supported-systems]: New field. --- gnu/packages/admin.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3f13210a60..8f48e42fec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2244,6 +2244,7 @@ (define-public intel-gpu-tools environments to get useful results. Therefore, Intel GPU Tools includes low-level tools and tests specifically for development and testing of the Intel DRM Driver.") + (supported-systems '("i686-linux" "x86_64-linux")) (license license:expat))) (define-public fabric -- cgit v1.2.3 From e72077c5356e2db21002b351a7a79901232a2d3b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 17 Mar 2018 04:02:25 -0400 Subject: download: Remove TU Wien mirror. * guix/download.scm (%mirrors): Remove gd.tuwien.ac.at, which no longer seems to exist. --- guix/download.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/guix/download.scm b/guix/download.scm index 55da2c1d37..5044534bf5 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -66,7 +66,6 @@ (define %mirrors "ftp://gcc.gnu.org/pub/gcc/" ,@(map (cut string-append <> "/gcc") gnu-mirrors)) (gnupg - "http://gd.tuwien.ac.at/privacy/gnupg/" "http://artfiles.org/gnupg.org" "http://www.crysys.hu/" "https://gnupg.org/ftp/gcrypt/" @@ -143,7 +142,6 @@ (define %mirrors "http://apache.belnet.be/" "http://mirrors.ircam.fr/pub/apache/" "http://apache-mirror.rbc.ru/pub/apache/" - "ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/" ;; As a last resort, try the archive. "http://archive.apache.org/dist/") @@ -163,7 +161,6 @@ (define %mirrors "ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.x.org/" "ftp://ftp.portal-to-web.de/pub/mirrors/x.org/" "ftp://ftp.solnet.ch/mirror/x.org/" - "ftp://gd.tuwien.ac.at/X11/" "ftp://mi.mirror.garr.it/mirrors/x.org/" "ftp://mirror.cict.fr/x.org/" "ftp://mirror.switch.ch/mirror/X11/" -- cgit v1.2.3 From 4fd09720eed9e0ed314e9a251592d1e3ba2bfd95 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 17 Mar 2018 13:34:38 +0100 Subject: gnu: wine-staging-patchset-data: Update to 3.4. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.4. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 0327deaf24..07a1244f2e 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -221,7 +221,7 @@ (define-public wine64 (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.3") + (version "3.4") (source (origin (method url-fetch) @@ -230,7 +230,7 @@ (define-public wine-staging-patchset-data (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "16l28vrhqn27kipqwms622jz1prfky8qkjb8pj747k3qjnm2k1g9")))) + "00yzh9bqs2rjgvk78xv3gfkbv4f2bkch9vb1ii4xh883f7wvkz93")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 732a148995ada989a3e96b460e2a159acf43b373 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 17 Mar 2018 15:01:35 +0100 Subject: gnu: wine-staging: Update to 3.4. * gnu/packages/wine.scm (wine-staging): Update to 3.4. --- gnu/packages/wine.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 07a1244f2e..37d36cf922 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -270,12 +270,13 @@ (define-public wine-staging (source (origin (method url-fetch) (uri (string-append - "https://dl.winehq.org/wine/source/3.x/wine-" version - ".tar.xz")) + "https://dl.winehq.org/wine/source/" + (version-major version) ".x" + "/wine-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505")))) + "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+", gtk+) ("libva", libva) -- cgit v1.2.3 From 3bd840e406733694dd240496e1132b8676346d4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 04:43:08 +0100 Subject: gnu: Fix more ‘filesystem’ spellings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-pyinotify)[description]: Spell ‘file system’ as ‘file system’. * gnu/packages/syncthing.scm (go-github-com-zillode-notify)[synopsis]: Likewise. (go-github-com-prometheus-procfs)[description]: Likewise. Minorly tweak grammar. --- gnu/packages/python.scm | 2 +- gnu/packages/syncthing.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 135ea29706..8107c0acfa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12988,7 +12988,7 @@ (define-public python-pyinotify (synopsis "Python library for monitoring inotify events") (description "@code{pyinotify} provides a Python interface for monitoring -filesystem events on Linux.") +file system events on Linux.") (license license:expat))) (define-public python2-pyinotify diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6c3792b92f..04f258481e 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1692,7 +1692,7 @@ (define-public go-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 "Filesystem event notification library") + (synopsis "File system event notification library") (description "This package provides @code{notify}, a file system event notification library in Go.") (home-page "https://github.com/zillode/notify") @@ -1871,8 +1871,8 @@ (define-public go-github-com-prometheus-procfs (arguments '(#:import-path "github.com/prometheus/procfs")) (synopsis "Go library for reading @file{/proc}") - (description "This Go package @code{procfs} provides functions to retrieve -system, kernel and process metrics from the pseudo-filesystem @file{/proc}.") + (description "The @code{procfs} Go package provides functions to retrieve +system, kernel, and process metrics from the @file{/proc} pseudo file system.") (home-page "https://github.com/prometheus/procfs") (license asl2.0)))) -- cgit v1.2.3 From 111c25fd13e02eed7dd038834730862b7dbfc8a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 04:45:55 +0100 Subject: gnu: perl-date-manip: Update to 6.70. * gnu/packages/perl.scm (perl-date-manip): Update to 6.70. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cf9f21dbc9..e6a656c7b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2043,7 +2043,7 @@ (define-public perl-date-calc-xs (define-public perl-date-manip (package (name "perl-date-manip") - (version "6.50") + (version "6.70") (source (origin (method url-fetch) @@ -2051,7 +2051,7 @@ (define-public perl-date-manip "Date-Manip-" version ".tar.gz")) (sha256 (base32 - "0zd0wbf91i49753rnf7m1lw197hdl5r97mxy0n43zdmcmhvkb3qq")))) + "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments -- cgit v1.2.3 From 93e8731dcb60538183ecc6780ce68165deadfb8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 20:12:54 +0100 Subject: gnu: perl-sql-abstract: Update to 1.85. * gnu/packages/databases.scm (perl-sql-abstract): Update to 1.85. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ab8729bde0..58da1f7a90 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1359,7 +1359,7 @@ (define-public perl-dbd-sqlite (define-public perl-sql-abstract (package (name "perl-sql-abstract") - (version "1.84") + (version "1.85") (source (origin (method url-fetch) @@ -1367,7 +1367,7 @@ (define-public perl-sql-abstract "SQL-Abstract-" version ".tar.gz")) (sha256 (base32 - "0xayvgv6nic61jm3nhg41rzwgm8h83wfyazvpaks0z7asjillpv5")))) + "1aycggrvppy2zgkwwn85jkdz93n5gsx4dambrjk67k5067hayi4z")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) -- cgit v1.2.3 From d062957a8797d1bd6cc44bdc94259051f42afaab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Mar 2018 20:29:14 +0100 Subject: gnu: Use HTTPS for r-project.org home pages. * gnu/packages/cran.scm (r-performanceanalytics, r-qap, r-gclus, r-leaps) (r-splus2r, r-ifultools, r-sapa, r-quantmod, r-tseries, r-wmtsa, r-fractal) (r-urca, r-trend, r-expm, r-complexplus, r-powerplus, r-signal, r-abind) (r-prroc)[home-page]: Use HTTPS. * gnu/packages/emacs.scm (emacs-ess)[home-page]: Likewise. * gnu/packages/graph.scm (r-diffusionmap)[home-page]: Likewise. * gnu/packages/statistics.scm (r-minimal, r-quantreg)[home-page]: Likewise. --- gnu/packages/cran.scm | 38 +++++++++++++++++++------------------- gnu/packages/emacs.scm | 2 +- gnu/packages/graph.scm | 2 +- gnu/packages/statistics.scm | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9b045c122f..717fa7fdfa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1679,7 +1679,7 @@ (define-public r-performanceanalytics `(("r-quadprog" ,r-quadprog) ("r-xts" ,r-xts) ("r-zoo" ,r-zoo))) - (home-page "http://r-forge.r-project.org/projects/returnanalytics/") + (home-page "https://r-forge.r-project.org/projects/returnanalytics/") (synopsis "Econometric tools for performance and risk analysis") (description "This is a collection of econometric functions for performance and risk analysis. This package aims to aid practitioners and @@ -1996,7 +1996,7 @@ (define-public r-qap "0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/qap/") + (home-page "https://cran.r-project.org/web/packages/qap/") (synopsis "Heuristics for the quadratic assignment problem (QAP)") (description "This package implements heuristics for the @dfn{quadratic assignment problem} (QAP). Currently only a simulated annealing heuristic is @@ -2016,7 +2016,7 @@ (define-public r-gclus "02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster))) - (home-page "http://cran.r-project.org/web/packages/gclus/") + (home-page "https://cran.r-project.org/web/packages/gclus/") (synopsis "Clustering graphics") (description "This package orders panels in scatterplot matrices and parallel coordinate displays by some merit index. It contains various indices @@ -2355,7 +2355,7 @@ (define-public r-leaps "11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/leaps/") + (home-page "https://cran.r-project.org/web/packages/leaps/") (synopsis "Regression subset selection") (description "This package provides tools for regression subset selection, including @@ -2376,7 +2376,7 @@ (define-public r-splus2r (properties `((upstream-name . "splus2R"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/splus2R/") + (home-page "https://cran.r-project.org/web/packages/splus2R/") (synopsis "Supplemental S-PLUS functionality in R") (description "Currently there are many functions in S-PLUS that are missing in R. To @@ -2399,7 +2399,7 @@ (define-public r-ifultools (propagated-inputs `(("r-mass" ,r-mass) ("r-splus2r" ,r-splus2r))) - (home-page "http://cran.r-project.org/web/packages/ifultools/") + (home-page "https://cran.r-project.org/web/packages/ifultools/") (synopsis "Insightful research tools") (description "This package provides C code used by the wmtsa, fractal, and sapa R packages.") @@ -2420,7 +2420,7 @@ (define-public r-sapa (propagated-inputs `(("r-ifultools" ,r-ifultools) ("r-splus2r" ,r-splus2r))) - (home-page "http://cran.r-project.org/web/packages/sapa/") + (home-page "https://cran.r-project.org/web/packages/sapa/") (synopsis "Spectral analysis for physical applications") (description "This package provides software for the book Spectral Analysis for Physical Applications, Donald B. Percival and Andrew T. Walden, @@ -2444,7 +2444,7 @@ (define-public r-quantmod ("r-ttr" ,r-ttr) ("r-xts" ,r-xts) ("r-zoo" ,r-zoo))) - (home-page "http://cran.r-project.org/web/packages/quantmod/") + (home-page "https://cran.r-project.org/web/packages/quantmod/") (synopsis "Quantitative financial modelling framework") (description "This package provides a quantitative financial modelling framework to allow users to specify, build, trade, and analyse quantitative @@ -2469,7 +2469,7 @@ (define-public r-tseries ("r-zoo" ,r-zoo))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/tseries/") + (home-page "https://cran.r-project.org/web/packages/tseries/") (synopsis "Time series analysis and computational finance") (description "This package provides functions relating to time series analysis and @@ -2492,7 +2492,7 @@ (define-public r-wmtsa `(("r-ifultools" ,r-ifultools) ("r-mass" ,r-mass) ("r-splus2r" ,r-splus2r))) - (home-page "http://cran.r-project.org/web/packages/wmtsa/") + (home-page "https://cran.r-project.org/web/packages/wmtsa/") (synopsis "Wavelet methods for time series analysis") (description "This package provides software to accompany the book \"Wavelet Methods @@ -2568,7 +2568,7 @@ (define-public r-fractal ("r-scatterplot3d" ,r-scatterplot3d) ("r-splus2r" ,r-splus2r) ("r-wmtsa" ,r-wmtsa))) - (home-page "http://cran.r-project.org/web/packages/fractal/") + (home-page "https://cran.r-project.org/web/packages/fractal/") (synopsis "Fractal time series modeling and analysis") (description "This package provides tools for stochastic fractal and deterministic @@ -2589,7 +2589,7 @@ (define-public r-urca (build-system r-build-system) (propagated-inputs `(("r-nlme" ,r-nlme))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/urca/") + (home-page "https://cran.r-project.org/web/packages/urca/") (synopsis "Unit root and cointegration tests for time series data") (description "This package provides unit root and cointegration tests encountered in @@ -2637,7 +2637,7 @@ (define-public r-trend `(("r-extradistr" ,r-extradistr))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/trend/") + (home-page "https://cran.r-project.org/web/packages/trend/") (synopsis "Non-parametric trend tests and change-point detection") (description "The analysis of environmental data often requires the detection of @@ -2666,7 +2666,7 @@ (define-public r-expm (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://r-forge.r-project.org/projects/expm/") + (home-page "https://r-forge.r-project.org/projects/expm/") (synopsis "Tools for matrix exponentials and related quantities") (description "This package provides tools for the computation of the matrix @@ -2688,7 +2688,7 @@ (define-public r-complexplus (propagated-inputs `(("r-expm" ,r-expm) ("r-matrix" ,r-matrix))) - (home-page "http://cran.r-project.org/web/packages/complexplus/") + (home-page "https://cran.r-project.org/web/packages/complexplus/") (synopsis "Functions of complex or real variables") (description "This package extends several functions to the complex domain, including @@ -2759,7 +2759,7 @@ (define-public r-powerplus ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) ("r-phontools" ,r-phontools))) - (home-page "http://cran.r-project.org/web/packages/powerplus/") + (home-page "https://cran.r-project.org/web/packages/powerplus/") (synopsis "Exponentiation operations") (description "This package provides tools for the computation of matrix and scalar @@ -2966,7 +2966,7 @@ (define-public r-signal (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/signal/") + (home-page "https://cran.r-project.org/web/packages/signal/") (synopsis "Signal processing") (description "This package provides a set of signal processing functions originally @@ -3075,7 +3075,7 @@ (define-public r-abind (base32 "0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis")))) (build-system r-build-system) - (home-page "http://cran.r-project.org/web/packages/abind/") + (home-page "https://cran.r-project.org/web/packages/abind/") (synopsis "Combine multidimensional arrays") (description "This package provides tools to combine multidimensional arrays into a @@ -3098,7 +3098,7 @@ (define-public r-prroc "03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc")))) (properties `((upstream-name . "PRROC"))) (build-system r-build-system) - (home-page "http://cran.r-project.org/web/packages/PRROC/") + (home-page "https://cran.r-project.org/web/packages/PRROC/") (synopsis "Precision-Recall and ROC curves for weighted and unweighted data") (description "This package computes the areas under the @dfn{precision-recall} (PR) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a6c674dfb2..da366441bd 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3773,7 +3773,7 @@ (define-public emacs-ess texlive-latex-seminar texlive-latex-hyperref texlive-tex-texinfo))))) - (home-page "http://ess.r-project.org/") + (home-page "https://ess.r-project.org/") (synopsis "Emacs mode for statistical analysis programs") (description "Emacs Speaks Statistics (ESS) is an add-on package for GNU Emacs. It is designed to support editing of scripts and interaction with diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 6a5e0e753f..38924e42b2 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -142,7 +142,7 @@ (define-public r-diffusionmap `(("r-igraph" ,r-igraph) ("r-matrix" ,r-matrix) ("r-scatterplot3d" ,r-scatterplot3d))) - (home-page "http://www.r-project.org") + (home-page "https://www.r-project.org") (synopsis "Diffusion map") (description "This package implements the diffusion map method of data parametrization, including creation and visualization of diffusion maps, diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 78afb77a8b..8afccb0737 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -271,7 +271,7 @@ (define-public r-minimal (list (search-path-specification (variable "R_LIBS_SITE") (files (list "site-library/"))))) - (home-page "http://www.r-project.org/") + (home-page "https://www.r-project.org/") (synopsis "Environment for statistical computing and graphics") (description "R is a language and environment for statistical computing and graphics. @@ -5018,7 +5018,7 @@ (define-public r-quantreg `(("r-matrix" ,r-matrix) ("r-matrixmodels" ,r-matrixmodels) ("r-sparsem" ,r-sparsem))) - (home-page "http://www.r-project.org") + (home-page "https://www.r-project.org") (synopsis "Quantile regression") (description "This package provides an estimation and inference methods for models -- cgit v1.2.3 From 132a7e68e4623f0a9d3bde4c40de8ffae5f02f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 00:41:00 +0100 Subject: gnu: python-entrypoints: Update to 0.2.3. * gnu/packages/python.scm (python-entrypoints): Update to 0.2.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8107c0acfa..fd4bcd57b6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6485,7 +6485,7 @@ (define-public python2-bleach (define-public python-entrypoints (package (name "python-entrypoints") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) @@ -6494,7 +6494,7 @@ (define-public python-entrypoints (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0azqlkh3j0za080lsf5crnhaxx3c93k9dpv5ihkhf5cppgw5sjz5")))) + "1pdvgfr5bxyvnfvxbsd3zi0dh3il71pc4k6rinx6zpps91b84a56")))) (build-system python-build-system) ;; The package does not come with a setup.py file, so we have to generate ;; one ourselves. -- cgit v1.2.3 From e4da20ecd82dba88287a60147987e19529f6567b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 01:02:01 +0100 Subject: gnu: python-bcrypt: Update to 3.1.4. * gnu/packages/password-utils.scm (python-bcrypt): Update to 3.1.4. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 46b6e795ab..8810392530 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -458,14 +458,14 @@ (define-public argon2 (define-public python-bcrypt (package (name "python-bcrypt") - (version "3.1.0") + (version "3.1.4") (source (origin (method url-fetch) (uri (pypi-uri "bcrypt" version)) (sha256 (base32 - "1giy0dvd8gvq6flxh44np1v2nqwsji5qsnrz038mgwzgp7c20j75")))) + "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7")))) (build-system python-build-system) (native-inputs `(("python-pycparser" ,python-pycparser) -- cgit v1.2.3 From 9b62a6c5eb5409cd7f3c19fad10468e631353836 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 01:10:11 +0100 Subject: gnu: python-oslotest: Update to 3.3.0. * gnu/packages/openstack.scm (python-oslotest): Update to 3.3.0. --- gnu/packages/openstack.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index f0147bab59..c1380a1af5 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -646,14 +646,14 @@ (define-public python2-oslosphinx (define-public python-oslotest (package (name "python-oslotest") - (version "3.2.0") + (version "3.3.0") (source (origin (method url-fetch) (uri (pypi-uri "oslotest" version)) (sha256 (base32 - "1xay6wjxzqm4bg87fahqas84dhvhgf1gghzldkcczsfx897mqdkh")))) + "006i73w8kbc9s0av2v5mbni6mnkb91c2nq17wa0lz7bwk5zss992")))) (build-system python-build-system) (propagated-inputs `(("python-fixtures" ,python-fixtures) -- cgit v1.2.3 From c9ec726cd8061c8c64d7ea0fcec5bc1f4911cbf1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 01:19:42 +0100 Subject: gnu: python-protobuf: Update to 3.5.2. * gnu/packages/protobuf.scm (python-protobuf): Update to 3.5.2. --- gnu/packages/protobuf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 17d3bacf02..877c9c9c84 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,14 +149,14 @@ (define-public protobuf-c (define-public python-protobuf (package (name "python-protobuf") - (version "3.4.0") + (version "3.5.2") (source (origin (method url-fetch) (uri (pypi-uri "protobuf" version)) (sha256 (base32 - "0x33xz85cy5ilg1n2rn92l4qwlcw25vzysx2ldv7k625yjg600pg")))) + "1q4b1m55w4gvcbzklbk8iylaii98n4in41k27d94w8ypbwlrm1q9")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) -- cgit v1.2.3 From f212a85e41a62f01f737c71f96cedcaa789206bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 02:40:05 +0100 Subject: gnu: python-jsonschema: Update to 2.6.0. * gnu/packages/python.scm (python-jsonschema): Update to 2.6.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd4bcd57b6..673d5d3d74 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1857,7 +1857,7 @@ (define-public python2-vcversioner (define-public python-jsonschema (package (name "python-jsonschema") - (version "2.5.1") + (version "2.6.0") (source (origin (method url-fetch) (uri @@ -1866,7 +1866,7 @@ (define-public python-jsonschema version ".tar.gz")) (sha256 (base32 - "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn")))) + "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From e5fa7df9639205b4fffaec8ebb63ec9773465cd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 04:39:52 +0100 Subject: gnu: python-decorator: Update to 4.2.1. * gnu/packages/python.scm (python-decorator): Update to 4.2.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 673d5d3d74..4eb9c9af3e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4056,13 +4056,13 @@ (define-public python2-cairocffi (define-public python-decorator (package (name "python-decorator") - (version "4.1.2") + (version "4.2.1") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "1d8npb11kxyi36mrvjdpcjij76l5zfyrz2f820brf0l0rcw4vdkw")))) + (base32 "03iaf116rm3w8b4agb8hzf6z9331mrvi4khfxq35zkx17sgxsikx")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no test target (home-page "https://pypi.python.org/pypi/decorator/") -- cgit v1.2.3 From 34f53e4fbf87d19630dca38216ce3b2e6f5fb5e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 04:42:42 +0100 Subject: gnu: python-phonenumbers: Update to 8.9.1. * gnu/packages/python.scm (python-phonenumbers): Update to 8.9.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4eb9c9af3e..fbea6b9fe0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12633,14 +12633,14 @@ (define-public python2-mmtk (define-public python-phonenumbers (package (name "python-phonenumbers") - (version "8.8.9") + (version "8.9.1") (source (origin (method url-fetch) (uri (pypi-uri "phonenumbers" version)) (sha256 (base32 - "1lhhxmx3hk0b5891nc0p82dl5bq2w9cqbawmh8j5zy587af2j6fq")))) + "03fmrgb4r8x3ykmddjs9i3zhs703in8smikj3a6447blqpimwyh1")))) (build-system python-build-system) (home-page "https://github.com/daviddrysdale/python-phonenumbers") -- cgit v1.2.3 From 96de54114c4486b6a7348335741df281253e60db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 07:50:09 +0100 Subject: gnu: python-jupyter-core: Update to 4.4.0. * gnu/packages/python.scm (python-jupyter-core): Update to 4.4.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbea6b9fe0..28f1c64989 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4428,14 +4428,14 @@ (define-public python2-traitlets (define-public python-jupyter-core (package (name "python-jupyter-core") - (version "4.2.1") + (version "4.4.0") (source (origin (method url-fetch) (uri (string-append (pypi-uri "jupyter_core" version))) (sha256 (base32 - "1cy7inv218dgh4m1fbzbsiqpz733ylgjrj62jxqpfzs3r2cm7ic9")))) + "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s")))) (build-system python-build-system) ;; FIXME: not sure how to run the tests (arguments `(#:tests? #f)) -- cgit v1.2.3 From c7bb731af8e052dd35b98d7adcbd5363d366a498 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 07:50:57 +0100 Subject: gnu: python-kazoo: Update to 2.4.0. * gnu/packages/python.scm (python-kazoo): Update to 2.4.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 28f1c64989..4e2f4b7b54 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8885,14 +8885,14 @@ (define-public python2-tabulate (define-public python-kazoo (package (name "python-kazoo") - (version "2.2.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "kazoo" version)) (sha256 (base32 - "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj")))) + "16y213k7r8shyn2zw1k6lkzjgcrvm441pqv8scvcjixhvpbx3hm7")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: needs zookeeper (propagated-inputs -- cgit v1.2.3 From c300630d556a0241ad09949f03ea8e9bcb119f74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 07:55:00 +0100 Subject: gnu: python-jupyter-console: Update to 5.2.0. * gnu/packages/python.scm (python-jupyter-console): Update to 5.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4e2f4b7b54..adac8e9f48 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6691,14 +6691,14 @@ (define-public python2-ipywidgets (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "5.0.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "04acmkwsi99rcg3vb54c6n492zv35s92h2ahabc0w6wj976cipvx")))) + "1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal")))) (build-system python-build-system) ;; FIXME: it's not clear how to run the tests. (arguments `(#:tests? #f)) -- cgit v1.2.3 From e83539e8cc9fb323f2d0e104e967386f5a6182d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 07:56:35 +0100 Subject: gnu: python-chai: Update to 1.1.2. * gnu/packages/python.scm (python-chai): Update to 1.1.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index adac8e9f48..d586eb94ba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8992,13 +8992,13 @@ (define-public python2-jsonrpclib (define-public python-chai (package (name "python-chai") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "chai" version)) (sha256 (base32 - "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl")))) + "1k6n6zbgrrs83crp6mr3yqj9zlv40b8rpisyrliwsq7naml2p3gz")))) (build-system python-build-system) (home-page "https://github.com/agoragames/chai") (synopsis "Mocking framework for Python") -- cgit v1.2.3 From c8674cf5fedbc6d4f69b363e74e7326c477eb7e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 09:03:00 +0100 Subject: gnu: python-ptyprocess: Update to 0.5.2. * gnu/packages/python.scm (python-ptyprocess): Update to 0.5.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d586eb94ba..f9818417a6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5614,7 +5614,7 @@ (define-public python2-markdown (define-public python-ptyprocess (package (name "python-ptyprocess") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -5623,7 +5623,7 @@ (define-public python-ptyprocess version ".tar.gz")) (sha256 (base32 - "19l1xrjn4l9gjz01s3vg92gn2dd9d8mw1v86ppkzlnr9m5iwwc05")))) + "0ra31k10v3629xq0kdn8lwmfbi97anmk48r03yvh7mks0kq96hg6")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 40a1020240d21700810f8efe4e505cd72bab0b3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 09:04:57 +0100 Subject: gnu: python-simplejson: Update to 3.13.2. * gnu/packages/python.scm (python-simplejson): Update to 3.13.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f9818417a6..d64c7e7e6f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1164,14 +1164,14 @@ (define-public python2-mechanize (define-public python-simplejson (package (name "python-simplejson") - (version "3.10.0") + (version "3.13.2") (source (origin (method url-fetch) (uri (pypi-uri "simplejson" version)) (sha256 (base32 - "1qhwsykjlb85igb4cfl6v6gkprzbbg8gyqdd7zscc8w3x0ifcfwm")))) + "02jg5nixffqyicfqdl4dil82fh1z9p2as758wp0nqwalw0hcykjc")))) (build-system python-build-system) (home-page "http://simplejson.readthedocs.org/en/latest/") (synopsis -- cgit v1.2.3 From 4bd77a5dd0f55a8e121deb714a3c337786386753 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 09:33:39 +0100 Subject: gnu: python-nbformat: Update to 4.4.0. * gnu/packages/python.scm (python-nbformat): Update to 4.4.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d64c7e7e6f..6cdf13db11 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6433,14 +6433,14 @@ (define-public python2-debian (define-public python-nbformat (package (name "python-nbformat") - (version "4.3.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (pypi-uri "nbformat" version)) (sha256 (base32 - "12s7j4qja8b5bs1kyw5dzmrqbjxxj8wk52cyasbiqbv7fblcrssz")))) + "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no test target (propagated-inputs -- cgit v1.2.3 From f17f9984c372ff88ee8e8b6b5601f1be8dd4a2e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 09:34:45 +0100 Subject: gnu: python-pkginfo: Update to 1.4.2. * gnu/packages/python.scm (python-pkginfo): Update to 1.4.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6cdf13db11..aef63f334b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12117,14 +12117,14 @@ (define-public python2-tqdm (define-public python-pkginfo (package (name "python-pkginfo") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "pkginfo" version)) (sha256 (base32 - "17pqjfpq3c6xzdmk8pski6jcjgjv78q00zjf2bgzb668pzm6l6mv")))) + "0x6lm17p1ks031mj6pajyp4rkq74vpqq8qwjb7ikgwmkli1day2q")))) (build-system python-build-system) (arguments ;; The tests are broken upstream. -- cgit v1.2.3 From 36a17f056c097d548e56558a99f276bca61d9825 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:04:49 +0100 Subject: gnu: texlive-latex-type1cm: Fix description typo. * gnu/packages/tex.scm (texlive-latex-type1cm)[description]: Fix typo. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 30033e1041..1416a00251 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3591,7 +3591,7 @@ (define-public texlive-latex-type1cm fonts (Bakoma, or the versions from BSR/Y&Y, or True Type versions from Kinch, PCTeX, etc.). In fact, since modern distributions will automatically generate any bitmap font you might need, @code{type1cm} has wider application than just -those using scaleable versions of the fonts. Note that the LaTeX distribution +those using scalable versions of the fonts. Note that the LaTeX distribution now contains a package @code{fix-cm},f which performs the task of @code{type1cm}, as well as doing the same job for T1- and TS1-encoded @code{ec} fonts.") -- cgit v1.2.3 From 49c4c4de8575821b0ba08b5c980b996577bcb9ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:33:16 +0100 Subject: gnu: shaderc: Fix formatting. * gnu/packages/vulkan.scm (shaderc): Use conventional indentation. [native-inputs]: Move unquotes to their operands. --- gnu/packages/vulkan.scm | 142 ++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 478de6a444..2daa857394 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -210,74 +210,76 @@ (define-public shaderc (let ((commit "773ec22d49f40b7161820f29d953be4a7e40190d") (revision "1")) (package - (name "shaderc") - (version (string-append "0.0-" revision "." (string-take commit 9))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/shaderc") - (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ;; Tests don't work yet. - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Remove various lines and touch build-version.inc or - ;; configuring won't work. - (invoke "touch" "glslc/src/build-version.inc") - (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") "")) - (substitute* "CMakeLists.txt" - ((".*update_build_version.py..*") "")) - (substitute* "CMakeLists.txt" - ((".*add_custom_target.build-version.*") "")) - (substitute* "CMakeLists.txt" - ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*") - "")) - (substitute* "CMakeLists.txt" - ((".*Update build-version.inc.*") "")) - (substitute* "CMakeLists.txt" ((".*--check.*") "")) - (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") - "\"1\"")) - (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" - "-DSHADERC_SKIP_TESTS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_PREFIX=" - out))))) - (add-after 'unpack 'unpack-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((spirv-tools-source (assoc-ref %build-inputs - "spirv-tools-source")) - (spirv-headers-source (assoc-ref %build-inputs - "spirv-headers-source")) - (glslang-source (assoc-ref %build-inputs - "glslang-source"))) - (mkdir-p "third-party/spirv-tools") - (copy-recursively spirv-tools-source - "third_party/spirv-tools") - (mkdir-p "third-party/spirv-tools/external/spirv-headers") - (copy-recursively spirv-headers-source - (string-append "third_party/spirv-tools" - "/external/spirv-headers")) - (mkdir-p "third-party/glslang") - (copy-recursively glslang-source - "third_party/glslang") - #t)))))) - (inputs `(("python" ,python))) - (native-inputs `(("cmake" ,cmake) - ("glslang-source", (package-source glslang)) - ("pkg-config", pkg-config) - ("spirv-headers-source", (package-source spirv-headers)) - ("spirv-tools-source", (package-source spirv-tools)))) - (home-page "https://github.com/google/shaderc") - (synopsis "Tools for shader compilation") - (description "Shaderc is a collection of tools, libraries and tests for + (name "shaderc") + (version (string-append "0.0-" revision "." (string-take commit 9))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/shaderc") + (commit commit))) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; tests don't work yet. + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Remove various lines and touch build-version.inc or + ;; configuring won't work. + (invoke "touch" "glslc/src/build-version.inc") + (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") "")) + (substitute* "CMakeLists.txt" + ((".*update_build_version.py..*") "")) + (substitute* "CMakeLists.txt" + ((".*add_custom_target.build-version.*") "")) + (substitute* "CMakeLists.txt" + ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*") + "")) + (substitute* "CMakeLists.txt" + ((".*Update build-version.inc.*") "")) + (substitute* "CMakeLists.txt" ((".*--check.*") "")) + (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") + "\"1\"")) + (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" + "-DSHADERC_SKIP_TESTS=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_PREFIX=" + out))))) + (add-after 'unpack 'unpack-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((spirv-tools-source (assoc-ref %build-inputs + "spirv-tools-source")) + (spirv-headers-source (assoc-ref %build-inputs + "spirv-headers-source")) + (glslang-source (assoc-ref %build-inputs + "glslang-source"))) + (mkdir-p "third-party/spirv-tools") + (copy-recursively spirv-tools-source + "third_party/spirv-tools") + (mkdir-p "third-party/spirv-tools/external/spirv-headers") + (copy-recursively spirv-headers-source + (string-append "third_party/spirv-tools" + "/external/spirv-headers")) + (mkdir-p "third-party/glslang") + (copy-recursively glslang-source + "third_party/glslang") + #t)))))) + (inputs + `(("python" ,python))) + (native-inputs + `(("cmake" ,cmake) + ("glslang-source" ,(package-source glslang)) + ("pkg-config" ,pkg-config) + ("spirv-headers-source" ,(package-source spirv-headers)) + ("spirv-tools-source" ,(package-source spirv-tools)))) + (home-page "https://github.com/google/shaderc") + (synopsis "Tools for shader compilation") + (description "Shaderc is a collection of tools, libraries, and tests for shader compilation.") - (license license:asl2.0)))) + (license license:asl2.0)))) -- cgit v1.2.3 From 8696fbbad1904e6c5edb59f334f9d9ab7ddeeba7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:36:10 +0100 Subject: gnu: shaderc: Use standard versioning scheme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vulkan.scm (shaderc)[version]: Use GIT-VERSION with a ‘0.0.0’ prefix. --- gnu/packages/vulkan.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2daa857394..6ba9b94a3d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Rutger Helling +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -211,7 +212,7 @@ (define-public shaderc (revision "1")) (package (name "shaderc") - (version (string-append "0.0-" revision "." (string-take commit 9))) + (version (git-version "0.0.0-" revision commit)) (source (origin (method git-fetch) -- cgit v1.2.3 From 9bc0591bc11190ac49c8ea3cf44c4903c924f6c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:44:36 +0100 Subject: gnu: shaderc: Use more standard keys. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vulkan.scm (shaderc)[arguments]: Move cmake options from the raw INVOKE call to #:build-type and #:configure-flags. Adjust the ‘configure’ phase accordingly. --- gnu/packages/vulkan.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6ba9b94a3d..dc73ce3cad 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -225,11 +225,18 @@ (define-public shaderc "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) (build-system meson-build-system) (arguments - `(#:tests? #f ; tests don't work yet. + `(#:build-type "Release" + #:configure-flags + (list "-GNinja" + "-DSHADERC_SKIP_TESTS=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))) + #:tests? #f ; tests don't work yet. #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key build-type configure-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remove various lines and touch build-version.inc or ;; configuring won't work. @@ -247,11 +254,8 @@ (define-public shaderc (substitute* "CMakeLists.txt" ((".*--check.*") "")) (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") "\"1\"")) - (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" - "-DSHADERC_SKIP_TESTS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_PREFIX=" - out))))) + (invoke "cmake" (cons build-type configure-flags)) + #t))) (add-after 'unpack 'unpack-sources (lambda* (#:key inputs #:allow-other-keys) (let ((spirv-tools-source (assoc-ref %build-inputs -- cgit v1.2.3 From c695fb769c94623371c5997da1dc454b0a4f58a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:50:14 +0100 Subject: gnu: Fix common unquote typos. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's easy to mistype ‘("foo" foo)’ as ‘("foo", foo)’ (which also works). Fix such typos for the proper edification of our young. * gnu/packages/android.scm: Move unquotes to their operands. * gnu/packages/bootloaders.scm: Likewise. * gnu/packages/build-tools.scm: Likewise. * gnu/packages/chemistry.scm: Likewise. * gnu/packages/compression.scm: Likewise. * gnu/packages/connman.scm: Likewise. * gnu/packages/django.scm: Likewise. * gnu/packages/emulators.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/file-systems.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gimp.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/graphics.scm: Likewise. * gnu/packages/haskell.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/julia.scm: Likewise. * gnu/packages/kde-frameworks.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lua.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/make-bootstrap.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/ocaml.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/python-web.scm: Likewise. * gnu/packages/qt.scm: Likewise. * gnu/packages/ratpoison.scm: Likewise. * gnu/packages/sdl.scm: Likewise. * gnu/packages/sml.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/text-editors.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/virtualization.scm: Likewise. * gnu/packages/vulkan.scm: Likewise. * gnu/packages/wget.scm: Likewise. * gnu/packages/wine.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xml.scm: Likewise. * gnu/packages/xorg.scm: Likewise. --- gnu/packages/android.scm | 2 +- gnu/packages/bootloaders.scm | 2 +- gnu/packages/build-tools.scm | 2 +- gnu/packages/chemistry.scm | 4 ++-- gnu/packages/compression.scm | 2 +- gnu/packages/connman.scm | 4 ++-- gnu/packages/django.scm | 4 ++-- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/file-systems.scm | 2 +- gnu/packages/flashing-tools.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/games.scm | 26 +++++++++++++------------- gnu/packages/gimp.scm | 12 ++++++------ gnu/packages/gl.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/graphics.scm | 14 +++++++------- gnu/packages/haskell.scm | 8 ++++---- gnu/packages/irc.scm | 2 +- gnu/packages/kde-frameworks.scm | 36 ++++++++++++++++++------------------ gnu/packages/linux.scm | 24 ++++++++++++------------ gnu/packages/lua.scm | 10 +++++----- gnu/packages/mail.scm | 2 +- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/music.scm | 6 +++--- gnu/packages/networking.scm | 20 ++++++++++---------- gnu/packages/ocaml.scm | 6 +++--- gnu/packages/perl.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python.scm | 8 ++++---- gnu/packages/qt.scm | 2 +- gnu/packages/ratpoison.scm | 2 +- gnu/packages/sdl.scm | 6 +++--- gnu/packages/sml.scm | 2 +- gnu/packages/terminals.scm | 16 ++++++++-------- gnu/packages/text-editors.scm | 8 ++++---- gnu/packages/video.scm | 4 ++-- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 4 ++-- gnu/packages/web.scm | 8 ++++---- gnu/packages/wget.scm | 28 ++++++++++++++-------------- gnu/packages/wine.scm | 4 ++-- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 6 +++--- gnu/packages/xml.scm | 4 ++-- gnu/packages/xorg.scm | 2 +- 47 files changed, 163 insertions(+), 163 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 6baefbca96..637cda0205 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -457,7 +457,7 @@ (define-public git-repo ;; TODO: Add git-remote-persistent-https once it is available in guix `(("git" ,git) ("gnupg" ,gnupg) - ("ssh", openssh))) + ("ssh" ,openssh))) (native-inputs `(("nose" ,python2-nose))) (home-page "https://code.google.com/p/git-repo/") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9ea8748a5b..582c71cc4a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -181,7 +181,7 @@ (define-public grub-efi (synopsis "GRand Unified Boot loader (UEFI version)") (inputs `(("efibootmgr" ,efibootmgr) - ("mtools", mtools) + ("mtools" ,mtools) ,@(package-inputs grub))) (arguments `(;; TODO: Tests need a UEFI firmware for qemu. There is one at diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 2abb44fdb8..73eacf7df2 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -81,7 +81,7 @@ (define-public meson (base32 "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah")))) (build-system python-build-system) - (inputs `(("ninja", ninja))) + (inputs `(("ninja" ,ninja))) (propagated-inputs `(("python" ,python))) (home-page "https://mesonbuild.com/") (synopsis "Build system designed to be fast and user-friendly") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index ed883072b4..f1359b2cf6 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -73,8 +73,8 @@ (define-public nmoldyn (build-system python-build-system) (inputs `(("python-matplotlib" ,(with-numpy-1.8 python2-matplotlib)) - ("python-scientific", python2-scientific) - ("netcdf", netcdf) + ("python-scientific" ,python2-scientific) + ("netcdf" ,netcdf) ("gv" ,gv))) (propagated-inputs `(("python-mmtk" ,python2-mmtk))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 05442024f6..f92239d505 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1657,7 +1657,7 @@ (define-public pzstd (source (package-source zstd)) (build-system gnu-build-system) (native-inputs - `(("googletest", googletest))) + `(("googletest" ,googletest))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 25756019fd..7e87cd8968 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -70,7 +70,7 @@ (define-public connman (string-append "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share")))) (native-inputs - `(("pkg-config", pkg-config) + `(("pkg-config" ,pkg-config) ("python" ,python-2))) (inputs `(("dbus" ,dbus) @@ -84,7 +84,7 @@ (define-public connman ;; TODO: add neard, ofono ("openconnect" ,openconnect) ("openvpn" ,openvpn) - ("ppp", ppp) + ("ppp" ,ppp) ("vpnc" ,vpnc) ("wpa-supplicant" ,wpa-supplicant))) (home-page "https://01.org/connman") diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index a901af6f14..4501b5c745 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -75,7 +75,7 @@ (define-public python-django (zero? (system* "python" "tests/runtests.py"))))))) ;; TODO: Install extras/django_bash_completion. (native-inputs - `(("tzdata", tzdata-for-tests) + `(("tzdata" ,tzdata-for-tests) ;; bcrypt and argon2-cffi are extra requirements not yet in guix ;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0 ;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt! @@ -199,7 +199,7 @@ (define-public python-django-filter (native-inputs `(("python-django" ,python-django) ("python-djangorestframework" ,python-djangorestframework) - ("python-django-crispy-forms", python-django-crispy-forms) + ("python-django-crispy-forms" ,python-django-crispy-forms) ("python-mock" ,python-mock))) (home-page "https://django-filter.readthedocs.io/en/latest/") (synopsis "Reusable Django application to filter querysets dynamically") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 142603b082..9d8e7fa1ae 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1095,7 +1095,7 @@ (define-public retroarch ("sdl" ,sdl2) ("udev" ,eudev) ("vulkan-icd-loader" ,vulkan-icd-loader) - ("wayland", wayland) + ("wayland" ,wayland) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 449584f57e..076d4b6094 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -862,7 +862,7 @@ (define-public volk (inputs `(("boost" ,boost))) (native-inputs - `(("python-2", python-2) + `(("python-2" ,python-2) ("python2-cheetah" ,python2-cheetah))) (home-page "http://libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0e65213c72..6522662c4e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -236,7 +236,7 @@ (define-public curlftpfs (inputs `(("curl" ,curl) ("glib" ,glib) - ("fuse", fuse))) + ("fuse" ,fuse))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://curlftpfs.sourceforge.net/") diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 192f84c36c..51b259a5cf 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -104,7 +104,7 @@ (define-public 0xffff "1g4032c81wkk37wvbg1dxcqq6mnd76y9x7f2crmzqi6z4q9jcxmj")))) (build-system gnu-build-system) (inputs - `(("libusb",libusb-0.1))) ; doesn't work with libusb-compat + `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 366fcecea2..f673c4bf34 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -357,7 +357,7 @@ (define-public packagekit ("glib:bin" ,glib "bin"))) (inputs `(("glib" ,glib) - ("bash-completion", bash-completion) + ("bash-completion" ,bash-completion) ("polkit" ,polkit))) (propagated-inputs `(("sqlite" ,sqlite))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a33da03ad5..a03e58b0ad 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -234,7 +234,7 @@ (define-public cataclysm-dda ("libvorbis" ,libvorbis) ("ncurses" ,ncurses) ("sdl2" ,sdl2) - ("sdl2-image", sdl2-image) + ("sdl2-image" ,sdl2-image) ("sdl2-ttf" ,sdl2-ttf) ("sdl2-mixer" ,sdl2-mixer))) (home-page "http://en.cataclysmdda.com/") @@ -2230,19 +2230,19 @@ (define-public openrct2 (substitute* "cmake_install.cmake" (("EXPECTED_HASH SHA1=b587d83de508d0b104d14c599b76f8565900fce0") ""))))))) - (inputs `(("curl", curl) - ("fontconfig", fontconfig) - ("freetype", freetype) - ("jansson", jansson) - ("libpng", libpng) - ("libzip", libzip) - ("mesa", mesa) - ("openssl", openssl) - ("sdl2", sdl2) - ("speexdsp", speexdsp) - ("zlib", zlib))) + (inputs `(("curl" ,curl) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("jansson" ,jansson) + ("libpng" ,libpng) + ("libzip" ,libzip) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("sdl2" ,sdl2) + ("speexdsp" ,speexdsp) + ("zlib" ,zlib))) (native-inputs - `(("pkg-config", pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c98f686d41..2483885c95 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -175,12 +175,12 @@ (define-public gimp ("libjpeg" ,libjpeg-8) ("atk" ,atk) ("gtk+" ,gtk+-2) - ("exif" ,libexif) ;optional, EXIF + XMP support - ("lcms" ,lcms) ;optional, color management - ("librsvg" ,librsvg) ;optional, SVG support - ("poppler", poppler) ; optional, PDF support - ("python" ,python-2) ;optional, Python support - ("python2-pygtk" ,python2-pygtk) ;optional, Python support + ("exif" ,libexif) ; optional, EXIF + XMP support + ("lcms" ,lcms) ; optional, color management + ("librsvg" ,librsvg) ; optional, SVG support + ("poppler" ,poppler) ; optional, PDF support + ("python" ,python-2) ; optional, Python support + ("python2-pygtk" ,python2-pygtk) ; optional, Python support ("gegl" ,gegl))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 0e416a9efd..f46c4b4d4b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -756,7 +756,7 @@ (define-public virtualgl ("libjpeg-turbo" ,libjpeg-turbo) ("mesa" ,mesa) ("openssl" ,openssl))) - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.virtualgl.org") (synopsis "Redirects 3D commands from an OpenGL application onto a 3D graphics card") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 56ee1aa885..8ce36430ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -273,7 +273,7 @@ (define-public deja-dup ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake", cmake))) + ("cmake" ,cmake))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8504b2f11e..8ea9c74cec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -435,13 +435,13 @@ (define-public openscenegraph (native-inputs `(("unzip" ,unzip))) (inputs - `(("giflib", giflib) - ("jasper", jasper) - ("librsvg", librsvg) - ("pth", pth) - ("qtbase", qtbase) - ("ffmpeg", ffmpeg) - ("mesa", mesa))) + `(("giflib" ,giflib) + ("jasper" ,jasper) + ("librsvg" ,librsvg) + ("pth" ,pth) + ("qtbase" ,qtbase) + ("ffmpeg" ,ffmpeg) + ("mesa" ,mesa))) (synopsis "High performance real-time graphics toolkit") (description "The OpenSceneGraph is a high performance 3D graphics toolkit diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c5408f8627..9c59f56139 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7881,7 +7881,7 @@ (define-public ghc-hslogger (inputs `(("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) - ("ghc-directory", ghc-directory) + ("ghc-directory" ,ghc-directory) ("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -8458,7 +8458,7 @@ (define-public ghc-statistics (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-ieee754", ghc-ieee754) + ("ghc-ieee754" ,ghc-ieee754) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) @@ -8582,7 +8582,7 @@ (define-public ghc-contravariant-extras (build-system haskell-build-system) (inputs `(("ghc-tuple-th" ,ghc-tuple-th) ("ghc-contravariant" ,ghc-contravariant) - ("ghc-base-prelude",ghc-base-prelude))) + ("ghc-base-prelude" ,ghc-base-prelude))) (home-page "https://github.com/nikita-volkov/contravariant-extras") (synopsis "Extras for the @code{ghc-contravariant} Haskell package") (description "This Haskell package provides extras for the @@ -8897,7 +8897,7 @@ (define-public ghc-mono-traversable ("ghc-vector-algorithms" ,ghc-vector-algorithms) ("ghc-split" ,ghc-split))) (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit",ghc-hunit) + ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-semigroups" ,ghc-semigroups) ("ghc-foldl" ,ghc-foldl))) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e59b34417b..bad27dacb6 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -100,7 +100,7 @@ (define-public quassel ("qttools" ,qttools))) (inputs `(("qca" ,qca) - ("qtbase", qtbase) + ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 246860e3f3..b763a03476 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -157,7 +157,7 @@ (define-public phonon ;; TODO: Add building the super experimental QML support `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) - ("qttools", qttools))) + ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1186,7 +1186,7 @@ (define-public modemmanager-qt ("pkg-config" ,pkg-config))) (propagated-inputs ;; Headers contain #include - `(("modem-manager", modem-manager))) + `(("modem-manager" ,modem-manager))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1284,7 +1284,7 @@ (define-public prison (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("libdmtx", libdmtx) + `(("libdmtx" ,libdmtx) ("qrencode" ,qrencode) ("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this (home-page "https://api.kde.org/frameworks/prison/html/index.html") @@ -2209,7 +2209,7 @@ (define-public kdeclarative ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libepoxy", libepoxy) + ("libepoxy" ,libepoxy) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) @@ -3003,7 +3003,7 @@ (define-public ktexteditor ("libgit2" ,libgit2) ("perl" ,perl) ("qtbase" ,qtbase) - ("qtdeclarative", qtdeclarative) + ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) ("qtxmlpatterns" ,qtxmlpatterns) ("solid" ,solid) @@ -3071,7 +3071,7 @@ (define-public ktextwidgets ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) - ("qtspeech", qtspeech))) + ("qtspeech" ,qtspeech))) (arguments `(#:phases (modify-phases %standard-phases @@ -3150,7 +3150,7 @@ (define-public kxmlgui `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("attica" ,attica) - ("kauth", kauth) + ("kauth" ,kauth) ("kcodecs" ,kcodecs) ("kcoreaddons" ,kcoreaddons) ("kglobalaccel" ,kglobalaccel) @@ -3395,7 +3395,7 @@ (define-public kdelibs4support `(("dbus" ,dbus) ("docbook-xml" ,docbook-xml-4.4) ; optional ("extra-cmake-modules" ,extra-cmake-modules) - ("perl", perl) + ("perl" ,perl) ("perl-uri" ,perl-uri) ("pkg-config" ,pkg-config) ("shared-mime-info" ,shared-mime-info) @@ -3421,7 +3421,7 @@ (define-public kdelibs4support ("knotifications" ,knotifications) ("kparts" ,kparts) ("ktextwidgets" ,ktextwidgets) - ("kunitconversion", kunitconversion) + ("kunitconversion" ,kunitconversion) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase))) (inputs @@ -3434,9 +3434,9 @@ (define-public kdelibs4support ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("libsm", libsm) - ("networkmanager-qt", networkmanager-qt) - ("openssl", openssl) + ("libsm" ,libsm) + ("networkmanager-qt" ,networkmanager-qt) + ("openssl" ,openssl) ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) @@ -3507,7 +3507,7 @@ (define-public khtml (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("perl", perl))) + ("perl" ,perl))) (inputs `(("giflib" ,giflib) ("gperf" ,gperf) @@ -3521,14 +3521,14 @@ (define-public khtml ("knotifications" ,knotifications) ("kparts" ,kparts) ("ktextwidgets" ,ktextwidgets) - ("kwallet", kwallet) + ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libjpeg", libjpeg) - ("libpng", libpng) - ("openssl", openssl) - ("phonon", phonon) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("openssl" ,openssl) + ("phonon" ,phonon) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index df6d7468ac..a268c4db0d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1778,9 +1778,9 @@ (define-public archivemount (base32 "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg")))) (build-system gnu-build-system) - (inputs `(("fuse", fuse) - ("libarchive", libarchive))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("fuse" ,fuse) + ("libarchive" ,libarchive))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.cybernoia.de/software/archivemount") (synopsis "Tool for mounting archive files with FUSE") (description "archivemount is a FUSE-based file system for Unix variants, @@ -2034,7 +2034,7 @@ (define-public eudev ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES - ("xsltproc", libxslt))) + ("xsltproc" ,libxslt))) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, @@ -3707,7 +3707,7 @@ (define-public mtd-utils (inputs `(("acl" ,acl) ("libuuid" ,util-linux) - ("lzo", lzo) + ("lzo" ,lzo) ("zlib" ,zlib))) (build-system gnu-build-system) (arguments @@ -4137,13 +4137,13 @@ (define-public nftables (base32 "1i1gfy8l7qyhc5vlrpp63s0n5kybmc9pi4dywiq8rmkhrrnddsla")))) (build-system gnu-build-system) - (inputs `(("bison", bison) - ("flex", flex) - ("gmp", gmp) - ("libmnl", libmnl) - ("libnftnl", libnftnl) - ("readline", readline))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("bison" ,bison) + ("flex" ,flex) + ("gmp" ,gmp) + ("libmnl" ,libmnl) + ("libnftnl" ,libnftnl) + ("readline" ,readline))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.nftables.org") (synopsis "Userspace utility for Linux packet filtering") (description "nftables is the project that aims to replace the existing diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0d4bf12817..69180abeac 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -354,12 +354,12 @@ (define-public lua-lgi (inputs `(("gobject-introspection" ,gobject-introspection) ("glib" ,glib) - ("pango", pango) - ("gtk", gtk+-2) + ("pango" ,pango) + ("gtk" ,gtk+-2) ("lua" ,lua) ("cairo" ,cairo) ("libffi" ,libffi) - ("xorg-server", xorg-server))) + ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config) ("dbus" ,dbus))) ;tests use 'dbus-run-session' @@ -397,7 +397,7 @@ (define (make-lua-lpeg name lua) (string-append out "/share/lua/" lua-version)) #t)))) #:test-target "test")) - (inputs `(("lua", lua))) + (inputs `(("lua" ,lua))) (synopsis "Pattern-matching library for Lua") (description "LPeg is a pattern-matching library for Lua, based on Parsing Expression @@ -436,7 +436,7 @@ (define (make-lua-bitop name lua) #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs `(("lua", lua))) + (inputs `(("lua" ,lua))) (home-page "https://bitop.luajit.org/index.html") (synopsis "Bitwise operations on numbers for Lua") (description diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7986671e97..1d52b35929 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1812,7 +1812,7 @@ (define-public mb2md (patch-shebang "mb2md" (list (string-append perl "/bin"))) (chmod "mb2md" #o555)) #t)))) - (native-inputs `(("gzip", gzip))) + (native-inputs `(("gzip" ,gzip))) (inputs `(("perl" ,perl) ("perl-timedate" ,perl-timedate))) (home-page "http://batleth.sapienti-sat.org/projects/mb2md/") diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 779b7ef5aa..99488fb4c4 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -108,7 +108,7 @@ (define (native-inputs) ("gcc" ,(package (inherit gcc) (outputs '("out")) ; all in one so libgcc_s is easily found (inputs - `(("libc",(glibc-for-bootstrap)) + `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ,@(package-inputs gcc))))) ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ae489e1586..6ce8b258bb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,9 +144,9 @@ (define-public libsignal-protocol-c #:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1"))) (build-system cmake-build-system) (inputs `( ;; Required for tests: - ("check", check) - ("openssl", openssl))) - (native-inputs `(("pkg-config", pkg-config))) + ("check" ,check) + ("openssl" ,openssl))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/WhisperSystems/libsignal-protocol-c") (synopsis "Implementation of a ratcheting forward secrecy protocol") (description "libsignal-protocol-c is an implementation of a ratcheting @@ -613,8 +613,8 @@ (define-public dino (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (inputs `(("libgee" ,libgee) - ("libsignal-protocol-c", libsignal-protocol-c) - ("libgcrypt", libgcrypt) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libgcrypt" ,libgcrypt) ("libsoup" ,libsoup) ("sqlite" ,sqlite) ("gpgme" ,gpgme) @@ -623,7 +623,7 @@ (define-public dino ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (native-inputs `(("pkg-config" ,pkg-config) - ("libsignal-protocol-c-source", (package-source libsignal-protocol-c)) + ("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c)) ("glib" ,glib "bin") ("vala" ,vala) ("gettext" ,gettext-minimal))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4bd58d9733..c7c4913bf0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -399,7 +399,7 @@ (define-public denemo "Clarinet in Bb.denemo")) #t))))) (native-inputs - `(("glib:bin", glib "bin") ; for gtester + `(("glib:bin" ,glib "bin") ; for gtester ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) @@ -417,7 +417,7 @@ (define-public denemo ("libsndfile" ,libsndfile) ("libtool" ,libtool) ("libxml2" ,libxml2) - ("lilypond", lilypond) + ("lilypond" ,lilypond) ("portaudio" ,portaudio) ("portmidi" ,portmidi) ("rubberband" ,rubberband))) @@ -2518,7 +2518,7 @@ (define-public instantmusic (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests) - ("eyed3", eyed3) + ("eyed3" ,eyed3) ("python-beautifulsoup4" ,python-beautifulsoup4) ("youtube-dl" ,youtube-dl))) (arguments diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 395e75afa6..999f0578d7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1225,11 +1225,11 @@ (define-public nzbget (assoc-ref %build-inputs "ncurses") "/lib") (string-append "--with-tlslib=GnuTLS")))) (build-system gnu-build-system) - (inputs `(("gnutls", gnutls) - ("libxml2", libxml2) - ("ncurses", ncurses) - ("zlib", zlib))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("gnutls" ,gnutls) + ("libxml2" ,libxml2) + ("ncurses" ,ncurses) + ("zlib" ,zlib))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/nzbget/nzbget") (synopsis "Usenet binary file downloader") (description @@ -1455,11 +1455,11 @@ (define-public quagga (patches (search-patches "quagga-reproducible-build.patch")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config",pkg-config) - ("perl",perl) - ("dejagnu",dejagnu))) - (inputs `(("readline",readline) - ("c-ares",c-ares))) + (native-inputs `(("pkg-config" ,pkg-config) + ("perl" ,perl) + ("dejagnu" ,dejagnu))) + (inputs `(("readline" ,readline) + ("c-ares" ,c-ares))) (synopsis "Routing Software Suite") (description "Quagga is a routing software suite, providing implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms. diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 24f402128c..9346012390 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3755,7 +3755,7 @@ (define-public ocaml-integers (delete 'configure)))) (inputs `(("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as @@ -3789,7 +3789,7 @@ (define-public ocaml-ctypes ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (synopsis "Library for binding to C libraries using pure OCaml") (description "Ctypes is a library for binding to C libraries using pure OCaml. The primary aim is to make writing C extensions as straightforward as @@ -3822,7 +3822,7 @@ (define-public ocaml-ocb-stubblr (delete 'configure)))) (inputs `(("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (native-inputs `(("astring" ,ocaml-astring))) (synopsis "OCamlbuild plugin for C stubs") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e6a656c7b9..0bc4697229 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5759,7 +5759,7 @@ (define-public perl-moox-configfromfile ("perl-file-configdir" ,perl-file-configdir) ("perl-file-find-rule" ,perl-file-find-rule) ("perl-hash-merge" ,perl-hash-merge) - ("perl-moo", perl-moo) + ("perl-moo" ,perl-moo) ("perl-moox-file-configdir" ,perl-moox-file-configdir) ("perl-namespace-clean" ,perl-namespace-clean))) (home-page "http://search.cpan.org/dist/MooX-ConfigFromFile/") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3b907cafcf..7974c005c2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -823,7 +823,7 @@ (define-public python-zope-schema '(#:tests? #f)) ; FIXME: Tests can't find zope.event. (propagated-inputs `(("python-zope-event" ,python-zope-event) - ("python-zope-exceptions", python-zope-exceptions) + ("python-zope-exceptions" ,python-zope-exceptions) ("python-zope-interface" ,python-zope-interface))) (native-inputs `(("python-zope-testing" ,python-zope-testing) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aef63f334b..05d3390604 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11975,7 +11975,7 @@ (define-public python-rencode "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("python-cython", python-cython))) + ("python-cython" ,python-cython))) (home-page "https://github.com/aresch/rencode") (synopsis "Serialization of heterogeneous data structures") (description @@ -12158,7 +12158,7 @@ (define-public python-twine (build-system python-build-system) (propagated-inputs `(("python-tqdm" ,python-tqdm) - ("python-pkginfo", python-pkginfo) + ("python-pkginfo" ,python-pkginfo) ("python-requests" ,python-requests) ("python-requests-toolbelt" ,python-requests-toolbelt))) (home-page "https://github.com/pypa/twine") @@ -12568,7 +12568,7 @@ (define-public python2-scientific `(("netcdf" ,netcdf))) (propagated-inputs `(("python-numpy" ,python2-numpy-1.8) - ("python-pyro", python2-pyro))) + ("python-pyro" ,python2-pyro))) (arguments ;; ScientificPython is not compatible with Python 3 `(#:python ,python-2 @@ -12915,7 +12915,7 @@ (define-public bpython #t))))) (propagated-inputs `(("python-pygments" ,python-pygments) - ("python-requests", python-requests) + ("python-requests" ,python-requests) ("python-babel" ,python-babel) ; optional, for internationalization ("python-curtsies" ,python-curtsies) ; >= 0.1.18 ("python-greenlet" ,python-greenlet) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a8c2729ee8..d6082bd7a4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1937,7 +1937,7 @@ (define-public qtwebkit ("libwebp" ,libwebp) ("sqlite" ,sqlite) ("fontconfig" ,fontconfig) - ("libxrender", libxrender) + ("libxrender" ,libxrender) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index d630c24fd4..19321872c5 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -79,7 +79,7 @@ (define-public ratpoison ("readline" ,readline) ("xextproto" ,xextproto))) (native-inputs - `(("perl",perl) + `(("perl" ,perl) ("pkg-config" ,pkg-config) ("ratpoison.desktop" ,ratpoison.desktop))) (home-page "https://www.nongnu.org/ratpoison/") diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 222fd5b6f1..30d18aa1c3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -122,9 +122,9 @@ (define-public sdl2 ("fcitx" ,fcitx) ; helps with CJK input ("glib" ,glib) ("ibus" ,ibus) - ("libxkbcommon", libxkbcommon) - ("wayland", wayland) - ("wayland-protocols", wayland-protocols)) + ("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols)) (package-inputs sdl))) (license bsd-3))) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index b9bd7a7e82..1d7fd3fb51 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -42,7 +42,7 @@ (define-public polyml (build-system gnu-build-system) (inputs `(("gmp" ,gmp) - ("lesstif",lesstif) + ("lesstif" ,lesstif) ("libffi" ,libffi) ("libx11" ,libx11) ("libxt" ,libxt))) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index eeae8bea41..6540a9feaf 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -128,9 +128,9 @@ (define-public termite (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) (inputs - `(("vte", vte-ng) - ("gtk+", gtk+) - ("ncurses", ncurses))) + `(("vte" ,vte-ng) + ("gtk+" ,gtk+) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -292,10 +292,10 @@ (define-public libtermkey #:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test")) - (inputs `(("ncurses", ncurses))) - (native-inputs `(("libtool", libtool) + (inputs `(("ncurses" ,ncurses))) + (native-inputs `(("libtool" ,libtool) ("perl-test-harness" ,perl-test-harness) - ("pkg-config", pkg-config))) + ("pkg-config" ,pkg-config))) (synopsis "Keyboard entry processing library for terminal-based programs") (description "Libtermkey handles all the necessary logic to recognise special keys, UTF-8 @@ -692,7 +692,7 @@ (define-public python-pyte (delete-file "tests/test_input_output.py") #t))))) (propagated-inputs - `(("python-wcwidth", python-wcwidth))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest-runner" ,python-pytest-runner) ("python-pytest" ,python-pytest))) @@ -762,7 +762,7 @@ (define-public python-curtsies (invoke "nosetests" "-v")))))) (propagated-inputs `(("python-blessings" ,python-blessings) - ("python-wcwidth", python-wcwidth))) + ("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-mock" ,python-mock) ("python-pyte" ,python-pyte) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f1ccab9af9..cbf077cea3 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -81,10 +81,10 @@ (define-public vis (list (search-path-specification (variable "VIS_PATH") (files '("share/vis"))))) - (inputs `(("lua", lua) - ("ncurses", ncurses) - ("libtermkey", libtermkey) - ("lua-lpeg", lua-lpeg) + (inputs `(("lua" ,lua) + ("ncurses" ,ncurses) + ("libtermkey" ,libtermkey) + ("lua-lpeg" ,lua-lpeg) ("tre" ,tre))) (synopsis "Vim-like text editor") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0979b4f4e7..39354f93ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1062,7 +1062,7 @@ (define-public mpv ("waf" ,python-waf) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) - ("libxkbcommon", libxkbcommon) + ("libxkbcommon" ,libxkbcommon) ("youtube-dl" ,youtube-dl) ("zlib" ,zlib))) (arguments @@ -2461,7 +2461,7 @@ (define-public mediainfo ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("zlib" ,zlib) - ("libmediainfo", libmediainfo) + ("libmediainfo" ,libmediainfo) ("libzen" ,libzen))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 24f7333cd8..55a92eca0d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -747,7 +747,7 @@ (define-public lookingglass ("sdl2" ,sdl2) ("sdl2-ttf" ,sdl2-ttf) ("spice-protocol" ,spice-protocol))) - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ;; No tests are available. #:phases (modify-phases %standard-phases diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index dc73ce3cad..4d981416d0 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -103,7 +103,7 @@ (define-public spirv-tools (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) - (native-inputs `(("pkg-config", pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") (synopsis "API and commands for processing SPIR-V modules") @@ -190,7 +190,7 @@ (define-public vulkan-icd-loader ("mesa" ,mesa) ("spirv-tools" ,spirv-tools) ("wayland" ,wayland))) - (native-inputs `(("pkg-config", pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ceb7d9b7c7..394fa7b71c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -960,9 +960,9 @@ (define-public websockify ; named 'stubout'". The tests can be run by replacing the check phase with ; the command "python setup.py nosetests --verbosity=3". (native-inputs `(; Required for tests: - ("python-mox3", python-mox3) - ("python-nose", python-nose))) - (propagated-inputs `(("python-numpy", python-numpy))) + ("python-mox3" ,python-mox3) + ("python-nose" ,python-nose))) + (propagated-inputs `(("python-numpy" ,python-numpy))) (home-page "https://github.com/novnc/websockify") (synopsis "WebSockets support for any application/server") (description "Websockify translates WebSockets traffic to normal socket @@ -989,7 +989,7 @@ (define-public wwwoffle #:tests? #f)) ; no test target (native-inputs `(("flex" ,flex))) (inputs `(("gnutls" ,gnutls) - ("libcrypt", libgcrypt))) + ("libcrypt" ,libgcrypt))) (home-page "https://www.gedanken.org.uk/software/wwwoffle/") (synopsis "Caching web proxy optimized for intermittent internet links") (description "WWWOFFLE is a proxy web server that is especially good for diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index c6a319965a..585b8a0342 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -152,21 +152,21 @@ (define-public wget2 (zero? (system* "sh" "./bootstrap" "--gnulib-srcdir=gnulib" "--no-git"))))))) - (inputs `(("autoconf", autoconf) - ("automake", automake) - ("doxygen", doxygen) - ("flex", flex) - ("gettext", gettext-minimal) - ("gnutls", gnutls/dane) - ("libiconv", libiconv) - ("libidn2", libidn2) - ("libmicrohttpd", libmicrohttpd) - ("libpsl", libpsl) - ("libtool", libtool) - ("pcre2", pcre2) - ("python", python))) + (inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("doxygen" ,doxygen) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("gnutls" ,gnutls/dane) + ("libiconv" ,libiconv) + ("libidn2" ,libidn2) + ("libmicrohttpd" ,libmicrohttpd) + ("libpsl" ,libpsl) + ("libtool" ,libtool) + ("pcre2" ,pcre2) + ("python" ,python))) ;; TODO: Add libbrotlidec, libnghttp2. - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://gitlab.com/gnuwget/wget2") (synopsis "Successor of GNU Wget") (description "GNU Wget2 is the successor of GNU Wget, a file and recursive diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 37d36cf922..8496eb3365 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -278,8 +278,8 @@ (define-public wine-staging (base32 "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf - ("gtk+", gtk+) - ("libva", libva) + ("gtk+" ,gtk+) + ("libva" ,libva) ("python" ,python) ("sdl2" ,sdl2) ("util-linux" ,util-linux) ; for hexdump diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b38b3caa25..9bd3492413 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -710,7 +710,7 @@ (define-public awesome ("libxdg-basedir" ,libxdg-basedir) ("libxkbcommon" ,libxkbcommon) ("lua" ,lua) - ("lua-lgi",lua-lgi) + ("lua-lgi" ,lua-lgi) ("pango" ,pango) ("startup-notification" ,startup-notification) ("xcb-util" ,xcb-util) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 07a9b390fa..4e7f2c207f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1332,9 +1332,9 @@ (define-public xcalib (install-file "README" doc) ;; Avoid unspecified return value. #t)))))) - (inputs `(("libx11", libx11) - ("libxext", libxext) - ("libxxf86vm", libxxf86vm))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxxf86vm" ,libxxf86vm))) (synopsis "Tiny monitor calibration loader for XFree86 (or X.org)") (description "xcalib is a tiny tool to load the content of vcgt-Tags in ICC profiles to the video card's gamma ramp. It does work with most video card diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 729fa56a30..6c1d2a7796 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1415,7 +1415,7 @@ (define-public perl-xml-sax-writer (propagated-inputs `(("perl-libxml" ,perl-libxml) ("perl-xml-filter-buffertext" ,perl-xml-filter-buffertext) - ("perl-xml-namespacesupport", perl-xml-namespacesupport) + ("perl-xml-namespacesupport" ,perl-xml-namespacesupport) ("perl-xml-sax-base" ,perl-xml-sax-base))) (home-page "http://search.cpan.org/dist/XML-SAX-Writer/") (synopsis "SAX2 XML Writer") @@ -1472,7 +1472,7 @@ (define-public perl-xml-twig ("perl-xml-sax-writer" ,perl-xml-sax-writer) ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-xpathengine" ,perl-xml-xpathengine) - ("perl-test-pod", perl-test-pod) + ("perl-test-pod" ,perl-test-pod) ("perl-tree-xpathengine" ,perl-tree-xpathengine))) (home-page "http://search.cpan.org/dist/XML-Twig/") (synopsis "Perl module for processing huge XML documents in tree mode") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 46a9a3b85f..1e4835b5c0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5983,7 +5983,7 @@ (define-public xpra ("python2-rencode" ,python2-rencode) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config) - ("python2-cython", python2-cython))) + ("python2-cython" ,python2-cython))) (arguments `(#:python ,python-2 ;; no full Python 3 support yet #:configure-flags '("--with-tests" -- cgit v1.2.3 From 3def739da13a166769777d0db7baba79230f64ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Mar 2018 12:23:59 +0100 Subject: gnu: Use the CMake build system's #:build-type key. * gnu/packages/code.scm (rtags)[arguments]: Move the CMAKE_BUILD_TYPE from #:configure-flags to #:build-type. * gnu/packages/databases.scm (apache-arrow)[arguments]: Likewise * gnu/packages/engineering.scm (kicad)[arguments]: Likewise * gnu/packages/flashing-tools.scm (heimdall)[arguments]: Likewise * gnu/packages/graphics.scm (openscenegraph)[arguments]: Likewise * gnu/packages/linux.scm (rdma-core)[arguments]: Likewise * gnu/packages/music.scm (portmidi)[arguments]: Likewise * gnu/packages/photo.scm (rawtherapee)[arguments]: Likewise * gnu/packages/rdesktop.scm (freerdp)[arguments]: Likewise * gnu/packages/serialization.scm (flatbuffers)[arguments]: Likewise * gnu/packages/web.scm (tidy-html)[arguments]: Likewise --- gnu/packages/code.scm | 4 ++-- gnu/packages/databases.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/flashing-tools.scm | 4 ++-- gnu/packages/graphics.scm | 13 ++++++------- gnu/packages/linux.scm | 4 ++-- gnu/packages/music.scm | 4 ++-- gnu/packages/photo.scm | 2 +- gnu/packages/rdesktop.scm | 7 ++++--- gnu/packages/serialization.scm | 8 ++++---- gnu/packages/web.scm | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 979c7a72b8..15fdf9d66f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -420,9 +420,9 @@ (define-public rtags "0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2")))) (build-system cmake-build-system) (arguments - '(#:configure-flags + '(#:build-type "RelWithDebInfo" + #:configure-flags '("-DRTAGS_NO_ELISP_FILES=1" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DBUILD_TESTING=FALSE") #:tests? #f)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 58da1f7a90..bcf1864775 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2771,9 +2771,9 @@ (define-public apache-arrow (setenv "JEMALLOC_HOME" (assoc-ref %build-inputs "jemalloc")) (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) #t))) + #:build-type "Release" #:configure-flags - (list "-DCMAKE_BUILD_TYPE=Release" - "-DARROW_PYTHON=ON" + (list "-DARROW_PYTHON=ON" ;; Install to PREFIX/lib (the default is ;; PREFIX/lib64). diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 076d4b6094..4d45aab772 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -696,12 +696,12 @@ (define-public kicad (arguments `(#:out-of-source? #t #:tests? #f ; no tests + #:build-type "Release" #:configure-flags (list "-DKICAD_STABLE_VERSION=ON" "-DKICAD_REPO_NAME=stable" ,(string-append "-DKICAD_BUILD_VERSION=4.0-" (string-take commit 7)) - "-DCMAKE_BUILD_TYPE=Release" "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 51b259a5cf..36c8353ee0 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -300,8 +300,8 @@ (define-public heimdall "1y7gwg3lipyp2zcysm2vid1qg5nwin9bxbvgzs28lz2rya4fz6sq")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") - #:tests? #f; no tests + `(#:build-type "Release" + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-invocations diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8ea9c74cec..d2f1b3b0b8 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017, 2018 Ben Woodcroft -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -423,15 +423,14 @@ (define-public openscenegraph (file-name (string-append name "-" version ".zip")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;; No test target available. + `(#:tests? #f ; no test target available + ;; Without this flag, 'rd' will be added to the name of the + ;; library binaries and break linking with other programs. + #:build-type "Release" #:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib64") - ;; We need to set this flag or otherwise 'rd' will be added - ;; to the name of the library binaries and break linking - ;; with other programs. - "-DCMAKE_BUILD_TYPE=Release"))) + (assoc-ref %outputs "out") "/lib64")))) (native-inputs `(("unzip" ,unzip))) (inputs diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a268c4db0d..b7e70249f3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3404,8 +3404,8 @@ (define-public rdma-core ;; Upstream uses the "ninja" build system and encourage distros ;; to do the same for consistency. They also recommend using the ;; "Release" build type. - #:configure-flags (list "-GNinja" - "-DCMAKE_BUILD_TYPE=Release") + #:build-type "Release" + #:configure-flags (list "-GNinja") #:phases (modify-phases %standard-phases (replace 'build diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c7c4913bf0..7818cfcc0b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1754,10 +1754,10 @@ (define-public portmidi (patches (list (search-patch "portmidi-modular-build.patch"))))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; tests cannot be linked + `(#:tests? #f ; tests cannot be linked + #:build-type "Release" ; needed to have PMALSA set #:configure-flags (list "-DPORTMIDI_ENABLE_JAVA=Off" - "-DCMAKE_BUILD_TYPE=Release" ; needed to have PMALSA set "-DPORTMIDI_ENABLE_TEST=Off"))) ; tests fail linking (inputs `(("alsa-lib" ,alsa-lib))) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 758ed3f6f1..90bc365d05 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -481,11 +481,11 @@ (define-public rawtherapee (build-system cmake-build-system) (arguments '(#:tests? #f ; no test suite + #:build-type "release" #:configure-flags (list (string-append "-DLENSFUNDBDIR=" (assoc-ref %build-inputs "lensfun") "/share/lensfun") - "-DCMAKE_BUILD_TYPE=release" ; Don't optimize the build for the host machine. See the file ; 'ProcessorTargets.cmake' in the source distribution for more ; information. diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 1a2d0412d1..bd2b5737e9 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -111,9 +112,9 @@ (define-public freerdp ("zlib" ,zlib) ("openssl" ,openssl))) (arguments - `(#:configure-flags - (list "-DCMAKE_BUILD_TYPE=RELEASE" - "-DWITH_JPEG=ON" + `(#:build-type "RELEASE" + #:configure-flags + (list "-DWITH_JPEG=ON" ,@(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system))) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3dd3a070e4..f721165751 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 ng0 -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. @@ -431,10 +431,10 @@ (define-public flatbuffers "0blc978wc5h91662vai24xj92c3bx56y6hzid90qva7il302jl64")))) (build-system cmake-build-system) (arguments - '(#:configure-flags + '(#:build-type "Release" + #:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib") - "-DCMAKE_BUILD_TYPE=Release"))) + (assoc-ref %outputs "out") "/lib")))) (home-page "https://google.github.io/flatbuffers/") (synopsis "Memory-efficient serialization library") (description "FlatBuffers is a cross platform serialization library for C++, diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 394fa7b71c..625df2b1dc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4971,10 +4971,10 @@ (define-public tidy-html "0n29wcgw32rhnraj9j21ibhwi0xagmmcskhbaz8ihxly7nx3p9h8")))) (build-system cmake-build-system) (outputs '("out" - "static")) ; 1.0MiB of .a files + "static")) ; 1.0MiB of .a files (arguments - `(#:tests? #f ; No tests available - #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release") + `(#:tests? #f ; no tests available + #:build-type "Release" #:phases (modify-phases %standard-phases (add-after 'install 'move-static-libraries -- cgit v1.2.3 From 533808383f7fca6563aee1452f5202e0cd1b66b8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 17 Mar 2018 20:23:33 +0000 Subject: services: databases: Change quote' to single-quote. In the postgresql-config-file gexp compiler. * gnu/services/databases.scm (postgresql-config-file-compiler): Change quote' to single-quote. --- gnu/services/databases.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 72927c4534..8ae248ebe4 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -112,7 +112,7 @@ (define-gexp-compiler (postgresql-config-file-compiler (match file (($ log-destination hba-file ident-file extra-config) - (define (quote' string) + (define (single-quote string) (if string (list "'" string "'") '())) @@ -124,9 +124,9 @@ (define contents ((key . #f) '()) ((key values ...) `(,key " = " ,@values "\n"))) - `(("log_destination" ,@(quote' log-destination)) - ("hba_file" ,@(quote' hba-file)) - ("ident_file" ,@(quote' ident-file)) + `(("log_destination" ,@(single-quote log-destination)) + ("hba_file" ,@(single-quote hba-file)) + ("ident_file" ,@(single-quote ident-file)) ,@extra-config))) (gexp->derivation -- cgit v1.2.3 From fb6f35ba1d96072b22e767dec788446123acf29f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 13 Mar 2018 18:47:41 +0000 Subject: gnu: Add python-prometheus-client. * gnu/packages/monitoring.scm (python-prometheus-client, python2-prometheus-client): New variables. --- gnu/packages/monitoring.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index c5a86d02c6..31ec88db81 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -28,6 +28,7 @@ (define-module (gnu packages monitoring) #:use-module (guix build-system gnu) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages django) #:use-module (gnu packages gd) @@ -262,3 +263,33 @@ (define-public python2-graphite-web two things: store numeric time-series data, and render graphs of this data on demand.") (license license:asl2.0))) + +(define-public python-prometheus-client + (package + (name "python-prometheus-client") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prometheus_client" version)) + (sha256 + (base32 + "164qzzg8q8awqk0angcm87p2sjiibaj1wgjz0xk6j0klvqi5q2mz")))) + (build-system python-build-system) + (arguments + '(;; No included tests. + #:tests? #f)) + (home-page + "https://github.com/prometheus/client_python") + (synopsis "Python client for the Prometheus monitoring system") + (description + "The @code{prometheus_client} package supports exposing metrics from +software written in Python, so that they can be scraped by a Prometheus +service. + +Metrics can be exposed through a standalone web server, or through Twisted, +WSGI and the node exporter textfile collector.") + (license license:asl2.0))) + +(define-public python2-prometheus-client + (package-with-python2 python-prometheus-client)) -- cgit v1.2.3 From 308b17f676999876bfec12841659cbfa56a652be Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 17 Mar 2018 21:55:24 +0100 Subject: Revert "gnu: shaderc: Use more standard keys." This reverts commit 9bc0591bc11190ac49c8ea3cf44c4903c924f6c7. This commit broke 'shaderc'. --- gnu/packages/vulkan.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 4d981416d0..bd0fb9e1ce 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -225,18 +225,11 @@ (define-public shaderc "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) (build-system meson-build-system) (arguments - `(#:build-type "Release" - #:configure-flags - (list "-GNinja" - "-DSHADERC_SKIP_TESTS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out"))) - #:tests? #f ; tests don't work yet. + `(#:tests? #f ; tests don't work yet. #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key build-type configure-flags #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remove various lines and touch build-version.inc or ;; configuring won't work. @@ -254,8 +247,11 @@ (define-public shaderc (substitute* "CMakeLists.txt" ((".*--check.*") "")) (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") "\"1\"")) - (invoke "cmake" (cons build-type configure-flags)) - #t))) + (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" + "-DSHADERC_SKIP_TESTS=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_PREFIX=" + out))))) (add-after 'unpack 'unpack-sources (lambda* (#:key inputs #:allow-other-keys) (let ((spirv-tools-source (assoc-ref %build-inputs -- cgit v1.2.3 From 5983b78368f1033c52cc5e824115975ab0b31dff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 17 Mar 2018 23:08:34 +0200 Subject: gnu: shaderc: Clean up package arguments. * gnu/packages/vulkan.scm (shaderc)[version]: Remove extra '-'. [arguments]: Remove extra 'mkdir-p' calls and refer to inputs directly. --- gnu/packages/vulkan.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index bd0fb9e1ce..12b1f93015 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,7 +213,7 @@ (define-public shaderc (revision "1")) (package (name "shaderc") - (version (git-version "0.0.0-" revision commit)) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -254,22 +255,14 @@ (define-public shaderc out))))) (add-after 'unpack 'unpack-sources (lambda* (#:key inputs #:allow-other-keys) - (let ((spirv-tools-source (assoc-ref %build-inputs - "spirv-tools-source")) - (spirv-headers-source (assoc-ref %build-inputs - "spirv-headers-source")) - (glslang-source (assoc-ref %build-inputs - "glslang-source"))) - (mkdir-p "third-party/spirv-tools") - (copy-recursively spirv-tools-source - "third_party/spirv-tools") - (mkdir-p "third-party/spirv-tools/external/spirv-headers") + (let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source")) + (spirv-headers-source (assoc-ref inputs "spirv-headers-source")) + (glslang-source (assoc-ref inputs "glslang-source"))) + (copy-recursively spirv-tools-source "third_party/spirv-tools") (copy-recursively spirv-headers-source (string-append "third_party/spirv-tools" "/external/spirv-headers")) - (mkdir-p "third-party/glslang") - (copy-recursively glslang-source - "third_party/glslang") + (copy-recursively glslang-source "third_party/glslang") #t)))))) (inputs `(("python" ,python))) -- cgit v1.2.3 From 3c274149688472cca4f506483b82d0b7865481b3 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Tue, 13 Mar 2018 22:55:10 +0100 Subject: gnu: java-simple-xml: Fix java8 test failures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/javas-simple-xml-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/java.scm (java-simple-xml)[source](patches): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + .../patches/java-simple-xml-fix-tests.patch | 37 ++++++++++++++++++++++ gnu/packages/xml.scm | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-simple-xml-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 788b260e5e..f27565bb29 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -789,6 +789,7 @@ dist_patch_DATA = \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ + %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ diff --git a/gnu/packages/patches/java-simple-xml-fix-tests.patch b/gnu/packages/patches/java-simple-xml-fix-tests.patch new file mode 100644 index 0000000000..6270b87009 --- /dev/null +++ b/gnu/packages/patches/java-simple-xml-fix-tests.patch @@ -0,0 +1,37 @@ +From b3b7a305f1278ec414500bf96c4c7a7f634c941b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jens=20Thee=C3=9F?= +Date: Thu, 15 Sep 2016 13:08:26 +0200 +Subject: [PATCH] Dictionary uses stable order. This fixes unit tests. + +This is upstream pull request #15: +https://github.com/ngallagher/simplexml/pull/15 +This software is unmaintained, this pull request will no get merged. +The patch is modified, to match the directory layout of the tarball. + +--- + src/main/java/org/simpleframework/xml/util/Dictionary.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/org/simpleframework/xml/util/Dictionary.java b/src/main/java/org/simpleframework/xml/util/Dictionary.java +index 077d2514..c7327426 100644 +--- a/src/org/simpleframework/xml/util/Dictionary.java ++++ b/src/org/simpleframework/xml/util/Dictionary.java +@@ -19,8 +19,8 @@ + package org.simpleframework.xml.util; + + import java.util.AbstractSet; +-import java.util.HashMap; + import java.util.Iterator; ++import java.util.LinkedHashMap; + + /** + * The Dictionary object represents a mapped set of entry +@@ -134,7 +134,7 @@ public T remove(String name) { + * + * @see org.simpleframework.xml.util.Entry + */ +- private static class Table extends HashMap { ++ private static class Table extends LinkedHashMap { + + /** + * Constructor for the Table object. This will diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6c1d2a7796..212b1c8e8a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1309,7 +1309,8 @@ (define-public java-simple-xml version ".zip")) (sha256 (base32 - "0w19k1awslmihpwsxwjbg89hv0vjhk4k3i0vrfchy3mqknd988y5")))) + "0w19k1awslmihpwsxwjbg89hv0vjhk4k3i0vrfchy3mqknd988y5")) + (patches (search-patches "java-simple-xml-fix-tests.patch")))) (build-system ant-build-system) (arguments `(#:build-target "build" -- cgit v1.2.3 From 985934cb218eaa44b255cfc464b11ce05f691973 Mon Sep 17 00:00:00 2001 From: Martin Castillo Date: Thu, 15 Mar 2018 23:40:58 +0100 Subject: services: openssh: Add 'accepted-environment' field. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/ssh.scm ()[accepted-environment]: New field. (openssh-config-file): Honor 'acccepted-environment'. * doc/guix.texi (Networking Services): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 17 +++++++++++++++++ gnu/services/ssh.scm | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index bcea89e07b..b768b20d6b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11158,6 +11158,23 @@ server. Alternately, one can specify the @command{sftp-server} command: `(("sftp" ,(file-append openssh "/libexec/sftp-server")))))) @end example +@item @code{accepted-environment} (default: @code{'()}) +List of strings describing which environment variables may be exported. + +Each string gets on its own line. See the @code{AcceptEnv} option in +@code{man sshd_config}. + +This example allows ssh-clients to export the @code{COLORTERM} variable. +It is set by terminal emulators, which support colors. You can use it in +your shell's ressource file to enable colors for the prompt and commands +if this variable is set. + +@example +(service openssh-service-type + (openssh-configuration + (accepted-environment '("COLORTERM")))) +@end example + @item @code{authorized-keys} (default: @code{'()}) @cindex authorized keys, SSH @cindex SSH authorized keys diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 301ba74041..f1d2be3f6b 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -302,6 +302,10 @@ (define-record-type* (subsystems openssh-configuration-subsystems (default '(("sftp" "internal-sftp")))) + ;; list of strings + (accepted-environment openssh-configuration-accepted-environment + (default '())) + ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys (default '())) @@ -430,6 +434,9 @@ (define (openssh-config-file config) (format port "AuthorizedKeysFile \ .ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u\n") + (for-each (lambda (s) (format port "AcceptEnv ~a\n" s)) + '#$(openssh-configuration-accepted-environment config)) + (for-each (match-lambda ((name command) (format port "Subsystem\t~a\t~a\n" name command))) -- cgit v1.2.3 From 44dd3d579db3aa467e41d0b431029e46cae8e12d Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 16 Mar 2018 14:53:09 +0100 Subject: import: elpa: use https in download URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/elpa.scm (elpa-url): Use HTTPS. Signed-off-by: Ludovic Courtès --- guix/import/elpa.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 45a419217c..7f76a13adb 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -69,9 +69,9 @@ (define (elpa-name->package-name name) (define* (elpa-url #:optional (repo 'gnu)) "Retrun the URL of REPO." (let ((elpa-archives - '((gnu . "http://elpa.gnu.org/packages") - (melpa-stable . "http://stable.melpa.org/packages") - (melpa . "http://melpa.org/packages")))) + '((gnu . "https://elpa.gnu.org/packages") + (melpa-stable . "https://stable.melpa.org/packages") + (melpa . "https://melpa.org/packages")))) (assq-ref elpa-archives repo))) (define* (elpa-fetch-archive #:optional (repo 'gnu)) -- cgit v1.2.3 From 07d2fed2f60c43372446bee5fa2ac779e4acb0eb Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 16 Mar 2018 14:55:10 +0100 Subject: import: elpa: Fix typos in documentation strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/elpa.scm: Fix typos in docstrings. Signed-off-by: Ludovic Courtès --- guix/import/elpa.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 7f76a13adb..5d3d04ee7c 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -67,7 +67,7 @@ (define (elpa-name->package-name name) (string-append package-name-prefix (string-downcase name))))) (define* (elpa-url #:optional (repo 'gnu)) - "Retrun the URL of REPO." + "Retrieve the URL of REPO." (let ((elpa-archives '((gnu . "https://elpa.gnu.org/packages") (melpa-stable . "https://stable.melpa.org/packages") @@ -75,7 +75,7 @@ (define* (elpa-url #:optional (repo 'gnu)) (assq-ref elpa-archives repo))) (define* (elpa-fetch-archive #:optional (repo 'gnu)) - "Retrive the archive with the list of packages available from REPO." + "Retrieve the archive with the list of packages available from REPO." (let ((url (and=> (elpa-url repo) (cut string-append <> "/archive-contents")))) (if url -- cgit v1.2.3 From c217df913e00327f5c9b779fd97e222c4c22dab9 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 17 Mar 2018 15:57:19 +0000 Subject: gnu: fvwm: Add '.desktop' file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fvwm.scm (fvwm)[arguments]: Add new phase to create '.desktop' file. Signed-off-by: Ludovic Courtès --- gnu/packages/fvwm.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm index 5ff3d5e4f2..a4c31aefc6 100644 --- a/gnu/packages/fvwm.scm +++ b/gnu/packages/fvwm.scm @@ -45,6 +45,27 @@ (define-public fvwm (base32 "0wzghjgy65pkn31rgl14fngizw7nbkzbxsfa670xmrndpmd4sr81")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (with-output-to-file + (string-append xsessions "/fvwm2.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=FVWM~@ + Comment=FVWM~@ + Exec=~a/bin/fvwm~@ + TryExec=~@*~a/bin/fvwm~@ + Icon=~@ + Type=Application~%" + out)))) + #t))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 80f565d3137eceb479b8f7d39c26e00385dd65f6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 17 Mar 2018 23:04:30 +0100 Subject: gnu: datamash: Update to 1.3. * gnu/packages/datamash.scm (datamash): Update to 1.3. --- gnu/packages/datamash.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm index 60c9ba795b..e839a1d985 100644 --- a/gnu/packages/datamash.scm +++ b/gnu/packages/datamash.scm @@ -28,7 +28,7 @@ (define-module (gnu packages datamash) (define-public datamash (package (name "datamash") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ (define-public datamash version ".tar.gz")) (sha256 (base32 - "15jrv3ly0vgvwwi2qjmhi39n7wrklwifdk961wwfaxyc5jr6zm78")))) + "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf")))) (native-inputs `(("which" ,which) ;for tests ("perl" ,perl))) ;for help2man -- cgit v1.2.3 From b34ac8248205d64b4023412e61512dfefe44cb9e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 17 Mar 2018 23:20:15 +0100 Subject: gnu: nss-mdns: Adjust Avahi socket file name. Fixes . Regression introduced in 550f4509acf2c0f67882260414b0bb2843e07465. Reported by George myglc2 Clemmer . * gnu/packages/avahi.scm (nss-mdns)[arguments]: Remove #:configure-flags. Add #:phases. --- gnu/packages/avahi.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 480b5e8d97..7734028dc3 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -99,10 +99,18 @@ (define-public nss-mdns (method url-fetch)))))) (build-system gnu-build-system) (arguments - ;; The Avahi daemon socket is expected by src/Makefile.am to be at - ;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir) - ;; appropriately. - '(#:configure-flags '("--localstatedir=/var"))) + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-avahi-socket-name + (lambda _ + ;; The Avahi daemon socket is expected by + ;; src/Makefile.am to be at + ;; "$(localstatedir)/run/avahi-daemon/socket", but + ;; nowadays it lives in /run/avahi-daemon/socket. + ;; Remove the "$(localstatedir)" bit. + (substitute* "src/Makefile.in" + (("\\$\\(localstatedir)/run/avahi-daemon/socket") + "/run/avahi-daemon/socket")) + #t))))) (synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in") (description "Nss-mdns is a plug-in for the GNU C Library's Name Service Switch -- cgit v1.2.3 From 44efe67ed0def7b1c246e8705d23f4554b65247f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 17 Mar 2018 23:58:22 +0100 Subject: gnu: guile-git: Update to 2bb9fbb. * gnu/packages/guile.scm (guile-git): Update to 2bb9fbb. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1e8aca1acf..ddd34ae7dc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1960,8 +1960,8 @@ (define-public guile-fibers (license license:lgpl3+))) (define-public guile-git - (let ((revision "4") - (commit "951a32c56cc4d80f8836e3c7394783e69c1fcbad")) + (let ((revision "5") + (commit "2bb9fbbf93cf93496718efc85ad9394aefa21029")) (package (name "guile-git") (version (string-append "0.0-" revision "." (string-take commit 7))) @@ -1971,7 +1971,7 @@ (define-public guile-git (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "0qri9x73ij6g40ijs4hyhj8knxw39ydgghiafq74dp99bc8hh0qc")) + "0z3v0v89dyp35zx2h2gsq6v29lba3wbzabc5n2g4hx2fcb6q5qqy")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 95bd9f65a8ee64d17707a76aebc8720bbd961b68 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 17 Mar 2018 23:59:18 +0100 Subject: git: 'switch-to-ref' accepts short commit IDs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Björn Höfling . * guix/git.scm (switch-to-ref): When REF is a commit, check the length of COMMIT and use 'object-lookup-prefix' if available. --- guix/git.scm | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index fc41e2ace3..d31c35f64f 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,8 @@ (define-module (guix git) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (%repository-cache-directory latest-repository-commit)) @@ -94,17 +97,32 @@ (define (dot-git? file stat) (define (switch-to-ref repository ref) "Switch to REPOSITORY's branch, commit or tag specified by REF." - (let* ((oid (match ref - (('branch . branch) - (reference-target - (branch-lookup repository branch BRANCH-REMOTE))) - (('commit . commit) - (string->oid commit)) - (('tag . tag) - (reference-name->oid repository - (string-append "refs/tags/" tag))))) - (obj (object-lookup repository oid))) - (reset repository obj RESET_HARD))) + (define obj + (match ref + (('branch . branch) + (let ((oid (reference-target + (branch-lookup repository branch BRANCH-REMOTE)))) + (object-lookup repository oid))) + (('commit . commit) + (let ((len (string-length commit))) + ;; 'object-lookup-prefix' appeared in Guile-Git in Mar. 2018, so we + ;; can't be sure it's available. Furthermore, 'string->oid' used to + ;; read out-of-bounds when passed a string shorter than 40 chars, + ;; which is why we delay calls to it below. + (if (< len 40) + (if (module-defined? (resolve-interface '(git object)) + 'object-lookup-prefix) + (object-lookup-prefix repository (string->oid commit) len) + (raise (condition + (&message + (message "long Git object ID is required"))))) + (object-lookup repository (string->oid commit))))) + (('tag . tag) + (let ((oid (reference-name->oid repository + (string-append "refs/tags/" tag)))) + (object-lookup repository oid))))) + + (reset repository obj RESET_HARD)) (define* (latest-repository-commit store url #:key -- cgit v1.2.3 From c4d2cffae7e8d6420dd7bd1fd19d31ddab89c101 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 25 Feb 2018 14:27:32 +0000 Subject: gnu: Add go-github-com-tj-docopt. * gnu/packages/golang.scm (go-github-com-tj-docopt): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 20a8c538be..92e612d34b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Sergei Trofimovich ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -639,3 +640,27 @@ (define-public go-github.com-jtolds-gls per-goroutine.") (home-page "https://github.com/jtolds/gls") (license license:expat))) + +(define-public go-github-com-tj-docopt + (package + (name "go-github-com-tj-docopt") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tj/docopt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06h8hdg1mh3s78zqlr01g4si7k0f0g6pr7fj7lnvfg446hgc7080")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/tj/docopt")) + (synopsis "Go implementation of docopt") + (description + "This library allows the user to define a command-line interface from a +program's help message rather than specifying it programatically with +command-line parsers.") + (home-page "https://github.com/tj/docopt") + (license license:expat))) -- cgit v1.2.3 From ed0c6a768ee84fadfc88d3701fbbee982fa033a5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 25 Feb 2018 14:28:12 +0000 Subject: gnu: Add go-github-com-hashicorp-hcl. * gnu/packages/golang.scm (go-github-com-hashicorp-hcl): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 92e612d34b..e0ce1032f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -664,3 +664,30 @@ (define-public go-github-com-tj-docopt command-line parsers.") (home-page "https://github.com/tj/docopt") (license license:expat))) + +(define-public go-github-com-hashicorp-hcl + (let ((commit "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8") + (revision "0")) + (package + (name "go-github-com-hashicorp-hcl") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hashicorp/hcl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc")))) + (build-system go-build-system) + (arguments + '(#:tests? #f + #:import-path "github.com/hashicorp/hcl")) + (synopsis "Go implementation of HashiCorp Configuration Language") + (description + "This package contains the main implementation of the @acronym{HCL, +HashiCorp Configuration Language}. HCL is designed to be a language for +expressing configuration which is easy for both humans and machines to read.") + (home-page "https://github.com/hashicorp/hcl") + (license license:mpl2.0)))) -- cgit v1.2.3 From be5ed142135e939cd23fcfe88c553fd28b32ac53 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 25 Feb 2018 14:30:46 +0000 Subject: gnu: Add terraform-docs. * gnu/packages/terraform.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/terraform.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/terraform.scm diff --git a/gnu/local.mk b/gnu/local.mk index f27565bb29..dfb3073d7a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -411,6 +411,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tcl.scm \ %D%/packages/telephony.scm \ %D%/packages/terminals.scm \ + %D%/packages/terraform.scm \ %D%/packages/texinfo.scm \ %D%/packages/tex.scm \ %D%/packages/textutils.scm \ diff --git a/gnu/packages/terraform.scm b/gnu/packages/terraform.scm new file mode 100644 index 0000000000..71b214ed0a --- /dev/null +++ b/gnu/packages/terraform.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Christopher Baines +;;; +;;; 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 . + +(define-module (gnu packages terraform) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system go) + #:use-module (gnu packages golang)) + +(define-public terraform-docs + (package + (name "terraform-docs") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/segmentio/terraform-docs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xchpik32ab8m89s6jv671vswg8xhprfvh6s5md0zd36482d2nmm")))) + (build-system go-build-system) + (native-inputs + `(("go-github-com-hashicorp-hcl" ,go-github-com-hashicorp-hcl) + ("go-github-com-tj-docopt" ,go-github-com-tj-docopt))) + (arguments + '(#:import-path "github.com/segmentio/terraform-docs")) + (synopsis "Generate documentation from Terraform modules") + (description + "The @code{terraform-docs} utility can generate documentation describing +the inputs and outputs for modules of the Terraform infrastructure management +tool. These can be shown, or written to a file in JSON or Markdown formats.") + (home-page "https://github.com/segmentio/terraform-docs") + (license license:expat))) -- cgit v1.2.3