Merge branch 'master' into core-updates
Marius Bakke
commit
c57d649de3
|
|
@ -26,6 +26,8 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
|
|||
GUIX_SYSTEM_TYPE
|
||||
GUIX_ASSERT_SUPPORTED_SYSTEM
|
||||
|
||||
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
|
||||
|
||||
AC_ARG_WITH(store-dir,
|
||||
AC_HELP_STRING([--with-store-dir=PATH],
|
||||
[file name of the store (defaults to /gnu/store)]),
|
||||
|
|
|
|||
16
doc/local.mk
16
doc/local.mk
|
|
@ -1,6 +1,6 @@
|
|||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
|
||||
|
|
@ -185,6 +185,7 @@ sub_commands_mans = \
|
|||
$(srcdir)/%D%/guix-archive.1 \
|
||||
$(srcdir)/%D%/guix-build.1 \
|
||||
$(srcdir)/%D%/guix-challenge.1 \
|
||||
$(srcdir)/%D%/guix-deploy.1 \
|
||||
$(srcdir)/%D%/guix-download.1 \
|
||||
$(srcdir)/%D%/guix-edit.1 \
|
||||
$(srcdir)/%D%/guix-environment.1 \
|
||||
|
|
@ -197,12 +198,19 @@ sub_commands_mans = \
|
|||
$(srcdir)/%D%/guix-pull.1 \
|
||||
$(srcdir)/%D%/guix-refresh.1 \
|
||||
$(srcdir)/%D%/guix-size.1 \
|
||||
$(srcdir)/%D%/guix-system.1
|
||||
$(srcdir)/%D%/guix-system.1 \
|
||||
$(srcdir)/%D%/guix-time-machine.1 \
|
||||
$(srcdir)/%D%/guix-weather.1
|
||||
|
||||
# Assume that cross-compiled commands cannot be executed.
|
||||
if !CROSS_COMPILING
|
||||
|
||||
dist_man1_MANS = \
|
||||
$(srcdir)/%D%/guix.1 \
|
||||
$(sub_commands_mans)
|
||||
|
||||
endif
|
||||
|
||||
gen_man = \
|
||||
LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN) \
|
||||
$(HELP2MANFLAGS)
|
||||
|
|
@ -224,10 +232,12 @@ $(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
|
|||
esac
|
||||
|
||||
if BUILD_DAEMON
|
||||
if !CROSS_COMPILING
|
||||
|
||||
dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1
|
||||
|
||||
$(srcdir)/%D%/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
|
||||
$(srcdir)/%D%/guix-daemon.1: guix-daemon$(EXEEXT)
|
||||
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -778,6 +778,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/beignet-correct-file-names.patch \
|
||||
%D%/packages/patches/benchmark-unbundle-googletest.patch \
|
||||
%D%/packages/patches/biber-fix-encoding-write.patch \
|
||||
%D%/packages/patches/biber-sortinithash.patch \
|
||||
%D%/packages/patches/bidiv-update-fribidi.patch \
|
||||
%D%/packages/patches/binutils-boot-2.20.1a.patch \
|
||||
%D%/packages/patches/binutils-loongson-workaround.patch \
|
||||
|
|
@ -807,6 +808,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clang-6.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-7.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-9.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-10.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* GNU Guix --- Functional package management for GNU
|
||||
Copyright (C) 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
Copyright (C) 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
|
||||
This file is part of GNU Guix.
|
||||
|
||||
|
|
@ -343,7 +343,13 @@ Please refer to the 'guix pack' documentation for more information.\n");
|
|||
chdir ("/"); /* avoid EBUSY */
|
||||
rm_rf (new_root);
|
||||
free (new_root);
|
||||
exit (status);
|
||||
|
||||
if (WIFEXITED (status))
|
||||
exit (WEXITSTATUS (status));
|
||||
else
|
||||
/* Abnormal termination cannot really be reproduced, so exit
|
||||
with 255. */
|
||||
exit (255);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21162,3 +21162,245 @@ evaluated interactively.")
|
|||
Bayes factors, posterior model probabilities, and normalizing constants in
|
||||
general, via different versions of bridge sampling.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-tea
|
||||
(package
|
||||
(name "r-tea")
|
||||
(version "1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tea" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ql7lrxk0ihm49kqsvz79ig8i54rwiy9nxav4v9hy72j9kj5bgjn"))))
|
||||
(properties
|
||||
`((upstream-name . "tea")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-matrix" ,r-matrix)))
|
||||
(home-page "https://cran.r-project.org/web/packages/tea/")
|
||||
(synopsis "Threshold estimation approaches")
|
||||
(description
|
||||
"This package provides different approaches for selecting the threshold
|
||||
in generalized Pareto distributions. Most of them are based on minimizing the
|
||||
AMSE-criterion or atleast by reducing the bias of the assumed GPD-model.
|
||||
Others are heuristically motivated by searching for stable sample paths, i.e.
|
||||
a nearly constant region of the tail index estimator with respect to k, which
|
||||
is the number of data in the tail. The third class is motivated by graphical
|
||||
inspection. In addition, a sequential testing procedure for GPD-GoF-tests
|
||||
is also implemented here.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public r-awsmethods
|
||||
(package
|
||||
(name "r-awsmethods")
|
||||
(version "1.1-1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "awsMethods" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"))))
|
||||
(properties
|
||||
`((upstream-name . "awsMethods")))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://www.wias-berlin.de/software/imaging/")
|
||||
(synopsis "Class and methods definitions")
|
||||
(description
|
||||
"This package defines the generic method @code{extract} and provides
|
||||
@code{openMP} support as needed in several packages like
|
||||
@code{aws}, @code{adimpro}, @code{fmri}, and @code{dwi}.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-aws
|
||||
(package
|
||||
(name "r-aws")
|
||||
(version "2.4-2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "aws" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1czlsy64nx6j7h1smgb561yyv3f98pwqwglk77yla4mx3fp14bvq"))))
|
||||
(properties
|
||||
`((upstream-name . "aws")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-awsmethods" ,r-awsmethods)
|
||||
("r-gsl" ,r-gsl)))
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
(home-page "https://cran.r-project.org/web/packages/aws/")
|
||||
(synopsis "Adaptive weights smoothing")
|
||||
(description
|
||||
"This package provides a collection of R-functions implementing adaptive
|
||||
smoothing procedures in 1D, 2D and 3D. This includes the
|
||||
Propagation-Separation approach to adaptive smoothing, the @dfn{Intersecting
|
||||
Confidence Intervals} (ICI), variational approaches, and a non-local means
|
||||
filter.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-sgloptim
|
||||
(package
|
||||
(name "r-sgloptim")
|
||||
(version "1.3.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "sglOptim" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"))))
|
||||
(properties
|
||||
`((upstream-name . "sglOptim")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-bh" ,r-bh)
|
||||
("r-doparallel" ,r-doparallel)
|
||||
("r-foreach" ,r-foreach)
|
||||
("r-matrix" ,r-matrix)
|
||||
("r-rcpp" ,r-rcpp)
|
||||
("r-rcpparmadillo" ,r-rcpparmadillo)
|
||||
("r-rcppprogress" ,r-rcppprogress)))
|
||||
(native-inputs
|
||||
`(("r-knitr" ,r-knitr)))
|
||||
(home-page "https://github.com/nielsrhansen/sglOptim")
|
||||
(synopsis "Generic sparse group Lasso solver")
|
||||
(description
|
||||
"This package provides a fast generic solver for sparse group lasso
|
||||
optimization problems. The loss (objective) function must be defined in a C++
|
||||
module. The optimization problem is solved using a coordinate gradient
|
||||
descent algorithm. Convergence of the algorithm is established and the
|
||||
algorithm is applicable to a broad class of loss functions. Use of parallel
|
||||
computing for cross validation and subsampling is supported through the
|
||||
@code{foreach} and @code{doParallel} packages.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-grouped
|
||||
(package
|
||||
(name "r-grouped")
|
||||
(version "0.6-0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "grouped" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"))))
|
||||
(properties
|
||||
`((upstream-name . "grouped")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-mass" ,r-mass)))
|
||||
(home-page "https://cran.r-project.org/web/packages/grouped/")
|
||||
(synopsis "Regression analysis of grouped and coarse data")
|
||||
(description
|
||||
"This package provides regression models for grouped and coarse data,
|
||||
under the coarsened at random assumption.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-stam
|
||||
(package
|
||||
(name "r-stam")
|
||||
(version "0.0-1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "stam" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"))))
|
||||
(properties
|
||||
`((upstream-name . "stam")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-np" ,r-np)
|
||||
("r-sp" ,r-sp)))
|
||||
(home-page "https://cran.r-project.org/web/packages/stam")
|
||||
(synopsis "Spatio-temporal analysis and modelling")
|
||||
(description
|
||||
"This package provides various methods to conduct Spatio-Temporal
|
||||
Analysis and Modelling, including Exploratory Spatio-Temporal Analysis and
|
||||
Inferred Spatio-Temporal Modelling.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-dcv
|
||||
(package
|
||||
(name "r-dcv")
|
||||
(version "0.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "dcv" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"))))
|
||||
(properties
|
||||
`((upstream-name . "dcv")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-lmtest" ,r-lmtest)))
|
||||
(home-page "https://cran.r-project.org/web/packages/dcv/")
|
||||
(synopsis "Conventional cross-validation statistics for climate-growth model")
|
||||
(description
|
||||
"This package performs several conventional cross-validation statistical
|
||||
methods for climate-growth model in the climate reconstruction from tree
|
||||
rings, including Sign Test statistic, Reduction of Error statistic, Product
|
||||
Mean Test, Durbin-Watson statistic etc.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-rcdd
|
||||
(package
|
||||
(name "r-rcdd")
|
||||
(version "1.2-2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rcdd" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pzpbqnlgzr240iici70278py5wnbbxkzlgn112f9wv5ga3riric"))))
|
||||
(properties
|
||||
`((upstream-name . "rcdd")))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("gmp" ,gmp)))
|
||||
(home-page "https://www.stat.umn.edu/geyer/rcdd/")
|
||||
(synopsis "Computational geometry")
|
||||
(description
|
||||
"This package converts back and forth between two representations of a
|
||||
convex polytope: as solution of a set of linear equalities and inequalities
|
||||
and as convex hull of set of points and rays. Also does linear programming
|
||||
and redundant generator elimination. All functions can use exact
|
||||
infinite-precision rational arithmetic.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-rxnat
|
||||
(package
|
||||
(name "r-rxnat")
|
||||
(version "1.0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "Rxnat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12xcs2l6vn50bwzfmv60j1qahjw2npfm1a3yjhffcxzh6p8chwbg"))))
|
||||
(properties
|
||||
`((upstream-name . "Rxnat")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-httr" ,r-httr)
|
||||
("r-rcurl" ,r-rcurl)))
|
||||
(native-inputs
|
||||
`(("r-knitr" ,r-knitr)))
|
||||
(home-page "https://cran.r-project.org/web/packages/Rxnat/")
|
||||
(synopsis "Queries and extracts images from neuroimaging datasets")
|
||||
(description
|
||||
"This package allows communication with the Extensible Neuroimaging
|
||||
Archive Toolkit. Rxnat uses the XNAT REST API to perform data queries and
|
||||
download images.")
|
||||
(license license:gpl2)))
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
(define-public datamash
|
||||
(package
|
||||
(name "datamash")
|
||||
(version "1.6")
|
||||
(version "1.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"))))
|
||||
"1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"))))
|
||||
(native-inputs
|
||||
`(("which" ,which) ;for tests
|
||||
("perl" ,perl))) ;for help2man
|
||||
|
|
|
|||
|
|
@ -129,14 +129,14 @@ in between these sequences may be different in both content and length.")
|
|||
(define-public liburcu
|
||||
(package
|
||||
(name "liburcu")
|
||||
(version "0.12.0")
|
||||
(version "0.12.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.lttng.org/files/urcu/"
|
||||
"userspace-rcu-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"15wzk3nyy6gh6i7xhksxzs8fjar1g4ddz51iahk1v7lq0vjip6s0"))))
|
||||
"03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("perl" ,perl))) ; for tests
|
||||
|
|
|
|||
|
|
@ -205,24 +205,24 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
|
|||
(define-public grammalecte
|
||||
(package
|
||||
(name "grammalecte")
|
||||
(version "1.8.0")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://grammalecte.net/grammalecte/zip/"
|
||||
"Grammalecte-fr-v" version ".zip"))
|
||||
(sha256
|
||||
(base32 "06z2na1zs5q6vla45q5b8fzjwpckanmwh42r8in8vhb7a8v2fkyp"))))
|
||||
(base32 "1dmbmvf27dy0cnq2x7ldp9xmni8fl1p7vflgpy0yrgifgrjvnxzr"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://grammalecte.net")
|
||||
(synopsis "French spelling and grammar checker")
|
||||
(description "Grammalecte is a grammar checker dedicated to the French
|
||||
language, derived from Lightproof.
|
||||
(description "Grammalecte is a grammar checker for the French language,
|
||||
derived from Lightproof.
|
||||
|
||||
Grammalecte aims at helping to write a proper French without distracting users
|
||||
with false positives. This grammar checker follows the principle: the less
|
||||
false positives, the better; if it cannot know with a good chance if
|
||||
a dubious expression is wrong, it will keep silent.
|
||||
Grammalecte helps writing a proper French, without distracting users with
|
||||
false positives. This grammar checker follows the principle: the less false
|
||||
positives, the better; if it cannot know with a good chance that a dubious
|
||||
expression is wrong, it keeps silent.
|
||||
|
||||
The package provides the command line interface, along with a server
|
||||
and a Python library.")
|
||||
|
|
|
|||
|
|
@ -305,6 +305,9 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
|
|||
(properties '((upstream-name . "freefont")
|
||||
(ftp-directory . "/gnu/freefont")))))
|
||||
|
||||
(define-public font-gnu-freefont-ttf
|
||||
(deprecated-package "font-gnu-freefont-ttf" font-gnu-freefont))
|
||||
|
||||
(define-public font-liberation
|
||||
(package
|
||||
(name "font-liberation")
|
||||
|
|
|
|||
|
|
@ -369,26 +369,26 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(sha256 hash)))
|
||||
|
||||
|
||||
(define-public linux-libre-5.6-version "5.6.6")
|
||||
(define-public linux-libre-5.6-version "5.6.7")
|
||||
(define-public linux-libre-5.6-pristine-source
|
||||
(let ((version linux-libre-5.6-version)
|
||||
(hash (base32 "1m3blvkma08v5y11jh0vhf4sr7jbcylkh15bssb5dgp40p8cx134")))
|
||||
(hash (base32 "1jljcva3gxg1yc2kw3jjgmhzzdm16nylzxl63zbndjza547l5813")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.6)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.34")
|
||||
(define-public linux-libre-5.4-version "5.4.35")
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "1ljcsrw9jknw2d9hb0yfr1pwy85l8z4rqycgd0kad9mb9lrw2glh")))
|
||||
(hash (base32 "1m06k19pbb3wz8z2dgf03jvzbbdh6q8jwwdz509s902a53vxasz1")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.117")
|
||||
(define-public linux-libre-4.19-version "4.19.118")
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "12xc1pwhwq4vp67hmn7hdynl4ik76cni79356hpzf1lbiqlrya6n")))
|
||||
(hash (base32 "15lcq3xky59v88vb8vvnmgcsmm1fadz0m4jyrii6rynsz5jr6x49")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
|
||||
;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
|
|
@ -85,17 +85,17 @@ as \"x86_64-linux\"."
|
|||
(string-append "https://releases.llvm.org/" version "/" component "-"
|
||||
version ".src.tar.xz")))
|
||||
|
||||
(define-public llvm
|
||||
(define-public llvm-10
|
||||
(package
|
||||
(name "llvm")
|
||||
(version "9.0.1")
|
||||
(version "10.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (llvm-download-uri "llvm" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))))
|
||||
"1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "opt-viewer"))
|
||||
(native-inputs
|
||||
|
|
@ -405,24 +405,50 @@ output), and Binutils.")
|
|||
("libc-debug" ,glibc "debug")
|
||||
("libc-static" ,glibc "static")))))
|
||||
|
||||
(define-public clang-runtime
|
||||
(define-public clang-runtime-10
|
||||
(clang-runtime-from-llvm
|
||||
llvm
|
||||
llvm-10
|
||||
"0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba"))
|
||||
|
||||
(define-public clang-10
|
||||
(clang-from-llvm llvm-10 clang-runtime-10
|
||||
"08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"
|
||||
#:patches '("clang-10.0-libc-search-path.patch")))
|
||||
|
||||
(define-public clang-toolchain-10
|
||||
(make-clang-toolchain clang-10))
|
||||
|
||||
(define-public llvm-9
|
||||
(package
|
||||
(inherit llvm-10)
|
||||
(version "9.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (llvm-download-uri "llvm" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))))))
|
||||
|
||||
(define-public clang-runtime-9
|
||||
(clang-runtime-from-llvm
|
||||
llvm-9
|
||||
"0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"
|
||||
'("clang-runtime-9-libsanitizer-mode-field.patch")))
|
||||
|
||||
(define-public clang
|
||||
(clang-from-llvm llvm clang-runtime
|
||||
(define-public clang-9
|
||||
(clang-from-llvm llvm-9 clang-runtime-9
|
||||
"0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p"
|
||||
#:patches '("clang-9.0-libc-search-path.patch")))
|
||||
|
||||
(define-public clang-toolchain
|
||||
(make-clang-toolchain clang))
|
||||
(define-public clang-toolchain-9
|
||||
(make-clang-toolchain clang-9))
|
||||
|
||||
(define-public llvm-9 llvm)
|
||||
(define-public clang-runtime-9 clang-runtime)
|
||||
(define-public clang-9 clang)
|
||||
(define-public clang-toolchain-9 clang-toolchain)
|
||||
;; Default LLVM and Clang version.
|
||||
(define-public llvm llvm-9)
|
||||
(define-public clang-runtime clang-runtime-9)
|
||||
(define-public clang clang-9)
|
||||
(define-public clang-toolchain clang-toolchain-9)
|
||||
|
||||
(define-public llvm-8
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -5423,3 +5423,83 @@ plugin and a standalone JACK application.")
|
|||
offers an LV2 version ported by moddevices.")
|
||||
(home-page "http://tap-plugins.sourceforge.net/")
|
||||
(license license:gpl2))))
|
||||
|
||||
(define-public wolf-shaper
|
||||
(package
|
||||
(name "wolf-shaper")
|
||||
(version "0.1.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pdesaulniers/wolf-shaper.git")
|
||||
(commit (string-append "v" version))
|
||||
;; Bundles a specific commit of the DISTRHO plugin framework.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lllgcbnnh1m95bp29hh17x170hl7170zizjrvy892qfkn36830d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:make-flags (list "CC=gcc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ;no configure target
|
||||
(replace 'install ;no install target
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(lv2 (string-append out "/lib/lv2")))
|
||||
;; Install LV2.
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-recursively file
|
||||
(string-append lv2 "/" (basename file))))
|
||||
(find-files "bin" "\\.lv2$" #:directories? #t))
|
||||
;; Install executables.
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file bin))
|
||||
(find-files "bin"
|
||||
(lambda (name stat)
|
||||
(and
|
||||
(equal? (dirname name) "bin")
|
||||
(not (string-suffix? ".so" name))
|
||||
(not (string-suffix? ".lv2" name))))))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("jack", jack-1)
|
||||
("lv2", lv2)
|
||||
("mesa", mesa)))
|
||||
(synopsis "Waveshaper plugin")
|
||||
(description "Wolf Shaper is a waveshaper plugin with a graph editor.
|
||||
It is provided as an LV2 plugin and as a standalone Jack application.")
|
||||
(home-page "https://pdesaulniers.github.io/wolf-shaper/")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public wolf-spectrum
|
||||
(package
|
||||
(inherit wolf-shaper)
|
||||
(name "wolf-spectrum")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pdesaulniers/wolf-spectrum")
|
||||
(commit (string-append "v" version))
|
||||
;; Bundles a specific commit of the DISTRHO plugin framework.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17db1jlj7vb1xyvkdhhrsvdbwb7jqw6i4168cdvlj3yvn2ra8gpm"))))
|
||||
(synopsis "2D spectrogram plugin")
|
||||
(description "Wolf Spectrum is a real-time 2D spectrogram plugin.
|
||||
It is provided as an LV2 plugin and as a standalone Jack application.")
|
||||
(home-page "https://github.com/pdesaulniers/wolf-spectrum")
|
||||
(license license:gpl3)))
|
||||
|
|
|
|||
|
|
@ -919,14 +919,15 @@ TCP connection, TLS handshake and so on) in the terminal.")
|
|||
(define-public squid
|
||||
(package
|
||||
(name "squid")
|
||||
(version "4.10")
|
||||
(version "4.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.squid-cache.org/Versions/v4/squid-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q"))))
|
||||
(base32
|
||||
"0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@
|
|||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||
;; start precisely like this.
|
||||
(let ((version "1.1.0")
|
||||
(commit "d62c9b2671be55ae0305bebfda17b595f33797f2")
|
||||
(revision 0))
|
||||
(commit "7dd05396ef4539165f955d9ab57225091f801ce9")
|
||||
(revision 1))
|
||||
(package
|
||||
(name "guix")
|
||||
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0v76hb0pidfgvxa22gq6hqf5yc3m527gl7hpzykazgjh881g2vmy"))
|
||||
"110fz4qay4iywpynw1cbv6if8ac0pxp21zhzwvnp2jn1f6vbwf64"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,84 @@
|
|||
Clang attempts to guess file names based on the OS and distro (yes!),
|
||||
but unfortunately, that doesn't work for us.
|
||||
|
||||
This patch makes it easy to insert libc's $libdir so that Clang passes the
|
||||
correct absolute file name of crt1.o etc. to 'ld'. It also disables all
|
||||
the distro-specific stuff and removes the hard-coded FHS directory names
|
||||
to make sure Clang also works on non-Guix systems.
|
||||
|
||||
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
|
||||
index bff1ab10..79e1477e 100644
|
||||
--- a/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ b/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -240,6 +240,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
.str());
|
||||
}
|
||||
|
||||
+// Comment out the distro-specific tweaks so that they don't bite when
|
||||
+// using Guix on a foreign distro.
|
||||
+#if 0
|
||||
Distro Distro(D.getVFS(), Triple);
|
||||
|
||||
if (Distro.IsAlpineLinux() || Triple.isAndroid()) {
|
||||
@@ -306,6 +309,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
|
||||
if (IsAndroid || Distro.IsOpenSUSE())
|
||||
ExtraOpts.push_back("--enable-new-dtags");
|
||||
+#endif // Guix
|
||||
|
||||
// The selection of paths to try here is designed to match the patterns which
|
||||
// the GCC driver itself uses, as this is part of the GCC-compatible driver.
|
||||
@@ -363,7 +367,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
// the cross. Note that GCC does include some of these directories in some
|
||||
// configurations but this seems somewhere between questionable and simply
|
||||
// a bug.
|
||||
- if (StringRef(LibPath).startswith(SysRoot)) {
|
||||
+ if (0) {
|
||||
addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths);
|
||||
addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths);
|
||||
}
|
||||
@@ -382,6 +386,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
|
||||
addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
|
||||
|
||||
+// This requires the commented distro tweaks above.
|
||||
+#if 0
|
||||
if (IsAndroid) {
|
||||
// Android sysroots contain a library directory for each supported OS
|
||||
// version as well as some unversioned libraries in the usual multiarch
|
||||
@@ -410,10 +416,15 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths);
|
||||
addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths);
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Try walking via the GCC triple path in case of biarch or multiarch GCC
|
||||
// installations with strange symlinks.
|
||||
if (GCCInstallation.isValid()) {
|
||||
+
|
||||
+// The following code would end up adding things like
|
||||
+// "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path.
|
||||
+#if 0
|
||||
addPathIfExists(D,
|
||||
SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
|
||||
"/../../" + OSLibDir,
|
||||
@@ -426,6 +437,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
BiarchSibling.gccSuffix(),
|
||||
Paths);
|
||||
}
|
||||
+#endif
|
||||
|
||||
// See comments above on the multilib variant for details of why this is
|
||||
// included even from outside the sysroot.
|
||||
@@ -450,8 +462,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
if (StringRef(D.Dir).startswith(SysRoot))
|
||||
addPathIfExists(D, D.Dir + "/../lib", Paths);
|
||||
|
||||
- addPathIfExists(D, SysRoot + "/lib", Paths);
|
||||
- addPathIfExists(D, SysRoot + "/usr/lib", Paths);
|
||||
+ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o,
|
||||
+ // and friends can be found.
|
||||
+ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths);
|
||||
}
|
||||
|
||||
ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const {
|
||||
|
|
@ -36,6 +36,8 @@
|
|||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages engineering)
|
||||
#:use-module (gnu packages fltk)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gd)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
|
|
@ -44,6 +46,7 @@
|
|||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages logging)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages networking)
|
||||
|
|
@ -53,9 +56,13 @@
|
|||
#:use-module (gnu packages python-science)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
|
|
@ -544,8 +551,10 @@ using GNU Radio and the Qt GUI toolkit.")
|
|||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("fltk" ,fltk)
|
||||
("hamlib" ,hamlib)
|
||||
("libpng" ,libpng)
|
||||
("libsamplerate" ,libsamplerate)
|
||||
("libusb" ,libusb)
|
||||
("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
("libxfixes" ,libxfixes)
|
||||
|
|
@ -644,3 +653,112 @@ transmitted over any of several digital modes and verified at the receipt end
|
|||
for correctness.")
|
||||
(home-page "http://www.w1hkj.com/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public hamlib
|
||||
(package
|
||||
(name "hamlib")
|
||||
(version "3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/Hamlib/Hamlib/releases/download/"
|
||||
version "/hamlib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
("lua" ,lua)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("swig" ,swig)
|
||||
("tcl" ,tcl)))
|
||||
(inputs
|
||||
`(("gd" ,gd)
|
||||
("libusb" ,libusb)
|
||||
("libxml2" ,libxml2)
|
||||
("readline" ,readline)))
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static"
|
||||
"--with-lua-binding"
|
||||
"--with-python-binding"
|
||||
"--with-tcl-binding"
|
||||
"--with-xml-support")))
|
||||
(synopsis "Tools and API to control radios")
|
||||
(description
|
||||
"The Ham Radio Control Library (Hamlib) is a project to provide programs
|
||||
with a consistent Application Programming Interface (API) for controlling the
|
||||
myriad of radios and rotators available to amateur radio and communications
|
||||
users.")
|
||||
(home-page "https://hamlib.github.io/")
|
||||
(license (list license:gpl2+ license:lgpl2.1+))))
|
||||
|
||||
(define wsjtx-hamlib
|
||||
;; Fork of hamlib with custom patches used by wsjtx.
|
||||
(package
|
||||
(inherit hamlib)
|
||||
(name "wsjtx-hamlib")
|
||||
(version "2.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.code.sf.net/u/bsomervi/hamlib.git")
|
||||
(commit (string-append "wsjtx-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ksv3cmr1dl45p0pp1panyc9dngd158gvv9ysv25lq4nqv1wn87i"))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("texinfo" ,texinfo)
|
||||
,@(package-native-inputs hamlib)))))
|
||||
|
||||
(define-public wsjtx
|
||||
(package
|
||||
(name "wsjtx")
|
||||
(version "2.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.code.sf.net/p/wsjt/wsjtx.git")
|
||||
(commit (string-append "wsjtx-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1fnqzjd3dmxp3yjwjvwz2djk9gzb1y2cqfa188f3x8lynxhdhnfs"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete bundled boost to use the shared one.
|
||||
(delete-file-recursively "boost")
|
||||
#t))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("asciidoc" ,asciidoc)
|
||||
("gfortran" ,gfortran)
|
||||
("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)
|
||||
("ruby-asciidoctor" ,ruby-asciidoctor)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("fftw" ,fftw)
|
||||
("fftwf" ,fftwf)
|
||||
("hamlib" ,wsjtx-hamlib)
|
||||
("libusb" ,libusb)
|
||||
("qtbase" ,qtbase)
|
||||
("qtmultimedia" ,qtmultimedia)
|
||||
("qtserialport" ,qtserialport)))
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No test suite
|
||||
(synopsis "Weak-signal ham radio communication program")
|
||||
(description
|
||||
"WSJT-X implements communication protocols or modes called FT4, FT8,
|
||||
JT4, JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
|
||||
detecting and measuring your own radio signals reflected from the Moon. These
|
||||
modes were all designed for making reliable, confirmed QSOs under extreme
|
||||
weak-signal conditions.")
|
||||
(home-page "https://www.physics.princeton.edu/pulsar/k1jt/wsjtx.html")
|
||||
(license license:gpl3)))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
|
@ -5891,7 +5891,7 @@ values (strings, macros, or numbers) pasted together.")
|
|||
(define-public biber
|
||||
(package
|
||||
(name "biber")
|
||||
(version "2.12")
|
||||
(version "2.11")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -5900,10 +5900,11 @@ values (strings, macros, or numbers) pasted together.")
|
|||
(file-name (git-file-name name version))
|
||||
;; TODO: Patch awaiting inclusion upstream (see:
|
||||
;; https://github.com/plk/biber/issues/239).
|
||||
(patches (search-patches "biber-fix-encoding-write.patch"))
|
||||
(patches (search-patches "biber-fix-encoding-write.patch"
|
||||
"biber-sortinithash.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
|
||||
"0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -7023,6 +7024,32 @@ a different path and manipulating characters. It includes the functionality
|
|||
of the old package @code{pst-char}.")
|
||||
(license license:lppl))))
|
||||
|
||||
(define-public texlive-marginnote
|
||||
(let ((template (simple-texlive-package
|
||||
"texlive-marginnote"
|
||||
(list "/source/latex/marginnote/marginnote.dtx")
|
||||
(base32
|
||||
"1vj1k8xm11gjdfj60as42d8lsv3dbzrm5dlgqcfk89d9dzm3k39j"))))
|
||||
(package
|
||||
(inherit template)
|
||||
(home-page "http://www.ctan.org/pkg/marginnote")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments template)
|
||||
((#:tex-directory _ '())
|
||||
"latex/marginnote")
|
||||
((#:build-targets _ '())
|
||||
''("marginnote.dtx"))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _ (chdir "source/latex/marginnote") #t))))))
|
||||
(synopsis "Notes in the margin")
|
||||
(description "This package provides the command @code{\\marginnote} that
|
||||
may be used instead of @code{\\marginpar} at almost every place where
|
||||
@code{\\marginpar} cannot be used, e.g., inside floats, footnotes, or in
|
||||
frames made with the @code{framed} package.")
|
||||
(license license:lppl1.3c+))))
|
||||
|
||||
(define-public texlive-iftex
|
||||
(let ((template (simple-texlive-package
|
||||
"texlive-iftex"
|
||||
|
|
@ -7243,3 +7270,29 @@ commands as well as behind-the-scenes optimisation. Guidelines are given as
|
|||
to what constitutes a good table in this context. The package offers
|
||||
@code{longtable} compatibility.")
|
||||
(license license:lppl1.3+)))
|
||||
|
||||
(define-public texlive-csquotes
|
||||
(let ((template (simple-texlive-package
|
||||
"texlive-csquotes"
|
||||
(list "/doc/latex/csquotes/"
|
||||
"/tex/latex/csquotes/")
|
||||
(base32
|
||||
"15hgn37zg433skn7ijqs1kl2z56fhy29cjxn01b5pjrnrkdar4i4")
|
||||
#:trivial? #t)))
|
||||
(package
|
||||
(inherit template)
|
||||
(propagated-inputs
|
||||
`(("texlive-etoolbox" ,texlive-etoolbox)))
|
||||
(home-page "https://www.ctan.org/pkg/csquotes")
|
||||
(synopsis "Context sensitive quotation facilities")
|
||||
(description "This package provides advanced facilities for inline and
|
||||
display quotations. It is designed for a wide range of tasks ranging from the
|
||||
most simple applications to the more complex demands of formal quotations.
|
||||
The facilities include commands, environments, and user-definable 'smart
|
||||
quotes' which dynamically adjust to their context. Quotation marks are
|
||||
switched automatically if quotations are nested and they can be adjusted to
|
||||
the current language if the babel package is available. There are additional
|
||||
facilities designed to cope with the more specific demands of academic
|
||||
writing, especially in the humanities and the social sciences. All quote
|
||||
styles as well as the optional active quotes are freely configurable.")
|
||||
(license license:lppl1.3c+))))
|
||||
|
|
|
|||
|
|
@ -6280,12 +6280,14 @@ technologies.")
|
|||
(name "java-eclipse-jetty-test-helper")
|
||||
(version "4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/eclipse/jetty.toolchain/"
|
||||
"archive/jetty-test-helper-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/eclipse/jetty.toolchain/")
|
||||
(commit (string-append "jetty-test-helper-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jd6r9wc26fa11si4rn2gvy8ml8q4zw1nr6v04mjp8wvwpgvzwx5"))))
|
||||
"1g7cdh03nfwbdxzvwm84ysgvw08xx7431lsjryj2gmf3lrqpizgb"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "eclipse-jetty-test-helper.jar"
|
||||
|
|
|
|||
|
|
@ -194,6 +194,11 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"."
|
|||
(with-augmented-search-path %load-path source-directory
|
||||
(with-augmented-search-path %load-compiled-path build-directory
|
||||
(with-fluids ((*current-warning-prefix* ""))
|
||||
;; Make sure the compiler's modules are loaded before 'with-target'
|
||||
;; (since 'with-target' influences the .go loader), and before
|
||||
;; starting to compile files in parallel.
|
||||
(compile #f)
|
||||
|
||||
(with-target host
|
||||
(lambda ()
|
||||
;; FIXME: To work around <https://bugs.gnu.org/15602>, we first
|
||||
|
|
@ -202,10 +207,6 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"."
|
|||
#:report-load report-load
|
||||
#:debug-port debug-port)
|
||||
|
||||
;; Make sure compilation related modules are loaded before
|
||||
;; starting to compile files in parallel.
|
||||
(compile #f)
|
||||
|
||||
;; XXX: Don't use too many workers to work around the insane
|
||||
;; memory requirements of the compiler in Guile 2.2.2:
|
||||
;; <https://lists.gnu.org/archive/html/guile-devel/2017-05/msg00033.html>.
|
||||
|
|
|
|||
|
|
@ -179,7 +179,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
|
|||
;; can happen, for example, when the user swapped the revision and commit
|
||||
;; arguments by mistake.
|
||||
(when (< (string-length commit) 7)
|
||||
(error "git-version: commit ID unexpectedly short"))
|
||||
(raise
|
||||
(condition
|
||||
(&message (message "git-version: commit ID unexpectedly short")))))
|
||||
(string-append version "-" revision "." (string-take commit 7)))
|
||||
|
||||
(define (git-file-name name version)
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@
|
|||
delete-matching-generations
|
||||
guix-package
|
||||
|
||||
search-path-environment-variables
|
||||
|
||||
transaction-upgrade-entry ;mostly for testing
|
||||
|
||||
(%options . %package-options)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
|
@ -72,6 +72,10 @@ then
|
|||
# mounting an empty file system on top of it. That way, we exercise the
|
||||
# wrapper code that creates the user namespace and bind-mounts the store.
|
||||
unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"; echo "$STORE_PARENT"/*; "$test_directory/Bin/sed" --version > "$test_directory/output"'
|
||||
|
||||
# Check whether the exit code is preserved.
|
||||
if unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"; echo "$STORE_PARENT"/*; "$test_directory/Bin/sed" --does-not-exist';
|
||||
then false; else true; fi
|
||||
else
|
||||
# Run the relocatable 'sed' in the current namespaces. This is a weak
|
||||
# test because we're going to access store items from the host store.
|
||||
|
|
|
|||
Reference in New Issue