From 6a7f4d89b2029b43b766217d71d5dbbdfcc5fa09 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:47:10 +0100 Subject: doc: Clarify how sudo and guix interact when updating * doc/guix.texi (After System Installation): Explicitly explain the mechanics of how sudo differs from a login shell. Some recent discussions on IRC suggest that the existing wording wasn't entirely clear. --- doc/guix.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 282f9578bf..25b50bad9e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -73,6 +73,7 @@ Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* +Copyright @copyright{} 2020 Jakub Kądziołka@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -2440,6 +2441,11 @@ your system includes the latest security updates (@pxref{Security Updates}). Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}. + +The difference matters here, because @command{guix pull} updates +the @command{guix} command and package definitions only for the user it is ran +as. This means that if you choose to use @command{guix system reconfigure} in +root's login shell, you'll need to @command{guix pull} separately. @end quotation Join us on @code{#guix} on the Freenode IRC network or on -- cgit v1.2.3 From cc0cc9651a398822931e0b34714f64da6e04d0fa Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 14 Feb 2020 14:19:32 -0500 Subject: gnu: go-ipfs: Update to 0.4.23 * gnu/packages/ipfs.scm (go-ipfs): Update to 0.4.23 Signed-off-by: Leo Famulari --- gnu/packages/ipfs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 49612425fb..9fa3f144de 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -212,7 +212,7 @@ (define-public gx-go (define-public go-ipfs (package (name "go-ipfs") - (version "0.4.22") + (version "0.4.23") (source (origin (method url-fetch/tarbomb) @@ -220,7 +220,7 @@ (define-public go-ipfs "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "1gyz9yqb4y7p6vdjbcm66nvm6gjs4mdrjygdn79z3misv1pb5nkg")) + (base32 "191ir4h6c76xcnbwx9fj8j2lzzqyp10inmqd8sa393b5y0jmhi5a")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments -- cgit v1.2.3 From 459e0967705945bf6b5861598202aefef27451cd Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 9 Feb 2020 21:07:04 +0100 Subject: doc: Clarify documentation of guix environment --expose vs. --share MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The documentation for --expose and --share parameters are so similar that the reader has to read both descriptions in parallel to find the difference. * doc/guix.texi (Invoking guix environment)[--expose, --share]: Merge the two descriptions into one. Signed-off-by: Jakub Kądziołka --- doc/guix.texi | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 25b50bad9e..3c310c0912 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4964,8 +4964,10 @@ shared and will change to the user's home directory within the container instead. See also @code{--user}. @item --expose=@var{source}[=@var{target}] -For containers, expose the file system @var{source} from the host system -as the read-only file system @var{target} within the container. If +@item --share=@var{source}[=@var{target}] +For containers, @code{--expose} (resp. @code{--share}) exposes the file +system @var{source} from the host system as the read-only +(resp. writable) file system @var{target} within the container. If @var{target} is not specified, @var{source} is used as the target mount point in the container. @@ -4977,19 +4979,6 @@ directory: guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile @end example -@item --share=@var{source}[=@var{target}] -For containers, share the file system @var{source} from the host system -as the writable file system @var{target} within the container. If -@var{target} is not specified, @var{source} is used as the target mount -point in the container. - -The example below spawns a Guile REPL in a container in which the user's -home directory is accessible for both reading and writing via the -@file{/exchange} directory: - -@example -guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile -@end example @end table @command{guix environment} -- cgit v1.2.3 From 8cd2a395c7f2b4a607101ba2c9a3b8e47477e5a8 Mon Sep 17 00:00:00 2001 From: Maurice Bremond Date: Thu, 13 Feb 2020 11:50:55 +0100 Subject: gnu: mumps: Change "5.1.2" to "5.2.1" in library file names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/mumps-shared-libseq.patch, gnu/packages/patches/mumps-shared-mumps.patch, gnu/packages/patches/mumps-shared-pord.patch: Replace "5.1.2" with "5.2.1" in file names. Co-authored-by: Ludovic Courtès --- gnu/packages/patches/mumps-shared-libseq.patch | 2 +- gnu/packages/patches/mumps-shared-mumps.patch | 8 ++++---- gnu/packages/patches/mumps-shared-pord.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/patches/mumps-shared-libseq.patch b/gnu/packages/patches/mumps-shared-libseq.patch index feafcf123b..eccf528f7a 100644 --- a/gnu/packages/patches/mumps-shared-libseq.patch +++ b/gnu/packages/patches/mumps-shared-libseq.patch @@ -17,7 +17,7 @@ Index: mumps/libseq/Makefile + $(AR) $@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.1.2.so -o libmpiseq$(PLAT)-5.1.2.so -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.2.1.so -o libmpiseq$(PLAT)-5.2.1.so -Wl,-z,defs .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o diff --git a/gnu/packages/patches/mumps-shared-mumps.patch b/gnu/packages/patches/mumps-shared-mumps.patch index 9e2491f300..d94ccf6ce9 100644 --- a/gnu/packages/patches/mumps-shared-mumps.patch +++ b/gnu/packages/patches/mumps-shared-mumps.patch @@ -30,16 +30,16 @@ Index: mumps/src/Makefile -$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) - $(AR)$@ $? +$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.2.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.1.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.2.1.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s libmumps_common$(PLAT)-5.2.1.so $@ + +$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) + $(AR) $@ $? $(RANLIB) $@ +$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.2.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.1.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.2.1.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s lib$(ARITH)mumps$(PLAT)-5.2.1.so $@ + # Dependencies between modules: $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ diff --git a/gnu/packages/patches/mumps-shared-pord.patch b/gnu/packages/patches/mumps-shared-pord.patch index 48062d4f89..d3915b0ad9 100644 --- a/gnu/packages/patches/mumps-shared-pord.patch +++ b/gnu/packages/patches/mumps-shared-pord.patch @@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile $(RANLIB) $@ +libpord$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.1.2.so -o libpord$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libpord$(PLAT)-5.1.2.so $@ ++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.2.1.so -o libpord$(PLAT)-5.2.1.so -Wl,-z,defs ++ ln -s libpord$(PLAT)-5.2.1.so $@ + clean: rm -f *.o -- cgit v1.2.3 From 0c26e43ecacb5885d4ea59dcc9b118db192f2828 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:38:42 +0100 Subject: gnu: btrfs-progs: Install udev-rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (btrfs-progs)[arguments]: Add phase patch-makefile. [native-inputs]: Add lvm2, eudev. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d1ce205194..c5e27a07db 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4037,6 +4037,13 @@ (define-public btrfs-progs "static")) ; static versions of the binaries in "out" (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)") + (string-append (assoc-ref outputs "out") + "/lib/udev/rules.d"))) + #t)) (add-after 'build 'build-static (lambda _ (invoke "make" "static"))) (add-after 'install 'install-bash-completion @@ -4057,7 +4064,7 @@ (define-public btrfs-progs #:tests? #f ; XXX: require the 'btrfs' kernel module. #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel - (inputs `(("e2fsprogs" ,e2fsprogs) + (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert ("libblkid" ,util-linux) ("libblkid:static" ,util-linux "static") ("libuuid" ,util-linux) @@ -4077,6 +4084,8 @@ (define-public btrfs-progs ;; For tests. ("acl" ,acl) ("which" ,which) + ("dmsetup" ,lvm2) + ("udevadm" ,eudev) ;; The tests need 'grep' with perl regexp support. ("grep" ,grep))) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") -- cgit v1.2.3 From 117d8467be232bcc1b0136d04f362d95d975ca95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Feb 2020 23:03:36 +0100 Subject: doc: Use @itemx as needed. This is a followup to 459e0967705945bf6b5861598202aefef27451cd. * doc/guix.texi (Invoking guix environment): Use @itemx for '--share'. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3c310c0912..5d9292b2e9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4964,7 +4964,7 @@ shared and will change to the user's home directory within the container instead. See also @code{--user}. @item --expose=@var{source}[=@var{target}] -@item --share=@var{source}[=@var{target}] +@itemx --share=@var{source}[=@var{target}] For containers, @code{--expose} (resp. @code{--share}) exposes the file system @var{source} from the host system as the read-only (resp. writable) file system @var{target} within the container. If -- cgit v1.2.3 From 9e89b4196605457cff6ca14b21f86c7b25a22671 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 14 Feb 2020 17:01:34 -0500 Subject: gnu: VIGRA: Try to fix a build failure on the build farm. * gnu/packages/image.scm (vigra)[properties]: Set the maximum silent time to 7200 seconds. --- gnu/packages/image.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a79d63fb5d..f9da1e9e89 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1009,6 +1009,9 @@ (define-public vigra (sha256 (base32 "1bqs8vx5i1bzamvv563i24gx2xxdidqyxh9iaj46mbznhc84wmm5")))) (build-system cmake-build-system) + ;; Otherwise it fails on in the check phase after 3600 + ;; seconds of silence. + (properties '((max-silent-time . 7200))) (inputs `(("boost" ,boost) ("fftw" ,fftw) -- cgit v1.2.3 From da8ca4c3fc2ac36977e3190bb05802c487619e8c Mon Sep 17 00:00:00 2001 From: sirgazil Date: Fri, 14 Feb 2020 13:53:23 -0500 Subject: gnu: Add python-fuzzywuzzy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-fuzzywuzzy, python2-fuzzywuzzy): New variables. Signed-off-by: Jakub Kądziołka --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca559ca00a..aeea4df12a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -69,6 +69,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 sirgazil ;;; ;;; This file is part of GNU Guix. ;;; @@ -17541,3 +17542,31 @@ (define-public python-pypng files, with a focus on its use as an intermediate format for implementing custom PNG processing.") (license license:expat))) + +(define-public python-fuzzywuzzy + (package + (name "python-fuzzywuzzy") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fuzzywuzzy" version)) + (sha256 + (base32 + "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5")))) + (build-system python-build-system) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pycodestyle" ,python-pycodestyle) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-levenshtein" ,python-levenshtein))) + (home-page "https://github.com/seatgeek/fuzzywuzzy") + (synopsis "Fuzzy string matching in python") + (description "Approximate string matching using +@emph{Levenshtein Distance} to calculate the differences between +sequences.") + (license license:gpl2))) + +(define-public python2-fuzzywuzzy + (package-with-python2 python-fuzzywuzzy)) -- cgit v1.2.3 From ef2b1d2c8b60776bf66573b0c810474e9e1a4abd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Feb 2020 23:45:59 +0100 Subject: gnu: Add guile-webutils. * gnu/packages/guile-xyz.scm (guile-webutils): New variable. --- gnu/packages/guile-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e015503372..16b408900c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3038,3 +3038,36 @@ (define-public guile3.0-hashing (name "guile3.0-hashing") (native-inputs `(("guile" ,guile-next))))) + +(define-public guile-webutils + (let ((commit "8541904f761066dc9c27b1153e9a838be9a55299") + (revision "0")) + (package + (name "guile-webutils") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/cwebber/guile-webutils.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s9n3hbxd7lfpdi0x8wr0cfvlsf6g62ird9gbspxdrp5p05rbi64")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs + `(("guile" ,guile-2.2))) + (propagated-inputs + `(("guile-irregex" ,guile-irregex) + ("guile-gcrypt" ,guile-gcrypt))) + (home-page "https://notabug.org/cwebber/guile-webutils") + (synopsis "Web application authoring utilities for Guile") + (description + "This package provides tooling to write web applications in Guile, such +as signed sessions, multipart message support, etc.") + (license license:gpl3+)))) -- cgit v1.2.3 From 856650d9c1f9b0b2ac1b6daf32b1d48249c4aa24 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:07:58 -0500 Subject: gnu: linux-libre: Update deblob scripts. * gnu/packages/linux.scm (deblob-scripts-5.4): Update to 5.4.19. (deblob-scripts-4.19, deblob-scripts-4.14, deblob-scripts-4.9) (deblob-scripts-4.4): Update versions, although the scripts are unchanged. --- gnu/packages/linux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c5e27a07db..9140a6f852 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -191,31 +191,31 @@ (define (linux-libre-deblob-scripts version (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.14" + "5.4.19" (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "121px6030s89jh975sw0whwq315al6px1s7ildz3asql97bjdgc8"))) + (base32 "1ajzwyy6vgmihxpz3sbshzfzd0w8yzj0fihv0d5rjpr4z3gm48bk"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.98" + "4.19.103" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1w2wgxblpq09i33qmqgw5v3r5rm9vkkygr6m0sgv4zgczk9s29wr"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.167" + "4.14.170" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.211" + "4.9.213" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.211" + "4.4.213" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) -- cgit v1.2.3 From 6a9db45259507be5a1f8880c448fc3da75ae72e0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:01:52 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.214. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.214. (linux-libre-4.4-pristine-source): 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 9140a6f852..e50700d237 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -391,10 +391,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.213") +(define-public linux-libre-4.4-version "4.4.214") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0"))) + (hash (base32 "0v575wl85fg9c3ksdj570hxjcl9p1dxwzag3fm0qcrq75kp6bamn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 96100c0da94056027d93cb28ac311ed8f822035f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:02:51 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.214. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.214. (linux-libre-4.9-pristine-source): 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 e50700d237..c0fb94b78b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,10 +383,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.213") +(define-public linux-libre-4.9-version "4.9.214") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg"))) + (hash (base32 "10z4n792g88p46csla2g9b0m7vz40ln0901ffb2cfd3hmhyhjzxl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From d498aa8862f49c92e9d5af4e33ef075e8276c99f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:03:21 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.171. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.171. (linux-libre-4.14-pristine-source): 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 c0fb94b78b..75d3a377ea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -375,10 +375,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.170") +(define-public linux-libre-4.14-version "4.14.171") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll"))) + (hash (base32 "181jadiwfix23xmqfvg7hpacjd0523v7vy0frzn8g8dlwj4j9q2g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From c829faacefa2d80ff3229e95b7bb93d777ce3a5e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:03:53 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.104. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.104. (linux-libre-4.19-pristine-source): 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 75d3a377ea..c040750526 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,10 +367,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.103") +(define-public linux-libre-4.19-version "4.19.104") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l"))) + (hash (base32 "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From cab611d9d5b236ce5f54693f75235b19bea0d75a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 14 Feb 2020 22:04:26 -0500 Subject: gnu: linux-libre: Update to 5.4.20. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.20. (linux-libre-5.4-pristine-source): 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 c040750526..b5ade50ca8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,10 +359,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.19") +(define-public linux-libre-5.4-version "5.4.20") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m"))) + (hash (base32 "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From f36ec871d209290fa64cd0710639bee1c3740128 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 09:54:16 +0100 Subject: gnu: sbcl-iterate: Update to 1.5. * gnu/packages/lisp-xyz.scm (sbcl-iterate): Update to 1.5. [source]: Fetch from official project URL instead of Quicklisp archive. --- gnu/packages/lisp-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2682c731b9..f8d2dcf02c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -962,18 +962,15 @@ (define-public cl-parse-number (define-public sbcl-iterate (package (name "sbcl-iterate") - ;; The latest official release (1.4.3) fails to build so we have to take - ;; the current darcs tarball from quicklisp. - (version "20160825") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/iterate/" - "2016-08-25/iterate-" - version "-darcs.tgz")) + (uri (string-append "https://common-lisp.net/project/iterate/releases/" + "iterate-" version ".tar.gz")) (sha256 (base32 - "0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm")))) + "1lqsbhrkfl0yif46aymvb7l3nb9wdcmj4jyw485blj32jb4famzn")))) (build-system asdf-build-system/sbcl) (native-inputs `(("rt" ,sbcl-rt))) -- cgit v1.2.3 From e81b0719fc041bef307159a4c3ec9b494c1acb4a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 10:27:25 +0100 Subject: gnu: sbcl-rt: Fix source, home-page and license. * gnu/packages/lisp-xyz.scm (sbcl-rt)[source]: Use main repository instead of Quicklisp archive. [home-page]: Link to CLiki page. [license]: Source code indicates MIT license. --- gnu/packages/lisp-xyz.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f8d2dcf02c..afc56e89b2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1596,23 +1596,26 @@ (define-public ecl-cl-fad (sbcl-package->ecl-package sbcl-cl-fad)) (define-public sbcl-rt - (package - (name "sbcl-rt") - (version "1990.12.19") - (source - (origin - (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-" - "20101006-git" ".tgz")) - (sha256 - (base32 - "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v")))) - (build-system asdf-build-system/sbcl) - (synopsis "MIT Regression Tester") - (description - "RT provides a framework for writing regression test suites.") - (home-page "https://github.com/sharplispers/nibbles") - (license license:unlicense))) + (let ((commit "a6a7503a0b47953bc7579c90f02a6dba1f6e4c5a") + (revision "1")) + (package + (name "sbcl-rt") + (version (git-version "1990.12.19" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/rt.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b")))) + (build-system asdf-build-system/sbcl) + (synopsis "MIT Regression Tester") + (description + "RT provides a framework for writing regression test suites.") + (home-page "https://www.cliki.net/rt") + (license license:expat)))) (define-public cl-rt (sbcl-package->cl-source-package sbcl-rt)) -- cgit v1.2.3 From d9d8e3c22c5d6d4f75de955be4d70f8e922881d0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 10:48:02 +0100 Subject: gnu: sbcl-ptester: Fix source and license. * gnu/packages/lisp-xyz.scm (sbcl-ptester)[source]: Use main repository instead of Quicklisp archive. [license]: Source code indicates LLGPL license. --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index afc56e89b2..50ca883f36 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2298,27 +2298,27 @@ (define-public ecl-cl-string-match (sbcl-package->ecl-package sbcl-cl-string-match)) (define-public sbcl-ptester - (package - (name "sbcl-ptester") - (version "20160929") - (source - (origin - (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/ptester/" - (date->string (string->date version "~Y~m~d") "~Y-~m-~d") - "/ptester-" - version - "-git.tgz")) - (sha256 - (base32 - "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz")))) - (build-system asdf-build-system/sbcl) - (home-page "http://quickdocs.org/ptester/") - (synopsis "Portable test harness package") - (description - "@command{ptester} is a portable testing framework based on Franz's + (let ((commit "fe69fde54f4bce00ce577feb918796c293fc7253") + (revision "1")) + (package + (name "sbcl-ptester") + (version (git-version "2.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/ptester.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf")))) + (build-system asdf-build-system/sbcl) + (home-page "http://quickdocs.org/ptester/") + (synopsis "Portable test harness package") + (description + "@command{ptester} is a portable testing framework based on Franz's tester module.") - (license license:lgpl3+))) + (license license:llgpl)))) (define-public cl-ptester (sbcl-package->cl-source-package sbcl-ptester)) -- cgit v1.2.3 From ff6cf9faa7f057588dda66006e222cceff850de7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 11:05:43 +0100 Subject: gnu: sbcl-puri: Fix source and license. * gnu/packages/lisp-xyz.scm (sbcl-puri)[source]: Use main repository instead of Quicklisp archive. [description]: Fix typo. [license]: Source code indicates LLGPL license. --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 50ca883f36..7ba0e3c873 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2327,30 +2327,29 @@ (define-public ecl-ptester (sbcl-package->ecl-package sbcl-ptester)) (define-public sbcl-puri - (package - (name "sbcl-puri") - (version "20180228") - (source - (origin - (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/puri/" - (date->string (string->date version "~Y~m~d") "~Y-~m-~d") - "/puri-" - version - "-git.tgz")) - (sha256 - (base32 - "1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz")))) - (build-system asdf-build-system/sbcl) - ;; REVIEW: Webiste down? - (native-inputs - `(("ptester" ,sbcl-ptester))) - (home-page "http://files.kpe.io/puri/") - (synopsis "Portable URI Library") - (description - "This is portable Universal Resource Identifier library for Common Lisp -programs. It parses URI according to the RFC 2396 specification") - (license license:lgpl3+))) + (let ((commit "ef5afb9e5286c8e952d4344f019c1a636a717b97") + (revision "1")) + (package + (name "sbcl-puri") + (version (git-version "1.5.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/puri.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vm25pdl92laj72p5vyd538kf3cjy2655z6bdc99h20ana2p231s")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("ptester" ,sbcl-ptester))) + (home-page "http://quickdocs.org/puri/") + (synopsis "Portable URI Library") + (description + "This is a portable Universal Resource Identifier library for Common +Lisp programs. It parses URI according to the RFC 2396 specification.") + (license license:llgpl)))) (define-public cl-puri (sbcl-package->cl-source-package sbcl-puri)) -- cgit v1.2.3 From 1fce78c452d1361885b712e1193fd883df085d27 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 11:16:49 +0100 Subject: gnu: sbcl-parse-declarations: Fix source. * gnu/packages/lisp-xyz.scm (sbcl-parse-declarations)[source]: Use main repository instead of Quicklisp archive. --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7ba0e3c873..9841eb24ba 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4952,33 +4952,37 @@ (define-public ecl-py4cl (sbcl-package->ecl-package sbcl-py4cl)) (define-public sbcl-parse-declarations - (package - (name "sbcl-parse-declarations") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "http://beta.quicklisp.org/archive/parse-declarations/" - "2010-10-06/parse-declarations-20101006-darcs.tgz")) - (sha256 - (base32 - "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd")))) - (build-system asdf-build-system/sbcl) - (arguments - `(#:asd-file "parse-declarations-1.0.asd" - #:asd-system-name "parse-declarations-1.0")) - (home-page "https://common-lisp.net/project/parse-declarations/") - (synopsis "Parse, filter, and build declarations") - (description - "Parse-Declarations is a Common Lisp library to help writing + (let ((commit "549aebbfb9403a7fe948654126b9c814f443f4f2") + (revision "1")) + (package + (name "sbcl-parse-declarations") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append + "https://gitlab.common-lisp.net/parse-declarations/" + "parse-declarations.git")) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03g5qks4c59nmxa48pbslxkfh77h8hn8566jddp6m9pl15dzzpxd")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "parse-declarations-1.0.asd" + #:asd-system-name "parse-declarations-1.0")) + (home-page "https://common-lisp.net/project/parse-declarations/") + (synopsis "Parse, filter, and build declarations") + (description + "Parse-Declarations is a Common Lisp library to help writing macros which establish bindings. To be semantically correct, such macros must take user declarations into account, as these may affect the bindings they establish. Yet the ANSI standard of Common Lisp does not provide any operators to work with declarations in a convenient, high-level way. This library provides such operators.") - ;; MIT License - (license license:expat))) + ;; MIT License + (license license:expat)))) (define-public cl-parse-declarations (sbcl-package->cl-source-package sbcl-parse-declarations)) -- cgit v1.2.3 From 639b47e665c6a23e7ff42ac7e29032ce881a0d03 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 11:38:34 +0100 Subject: gnu: sbcl-fare-quasiquote: Fix source and home-page. * gnu/packages/lisp-xyz.scm (sbcl-fare-quasiquote)[source]: Use main repository instead of Quicklisp archive. [home-page]: Fix URL. [synopsis]: Shorten it. --- gnu/packages/lisp-xyz.scm | 69 ++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9841eb24ba..760f4e1a4a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5892,41 +5892,44 @@ (define-public cl-optima (sbcl-package->cl-source-package sbcl-optima)) (define-public sbcl-fare-quasiquote - (package - (name "sbcl-fare-quasiquote") - (build-system asdf-build-system/sbcl) - (version "20171130") - (home-page "http://common-lisp.net/project/fare-quasiquote") - (source - (origin - (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/fare-quasiquote/" - (date->string (string->date version "~Y~m~d") "~Y-~m-~d") - "/fare-quasiquote-" - version - "-git.tgz")) - (sha256 - (base32 - "00brmh7ndsi0c97nibi8cy10j3l4gmkyrfrr5jr5lzkfb7ngyfqa")))) - (inputs - `(("fare-utils" ,sbcl-fare-utils))) - (arguments - ;; XXX: Circular dependencies: Tests depend on subsystems, which depend on the main systems. - `(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; XXX: Require 1.0.0 version of fare-utils, and we package some - ;; commits after 1.0.0.5, but ASDF fails to read the - ;; "-REVISION-COMMIT" part generated by Guix. - (add-after 'unpack 'patch-requirement - (lambda _ - (substitute* "fare-quasiquote.asd" - (("\\(:version \"fare-utils\" \"1.0.0\"\\)") "\"fare-utils\""))))))) - (synopsis "Pattern-matching friendly implementation of quasiquote for Common Lisp") - (description "The main purpose of this n+2nd reimplementation of + (let ((commit "640d39a0451094071b3e093c97667b3947f43639") + (revision "1")) + (package + (name "sbcl-fare-quasiquote") + (build-system asdf-build-system/sbcl) + (version (git-version "1.0.1" revision commit)) + (home-page "https://gitlab.common-lisp.net/frideau/fare-quasiquote") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.common-lisp.net/frideau/" + "fare-quasiquote.git")) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g6q11l50kgija9f55lzqpcwvaq0ljiw8v1j265hnyg6nahjwjvg")))) + (inputs + `(("fare-utils" ,sbcl-fare-utils))) + (arguments + ;; XXX: Circular dependencies: Tests depend on subsystems, + ;; which depend on the main systems. + `(#:tests? #f + #:phases + (modify-phases %standard-phases + ;; XXX: Require 1.0.0 version of fare-utils, and we package some + ;; commits after 1.0.0.5, but ASDF fails to read the + ;; "-REVISION-COMMIT" part generated by Guix. + (add-after 'unpack 'patch-requirement + (lambda _ + (substitute* "fare-quasiquote.asd" + (("\\(:version \"fare-utils\" \"1.0.0\"\\)") + "\"fare-utils\""))))))) + (synopsis "Pattern-matching friendly implementation of quasiquote") + (description "The main purpose of this n+2nd reimplementation of quasiquote is enable matching of quasiquoted patterns, using Optima or Trivia.") - (license license:expat))) + (license license:expat)))) (define-public cl-fare-quasiquote (sbcl-package->cl-source-package sbcl-fare-quasiquote)) -- cgit v1.2.3 From 0f46c5f5048426b464464f48800330b753765da7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 11:59:47 +0100 Subject: gnu: sbcl-fare-quasiquote-extras: Fix build. * gnu/packages/lisp-xyz.scm (sbcl-fare-quasiquote-extras)[arguments]: Fix 'build' phase. --- gnu/packages/lisp-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 760f4e1a4a..b4f1fdb04f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5988,6 +5988,8 @@ (define-public sbcl-fare-quasiquote-extras (lib (string-append out "/lib/" (%lisp-type)))) (mkdir-p lib) (install-file "fare-quasiquote-extras.asd" lib) + (make-file-writable + (string-append lib "/fare-quasiquote-extras.asd")) #t))) (add-after 'create-asd-file 'fix-asd-file (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 74281436c529283d6f1a429d7a1000fd5903f09e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Feb 2020 14:00:33 +0100 Subject: gnu: radare2: Improve description. * gnu/packages/engineering.scm (radare2)[synopsis, description]: Re-write. --- gnu/packages/engineering.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4db8109249..73fea26695 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1310,12 +1310,20 @@ (define-public radare2 (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://radare.org/") - (synopsis "Portable reversing framework") + (synopsis "Reverse engineering framework") (description - "Radare project started as a forensics tool, a scriptable commandline -hexadecimal editor able to open disk files, but later support for analyzing -binaries, disassembling code, debugging programs, attaching to remote gdb -servers, ...") + "Radare2 is a complete framework for reverse-engineering, debugging, and +analyzing binaries. It is composed of a set of small utilities that can be +used together or independently from the command line. + +Radare2 is built around a scriptable disassembler and hexadecimal editor that +support a variety of executable formats for different processors and operating +systems, through multiple back ends for local and remote files and disk +images. + +It can also compare (@dfn{diff}) binaries with graphs and extract information +like relocation symbols. It is able to deal with malformed binaries, making +it suitable for security research and analysis.") (license license:lgpl3))) (define-public asco -- cgit v1.2.3 From 7d9f8db2a88ff1047dfcf72a8ea0568003475c43 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 15 Feb 2020 14:20:24 +0100 Subject: gnu: python-fuzzywuzzy: Capitalize Python in synopsis Follow-up to commit da8ca4c3fc2ac36977e3190bb05802c487619e8c * gnu/packages/python-xyz.scm (python-fuzzywuzzy)[synopsis]: python -> Python --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aeea4df12a..8546943d83 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17562,7 +17562,7 @@ (define-public python-fuzzywuzzy (propagated-inputs `(("python-levenshtein" ,python-levenshtein))) (home-page "https://github.com/seatgeek/fuzzywuzzy") - (synopsis "Fuzzy string matching in python") + (synopsis "Fuzzy string matching in Python") (description "Approximate string matching using @emph{Levenshtein Distance} to calculate the differences between sequences.") -- cgit v1.2.3 From 13c8e747e86e39c0a8c6ec7da8c812d9bbcb682b Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Wed, 12 Feb 2020 15:33:43 -0500 Subject: gnu: containerd: Fix test failure with Go 1.13. * gnu/packages/docker.scm (containerd)[source]: Add patch. * gnu/packages/patches/containerd-test-with-go1.13.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/docker.scm | 4 +++- .../patches/containerd-test-with-go1.13.patch | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/containerd-test-with-go1.13.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a316f6edb..1f7cad9d32 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -794,6 +794,7 @@ dist_patch_DATA = \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ + %D%/packages/patches/containerd-test-with-go1.13.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 1f832a25e5..cc353fd11f 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -183,7 +183,9 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")))) + (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")) + (patches + (search-patches "containerd-test-with-go1.13.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" diff --git a/gnu/packages/patches/containerd-test-with-go1.13.patch b/gnu/packages/patches/containerd-test-with-go1.13.patch new file mode 100644 index 0000000000..964adee9e6 --- /dev/null +++ b/gnu/packages/patches/containerd-test-with-go1.13.patch @@ -0,0 +1,21 @@ +Compatibility fix for go 1.13, flag.Parse() shouldn't be called during +package initialization. +https://golang.org/doc/go1.13#testing +--- a/client_test.go 2020-02-12 14:50:28.991245371 -0500 ++++ b/client_test.go 2020-02-12 15:12:37.383523980 -0500 +@@ -49,7 +49,6 @@ + flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests") + flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests") + flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests") +- flag.Parse() + } + + func testContext() (context.Context, context.CancelFunc) { +@@ -59,6 +58,7 @@ + } + + func TestMain(m *testing.M) { ++ flag.Parse() + if testing.Short() { + os.Exit(m.Run()) + } -- cgit v1.2.3 From 2e5044cfe49de2caf4e4ae2f1be4c2b9f1d690a2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 15 Feb 2020 13:31:33 +0100 Subject: gnu: monero: Disable core tests. Core tests sometimes fail at least on i686-linux. Let's disable them for now and just try hash tests and unit tests. * gnu/packages/finance.scm (monero)[arguments]: Don't run 'core_tests' in 'check' phase. --- gnu/packages/finance.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 990298ce3f..2ba413d388 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -573,7 +573,11 @@ (define-public monero ;; Only try tests that don't need access to network or system (replace 'check (lambda _ - (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) + ;; Core tests sometimes fail, at least on i686-linux. + ;; Let's disable them for now and just try hash tests + ;; and unit tests. + ;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) + (invoke "make" "ARGS=-R 'hash' --verbose" "test"))) (add-after 'check 'unit-tests (lambda _ (let ((excluded-unit-tests -- cgit v1.2.3 From 3bc9f9e77a9a9220b3370cfd0da62f15180c0525 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:20:30 +0100 Subject: gnu: abc: Use HTTPS home page. * gnu/packages/fpga.scm (abc)[home-page]: Use HTTPS. --- gnu/packages/fpga.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 46c917b0d5..129b41f99a 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -75,7 +75,7 @@ (define-public abc (let* ((out (assoc-ref outputs "out")) (out-bin (string-append out "/bin"))) (install-file "abc" out-bin))))))) - (home-page "http://people.eecs.berkeley.edu/~alanmi/abc/") + (home-page "https://people.eecs.berkeley.edu/~alanmi/abc/") (synopsis "Sequential logic synthesis and formal verification") (description "ABC is a program for sequential logic synthesis and formal verification.") -- cgit v1.2.3 From 917c28d2ab1a6ba7a5d0f1a23e10362de32fec6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:22:39 +0100 Subject: gnu: cl-trivial-mimes: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (cl-trivial-mimes)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b4f1fdb04f..215f30fec0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4609,7 +4609,7 @@ (define-public sbcl-trivial-mimes `(("stefil" ,sbcl-hu.dwim.stefil))) (inputs `(("sbcl-cl-fad" ,sbcl-cl-fad))) - (home-page "http://shinmera.github.io/trivial-mimes/") + (home-page "https://shinmera.github.io/trivial-mimes/") (synopsis "Tiny Common Lisp library to detect mime types in files") (description "This is a teensy library that provides some functions to determine the -- cgit v1.2.3 From f13695ec3e125afad2a3f1a584948415cd0f1668 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:23:51 +0100 Subject: gnu: sbcl-ningle: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-ningle)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 215f30fec0..5b990d2faa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4753,7 +4753,7 @@ (define-public sbcl-ningle ("sbcl-lack-component" ,sbcl-lack-component) ("sbcl-alexandria" ,sbcl-alexandria) ("sbcl-babel" ,sbcl-babel))) - (home-page "http://8arrow.org/ningle/") + (home-page "https://8arrow.org/ningle/") (synopsis "Super micro framework for Common Lisp") (description "Ningle is a lightweight web application framework for Common Lisp.") -- cgit v1.2.3 From 82c89ead380b34e76fa9f690fc07e8434fdc1eb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:30:43 +0100 Subject: gnu: ebtables: Use HTTPS home page. * gnu/packages/linux.scm (ebtables)[home-page]: Use HTTPS. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b5ade50ca8..db1bed04e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1785,7 +1785,7 @@ (define-public ebtables `(("perl" ,perl) ("iptables" ,iptables))) (synopsis "Ethernet bridge frame table administration") - (home-page "http://ebtables.netfilter.org/") + (home-page "https://ebtables.netfilter.org/") (description "ebtables is an application program used to set up and maintain the tables of rules (inside the Linux kernel) that inspect Ethernet frames. It is -- cgit v1.2.3 From 53ddc6a71f6d7968734007f0b5325c66d9c6a33b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:33:57 +0100 Subject: gnu: emacs-markdown-mode: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-markdown-mode)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9087a8d98c..c2f0490279 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6308,7 +6308,7 @@ (define-public emacs-markdown-mode (base32 "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7")))) (build-system emacs-build-system) - (home-page "http://jblevins.org/projects/markdown-mode/") + (home-page "https://jblevins.org/projects/markdown-mode/") (synopsis "Emacs Major mode for Markdown files") (description "Markdown-mode is a major mode for editing Markdown-formatted text files -- cgit v1.2.3 From ec93777e891a98a13b16cec79e732b8fb1ca0dd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Feb 2020 10:41:23 +0100 Subject: gnu: diction: Update to 1.14. * gnu/packages/dictionaries.scm (diction): Update to 1.14. --- gnu/packages/dictionaries.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index cd0a5db93c..ef239378d0 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Pierre Langlois @@ -140,14 +140,14 @@ (define-public diction ;; Not quite a dictionary, not quite a spell checker either… (package (name "diction") - (version "1.11") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/diction/diction-" - version ".tar.gz")) - (sha256 - (base32 - "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him")))) + (version "1.14") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.moria.de/~michael/diction/diction-" + version ".tar.gz")) + (sha256 + (base32 "1z6p5x3l1a00h4v4s33qa82fznzc1jdqdnlc4dnmd9nblnrjy0fs")))) (build-system gnu-build-system) (synopsis "Identifies wordy and commonly misused phrases") (description -- cgit v1.2.3 From 6c0ad0bc63121fc60660c381c50657c1f2852051 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Feb 2020 11:11:52 +0100 Subject: gnu: tumbler: Update to 0.2.8. * gnu/packages/xfce.scm (tumbler): Update to 0.2.8. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7489624646..c1f41e5aa2 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -267,7 +267,7 @@ (define-public garcon (define-public tumbler (package (name "tumbler") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -275,7 +275,7 @@ (define-public tumbler "tumbler-" version ".tar.bz2")) (sha256 (base32 - "1r0l0ghcrj71ax7yil1m4p7yjrfqm3icx0s8r7ivwv3i2rgw617p")))) + "15iyx4xk6v3vk8272c848y8rj4sq43khlqxndnai0w5mvsivk689")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 2a42629f2b647e1678cb024d0d036b2b463c1d96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Feb 2020 11:47:22 +0100 Subject: gnu: xvid: Update to 1.3.7. * gnu/packages/video.scm (xvid): Update to 1.3.7. --- gnu/packages/video.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4bf004e990..285fe72aea 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2149,7 +2149,7 @@ (define-public vapoursynth (define-public xvid (package (name "xvid") - (version "1.3.6") + (version "1.3.7") (source (origin (method url-fetch) (uri (string-append @@ -2157,21 +2157,19 @@ (define-public xvid version ".tar.bz2")) (sha256 (base32 - "0zppakvcgq5a42mhqqsbliclpg2jrhbmbfgrzalyfzr47jqmhssy")))) + "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf")))) (build-system gnu-build-system) (native-inputs `(("yasm" ,yasm))) (arguments '(#:phases (modify-phases %standard-phases - (add-before - 'configure 'pre-configure + (add-before 'configure 'pre-configure (lambda _ (chdir "build/generic") (substitute* "configure" (("#! /bin/sh") (string-append "#!" (which "sh")))) #t))) - ;; No 'check' target. - #:tests? #f)) + #:tests? #f)) ; no test suite (home-page "https://www.xvid.com/") (synopsis "MPEG-4 Part 2 Advanced Simple Profile video codec") (description "Xvid is an MPEG-4 Part 2 Advanced Simple Profile (ASP) video -- cgit v1.2.3 From 41db3463a616166af5eb01b7b1f1c599010bd4df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Feb 2020 13:13:02 +0100 Subject: gnu: you-get: Update to 0.4.1403. * gnu/packages/video.scm (you-get): Update to 0.4.1403. --- 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 285fe72aea..ed104b7c3f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1690,7 +1690,7 @@ (define-public youtube-dl-gui (define-public you-get (package (name "you-get") - (version "0.4.1355") + (version "0.4.1403") (source (origin (method git-fetch) (uri (git-reference @@ -1699,7 +1699,7 @@ (define-public you-get (file-name (git-file-name name version)) (sha256 (base32 - "0xq7z04hvw3b3npiahlpzhbxsjvam9n9dynplyrkn84dx6k9ajbj")))) + "04viy19x4g9dngml82nf9j94ys3p47bs62c2q2cn1barkybaa3as")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From 8aaeabf9ecad2bd3b743a4a2258c04eaf5fd9da5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Feb 2020 14:03:45 +0100 Subject: gnu: unbound: Update to 1.9.6 [security improvements]. * gnu/packages/dns.scm (unbound): Update to 1.9.6. --- 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 3a42a98bc4..1ed751b7e1 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -390,14 +390,14 @@ (define-public nsd (define-public unbound (package (name "unbound") - (version "1.9.5") + (version "1.9.6") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca")))) + (base32 "1w5aylh2gfvfvqkgrq46aw427x9c0a3hwm0f985s55wim5pgr60x")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From 977617ac5eec4ab6940bee29e133b8db91f14e1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Feb 2020 15:01:51 +0100 Subject: gnu: thunar: Update to 1.8.12. * gnu/packages/xfce.scm (thunar): Update to 1.8.12. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c1f41e5aa2..fe5f2e6a0e 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -645,7 +645,7 @@ (define-public xfce4-settings (define-public thunar (package (name "thunar") - (version "1.8.11") + (version "1.8.12") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" @@ -653,7 +653,7 @@ (define-public thunar "thunar-" version ".tar.bz2")) (sha256 (base32 - "0f5jw61z1dbvyyf1nks5dagnbs6sxxw7spybgwvpb3hfljrlvphq")))) + "1y1548jrx93c9v8ks60mkd9sx5xl69fmwh1pbr9gsnqz1gp5na99")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 96636e4910870906efb63f9e8890515c142bd941 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 18:01:19 +0100 Subject: gnu: Add fbset. * gnu/packages/linux.scm (fbset): New public variable. --- gnu/packages/linux.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index db1bed04e2..ce8ca8c510 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1229,6 +1229,62 @@ (define-public ddate by Robert Shea and Robert Anton Wilson.") (license license:public-domain))) +(define-public fbset + (package + (name "fbset") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://users.telenet.be/geertu/Linux/fbdev/fbset-" + version ".tar.gz")) + (sha256 + (base32 "080wnisi0jq7dp0jcwdp83rq8q8s3kw41vc712516xbv4jq4mzs0")))) + (build-system gnu-build-system) + (arguments + '(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'install 'pre-install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("mknod ") "true ") + ;; The Makefile doesn't honour PREFIX or similar. + (("/usr") out)) + (mkdir out) + (with-directory-excursion out + (for-each mkdir-p (list "sbin" + "man/man5" + "man/man8"))) + #t))) + (add-after 'install 'install-fb.modes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc"))) + (for-each (cut install-file <> etc) + (find-files "etc" "^fb\\.modes")) + (symlink "fb.modes.ATI" + (string-append etc "/fb.modes")) + #t)))) + ;; Parallel building races to create modes.tab.c. + #:parallel-build? #f + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (home-page "http://users.telenet.be/geertu/Linux/fbdev/") + (synopsis "Show and modify Linux frame buffer settings") + (description + "The kernel Linux's @dfn{frame buffers} provide a simple interface to +different kinds of graphic displays. The @command{fbset} utility can query and +change various device settings such as depth, virtual resolution, and timing +parameters.") + (license license:gpl2))) + (define-public procps (package (name "procps") -- cgit v1.2.3 From 505b2631a9c35bbaa5ba6771ad4f646086f23cad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Feb 2020 17:03:35 +0100 Subject: gnu: le-certs: Update input hashes. These unversioned files were modified upstream. The result of $ openssl x509 -in -text for each old/new pair remains the same, however. * gnu/packages/certs.scm (le-certs)[inputs]: Update hash for isrgrootx1.pem, letsencryptauthorityx3.pem, and letsencryptauthorityx4.pem. --- gnu/packages/certs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 864fe5def1..24831db5e6 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -185,7 +185,7 @@ (define-public le-certs (uri "https://letsencrypt.org/certs/isrgrootx1.pem") (sha256 (base32 - "0zycy85ff9ga53z1q03df89ka9iihb9p8bjhw056rq2y4rn3b6ac")))) + "1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92")))) ;; "Let’s Encrypt Authority X3", the active Let's Encrypt intermediate ;; certificate. ("letsencryptauthorityx3.pem" @@ -194,7 +194,7 @@ (define-public le-certs (uri "https://letsencrypt.org/certs/letsencryptauthorityx3.pem") (sha256 (base32 - "1kvac1dhm1d02bhrfj6l1cz1dpldz6ishb78zzvy8245zgvh7pdn")))) + "100lxxvqv4fj563bm03zzk5r36hq5jx9nnrajzs38g825c5k0cg2")))) ;; "Let’s Encrypt Authority X4", the backup Let's Encrypt intermediate ;; certificate. This will be used for disaster recovery and will only be ;; used should Let's Encrypt lose the ability to issue with "Let’s @@ -205,7 +205,7 @@ (define-public le-certs (uri "https://letsencrypt.org/certs/letsencryptauthorityx4.pem") (sha256 (base32 - "0giiixknr0mls2ir6qqzb42mq7x9a7vz79gbn7fjszbf87pqhpzm")))))) + "0d5256gwf73drq6q6jala28rfzhrgbk5pjfq27vc40ly91pdyh8m")))))) (home-page "https://letsencrypt.org/certificates/") (synopsis "Let's Encrypt root and intermediate certificates") (description "This package provides a certificate store containing only the -- cgit v1.2.3 From 9a232125713ec0bba3770bb8e929ef676417f27d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 17:23:22 +0100 Subject: gnu: libtorrent-rasterbar: Update to 1.1.14. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.1.14. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 045fbe65ab..fa63c49920 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -380,7 +380,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.1.13") + (version "1.1.14") (source (origin (method url-fetch) (uri @@ -390,7 +390,7 @@ (define-public libtorrent-rasterbar "/libtorrent-rasterbar-" version ".tar.gz")) (sha256 (base32 - "1mza92ljjqvlz9582pmls3n45srqhxvw3q348xihcg4fhlchf11h")))) + "0sn3ingmk1lk9p56f9ifgdwhjg0qizcfgv15wyc9s71nm5fya7sc")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 0d1d0a6e71b676e6165b278cbefd51ae4235a538 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 17:23:38 +0100 Subject: gnu: python-markdown: Update to 3.2.1. * gnu/packages/python-xyz.scm (python-markdown): Update to 3.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8546943d83..fa38e47138 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6732,14 +6732,14 @@ (define-public python2-mistune (define-public python-markdown (package (name "python-markdown") - (version "3.2") + (version "3.2.1") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "1gwqrhrp0n9xllgmjc8n1p260968kr0dd2jncjkj4r617q61imss")))) + "00k91gwhxnm8jdnm2v5xjz9irj6dbi7afywz2hpakqdbxs1ydzlh")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From b4ded9e78e01ad5c9c7af75fefaaf152ea9f5e85 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 15 Feb 2020 22:32:49 +0100 Subject: gnu: emacs-org: Update to 9.3.6. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.3.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c2f0490279..272be6d814 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8078,13 +8078,13 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update it as ;; well. - (version "9.3.3") + (version "9.3.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 - (base32 "0yafckcx5ka2rpmv24x7ns6f3s1h216x2lbgaxsf1dmklbjcfvwv")))) + (base32 "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") -- cgit v1.2.3 From 038497db186cdbfd8ca8a95e17634daab3650f8e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 15 Feb 2020 22:32:53 +0100 Subject: gnu: emacs-org-contrib: Update to 20200213. * gnu/packages/emacs-xyz.scm (emacs-org-contrib): Update to 20200213. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 272be6d814..5c4db0f7b0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8098,14 +8098,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20200206") + (version "20200213") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/" "org-plus-contrib-" version ".tar")) (sha256 - (base32 "1fdxh8zgjnb500wkcl0bc0fdzbsln6p044b4s4nz85wkfw0jkfs5")))) + (base32 "0g6rrrwplrifz4ip0jg638m4kvpvdg03hwnyghd813w0lm935mh5")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) -- cgit v1.2.3 From 6d34d3f80b6994d6ba48fa7568dd1fdd86986160 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 15 Feb 2020 22:43:56 +0100 Subject: gnu: higan: End phases with #t * gnu/packages/emulators.scm (higan)[arguments]: End all phases with #t. --- gnu/packages/emulators.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 284dc22039..358559aa26 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -344,15 +344,18 @@ (define-public higan (delete 'configure) (add-before 'build 'chdir-to-higan (lambda _ - (chdir "higan"))) + (chdir "higan") + #t)) (add-before 'install 'create-/share/applications (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; It seems the author forgot to do this in the Makefile. - (mkdir-p (string-append out "/share/applications"))))) + (mkdir-p (string-append out "/share/applications")) + #t))) (add-after 'install 'chdir-to-icarus (lambda _ - (chdir "../icarus"))) + (chdir "../icarus") + #t)) (add-after 'chdir-to-icarus 'build-icarus build-phase) (add-after 'build-icarus 'install-icarus install-phase) (add-after 'install-icarus 'wrap-higan-executable @@ -383,7 +386,8 @@ (define-public higan (chmod higan #o555) ;; Second, make sure higan will find icarus in PATH. (wrap-program higan - `("PATH" ":" prefix (,bin)))))))) + `("PATH" ":" prefix (,bin))) + #t))))) #:make-flags (list "compiler=g++" (string-append "prefix=" (assoc-ref %outputs "out"))) -- cgit v1.2.3 From f3686999a210ba8638859252fc0a7b8afd7b2cc1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 15 Feb 2020 23:05:30 +0100 Subject: gnu: higan: Don't use auto-generated tarball. * gnu/packages/emulators.scm (higan)[source]: Don't use autogenerated tarball. Fetch from the new location for the repository. --- gnu/packages/emulators.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 358559aa26..202bbe5c56 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -313,13 +313,13 @@ (define-public higan (version "106") (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.com/higan/higan/repository/archive.tar.gz?ref=v" - version)) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/byuu/higan/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0y42pra0dxzlbkyzcp3r8a39pji2bj3p9fl40425f60af2igr4rw")) + (base32 "1mxivf8124vz4hl0b0xa1yqv0z9m3i12v9psmbpqkprrbq0wbgn1")) (patches (search-patches "higan-remove-march-native-flag.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From c66f3b3bec196cf0e39bd0a0ffe267aad43eb423 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 15 Feb 2020 23:12:57 +0100 Subject: gnu: higan: Explain why v106, and not v107, is being packaged * gnu/packages/emulators.scm (higan): Add a comment. --- gnu/packages/emulators.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 202bbe5c56..cfc5039ca0 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -307,6 +307,14 @@ (define-public emulation-station (home-page "http://www.emulationstation.org") (license license:expat)))) +;; Note: higan v107 has been released, but as explained by the dialog that +;; appears after starting the new version, it's an experimental release. The +;; author recommends v106 for general use. +;; +;; When updating to v107 (or probably beyond), sdl will have to be replaced +;; with sdl2, and libxrandr will need to be added to inputs. The patch +;; `higan-remove-march-native-flag.patch' will not be necessary, since the flag +;; is now being added only for `platform=local', which is not the default. (define-public higan (package (name "higan") -- cgit v1.2.3 From 779d96c9b0ee38cbaca9f8577e6cc7f907fb29cb Mon Sep 17 00:00:00 2001 From: shtwzrd Date: Sun, 9 Feb 2020 21:31:09 +0000 Subject: services: xorg: Filter modules based on system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by shtwzrd . * gnu/services/xorg.scm (xorg-configuration): Apply a filter over %default-xorg-modules packages, excluding those for which the %current-system is not among the package's supported-systems. This patch makes it possible to use xorg-configuration on systems other than x86_64 and i686, as without it, xf86-video-intel would be pulled in on the unsupported architecture and fail. Signed-off-by: Jakub Kądziołka --- gnu/services/xorg.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 73a32e4b02..df5c350a37 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Tim Gesthuizen +;;; Copyright © 2020 shtwzrd ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,7 +153,12 @@ (define-record-type* xorg-configuration make-xorg-configuration xorg-configuration? (modules xorg-configuration-modules ;list of packages - (default %default-xorg-modules)) + ; filter out modules not supported on current system + (default (filter + (lambda (p) + (member (%current-system) + (package-supported-systems p))) + %default-xorg-modules))) (fonts xorg-configuration-fonts ;list of packges (default %default-xorg-fonts)) (drivers xorg-configuration-drivers ;list of strings -- cgit v1.2.3 From 4530fe8ecca456fcc7226914502ad452c33ce27b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 00:51:56 +0100 Subject: gnu: emulation-station: Fix build. * gnu/packages/emulators.scm (emulation-station): Switch to an unreleased git commit. --- gnu/packages/emulators.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index cfc5039ca0..b9c854ca25 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -274,19 +274,21 @@ (define-public dosbox (license license:gpl2+))) (define-public emulation-station - (let ((commit "646bede3d9ec0acf0ae378415edac136774a66c5")) + ;; No release for a long time, new commits fix build issues + (let ((commit "9cc42adff67946175d2b7e25c6ae69cc374e98a0") + (revision "1")) (package (name "emulation-station") - (version "2.0.1") + (version (git-version "2.0.1" revision commit)) (source (origin (method git-fetch) ; no tarball available (uri (git-reference (url "https://github.com/Aloshi/EmulationStation.git") (commit commit))) ; no version tag - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v")))) + "1cva0ns650v17lfn8in095zci6lc43d23f1x3mlzc41qfqa6mbd1")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit v1.2.3 From 3c6aca4232d1a3638ec962bc7afe9121626c43ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Feb 2020 09:25:00 +0200 Subject: doc: Fix typo. * doc/guix.texi (X Window)[sddm-service-type]: SSDM -> SDDM typo fix. [sddm-configuration]: Also list 'maya' theme. * gnu/services/sddm.scm (sddm-service): Fix typo in doc string. (sddm-configuration): Also list 'maya' theme. --- doc/guix.texi | 4 ++-- gnu/services/sddm.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5d9292b2e9..aa50340fe2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14458,7 +14458,7 @@ Command to run when halting. Command to run when rebooting. @item @code{theme} (default "maldives") -Theme to use. Default themes provided by SDDM are "elarun" or "maldives". +Theme to use. Default themes provided by SDDM are "elarun", "maldives" or "maya". @item @code{themes-directory} (default "/run/current-system/profile/share/sddm/themes") Directory to look for themes. @@ -14533,7 +14533,7 @@ Relogin after logout. @cindex X11 login @defvr {Scheme Variable} sddm-service-type This is the type of the service to run the -@uref{https://github.com/sddm/sddm,SSDM display manager}. Its value +@uref{https://github.com/sddm/sddm,SDDM display manager}. Its value must be a @code{sddm-configuration} record (see below). Here's an example use: diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index ac8c9a8403..473b4876a1 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -56,7 +56,7 @@ (define-record-type* (default (file-append shepherd "/sbin/reboot"))) ;; [Theme] - ;; valid values are elarun or maldives + ;; valid values are elarun, maldives or maya (theme sddm-configuration-theme (default "maldives")) (themes-directory sddm-configuration-themes-directory @@ -325,6 +325,6 @@ (define sddm-service-type (define-deprecated (sddm-service #:optional (config (sddm-configuration))) sddm-service-type - "Run the @uref{https://github.com/sddm/sddm,SSDM display manager} + "Run the @uref{https://github.com/sddm/sddm,SDDM display manager} with the given @var{config}, a @code{} object." (service sddm-service-type config)) -- cgit v1.2.3 From 598ea80f84922908245c47b03d22cfdeac813676 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 16 Feb 2020 14:03:59 +0100 Subject: gnu: gwl: Update to 0.2.0. * gnu/packages/package-management.scm (gwl): Update to 0.2.0. [source]: Fetch from gnu.org. [native-inputs]: Add texinfo and graphviz. [propagated-inputs]: Add guile-gcrypt, guile-pfds, guile-syntax-highlight, and guile-wisp. [home-page]: Use workflows.guix.info. [description]: Use official project description. --- gnu/packages/package-management.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 422d4f1959..09888ca9e2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017 Roel Janssen @@ -788,29 +788,36 @@ (define-public conda (define-public gwl (package (name "gwl") - (version "0.1.1") + (version "0.2.0") (source (origin (method url-fetch) - (uri (string-append "https://www.guixwl.org/releases/gwl-" - version ".tar.gz")) + (uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz")) (sha256 (base32 - "06pm967mq1wyggx7l0nfapw5s0k5qc5r9lawk2v3db868br779a7")))) + "0db1nvy6qzhj9kv834vrlxw7gqv3lih1n4hv5zac1zjmb61ll915")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("graphviz" ,graphviz))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guix" ,guix) - ("guile-commonmark" ,guile-commonmark))) - (home-page "https://www.guixwl.org") + ("guile-commonmark" ,guile-commonmark) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-pfds" ,guile-pfds) + ("guile-syntax-highlight" ,guile-syntax-highlight) + ("guile-wisp" ,guile-wisp))) + (home-page "https://workflows.guix.info") (synopsis "Workflow management extension for GNU Guix") - (description "This project provides two subcommands to GNU Guix and -introduces two record types that provide a workflow management extension built -on top of GNU Guix.") + (description "The @dfn{Guix Workflow Language} (GWL) provides an +extension to GNU Guix's declarative language for package management to +automate the execution of programs in scientific workflows. The GWL +can use process engines to integrate with various computing +environments.") ;; The Scheme modules in guix/ and gnu/ are licensed GPL3+, ;; the web interface modules in gwl/ are licensed AGPL3+, ;; and the fonts included in this package are licensed OFL1.1. -- cgit v1.2.3 From efd9742b246795b623c2d641fa757470dada92df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Feb 2020 16:09:11 +0100 Subject: gnu: whois: Update to 5.5.6. * gnu/packages/networking.scm (whois): Update to 5.5.6. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dbc40028ad..ae131a5667 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -562,14 +562,14 @@ (define-public iodine (define-public whois (package (name "whois") - (version "5.5.5") + (version "5.5.6") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/whois/" "whois_" version ".tar.xz")) (sha256 - (base32 "03akwma24gzfnsmwpjxmkzmcaxzg6fc68hmyaz0xmsl28i28l3n3")))) + (base32 "0kpi981zjczvdcxfcq455c529vlaxa73x8kbm530z5b01h0fk8fb")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From b3e992e984144f643efff81808139b6c76777012 Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Mon, 27 Jan 2020 14:13:16 +0200 Subject: gnu: elixir: Update to 1.10.0. * gnu/packages/elixir.scm (elixir): Update to 1.10.0. * gnu/packages/patches/elixir-path-length.patch: Update patch so it can be applied to v1.10.0 source Signed-off-by: Marius Bakke --- gnu/packages/elixir.scm | 4 ++-- gnu/packages/patches/elixir-path-length.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 7420bc4963..9aa693ff3a 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-module (gnu packages elixir) (define-public elixir (package (name "elixir") - (version "1.9.4") + (version "1.10.0") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (define-public elixir (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b")) + (base32 "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/elixir-path-length.patch b/gnu/packages/patches/elixir-path-length.patch index aa8bf38829..ab99595cff 100644 --- a/gnu/packages/patches/elixir-path-length.patch +++ b/gnu/packages/patches/elixir-path-length.patch @@ -5,11 +5,11 @@ after the substitution is made. --- a/Makefile +++ b/Makefile -@@ -213,6 +213,7 @@ - TEST_ERLS = $(addprefix $(TEST_EBIN)/, $(addsuffix .beam, $(basename $(notdir $(wildcard $(TEST_ERL)/*.erl))))) +@@ -265,6 +265,7 @@ format: compile + $(call FORMAT) test_formatted: compile -+ bin/elixir bin/mix format lib/mix/lib/mix/scm/git.ex - bin/elixir bin/mix format --check-formatted ++ $(call FORMAT,lib/mix/lib/mix/scm/git.ex) + $(call FORMAT,--check-formatted) test_erlang: compile $(TEST_ERLS) -- cgit v1.2.3 From c9aadd074961b149870cbe6128d77b6cacb1d2b6 Mon Sep 17 00:00:00 2001 From: Rene Saavedra Date: Sat, 15 Feb 2020 18:46:14 -0600 Subject: gnu: accountsservice: 'Add patch-/bin/cat' phase. * gnu/packages/freedesktop.scm (accountsservice)[arguments]: Add 'patch-/bin/cat' phase. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0c0fcff02c..24f33efe35 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Reza Alizadeh Majd ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Rene Saavedra ;;; ;;; This file is part of GNU Guix. ;;; @@ -934,6 +935,11 @@ (define-public accountsservice "--enable-elogind") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/cat + (lambda _ + (substitute* "src/user.c" + (("/bin/cat") (which "cat"))) + #t)) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 92b99cabd6123a4a7beb5aa1d228430dde5bec01 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 19:15:42 +0100 Subject: gnu: rust-ignore-0.4: Add rust-winapi-util-0.1 to inputs. This is a followup to 566997236494d83a48182d69311897789b5c9cd4. At the time, it seemed like the input is only used on Windows and therefore unnecessary. However, the package kept building only because the crate was still being used transitively, through rust-same-file-1.0. * gnu/packages/crates-io.scm (rust-ignore-0.4)[arguments](cargo-inputs): Add rust-winapi-util-0.1. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f874a63f49..a1b80f2f8f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5679,7 +5679,8 @@ (define-public rust-ignore-0.4 ("rust-regex" ,rust-regex-1.1) ("rust-same-file" ,rust-same-file-1.0) ("rust-thread-local" ,rust-thread-local-1.0) - ("rust-walkdir" ,rust-walkdir-2.2)))) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore") (synopsis "Efficiently match ignore files such as .gitignore") (description -- cgit v1.2.3 From 92cd55fa689eab1b7121117d3dd3fc2e5ffc3b72 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 19:26:58 +0100 Subject: gnu: rust-same-file-1.0: Don't skip build. * gnu/packages/crates-io.scm (rust-same-file-1.0)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a1b80f2f8f..edbc238ad5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11229,8 +11229,7 @@ (define-public rust-same-file-1.0 "00h5j1w87dmhnvbv9l8bic3y7xxsnjmssvifw2ayvgx9mb1ivz4k")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-winapi-util" ,rust-winapi-util-0.1)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) -- cgit v1.2.3 From b905ebed0cac707e6aefb883dadfa11821ca361c Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 20:16:17 +0100 Subject: gnu: libvirt, virt-manager: Don't use tabs for indentation * gnu/packages/virtualization.scm: Replace tabs with spaces. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3670b396a5..2659231d1b 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -461,8 +461,8 @@ (define-public libvirt (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails "virnetsockettest" ; tries to network "virshtest"))) ; fails (substitute* "tests/Makefile.in" @@ -629,8 +629,8 @@ (define-public virt-manager (add-after 'unpack 'fix-qemu-img-reference (lambda* (#:key inputs #:allow-other-keys) (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From f468df9f4df4b3ca94f5a390d5dd10d993b464a8 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 20:21:07 +0100 Subject: gnu: virt-manager: Move gobject-introspection to native-inputs * gnu/packages/virtualization.scm (virt-manager): Move gobject-introspection from inputs to native-inputs. --- gnu/packages/virtualization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 2659231d1b..0e075c3af4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guy Fleury Iteriteka +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -671,7 +672,6 @@ (define-public virt-manager ("libvirt-glib" ,libvirt-glib) ("libosinfo" ,libosinfo) ("vte" ,vte) - ("gobject-introspection" ,gobject-introspection) ("python-libvirt" ,python-libvirt) ("python-requests" ,python-requests) ("python-ipaddress" ,python-ipaddress) @@ -684,6 +684,7 @@ (define-public virt-manager `(("qemu" ,qemu))) (native-inputs `(("glib" ,glib "bin") ; glib-compile-schemas + ("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool))) -- cgit v1.2.3 From ce5af131d896f45c088a30d13f62a0914d97829b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Feb 2020 04:29:35 +0100 Subject: gnu: Add rtl8812au-aircrack-ng-linux-module. * gnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module): New public variable. --- gnu/packages/linux.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ce8ca8c510..ee3d6a4063 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -932,6 +932,52 @@ (define-public acpi-call-linux-module and should be used with caution, especially on untested models.") (license license:gpl3+))) ; see README.md (no licence headers) +(define-public rtl8812au-aircrack-ng-linux-module + (let ((commit "945d6ed6505c32f0993b1dba576388e92e78101b") + (revision "0")) + (package + (name "rtl8812au-aircrack-ng-linux-module") + (version (git-version "5.6.4.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aircrack-ng/rtl8812au.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pjws7qb5l4z9k80vgz4zdxmqhbwxjjrmkpf0hijf821byyddvi7")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled tarballs, APKs, word lists, speadsheets, + ;; and other unnecessary unlicenced things. + (for-each delete-file-recursively (list "android" + "docs" + "tools")) + #t)))) + (build-system linux-module-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (apply invoke "make" + (string-append "KSRC=" + (assoc-ref inputs "linux-module-builder") + "/lib/modules/build") + (or make-flags '()))))) + #:tests? #f)) ; no test suite + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://github.com/aircrack-ng/rtl8812au") + (synopsis "Linux driver for Realtek USB wireless network adapters") + (description + "This is Realtek's rtl8812au Linux driver for USB 802.11n wireless +network adapters, modified by the aircrack-ng project to support monitor mode +and frame injection. It provides a @code{88XXau} kernel module that supports +RTL8812AU, RTL8821AU, and RTL8814AU chips.") + (license license:gpl2+)))) + (define-public vhba-module (package (name "vhba-module") -- cgit v1.2.3 From 8db20f2dddaf25d68564f9999cbe117e3cd19ace Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Feb 2020 16:53:21 +0100 Subject: gnu: blender: Update to 2.82. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graphics.scm (blender): Update to 2.82. [arguments]: Uncomment ‘fix-broken-import’ phase. --- gnu/packages/graphics.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a7ea6192fb..9aa0e134b2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -88,14 +88,14 @@ (define-module (gnu packages graphics) (define-public blender (package (name "blender") - (version "2.81a") + (version "2.82") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j")))) + "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -127,11 +127,11 @@ (define-public blender (modify-phases %standard-phases ;; XXX This file doesn't exist in the Git sources but will probably ;; exist in the eventual 2.80 source tarball. -; (add-after 'unpack 'fix-broken-import -; (lambda _ -; (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" -; (("import encode_bin") "from . import encode_bin")) -; #t)) + (add-after 'unpack 'fix-broken-import + (lambda _ + (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" + (("import encode_bin") "from . import encode_bin")) + #t)) (add-after 'set-paths 'add-ilmbase-include-path (lambda* (#:key inputs #:allow-other-keys) ;; OpenEXR propagates ilmbase, but its include files do not appear -- cgit v1.2.3 From 1f14453eedfede4626a78321c66a009c9997bee4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Feb 2020 21:56:33 +0100 Subject: gnu: Remove blender@2.79b. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As discussed on #guix with lfam and raingloom, it no longer builds and users with hardware that requires it can use ‘guix time-machine’. * gnu/packages/graphics.scm (blender-2.79): Remove variable. --- gnu/packages/graphics.scm | 89 ----------------------------------------------- 1 file changed, 89 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9aa0e134b2..f723e00aa4 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -176,95 +176,6 @@ (define-public blender application can be customized via its API for Python scripting.") (license license:gpl2+))) -(define-public blender-2.79 - (package - (name "blender") - (version "2.79b") - (source (origin - (method url-fetch) - (uri (string-append "https://download.blender.org/source/" - "blender-" version ".tar.gz")) - (sha256 - (base32 - "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")) - (patches (search-patches "blender-2.79-newer-ffmpeg.patch" - "blender-2.79-python-3.7-fix.patch")))) - (build-system cmake-build-system) - (arguments - (let ((python-version (version-major+minor (package-version python)))) - `(;; Test files are very large and not included in the release tarball. - #:tests? #f - #:configure-flags - (list "-DWITH_CODEC_FFMPEG=ON" - "-DWITH_CODEC_SNDFILE=ON" - "-DWITH_CYCLES=ON" - "-DWITH_DOC_MANPAGE=ON" - "-DWITH_FFTW3=ON" - "-DWITH_GAMEENGINE=ON" - "-DWITH_IMAGE_OPENJPEG=ON" - "-DWITH_INPUT_NDOF=ON" - "-DWITH_INSTALL_PORTABLE=OFF" - "-DWITH_JACK=ON" - "-DWITH_MOD_OCEANSIM=ON" - "-DWITH_PLAYER=ON" - "-DWITH_PYTHON_INSTALL=OFF" - "-DWITH_PYTHON_INSTALL=OFF" - "-DWITH_SYSTEM_OPENJPEG=ON" - (string-append "-DPYTHON_LIBRARY=python" ,python-version "m") - (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") - "/include/python" ,python-version "m") - (string-append "-DPYTHON_VERSION=" ,python-version)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-broken-import - (lambda _ - (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" - (("import encode_bin") "from . import encode_bin")) - #t)) - (add-after 'set-paths 'add-ilmbase-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; OpenEXR propagates ilmbase, but its include files do not appear - ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to - ;; the CPATH to satisfy the dependency on "half.h". - (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)))))) - (inputs - `(("boost" ,boost) - ("jemalloc" ,jemalloc) - ("libx11" ,libx11) - ("openimageio" ,openimageio-1.7) - ("openexr" ,openexr) - ("ilmbase" ,ilmbase) - ("openjpeg" ,openjpeg-1) - ("libjpeg" ,libjpeg) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("ffmpeg" ,ffmpeg) - ("fftw" ,fftw) - ("jack" ,jack-1) - ("libsndfile" ,libsndfile) - ("freetype" ,freetype) - ("glew" ,glew) - ("openal" ,openal) - ("python" ,python) - ("zlib" ,zlib))) - (home-page "https://blender.org/") - (synopsis "3D graphics creation suite") - (description - "Blender is a 3D graphics creation suite. It supports the entirety of -the 3D pipeline—modeling, rigging, animation, simulation, rendering, -compositing and motion tracking, even video editing and game creation. The -application can be customized via its API for Python scripting. - -NOTE: This older version of Blender is the last release that does not require -OpenGL 3. It is retained for use with older computers.") - (license license:gpl2+))) - (define-public assimp (package (name "assimp") -- cgit v1.2.3 From f6c8ba3172e20c65e0d07ec2a5208f9de069ea34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 14:05:05 +0100 Subject: gnu: noise-repellent: Update to 0.1.5. * gnu/packages/audio.scm (noise-repellent): Update to 0.1.5. [build-system]: Switch to meson-build-system. [arguments]: Remove GNU build system flags & set installation prefix. --- gnu/packages/audio.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7b46e2cb6f..3cb32d2e0f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3523,7 +3523,7 @@ (define-public snd (define-public noise-repellent (package (name "noise-repellent") - (version "0.1.4") + (version "0.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -3532,16 +3532,12 @@ (define-public noise-repellent (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0rd3dlmk3vivjmcr6x2x860y0j1d49c2j95j6ny50v184mwvn11j")))) - (build-system gnu-build-system) + "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl")))) + (build-system meson-build-system) (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ; there are none - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + `(#:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out") + "/lib/lv2")))) (inputs `(("lv2" ,lv2) ("fftwf" ,fftwf))) -- cgit v1.2.3 From bcd3c48538cf7ab95b1c735880c866dccbdf7954 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 14:48:03 +0100 Subject: gnu: boinc-client: Update to 7.16.4. * gnu/packages/distributed.scm (boinc-client): Update to 7.16.4. --- gnu/packages/distributed.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index 4a35094eba..f54f4727e1 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brant Gardner -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +43,7 @@ (define-module (gnu packages distributed) (define-public boinc-client (package (name "boinc-client") - (version "7.16.3") + (version "7.16.4") (source (origin (method git-fetch) (uri (git-reference @@ -54,7 +54,7 @@ (define-public boinc-client (file-name (git-file-name "boinc" version)) (sha256 (base32 - "1l181s7wnx0xd7m62qjixdjw4ri87q47xi0x662m2jsh9lzb8khf")))) + "08xx2kzb7c46k1zb91w74kyig3b5kilxdw5ilfs67r8p55mxk0g1")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-server"))) (inputs `(("openssl" ,openssl) -- cgit v1.2.3 From 3bc39f0c5dc3a6e5ad2feca7438e1f1d55e24771 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 14:48:40 +0100 Subject: gnu: boinc-client: Trim synopsis. * gnu/packages/distributed.scm (boinc-client)[synopsis]: Remove package name. --- gnu/packages/distributed.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index f54f4727e1..c5207aace4 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -71,7 +71,7 @@ (define-public boinc-client ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (synopsis "BOINC lets you help cutting-edge science research using your computer") + (synopsis "Help cutting-edge science research using your computer") (description "BOINC is a platform for high-throughput computing on a large scale (thousands or millions of computers). It can be used for volunteer computing (using consumer devices) or grid computing (using organizational -- cgit v1.2.3 From 8bb9f9971cd45c075b8ad9c9d454911ca6468764 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 16:39:30 +0100 Subject: gnu: ddclient: Update to 3.9.1. * gnu/packages/dns.scm (ddclient): Update to 3.9.1. [source]: Use GIT-FETCH and add a FILE-NAME. [native-inputs]: Remove gzip and tar. [arguments]: Adapt to git checkout source. --- gnu/packages/dns.scm | 96 +++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1ed751b7e1..ee95b8f396 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -741,20 +741,20 @@ (define-public knot-resolver (define-public ddclient (package (name "ddclient") - (version "3.9.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/ddclient/ddclient/ddclient-" - version "/ddclient-" version ".tar.gz")) - (sha256 - (base32 - "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw")))) + (version "3.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ddclient/ddclient.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w")))) (build-system trivial-build-system) ; no Makefile.PL (native-inputs `(("bash" ,bash) - ("gzip" ,gzip) - ("perl" ,perl) - ("tar" ,tar))) + ("perl" ,perl))) (inputs `(("inetutils" ,inetutils) ; logger ("net-tools" ,net-tools) @@ -770,47 +770,45 @@ (define-public ddclient (use-modules (guix build utils) (ice-9 match) (srfi srfi-26)) - ;; bootstrap (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin" ":" - (assoc-ref %build-inputs "tar") "/bin" ":" - (assoc-ref %build-inputs "gzip") "/bin" ":" (assoc-ref %build-inputs "perl") "/bin")) - ;; extract source - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) - ;; package - (with-directory-excursion (string-append ,name "-" ,version) - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (let ((file "ddclient")) - (substitute* file - (("/usr/bin/perl") (which "perl")) - ;; Strictly use ‘/etc/ddclient/ddclient.conf’. - (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf") - (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf") - ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’ - (("\\$cachedir\\$program\\.cache") - "/var/cache/ddclient/ddclient.cache")) - (install-file file bin) - (wrap-program (string-append bin "/" file) - `("PATH" ":" = - ("$PATH" - ,@(map (lambda (input) - (match input - ((name . store) - (string-append store "/bin")))) - %build-inputs))) - `("PERL5LIB" ":" = - ,(delete - "" - (map (match-lambda - (((? (cut string-prefix? "perl-" <>) name) . dir) - (string-append dir "/lib/perl5/site_perl")) - (_ "")) - %build-inputs))))) - (for-each (cut install-file <> (string-append out - "/share/ddclient")) - (find-files "." "sample.*$"))))))) + + ;; Copy the (read-only) source into the (writable) build directory. + (copy-recursively (assoc-ref %build-inputs "source") ".") + + ;; Install. + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (let ((file "ddclient")) + (substitute* file + (("/usr/bin/perl") (which "perl")) + ;; Strictly use ‘/etc/ddclient/ddclient.conf’. + (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf") + (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf") + ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’ + (("\\$cachedir\\$program\\.cache") + "/var/cache/ddclient/ddclient.cache")) + (install-file file bin) + (wrap-program (string-append bin "/" file) + `("PATH" ":" = + ("$PATH" + ,@(map (lambda (input) + (match input + ((name . store) + (string-append store "/bin")))) + %build-inputs))) + `("PERL5LIB" ":" = + ,(delete + "" + (map (match-lambda + (((? (cut string-prefix? "perl-" <>) name) . dir) + (string-append dir "/lib/perl5/site_perl")) + (_ "")) + %build-inputs))))) + (for-each (cut install-file <> (string-append out + "/share/ddclient")) + (find-files "." "sample.*$")))))) (home-page "https://sourceforge.net/projects/ddclient/") (synopsis "Address updating utility for dynamic DNS services") (description "This package provides a client to update dynamic IP -- cgit v1.2.3 From 9469ab532fe561b8bb679ba8bf08f1c1f5f9374a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 16:41:18 +0100 Subject: gnu: ddclient: Update home page. * gnu/packages/dns.scm (ddclient)[home-page]: Update. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ee95b8f396..32b8164ecc 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -809,7 +809,7 @@ (define-public ddclient (for-each (cut install-file <> (string-append out "/share/ddclient")) (find-files "." "sample.*$")))))) - (home-page "https://sourceforge.net/projects/ddclient/") + (home-page "https://ddclient.net/") (synopsis "Address updating utility for dynamic DNS services") (description "This package provides a client to update dynamic IP addresses with several dynamic DNS service providers, such as -- cgit v1.2.3 From 338ae8eb366003c6e66ef1bfec0bbed498a386d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 16:41:45 +0100 Subject: gnu: camlp5: Update to 7.11. * gnu/packages/ocaml.scm (camlp5): Update to 7.11. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 32b03359d8..3adc872ed0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016-2020 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2018 Kei Kebreau @@ -528,7 +528,7 @@ (define-public opam (define-public camlp5 (package (name "camlp5") - (version "7.10") + (version "7.11") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ (define-public camlp5 (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7")))) + (base32 "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From fbc2c04e207815d88d6506eaeab15c6cb5e59bce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 17:08:38 +0100 Subject: gnu: lttoolbox: Update to 3.5.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dictionaries.scm (lttoolbox): Update to 3.5.1. [arguments]: Replace ‘bootstrap’ phase. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/dictionaries.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index ef239378d0..3e7710537c 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -312,7 +312,7 @@ (define-public translate-shell (define-public lttoolbox (package (name "lttoolbox") - (version "3.5.0") + (version "3.5.1") (source (origin (method url-fetch) @@ -320,14 +320,24 @@ (define-public lttoolbox "https://github.com/apertium/lttoolbox/releases/download/v" version "/lttoolbox-" version ".tar.gz")) (sha256 - (base32 - "08y6pf1hl7prwygy1g8h6ndqww18pmb9f3r5988q0pcrp8w6xz6b")) + (base32 "14yyrkzyqlsrii3v3ggg4dyvwlrcqcqc0aprphz5781a44jsrcwz")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + ;; The included ./autogen.sh unconditionally runs ./configure before + ;; its shebangs have been patched. + (lambda _ + (invoke "autoreconf" "-vfi")))))) (inputs `(("libxml2" ,libxml2))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (home-page "http://wiki.apertium.org/wiki/Lttoolbox") (synopsis "Lexical processing toolbox") (description "Lttoolbox is a toolbox for lexical processing, morphological -- cgit v1.2.3 From 9c478cbd6403fffa4cd93e689cdc3c630da18c1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 17:24:39 +0100 Subject: gnu: lttoolbox: Remove redundant FILE-NAME. * gnu/packages/dictionaries.scm (lttoolbox)[source]: Remove FILE-NAME field. --- gnu/packages/dictionaries.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3e7710537c..6108a0d56c 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -320,8 +320,7 @@ (define-public lttoolbox "https://github.com/apertium/lttoolbox/releases/download/v" version "/lttoolbox-" version ".tar.gz")) (sha256 - (base32 "14yyrkzyqlsrii3v3ggg4dyvwlrcqcqc0aprphz5781a44jsrcwz")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "14yyrkzyqlsrii3v3ggg4dyvwlrcqcqc0aprphz5781a44jsrcwz")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4bf26153e77cd28e6bba1b9b19820bea91f98f96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 18:02:46 +0100 Subject: gnu: libasr: Update to 1.0.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (libasr): Update to 1.0.4. [arguments]: Remove obsolete ‘bootstrap’ phase replacement. --- gnu/packages/dns.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 32b8164ecc..b23a7fc9d5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -278,22 +278,18 @@ (define-public dnscrypt-wrapper (define-public libasr (package (name "libasr") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "libasr-" version ".tar.gz")) (sha256 - (base32 "13fn4sr4vlcx1xijpl26nmnxawyls4lr5q3mi11jdm76f80qxn4w")))) + (base32 "1d6s8njqhvayx2gp47409sp1fn8m608ws26hr1srfp6i23nnpyqr")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'bootstrap - ;; ‘GNU build system bootstrapping not needed’, the default lies. - (lambda _ - (invoke "sh" "./bootstrap"))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From bc6c06b0bf2b7634aa0c12e4ce673c15dba51b39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 18:13:19 +0100 Subject: gnu: sbsigntools: Update to 0.9.3. * gnu/packages/efi.scm (sbsigntools): Update to 0.9.3. --- gnu/packages/efi.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index b6e93dd618..13c33adbd3 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic ;;; Copyright © 2019 Efraim Flashner -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,7 +64,7 @@ (define-public gnu-efi (define-public sbsigntools (package (name "sbsigntools") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) @@ -75,8 +75,7 @@ (define-public sbsigntools (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 - "116649ixr6gvw9fqiljfflxsv4293hgm73bmba5ilxrzn4kpbzvb")))) + (base32 "0gc3xmp73xl7z4nkwz4qy960rdflmx7k4ksgyblcnia9smvsir6y")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6cd3f4106c4f90deea8010f20c79ee54696607df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 18:14:54 +0100 Subject: gnu: fasm: Update to 1.73.22. * gnu/packages/assembly.scm (fasm): Update to 1.73.22. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index a96b169d15..121035b6d2 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -148,14 +148,14 @@ (define-public lightning (define-public fasm (package (name "fasm") - (version "1.73.21") + (version "1.73.22") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "143zh7x3q0r2kclshh8n5w4i5pw4lh60si7rspvc725xxjpjkvcv")))) + (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist -- cgit v1.2.3 From c6f582b54584d0a62927b0c075b6cfc6d2d7034d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 18:20:00 +0100 Subject: gnu: fio: Update to 3.18. * gnu/packages/benchmark.scm (fio): Update to 3.18. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 08478d3118..602681ac86 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -44,14 +44,14 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.17") + (version "3.18") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "1hvh8syjz6l0q9bm5p7rf0yrmpkfcx5zj5d47mf6335w1i0h5gqf")))) + "12wzi40hn0ylkdiqwjjljdjmiq78nhwsv3qqa0fad7h3x08w6w6b")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From ccea06cc5ae96c78e35313bc6a29865dd2ee7c73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 19:45:03 +0100 Subject: gnu: flashrom: Update to 1.2. * gnu/packages/flashing-tools.scm (flashrom): Update to 1.2. --- gnu/packages/flashing-tools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index eb92ae40f5..2b1338d387 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2017 Jonathan Brielmaier ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +48,7 @@ (define-module (gnu packages flashing-tools) (define-public flashrom (package (name "flashrom") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append @@ -56,7 +56,7 @@ (define-public flashrom version ".tar.bz2")) (sha256 (base32 - "06afq680n9p34hi3vrkn12vd1pfyq2062db9qqbi4hi21k3skbdf")))) + "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71")))) (build-system gnu-build-system) (inputs `(("dmidecode" ,dmidecode) ("pciutils" ,pciutils) -- cgit v1.2.3 From 1788bb9016a98d9c9412bc1611156d33f3f731d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 21:02:04 +0100 Subject: gnu: openscenegraph: Update to 3.6.5. * gnu/packages/graphics.scm (openscenegraph): Update to 3.6.5. --- gnu/packages/graphics.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f723e00aa4..f437c26b2d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -441,7 +441,7 @@ (define-public openimageio-1.7 (define-public openscenegraph (package (name "openscenegraph") - (version "3.6.4") + (version "3.6.5") (source (origin (method git-fetch) @@ -449,14 +449,13 @@ (define-public openscenegraph (url "https://github.com/openscenegraph/OpenSceneGraph") (commit (string-append "OpenSceneGraph-" version)))) (sha256 - (base32 - "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785")) + (base32 "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1")) (file-name (git-file-name name version)))) (properties `((upstream-name . "OpenSceneGraph"))) (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" @@ -469,7 +468,7 @@ (define-public openscenegraph ("unzip" ,unzip))) (inputs `(("giflib" ,giflib) - ("libjpeg" ,libjpeg) ; Required for the JPEG texture plugin. + ("libjpeg" ,libjpeg) ; required by the JPEG texture plugin ("jasper" ,jasper) ("librsvg" ,librsvg) ("libxrandr" ,libxrandr) -- cgit v1.2.3 From 99ed3a1f0b58a355becbbbd75b7f3a3f8ebb3539 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 21:02:53 +0100 Subject: gnu: openscenegraph: Fix typo in description. * gnu/packages/graphics.scm (openscenegraph)[synopsis, description]: Add missing hyphen. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f437c26b2d..c30f23d921 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -474,9 +474,9 @@ (define-public openscenegraph ("libxrandr" ,libxrandr) ("ffmpeg" ,ffmpeg) ("mesa" ,mesa))) - (synopsis "High performance real-time graphics toolkit") + (synopsis "High-performance real-time graphics toolkit") (description - "The OpenSceneGraph is a high performance 3D graphics toolkit + "The OpenSceneGraph is a high-performance 3D graphics toolkit used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modeling.") (home-page "http://www.openscenegraph.org") -- cgit v1.2.3 From f6fdbb053e96bede8943cb3313a6056c5bfc1365 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 21:03:38 +0100 Subject: gnu: freeorion: Update to 0.4.9. * gnu/packages/games.scm (freeorion): Update to 0.4.9. [source]: Use release tarball. --- gnu/packages/games.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 587f25906d..cb21a66133 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8146,23 +8146,15 @@ (define-public ri-li (define-public freeorion (package (name "freeorion") - (version "0.4.8") + (version "0.4.9") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/freeorion/freeorion.git") - ;; Most recent stable release uses boost_signals (v1) which was - ;; later replaced with boost-signals2 and no longer exists. This - ;; commit builds and runs. - ;; - ;; TODO: Update this when the next stable release when it is - ;; available. - (commit "470d0711537804df3c2ca25532f674ab4bec58af"))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/freeorion/freeorion/releases/" + "download/v" version "/FreeOrion_v" version + "_2020-02-02.db53471_Source.tar.gz")) (sha256 - (base32 - "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f")) + (base32 "1qfnqkysagh8dw26plk229qh17mv4prjxs6qhfyczrmrrakb72an")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2392e589c3b3f7805805c3fce11d208877325970 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 21:04:33 +0100 Subject: gnu: libmicrohttpd: Update to 0.9.70. * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.70. --- gnu/packages/gnunet.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d626d2cc65..f9b71a2f3a 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016, 2017, 2018, 2019 ng0 -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio ;;; @@ -150,14 +150,14 @@ (define-public libextractor (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.69") + (version "0.9.70") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv")))) + "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 3603f5536ee0223f2e15ca6c518ab922030646dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 22:32:37 +0100 Subject: gnu: wabt: Use Texinfo mark-up. * gnu/packages/web.scm (wabt)[description]: Mark up more better. --- gnu/packages/web.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2b9836ecc4..dc67dbd547 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1095,16 +1095,21 @@ (define-public wabt (description "WABT (pronounced: wabbit) is a suite of tools for WebAssembly, including: -* wat2wasm: translate from WebAssembly text format to the WebAssembly binary - format -* wasm2wat: the inverse of wat2wasm, translate from the binary format back - to the text format (also known as a .wat) -* wasm-objdump: print information about a wasm binary. Similar to objdump. -* wasm-interp: decode and run a WebAssembly binary file using a stack-based - interpreter -* wat-desugar: parse .wat text form as supported by the spec interpreter - (s-expressions, flat syntax, or mixed) and print canonical flat format -* wasm2c: convert a WebAssembly binary file to a C source and header +@enumerate +@item @command{wat2wasm} translates from WebAssembly text format to the +WebAssembly binary format +@item @command{wasm2wat} is the inverse; it translates from the binary format +back to the text format (also known as a .wat) +@item @command{wasm-objdump} prints information about a wasm binary, similarly +to @command{objdump}. +@item @command{wasm-interp} decodes ands run a WebAssembly binary file using a +stack-based interpreter +@item @command{wat-desugar} parses .wat text form as supported by the spec +interpreter (s-expressions, flat syntax, or mixed) and prints the canonical +flat format +@item @command{wasm2c} converts a WebAssembly binary file to a C source and +header file. +@end enumerate These tools are intended for use in (or for development of) toolchains or other systems that want to manipulate WebAssembly files.") -- cgit v1.2.3 From 41e7be78a1d62425e167670a254f6573e38ddcda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:00:35 +0100 Subject: gnu: r-rocr: Use HTTPS home page. * gnu/packages/statistics.scm (r-rocr)[home-page]: Use HTTPS. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9e31f42ad1..313634c29c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4266,7 +4266,7 @@ (define-public r-rocr (build-system r-build-system) (propagated-inputs `(("r-gplots" ,r-gplots))) - (home-page "http://rocr.bioinf.mpi-sb.mpg.de/") + (home-page "https://rocr.bioinf.mpi-sb.mpg.de/") (synopsis "Visualizing the performance of scoring classifiers") (description "ROCR is a flexible tool for creating cutoff-parameterized 2D performance -- cgit v1.2.3 From 177e3dfe8806f70ade828a9462f969108e97f40d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:03:48 +0100 Subject: gnu: r-tcltk2: Use HTTPS home page. * gnu/packages/cran.scm (r-tcltk2)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fd1cc7f358..21a1eebb11 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16771,7 +16771,7 @@ (define-public r-tcltk2 (inputs `(("tcl" ,tcl) ("tk" ,tk))) - (home-page "http://www.sciviews.org/SciViews-R") + (home-page "https://www.sciviews.org/SciViews-R") (synopsis "Tcl/Tk additions") (description "This package provides a series of additional Tcl commands and Tk widgets -- cgit v1.2.3 From eef6623e4c694f4c2c71c91cb10a0bb575796cad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:16:14 +0100 Subject: gnu: r-sdmtools: Use HTTPS home page. * gnu/packages/cran.scm (r-sdmtools)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 21a1eebb11..4e830fee11 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3717,7 +3717,7 @@ (define-public r-sdmtools (properties `((upstream-name . "SDMTools"))) (build-system r-build-system) (propagated-inputs `(("r-r-utils" ,r-r-utils))) - (home-page "http://www.rforge.net/SDMTools/") + (home-page "https://www.rforge.net/SDMTools/") (synopsis "Species distribution modelling tools") (description "This package provides a set of tools for post processing the outcomes of species distribution modeling exercises. It includes novel -- cgit v1.2.3 From a1b867e4fabe583bb8274aedb2e52060830b5b38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:37:51 +0100 Subject: gnu: python2-enum: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-enum)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fa38e47138..bbcf936c4c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1393,7 +1393,7 @@ (define-public python2-enum (build-system python-build-system) (arguments `(#:python ,python-2)) - (home-page "http://pypi.python.org/pypi/enum/") + (home-page "https://pypi.python.org/pypi/enum/") (synopsis "Robust enumerated type support in Python") (description "This provides a module for robust enumerations in Python. It has -- cgit v1.2.3 From 25ee4a474511162e3ad98e7ecb0d06cedf438b0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:38:42 +0100 Subject: gnu: autoconf: Use HTTPS home page. * gnu/packages/autotools.scm (autoconf)[home-page]: Use HTTPS. --- gnu/packages/autotools.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index ceb70dfee7..2ba9950981 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -60,8 +60,7 @@ (define-public autoconf ;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It ;; should use our own "cpp" instead of "/lib/cpp". (arguments `(#:tests? #f)) - (home-page - "http://www.gnu.org/software/autoconf/") + (home-page "https://www.gnu.org/software/autoconf/") (synopsis "Create source code configuration scripts") (description "Autoconf offers the developer a robust set of M4 macros which expand -- cgit v1.2.3 From d39885a8a9e0e03c2bf6277d475d384168bba642 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:39:48 +0100 Subject: gnu: python-reno: Update home page. * gnu/packages/openstack.scm (python-reno)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/openstack.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 0d87691cd7..3b6ec6b44f 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -599,7 +599,7 @@ (define-public python-reno ("python-sphinx" ,python-sphinx) ("gnupg" ,gnupg) ("git" ,git-minimal))) - (home-page "http://docs.openstack.org/developer/reno/") + (home-page "https://docs.openstack.org/reno/latest/") (synopsis "Release notes manager") (description "Reno is a tool for storing release notes in a git repository and building documentation from them.") -- cgit v1.2.3 From 205c1e04e04b9a9338c7219ff82bd13f000fb8c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Feb 2020 23:11:04 +0100 Subject: gnu: shepherd: Update to 0.7.0. * gnu/packages/admin.scm (shepherd): Update to 0.7.0. --- 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 4780fe124e..8f8038b60d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -196,14 +196,14 @@ (define-public progress (define-public shepherd (package (name "shepherd") - (version "0.6.1") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1xn6mb5bh8bpfgdrh09ja31jk0ln7bmxbbf0vjcqxkkixs2wl6sk")))) + "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From 139a9887843d0ea7dd724c4dd0d00470337370b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Feb 2020 23:12:41 +0100 Subject: gnu: shepherd: Add "guile3.0-shepherd" variant. * gnu/packages/admin.scm (guile3.0-shepherd): New variable. --- gnu/packages/admin.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f8038b60d..a5f6158f3d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier @@ -228,6 +228,16 @@ (define-public shepherd (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) +(define-public guile3.0-shepherd + (package + (inherit shepherd) + (name "guile3.0-shepherd") + (native-inputs + `(("pkg-config" ,pkg-config) + ("guile" ,guile-next))) + (inputs + `(("guile" ,guile-next))))) + (define-public cloud-utils (package (name "cloud-utils") -- cgit v1.2.3 From 8b9cad01e9619f53dc5a65892ca6a09ca5de3447 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Feb 2020 23:28:54 +0100 Subject: services: shepherd: Spawn services with nothing but the PATH variable. Previously, services spawned with 'make-forkexec-constructor' & co. would all inherit the environment variables of PID 1, which includes things like 'BOOT_IMAGE'. This change resets it to the bare minimum. * gnu/services/shepherd.scm (shepherd-configuration-file): Add call to 'default-environment-variables'. Remove 'setenv' call. --- gnu/services/shepherd.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 08bb33039c..d483ff1a15 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Carlo Zancanaro ;;; @@ -281,6 +281,12 @@ (define config (use-modules (srfi srfi-34) (system repl error-handling)) + ;; Specify the default environment visible to all the services. + ;; Without this statement, all the environment variables of PID 1 + ;; are inherited by child services. + (default-environment-variables + '("PATH=/run/current-system/profile/bin")) + ;; Arrange to spawn a REPL if something goes wrong. This is better ;; than a kernel panic. (call-with-error-handling @@ -288,10 +294,6 @@ (define config (apply register-services (map load-compiled '#$(map scm->go files))))) - ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around - ;; it. - (setenv "PATH" "/run/current-system/profile/bin") - (format #t "starting services...~%") (for-each (lambda (service) ;; In the Shepherd 0.3 the 'start' method can raise -- cgit v1.2.3 From 63b148f70fa1292a4983fcc787792f7ff517b9f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 23:12:04 +0100 Subject: gnu: endlessh: Update to 1.1. * gnu/packages/ssh.scm (endlessh): Update to 1.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/ssh.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d203bb1455..8acc7ce2ed 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -769,23 +769,24 @@ (define-public clustershell (define-public endlessh (package (name "endlessh") - (version "1.0") + (version "1.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/skeeto/endlessh/releases/" - "download/" version "/endlessh-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/skeeto/endlessh.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0hhsr65hzrcb7ylskmxyr92svzndhks8hqzn8hvg7f7j89rkvq5k")))) + (base32 "0ziwr8j1frsp3dajr8h5glkm1dn5cci404kazz5w1jfrp0736x68")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") - #:tests? #f ; no test target + #:tests? #f ; no test target #:phases (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (delete 'configure)))) ; no configure script (home-page "https://github.com/skeeto/endlessh") (synopsis "SSH tarpit that slowly sends an endless banner") (description -- cgit v1.2.3 From 21f5de6d32a7d0e75ec2df69dc753a75a15657cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 23:13:54 +0100 Subject: gnu: openssh: Don't use NAME in source URI. * gnu/packages/ssh.scm (openssh)[source]: Hard-code NAME. --- gnu/packages/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 8acc7ce2ed..7ea871e581 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -133,7 +133,7 @@ (define-public openssh (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" - name "-" version ".tar.gz")) + "openssh-" version ".tar.gz")) (sha256 (base32 "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x")))) -- cgit v1.2.3 From 6db6bcf71570e7d667ea5918c67016d0d3076650 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 00:39:41 +0100 Subject: gnu: openssh: Update to 8.2p1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (openssh): Update to 8.2p1. [arguments]: Adjust ‘patch-tests’ phase. --- gnu/packages/ssh.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7ea871e581..eae2f98b53 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -129,14 +129,14 @@ (define-public libssh2 (define-public openssh (package (name "openssh") - (version "8.0p1") + (version "8.2p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) (sha256 (base32 - "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x")))) + "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) @@ -145,7 +145,7 @@ (define-public openssh ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) - ("xauth" ,xauth))) ;for 'ssh -X' and 'ssh -Y' + ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" ;; Otherwise, the test scripts try to use a nonexistent directory and @@ -156,12 +156,12 @@ (define-public openssh ;; Default value of 'PATH' used by sshd. "--with-default-path=/run/current-system/profile/bin" - ;; configure needs to find krb5-config + ;; configure needs to find krb5-config. ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin") - ;; libedit needed for sftp completion + ;; libedit is needed for sftp completion. "--with-libedit" ;; Enable PAM support in sshd. @@ -178,14 +178,18 @@ (define-public openssh #t))) (add-before 'check 'patch-tests (lambda _ - ;; remove 't-exec' regress target which requires user 'sshd' - (substitute* "regress/Makefile" - (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post) + (substitute* "regress/test-exec.sh" + (("/bin/sh") (which "sh"))) + + ;; Remove 't-exec' regress target which requires user 'sshd'. + (substitute* (list "Makefile" + "regress/Makefile") + (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))) #t)) (replace 'install (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) - ;; install without host keys and system configuration files + ;; Install without host keys and system configuration files. (apply invoke "make" "install-nosysconf" make-flags) (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From 19115138257768fad6467ef2c22428c013798357 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:42:31 +0100 Subject: gnu: hlint: Update home page. * gnu/packages/haskell-apps.scm (hlint)[home-page]: Use source repository. --- gnu/packages/haskell-apps.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 767f0c7f99..3cf6eeafee 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -442,7 +442,7 @@ (define-public hlint ("ghc-aeson" ,ghc-aeson) ("ghc-lib-parser" ,ghc-lib-parser) ("hscolour" ,hscolour))) - (home-page "http://community.haskell.org/~ndm/hlint/") + (home-page "https://github.com/ndmitchell/hlint") (synopsis "Suggest improvements for Haskell source code") (description "HLint reads Haskell programs and suggests changes that hopefully make them easier to read. HLint also makes it easy to disable -- cgit v1.2.3 From d46646d9c772fb699ca24a56f815695eecdcb513 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:49:41 +0100 Subject: gnu: python-blinker: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-blinker)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bbcf936c4c..655a9d15f2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3201,7 +3201,7 @@ (define-public python-blinker (base32 "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7")))) (build-system python-build-system) - (home-page "http://pythonhosted.org/blinker/") + (home-page "https://pythonhosted.org/blinker/") (synopsis "Fast, simple object-to-object and broadcast signaling") (description "Blinker provides a fast dispatching system that allows any number of -- cgit v1.2.3 From 78f8780e9fbf5a8346a6ea19b5599f5f4114383b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:56:00 +0100 Subject: gnu: python2-munkres: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-munkres)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 655a9d15f2..b1fa529911 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9431,7 +9431,7 @@ (define-public python-munkres (build-system python-build-system) (arguments '(#:tests? #f)) ; no test suite - (home-page "http://software.clapper.org/munkres/") + (home-page "https://software.clapper.org/munkres/") (synopsis "Implementation of the Munkres algorithm") (description "The Munkres module provides an implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), -- cgit v1.2.3 From 0eecc9eba84478ebf31113f4dc975ddbcddbf7fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:59:12 +0100 Subject: gnu: sbcl-trivial-gray-streams: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-trivial-gray-streams)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5b990d2faa..7496dc5ba4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -218,7 +218,7 @@ (define-public sbcl-trivial-gray-streams ANSI CL by David N. Gray. The proposal did not make it into ANSI CL, but most popular CL implementations implement it. This package provides an extremely thin compatibility layer for gray streams.") - (home-page "http://www.cliki.net/trivial-gray-streams") + (home-page "https://www.cliki.net/trivial-gray-streams") (license license:x11)))) (define-public cl-trivial-gray-streams -- cgit v1.2.3 From 35f985cb52d7bc3d7e03d5db0a63da4dcf4d3322 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:00:55 +0100 Subject: gnu: guile-present: Use HTTPS home page. * gnu/packages/gtk.scm (guile-present)[home-page]: Use HTTPS. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f934eabe27..16852650ea 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -986,7 +986,7 @@ (define-public guile-present `(("guile-lib" ,guile-lib) ("guile-cairo" ,guile-cairo) ("guile-rsvg" ,guile-rsvg))) - (home-page "http://wingolog.org/software/guile-present/") + (home-page "https://wingolog.org/software/guile-present/") (synopsis "Create SVG or PDF presentations in Guile") (description "Guile-Present defines a declarative vocabulary for presentations, -- cgit v1.2.3 From 31b85761754bb82d59377ab2047dcae74c88fa50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:01:08 +0100 Subject: gnu: java-commons-exec: Use HTTPS home page. * gnu/packages/java.scm (java-commons-exec)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6abd0c8360..9cbee0df43 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4929,7 +4929,7 @@ (define-public java-commons-exec-1.1 (replace 'install (install-jars "target"))))) (native-inputs `(("java-junit" ,java-junit))) - (home-page "http://commons.apache.org/proper/commons-exec/") + (home-page "https://commons.apache.org/proper/commons-exec/") (synopsis "Common program execution related classes") (description "Commons-Exec simplifies executing external processes.") (license license:asl2.0))) -- cgit v1.2.3 From 2c051312b57cafc4f2bda4e7611f553c5efc0b14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:02:19 +0100 Subject: gnu: libgig: Use HTTPS home page. * gnu/packages/music.scm (libgig)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 50e5d11f8d..5cecfc6a31 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2284,7 +2284,7 @@ (define-public libgig ("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://linuxsampler.org/libgig/") + (home-page "https://linuxsampler.org/libgig/") (synopsis "C++ library for working with Gigasampler (.gig) files") (description "Libgig is a C++ library for loading, modifying existing and creating new -- cgit v1.2.3 From 2196e3cc23e5e8a372367ea6b520c35f719f2fb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:02:46 +0100 Subject: gnu: newlib: Use HTTPS home page. * gnu/packages/embedded.scm (newlib)[home-page]: Use HTTPS. --- gnu/packages/embedded.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 08c8533812..136add4e82 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -175,7 +175,7 @@ (define-public newlib-arm-none-eabi `(("xbinutils" ,(cross-binutils "arm-none-eabi")) ("xgcc" ,gcc-arm-none-eabi-4.9) ("texinfo" ,texinfo))) - (home-page "http://www.sourceware.org/newlib/") + (home-page "https://www.sourceware.org/newlib/") (synopsis "C library for use on embedded systems") (description "Newlib is a C library intended for use on embedded systems. It is a conglomeration of several library parts that are easily -- cgit v1.2.3 From de5bc83cd3245d76c8769e14cd1d6fb5256de28b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 04:50:12 +0100 Subject: gnu: upx: Don't use NAME in source URI. * gnu/packages/compression.scm (upx)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 98af41760f..a65e320a9b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1907,7 +1907,7 @@ (define-public upx (source (origin (method url-fetch) (uri (string-append "https://github.com/upx/upx/releases/download/v" - version "/" name "-" version "-src.tar.xz")) + version "/upx-" version "-src.tar.xz")) (sha256 (base32 "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1")) -- cgit v1.2.3 From f5255ed3d3689c793b87939d30df7e2e3443b004 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 04:55:47 +0100 Subject: gnu: upx: Update to 3.96. * gnu/packages/compression.scm (upx): Update to 3.96. [source]: Remove patch. [arguments]: Remove CHECK_WHITESPACE work-around. [properties]: Remove obsolete hidden CVE. * gnu/packages/patches/upx-fix-CVE-2017-15056.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/compression.scm | 15 +--- gnu/packages/patches/upx-fix-CVE-2017-15056.patch | 96 ----------------------- 3 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/upx-fix-CVE-2017-15056.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1f7cad9d32..f2289518e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1465,7 +1465,6 @@ dist_patch_DATA = \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ - %D%/packages/patches/upx-fix-CVE-2017-15056.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index a65e320a9b..3f4b99bfcf 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1903,15 +1903,14 @@ (define-public ucl (define-public upx (package (name "upx") - (version "3.94") + (version "3.96") (source (origin (method url-fetch) (uri (string-append "https://github.com/upx/upx/releases/download/v" version "/upx-" version "-src.tar.xz")) (sha256 (base32 - "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1")) - (patches (search-patches "upx-fix-CVE-2017-15056.patch")))) + "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) @@ -1920,10 +1919,7 @@ (define-public upx ("zlib" ,zlib))) (arguments `(#:make-flags - (list "all" - ;; CHECK_WHITESPACE does not seem to work. - ;; See https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/upx. - "CHECK_WHITESPACE=true") + (list "all") #:phases (modify-phases %standard-phases (delete 'configure) @@ -1945,11 +1941,6 @@ (define-public upx #t)) ))) (home-page "https://upx.github.io/") - ;; CVE-2017-16869 is about Mach-O files which is not of a big concern for Guix. - ;; See https://github.com/upx/upx/issues/146 and - ;; https://nvd.nist.gov/vuln/detail?vulnId=CVE-2017-16869. - ;; The issue will be fixed after version 3.94. - (properties `((lint-hidden-cve . ("CVE-2017-16869")))) (synopsis "Compression tool for executables") (description "The Ultimate Packer for eXecutables (UPX) is an executable file diff --git a/gnu/packages/patches/upx-fix-CVE-2017-15056.patch b/gnu/packages/patches/upx-fix-CVE-2017-15056.patch deleted file mode 100644 index 525980e73e..0000000000 --- a/gnu/packages/patches/upx-fix-CVE-2017-15056.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 3e0c2966dffb5dadb512a476ef4be3d0cc51c2be Mon Sep 17 00:00:00 2001 -From: Pierre Neidhardt -Date: Sat, 16 Jun 2018 16:35:00 +0200 -Subject: [PATCH] Protect against bad crafted input - -Also check for wrap-around when checking oversize involving e_shoff and e_shnum. - -raised by https://github.com/upx/upx/pull/190 - modified: p_lx_elf.cpp ---- - src/p_lx_elf.cpp | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 822a7652..41e805ee 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -235,8 +235,17 @@ PackLinuxElf32::PackLinuxElf32help1(InputFile *f) - sz_phdrs = 0; - return; - } -+ if (0==e_phnum) throwCantUnpack("0==e_phnum"); - e_phoff = get_te32(&ehdri.e_phoff); -+ unsigned const last_Phdr = e_phoff + e_phnum * sizeof(Elf32_Phdr); -+ if (last_Phdr < e_phoff || (unsigned long)file_size < last_Phdr) { -+ throwCantUnpack("bad e_phoff"); -+ } - e_shoff = get_te32(&ehdri.e_shoff); -+ unsigned const last_Shdr = e_shoff + e_shnum * sizeof(Elf32_Shdr); -+ if (last_Shdr < e_shoff || (unsigned long)file_size < last_Shdr) { -+ throwCantUnpack("bad e_shoff"); -+ } - sz_phdrs = e_phnum * e_phentsize; - - if (f && Elf32_Ehdr::ET_DYN!=e_type) { -@@ -599,8 +608,17 @@ PackLinuxElf64::PackLinuxElf64help1(InputFile *f) - sz_phdrs = 0; - return; - } -+ if (0==e_phnum) throwCantUnpack("0==e_phnum"); - e_phoff = get_te64(&ehdri.e_phoff); -+ upx_uint64_t const last_Phdr = e_phoff + e_phnum * sizeof(Elf64_Phdr); -+ if (last_Phdr < e_phoff || (unsigned long)file_size < last_Phdr) { -+ throwCantUnpack("bad e_phoff"); -+ } - e_shoff = get_te64(&ehdri.e_shoff); -+ upx_uint64_t const last_Shdr = e_shoff + e_shnum * sizeof(Elf64_Shdr); -+ if (last_Shdr < e_shoff || (unsigned long)file_size < last_Shdr) { -+ throwCantUnpack("bad e_shoff"); -+ } - sz_phdrs = e_phnum * e_phentsize; - - if (f && Elf64_Ehdr::ET_DYN!=e_type) { -@@ -3763,6 +3781,9 @@ void PackLinuxElf64::pack4(OutputFile *fo, Filter &ft) - - void PackLinuxElf64::unpack(OutputFile *fo) - { -+ if (e_phoff != sizeof(Elf64_Ehdr)) {// Phdrs not contiguous with Ehdr -+ throwCantUnpack("bad e_phoff"); -+ } - unsigned const c_phnum = get_te16(&ehdri.e_phnum); - upx_uint64_t old_data_off = 0; - upx_uint64_t old_data_len = 0; -@@ -3828,6 +3849,9 @@ void PackLinuxElf64::unpack(OutputFile *fo) - unsigned total_out = 0; - unsigned c_adler = upx_adler32(NULL, 0); - unsigned u_adler = upx_adler32(NULL, 0); -+ if ((MAX_ELF_HDR - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) { -+ throwCantUnpack("bad compressed e_phnum"); -+ } - - // Packed ET_EXE has no PT_DYNAMIC. - // Packed ET_DYN has original PT_DYNAMIC for info needed by rtld. -@@ -4383,6 +4407,9 @@ Elf64_Sym const *PackLinuxElf64::elf_lookup(char const *name) const - - void PackLinuxElf32::unpack(OutputFile *fo) - { -+ if (e_phoff != sizeof(Elf32_Ehdr)) {// Phdrs not contiguous with Ehdr -+ throwCantUnpack("bad e_phoff"); -+ } - unsigned const c_phnum = get_te16(&ehdri.e_phnum); - unsigned old_data_off = 0; - unsigned old_data_len = 0; -@@ -4449,6 +4476,9 @@ void PackLinuxElf32::unpack(OutputFile *fo) - unsigned total_out = 0; - unsigned c_adler = upx_adler32(NULL, 0); - unsigned u_adler = upx_adler32(NULL, 0); -+ if ((MAX_ELF_HDR - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) { -+ throwCantUnpack("bad compressed e_phnum"); -+ } - - // Packed ET_EXE has no PT_DYNAMIC. - // Packed ET_DYN has original PT_DYNAMIC for info needed by rtld. --- -2.17.0 - -- cgit v1.2.3 From a5215f179359f1adcc8947a5b39a721f7674947c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 05:05:55 +0100 Subject: gnu: gcompris-qt: Update to 0.98. * gnu/packages/education.scm (gcompris-qt): Update to 0.98. --- gnu/packages/education.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 3ae1ec2192..20fc9a3706 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; @@ -132,7 +132,7 @@ (define-public gcompris (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.97") + (version "0.98") (source (origin (method url-fetch) @@ -140,7 +140,7 @@ (define-public gcompris-qt "https://gcompris.net/download/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 - (base32 "0hl3a1jjnrpnbqkpx3rl3fl86yfv503lh48djb888hplvr4nf747")))) + (base32 "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 52beda0da77f4f02f5a60e374d8b645fbf26d779 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 05:10:19 +0100 Subject: gnu: simple-scan: Update to 3.34.4. * gnu/packages/gnome.scm (simple-scan): Update to 3.34.4. --- 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 014b68f54f..3c63ab283d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5330,7 +5330,7 @@ (define-public gusb (define-public simple-scan (package (name "simple-scan") - (version "3.34.2") + (version "3.34.4") (source (origin (method url-fetch) @@ -5338,7 +5338,7 @@ (define-public simple-scan (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp")))) + (base32 "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From f98e83a17fa30587520e858231ec9c61f3624ecd Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Mon, 17 Feb 2020 07:35:26 +0100 Subject: doc: Add German Cookbook translation. * doc/local.mk (info_TEXINFOS): Add guix-cookbook.de.texi. (TRANSLATED_INFO): Add guix-cookbook.de.texi. * po/doc/guix-cookbook.de.po: New file. * po/doc/local.mk (DOC_COOKBOOK_PO_FILES): Add guix-cookbook.de.po. --- doc/local.mk | 6 +- po/doc/guix-cookbook.de.po | 3395 ++++++++++++++++++++++++++++++++++++++++++++ po/doc/local.mk | 3 +- 3 files changed, 3401 insertions(+), 3 deletions(-) create mode 100644 po/doc/guix-cookbook.de.po diff --git a/doc/local.mk b/doc/local.mk index a361f2388e..3805593172 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -27,7 +27,8 @@ info_TEXINFOS = %D%/guix.texi \ %D%/guix.fr.texi \ %D%/guix.ru.texi \ %D%/guix.zh_CN.texi \ - %D%/guix-cookbook.texi + %D%/guix-cookbook.texi \ + %D%/guix-cookbook.de.texi %C%_guix_TEXINFOS = \ %D%/contributing.texi \ @@ -69,7 +70,8 @@ TRANSLATED_INFO = \ %D%/contributing.es.texi \ %D%/contributing.fr.texi \ %D%/contributing.ru.texi \ - %D%/contributing.zh_CN.texi + %D%/contributing.zh_CN.texi \ + %D%/guix-cookbook.de.texi # Bundle this file so that makeinfo finds it in out-of-source-tree builds. BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) diff --git a/po/doc/guix-cookbook.de.po b/po/doc/guix-cookbook.de.po new file mode 100644 index 0000000000..4bb57d980c --- /dev/null +++ b/po/doc/guix-cookbook.de.po @@ -0,0 +1,3395 @@ +# German translations for the Guix Cookbook. +# Copyright (C) 2020 Ludovic Courtès +# This file is distributed under the same license as the guix package. +# Florian Pelz , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: guix 1.0.1.4876-09145-dirty\n" +"Report-Msgid-Bugs-To: ludo@gnu.org\n" +"POT-Creation-Date: 2020-02-14 08:04+0100\n" +"PO-Revision-Date: 2020-02-17 06:51+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:7 +msgid "@documentencoding UTF-8" +msgstr "" +"@documentencoding UTF-8\n" +"@documentlanguage de\n" +"@frenchspacing on" + +#. type: top +#: doc/guix-cookbook.texi:7 doc/guix-cookbook.texi:29 doc/guix-cookbook.texi:43 +#, no-wrap +msgid "GNU Guix Cookbook" +msgstr "GNU-Guix-Kochbuch" + +#. type: copying +#: doc/guix-cookbook.texi:14 +msgid "Copyright @copyright{} 2019 Ricardo Wurmus@* Copyright @copyright{} 2019 Efraim Flashner@* Copyright @copyright{} 2019 Pierre Neidhardt@*" +msgstr "Copyright @copyright{} 2019 Ricardo Wurmus@* Copyright @copyright{} 2019 Efraim Flashner@* Copyright @copyright{} 2019 Pierre Neidhardt@*" + +#. type: copying +#: doc/guix-cookbook.texi:21 +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''." +msgstr "Es ist Ihnen gestattet, dieses Dokument zu vervielfältigen, weiterzugeben und/oder zu verändern, unter den Bedingungen der GNU Free Documentation License, entweder gemäß Version 1.3 der Lizenz oder (nach Ihrer Option) einer späteren Version, die von der Free Software Foundation veröffentlicht wurde, ohne unveränderliche Abschnitte, ohne vorderen Umschlagtext und ohne hinteren Umschlagtext. Eine Kopie der Lizenz finden Sie im Abschnitt mit dem Titel „GNU Free Documentation License“." + +#. type: dircategory +#: doc/guix-cookbook.texi:23 +#, no-wrap +msgid "System administration" +msgstr "Systemadministration" + +#. type: menuentry +#: doc/guix-cookbook.texi:26 +msgid "Guix cookbook: (guix-cookbook)" +msgstr "Guix-Kochbuch: (guix-cookbook.de)" + +#. type: menuentry +#: doc/guix-cookbook.texi:26 +msgid "Tutorials and examples for GNU Guix." +msgstr "Anleitungen und Beispiele für GNU Guix." + +#. type: subtitle +#: doc/guix-cookbook.texi:30 +#, no-wrap +msgid "Tutorials and examples for using the GNU Guix Functional Package Manager" +msgstr "Anleitungen und Beispiele, wie man den funktionalen Paketmanager GNU Guix benutzt" + +#. type: author +#: doc/guix-cookbook.texi:31 +#, no-wrap +msgid "The GNU Guix Developers" +msgstr "Die Entwickler von GNU Guix" + +#. type: node +#: doc/guix-cookbook.texi:42 +#, no-wrap +msgid "Top" +msgstr "Top" + +#. type: Plain text +#: doc/guix-cookbook.texi:49 +msgid "This document presents tutorials and detailed examples for GNU@tie{}Guix, a functional package management tool written for the GNU system. Please @pxref{Top,,, guix, GNU Guix reference manual} for details about the system, its API, and related concepts." +msgstr "Dieses Dokument stellt Anleitungen und detaillierte Beispiele vor, wie man GNU@tie{}Guix benutzt, ein Werkzeug zur funktionalen Paketverwaltung, das für das GNU-System geschrieben wurde. Bitte lesen Sie Details zum System, seinen Programmierschnittstellen und ähnlichen Konzepten im @ref{Top,,, guix.de, Referenzhandbuch zu GNU Guix} nach." + +#. type: Plain text +#: doc/guix-cookbook.texi:56 +msgid "If you would like to translate this document in your native language, consider joining the @uref{https://translationproject.org/domain/guix-cookbook.html, Translation Project}." +msgstr "Wenn Sie dieses Dokument in Ihre eigene Sprache übersetzen möchten, dann sind Sie beim @uref{https://translationproject.org/domain/guix-cookbook.html, Translation Project} herzlich willkommen." + +#. type: chapter +#: doc/guix-cookbook.texi:62 doc/guix-cookbook.texi:71 +#: doc/guix-cookbook.texi:87 doc/guix-cookbook.texi:88 +#, no-wrap +msgid "Scheme tutorials" +msgstr "Anleitungen zu Scheme" + +#. type: menuentry +#: doc/guix-cookbook.texi:62 +msgid "Meet your new favorite language!" +msgstr "Lernen Sie Ihre neue Lieblingssprache kennen!" + +#. type: chapter +#: doc/guix-cookbook.texi:62 doc/guix-cookbook.texi:75 +#: doc/guix-cookbook.texi:291 doc/guix-cookbook.texi:292 +#, no-wrap +msgid "Packaging" +msgstr "Paketerstellung" + +#. type: menuentry +#: doc/guix-cookbook.texi:62 +msgid "Packaging tutorials" +msgstr "Anleitungen, wie man Pakete erstellt." + +#. type: chapter +#: doc/guix-cookbook.texi:62 doc/guix-cookbook.texi:79 +#: doc/guix-cookbook.texi:1311 doc/guix-cookbook.texi:1312 +#, no-wrap +msgid "System Configuration" +msgstr "Systemkonfiguration" + +#. type: menuentry +#: doc/guix-cookbook.texi:62 +msgid "Customizing the GNU System" +msgstr "Das GNU-System anpassen." + +#. type: chapter +#: doc/guix-cookbook.texi:62 doc/guix-cookbook.texi:1566 +#: doc/guix-cookbook.texi:1567 +#, no-wrap +msgid "Advanced package management" +msgstr "Fortgeschrittene Paketverwaltung" + +# angelehnt an Alle Macht dem Volke in Übersetzung von Die Mutter +#. type: menuentry +#: doc/guix-cookbook.texi:62 +msgid "Power to the users!" +msgstr "Alle Macht den Nutzern!" + +#. type: chapter +#: doc/guix-cookbook.texi:66 doc/guix-cookbook.texi:1964 +#: doc/guix-cookbook.texi:1965 +#, no-wrap +msgid "Acknowledgments" +msgstr "Danksagungen" + +#. type: menuentry +#: doc/guix-cookbook.texi:66 +msgid "Thanks!" +msgstr "Danke!" + +#. type: appendix +#: doc/guix-cookbook.texi:66 doc/guix-cookbook.texi:1989 +#: doc/guix-cookbook.texi:1990 +#, no-wrap +msgid "GNU Free Documentation License" +msgstr "GNU-Lizenz für freie Dokumentation" + +#. type: menuentry +#: doc/guix-cookbook.texi:66 +msgid "The license of this document." +msgstr "Die Lizenz dieses Dokuments." + +#. type: unnumbered +#: doc/guix-cookbook.texi:66 doc/guix-cookbook.texi:1995 +#: doc/guix-cookbook.texi:1996 +#, no-wrap +msgid "Concept Index" +msgstr "Konzeptverzeichnis" + +#. type: menuentry +#: doc/guix-cookbook.texi:66 +msgid "Concepts." +msgstr "Konzepte." + +#. type: menuentry +#: doc/guix-cookbook.texi:69 +msgid "--- The Detailed Node Listing ---" +msgstr "--- Detaillierte Liste der Knoten ---" + +#. type: section +#: doc/guix-cookbook.texi:73 doc/guix-cookbook.texi:101 +#: doc/guix-cookbook.texi:102 +#, no-wrap +msgid "A Scheme Crash Course" +msgstr "Ein Schnellkurs in Scheme" + +#. type: menuentry +#: doc/guix-cookbook.texi:73 +msgid "Learn the basics of Scheme" +msgstr "Die Grundzüge von Scheme erlernen." + +#. type: section +#: doc/guix-cookbook.texi:77 doc/guix-cookbook.texi:303 +#: doc/guix-cookbook.texi:305 doc/guix-cookbook.texi:306 +#, no-wrap +msgid "Packaging Tutorial" +msgstr "Anleitung zum Paketeschreiben" + +#. type: menuentry +#: doc/guix-cookbook.texi:77 +msgid "Let's add a package to Guix!" +msgstr "Lasst uns ein Paket zu Guix beitragen!" + +#. type: section +#: doc/guix-cookbook.texi:81 doc/guix-cookbook.texi:1323 +#: doc/guix-cookbook.texi:1325 doc/guix-cookbook.texi:1326 +#, no-wrap +msgid "Customizing the Kernel" +msgstr "Den Kernel anpassen" + +#. type: menuentry +#: doc/guix-cookbook.texi:81 +msgid "Creating and using a custom Linux kernel" +msgstr "Einen eigenen Linux-Kernel benutzen" + +#. type: Plain text +#: doc/guix-cookbook.texi:94 +msgid "GNU@tie{}Guix is written in the general purpose programming language Scheme, and many of its features can be accessed and manipulated programmatically. You can use Scheme to generate package definitions, to modify them, to build them, to deploy whole operating systems, etc." +msgstr "GNU@tie{}Guix ist in Scheme geschrieben, einer für alle Anwendungszwecke geeigneten Programmiersprache, und viele Funktionalitäten von Guix können programmatisch angesteuert und verändert werden. Sie können Scheme benutzen, um Paketdefinitionen zu erzeugen, abzuändern, ganze Betriebssysteme einzuspielen etc." + +#. type: Plain text +#: doc/guix-cookbook.texi:98 +msgid "Knowing the basics of how to program in Scheme will unlock many of the advanced features Guix provides --- and you don't even need to be an experienced programmer to use them!" +msgstr "Wenn man die Grundzüge kennt, wie man in Scheme programmiert, bekommt man Zugang zu vielen der fortgeschrittenen Funktionen von Guix — und Sie müssen dazu nicht einmal ein erfahrener Programmierer sein!" + +#. type: Plain text +#: doc/guix-cookbook.texi:100 +msgid "Let's get started!" +msgstr "Legen wir los!" + +#. type: cindex +#: doc/guix-cookbook.texi:104 +#, no-wrap +msgid "Scheme, crash course" +msgstr "Scheme, Schnellkurs" + +#. type: Plain text +#: doc/guix-cookbook.texi:110 +msgid "Guix uses the Guile implementation of Scheme. To start playing with the language, install it with @code{guix install guile} and start a @uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop, REPL} by running @code{guile} from the command line." +msgstr "Die von Guix benutzte Scheme-Implementierung nennt sich Guile. Um mit der Sprache herumspielen zu können, installieren Sie Guile mit @code{guix install guile} und starten eine interaktive Programmierumgebung (englisch @uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop, REPL}), indem Sie @code{guile} auf der Befehlszeile ausführen." + +#. type: Plain text +#: doc/guix-cookbook.texi:113 +msgid "Alternatively you can also run @code{guix environment --ad-hoc guile -- guile} if you'd rather not have Guile installed in your user profile." +msgstr "Alternativ können Sie auch den Befehl @code{guix environment --ad-hoc guile -- guile} ausführen, wenn Sie Guile lieber @emph{nicht} in Ihr Nutzerprofil installieren wollen." + +#. type: Plain text +#: doc/guix-cookbook.texi:119 +msgid "In the following examples, lines show what you would type at the REPL; lines starting with ``@result{}'' show evaluation results, while lines starting with ``@print{}'' show things that get printed. @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}), for more details on the REPL." +msgstr "In den folgenden Beispielen stehen die Zeilen dafür, was Sie auf der REPL eintippen; wenn eine Zeile mit „@result{}“ beginnt, zeigt sie das Ergebnis einer Auswertung, während Zeilen, die mit „@print{}“ beginnen, für eine angezeigte Ausgabe stehen. Siehe @ref{Using Guile Interactively,,, guile, GNU Guile Reference Manual} für mehr Details zur REPL." + +#. type: itemize +#: doc/guix-cookbook.texi:126 +msgid "Scheme syntax boils down to a tree of expressions (or @emph{s-expression} in Lisp lingo). An expression can be a literal such as numbers and strings, or a compound which is a parenthesized list of compounds and literals. @code{#t} and @code{#f} stand for the Booleans ``true'' and ``false'', respectively." +msgstr "Die Scheme-Syntax ist an sich ein Baum von Ausdrücken (Lisp-Programmierer nennen sie @emph{symbolische Ausdrücke}, kurz @emph{S-Ausdrücke} bzw.@: englisch @emph{s-expression}). Ein solcher Ausdruck kann ein Literal sein, wie z.B.@: Zahlen oder Zeichenketten, oder er kann ein zusammengesetzter Ausdruck sein, d.h.@: eine geklammerte Liste von zusammengesetzten und literalen Ausdrücken. Dabei stehen @code{#t} und @code{#f} jeweils für die Booleschen Werte „wahr“ und „falsch“." + +#. type: itemize +#: doc/guix-cookbook.texi:128 +msgid "Examples of valid expressions:" +msgstr "Beispiele für gültige Ausdrücke" + +#. type: lisp +#: doc/guix-cookbook.texi:132 +#, no-wrap +msgid "" +"\"Hello World!\"\n" +"@result{} \"Hello World!\"\n" +"\n" +msgstr "" +"\"Hallo Welt!\"\n" +"@result{} \"Hallo Welt!\"\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:135 +#, no-wrap +msgid "" +"17\n" +"@result{} 17\n" +"\n" +msgstr "" +"17\n" +"@result{} 17\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:139 +#, no-wrap +msgid "" +"(display (string-append \"Hello \" \"Guix\" \"\\n\"))\n" +"@print{} Hello Guix!\n" +"@result{} #\n" +msgstr "" +"(display (string-append \"Hallo \" \"Guix\" \"\\n\"))\n" +"@print{} Hallo Guix!\n" +"@result{} #\n" + +#. type: itemize +#: doc/guix-cookbook.texi:146 +msgid "This last example is a function call nested in another function call. When a parenthesized expression is evaluated, the first term is the function and the rest are the arguments passed to the function. Every function returns the last evaluated expression as its return value." +msgstr "Das letzte Beispiel eben ist der Aufruf einer Funktion innerhalb eines anderen Funktionsaufrufs. Wenn ein geklammerter Ausdruck ausgewertet wird, ist der erste Term die Funktion und der Rest sind die Argumente, die an die Funktion übergeben werden. Jede Funktion liefert ihren zuletzt ausgewerteten Ausdruck als ihren Rückgabewert." + +#. type: itemize +#: doc/guix-cookbook.texi:149 +msgid "Anonymous functions are declared with the @code{lambda} term:" +msgstr "Anonyme Funktionen werden mit dem @code{lambda}-Term deklariert:" + +#. type: lisp +#: doc/guix-cookbook.texi:153 +#, no-wrap +msgid "" +"(lambda (x) (* x x))\n" +"@result{} #:24:0 (x)>\n" +msgstr "" +"(lambda (x) (* x x))\n" +"@result{} #:24:0 (x)>\n" + +#. type: itemize +#: doc/guix-cookbook.texi:158 +msgid "The above procedure returns the square of its argument. Since everything is an expression, the @code{lambda} expression returns an anonymous procedure, which can in turn be applied to an argument:" +msgstr "Die obige Prozedur liefert das Quadrat ihres Arguments. Weil alles ein Ausdruck ist, liefert der Ausdruck @code{lambda} eine anonyme Prozedur, die wiederum auf ein Argument angewandt werden kann:" + +#. type: lisp +#: doc/guix-cookbook.texi:162 +#, no-wrap +msgid "" +"((lambda (x) (* x x)) 3)\n" +"@result{} 9\n" +msgstr "" +"((lambda (x) (* x x)) 3)\n" +"@result{} 9\n" + +#. type: itemize +#: doc/guix-cookbook.texi:166 +msgid "Anything can be assigned a global name with @code{define}:" +msgstr "Allem kann mit @code{define} ein globaler Name zugewiesen werden:" + +#. type: lisp +#: doc/guix-cookbook.texi:172 +#, no-wrap +msgid "" +"(define a 3)\n" +"(define square (lambda (x) (* x x)))\n" +"(square a)\n" +"@result{} 9\n" +msgstr "" +"(define a 3)\n" +"(define quadrat (lambda (x) (* x x)))\n" +"(quadrat a)\n" +"@result{} 9\n" + +#. type: itemize +#: doc/guix-cookbook.texi:176 +msgid "Procedures can be defined more concisely with the following syntax:" +msgstr "Prozeduren können auch kürzer mit der folgenden Syntax definiert werden:" + +#. type: lisp +#: doc/guix-cookbook.texi:179 +#, no-wrap +msgid "(define (square x) (* x x))\n" +msgstr "(define (quadrat x) (* x x))\n" + +#. type: itemize +#: doc/guix-cookbook.texi:183 +msgid "A list structure can be created with the @code{list} procedure:" +msgstr "Eine Listenstruktur kann mit der @code{list}-Prozedur erzeugt werden:" + +#. type: lisp +#: doc/guix-cookbook.texi:187 +#, no-wrap +msgid "" +"(list 2 a 5 7)\n" +"@result{} (2 3 5 7)\n" +msgstr "" +"(list 2 a 5 7)\n" +"@result{} (2 3 5 7)\n" + +#. type: itemize +#: doc/guix-cookbook.texi:194 +msgid "The @dfn{quote} disables evaluation of a parenthesized expression: the first term is not called over the other terms (@pxref{Expression Syntax, quote,, guile, GNU Guile Reference Manual}). Thus it effectively returns a list of terms." +msgstr "Mit dem @dfn{quote}-Zeichen wird das Auswerten eines geklammerten Ausdrucks abgeschaltet: Der erste Term wird @emph{nicht} auf den anderen Termen aufgerufen (siehe @ref{Expression Syntax, quote,, guile, GNU Guile Reference Manual}). Folglich liefert es quasi eine Liste von Termen." + +#. type: lisp +#: doc/guix-cookbook.texi:198 +#, no-wrap +msgid "" +"'(display (string-append \"Hello \" \"Guix\" \"\\n\"))\n" +"@result{} (display (string-append \"Hello \" \"Guix\" \"\\n\"))\n" +"\n" +msgstr "" +"'(display (string-append \"Hello \" \"Guix\" \"\\n\"))\n" +"@result{} (display (string-append \"Hello \" \"Guix\" \"\\n\"))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:201 +#, no-wrap +msgid "" +"'(2 a 5 7)\n" +"@result{} (2 a 5 7)\n" +msgstr "" +"'(2 a 5 7)\n" +"@result{} (2 a 5 7)\n" + +#. type: itemize +#: doc/guix-cookbook.texi:207 +msgid "The @dfn{quasiquote} disables evaluation of a parenthesized expression until @dfn{unquote} (a comma) re-enables it. Thus it provides us with fine-grained control over what is evaluated and what is not." +msgstr "Mit einem @dfn{quasiquote}-Zeichen wird die Auswertung eines geklammerten Ausdrucks so lange abgeschaltet, bis ein @dfn{unquote} (ein Komma) sie wieder aktiviert. Wir können damit genau steuern, was ausgewertet wird und was nicht." + +#. type: lisp +#: doc/guix-cookbook.texi:211 +#, no-wrap +msgid "" +"`(2 a 5 7 (2 ,a 5 ,(+ a 4)))\n" +"@result{} (2 a 5 7 (2 3 5 7))\n" +msgstr "" +"`(2 a 5 7 (2 ,a 5 ,(+ a 4)))\n" +"@result{} (2 a 5 7 (2 3 5 7))\n" + +#. type: itemize +#: doc/guix-cookbook.texi:215 +msgid "Note that the above result is a list of mixed elements: numbers, symbols (here @code{a}) and the last element is a list itself." +msgstr "Beachten Sie, dass obiges Ergenis eine Liste verschiedenartiger Elemente ist: Zahlen, Symbole (in diesem Fall @code{a}) und als letztes Element selbst wieder eine Liste." + +#. type: itemize +#: doc/guix-cookbook.texi:219 +msgid "Multiple variables can be named locally with @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual}):" +msgstr "Mehrere Variable können in einer lokalen Umgebung mit Bezeichnern versehen werden, indem Sie @code{let} benutzen (siehe @ref{Local Bindings,,, guile, GNU Guile Reference Manual}):" + +#. type: lisp +#: doc/guix-cookbook.texi:226 +#, no-wrap +msgid "" +"(define x 10)\n" +"(let ((x 2)\n" +" (y 3))\n" +" (list x y))\n" +"@result{} (2 3)\n" +"\n" +msgstr "" +"(define x 10)\n" +"(let ((x 2)\n" +" (y 3))\n" +" (list x y))\n" +"@result{} (2 3)\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:229 +#, no-wrap +msgid "" +"x\n" +"@result{} 10\n" +"\n" +msgstr "" +"x\n" +"@result{} 10\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:232 +#, no-wrap +msgid "" +"y\n" +"@error{} In procedure module-lookup: Unbound variable: y\n" +msgstr "" +"y\n" +"@error{} In procedure module-lookup: Unbound variable: y\n" + +#. type: itemize +#: doc/guix-cookbook.texi:236 +msgid "Use @code{let*} to allow later variable declarations to refer to earlier definitions." +msgstr "Benutzen Sie @code{let*}, damit spätere Variablendeklarationen auf frühere verweisen können." + +#. type: lisp +#: doc/guix-cookbook.texi:242 +#, no-wrap +msgid "" +"(let* ((x 2)\n" +" (y (* x 3)))\n" +" (list x y))\n" +"@result{} (2 6)\n" +msgstr "" +"(let* ((x 2)\n" +" (y (* x 3)))\n" +" (list x y))\n" +"@result{} (2 6)\n" + +#. type: itemize +#: doc/guix-cookbook.texi:247 +msgid "The keyword syntax is @code{#:}; it is used to create unique identifiers. @pxref{Keywords,,, guile, GNU Guile Reference Manual}." +msgstr "Die Syntax für Schlüsselwörter ist @code{#:}. Wir benutzen sie, um eindeutige Bezeichnungen zu erzeugen. Siehe @ref{Keywords,,, guile, GNU Guile Reference Manual}." + +#. type: itemize +#: doc/guix-cookbook.texi:252 +msgid "The percentage @code{%} is typically used for read-only global variables in the build stage. Note that it is merely a convention, like @code{_} in C. Scheme treats @code{%} exactly the same as any other letter." +msgstr "Das Prozentzeichen @code{%} wird in der Regel für globale Variable auf Erstellungsebene benutzt, auf die nur lesend zugegriffen werden soll. Beachten Sie, dass es sich dabei nur um eine Konvention handelt, ähnlich wie @code{_} in C. Scheme behandelt @code{%} genau wie jedes andere Zeichen." + +#. type: itemize +#: doc/guix-cookbook.texi:256 +msgid "Modules are created with @code{define-module} (@pxref{Creating Guile Modules,,, guile, GNU Guile Reference Manual}). For instance" +msgstr "Module werden mit Hilfe von @code{define-module} erzeugt (siehe @ref{Creating Guile Modules,,, guile, GNU Guile Reference Manual}). Zum Beispiel definiert man mit" + +#. type: lisp +#: doc/guix-cookbook.texi:262 +#, no-wrap +msgid "" +"(define-module (guix build-system ruby)\n" +" #:use-module (guix store)\n" +" #:export (ruby-build\n" +" ruby-build-system))\n" +msgstr "" +"(define-module (guix build-system ruby)\n" +" #:use-module (guix store)\n" +" #:export (ruby-build\n" +" ruby-build-system))\n" + +#. type: itemize +#: doc/guix-cookbook.texi:268 +msgid "defines the module @code{guix build-system ruby} which must be located in @file{guix/build-system/ruby.scm} somewhere in the Guile load path. It depends on the @code{(guix store)} module and it exports two variables, @code{ruby-build} and @code{ruby-build-system}." +msgstr "das Modul @code{guix build-system ruby}, das sich unter dem Pfad @file{guix/build-system/ruby.scm} innerhalb irgendeines Verzeichnisses im Guile-Ladepfad befinden muss. Es hat eine Abhängigkeit auf das Modul @code{(guix store)} und exportiert zwei seiner Variablen, @code{ruby-build} und @code{ruby-build-system}." + +#. type: Plain text +#: doc/guix-cookbook.texi:273 +msgid "For a more detailed introduction, check out @uref{http://www.troubleshooters.com/codecorn/scheme_guile/hello.htm, Scheme at a Glance}, by Steve Litt." +msgstr "Für eine detailliertere Einführung können Sie einen Blick auf Steve Litts @uref{http://www.troubleshooters.com/codecorn/scheme_guile/hello.htm, Scheme at a Glance} werfen." + +#. type: Plain text +#: doc/guix-cookbook.texi:285 +msgid "One of the reference Scheme books is the seminal ``Structure and Interpretation of Computer Programs'', by Harold Abelson and Gerald Jay Sussman, with Julie Sussman. You'll find a @uref{https://mitpress.mit.edu/sites/default/files/sicp/index.html, free copy online}, together with @uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/, videos of the lectures by the authors}. The book is available in Texinfo format as the @code{sicp} Guix package. Go ahead, run @code{guix install sicp} and start reading with @code{info sicp} (@pxref{,,, sicp, Structure and Interpretation of Computer Programs}). An @uref{https://sarabander.github.io/sicp/, unofficial ebook is also available}." +msgstr "Eines der Referenzbücher zu Scheme ist das einflussreiche „Structure and Interpretation of Computer Programs“, von Harold Abelson und Gerald Jay Sussman, mit Julie Sussman. Eine deutsche Übersetzung „Struktur und Interpretation von Computerprogrammen“ hat Susanne Daniels-Herold verfasst. Vom englischen Original finden Sie eine @uref{https://mitpress.mit.edu/sites/default/files/sicp/index.html, kostenlose Ausgabe online} zusammen mit @uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/, Videos der von den Autoren gehaltenen Vorlesungen}. Das Buch können Sie im Texinfo-Format über das @code{sicp}-Guix-Paket beziehen. Probieren Sie es aus: Führen Sie @code{guix install sicp} aus und fangen Sie mit dem Lesen an, indem Sie @code{info sicp} eintippen (siehe @ref{,,, sicp, Structure and Interpretation of Computer Programs}). Es gibt auch ein @uref{https://sarabander.github.io/sicp/, inoffizielles E-Book}." + +#. type: Plain text +#: doc/guix-cookbook.texi:288 +msgid "You'll find more books, tutorials and other resources at @url{https://schemers.org/}." +msgstr "Sie finden noch mehr Bücher, Anleitungen und andere Ressourcen auf @url{https://schemers.org/}." + +#. type: cindex +#: doc/guix-cookbook.texi:294 +#, no-wrap +msgid "packaging" +msgstr "Pakete schreiben" + +#. type: Plain text +#: doc/guix-cookbook.texi:300 +msgid "This chapter is dedicated to teaching you how to add packages to the collection of packages that come with GNU Guix. This involves writing package definitions in Guile Scheme, organizing them in package modules, and building them." +msgstr "In diesem Kapitel bringen wir Ihnen bei, wie Sie Pakete zur mit GNU Guix ausgelieferten Paketsammlung beitragen. Dazu gehört, Paketdefinitionen in Guile Scheme zu schreiben, sie in Paketmodulen zu organisieren und sie zu erstellen." + +#. type: menuentry +#: doc/guix-cookbook.texi:303 +msgid "A tutorial on how to add packages to Guix." +msgstr "Eine Anleitung, wie Sie Pakete zu Guix hinzufügen." + +#. type: Plain text +#: doc/guix-cookbook.texi:314 +msgid "GNU Guix stands out as the @emph{hackable} package manager, mostly because it uses @uref{https://www.gnu.org/software/guile/, GNU Guile}, a powerful high-level programming language, one of the @uref{https://en.wikipedia.org/wiki/Scheme_%28programming_language%29, Scheme} dialects from the @uref{https://en.wikipedia.org/wiki/Lisp_%28programming_language%29, Lisp family}." +msgstr "GNU Guix zeichnet sich in erster Linie deswegen als das @emph{hackbare} Paketverwaltungswerkzeug aus, weil es mit @uref{https://www.gnu.org/software/guile/, GNU Guile} arbeitet, einer mächtigen, hochsprachlichen Programmiersprache, die einen der Dialekte von @uref{https://de.wikipedia.org/wiki/Scheme, Scheme} darstellt. Scheme wiederum gehört zur @uref{https://de.wikipedia.org/wiki/Lisp, Lisp-Familie von Programmiersprachen}." + +#. type: Plain text +#: doc/guix-cookbook.texi:318 +msgid "Package definitions are also written in Scheme, which empowers Guix in some very unique ways, unlike most other package managers that use shell scripts or simple languages." +msgstr "Paketdefinitionen werden ebenso in Scheme geschrieben, wodurch Guix auf sehr einzigartige Weise mächtiger wird als die meisten anderen Paketverwaltungssysteme, die Shell-Skripte oder einfache Sprachen benutzen." + +#. type: itemize +#: doc/guix-cookbook.texi:323 +msgid "Use functions, structures, macros and all of Scheme expressiveness for your package definitions." +msgstr "Sie können sich Funktionen, Strukturen, Makros und all die Ausdrucksstärke von Scheme für Ihre Paketdefinitionen zu Nutze machen." + +#. type: itemize +#: doc/guix-cookbook.texi:327 +msgid "Inheritance makes it easy to customize a package by inheriting from it and modifying only what is needed." +msgstr "Durch Vererbung können Sie ohne viel Aufwand ein Paket anpassen, indem Sie von ihm erben lassen und nur das Nötige abändern." + +#. type: itemize +#: doc/guix-cookbook.texi:337 +msgid "Batch processing: the whole package collection can be parsed, filtered and processed. Building a headless server with all graphical interfaces stripped out? It's possible. Want to rebuild everything from source using specific compiler optimization flags? Pass the @code{#:make-flags \"...\"} argument to the list of packages. It wouldn't be a stretch to think @uref{https://wiki.gentoo.org/wiki/USE_flag, Gentoo USE flags} here, but this goes even further: the changes don't have to be thought out beforehand by the packager, they can be @emph{programmed} by the user!" +msgstr "Stapelverarbeitung („batch mode“) wird möglich; die ganze Paketsammlung kann analysiert, gefiltert und verarbeitet werden. Versuchen Sie, ein Serversystem ohne Bildschirm („headless“) auch tatsächlich von allen Grafikschnittstellen zu befreien? Das ist möglich. Möchten Sie alles von Neuem aus seinem Quellcode erstellen, aber mit eingeschalteten besonderen Compileroptimierungen? Übergeben Sie einfach das passende @code{#:make-flags \"...\"}-Argument an die Paketliste. Es wäre nicht übertrieben, hier an die @uref{https://wiki.gentoo.org/wiki/USE_flag, USE-Optionen von Gentoo} zu denken, aber das hier übertrifft sie: Der Paketautor muss vorher gar nicht darüber nachgedacht haben, der Nutzer kann sie selbst @emph{programmieren}!" + +#. type: Plain text +#: doc/guix-cookbook.texi:343 +msgid "The following tutorial covers all the basics around package creation with Guix. It does not assume much knowledge of the Guix system nor of the Lisp language. The reader is only expected to be familiar with the command line and to have some basic programming knowledge." +msgstr "Die folgende Anleitung erklärt alles Grundlegende über das Schreiben von Paketen mit Guix. Dabei setzen wir kein großes Wissen über das Guix-System oder die Lisp-Sprache voraus. Vom Leser wird nur erwartet, dass er mit der Befehlszeile vertraut ist und über grundlegende Programmierkenntnisse verfügt." + +#. type: subsection +#: doc/guix-cookbook.texi:344 doc/guix-cookbook.texi:345 +#, no-wrap +msgid "A ``Hello World'' package" +msgstr "Ein Hallo-Welt-Paket" + +#. type: Plain text +#: doc/guix-cookbook.texi:350 +msgid "The ``Defining Packages'' section of the manual introduces the basics of Guix packaging (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}). In the following section, we will partly go over those basics again." +msgstr "Der Abschnitt „Pakete definieren“ im Handbuch führt in die Grundlagen des Paketschreibens für Guix ein (siehe @ref{Pakete definieren,,, guix.de, Referenzhandbuch zu GNU Guix}). Im folgenden Abschnitt werden wir diese Grundlagen teilweise rekapitulieren." + +#. type: Plain text +#: doc/guix-cookbook.texi:356 +msgid "GNU@tie{}Hello is a dummy project that serves as an idiomatic example for packaging. It uses the GNU build system (@code{./configure && make && make install}). Guix already provides a package definition which is a perfect example to start with. You can look up its declaration with @code{guix edit hello} from the command line. Let's see how it looks:" +msgstr "GNU@tie{}Hello ist ein Projekt, das uns als Stellvertreter für „richtige“ Projekte und allgemeines Beispiel für das Schreiben von Paketen dient. Es verwendet das GNU-Erstellungssystem (@code{./configure && make && make install}). Guix stellt uns schon eine Paketdefinition zur Verfügung, die uns einen perfekten Ausgangspunkt bietet. Sie können sich ihre Deklaration anschauen, indem Sie @code{guix edit hello} von der Befehlszeile ausführen. Schauen wir sie uns an:" + +#. type: lisp +#: doc/guix-cookbook.texi:377 +#, no-wrap +msgid "" +"(define-public hello\n" +" (package\n" +" (name \"hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, GNU world: An example GNU package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+)))\n" +msgstr "" +"(define-public hello\n" +" (package\n" +" (name \"hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, GNU world: An example GNU package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:381 +msgid "As you can see, most of it is rather straightforward. But let's review the fields together:" +msgstr "Wie Sie sehen können, ist das meiste klar strukturiert. Aber sehen wir uns die Felder zusammen an:" + +#. type: item +#: doc/guix-cookbook.texi:383 +#, no-wrap +msgid "name" +msgstr "name" + +#. type: table +#: doc/guix-cookbook.texi:386 +msgid "The project name. Using Scheme conventions, we prefer to keep it lower case, without underscore and using dash-separated words." +msgstr "Der Name des Projekts. Wir halten uns an die Konventionen von Scheme und bevorzugen deshalb Kleinschreibung ohne Unterstriche, sondern mit Bindestrichen zwischen den Wörtern." + +#. type: item +#: doc/guix-cookbook.texi:387 +#, no-wrap +msgid "source" +msgstr "source" + +#. type: table +#: doc/guix-cookbook.texi:390 +msgid "This field contains a description of the source code origin. The @code{origin} record contains these fields:" +msgstr "Dieses Feld enthält eine Beschreibung, was der Ursprung des Quellcodes ist. Das @code{origin}-Verbundsobjekt enthält diese Felder:" + +#. type: item +#: doc/guix-cookbook.texi:392 +#, no-wrap +msgid "The method, here @code{url-fetch} to download via HTTP/FTP, but other methods" +msgstr "Die Methode. Wir verwenden hier @code{url-fetch}, um über HTTP/FTP herunterzuladen," + +#. type: enumerate +#: doc/guix-cookbook.texi:394 +msgid "exist, such as @code{git-fetch} for Git repositories." +msgstr "aber es gibt auch andere Methoden wie @code{git-fetch} für Git-Repositorys." + +#. type: item +#: doc/guix-cookbook.texi:394 +#, no-wrap +msgid "The URI, which is typically some @code{https://} location for @code{url-fetch}. Here" +msgstr "Die URI, welche bei @code{url-fetch} normalerweise eine Ortsangabe mit @code{https://} ist." + +#. type: enumerate +#: doc/guix-cookbook.texi:397 +msgid "the special `mirror://gnu` refers to a set of well known locations, all of which can be used by Guix to fetch the source, should some of them fail." +msgstr "In diesem Fall verweist die besondere URI ‚mirror://gnu‘ auf eine von mehreren wohlbekannten Ortsangaben, von denen Guix jede durchprobieren kann, um den Quellcode herunterzuladen, wenn es bei manchen davon nicht klappt." + +#. type: item +#: doc/guix-cookbook.texi:397 +#, no-wrap +msgid "The @code{sha256} checksum of the requested file. This is essential to ensure" +msgstr "Die @code{sha256}-Prüfsumme der angefragten Datei." + +#. type: enumerate +#: doc/guix-cookbook.texi:400 +msgid "the source is not corrupted. Note that Guix works with base32 strings, hence the call to the @code{base32} function." +msgstr "Sie ist notwendig, damit sichergestellt werden kann, dass der Quellcode nicht beschädigt ist. Beachten Sie, dass Guix mit Zeichenketten in Base32-Kodierung arbeitet, weshalb wir die @code{base32}-Funktion aufrufen." + +#. type: item +#: doc/guix-cookbook.texi:402 +#, no-wrap +msgid "build-system" +msgstr "build-system" + +#. type: table +#: doc/guix-cookbook.texi:411 +msgid "This is where the power of abstraction provided by the Scheme language really shines: in this case, the @code{gnu-build-system} abstracts away the famous @code{./configure && make && make install} shell invocations. Other build systems include the @code{trivial-build-system} which does not do anything and requires from the packager to program all the build steps, the @code{python-build-system}, the @code{emacs-build-system}, and many more (@pxref{Build Systems,,, guix, GNU Guix Reference Manual})." +msgstr "Hier glänzt Schemes Fähigkeit zur Abstraktion: In diesem Fall abstrahiert @code{gnu-build-system} die berühmten Schritte @code{./configure && make && make install}, die sonst in der Shell aufgerufen würden. Zu den anderen Erstellungssystemen gehören das @code{trivial-build-system}, das nichts tut und dem Paketautoren das Schreiben sämtlicher Erstellungsschritte abverlangt, das @code{python-build-system}, das @code{emacs-build-system}, und viele mehr (siehe @ref{Erstellungssysteme,,, guix.de, Referenzhandbuch zu GNU Guix})." + +#. type: item +#: doc/guix-cookbook.texi:412 +#, no-wrap +msgid "synopsis" +msgstr "synopsis" + +#. type: table +#: doc/guix-cookbook.texi:415 +msgid "It should be a concise summary of what the package does. For many packages a tagline from the project's home page can be used as the synopsis." +msgstr "Die Zusammenfassung. Sie sollte eine knappe Beschreibung sein, was das Paket tut. Für viele Pakete findet sich auf der Homepage ein Einzeiler, der als Zusammenfassung benutzt werden kann." + +#. type: item +#: doc/guix-cookbook.texi:416 +#, no-wrap +msgid "description" +msgstr "description" + +#. type: table +#: doc/guix-cookbook.texi:419 +msgid "Same as for the synopsis, it's fine to re-use the project description from the homepage. Note that Guix uses Texinfo syntax." +msgstr "Genau wie bei der Zusammenfassung ist es in Ordnung, die Beschreibung des Projekts für das Paket wiederzuverwenden. Beachten Sie, dass Guix dafür Texinfo-Syntax verlangt." + +#. type: item +#: doc/guix-cookbook.texi:420 +#, no-wrap +msgid "home-page" +msgstr "home-page" + +#. type: table +#: doc/guix-cookbook.texi:422 +msgid "Use HTTPS if available." +msgstr "Hier soll möglichst HTTPS benutzt werden." + +#. type: item +#: doc/guix-cookbook.texi:423 +#, no-wrap +msgid "license" +msgstr "license" + +#. type: table +#: doc/guix-cookbook.texi:426 +msgid "See @code{guix/licenses.scm} in the project source for a full list of available licenses." +msgstr "Siehe die vollständige Liste verfügbarer Lizenzen in @code{guix/licenses.scm} im Guix-Quellcode." + +#. type: Plain text +#: doc/guix-cookbook.texi:430 +msgid "Time to build our first package! Nothing fancy here for now: we will stick to a dummy @code{my-hello}, a copy of the above declaration." +msgstr "Es wird Zeit, unser erstes Paket zu schreiben! Aber noch nichts tolles, wir bleiben bei einem Paket @code{my-hello} stelltvertretend für „richtige“ Software; es ist eine Kopie obiger Deklaration." + +#. type: Plain text +#: doc/guix-cookbook.texi:434 +msgid "As with the ritualistic ``Hello World'' taught with most programming languages, this will possibly be the most ``manual'' approach. We will work out an ideal setup later; for now we will go the simplest route." +msgstr "Genau wie beim Ritual, Neulinge in Programmiersprachen „Hallo Welt“ schreiben zu lassen, fangen wir mit der vielleicht „arbeitsintensivsten“ Herangehensweise ans Paketeschreiben an. Wir kümmern uns später darum, wie man am besten an Paketen arbeitet; erst einmal nehmen wir den einfachsten Weg." + +#. type: Plain text +#: doc/guix-cookbook.texi:436 +msgid "Save the following to a file @file{my-hello.scm}." +msgstr "Speichern Sie den folgenden Code in eine Datei @file{my-hello.scm}." + +#. type: lisp +#: doc/guix-cookbook.texi:442 +#, no-wrap +msgid "" +"(use-modules (guix packages)\n" +" (guix download)\n" +" (guix build-system gnu)\n" +" (guix licenses))\n" +"\n" +msgstr "" +"(use-modules (guix packages)\n" +" (guix download)\n" +" (guix build-system gnu)\n" +" (guix licenses))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:461 +#, no-wrap +msgid "" +"(package\n" +" (name \"my-hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, Guix world: An example custom Guix package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+))\n" +msgstr "" +"(package\n" +" (name \"my-hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, Guix world: An example custom Guix package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:464 +msgid "We will explain the extra code in a moment." +msgstr "Wir erklären den zusätzlichen Code in Kürze." + +#. type: Plain text +#: doc/guix-cookbook.texi:471 +msgid "Feel free to play with the different values of the various fields. If you change the source, you'll need to update the checksum. Indeed, Guix refuses to build anything if the given checksum does not match the computed checksum of the source code. To obtain the correct checksum of the package declaration, we need to download the source, compute the sha256 checksum and convert it to base32." +msgstr "Spielen Sie ruhig mit unterschiedlichen Werten für die verschiedenen Felder herum. Wenn Sie den Quellort (die „source“) ändern, müssen Sie die Prüfsumme aktualisieren. Tatsächlich weigert sich Guix, etwas zu erstellen, wenn die angegebene Prüfsumme nicht zu der berechneten Prüfsumme des Quellcodes passt. Um die richtige Prüfsumme für die Paketdeklaration zu finden, müssen wir den Quellcode herunterladen, die SHA256-Summe davon berechnen und sie in Base32 umwandeln." + +#. type: Plain text +#: doc/guix-cookbook.texi:474 +msgid "Thankfully, Guix can automate this task for us; all we need is to provide the URI:" +msgstr "Glücklicherweise kann Guix diese Aufgabe automatisieren; wir müssen lediglich die URI übergeben." + +#. type: example +#: doc/guix-cookbook.texi:478 +#, no-wrap +msgid "" +"$ guix download mirror://gnu/hello/hello-2.10.tar.gz\n" +"\n" +msgstr "" +"$ guix download mirror://gnu/hello/hello-2.10.tar.gz\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:485 +#, no-wrap +msgid "" +"Starting download of /tmp/guix-file.JLYgL7\n" +"From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz...\n" +"following redirection to `https://mirror.ibcp.fr/pub/gnu/hello/hello-2.10.tar.gz'...\n" +" …10.tar.gz 709KiB 2.5MiB/s 00:00 [##################] 100.0%\n" +"/gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz\n" +"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\n" +msgstr "" +"Starting download of /tmp/guix-file.JLYgL7\n" +"From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz...\n" +"following redirection to `https://mirror.ibcp.fr/pub/gnu/hello/hello-2.10.tar.gz'...\n" +" …10.tar.gz 709KiB 2.5MiB/s 00:00 [##################] 100.0%\n" +"/gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz\n" +"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:490 +msgid "In this specific case the output tells us which mirror was chosen. If the result of the above command is not the same as in the above snippet, update your @code{my-hello} declaration accordingly." +msgstr "In diesem speziellen Fall sagt uns die Ausgabe, welcher Spiegelserver ausgewählt wurde. Wenn das Ergebnis des obigen Befehls nicht dasselbe ist wie im Codeschnipsel, dann aktualisieren Sie Ihre @code{my-hello}-Deklaration entsprechend." + +#. type: Plain text +#: doc/guix-cookbook.texi:494 +msgid "Note that GNU package tarballs come with an OpenPGP signature, so you should definitely check the signature of this tarball with `gpg` to authenticate it before going further:" +msgstr "Beachten Sie, dass Tarball-Archive von GNU-Paketen mit einer OpenPGP-Signatur ausgeliefert werden, deshalb sollten Sie mit Sicherheit die Signatur dieses Tarballs mit „gpg“ überprüfen, um ihn zu authentifizieren, bevor Sie weitermachen." + +#. type: example +#: doc/guix-cookbook.texi:498 +#, no-wrap +msgid "" +"$ guix download mirror://gnu/hello/hello-2.10.tar.gz.sig\n" +"\n" +msgstr "" +"$ guix download mirror://gnu/hello/hello-2.10.tar.gz.sig\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:513 +#, no-wrap +msgid "" +"Starting download of /tmp/guix-file.03tFfb\n" +"From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz.sig...\n" +"following redirection to `https://ftp.igh.cnrs.fr/pub/gnu/hello/hello-2.10.tar.gz.sig'...\n" +" ….tar.gz.sig 819B 1.2MiB/s 00:00 [##################] 100.0%\n" +"/gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig\n" +"0q0v86n3y38z17rl146gdakw9xc4mcscpk8dscs412j22glrv9jf\n" +"$ gpg --verify /gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig /gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz\n" +"gpg: Signature made Sun 16 Nov 2014 01:08:37 PM CET\n" +"gpg: using RSA key A9553245FDE9B739\n" +"gpg: Good signature from \"Sami Kerola \" [unknown]\n" +"gpg: aka \"Sami Kerola (http://www.iki.fi/kerolasa/) \" [unknown]\n" +"gpg: WARNING: This key is not certified with a trusted signature!\n" +"gpg: There is no indication that the signature belongs to the owner.\n" +"Primary key fingerprint: 8ED3 96E3 7E38 D471 A005 30D3 A955 3245 FDE9 B739\n" +msgstr "" +"Starting download of /tmp/guix-file.03tFfb\n" +"From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz.sig...\n" +"following redirection to `https://ftp.igh.cnrs.fr/pub/gnu/hello/hello-2.10.tar.gz.sig'...\n" +" ….tar.gz.sig 819B 1.2MiB/s 00:00 [##################] 100.0%\n" +"/gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig\n" +"0q0v86n3y38z17rl146gdakw9xc4mcscpk8dscs412j22glrv9jf\n" +"$ gpg --verify /gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig /gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz\n" +"gpg: Signatur vom So 16 Nov 2014 13:08:37 CET\n" +"gpg: mittels RSA-Schlüssel A9553245FDE9B739\n" +"gpg: Korrekte Signatur von \"Sami Kerola (https://www.iki.fi/kerolasa/) \" [unbekannt]\n" +"gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n" +"gpg: Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen Besitzer gehört.\n" +"Haupt-Fingerabdruck = 8ED3 96E3 7E38 D471 A005 30D3 A955 3245 FDE9 B739\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:516 +msgid "You can then happily run" +msgstr "Sie können dann unbesorgt das hier ausführen:" + +#. type: example +#: doc/guix-cookbook.texi:520 +#, no-wrap +msgid "$ guix package --install-from-file=my-hello.scm\n" +msgstr "$ guix package --install-from-file=my-hello.scm\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:523 +msgid "You should now have @code{my-hello} in your profile!" +msgstr "Nun sollte @code{my-hello} in Ihrem Profil enthalten sein!" + +#. type: example +#: doc/guix-cookbook.texi:529 +#, no-wrap +msgid "" +"$ guix package --list-installed=my-hello\n" +"my-hello\t2.10\tout\n" +"/gnu/store/f1db2mfm8syb8qvc357c53slbvf1g9m9-my-hello-2.10\n" +msgstr "" +"$ guix package --list-installed=my-hello\n" +"my-hello\t2.10\tout\n" +"/gnu/store/f1db2mfm8syb8qvc357c53slbvf1g9m9-my-hello-2.10\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:534 +msgid "We've gone as far as we could without any knowledge of Scheme. Before moving on to more complex packages, now is the right time to brush up on your Scheme knowledge. @pxref{A Scheme Crash Course} to get up to speed." +msgstr "Wir sind so weit gekommen, wie es ohne Scheme-Kenntnisse möglich ist. Bevor wir mit komplexeren Paketen weitermachen, ist jetzt der Zeitpunkt gekommen, Ihr Wissen über Scheme zu entstauben. Siehe @ref{Ein Schnellkurs in Scheme} für eine Auffrischung." + +#. type: subsection +#: doc/guix-cookbook.texi:535 doc/guix-cookbook.texi:536 +#, no-wrap +msgid "Setup" +msgstr "Herangehensweisen" + +#. type: Plain text +#: doc/guix-cookbook.texi:541 +msgid "In the rest of this chapter we will rely on some basic Scheme programming knowledge. Now let's detail the different possible setups for working on Guix packages." +msgstr "Im Rest dieses Kapitels setzen wir ein paar grundlegende Scheme-Programmierkenntnisse voraus. Wir wollen uns nun verschiedene mögliche Herangehensweisen anschauen, wie man an Guix-Paketen arbeiten kann." + +#. type: Plain text +#: doc/guix-cookbook.texi:543 +msgid "There are several ways to set up a Guix packaging environment." +msgstr "Es gibt mehrere Arten, eine Umgebung zum Paketeschreiben aufzusetzen." + +#. type: Plain text +#: doc/guix-cookbook.texi:546 +msgid "We recommend you work directly on the Guix source checkout since it makes it easier for everyone to contribute to the project." +msgstr "Unsere Empfehlung ist, dass Sie direkt am Checkout des Guix-Quellcodes arbeiten, weil es dann für alle einfacher ist, zu Guix beizutragen." + +#. type: Plain text +#: doc/guix-cookbook.texi:548 +msgid "But first, let's look at other possibilities." +msgstr "Werfen wir aber zunächst einen Blick auf andere Möglichkeiten." + +#. type: subsubsection +#: doc/guix-cookbook.texi:549 doc/guix-cookbook.texi:550 +#, no-wrap +msgid "Local file" +msgstr "Lokale Datei" + +#. type: Plain text +#: doc/guix-cookbook.texi:555 +msgid "This is what we previously did with @samp{my-hello}. With the Scheme basics we've covered, we are now able to explain the leading chunks. As stated in @code{guix package --help}:" +msgstr "Diese Methode haben wir zuletzt für @samp{my-hello} benutzt. Jetzt nachdem wir uns mit den Scheme-Grundlagen befasst haben, können wir uns den Code am Anfang erklären. @code{guix package --help} sagt uns:" + +#. type: example +#: doc/guix-cookbook.texi:560 +#, no-wrap +msgid "" +" -f, --install-from-file=FILE\n" +" install the package that the code within FILE\n" +" evaluates to\n" +msgstr "" +" -f, --install-from-file=DATEI\n" +" das Paket installieren, zu dem der Code in der DATEI\n" +" ausgewertet wird\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:564 +msgid "Thus the last expression @emph{must} return a package, which is the case in our earlier example." +msgstr "Daher @emph{muss} der letzte Ausdruck ein Paket liefern, was im vorherigen Beispiel der Fall ist." + +#. type: Plain text +#: doc/guix-cookbook.texi:568 +msgid "The @code{use-modules} expression tells which of the modules we need in the file. Modules are a collection of values and procedures. They are commonly called ``libraries'' or ``packages'' in other programming languages." +msgstr "Der Ausdruck @code{use-modules} sagt aus, welche Module in der Datei gebraucht werden. Module sind eine Sammlung aus Werten und Prozeduren. In anderen Programmiersprachen werden sie oft „Bibliotheken“ oder „Pakete“ genannt." + +#. type: node +#: doc/guix-cookbook.texi:569 +#, no-wrap +msgid "@samp{GUIX_PACKAGE_PATH}" +msgstr "@samp{GUIX_PACKAGE_PATH}" + +#. type: samp{#1} +#: doc/guix-cookbook.texi:570 +#, no-wrap +msgid "GUIX_PACKAGE_PATH" +msgstr "GUIX_PACKAGE_PATH" + +#. type: emph{#1} +#: doc/guix-cookbook.texi:574 +msgid "Note: Starting from Guix 0.16, the more flexible Guix @dfn{channels} are the preferred way and supersede @samp{GUIX_PACKAGE_PATH}. See next section." +msgstr "Anmerkung: Seit Guix 0.16 sind die vielseitigeren @dfn{Kanäle} von Guix die bevorzugte Wahl und sie lösen den @samp{GUIX_PACKAGE_PATH} ab. Siehe den nächsten Abschnitt." + +#. type: Plain text +#: doc/guix-cookbook.texi:578 +msgid "It can be tedious to specify the file from the command line instead of simply calling @code{guix package --install my-hello} as you would do with the official packages." +msgstr "Es kann mühsam sein, die Datei auf der Befehlszeile anzugeben, statt einfach @code{guix package --install my-hello} aufzurufen, wie man es bei den offiziellen Paketen tun würde." + +#. type: Plain text +#: doc/guix-cookbook.texi:581 +msgid "Guix makes it possible to streamline the process by adding as many ``package declaration directories'' as you want." +msgstr "Guix ermöglicht es, den Prozess zu optimieren, indem man so viele „Paketdeklarationsverzeichnisse“, wie man will, hinzufügt." + +#. type: Plain text +#: doc/guix-cookbook.texi:584 +msgid "Create a directory, say @samp{~./guix-packages} and add it to the @samp{GUIX_PACKAGE_PATH} environment variable:" +msgstr "Erzeugen Sie ein Verzeichnis, beispielsweise @samp{~./guix-packages}, und fügen Sie es zur Umgebungsvariablen @samp{GUIX_PACKAGE_PATH} hinzu:" + +#. type: example +#: doc/guix-cookbook.texi:588 +#, no-wrap +msgid "" +"$ mkdir ~/guix-packages\n" +"$ export GUIX_PACKAGE_PATH=~/guix-packages\n" +msgstr "" +"$ mkdir ~/guix-packages\n" +"$ export GUIX_PACKAGE_PATH=~/guix-packages\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:591 +msgid "To add several directories, separate them with a colon (@code{:})." +msgstr "Um mehrere Verzeichnisse hinzuzufügen, trennen Sie diese ab durch einen Doppelpunkt (@code{:})." + +#. type: Plain text +#: doc/guix-cookbook.texi:593 +msgid "Our previous @samp{my-hello} needs some adjustments though:" +msgstr "Unser @samp{my-hello} von vorher braucht zudem ein paar Anpassungen:" + +#. type: lisp +#: doc/guix-cookbook.texi:600 +#, no-wrap +msgid "" +"(define-module (my-hello)\n" +" #:use-module (guix licenses)\n" +" #:use-module (guix packages)\n" +" #:use-module (guix build-system gnu)\n" +" #:use-module (guix download))\n" +"\n" +msgstr "" +"(define-module (my-hello)\n" +" #:use-module (guix licenses)\n" +" #:use-module (guix packages)\n" +" #:use-module (guix build-system gnu)\n" +" #:use-module (guix download))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:620 +#, no-wrap +msgid "" +"(define-public my-hello\n" +" (package\n" +" (name \"my-hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, Guix world: An example custom Guix package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+)))\n" +msgstr "" +"(define-public my-hello\n" +" (package\n" +" (name \"my-hello\")\n" +" (version \"2.10\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" +" \".tar.gz\"))\n" +" (sha256\n" +" (base32\n" +" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" +" (build-system gnu-build-system)\n" +" (synopsis \"Hello, Guix world: An example custom Guix package\")\n" +" (description\n" +" \"GNU Hello prints the message \\\"Hello, world!\\\" and then exits. It\n" +"serves as an example of standard GNU coding practices. As such, it supports\n" +"command-line arguments, multiple languages, and so on.\")\n" +" (home-page \"https://www.gnu.org/software/hello/\")\n" +" (license gpl3+)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:626 +msgid "Note that we have assigned the package value to an exported variable name with @code{define-public}. This is effectively assigning the package to the @code{my-hello} variable so that it can be referenced, among other as dependency of other packages." +msgstr "Beachten Sie, dass wir den Paketwert einer exportierten Variablen mit @code{define-public} zugewiesen haben. Das bedeutet, das Paket wird einer Variablen @code{my-hello} zugewiesen, damit darauf verwiesen werden kann. Unter anderem kann es dadurch als Abhängigkeit anderer Pakete verwendet werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:631 +msgid "If you use @code{guix package --install-from-file=my-hello.scm} on the above file, it will fail because the last expression, @code{define-public}, does not return a package. If you want to use @code{define-public} in this use-case nonetheless, make sure the file ends with an evaluation of @code{my-hello}:" +msgstr "Wenn Sie @code{guix package --install-from-file=my-hello.scm} auf der obigen Datei aufrufen, geht es schief, weil der letzte Ausdruck, @code{define-public}, kein Paket zurückliefert. Wenn Sie trotzdem @code{define-public} für jene Herangehensweise verwenden möchten, stellen Sie sicher, dass am Ende der Datei eine Auswertung von @code{my-hello} steht:" + +#. type: lisp +#: doc/guix-cookbook.texi:637 +#, no-wrap +msgid "" +"; ...\n" +"(define-public my-hello\n" +" ; ...\n" +" )\n" +"\n" +msgstr "" +"; …\n" +"(define-public my-hello\n" +" ; …\n" +" )\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:639 +#, no-wrap +msgid "my-hello\n" +msgstr "my-hello\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:642 +msgid "This last example is not very typical." +msgstr "Meistens tut man das aber nicht." + +#. type: Plain text +#: doc/guix-cookbook.texi:645 +msgid "Now @samp{my-hello} should be part of the package collection like all other official packages. You can verify this with:" +msgstr "@samp{my-hello} sollte nun Teil der Paketsammlung sein, genau wie all die anderen, offiziellen Pakete. Sie können das so ausprobieren:" + +#. type: example +#: doc/guix-cookbook.texi:648 +#, no-wrap +msgid "$ guix package --show=my-hello\n" +msgstr "$ guix package --show=my-hello\n" + +#. type: subsubsection +#: doc/guix-cookbook.texi:650 doc/guix-cookbook.texi:651 +#, no-wrap +msgid "Guix channels" +msgstr "Guix-Kanäle" + +#. type: Plain text +#: doc/guix-cookbook.texi:657 +msgid "Guix 0.16 features channels, which is very similar to @samp{GUIX_PACKAGE_PATH} but provides better integration and provenance tracking. Channels are not necessarily local, they can be maintained as a public Git repository for instance. Of course, several channels can be used at the same time." +msgstr "Guix 0.16 hat Kanäle eingeführt, die sehr ähnlich zu @samp{GUIX_PACKAGE_PATH} sind, sich aber besser integrieren und Provenienzverfolgung ermöglichen. Kanäle befinden sich nicht unbedingt auf einem lokalen Rechner, sie können zum Beispiel auch anderen als öffentliches Git-Repository angeboten werden. Natürlich können zur selben Zeit mehrere Kanäle benutzt werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:659 +msgid "@xref{Channels,,, guix, GNU Guix Reference Manual} for setup details." +msgstr "Siehe @ref{Kanäle,,, guix.de, Referenzhandbuch zu GNU Guix} für Details zu deren Einrichtung." + +#. type: subsubsection +#: doc/guix-cookbook.texi:660 doc/guix-cookbook.texi:661 +#, no-wrap +msgid "Direct checkout hacking" +msgstr "Direkt am Checkout hacken" + +#. type: Plain text +#: doc/guix-cookbook.texi:666 +msgid "Working directly on the Guix project is recommended: it reduces the friction when the time comes to submit your changes upstream to let the community benefit from your hard work!" +msgstr "Es wird empfohlen, direkt am Code des Guix-Projekts zu arbeiten, weil Ihre Änderungen dann später mit weniger Schwierigkeiten bei uns eingereicht werden können, damit Ihre harte Arbeit der Gemeinschaft nützt!" + +#. type: Plain text +#: doc/guix-cookbook.texi:672 +msgid "Unlike most software distributions, the Guix repository holds in one place both the tooling (including the package manager) and the package definitions. This choice was made so that it would give developers the flexibility to modify the API without breakage by updating all packages at the same time. This reduces development inertia." +msgstr "Anders als die meisten Software-Distributionen werden bei Guix sowohl Werkzeuge (einschließlich des Paketverwaltungsprogramms) als auch die Paketdefinitionen in einem Repository gespeichert. Der Grund für diese Entscheidung war, dass Entwickler die Freiheit haben sollten, die Programmierschnittstelle (API) zu ändern, ohne Inkompatibilitäten einzuführen, indem alle Pakete gleichzeitig mit der API aktualisiert werden. Dadurch wird die Entwicklung weniger träge." + +#. type: Plain text +#: doc/guix-cookbook.texi:674 +msgid "Check out the official @uref{https://git-scm.com/, Git} repository:" +msgstr "Legen Sie ein Checkout des offiziellen @uref{https://git-scm.com/, Git-Repositorys} an:" + +#. type: example +#: doc/guix-cookbook.texi:677 +#, no-wrap +msgid "$ git clone https://git.savannah.gnu.org/git/guix.git\n" +msgstr "$ git clone https://git.savannah.gnu.org/git/guix.git\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:681 +msgid "In the rest of this article, we use @samp{$GUIX_CHECKOUT} to refer to the location of the checkout." +msgstr "Im Rest dieses Artikels schreiben wir @samp{$GUIX_CHECKOUT}, wenn wir den Ort meinen, an dem das Checkout gespeichert ist." + +#. type: Plain text +#: doc/guix-cookbook.texi:685 +msgid "Follow the instructions in the manual (@pxref{Contributing,,, guix, GNU Guix Reference Manual}) to set up the repository environment." +msgstr "Folgen Sie den Anweisungen im Handbuch (siehe (@ref{Mitwirken,,, guix.de, Referenzhandbuch zu GNU Guix}), um die nötige Umgebung für die Nutzung des Repositorys herzustellen." + +#. type: Plain text +#: doc/guix-cookbook.texi:688 +msgid "Once ready, you should be able to use the package definitions from the repository environment." +msgstr "Sobald sie hergestellt wurde, sollten Sie die Paketdefinitionen aus der Repository-Umgebung benutzen können." + +#. type: Plain text +#: doc/guix-cookbook.texi:690 +msgid "Feel free to edit package definitions found in @samp{$GUIX_CHECKOUT/gnu/packages}." +msgstr "Versuchen Sie sich ruhig daran, die Paketdefinitionen zu editieren, die Sie in @samp{$GUIX_CHECKOUT/gnu/packages} finden." + +#. type: Plain text +#: doc/guix-cookbook.texi:694 +msgid "The @samp{$GUIX_CHECKOUT/pre-inst-env} script lets you use @samp{guix} over the package collection of the repository (@pxref{Running Guix Before It Is Installed,,, guix, GNU Guix Reference Manual})." +msgstr "Das Skript @samp{$GUIX_CHECKOUT/pre-inst-env} ermöglicht es Ihnen, @samp{guix} auf der Paketsammlung des Repositorys aufzurufen (siehe @ref{Guix vor der Installation ausführen,,, guix.de, Referenzhandbuch zu GNU Guix})." + +#. type: itemize +#: doc/guix-cookbook.texi:698 +msgid "Search packages, such as Ruby:" +msgstr "So suchen Sie Pakete, z.B.@: Ruby:" + +#. type: example +#: doc/guix-cookbook.texi:705 +#, no-wrap +msgid "" +" $ cd $GUIX_CHECKOUT\n" +" $ ./pre-inst-env guix package --list-available=ruby\n" +" ruby 1.8.7-p374 out gnu/packages/ruby.scm:119:2\n" +" ruby 2.1.6 out gnu/packages/ruby.scm:91:2\n" +" ruby 2.2.2 out gnu/packages/ruby.scm:39:2\n" +msgstr "" +" $ cd $GUIX_CHECKOUT\n" +" $ ./pre-inst-env guix package --list-available=ruby\n" +" ruby 1.8.7-p374 out gnu/packages/ruby.scm:119:2\n" +" ruby 2.1.6 out gnu/packages/ruby.scm:91:2\n" +" ruby 2.2.2 out gnu/packages/ruby.scm:39:2\n" + +#. type: itemize +#: doc/guix-cookbook.texi:709 +msgid "Build a package, here Ruby version 2.1:" +msgstr "Erstellen Sie ein Paket, z.B.@: Ruby in Version 2.1:" + +#. type: example +#: doc/guix-cookbook.texi:713 +#, no-wrap +msgid "" +" $ ./pre-inst-env guix build --keep-failed ruby@@2.1\n" +" /gnu/store/c13v73jxmj2nir2xjqaz5259zywsa9zi-ruby-2.1.6\n" +msgstr "" +" $ ./pre-inst-env guix build --keep-failed ruby@@2.1\n" +" /gnu/store/c13v73jxmj2nir2xjqaz5259zywsa9zi-ruby-2.1.6\n" + +#. type: itemize +#: doc/guix-cookbook.texi:717 +msgid "Install it to your user profile:" +msgstr "Installieren Sie es in Ihr Profil:" + +#. type: example +#: doc/guix-cookbook.texi:720 +#, no-wrap +msgid " $ ./pre-inst-env guix package --install ruby@@2.1\n" +msgstr " $ ./pre-inst-env guix package --install ruby@@2.1\n" + +#. type: itemize +#: doc/guix-cookbook.texi:724 +msgid "Check for common mistakes:" +msgstr "Prüfen Sie auf häufige Fehler:" + +#. type: example +#: doc/guix-cookbook.texi:727 +#, no-wrap +msgid " $ ./pre-inst-env guix lint ruby@@2.1\n" +msgstr " $ ./pre-inst-env guix lint ruby@@2.1\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:732 +msgid "Guix strives at maintaining a high packaging standard; when contributing to the Guix project, remember to" +msgstr "Guix ist bestrebt, einen hohen Standard an seine Pakete anzusetzen. Wenn Sie Beiträge zum Guix-Projekt leisten," + +#. type: itemize +#: doc/guix-cookbook.texi:736 +msgid "follow the coding style (@pxref{Coding Style,,, guix, GNU Guix Reference Manual})," +msgstr "schreiben Sie Ihren Code im Stil von Guix (siehe @ref{Programmierstil,,, guix.de, Referenzhandbuch zu GNU Guix})" + +#. type: itemize +#: doc/guix-cookbook.texi:738 +msgid "and review the check list from the manual (@pxref{Submitting Patches,,, guix, GNU Guix Reference Manual})." +msgstr "und schauen Sie sich die Kontrollliste aus dem Handbuch (siehe @ref{Einreichen von Patches,,, guix.de, Referenzhandbuch zu GNU Guix}) noch einmal an." + +#. type: Plain text +#: doc/guix-cookbook.texi:742 +msgid "Once you are happy with the result, you are welcome to send your contribution to make it part of Guix. This process is also detailed in the manual. (@pxref{Contributing,,, guix, GNU Guix Reference Manual})" +msgstr "Sobald Sie mit dem Ergebnis zufrieden sind, freuen wir uns, wenn Sie Ihren Beitrag an uns schicken, damit wir ihn in Guix aufnehmen. Dieser Prozess wird auch im Handbuch beschrieben (siehe @ref{Mitwirken,,, guix.de, Referenzhandbuch zu GNU Guix})<." + +#. type: Plain text +#: doc/guix-cookbook.texi:745 +msgid "It's a community effort so the more join in, the better Guix becomes!" +msgstr "Es handelt sich um eine gemeinschaftliche Arbeit, je mehr also mitmachen, desto besser wird Guix!" + +#. type: subsection +#: doc/guix-cookbook.texi:746 doc/guix-cookbook.texi:747 +#, no-wrap +msgid "Extended example" +msgstr "Erweitertes Beispiel" + +#. type: Plain text +#: doc/guix-cookbook.texi:752 +msgid "The above ``Hello World'' example is as simple as it goes. Packages can be more complex than that and Guix can handle more advanced scenarios. Let's look at another, more sophisticated package (slightly modified from the source):" +msgstr "Einfacher als obiges Hallo-Welt-Beispiel wird es nicht. Pakete können auch komplexer als das sein und Guix eignet sich für fortgeschrittenere Szenarien. Schauen wir uns ein anderes, umfangreicheres Paket an (leicht modifiziert gegenüber Guix’ Quellcode):" + +#. type: lisp +#: doc/guix-cookbook.texi:766 +#, no-wrap +msgid "" +"(define-module (gnu packages version-control)\n" +" #:use-module ((guix licenses) #:prefix license:)\n" +" #:use-module (guix utils)\n" +" #:use-module (guix packages)\n" +" #:use-module (guix git-download)\n" +" #:use-module (guix build-system cmake)\n" +" #:use-module (gnu packages ssh)\n" +" #:use-module (gnu packages web)\n" +" #:use-module (gnu packages pkg-config)\n" +" #:use-module (gnu packages python)\n" +" #:use-module (gnu packages compression)\n" +" #:use-module (gnu packages tls))\n" +"\n" +msgstr "" +"(define-module (gnu packages version-control)\n" +" #:use-module ((guix licenses) #:prefix license:)\n" +" #:use-module (guix utils)\n" +" #:use-module (guix packages)\n" +" #:use-module (guix git-download)\n" +" #:use-module (guix build-system cmake)\n" +" #:use-module (gnu packages ssh)\n" +" #:use-module (gnu packages web)\n" +" #:use-module (gnu packages pkg-config)\n" +" #:use-module (gnu packages python)\n" +" #:use-module (gnu packages compression)\n" +" #:use-module (gnu packages tls))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:826 +#, no-wrap +msgid "" +"(define-public my-libgit2\n" +" (let ((commit \"e98d0a37c93574d2c6107bf7f31140b548c6a7bf\")\n" +" (revision \"1\"))\n" +" (package\n" +" (name \"my-libgit2\")\n" +" (version (git-version \"0.26.6\" revision commit))\n" +" (source (origin\n" +" (method git-fetch)\n" +" (uri (git-reference\n" +" (url \"https://github.com/libgit2/libgit2/\")\n" +" (commit commit)))\n" +" (file-name (git-file-name name version))\n" +" (sha256\n" +" (base32\n" +" \"17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3\"))\n" +" (patches (search-patches \"libgit2-mtime-0.patch\"))\n" +" (modules '((guix build utils)))\n" +" (snippet '(begin\n" +" ;; Remove bundled software.\n" +" (delete-file-recursively \"deps\")\n" +" #t))))\n" +" (build-system cmake-build-system)\n" +" (outputs '(\"out\" \"debug\"))\n" +" (arguments\n" +" `(#:tests? #t ; Run the test suite (this is the default)\n" +" #:configure-flags '(\"-DUSE_SHA1DC=ON\") ; SHA-1 collision detection\n" +" #:phases\n" +" (modify-phases %standard-phases\n" +" (add-after 'unpack 'fix-hardcoded-paths\n" +" (lambda _\n" +" (substitute* \"tests/repo/init.c\"\n" +" ((\"#!/bin/sh\") (string-append \"#!\" (which \"sh\"))))\n" +" (substitute* \"tests/clar/fs.h\"\n" +" ((\"/bin/cp\") (which \"cp\"))\n" +" ((\"/bin/rm\") (which \"rm\")))\n" +" #t))\n" +" ;; Run checks more verbosely.\n" +" (replace 'check\n" +" (lambda _ (invoke \"./libgit2_clar\" \"-v\" \"-Q\")))\n" +" (add-after 'unpack 'make-files-writable-for-tests\n" +" (lambda _ (for-each make-file-writable (find-files \".\" \".*\")))))))\n" +" (inputs\n" +" `((\"libssh2\" ,libssh2)\n" +" (\"http-parser\" ,http-parser)\n" +" (\"python\" ,python-wrapper)))\n" +" (native-inputs\n" +" `((\"pkg-config\" ,pkg-config)))\n" +" (propagated-inputs\n" +" ;; These two libraries are in 'Requires.private' in libgit2.pc.\n" +" `((\"openssl\" ,openssl)\n" +" (\"zlib\" ,zlib)))\n" +" (home-page \"https://libgit2.github.com/\")\n" +" (synopsis \"Library providing Git core methods\")\n" +" (description\n" +" \"Libgit2 is a portable, pure C implementation of the Git core methods\n" +"provided as a re-entrant linkable library with a solid API, allowing you to\n" +"write native speed custom Git applications in any language with bindings.\")\n" +" ;; GPLv2 with linking exception\n" +" (license license:gpl2))))\n" +msgstr "" +"(define-public my-libgit2\n" +" (let ((commit \"e98d0a37c93574d2c6107bf7f31140b548c6a7bf\")\n" +" (revision \"1\"))\n" +" (package\n" +" (name \"my-libgit2\")\n" +" (version (git-version \"0.26.6\" revision commit))\n" +" (source (origin\n" +" (method git-fetch)\n" +" (uri (git-reference\n" +" (url \"https://github.com/libgit2/libgit2/\")\n" +" (commit commit)))\n" +" (file-name (git-file-name name version))\n" +" (sha256\n" +" (base32\n" +" \"17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3\"))\n" +" (patches (search-patches \"libgit2-mtime-0.patch\"))\n" +" (modules '((guix build utils)))\n" +" (snippet '(begin\n" +" ;; Remove bundled software.\n" +" (delete-file-recursively \"deps\")\n" +" #t))))\n" +" (build-system cmake-build-system)\n" +" (outputs '(\"out\" \"debug\"))\n" +" (arguments\n" +" `(#:tests? #t ; Run the test suite (this is the default)\n" +" #:configure-flags '(\"-DUSE_SHA1DC=ON\") ; SHA-1 collision detection\n" +" #:phases\n" +" (modify-phases %standard-phases\n" +" (add-after 'unpack 'fix-hardcoded-paths\n" +" (lambda _\n" +" (substitute* \"tests/repo/init.c\"\n" +" ((\"#!/bin/sh\") (string-append \"#!\" (which \"sh\"))))\n" +" (substitute* \"tests/clar/fs.h\"\n" +" ((\"/bin/cp\") (which \"cp\"))\n" +" ((\"/bin/rm\") (which \"rm\")))\n" +" #t))\n" +" ;; Run checks more verbosely.\n" +" (replace 'check\n" +" (lambda _ (invoke \"./libgit2_clar\" \"-v\" \"-Q\")))\n" +" (add-after 'unpack 'make-files-writable-for-tests\n" +" (lambda _ (for-each make-file-writable (find-files \".\" \".*\")))))))\n" +" (inputs\n" +" `((\"libssh2\" ,libssh2)\n" +" (\"http-parser\" ,http-parser)\n" +" (\"python\" ,python-wrapper)))\n" +" (native-inputs\n" +" `((\"pkg-config\" ,pkg-config)))\n" +" (propagated-inputs\n" +" ;; These two libraries are in 'Requires.private' in libgit2.pc.\n" +" `((\"openssl\" ,openssl)\n" +" (\"zlib\" ,zlib)))\n" +" (home-page \"https://libgit2.github.com/\")\n" +" (synopsis \"Library providing Git core methods\")\n" +" (description\n" +" \"Libgit2 is a portable, pure C implementation of the Git core methods\n" +"provided as a re-entrant linkable library with a solid API, allowing you to\n" +"write native speed custom Git applications in any language with bindings.\")\n" +" ;; GPLv2 with linking exception\n" +" (license license:gpl2))))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:831 +msgid "(In those cases were you only want to tweak a few fields from a package definition, you should rely on inheritance instead of copy-pasting everything. See below.)" +msgstr "(In solchen Fällen, wo Sie nur ein paar wenige Felder einer Paketdefinition abändern wollen, wäre es wirklich besser, wenn Sie Vererbung einsetzen würden, statt alles abzuschreiben. Siehe unten.)" + +#. type: Plain text +#: doc/guix-cookbook.texi:833 +msgid "Let's discuss those fields in depth." +msgstr "Reden wir über diese Felder im Detail." + +#. type: subsubsection +#: doc/guix-cookbook.texi:834 +#, no-wrap +msgid "@code{git-fetch} method" +msgstr "@code{git-fetch}-Methode" + +#. type: Plain text +#: doc/guix-cookbook.texi:841 +msgid "Unlike the @code{url-fetch} method, @code{git-fetch} expects a @code{git-reference} which takes a Git repository and a commit. The commit can be any Git reference such as tags, so if the @code{version} is tagged, then it can be used directly. Sometimes the tag is prefixed with a @code{v}, in which case you'd use @code{(commit (string-append \"v\" version))}." +msgstr "Anders als die @code{url-fetch}-Methode erwartet @code{git-fetch} eine @code{git-reference}, welche ein Git-Repository und einen Commit entgegennimmt. Der Commit kann eine beliebige Art von Git-Referenz sein, z.B.@: ein Tag. Wenn die @code{version} also mit einem Tag versehen ist, kann sie einfach benutzt werden. Manchmal ist dem Tag ein Präfix @code{v} vorangestellt. In diesem Fall würden Sie @code{(commit (string-append \"v\" version))} schreiben." + +#. type: Plain text +#: doc/guix-cookbook.texi:845 +msgid "To ensure that the source code from the Git repository is stored in a unique directory with a readable name we use @code{(file-name (git-file-name name version))}." +msgstr "Um sicherzustellen, dass der Quellcode aus dem Git-Repository in einem nachvollziehbaren Verzeichnis mit lesbarem Namen landet, schreiben wir @code{(file-name (git-file-name name version))}." + +#. type: Plain text +#: doc/guix-cookbook.texi:848 +msgid "Note that there is also a @code{git-version} procedure that can be used to derive the version when packaging programs for a specific commit." +msgstr "Beachten Sie, dass auch eine Prozedur @code{git-version} existiert, mit der die Version beim Paketieren eines bestimmten Commits eines Programms abgeleitet werden kann." + +#. type: subsubsection +#: doc/guix-cookbook.texi:849 +#, no-wrap +msgid "Snippets" +msgstr "Schnipsel" + +#. type: Plain text +#: doc/guix-cookbook.texi:855 +msgid "Snippets are quoted (i.e. non-evaluated) Scheme code that are a means of patching the source. They are a Guix-y alternative to the traditional @samp{.patch} files. Because of the quote, the code in only evaluated when passed to the Guix daemon for building. There can be as many snippets as needed." +msgstr "„Snippets“, deutsch Schnipsel, sind mit z.B.@: @code{quote}-Zeichen maskierte, also nicht ausgewertete, Stücke Scheme-Code, mit denen der Quellcode gepatcht wird. Sie sind eine guixige Alternative zu traditionellen @samp{.patch}-Dateien. Wegen der Maskierung werden sie erst dann ausgewertet, wenn sie an den Guix-Daemon zum Erstellen übergeben werden. Es kann so viele Schnipsel geben wie nötig." + +#. type: Plain text +#: doc/guix-cookbook.texi:858 +msgid "Snippets might need additional Guile modules which can be imported from the @code{modules} field." +msgstr "In Schnipseln könnten zusätzliche Guile-Module benötigt werden. Diese können importiert werden, indem man sie im Feld @code{modules} angibt." + +#. type: subsubsection +#: doc/guix-cookbook.texi:859 +#, no-wrap +msgid "Inputs" +msgstr "Eingaben" + +#. type: Plain text +#: doc/guix-cookbook.texi:862 +msgid "First, a syntactic comment: See the quasi-quote / comma syntax?" +msgstr "Zunächst ein syntaktischer Kommentar: Sehen Sie die Syntax mit @code{quasiquote} und Komma?" + +#. type: lisp +#: doc/guix-cookbook.texi:866 +#, no-wrap +msgid "" +" (native-inputs\n" +" `((\"pkg-config\" ,pkg-config)))\n" +msgstr "" +" (native-inputs\n" +" `((\"pkg-config\" ,pkg-config)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:869 +msgid "is equivalent to" +msgstr "ist das Gleiche wie" + +#. type: lisp +#: doc/guix-cookbook.texi:873 +#, no-wrap +msgid "" +" (native-inputs\n" +" (list (list \"pkg-config\" pkg-config)))\n" +msgstr "" +" (native-inputs\n" +" (list (list \"pkg-config\" pkg-config)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:876 +msgid "You'll mostly see the former because it's shorter." +msgstr "Sie werden hauptsächlich erstere Variante sehen, weil sie kürzer ist." + +#. type: Plain text +#: doc/guix-cookbook.texi:878 +msgid "There are 3 different input types. In short:" +msgstr "Es gibt 3 verschiedene Arten von Eingaben. Kurz gefasst:" + +#. type: item +#: doc/guix-cookbook.texi:880 +#, no-wrap +msgid "native-inputs" +msgstr "native-inputs" + +#. type: table +#: doc/guix-cookbook.texi:883 +msgid "Required for building but not runtime -- installing a package through a substitute won't install these inputs." +msgstr "Sie werden zum Erstellen gebraucht, aber @emph{nicht} zur Laufzeit — wenn Sie ein Paket als Substitut installieren, werden diese Eingaben nirgendwo installiert." + +#. type: item +#: doc/guix-cookbook.texi:883 +#, no-wrap +msgid "inputs" +msgstr "inputs" + +#. type: table +#: doc/guix-cookbook.texi:886 +msgid "Installed in the store but not in the profile, as well as being present at build time." +msgstr "Sie werden in den Store installiert, aber nicht in das Profil, und sie stehen beim Erstellen zur Verfügung." + +#. type: item +#: doc/guix-cookbook.texi:886 +#, no-wrap +msgid "propagated-inputs" +msgstr "propagated-inputs" + +#. type: table +#: doc/guix-cookbook.texi:889 +msgid "Installed in the store and in the profile, as well as being present at build time." +msgstr "Sie werden sowohl in den Store als auch ins Profil installiert und sind auch beim Erstellen verfügbar." + +#. type: Plain text +#: doc/guix-cookbook.texi:892 +msgid "@xref{Package Reference,,, guix, GNU Guix Reference Manual} for more details." +msgstr "Siehe @ref{„package“-Referenz,,, guix.de, Referenzhandbuch zu GNU Guix} für mehr Details." + +#. type: Plain text +#: doc/guix-cookbook.texi:896 +msgid "The distinction between the various inputs is important: if a dependency can be handled as an @emph{input} instead of a @emph{propagated input}, it should be done so, or else it ``pollutes'' the user profile for no good reason." +msgstr "Der Unterschied zwischen den verschiedenen Eingaben ist wichtig: Wenn eine Abhängigkeit als @code{input} statt als @code{propagated-input} ausreicht, dann sollte sie auch so eingeordnet werden, sonst „verschmutzt“ sie das Profil des Benutzers ohne guten Grund." + +#. type: Plain text +#: doc/guix-cookbook.texi:903 +msgid "For instance, a user installing a graphical program that depends on a command line tool might only be interested in the graphical part, so there is no need to force the command line tool into the user profile. The dependency is a concern to the package, not to the user. @emph{Inputs} make it possible to handle dependencies without bugging the user by adding undesired executable files (or libraries) to their profile." +msgstr "Wenn eine Nutzerin beispielsweise ein grafisches Programm installiert, das von einem Befehlszeilenwerkzeug abhängt, sie sich aber nur für den grafischen Teil interessiert, dann sollten wir sie nicht zur Installation des Befehlszeilenwerkzeugs in ihr Benutzerprofil zwingen. Um die Abhängigkeit sollte sich das Paket kümmern, nicht seine Benutzerin. Mit @emph{Inputs} können wir Abhängigkeiten verwenden, wo sie gebraucht werden, ohne Nutzer zu belästigen, indem wir ausführbare Dateien (oder Bibliotheken) in deren Profil installieren." + +#. type: Plain text +#: doc/guix-cookbook.texi:909 +msgid "Same goes for @emph{native-inputs}: once the program is installed, build-time dependencies can be safely garbage-collected. It also matters when a substitute is available, in which case only the @emph{inputs} and @emph{propagated inputs} will be fetched: the @emph{native inputs} are not required to install a package from a substitute." +msgstr "Das Gleiche gilt für @emph{native-inputs}: Wenn das Programm einmal installiert ist, können Abhängigkeiten zur Erstellungszeit gefahrlos dem Müllsammler anvertraut werden. Sie sind auch besser, wenn ein Substitut verfügbar ist, so dass nur die @code{inputs} und @code{propagated-inputs} heruntergeladen werden; @code{native-inputs} braucht niemand, der das Paket aus einem Substitut heraus installiert." + +#. type: subsubsection +#: doc/guix-cookbook.texi:910 +#, no-wrap +msgid "Outputs" +msgstr "Ausgaben" + +#. type: Plain text +#: doc/guix-cookbook.texi:914 +msgid "Just like how a package can have multiple inputs, it can also produce multiple outputs." +msgstr "Genau wie ein Paket mehrere Eingaben haben kann, kann es auch mehrere Ausgaben haben." + +#. type: Plain text +#: doc/guix-cookbook.texi:916 +msgid "Each output corresponds to a separate directory in the store." +msgstr "Jede Ausgabe entspricht einem anderen Verzeichnis im Store." + +#. type: Plain text +#: doc/guix-cookbook.texi:919 +msgid "The user can choose which output to install; this is useful to save space or to avoid polluting the user profile with unwanted executables or libraries." +msgstr "Die Benutzerin kann sich entscheiden, welche Ausgabe sie installieren will; so spart sie Platz auf dem Datenträger und verschmutzt ihr Benutzerprofil nicht mit unerwünschten ausführbaren Dateien oder Bibliotheken." + +#. type: Plain text +#: doc/guix-cookbook.texi:922 +msgid "Output separation is optional. When the @code{outputs} field is left out, the default and only output (the complete package) is referred to as @code{\"out\"}." +msgstr "Nach Ausgaben zu trennen ist optional. Wenn Sie kein @code{outputs}-Feld schreiben, heißt die standardmäßige und einzige Ausgabe (also das ganze Paket) schlicht @code{\"out\"}." + +#. type: Plain text +#: doc/guix-cookbook.texi:924 +msgid "Typical separate output names include @code{debug} and @code{doc}." +msgstr "Typische Namen für getrennte Ausgaben sind @code{debug} und @code{doc}." + +#. type: Plain text +#: doc/guix-cookbook.texi:928 +msgid "It's advised to separate outputs only when you've shown it's worth it: if the output size is significant (compare with @code{guix size}) or in case the package is modular." +msgstr "Es wird empfohlen, getrennte Ausgaben nur dann anzubieten, wenn Sie gezeigt haben, dass es sich lohnt, d.h.@: wenn die Ausgabengröße signifikant ist (vergleichen Sie sie mittels @code{guix size}) oder das Paket modular aufgebaut ist." + +#. type: subsubsection +#: doc/guix-cookbook.texi:929 +#, no-wrap +msgid "Build system arguments" +msgstr "Argumente ans Erstellungssystem" + +#. type: Plain text +#: doc/guix-cookbook.texi:932 +msgid "The @code{arguments} is a keyword-value list used to configure the build process." +msgstr "@code{arguments} ist eine Liste aus Schlüsselwort-Wert-Paaren (eine „keyword-value list“), mit denen der Erstellungsprozess konfiguriert wird." + +#. type: Plain text +#: doc/guix-cookbook.texi:937 +msgid "The simplest argument @code{#:tests?} can be used to disable the test suite when building the package. This is mostly useful when the package does not feature any test suite. It's strongly recommended to keep the test suite on if there is one." +msgstr "Das einfachste Argument @code{#:tests?} kann man benutzen, um den Testkatalog bei der Erstellung des Pakets nicht zu prüfen. Das braucht man meistens dann, wenn das Paket überhaupt keinen Testkatalog hat. Wir empfehlen sehr, den Testkatalog zu benutzen, wenn es einen gibt." + +#. type: Plain text +#: doc/guix-cookbook.texi:941 +msgid "Another common argument is @code{:make-flags}, which specifies a list of flags to append when running make, as you would from the command line. For instance, the following flags" +msgstr "Ein anderes häufiges Argument ist @code{:make-flags}, was eine Liste an den @code{make}-Aufruf anzuhängender Befehlszeilenargumente festlegt, so wie Sie sie auf der Befehlszeile angeben würden. Zum Beispiel werden die folgenden @code{:make-flags}" + +#. type: lisp +#: doc/guix-cookbook.texi:945 +#, no-wrap +msgid "" +"#:make-flags (list (string-append \"prefix=\" (assoc-ref %outputs \"out\"))\n" +" \"CC=gcc\")\n" +msgstr "" +"#:make-flags (list (string-append \"prefix=\" (assoc-ref %outputs \"out\"))\n" +" \"CC=gcc\")\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:948 +msgid "translate into" +msgstr "übersetzt zu" + +#. type: example +#: doc/guix-cookbook.texi:951 +#, no-wrap +msgid "$ make CC=gcc prefix=/gnu/store/...-\n" +msgstr "$ make CC=gcc prefix=/gnu/store/...-\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:957 +msgid "This sets the C compiler to @code{gcc} and the @code{prefix} variable (the installation directory in Make parlance) to @code{(assoc-ref %outputs \"out\")}, which is a build-stage global variable pointing to the destination directory in the store (something like @samp{/gnu/store/...-my-libgit2-20180408})." +msgstr "Dadurch wird als C-Compiler @code{gcc} verwendet und als @code{prefix}-Variable (das Installationsverzeichnis in der Sprechweise von Make) wird @code{(assoc-ref %outputs \"out\")} verwendet, also eine globale Variable der Erstellungsschicht, die auf das Zielverzeichnis im Store verweist (so etwas wie @samp{/gnu/store/...-my-libgit2-20180408})." + +#. type: Plain text +#: doc/guix-cookbook.texi:959 +msgid "Similarly, it's possible to set the configure flags:" +msgstr "Auf gleiche Art kann man auch die Befehlszeilenoptionen für configure festlegen:" + +#. type: lisp +#: doc/guix-cookbook.texi:962 +#, no-wrap +msgid "#:configure-flags '(\"-DUSE_SHA1DC=ON\")\n" +msgstr "#:configure-flags '(\"-DUSE_SHA1DC=ON\")\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:966 +msgid "The @code{%build-inputs} variable is also generated in scope. It's an association table that maps the input names to their store directories." +msgstr "Die Variable @code{%build-inputs} wird auch in diesem Sichtbarkeitsbereich erzeugt. Es handelt sich um eine assoziative Liste, die von den Namen der Eingaben auf ihre Verzeichnisse im Store abbildet." + +#. type: Plain text +#: doc/guix-cookbook.texi:971 +msgid "The @code{phases} keyword lists the sequential steps of the build system. Typically phases include @code{unpack}, @code{configure}, @code{build}, @code{install} and @code{check}. To know more about those phases, you need to work out the appropriate build system definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}:" +msgstr "Das @code{phases}-Schlüsselwort listet der Reihe nach die vom Erstellungssystem durchgeführten Schritte auf. Zu den üblichen Phasen gehören @code{unpack}, @code{configure}, @code{build}, @code{install} und @code{check}. Um mehr über diese Phasen zu lernen, müssen Sie sich die Definition des zugehörigen Erstellungssystems in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm} anschauen:" + +#. type: lisp +#: doc/guix-cookbook.texi:990 +#, no-wrap +msgid "" +"(define %standard-phases\n" +" ;; Standard build phases, as a list of symbol/procedure pairs.\n" +" (let-syntax ((phases (syntax-rules ()\n" +" ((_ p ...) `((p . ,p) ...)))))\n" +" (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack\n" +" bootstrap\n" +" patch-usr-bin-file\n" +" patch-source-shebangs configure patch-generated-file-shebangs\n" +" build check install\n" +" patch-shebangs strip\n" +" validate-runpath\n" +" validate-documentation-location\n" +" delete-info-dir-file\n" +" patch-dot-desktop-files\n" +" install-license-files\n" +" reset-gzip-timestamps\n" +" compress-documentation)))\n" +msgstr "" +"(define %standard-phases\n" +" ;; Standard build phases, as a list of symbol/procedure pairs.\n" +" (let-syntax ((phases (syntax-rules ()\n" +" ((_ p ...) `((p . ,p) ...)))))\n" +" (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack\n" +" bootstrap\n" +" patch-usr-bin-file\n" +" patch-source-shebangs configure patch-generated-file-shebangs\n" +" build check install\n" +" patch-shebangs strip\n" +" validate-runpath\n" +" validate-documentation-location\n" +" delete-info-dir-file\n" +" patch-dot-desktop-files\n" +" install-license-files\n" +" reset-gzip-timestamps\n" +" compress-documentation)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:993 +msgid "Or from the REPL:" +msgstr "Alternativ auf einer REPL:" + +#. type: lisp +#: doc/guix-cookbook.texi:999 +#, no-wrap +msgid "" +"(add-to-load-path \"/path/to/guix/checkout\")\n" +",use (guix build gnu-build-system)\n" +"(map first %standard-phases)\n" +"@result{} (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation)\n" +msgstr "" +"(add-to-load-path \"/path/to/guix/checkout\")\n" +",use (guix build gnu-build-system)\n" +"(map first %standard-phases)\n" +"@result{} (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation)\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1003 +msgid "If you want to know more about what happens during those phases, consult the associated procedures." +msgstr "Wenn Sie mehr darüber wissen wollen, was in diesen Phasen passiert, schauen Sie in den jeweiligen Prozeduren." + +#. type: Plain text +#: doc/guix-cookbook.texi:1006 +msgid "For instance, as of this writing the definition of @code{unpack} for the GNU build system is" +msgstr "Beispielsweise sieht momentan, als dies hier geschrieben wurde, die Definition von @code{unpack} für das GNU-Erstellungssystem so aus:" + +#. type: lisp +#: doc/guix-cookbook.texi:1016 +#, no-wrap +msgid "" +"(define* (unpack #:key source #:allow-other-keys)\n" +" \"Unpack SOURCE in the working directory, and change directory within the\n" +"source. When SOURCE is a directory, copy it in a sub-directory of the current\n" +"working directory.\"\n" +" (if (file-is-directory? source)\n" +" (begin\n" +" (mkdir \"source\")\n" +" (chdir \"source\")\n" +"\n" +msgstr "" +"(define* (unpack #:key source #:allow-other-keys)\n" +" \"Unpack SOURCE in the working directory, and change directory within the\n" +"source. When SOURCE is a directory, copy it in a sub-directory of the current\n" +"working directory.\"\n" +" (if (file-is-directory? source)\n" +" (begin\n" +" (mkdir \"source\")\n" +" (chdir \"source\")\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:1027 +#, no-wrap +msgid "" +" ;; Preserve timestamps (set to the Epoch) on the copied tree so that\n" +" ;; things work deterministically.\n" +" (copy-recursively source \".\"\n" +" #:keep-mtime? #t))\n" +" (begin\n" +" (if (string-suffix? \".zip\" source)\n" +" (invoke \"unzip\" source)\n" +" (invoke \"tar\" \"xvf\" source))\n" +" (chdir (first-subdirectory \".\"))))\n" +" #t)\n" +msgstr "" +" ;; Preserve timestamps (set to the Epoch) on the copied tree so that\n" +" ;; things work deterministically.\n" +" (copy-recursively source \".\"\n" +" #:keep-mtime? #t))\n" +" (begin\n" +" (if (string-suffix? \".zip\" source)\n" +" (invoke \"unzip\" source)\n" +" (invoke \"tar\" \"xvf\" source))\n" +" (chdir (first-subdirectory \".\"))))\n" +" #t)\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1035 +msgid "Note the @code{chdir} call: it changes the working directory to where the source was unpacked. Thus every phase following the @code{unpack} will use the source as a working directory, which is why we can directly work on the source files. That is to say, unless a later phase changes the working directory to something else." +msgstr "Beachten Sie den Aufruf von @code{chdir}: Damit wird das Arbeitsverzeichnis zu demjenigen gewechselt, wohin die Quelldateien entpackt wurden. In jeder Phase nach @code{unpack} dient also das Verzeichnis mit den Quelldateien als Arbeitsverzeichnis. Deswegen können wir direkt mit den Quelldateien arbeiten, zumindest solange keine spätere Phase das Arbeitsverzeichnis woandershin wechselt." + +#. type: Plain text +#: doc/guix-cookbook.texi:1039 +msgid "We modify the list of @code{%standard-phases} of the build system with the @code{modify-phases} macro as per the list of specified modifications, which may have the following forms:" +msgstr "Die Liste der @code{%standard-phases} des Erstellungssystems ändern wir mit Hilfe des @code{modify-phases}-Makros über eine Liste von Änderungen. Sie kann folgende Formen haben:" + +#. type: itemize +#: doc/guix-cookbook.texi:1043 +msgid "@code{(add-before PHASE NEW-PHASE PROCEDURE)}: Run @code{PROCEDURE} named @code{NEW-PHASE} before @code{PHASE}." +msgstr "@code{(add-before PHASE NEUE-PHASE PROZEDUR)}: Die @code{PROZEDUR} namens @code{NEUE-PHASE} vor @code{PHASE} ausführen." + +#. type: itemize +#: doc/guix-cookbook.texi:1045 +msgid "@code{(add-after PHASE NEW-PHASE PROCEDURE)}: Same, but afterwards." +msgstr "@code{(add-after PHASE NEUE-PHASE PROZEDUR)}: Genauso, aber danach." + +#. type: itemize +#: doc/guix-cookbook.texi:1047 +msgid "@code{(replace PHASE PROCEDURE)}." +msgstr "@code{(replace PHASE PROZEDUR)}." + +#. type: itemize +#: doc/guix-cookbook.texi:1049 +msgid "@code{(delete PHASE)}." +msgstr "@code{(delete PHASE)}." + +#. type: Plain text +#: doc/guix-cookbook.texi:1056 +msgid "The @code{PROCEDURE} supports the keyword arguments @code{inputs} and @code{outputs}. Each input (whether @emph{native}, @emph{propagated} or not) and output directory is referenced by their name in those variables. Thus @code{(assoc-ref outputs \"out\")} is the store directory of the main output of the package. A phase procedure may look like this:" +msgstr "Die @code{PROZEDUR} unterstützt die Schlüsselwortargumente @code{inputs} und @code{outputs}. Jede Eingabe (ob sie @emph{native}, @emph{propagated} oder nichts davon ist) und jedes Ausgabeverzeichnis ist in diesen Variablen mit dem jeweiligen Namen assoziiert. @code{(assoc-ref outputs \"out\")} ist also das Store-Verzeichnis der Hauptausgabe des Pakets. Eine Phasenprozedur kann so aussehen:" + +#. type: lisp +#: doc/guix-cookbook.texi:1064 +#, no-wrap +msgid "" +"(lambda* (#:key inputs outputs #:allow-other-keys)\n" +" (let (((bash-directory (assoc-ref inputs \"bash\"))\n" +" (output-directory (assoc-ref outputs \"out\"))\n" +" (doc-directory (assoc-ref outputs \"doc\"))\n" +" ; ...\n" +" #t)\n" +msgstr "" +"(lambda* (#:key inputs outputs #:allow-other-keys)\n" +" (let (((bash-directory (assoc-ref inputs \"bash\"))\n" +" (output-directory (assoc-ref outputs \"out\"))\n" +" (doc-directory (assoc-ref outputs \"doc\"))\n" +" ; ...\n" +" #t)\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1070 +msgid "The procedure must return @code{#t} on success. It's brittle to rely on the return value of the last expression used to tweak the phase because there is no guarantee it would be a @code{#t}. Hence the trailing @code{#t} to ensure the right value is returned on success." +msgstr "Die Prozedur muss bei Erfolg @code{#t} zurückliefern. Auf den Rückgabewert des letzten Ausdrucks, mit dem die Phase angepasst wurde, kann man sich nicht verlassen, weil es keine Garantie gibt, dass der Rückgabewert @code{#t} sein wird. Deswegen schreiben wir dahinter @code{#t}, damit bei erfolgreicher Ausführung der richtige Wert geliefert wird." + +#. type: subsubsection +#: doc/guix-cookbook.texi:1071 +#, no-wrap +msgid "Code staging" +msgstr "Code-Staging" + +#. type: Plain text +#: doc/guix-cookbook.texi:1077 +msgid "The astute reader may have noticed the quasi-quote and comma syntax in the argument field. Indeed, the build code in the package declaration should not be evaluated on the client side, but only when passed to the Guix daemon. This mechanism of passing code around two running processes is called @uref{https://arxiv.org/abs/1709.00833, code staging}." +msgstr "Aufmerksame Leser könnten die Syntax mit @code{quasiquote} und Komma im Argumentefeld bemerkt haben. Tatsächlich sollte der Erstellungscode in der Paketdeklaration @emph{nicht} auf Client-Seite ausgeführt werden, sondern erst, wenn er an den Guix-Daemon übergeben worden ist. Der Mechanismus, über den Code zwischen zwei laufenden Prozessen weitergegeben wird, nennen wir @uref{https://arxiv.org/abs/1709.00833, Code-Staging}." + +#. type: subsubsection +#: doc/guix-cookbook.texi:1078 +#, no-wrap +msgid "Utility functions" +msgstr "Hilfsfunktionen" + +#. type: Plain text +#: doc/guix-cookbook.texi:1083 +msgid "When customizing @code{phases}, we often need to write code that mimics the equivalent system invocations (@code{make}, @code{mkdir}, @code{cp}, etc.) commonly used during regular ``Unix-style'' installations." +msgstr "Beim Anpassen der @code{phases} müssen wir oft Code schreiben, der analog zu den äquivalenten Systemaufrufen funktioniert (@code{make}, @code{mkdir}, @code{cp}, etc.), welche in regulären „Unix-artigen“ Installationen oft benutzt werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1086 +msgid "Some like @code{chmod} are native to Guile. @xref{,,, guile, Guile reference manual} for a complete list." +msgstr "Manche, wie @code{chmod}, sind Teil von Guile. Siehe das @ref{,,, guile, Referenzhandbuch zu Guile} für eine vollständige Liste." + +#. type: Plain text +#: doc/guix-cookbook.texi:1089 +msgid "Guix provides additional helper functions which prove especially handy in the context of package management." +msgstr "Guix stellt zusätzliche Hilfsfunktionen zur Verfügung, die bei der Paketverwaltung besonders praktisch sind." + +#. type: Plain text +#: doc/guix-cookbook.texi:1093 +msgid "Some of those functions can be found in @samp{$GUIX_CHECKOUT/guix/guix/build/utils.scm}. Most of them mirror the behaviour of the traditional Unix system commands:" +msgstr "Manche dieser Funktionalitäten finden Sie in @samp{$GUIX_CHECKOUT/guix/guix/build/utils.scm}. Die meisten spiegeln das Verhalten traditioneller Unix-Systembefehle wider:" + +#. type: item +#: doc/guix-cookbook.texi:1095 +#, no-wrap +msgid "which" +msgstr "which" + +#. type: table +#: doc/guix-cookbook.texi:1097 +msgid "Like the @samp{which} system command." +msgstr "Das Gleiche wie der @samp{which}-Systembefehl." + +#. type: item +#: doc/guix-cookbook.texi:1097 +#, no-wrap +msgid "find-files" +msgstr "find-files" + +#. type: table +#: doc/guix-cookbook.texi:1099 +msgid "Akin to the @samp{find} system command." +msgstr "Wie der @samp{find} Systembefehl." + +#. type: item +#: doc/guix-cookbook.texi:1099 +#, no-wrap +msgid "mkdir-p" +msgstr "mkdir-p" + +#. type: table +#: doc/guix-cookbook.texi:1101 +msgid "Like @samp{mkdir -p}, which creates all parents as needed." +msgstr "Wie @samp{mkdir -p}, das Elternverzeichnisse erzeugt, wenn nötig." + +#. type: item +#: doc/guix-cookbook.texi:1101 +#, no-wrap +msgid "install-file" +msgstr "install-file" + +#. type: table +#: doc/guix-cookbook.texi:1105 +msgid "Similar to @samp{install} when installing a file to a (possibly non-existing) directory. Guile has @code{copy-file} which works like @samp{cp}." +msgstr "Ähnlich wie @samp{install} beim Installieren einer Datei in ein (nicht unbedingt existierendes) Verzeichnis. Guile kennt @code{copy-file}, das wie @samp{cp} funktioniert." + +#. type: item +#: doc/guix-cookbook.texi:1105 +#, no-wrap +msgid "copy-recursively" +msgstr "copy-recursively" + +#. type: table +#: doc/guix-cookbook.texi:1107 +msgid "Like @samp{cp -r}." +msgstr "Wie @samp{cp -r}." + +#. type: item +#: doc/guix-cookbook.texi:1107 +#, no-wrap +msgid "delete-file-recursively" +msgstr "delete-file-recursively" + +#. type: table +#: doc/guix-cookbook.texi:1109 +msgid "Like @samp{rm -rf}." +msgstr "Wie @samp{rm -rf}." + +#. type: item +#: doc/guix-cookbook.texi:1109 +#, no-wrap +msgid "invoke" +msgstr "invoke" + +#. type: table +#: doc/guix-cookbook.texi:1111 +msgid "Run an executable. This should be used instead of @code{system*}." +msgstr "Eine ausführbare Datei ausführen. Man sollte es benutzen und nicht @code{system*}." + +#. type: item +#: doc/guix-cookbook.texi:1111 +#, no-wrap +msgid "with-directory-excursion" +msgstr "with-directory-excursion" + +#. type: table +#: doc/guix-cookbook.texi:1114 +msgid "Run the body in a different working directory, then restore the previous working directory." +msgstr "Den Rumpf in einem anderen Arbeitsverzeichnis ausführen und danach wieder in das vorherige Arbeitsverzeichnis wechseln." + +#. type: item +#: doc/guix-cookbook.texi:1114 +#, no-wrap +msgid "substitute*" +msgstr "substitute*" + +#. type: table +#: doc/guix-cookbook.texi:1116 +msgid "A ``@command{sed}-like'' function." +msgstr "Eine „@command{sed}-artige“ Funktion." + +#. type: subsubsection +#: doc/guix-cookbook.texi:1118 +#, no-wrap +msgid "Module prefix" +msgstr "Modulpräfix" + +#. type: Plain text +#: doc/guix-cookbook.texi:1128 +msgid "The license in our last example needs a prefix: this is because of how the @code{license} module was imported in the package, as @code{#:use-module ((guix licenses) #:prefix license:)}. The Guile module import mechanism (@pxref{Using Guile Modules,,, guile, Guile reference manual}) gives the user full control over namespacing: this is needed to avoid clashes between, say, the @samp{zlib} variable from @samp{licenses.scm} (a @emph{license} value) and the @samp{zlib} variable from @samp{compression.scm} (a @emph{package} value)." +msgstr "Die Lizenz in unserem letzten Beispiel braucht ein Präfix. Der Grund liegt darin, wie das @code{license}-Modul importiert worden ist, nämlich @code{#:use-module ((guix licenses) #:prefix license:)}. Der Importmechanismus von Guile-Modulen (siehe @ref{Using Guile Modules,,, guile, Referenzhandbuch zu Guile}) gibt Benutzern die volle Kontrolle über Namensräume. Man braucht sie, um Konflikte zu lösen, z.B.@ zwischen der @samp{zlib}-Variablen aus @samp{licenses.scm} (dieser Wert repräsentiert eine @emph{Softwarelizenz}) und der @samp{zlib}-Variablen aus @samp{compression.scm} (ein Wert, der für ein @emph{Paket} steht)." + +#. type: subsection +#: doc/guix-cookbook.texi:1129 doc/guix-cookbook.texi:1130 +#, no-wrap +msgid "Other build systems" +msgstr "Andere Erstellungssysteme" + +#. type: Plain text +#: doc/guix-cookbook.texi:1137 +msgid "What we've seen so far covers the majority of packages using a build system other than the @code{trivial-build-system}. The latter does not automate anything and leaves you to build everything manually. This can be more demanding and we won't cover it here for now, but thankfully it is rarely necessary to fall back on this system." +msgstr "Was wir bisher gesehen haben reicht für die meisten Pakete aus, die als Erstellungssystem etwas anderes als @code{trivial-build-system} verwenden. Letzteres automatisiert gar nichts und überlässt es Ihnen, alles zur Erstellung manuell festzulegen. Das kann einen noch mehr beanspruchen und wir beschreiben es hier zur Zeit nicht, aber glücklicherweise braucht man dieses System auch nur in seltenen Fällen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1141 +msgid "For the other build systems, such as ASDF, Emacs, Perl, Ruby and many more, the process is very similar to the GNU build system except for a few specialized arguments." +msgstr "Bei anderen Erstellungssystemen wie ASDF, Emacs, Perl, Ruby und vielen anderen ist der Prozess sehr ähnlich zum GNU-Erstellungssystem abgesehen von ein paar speziellen Argumenten." + +#. type: Plain text +#: doc/guix-cookbook.texi:1146 +msgid "@xref{Build Systems,,, guix, GNU Guix Reference Manual}, for more information on build systems, or check the source code in the @samp{$GUIX_CHECKOUT/guix/build} and @samp{$GUIX_CHECKOUT/guix/build-system} directories." +msgstr "Siehe @ref{Erstellungssysteme,,, guix.de, Referenzhandbuch zu GNU Guix}, für mehr Informationen über Erstellungssysteme, oder den Quellcode in den Verzeichnissen @samp{$GUIX_CHECKOUT/guix/build} und @samp{$GUIX_CHECKOUT/guix/build-system}." + +#. type: subsection +#: doc/guix-cookbook.texi:1147 doc/guix-cookbook.texi:1148 +#, no-wrap +msgid "Programmable and automated package definition" +msgstr "Programmierbare und automatisierte Paketdefinition" + +#. type: Plain text +#: doc/guix-cookbook.texi:1152 +msgid "We can't repeat it enough: having a full-fledged programming language at hand empowers us in ways that reach far beyond traditional package management." +msgstr "Wir können es nicht oft genug wiederholen: Eine Allzweck-Programmiersprache zur Hand zu haben macht Dinge möglich, die traditionelle Paketverwaltung weit übersteigen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1154 +msgid "Let's illustrate this with some awesome features of Guix!" +msgstr "Wir können uns das anhand Guix’ großartiger Funktionalitäten klarmachen!" + +#. type: subsubsection +#: doc/guix-cookbook.texi:1155 doc/guix-cookbook.texi:1156 +#, no-wrap +msgid "Recursive importers" +msgstr "Rekursive Importer" + +#. type: Plain text +#: doc/guix-cookbook.texi:1163 +msgid "You might find some build systems good enough that there is little to do at all to write a package, to the point that it becomes repetitive and tedious after a while. A @emph{raison d'être} of computers is to replace human beings at those boring tasks. So let's tell Guix to do this for us and create the package definition of an R package from CRAN (the output is trimmed for conciseness):" +msgstr "Sie könnten feststellen, dass manche Erstellungssysteme gut genug sind und nichts weiter zu tun bleibt, um ein Paket zu verfassen. Das Paketeschreiben kann so monoton werden und man wird dessen bald überdrüssig. Eine Daseinsberechtigung von Rechnern ist, Menschen bei solch langweiligen Aufgaben zu ersetzen. Lasst uns also Guix die Sache erledigen: Wir lassen uns die Paketdefinition eines R-Pakets mit den Informationen aus CRAN holen (was zu anderen ausgegeben wird, haben wir im Folgenden weggelassen):" + +#. type: example +#: doc/guix-cookbook.texi:1166 +#, no-wrap +msgid "" +"$ guix import cran --recursive walrus\n" +"\n" +msgstr "" +"$ guix import cran --recursive walrus\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1170 +#, no-wrap +msgid "" +"(define-public r-mc2d\n" +" ; ...\n" +" (license gpl2+)))\n" +"\n" +msgstr "" +"(define-public r-mc2d\n" +" ; …\n" +" (license gpl2+)))\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1174 +#, no-wrap +msgid "" +"(define-public r-jmvcore\n" +" ; ...\n" +" (license gpl2+)))\n" +"\n" +msgstr "" +"(define-public r-jmvcore\n" +" ; …\n" +" (license gpl2+)))\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1178 +#, no-wrap +msgid "" +"(define-public r-wrs2\n" +" ; ...\n" +" (license gpl3)))\n" +"\n" +msgstr "" +"(define-public r-wrs2\n" +" ; …\n" +" (license gpl3)))\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1207 +#, no-wrap +msgid "" +"(define-public r-walrus\n" +" (package\n" +" (name \"r-walrus\")\n" +" (version \"1.0.3\")\n" +" (source\n" +" (origin\n" +" (method url-fetch)\n" +" (uri (cran-uri \"walrus\" version))\n" +" (sha256\n" +" (base32\n" +" \"1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj\"))))\n" +" (build-system r-build-system)\n" +" (propagated-inputs\n" +" `((\"r-ggplot2\" ,r-ggplot2)\n" +" (\"r-jmvcore\" ,r-jmvcore)\n" +" (\"r-r6\" ,r-r6)\n" +" (\"r-wrs2\" ,r-wrs2)))\n" +" (home-page \"https://github.com/jamovi/walrus\")\n" +" (synopsis \"Robust Statistical Methods\")\n" +" (description\n" +" \"This package provides a toolbox of common robust statistical\n" +"tests, including robust descriptives, robust t-tests, and robust ANOVA.\n" +"It is also available as a module for 'jamovi' (see\n" +" for more information). Walrus is based on the\n" +"WRS2 package by Patrick Mair, which is in turn based on the scripts and\n" +"work of Rand Wilcox. These analyses are described in depth in the book\n" +"'Introduction to Robust Estimation & Hypothesis Testing'.\")\n" +" (license gpl3)))\n" +msgstr "" +"(define-public r-walrus\n" +" (package\n" +" (name \"r-walrus\")\n" +" (version \"1.0.3\")\n" +" (source\n" +" (origin\n" +" (method url-fetch)\n" +" (uri (cran-uri \"walrus\" version))\n" +" (sha256\n" +" (base32\n" +" \"1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj\"))))\n" +" (build-system r-build-system)\n" +" (propagated-inputs\n" +" `((\"r-ggplot2\" ,r-ggplot2)\n" +" (\"r-jmvcore\" ,r-jmvcore)\n" +" (\"r-r6\" ,r-r6)\n" +" (\"r-wrs2\" ,r-wrs2)))\n" +" (home-page \"https://github.com/jamovi/walrus\")\n" +" (synopsis \"Robust Statistical Methods\")\n" +" (description\n" +" \"This package provides a toolbox of common robust statistical\n" +"tests, including robust descriptives, robust t-tests, and robust ANOVA.\n" +"It is also available as a module for 'jamovi' (see\n" +" for more information). Walrus is based on the\n" +"WRS2 package by Patrick Mair, which is in turn based on the scripts and\n" +"work of Rand Wilcox. These analyses are described in depth in the book\n" +"'Introduction to Robust Estimation & Hypothesis Testing'.\")\n" +" (license gpl3)))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1211 +msgid "The recursive importer won't import packages for which Guix already has package definitions, except for the very first." +msgstr "Der rekursive Importer wird keine Pakete importieren, für die es in Guix bereits eine Paketdefinition gibt, außer dem Paket, mit dem er anfängt." + +#. type: Plain text +#: doc/guix-cookbook.texi:1216 +msgid "Not all applications can be packaged this way, only those relying on a select number of supported systems. Read about the full list of importers in the guix import section of the manual (@pxref{Invoking guix import,,, guix, GNU Guix Reference Manual})." +msgstr "Nicht für alle Anwendungen können auf diesem Weg Pakete erzeugt werden, nur für jene, die auf ausgewählten Systemen aufbauen. Im Handbuch können Sie Informationen über die vollständige Liste aller Importer bekommen (siehe @ref{Aufruf von guix import,,, guix.de, Referenzhandbuch zu GNU Guix})." + +#. type: subsubsection +#: doc/guix-cookbook.texi:1217 doc/guix-cookbook.texi:1218 +#, no-wrap +msgid "Automatic update" +msgstr "Automatisch aktualisieren" + +#. type: Plain text +#: doc/guix-cookbook.texi:1222 +msgid "Guix can be smart enough to check for updates on systems it knows. It can report outdated package definitions with" +msgstr "Guix ist klug genug, um verfügbare Aktualisierungen auf bekannten Systemen zu erkennen. Es kann über veraltete Paketdefinitionen Bericht erstatten, wenn man dies eingibt:" + +#. type: example +#: doc/guix-cookbook.texi:1225 +#, no-wrap +msgid "$ guix refresh hello\n" +msgstr "$ guix refresh hello\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1230 +msgid "In most cases, updating a package to a newer version requires little more than changing the version number and the checksum. Guix can do that automatically as well:" +msgstr "In den meisten Fällen muss man zur Aktualisierung auf eine neuere Version wenig mehr tun, als die Versionsnummer und die Prüfsumme ändern. Auch das kann mit Guix automatisiert werden:" + +#. type: example +#: doc/guix-cookbook.texi:1233 +#, no-wrap +msgid "$ guix refresh hello --update\n" +msgstr "$ guix refresh hello --update\n" + +#. type: subsubsection +#: doc/guix-cookbook.texi:1235 doc/guix-cookbook.texi:1236 +#, no-wrap +msgid "Inheritance" +msgstr "Vererbung" + +#. type: Plain text +#: doc/guix-cookbook.texi:1240 +msgid "If you've started browsing the existing package definitions, you might have noticed that a significant number of them have a @code{inherit} field:" +msgstr "Wenn Sie anfangen, bestehende Paketdefinitionen anzuschauen, könnte es Ihnen auffallen, dass viele von ihnen über ein @code{inherit}-Feld verfügen." + +#. type: lisp +#: doc/guix-cookbook.texi:1256 +#, no-wrap +msgid "" +"(define-public adwaita-icon-theme\n" +" (package (inherit gnome-icon-theme)\n" +" (name \"adwaita-icon-theme\")\n" +" (version \"3.26.1\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnome/sources/\" name \"/\"\n" +" (version-major+minor version) \"/\"\n" +" name \"-\" version \".tar.xz\"))\n" +" (sha256\n" +" (base32\n" +" \"17fpahgh5dyckgz7rwqvzgnhx53cx9kr2xw0szprc6bnqy977fi8\"))))\n" +" (native-inputs\n" +" `((\"gtk-encode-symbolic-svg\" ,gtk+ \"bin\")))))\n" +msgstr "" +"(define-public adwaita-icon-theme\n" +" (package (inherit gnome-icon-theme)\n" +" (name \"adwaita-icon-theme\")\n" +" (version \"3.26.1\")\n" +" (source (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"mirror://gnome/sources/\" name \"/\"\n" +" (version-major+minor version) \"/\"\n" +" name \"-\" version \".tar.xz\"))\n" +" (sha256\n" +" (base32\n" +" \"17fpahgh5dyckgz7rwqvzgnhx53cx9kr2xw0szprc6bnqy977fi8\"))))\n" +" (native-inputs\n" +" `((\"gtk-encode-symbolic-svg\" ,gtk+ \"bin\")))))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1261 +msgid "All unspecified fields are inherited from the parent package. This is very convenient to create alternative packages, for instance with different source, version or compilation options." +msgstr "Alle @emph{nicht} aufgeführten Felder werden vom Elternpaket geerbt. Das ist ziemlich praktisch, um alternative Pakete zu erzeugen, zum Beispiel solche mit geänderten Quellorten, Versionen oder Kompilierungsoptionen." + +#. type: subsection +#: doc/guix-cookbook.texi:1262 doc/guix-cookbook.texi:1263 +#, no-wrap +msgid "Getting help" +msgstr "Hilfe bekommen" + +#. type: Plain text +#: doc/guix-cookbook.texi:1269 +msgid "Sadly, some applications can be tough to package. Sometimes they need a patch to work with the non-standard filesystem hierarchy enforced by the store. Sometimes the tests won't run properly. (They can be skipped but this is not recommended.) Other times the resulting package won't be reproducible." +msgstr "Leider ist es für manche Anwendungen schwierig, Pakete zu schreiben. Manchmal brauchen sie einen Patch, um mit vom Standard abweichenden Dateisystemhierarchien klarzukommen, wie sie der Store erforderlich macht. Manchmal funktionieren die Tests nicht richtig. (Man kann sie überspringen, aber man sollte nicht.) Ein andermal ist das sich ergebende Paket nicht reproduzierbar." + +#. type: Plain text +#: doc/guix-cookbook.texi:1272 +msgid "Should you be stuck, unable to figure out how to fix any sort of packaging issue, don't hesitate to ask the community for help." +msgstr "Wenn Sie nicht weiterkommen, weil Sie nicht wissen, wie Sie ein Problem beim Paketschreiben lösen können, dann zögern Sie nicht, die Gemeinde um Hilfe zu bitten." + +#. type: Plain text +#: doc/guix-cookbook.texi:1274 +msgid "See the @uref{https://www.gnu.org/software/guix/contact/, Guix homepage} for information on the mailing lists, IRC, etc." +msgstr "Siehe die @uref{https://www.gnu.org/software/guix/contact/, Homepage von Guix} für Informationen, welche Mailing-Listen, IRC-Kanäle etc.@: bereitstehen." + +#. type: subsection +#: doc/guix-cookbook.texi:1275 doc/guix-cookbook.texi:1276 +#, no-wrap +msgid "Conclusion" +msgstr "Schlusswort" + +#. type: Plain text +#: doc/guix-cookbook.texi:1282 +msgid "This tutorial was a showcase of the sophisticated package management that Guix boasts. At this point we have mostly restricted this introduction to the @code{gnu-build-system} which is a core abstraction layer on which more advanced abstractions are based." +msgstr "Diese Anleitung hat einen Überblick über die fortgeschrittene Paketverwaltung gegeben, die Guix vorweist. Zu diesem Zeitpunkt haben wir diese Einführung größtenteils auf das @code{gnu-build-system} eingeschränkt, was eine zentrale Abstraktionsschicht darstellt, auf der weitere Abstraktionen aufbauen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1287 +msgid "Where do we go from here? Next we ought to dissect the innards of the build system by removing all abstractions, using the @code{trivial-build-system}: this should give us a thorough understanding of the process before investigating some more advanced packaging techniques and edge cases." +msgstr "Wie geht es nun weiter? Als Nächstes müssten wir das Erstellungssystem in seine Bestandteile zerlegen, um einen Einblick ganz ohne Abstraktionen zu bekommen. Das bedeutet, wir müssten das @code{trivial-build-system} analysieren. Dadurch sollte ein gründliches Verständnis des Prozesses vermittelt werden, bevor wir höher entwickelte Paketierungstechniken und Randfälle untersuchen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1290 +msgid "Other features worth exploring are the interactive editing and debugging capabilities of Guix provided by the Guile REPL@." +msgstr "Andere Funktionalitäten, die es wert sind, erkundet zu werden, sind Guix’ Funktionalitäten zum interaktiven Editieren und zur Fehlersuche, die die REPL von Guile darbietet." + +#. type: Plain text +#: doc/guix-cookbook.texi:1295 +msgid "Those fancy features are completely optional and can wait; now is a good time to take a well-deserved break. With what we've introduced here you should be well armed to package lots of programs. You can get started right away and hopefully we will see your contributions soon!" +msgstr "Diese eindrucksvollen Funktionalitäten sind völlig optional und können warten; jetzt ist die Zeit für eine wohlverdiente Pause. Mit dem Wissen, in das wir hier eingeführt haben, sollten Sie für das Paketieren vieler Programme gut gerüstet sein. Sie können gleich anfangen und hoffentlich bekommen wir bald Ihre Beiträge zu sehen!" + +#. type: subsection +#: doc/guix-cookbook.texi:1296 doc/guix-cookbook.texi:1297 +#, no-wrap +msgid "References" +msgstr "Literaturverzeichnis" + +#. type: itemize +#: doc/guix-cookbook.texi:1302 +msgid "The @uref{https://www.gnu.org/software/guix/manual/en/html_node/Defining-Packages.html, package reference in the manual}" +msgstr "Die @uref{https://guix.gnu.org/manual/de/html_node/Pakete-definieren.html, Paketreferenz im Handbuch}" + +#. type: itemize +#: doc/guix-cookbook.texi:1305 +msgid "@uref{https://gitlab.com/pjotrp/guix-notes/blob/master/HACKING.org, Pjotr’s hacking guide to GNU Guix}" +msgstr "@uref{https://gitlab.com/pjotrp/guix-notes/blob/master/HACKING.org, Pjotr’s Hacking-Leitfaden für GNU Guix}" + +#. type: itemize +#: doc/guix-cookbook.texi:1308 +msgid "@uref{https://www.gnu.org/software/guix/guix-ghm-andreas-20130823.pdf, ``GNU Guix: Package without a scheme!''}, by Andreas Enge" +msgstr "@uref{https://www.gnu.org/software/guix/guix-ghm-andreas-20130823.pdf, „GNU Guix: Package without a scheme!“} von Andreas Enge" + +#. type: Plain text +#: doc/guix-cookbook.texi:1317 +msgid "Guix offers a flexible language for declaratively configuring your Guix System. This flexibility can at times be overwhelming. The purpose of this chapter is to demonstrate some advanced configuration concepts." +msgstr "Guix stellt eine flexible Sprache bereit, um Ihr „Guix System“ auf deklarative Weise zu konfigurieren. Diese Flexibilität kann einen manchmal überwältigen. Dieses Kapitel hat den Zweck, einige fortgeschrittene Konfigurationskonzepte vorzuzeigen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1320 +msgid "@pxref{System Configuration,,, guix, GNU Guix Reference Manual} for a complete reference." +msgstr "Siehe @ref{Systemkonfiguration,,, guix.de, Referenzhandbuch zu GNU Guix} für eine vollständige Referenz." + +#. type: menuentry +#: doc/guix-cookbook.texi:1323 +msgid "Creating and using a custom Linux kernel on Guix System." +msgstr "Einen eigenen Linux-Kernel auf Guix System erzeugen und benutzen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1335 +msgid "Guix is, at its core, a source based distribution with substitutes (@pxref{Substitutes,,, guix, GNU Guix Reference Manual}), and as such building packages from their source code is an expected part of regular package installations and upgrades. Given this starting point, it makes sense that efforts are made to reduce the amount of time spent compiling packages, and recent changes and upgrades to the building and distribution of substitutes continues to be a topic of discussion within Guix." +msgstr "Im Kern ist Guix eine quellcodebasierte Distribution mit Substituten (siehe @ref{Substitute,,, guix.de, Referenzhandbuch zu GNU Guix}), daher ist das Erstellen von Paketen aus ihrem Quellcode heraus genauso vorgesehen wie die normale Installation und Aktualisierung von Paketen. Von diesem Standpunkt ist es sinnvoll, zu versuchen, den Zeitaufwand für das Kompilieren von Paketen zu senken, und kürzliche Neuerungen sowie Verbesserungen beim Erstellen und Verteilen von Substituten bleiben ein Diskussionsthema innerhalb von Guix." + +#. type: Plain text +#: doc/guix-cookbook.texi:1341 +msgid "The kernel, while not requiring an overabundance of RAM to build, does take a rather long time on an average machine. The official kernel configuration, as is the case with many GNU/Linux distributions, errs on the side of inclusiveness, and this is really what causes the build to take such a long time when the kernel is built from source." +msgstr "Der Kernel braucht zwar keine übermäßigen Mengen an Arbeitsspeicher beim Erstellen, jedoch jede Menge Zeit auf einer durchschnittlichen Maschine. Die offizielle Konfiguration des Kernels umfasst, wie bei anderen GNU/Linux-Distributionen auch, besser zu viel als zu wenig. Das ist der eigentliche Grund, warum seine Erstellung so lange dauert, wenn man den Kernel aus dem Quellcode heraus erstellt." + +#. type: Plain text +#: doc/guix-cookbook.texi:1346 +msgid "The Linux kernel, however, can also just be described as a regular old package, and as such can be customized just like any other package. The procedure is a little bit different, although this is primarily due to the nature of how the package definition is written." +msgstr "Man kann den Linux-Kernel jedoch auch als ganz normales Paket beschreiben, das genau wie jedes andere Paket angepasst werden kann. Der Vorgang ist ein klein wenig anders, aber das liegt hauptsächlich an der Art, wie die Paketdefinition geschrieben ist." + +#. type: Plain text +#: doc/guix-cookbook.texi:1349 +msgid "The @code{linux-libre} kernel package definition is actually a procedure which creates a package." +msgstr "Die @code{linux-libre}-Kernelpaketdefinition ist tatsächlich eine Prozedur, die ein Paket liefert." + +#. type: lisp +#: doc/guix-cookbook.texi:1361 +#, no-wrap +msgid "" +"(define* (make-linux-libre version hash supported-systems\n" +" #:key\n" +" ;; A function that takes an arch and a variant.\n" +" ;; See kernel-config for an example.\n" +" (extra-version #f)\n" +" (configuration-file #f)\n" +" (defconfig \"defconfig\")\n" +" (extra-options %default-extra-linux-options)\n" +" (patches (list %boot-logo-patch)))\n" +" ...)\n" +msgstr "" +"(define* (make-linux-libre version hash supported-systems\n" +" #:key\n" +" ;; A function that takes an arch and a variant.\n" +" ;; See kernel-config for an example.\n" +" (extra-version #f)\n" +" (configuration-file #f)\n" +" (defconfig \"defconfig\")\n" +" (extra-options %default-extra-linux-options)\n" +" (patches (list %boot-logo-patch)))\n" +" ...)\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1365 +msgid "The current @code{linux-libre} package is for the 5.1.x series, and is declared like this:" +msgstr "Das momentane @code{linux-libre}-Paket zielt ab auf die 5.1.x-Serie und ist wie folgt deklariert:" + +#. type: lisp +#: doc/guix-cookbook.texi:1373 +#, no-wrap +msgid "" +"(define-public linux-libre\n" +" (make-linux-libre %linux-libre-version\n" +" %linux-libre-hash\n" +" '(\"x86_64-linux\" \"i686-linux\" \"armhf-linux\" \"aarch64-linux\")\n" +" #:patches %linux-libre-5.1-patches\n" +" #:configuration-file kernel-config))\n" +msgstr "" +"(define-public linux-libre\n" +" (make-linux-libre %linux-libre-version\n" +" %linux-libre-hash\n" +" '(\"x86_64-linux\" \"i686-linux\" \"armhf-linux\" \"aarch64-linux\")\n" +" #:patches %linux-libre-5.1-patches\n" +" #:configuration-file kernel-config))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1382 +msgid "Any keys which are not assigned values inherit their default value from the @code{make-linux-libre} definition. When comparing the two snippets above, you may notice that the code comment in the first doesn't actually refer to the @code{#:extra-version} keyword; it is actually for @code{#:configuration-file}. Because of this, it is not actually easy to include a custom kernel configuration from the definition, but don't worry, there are other ways to work with what we do have." +msgstr "Alle Schlüssel, denen kein Wert zugewiesen wird, erben ihren Vorgabewert von der Definition von @code{make-linux-libre}. Wenn Sie die beiden Schnipsel oben vergleichen, könnte Ihnen auffallen, dass sich der Code-Kommentar in ersterem tatsächlich @emph{nicht} auf das @code{#:extra-version}-Schlüsselwort bezieht, sondern auf @code{#:configuration-file}. Deswegen ist es nicht so leicht, aus der Definition heraus eine eigene Kernel-Konfiguration anhand der Definition zu schreiben, aber keine Sorge, es gibt andere Möglichkeiten, um mit dem zu arbeiten, was uns gegeben wurde." + +#. type: Plain text +#: doc/guix-cookbook.texi:1388 +msgid "There are two ways to create a kernel with a custom kernel configuration. The first is to provide a standard @file{.config} file during the build process by including an actual @file{.config} file as a native input to our custom kernel. The following is a snippet from the custom @code{'configure} phase of the @code{make-linux-libre} package definition:" +msgstr "Es gibt zwei Möglichkeiten, einen Kernel mit eigener Kernel-Konfiguration zu erzeugen. Die erste ist, eine normale @file{.config}-Datei als native Eingabe zu unserem angepassten Kernel hinzuzufügen. Im Folgenden sehen Sie ein Schnipsel aus der angepassten @code{'configure}-Phase der @code{make-linux-libre}-Paketdefinition:" + +#. type: lisp +#: doc/guix-cookbook.texi:1392 +#, no-wrap +msgid "" +"(let ((build (assoc-ref %standard-phases 'build))\n" +" (config (assoc-ref (or native-inputs inputs) \"kconfig\")))\n" +"\n" +msgstr "" +"(let ((build (assoc-ref %standard-phases 'build))\n" +" (config (assoc-ref (or native-inputs inputs) \"kconfig\")))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:1400 +#, no-wrap +msgid "" +" ;; Use a custom kernel configuration file or a default\n" +" ;; configuration file.\n" +" (if config\n" +" (begin\n" +" (copy-file config \".config\")\n" +" (chmod \".config\" #o666))\n" +" (invoke \"make\" ,defconfig))\n" +msgstr "" +" ;; Use a custom kernel configuration file or a default\n" +" ;; configuration file.\n" +" (if config\n" +" (begin\n" +" (copy-file config \".config\")\n" +" (chmod \".config\" #o666))\n" +" (invoke \"make\" ,defconfig))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1405 +msgid "Below is a sample kernel package. The @code{linux-libre} package is nothing special and can be inherited from and have its fields overridden like any other package:" +msgstr "Nun folgt ein Beispiel-Kernel-Paket. Das @code{linux-libre}-Paket ist nicht anders als andere Pakete und man kann von ihm erben und seine Felder ersetzen wie bei jedem anderen Paket." + +#. type: lisp +#: doc/guix-cookbook.texi:1414 +#, no-wrap +msgid "" +"(define-public linux-libre/E2140\n" +" (package\n" +" (inherit linux-libre)\n" +" (native-inputs\n" +" `((\"kconfig\" ,(local-file \"E2140.config\"))\n" +" ,@@(alist-delete \"kconfig\"\n" +" (package-native-inputs linux-libre))))))\n" +msgstr "" +"(define-public linux-libre/E2140\n" +" (package\n" +" (inherit linux-libre)\n" +" (native-inputs\n" +" `((\"kconfig\" ,(local-file \"E2140.config\"))\n" +" ,@@(alist-delete \"kconfig\"\n" +" (package-native-inputs linux-libre))))))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1421 +msgid "In the same directory as the file defining @code{linux-libre-E2140} is a file named @file{E2140.config}, which is an actual kernel configuration file. The @code{defconfig} keyword of @code{make-linux-libre} is left blank here, so the only kernel configuration in the package is the one which was included in the @code{native-inputs} field." +msgstr "Im selben Verzeichnis wie die Datei, die @code{linux-libre-E2140} definiert, befindet sich noch eine Datei namens @file{E2140.config}, bei der es sich um eine richtige Kernel-Konfigurationsdatei handelt. Das Schlüsselwort @code{defconfig} von @code{make-linux-libre} wird hier leer gelassen, so dass die einzige Kernel-Konfiguration im Paket die im @code{native-inputs}-Feld ist." + +#. type: Plain text +#: doc/guix-cookbook.texi:1426 +msgid "The second way to create a custom kernel is to pass a new value to the @code{extra-options} keyword of the @code{make-linux-libre} procedure. The @code{extra-options} keyword works with another function defined right below it:" +msgstr "Die zweite Möglichkeit, einen eigenen Kernel zu erzeugen, ist, einen neuen Wert an das @code{extra-options}-Schlüsselwort der @code{make-linux-libre}-Prozedur zu übergeben. Das @code{extra-options}-Schlüsselwort wird zusammen mit einer anderen, direkt darunter definierten Funktion benutzt:" + +#. type: lisp +#: doc/guix-cookbook.texi:1442 +#, no-wrap +msgid "" +"(define %default-extra-linux-options\n" +" `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html\n" +" (\"CONFIG_DEVPTS_MULTIPLE_INSTANCES\" . #t)\n" +" ;; Modules required for initrd:\n" +" (\"CONFIG_NET_9P\" . m)\n" +" (\"CONFIG_NET_9P_VIRTIO\" . m)\n" +" (\"CONFIG_VIRTIO_BLK\" . m)\n" +" (\"CONFIG_VIRTIO_NET\" . m)\n" +" (\"CONFIG_VIRTIO_PCI\" . m)\n" +" (\"CONFIG_VIRTIO_BALLOON\" . m)\n" +" (\"CONFIG_VIRTIO_MMIO\" . m)\n" +" (\"CONFIG_FUSE_FS\" . m)\n" +" (\"CONFIG_CIFS\" . m)\n" +" (\"CONFIG_9P_FS\" . m)))\n" +"\n" +msgstr "" +"(define %default-extra-linux-options\n" +" `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html\n" +" (\"CONFIG_DEVPTS_MULTIPLE_INSTANCES\" . #t)\n" +" ;; Modules required for initrd:\n" +" (\"CONFIG_NET_9P\" . m)\n" +" (\"CONFIG_NET_9P_VIRTIO\" . m)\n" +" (\"CONFIG_VIRTIO_BLK\" . m)\n" +" (\"CONFIG_VIRTIO_NET\" . m)\n" +" (\"CONFIG_VIRTIO_PCI\" . m)\n" +" (\"CONFIG_VIRTIO_BALLOON\" . m)\n" +" (\"CONFIG_VIRTIO_MMIO\" . m)\n" +" (\"CONFIG_FUSE_FS\" . m)\n" +" (\"CONFIG_CIFS\" . m)\n" +" (\"CONFIG_9P_FS\" . m)))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:1453 +#, no-wrap +msgid "" +"(define (config->string options)\n" +" (string-join (map (match-lambda\n" +" ((option . 'm)\n" +" (string-append option \"=m\"))\n" +" ((option . #t)\n" +" (string-append option \"=y\"))\n" +" ((option . #f)\n" +" (string-append option \"=n\")))\n" +" options)\n" +" \"\\n\"))\n" +msgstr "" +"(define (config->string options)\n" +" (string-join (map (match-lambda\n" +" ((option . 'm)\n" +" (string-append option \"=m\"))\n" +" ((option . #t)\n" +" (string-append option \"=y\"))\n" +" ((option . #f)\n" +" (string-append option \"=n\")))\n" +" options)\n" +" \"\\n\"))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1456 +msgid "And in the custom configure script from the `make-linux-libre` package:" +msgstr "Und im eigenen configure-Skript des „make-linux-libre“-Pakets:" + +#. type: lisp +#: doc/guix-cookbook.texi:1464 +#, no-wrap +msgid "" +";; Appending works even when the option wasn't in the\n" +";; file. The last one prevails if duplicated.\n" +"(let ((port (open-file \".config\" \"a\"))\n" +" (extra-configuration ,(config->string extra-options)))\n" +" (display extra-configuration port)\n" +" (close-port port))\n" +"\n" +msgstr "" +";; Appending works even when the option wasn't in the\n" +";; file. The last one prevails if duplicated.\n" +"(let ((port (open-file \".config\" \"a\"))\n" +" (extra-configuration ,(config->string extra-options)))\n" +" (display extra-configuration port)\n" +" (close-port port))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:1466 +#, no-wrap +msgid "(invoke \"make\" \"oldconfig\"))))\n" +msgstr "(invoke \"make\" \"oldconfig\"))))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1471 +msgid "So by not providing a configuration-file the @file{.config} starts blank, and then we write into it the collection of flags that we want. Here's another custom kernel:" +msgstr "Indem wir also kein „configuration-file“ mitgeben, ist @file{.config} anfangs leer und danach schreiben wir dort die Sammlung der gewünschten Optionen („Flags“) hinein. Hier ist noch ein eigener Kernel:" + +#. type: lisp +#: doc/guix-cookbook.texi:1479 +#, no-wrap +msgid "" +"(define %macbook41-full-config\n" +" (append %macbook41-config-options\n" +" %filesystems\n" +" %efi-support\n" +" %emulation\n" +" (@@@@ (gnu packages linux) %default-extra-linux-options)))\n" +"\n" +msgstr "" +"(define %macbook41-full-config\n" +" (append %macbook41-config-options\n" +" %filesystems\n" +" %efi-support\n" +" %emulation\n" +" (@@@@ (gnu packages linux) %default-extra-linux-options)))\n" +"\n" + +#. type: lisp +#: doc/guix-cookbook.texi:1489 +#, no-wrap +msgid "" +"(define-public linux-libre-macbook41\n" +" ;; XXX: Access the internal 'make-linux-libre' procedure, which is\n" +" ;; private and unexported, and is liable to change in the future.\n" +" ((@@@@ (gnu packages linux) make-linux-libre) (@@@@ (gnu packages linux) %linux-libre-version)\n" +" (@@@@ (gnu packages linux) %linux-libre-hash)\n" +" '(\"x86_64-linux\")\n" +" #:extra-version \"macbook41\"\n" +" #:patches (@@@@ (gnu packages linux) %linux-libre-5.1-patches)\n" +" #:extra-options %macbook41-config-options))\n" +msgstr "" +"(define-public linux-libre-macbook41\n" +" ;; XXX: Auf die interne 'make-linux-libre'-Prozedur zugreifen, welche privat\n" +" ;; ist und nicht exportiert, desweiteren kann sie sich in Zukunft ändern.\n" +" ((@@@@ (gnu packages linux) make-linux-libre) (@@@@ (gnu packages linux) %linux-libre-version)\n" +" (@@@@ (gnu packages linux) %linux-libre-hash)\n" +" '(\"x86_64-linux\")\n" +" #:extra-version \"macbook41\"\n" +" #:patches (@@@@ (gnu packages linux) %linux-libre-5.1-patches)\n" +" #:extra-options %macbook41-config-options))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1496 +msgid "In the above example @code{%filesystems} is a collection of flags enabling different filesystem support, @code{%efi-support} enables EFI support and @code{%emulation} enables a x86_64-linux machine to act in 32-bit mode also. @code{%default-extra-linux-options} are the ones quoted above, which had to be added in since they were replaced in the @code{extra-options} keyword." +msgstr "Im obigen Beispiel ist @code{%filesystems} eine Sammlung solcher „Flags“, mit denen Unterstützung für verschiedene Dateisysteme aktiviert wird, @code{%efi-support} aktiviert Unterstützung für EFI und @code{%emulation} ermöglicht es einer x86_64-linux-Maschine, auch im 32-Bit-Modus zu arbeiten. Die @code{%default-extra-linux-options} sind die oben zitierten, die wieder hinzugefügt werden mussten, weil sie durch das @code{extra-options}-Schlüsselwort ersetzt worden waren." + +#. type: Plain text +#: doc/guix-cookbook.texi:1505 +msgid "This all sounds like it should be doable, but how does one even know which modules are required for a particular system? Two places that can be helpful in trying to answer this question is the @uref{https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Kernel, Gentoo Handbook} and the @uref{https://www.kernel.org/doc/html/latest/admin-guide/README.html?highlight=localmodconfig, documentation from the kernel itself}. From the kernel documentation, it seems that @code{make localmodconfig} is the command we want." +msgstr "All das klingt machbar, aber woher weiß man überhaupt, welche Module für ein bestimmtes System nötig sind? Es gibt zwei hilfreiche Anlaufstellen, zum einen das @uref{https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Kernel, Gentoo-Handbuch}, zum anderen die @uref{https://www.kernel.org/doc/html/latest/admin-guide/README.html?highlight=localmodconfig, Dokumentation des Kernels selbst}. Aus der Kernel-Dokumentation erfahren wir, dass @code{make localmodconfig} der Befehl sein könnte, den wir wollen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1508 +msgid "In order to actually run @code{make localmodconfig} we first need to get and unpack the kernel source code:" +msgstr "Um @code{make localmodconfig} auch tatsächlich ausführen zu können, müssen wir zunächst den Quellcode des Kernels holen und entpacken:" + +#. type: example +#: doc/guix-cookbook.texi:1511 +#, no-wrap +msgid "tar xf $(guix build linux-libre --source)\n" +msgstr "tar xf $(guix build linux-libre --source)\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1518 +msgid "Once inside the directory containing the source code run @code{touch .config} to create an initial, empty @file{.config} to start with. @code{make localmodconfig} works by seeing what you already have in @file{.config} and letting you know what you're missing. If the file is blank then you're missing everything. The next step is to run:" +msgstr "Sobald wir im Verzeichnis mit dem Quellcode sind, führen Sie @code{touch .config} aus, um mit einer ersten, leeren @file{.config} anzufangen. @code{make localmodconfig} funktioniert so, dass angeschaut wird, was bereits in Ihrer @file{.config} steht, und Ihnen mitgeteilt wird, was Ihnen noch fehlt. Wenn die Datei leer bleibt, fehlt eben alles. Der nächste Schritt ist, das hier auszuführen:" + +#. type: example +#: doc/guix-cookbook.texi:1521 +#, no-wrap +msgid "guix environment linux-libre -- make localmodconfig\n" +msgstr "guix environment linux-libre -- make localmodconfig\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1526 +msgid "and note the output. Do note that the @file{.config} file is still empty. The output generally contains two types of warnings. The first start with \"WARNING\" and can actually be ignored in our case. The second read:" +msgstr "und uns die Ausgabe davon anzuschauen. Beachten Sie, dass die @file{.config}-Datei noch immer leer ist. Die Ausgabe enthält im Allgemeinen zwei Arten von Warnungen. Am Anfang der ersten steht „WARNING“ und in unserem Fall können wir sie tatsächlich ignorieren. Bei der zweiten heißt es:" + +#. type: example +#: doc/guix-cookbook.texi:1529 +#, no-wrap +msgid "module pcspkr did not have configs CONFIG_INPUT_PCSPKR\n" +msgstr "module pcspkr did not have configs CONFIG_INPUT_PCSPKR\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1534 +msgid "For each of these lines, copy the @code{CONFIG_XXXX_XXXX} portion into the @file{.config} in the directory, and append @code{=m}, so in the end it looks like this:" +msgstr "Für jede solche Zeile kopieren Sie den @code{CONFIG_XXXX_XXXX}-Teil in die @file{.config} im selben Verzeichnis und hängen @code{=m} an, damit es am Ende so aussieht:" + +#. type: example +#: doc/guix-cookbook.texi:1538 +#, no-wrap +msgid "" +"CONFIG_INPUT_PCSPKR=m\n" +"CONFIG_VIRTIO=m\n" +msgstr "" +"CONFIG_INPUT_PCSPKR=m\n" +"CONFIG_VIRTIO=m\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1547 +msgid "After copying all the configuration options, run @code{make localmodconfig} again to make sure that you don't have any output starting with ``module''. After all of these machine specific modules there are a couple more left that are also needed. @code{CONFIG_MODULES} is necessary so that you can build and load modules separately and not have everything built into the kernel. @code{CONFIG_BLK_DEV_SD} is required for reading from hard drives. It is possible that there are other modules which you will need." +msgstr "Nachdem Sie alle Konfigurationsoptionen kopiert haben, führen Sie noch einmal @code{make localmodconfig} aus, um sicherzugehen, dass es keine Ausgaben mehr gibt, deren erstes Wort „module“ ist. Zusätzlich zu diesen maschinenspezifischen Modulen gibt es noch ein paar mehr, die Sie auch brauchen. @code{CONFIG_MODULES} brauchen Sie, damit Sie Module getrennt erstellen und laden können und nicht alles im Kernel eingebaut sein muss. Sie brauchen auch @code{CONFIG_BLK_DEV_SD}, um von Festplatten lesen zu können. Möglicherweise gibt es auch sonst noch Module, die Sie brauchen werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1551 +msgid "This post does not aim to be a guide to configuring your own kernel however, so if you do decide to build a custom kernel you'll have to seek out other guides to create a kernel which is just right for your needs." +msgstr "Die Absicht hinter dem hier Niedergeschriebenen ist @emph{nicht}, eine Anleitung zum Konfigurieren eines eigenen Kernels zu sein. Wenn Sie also vorhaben, den Kernel an Ihre ganz eigenen Bedürfnisse anzupassen, werden Sie in anderen Anleitungen fündig." + +#. type: Plain text +#: doc/guix-cookbook.texi:1559 +msgid "The second way to setup the kernel configuration makes more use of Guix's features and allows you to share configuration segments between different kernels. For example, all machines using EFI to boot have a number of EFI configuration flags that they need. It is likely that all the kernels will share a list of filesystems to support. By using variables it is easier to see at a glance what features are enabled and to make sure you don't have features in one kernel but missing in another." +msgstr "Die zweite Möglichkeit, die Kernel-Konfiguration einzurichten, benutzt mehr von Guix’ Funktionalitäten und sie ermöglicht es Ihnen, Gemeinsamkeiten von Konfigurationen zwischen verschiedenen Kernels zu teilen. Zum Beispiel wird eine Reihe von EFI-Konfigurationsoptionen von allen Maschinen, die EFI benutzen, benötigt. Wahrscheinlich haben all diese Kernel eine Schnittmenge zu unterstützender Dateisysteme. Indem Sie Variable benutzen, können Sie leicht auf einen Schlag sehen, welche Funktionalitäten aktiviert sind, und gleichzeitig sicherstellen, dass Ihnen nicht Funktionalitäten des einen Kernels im anderen fehlen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1564 +msgid "Left undiscussed however, is Guix's initrd and its customization. It is likely that you'll need to modify the initrd on a machine using a custom kernel, since certain modules which are expected to be built may not be available for inclusion into the initrd." +msgstr "Was wir hierbei nicht erläutert haben, ist, wie Guix’ initrd und dessen Anpassung funktioniert. Wahrscheinlich werden Sie auf einer Maschine mit eigenem Kernel die initrd verändern müssen, weil sonst versucht wird, bestimmte Module in die initrd einzubinden, die Sie gar nicht erstellen haben lassen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1574 +msgid "Guix is a functional package manager that offers many features beyond what more traditional package managers can do. To the uninitiated, those features might not have obvious use cases at first. The purpose of this chapter is to demonstrate some advanced package management concepts." +msgstr "Guix ist ein funktionales Paketverwaltungsprogramm, das weit mehr Funktionalitäten als traditionelle Paketverwalter anbietet. Für nicht Eingeweihte sind deren Anwendungsfälle nicht sofort ersichtlich. Dieses Kapitel ist dazu da, manche fortgeschrittenen Paketverwaltungskonzepte zu demonstrieren." + +#. type: Plain text +#: doc/guix-cookbook.texi:1577 +msgid "@pxref{Package Management,,, guix, GNU Guix Reference Manual} for a complete reference." +msgstr "Siehe @ref{Paketverwaltung,,, guix.de, Referenzhandbuch zu GNU Guix} für eine vollständige Referenz." + +#. type: section +#: doc/guix-cookbook.texi:1580 doc/guix-cookbook.texi:1582 +#: doc/guix-cookbook.texi:1583 +#, no-wrap +msgid "Guix Profiles in Practice" +msgstr "Guix-Profile in der Praxis" + +#. type: menuentry +#: doc/guix-cookbook.texi:1580 +msgid "Strategies for multiple profiles and manifests." +msgstr "Strategien für mehrere Profile und Manifeste." + +#. type: Plain text +#: doc/guix-cookbook.texi:1588 +msgid "Guix provides a very useful feature that may be quite foreign to newcomers: @emph{profiles}. They are a way to group package installations together and all users on the same system are free to use as many profiles as they want." +msgstr "Guix gibt uns eine sehr nützliche Funktionalität, die Neuankömmlingen sehr fremd sein dürfte: @emph{Profile}. Mit ihnen kann man Paketinstallationen zusammenfassen und jeder Benutzer desselben Systems kann so viele davon anlegen, wie sie oder er möchte." + +#. type: Plain text +#: doc/guix-cookbook.texi:1593 +msgid "Whether you're a developer or not, you may find that multiple profiles bring you great power and flexibility. While they shift the paradigm somewhat compared to @emph{traditional package managers}, they are very convenient to use once you've understood how to set them up." +msgstr "Ob Sie ein Entwickler sind oder nicht, Sie dürften feststellen, dass mehrere Profile ein mächtiges Werkzeug sind, das Sie flexibler macht. Zwar ist es ein gewisser Paradigmenwechsel verglichen mit @emph{traditioneller Paketverwaltung}, doch sind sie sehr praktisch, sobald man im Umgang mit ihnen den Dreh ’raushat." + +#. type: Plain text +#: doc/guix-cookbook.texi:1599 +msgid "If you are familiar with Python's @samp{virtualenv}, you can think of a profile as a kind of universal @samp{virtualenv} that can hold any kind of software whatsoever, not just Python software. Furthermore, profiles are self-sufficient: they capture all the runtime dependencies which guarantees that all programs within a profile will always work at any point in time." +msgstr "Wenn Ihnen Pythons @samp{virtualenv} vertraut ist, können Sie sich ein Profil als eine Art universelles @samp{virtualenv} vorstellen, das jede Art von Software enthalten kann und nicht nur Python-Software. Desweiteren sind Profile selbstversorgend: Sie schließen alle Laufzeitabhängigkeiten ein und garantieren somit, dass alle Programme innerhalb eines Profils stets zu jeder Zeit funktionieren werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1601 +msgid "Multiple profiles have many benefits:" +msgstr "Mehrere Profile bieten viele Vorteile:" + +#. type: itemize +#: doc/guix-cookbook.texi:1605 +msgid "Clean semantic separation of the various packages a user needs for different contexts." +msgstr "Klare semantische Trennung der verschiedenen Pakete, die ein Nutzer für verschiedene Kontexte braucht." + +#. type: itemize +#: doc/guix-cookbook.texi:1609 +msgid "Multiple profiles can be made available into the environment either on login or within a dedicated shell." +msgstr "Mehrere Profile können in der Umgebung verfügbar gemacht werden, entweder beim Anmelden oder in einer eigenen Shell." + +#. type: itemize +#: doc/guix-cookbook.texi:1613 +msgid "Profiles can be loaded on demand. For instance, the user can use multiple shells, each of them running different profiles." +msgstr "Profile können bei Bedarf geladen werden. Zum Beispiel kann der Nutzer mehrere Unter-Shells benutzen, von denen jede ein anderes Profil ausführt." + +#. type: itemize +#: doc/guix-cookbook.texi:1618 +msgid "Isolation: Programs from one profile will not use programs from the other, and the user can even install different versions of the same programs to the two profiles without conflict." +msgstr "Isolierung: Programme aus dem einen Profil werden keine Programme aus dem anderen benutzen, und der Nutzer kann sogar verschiedene Versionen desselben Programms in die zwei Profile installieren, ohne dass es zu Konflikten kommt." + +#. type: itemize +#: doc/guix-cookbook.texi:1622 +msgid "Deduplication: Profiles share dependencies that happens to be the exact same. This makes multiple profiles storage-efficient." +msgstr "Deduplizierung: Profile teilen sich Abhängigkeiten, wenn sie genau gleich sind. Dadurch sind mehrere Profile speichereffizient." + +#. type: itemize +#: doc/guix-cookbook.texi:1630 +msgid "Reproducible: when used with declarative manifests, a profile can be fully specified by the Guix commit that was active when it was set up. This means that the exact same profile can be @uref{https://guix.gnu.org/blog/2018/multi-dimensional-transactions-and-rollbacks-oh-my/, set up anywhere and anytime}, with just the commit information. See the section on @ref{Reproducible profiles}." +msgstr "Reproduzierbar: Wenn man dafür deklarative Manifeste benutzt, kann ein Profil allein durch den bei dessen Einrichtung aktiven Guix-Commit eindeutig spezifiziert werden. Das bedeutet, dass man genau dasselbe Profil @uref{https://guix.gnu.org/blog/2018/multi-dimensional-transactions-and-rollbacks-oh-my/, jederzeit und überall einrichten kann} und man dafür nur die Commit-Informationen braucht. Siehe den Abschnitt über @ref{Reproduzierbare Profile}." + +#. type: itemize +#: doc/guix-cookbook.texi:1634 +msgid "Easier upgrades and maintenance: Multiple profiles make it easy to keep package listings at hand and make upgrades completely friction-less." +msgstr "Leichtere Aktualisierung und Wartung: Mit mehreren Profilen ist es ein Leichtes, eine Liste von Paketen zur Hand zu haben und Aktualisierungen völlig reibungslos ablaufen zu lassen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1637 +msgid "Concretely, here follows some typical profiles:" +msgstr "Konkret wären diese hier typische Profile:" + +#. type: itemize +#: doc/guix-cookbook.texi:1641 +msgid "The dependencies of a project you are working on." +msgstr "Die Abhängigkeiten des Projekts, an dem Sie arbeiten." + +#. type: itemize +#: doc/guix-cookbook.texi:1644 +msgid "Your favourite programming language libraries." +msgstr "Die Bibliotheken Ihrer Lieblingsprogrammiersprache." + +#. type: itemize +#: doc/guix-cookbook.texi:1647 +msgid "Laptop-specific programs (like @samp{powertop}) that you don't need on a desktop." +msgstr "Programme nur für Laptops (wie @samp{powertop}), für die Sie auf einem „Desktop“-Rechner keine Verwendung haben." + +#. type: itemize +#: doc/guix-cookbook.texi:1651 +msgid "@TeX{}live (this one can be really useful when you need to install just one package for this one document you've just received over email)." +msgstr "@TeX{}live (das kann wirklich praktisch sein, wenn Sie nur ein einziges Paket für dieses eine Dokument installieren müssen, das Ihnen jemand in einer E-Mail geschickt hat)." + +#. type: itemize +#: doc/guix-cookbook.texi:1654 +msgid "Games." +msgstr "Spiele." + +#. type: Plain text +#: doc/guix-cookbook.texi:1657 +msgid "Let's dive in the set up!" +msgstr "Tauchen wir ein in deren Einrichtung!" + +#. type: subsection +#: doc/guix-cookbook.texi:1658 doc/guix-cookbook.texi:1659 +#, no-wrap +msgid "Basic setup with manifests" +msgstr "Grundlegende Einrichtung über Manifeste" + +#. type: Plain text +#: doc/guix-cookbook.texi:1663 +msgid "A Guix profile can be set up @emph{via} a so-called @emph{manifest specification} that looks like this:" +msgstr "Ein Guix-Profil kann über eine sogenannte @emph{Manifest-Spezifikation} eingerichtet werden. Das sieht etwa so aus:" + +#. type: lisp +#: doc/guix-cookbook.texi:1673 +#, no-wrap +msgid "" +"(specifications->manifest\n" +" '(\"package-1\"\n" +" ;; Version 1.3 of package-2.\n" +" \"package-2@@1.3\"\n" +" ;; The \"lib\" output of package-3.\n" +" \"package-3:lib\"\n" +" ; ...\n" +" \"package-N\"))\n" +msgstr "" +"(specifications->manifest\n" +" '(\"paket-1\"\n" +" ;; Version 1.3 von paket-2.\n" +" \"paket-2@@1.3\"\n" +" ;; Die \"lib\"-Ausgabe von paket-3.\n" +" \"paket-3:lib\"\n" +" ; …\n" +" \"paket-N\"))\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1677 +msgid "@pxref{Invoking guix package,,, guix, GNU Guix Reference Manual}, for the syntax details." +msgstr "Siehe @ref{Aufruf von guix package,,, guix.de, Referenzhandbuch zu GNU Guix}, für Details zur Syntax." + +#. type: Plain text +#: doc/guix-cookbook.texi:1679 +msgid "We can create a manifest specification per profile and install them this way:" +msgstr "Wir können eine Manifestspezifikation für jedes Profil schreiben und es auf diese Weise installieren:" + +#. type: example +#: doc/guix-cookbook.texi:1684 +#, no-wrap +msgid "" +"GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles\n" +"mkdir -p \"$GUIX_EXTRA_PROFILES\"/my-project # if it does not exist yet\n" +"guix package --manifest=/path/to/guix-my-project-manifest.scm --profile=\"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" +msgstr "" +"GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles\n" +"mkdir -p \"$GUIX_EXTRA_PROFILES\"/my-project # wenn es noch nicht existiert\n" +"guix package --manifest=/pfad/zu/guix-my-project-manifest.scm --profile=\"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1688 +msgid "Here we set an arbitrary variable @samp{GUIX_EXTRA_PROFILES} to point to the directory where we will store our profiles in the rest of this article." +msgstr "Hierbei haben wir eine beliebig benannte Variable @samp{GUIX_EXTRA_PROFILES} eingerichtet, die auf das Verzeichnis verweist, wo wir unsere Profile für den Rest dieses Artikels speichern wollen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1694 +msgid "Placing all your profiles in a single directory, with each profile getting its own sub-directory, is somewhat cleaner. This way, each sub-directory will contain all the symlinks for precisely one profile. Besides, \"looping over profiles\" becomes obvious from any programming language (e.g. a shell script) by simply looping over the sub-directories of @samp{$GUIX_EXTRA_PROFILES}." +msgstr "Wenn Sie all Ihre Profile in ein einzelnes Verzeichnis legen und jedes Profil ein Unterverzeichnis darin bekommt, ist die Organisation etwas verständlicher. Dadurch wird jedes Unterverzeichnis all die symbolischen Verknüpfungen für genau ein Profil enthalten. Außerdem wird es von jeder Programmiersprache aus einfach, eine „Schleife über die Profile“ zu schreiben (z.B.@: in einem Shell-Skript), indem Sie es einfach die Unterverzeichnisse von @samp{$GUIX_EXTRA_PROFILES} in einer Schleife durchlaufen lassen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1696 +msgid "Note that it's also possible to loop over the output of" +msgstr "Beachten Sie, dass man auch eine Schleife über die Ausgabe von" + +#. type: example +#: doc/guix-cookbook.texi:1699 +#, no-wrap +msgid "guix package --list-profiles\n" +msgstr "guix package --list-profiles\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1702 +msgid "although you'll probably have to filter out @samp{~/.config/guix/current}." +msgstr "schreiben kann, obwohl Sie dabei wahrscheinlich @samp{~/.config/guix/current} herausfiltern wollen würden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1704 +msgid "To enable all profiles on login, add this to your @samp{~/.bash_profile} (or similar):" +msgstr "Um bei der Anmeldung alle Profile zu aktivieren, fügen Sie dies in Ihre @samp{~/.bash_profile} ein (oder etwas Entsprechendes):" + +#. type: example +#: doc/guix-cookbook.texi:1714 +#, no-wrap +msgid "" +"for i in $GUIX_EXTRA_PROFILES/*; do\n" +" profile=$i/$(basename \"$i\")\n" +" if [ -f \"$profile\"/etc/profile ]; then\n" +" GUIX_PROFILE=\"$profile\"\n" +" . \"$GUIX_PROFILE\"/etc/profile\n" +" fi\n" +" unset profile\n" +"done\n" +msgstr "" +"for i in $GUIX_EXTRA_PROFILES/*; do\n" +" profile=$i/$(basename \"$i\")\n" +" if [ -f \"$profile\"/etc/profile ]; then\n" +" GUIX_PROFILE=\"$profile\"\n" +" . \"$GUIX_PROFILE\"/etc/profile\n" +" fi\n" +" unset profile\n" +"done\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1719 +msgid "Note to Guix System users: the above reflects how your default profile @samp{~/.guix-profile} is activated from @samp{/etc/profile}, that latter being loaded by @samp{~/.bashrc} by default." +msgstr "Eine Anmerkung für Nutzer von „Guix System“: Obiger Code entspricht dem, wie Ihr voreingestelltes Profil @samp{~/.guix-profile} durch @samp{/etc/profile} aktiviert wird, was nach Vorgabe durch @samp{~/.bashrc} geladen wird." + +#. type: Plain text +#: doc/guix-cookbook.texi:1721 +msgid "You can obviously choose to only enable a subset of them:" +msgstr "Selbstverständlich können Sie sich auch dafür entscheiden, nur eine Teilmenge zu aktivieren:" + +#. type: example +#: doc/guix-cookbook.texi:1731 +#, no-wrap +msgid "" +"for i in \"$GUIX_EXTRA_PROFILES\"/my-project-1 \"$GUIX_EXTRA_PROFILES\"/my-project-2; do\n" +" profile=$i/$(basename \"$i\")\n" +" if [ -f \"$profile\"/etc/profile ]; then\n" +" GUIX_PROFILE=\"$profile\"\n" +" . \"$GUIX_PROFILE\"/etc/profile\n" +" fi\n" +" unset profile\n" +"done\n" +msgstr "" +"for i in \"$GUIX_EXTRA_PROFILES\"/my-project-1 \"$GUIX_EXTRA_PROFILES\"/my-project-2; do\n" +" profile=$i/$(basename \"$i\")\n" +" if [ -f \"$profile\"/etc/profile ]; then\n" +" GUIX_PROFILE=\"$profile\"\n" +" . \"$GUIX_PROFILE\"/etc/profile\n" +" fi\n" +" unset profile\n" +"done\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1735 +msgid "When a profile is off, it's straightforward to enable it for an individual shell without \"polluting\" the rest of the user session:" +msgstr "Wenn ein Profil abgeschaltet ist, lässt es sich mit Leichtigkeit für eine bestimmte Shell aktivieren, ohne die restliche Benutzersitzung zu „verschmutzen“:" + +#. type: example +#: doc/guix-cookbook.texi:1738 +#, no-wrap +msgid "GUIX_PROFILE=\"path/to/my-project\" ; . \"$GUIX_PROFILE\"/etc/profile\n" +msgstr "GUIX_PROFILE=\"pfad/zu/my-project\" ; . \"$GUIX_PROFILE\"/etc/profile\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1745 +msgid "The key to enabling a profile is to @emph{source} its @samp{etc/profile} file. This file contains shell code that exports the right environment variables necessary to activate the software contained in the profile. It is built automatically by Guix and meant to be sourced. It contains the same variables you would get if you ran:" +msgstr "Der Schlüssel dazu, wie man ein Profil aktiviert, ist dessen @samp{etc/profile}-Datei mit @command{source} zu laden. Diese Datei enthält einige Shell-Befehle, um die für das Aktivieren der Software im Profil nötigen Umgebungsvariablen zu exportieren. Die Datei wird durch Guix automatisch erzeugt, um mit @command{source} eingelesen zu werden. Sie enthält dieselben Variablen, die Sie nach Ausführung dieses Befehls bekämen:" + +#. type: example +#: doc/guix-cookbook.texi:1748 +#, no-wrap +msgid "guix package --search-paths=prefix --profile=$my_profile\"\n" +msgstr "guix package --search-paths=prefix --profile=$my_profile\"\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1752 +msgid "Once again, see (@pxref{Invoking guix package,,, guix, GNU Guix Reference Manual}) for the command line options." +msgstr "Siehe auch hier das @ref{Aufruf von guix package,,, guix.de, Referenzhandbuch zu GNU Guix} für die Befehlszeilenoptionen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1754 +msgid "To upgrade a profile, simply install the manifest again:" +msgstr "Um ein Profil zu aktualisieren, installieren Sie das Manifest einfach nochmal:" + +#. type: example +#: doc/guix-cookbook.texi:1757 +#, no-wrap +msgid "guix package -m /path/to/guix-my-project-manifest.scm -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" +msgstr "guix package -m /pfad/zu/guix-my-project-manifest.scm -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1763 +msgid "To upgrade all profiles, it's easy enough to loop over them. For instance, assuming your manifest specifications are stored in @samp{~/.guix-manifests/guix-$profile-manifest.scm}, with @samp{$profile} being the name of the profile (e.g. \"project1\"), you could do the following in Bourne shell:" +msgstr "Um alle Profile zu aktualisieren, genügt es, sie in einer Schleife durchlaufen zu lassen. Nehmen wir zum Beispiel an, Ihre Manifestspezifikationen befinden sich in @samp{~/.guix-manifests/guix-$profile-manifest.scm}, wobei @samp{$profile} der Name des Profils ist (z.B.@: „projekt1“), dann könnten Sie in der Bourne-Shell Folgendes tun:" + +#. type: example +#: doc/guix-cookbook.texi:1768 +#, no-wrap +msgid "" +"for profile in \"$GUIX_EXTRA_PROFILES\"/*; do\n" +" guix package --profile=\"$profile\" --manifest=\"$HOME/.guix-manifests/guix-$profile-manifest.scm\"\n" +"done\n" +msgstr "" +"for profile in \"$GUIX_EXTRA_PROFILES\"/*; do\n" +" guix package --profile=\"$profile\" --manifest=\"$HOME/.guix-manifests/guix-$profile-manifest.scm\"\n" +"done\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1771 +msgid "Each profile has its own generations:" +msgstr "Jedes Profil verfügt über seine eigenen Generationen:" + +#. type: example +#: doc/guix-cookbook.texi:1774 +#, no-wrap +msgid "guix package -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project --list-generations\n" +msgstr "guix package -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project --list-generations\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1777 +msgid "You can roll-back to any generation of a given profile:" +msgstr "Sie können es auf jede Generation zurücksetzen:" + +#. type: example +#: doc/guix-cookbook.texi:1780 +#, no-wrap +msgid "guix package -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project --switch-generations=17\n" +msgstr "guix package -p \"$GUIX_EXTRA_PROFILES\"/my-project/my-project --switch-generations=17\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1784 +msgid "Finally, if you want to switch to a profile without inheriting from the current environment, you can activate it from an empty shell:" +msgstr "Zu guter Letzt ist es möglich, zu einem Profil zu wechseln ohne die aktuelle Umgebung zu erben, indem Sie es aus einer leeren Shell heraus aktivieren:" + +#. type: example +#: doc/guix-cookbook.texi:1788 +#, no-wrap +msgid "" +"env -i $(which bash) --login --noprofile --norc\n" +". my-project/etc/profile\n" +msgstr "" +"env -i $(which bash) --login --noprofile --norc\n" +". my-project/etc/profile\n" + +#. type: subsection +#: doc/guix-cookbook.texi:1790 doc/guix-cookbook.texi:1791 +#, no-wrap +msgid "Required packages" +msgstr "Die nötigen Pakete" + +#. type: Plain text +#: doc/guix-cookbook.texi:1796 +msgid "Activating a profile essentially boils down to exporting a bunch of environmental variables. This is the role of the @samp{etc/profile} within the profile." +msgstr "Das Aktivieren eines Profils bedeutet im Grunde, dass eine Menge Umgebungsvariabler exportiert wird. Diese Rolle fällt der @samp{etc/profile}-Datei innerhalb des Profils zu." + +#. type: emph{#1} +#: doc/guix-cookbook.texi:1799 +msgid "Note: Only the environmental variables of the packages that consume them will be set." +msgstr "Anmerkung: Nur diejenigen Umgebungsvariablen der sie gebrauchenden Pakete werden gesetzt." + +#. type: Plain text +#: doc/guix-cookbook.texi:1803 +msgid "For instance, @samp{MANPATH} won't be set if there is no consumer application for man pages within the profile. So if you need to transparently access man pages once the profile is loaded, you've got two options:" +msgstr "Zum Beispiel wird kein @samp{MANPATH} gesetzt sein, wenn keine Anwendung im Profil diese „Man-Pages“ (Handbuchseiten) gebraucht. Wenn Sie also transparenten Zugriff auf Handbuchseiten brauchen, nachdem das Profil geladen wurde, dann gibt es zwei Möglichkeiten:" + +#. type: itemize +#: doc/guix-cookbook.texi:1807 +msgid "Either export the variable manually, e.g." +msgstr "Entweder Sie exportieren die Variablen von Hand, z.B." + +#. type: example +#: doc/guix-cookbook.texi:1809 +#, no-wrap +msgid "export MANPATH=/path/to/profile$@{MANPATH:+:@}$MANPATH\n" +msgstr "export MANPATH=/path/to/profile$@{MANPATH:+:@}$MANPATH\n" + +#. type: itemize +#: doc/guix-cookbook.texi:1813 +msgid "Or include @samp{man-db} to the profile manifest." +msgstr "Oder Sie schreiben @samp{man-db} in das Profilmanifest hinein." + +#. type: Plain text +#: doc/guix-cookbook.texi:1817 +msgid "The same is true for @samp{INFOPATH} (you can install @samp{info-reader}), @samp{PKG_CONFIG_PATH} (install @samp{pkg-config}), etc." +msgstr "Das Gleiche gilt für @samp{INFOPATH} (Sie können @samp{info-reader} installieren), @samp{PKG_CONFIG_PATH} (installieren Sie @samp{pkg-config}), etc." + +#. type: subsection +#: doc/guix-cookbook.texi:1818 doc/guix-cookbook.texi:1819 +#, no-wrap +msgid "Default profile" +msgstr "Vorgabeprofil" + +#. type: Plain text +#: doc/guix-cookbook.texi:1822 +msgid "What about the default profile that Guix keeps in @samp{~/.guix-profile}?" +msgstr "Was ist mit dem Standardprofil, das Guix in @samp{~/.guix-profile} aufbewahrt?" + +#. type: Plain text +#: doc/guix-cookbook.texi:1825 +msgid "You can assign it the role you want. Typically you would install the manifest of the packages you want to use all the time." +msgstr "Sie können ihm die Rolle zuweisen, die Sie wollen. Normalerweise würden Sie das Manifest derjenigen Pakete installieren, die Sie ständig benutzen möchten." + +#. type: Plain text +#: doc/guix-cookbook.texi:1829 +msgid "Alternatively, you could keep it \"manifest-less\" for throw-away packages that you would just use for a couple of days. This way makes it convenient to run" +msgstr "Alternativ können Sie es ohne Manifest für Wegwerfpakete benutzen, die Sie nur ein paar Tage lang benutzen wollen. Das macht es leicht," + +#. type: example +#: doc/guix-cookbook.texi:1833 +#, no-wrap +msgid "" +"guix install package-foo\n" +"guix upgrade package-bar\n" +msgstr "" +"guix install paket-foo\n" +"guix upgrade paket-bar\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1836 +msgid "without having to specify the path to a profile." +msgstr "auszuführen ohne den Pfad zu einem Profil festzulegen." + +#. type: subsection +#: doc/guix-cookbook.texi:1837 doc/guix-cookbook.texi:1838 +#, no-wrap +msgid "The benefits of manifests" +msgstr "Der Vorteil von Manifesten" + +#. type: Plain text +#: doc/guix-cookbook.texi:1842 +msgid "Manifests are a convenient way to keep your package lists around and, say, to synchronize them across multiple machines using a version control system." +msgstr "Manifeste sind eine bequeme Art, Ihre Paketlisten zur Hand zu haben und diese z.B.@: über mehrere Maschinen hinweg in einem Versionskontrollsystem zu synchronisieren." + +#. type: Plain text +#: doc/guix-cookbook.texi:1846 +msgid "A common complaint about manifests is that they can be slow to install when they contain large number of packages. This is especially cumbersome when you just want get an upgrade for one package within a big manifest." +msgstr "Eine oft gehörte Beschwerde über Manifeste ist, dass es lange dauert, sie zu installieren, wenn sie viele Pakete enthalten. Das ist besonders hinderlich, wenn Sie nur ein einziges Paket in ein großes Manifest installieren möchten." + +#. type: Plain text +#: doc/guix-cookbook.texi:1851 +msgid "This is one more reason to use multiple profiles, which happen to be just perfect to break down manifests into multiple sets of semantically connected packages. Using multiple, small profiles provides more flexibility and usability." +msgstr "Das ist ein weiteres Argument dafür, mehrere Profile zu benutzen, denn es stellt sich heraus, dass dieses Vorgehen perfekt für das Aufbrechen von Manifesten in mehrere Mengen semantisch verbundener Pakete geeignet ist. Mit mehreren, kleinen Profilen haben Sie mehr Flexibilität und Benutzerfreundlichkeit." + +#. type: Plain text +#: doc/guix-cookbook.texi:1853 +msgid "Manifests come with multiple benefits. In particular, they ease maintenance:" +msgstr "Manifeste haben mehrere Vorteile. Insbesondere erleichtern sie die Wartung." + +#. type: itemize +#: doc/guix-cookbook.texi:1861 +msgid "When a profile is set up from a manifest, the manifest itself is self-sufficient to keep a \"package listing\" around and reinstall the profile later or on a different system. For ad-hoc profiles, we would need to generate a manifest specification manually and maintain the package versions for the packages that don't use the default version." +msgstr "Wenn ein Profil aus einem Manifest heraus eingerichtet wird, ist das Manifest selbst genug, um eine Liste der Pakete zur Verfügung zu haben und das Profil später auf einem anderen System zu installieren. Bei @i{ad-hoc}-Profilen müssten wir hingegen eine Manifestspezifikation von Hand schreiben und uns um die Paketversionen derjenigen Pakete kümmern, die nicht die vorgegebene Version verwenden." + +#. type: itemize +#: doc/guix-cookbook.texi:1866 +msgid "@code{guix package --upgrade} always tries to update the packages that have propagated inputs, even if there is nothing to do. Guix manifests remove this problem." +msgstr "Bei @code{guix package --upgrade} wird immer versucht, die Pakete zu aktualisieren, die propagierte Eingaben haben, selbst wenn es nichts zu tun gibt. Mit Guix-Manifesten fällt dieses Problem weg." + +#. type: itemize +#: doc/guix-cookbook.texi:1872 +msgid "When partially upgrading a profile, conflicts may arise (due to diverging dependencies between the updated and the non-updated packages) and they can be annoying to resolve manually. Manifests remove this problem altogether since all packages are always upgraded at once." +msgstr "Wenn man nur Teile eines Profils aktualisiert, kann es zu Konflikten kommen (weil die Abhängigkeiten zwischen aktualisierten und nicht aktualisierten Paketen voneinander abweichen), und es kann mühsam sein, diese Konflikte von Hand aufzulösen. Manifeste haben kein solches Problem, weil alle Pakete immer gleichzeitig aktualisiert werden." + +#. type: itemize +#: doc/guix-cookbook.texi:1878 +msgid "As mentioned above, manifests allow for reproducible profiles, while the imperative @code{guix install}, @code{guix upgrade}, etc. do not, since they produce different profiles every time even when they hold the same packages. See @uref{https://issues.guix.gnu.org/issue/33285, the related discussion on the matter}." +msgstr "Wie zuvor erwähnt, gewähren einem Manifeste reproduzierbare Profile, während die imperativen @code{guix install}, @code{guix upgrade}, etc.@: das nicht tun, weil sie jedes Mal ein anderes Profil ergeben, obwohl sie dieselben Pakete enthalten. Siehe die @uref{https://issues.guix.gnu.org/issue/33285, dieses Thema betreffende Diskussion}." + +#. type: itemize +#: doc/guix-cookbook.texi:1886 +msgid "Manifest specifications are usable by other @samp{guix} commands. For example, you can run @code{guix weather -m manifest.scm} to see how many substitutes are available, which can help you decide whether you want to try upgrading today or wait a while. Another example: you can run @code{guix pack -m manifest.scm} to create a pack containing all the packages in the manifest (and their transitive references)." +msgstr "Manifestspezifikationen können von anderen @samp{guix}-Befehlen benutzt werden. Zum Beispiel können Sie @code{guix weather -m manifest.scm} ausführen, um zu sehen, wieviele Substitute verfügbar sind, was Ihnen bei der Entscheidung helfen kann, ob Sie heute schon eine Aktualisierung durchführen oder lieber noch eine Weile warten möchten. Ein anderes Beispiel: Sie können mit @code{guix pack -m manifest.scm} ein Bündel erzeugen, das alle Pakete im Manifest enthält (mitsamt derer transitiven Referenzen)." + +#. type: itemize +#: doc/guix-cookbook.texi:1890 +msgid "Finally, manifests have a Scheme representation, the @samp{} record type. They can be manipulated in Scheme and passed to the various Guix @uref{https://en.wikipedia.org/wiki/Api, APIs}." +msgstr "Zuletzt haben Manifeste auch eine Repräsentation in Scheme, nämlich den @samp{}-Verbundstyp. Sie können in Scheme verarbeitet werden und an die verschiedenen @uref{https://de.wikipedia.org/wiki/Programmierschnittstelle, Guix-Programmierschnittstellen (APIs)} übergeben werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1898 +msgid "It's important to understand that while manifests can be used to declare profiles, they are not strictly equivalent: profiles have the side effect that they \"pin\" packages in the store, which prevents them from being garbage-collected (@pxref{Invoking guix gc,,, guix, GNU Guix Reference Manual}) and ensures that they will still be available at any point in the future." +msgstr "Es ist wichtig, dass Sie verstehen, dass Manifeste zwar benutzt werden können, um Profile zu deklarieren, sie aber nicht ganz dasselbe wie Profile sind: Profile haben Nebenwirkungen. Sie setzen Pakete im Store fest, so dass sie nicht vom Müllsammler geholt werden (siehe @ref{Aufruf von guix gc,,, guix.de, Referenzhandbuch zu GNU Guix}) und stellen sicher, dass sie auch in Zukunft jederzeit verfügbar sein werden." + +#. type: Plain text +#: doc/guix-cookbook.texi:1900 +msgid "Let's take an example:" +msgstr "Schauen wir uns ein Beispiel an:" + +#. type: enumerate +#: doc/guix-cookbook.texi:1906 +msgid "We have an environment for hacking on a project for which there isn't a Guix package yet. We build the environment using a manifest, and then run @code{guix environment -m manifest.scm}. So far so good." +msgstr "Wir haben eine Umgebung, in der wir an einem Projekt hacken können, für das es noch kein Guix-Paket gibt. Wir richten die Umgebung mit einem Manifest ein und führen dann @code{guix environment -m manifest.scm} aus. So weit so gut." + +#. type: enumerate +#: doc/guix-cookbook.texi:1912 +msgid "Many weeks pass and we have run a couple of @code{guix pull} in the mean time. Maybe a dependency from our manifest has been updated; or we may have run @code{guix gc} and some packages needed by our manifest have been garbage-collected." +msgstr "Nach vielen Wochen haben wir in der Zwischenzeit schon ein paarmal @code{guix pull} laufen lassen. Vielleicht wurde eine Abhängigkeit aus unserem Manifest aktualisiert oder wir könnten @code{guix gc} ausgeführt haben, so dass manche Pakete, die von unserem Manifest gebraucht würden, vom Müllsammler geholt worden sind." + +#. type: enumerate +#: doc/guix-cookbook.texi:1917 +msgid "Eventually, we set to work on that project again, so we run @code{guix environment -m manifest.scm}. But now we have to wait for Guix to build and install stuff!" +msgstr "Schließlich fangen wir wieder an, an dem Projekt zu arbeiten, also fÜhren wir @code{guix environment -m manifest.scm} aus. Aber jetzt müssen wir warten, bis Guix lauter Dinge erstellt und installiert hat!" + +#. type: Plain text +#: doc/guix-cookbook.texi:1923 +msgid "Ideally, we could spare the rebuild time. And indeed we can, all we need is to install the manifest to a profile and use @code{GUIX_PROFILE=/the/profile; . \"$GUIX_PROFILE\"/etc/profile} as explained above: this guarantees that our hacking environment will be available at all times." +msgstr "Ideal wäre es, wenn wir uns die Zeit für die Neuerstellung sparen könnten. Und das können wir auch: Alles, was wir brauchen, ist, das Manifest in ein Profil zu installieren und @code{GUIX_PROFILE=/das/profil; . \"$GUIX_PROFILE\"/etc/profile} aufzurufen, wie oben erklärt. Dadurch haben wir die Garantie, dass unsere Hacking-Umgebung jederzeit zur Verfügung steht." + +#. type: Plain text +#: doc/guix-cookbook.texi:1926 +msgid "@emph{Security warning:} While keeping old profiles around can be convenient, keep in mind that outdated packages may not have received the latest security fixes." +msgstr "@emph{Sicherheitswarnung:} Obwohl es angenehm sein kann, alte Profile zu behalten, sollten Sie daran denken, dass veraltete Pakete @emph{nicht} über die neuesten Sicherheitsbehebungen verfügen." + +#. type: subsection +#: doc/guix-cookbook.texi:1927 doc/guix-cookbook.texi:1928 +#, no-wrap +msgid "Reproducible profiles" +msgstr "Reproduzierbare Profile" + +#. type: Plain text +#: doc/guix-cookbook.texi:1931 +msgid "To reproduce a profile bit-for-bit, we need two pieces of information:" +msgstr "Um ein Profil Bit für Bit nachzubilden, brauchen wir zweierlei Informationen:" + +#. type: itemize +#: doc/guix-cookbook.texi:1935 +msgid "a manifest," +msgstr "ein Manifest und" + +#. type: itemize +#: doc/guix-cookbook.texi:1937 +msgid "a Guix channel specification." +msgstr "eine Kanalspezifikation für Guix." + +#. type: Plain text +#: doc/guix-cookbook.texi:1941 +msgid "Indeed, manifests alone might not be enough: different Guix versions (or different channels) can produce different outputs for a given manifest." +msgstr "Tatsächlich kann es vorkommen, dass ein Manifest allein nicht genug ist: Verschiedene Versionen von Guix (oder andere Kanäle) können beim selben Manifest zu verschiedenen Ausgaben führen." + +#. type: Plain text +#: doc/guix-cookbook.texi:1945 +msgid "You can output the Guix channel specification with @samp{guix describe --format=channels}. Save this to a file, say @samp{channel-specs.scm}." +msgstr "Sie können sich die Guix-Kanalspezifikationen mit @samp{guix describe --format=channels} ausgeben lassen. Speichern Sie sie in eine Datei ab, sagen wir @samp{channel-specs.scm}." + +#. type: Plain text +#: doc/guix-cookbook.texi:1948 +msgid "On another computer, you can use the channel specification file and the manifest to reproduce the exact same profile:" +msgstr "Auf einem anderen Rechner können Sie die Kanalspezifikationsdatei und das Manifest benutzen, um genau dasselbe Profil zu reproduzieren:" + +#. type: example +#: doc/guix-cookbook.texi:1952 +#, no-wrap +msgid "" +"GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles\n" +"GUIX_EXTRA=$HOME/.guix-extra\n" +"\n" +msgstr "" +"GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles\n" +"GUIX_EXTRA=$HOME/.guix-extra\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1955 +#, no-wrap +msgid "" +"mkdir \"$GUIX_EXTRA\"/my-project\n" +"guix pull --channels=channel-specs.scm --profile \"$GUIX_EXTRA/my-project/guix\"\n" +"\n" +msgstr "" +"mkdir \"$GUIX_EXTRA\"/my-project\n" +"guix pull --channels=channel-specs.scm --profile \"$GUIX_EXTRA/my-project/guix\"\n" +"\n" + +#. type: example +#: doc/guix-cookbook.texi:1958 +#, no-wrap +msgid "" +"mkdir -p \"$GUIX_EXTRA_PROFILES/my-project\"\n" +"\"$GUIX_EXTRA\"/my-project/guix/bin/guix package --manifest=/path/to/guix-my-project-manifest.scm --profile=\"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" +msgstr "" +"mkdir -p \"$GUIX_EXTRA_PROFILES/my-project\"\n" +"\"$GUIX_EXTRA\"/my-project/guix/bin/guix package --manifest=/path/to/guix-my-project-manifest.scm --profile=\"$GUIX_EXTRA_PROFILES\"/my-project/my-project\n" + +#. type: Plain text +#: doc/guix-cookbook.texi:1962 +msgid "It's safe to delete the Guix channel profile you've just installed with the channel specification, the project profile does not depend on it." +msgstr "Es kann nichts Schlimmes passieren, wenn Sie das Guix-Kanalprofil, das Sie eben aus der Kanalspezifikation erstellt haben, löschen, denn das Projektprofil hängt davon nicht ab." + +#. type: Plain text +#: doc/guix-cookbook.texi:1974 +msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes. Without this work, Guix would not exist." +msgstr "Guix baut auf dem @uref{https://nixos.org/nix/, Nix-Paketverwaltungsprogramm} auf, das von Eelco Dolstra entworfen und entwickelt wurde, mit Beiträgen von anderen Leuten (siehe die Datei @file{nix/AUTHORS} in Guix). Nix hat für die funktionale Paketverwaltung die Pionierarbeit geleistet und noch nie dagewesene Funktionalitäten vorangetrieben wie transaktionsbasierte Paketaktualisierungen und die Rücksetzbarkeit selbiger, eigene Paketprofile für jeden Nutzer und referenziell transparente Erstellungsprozesse. Ohne diese Arbeit gäbe es Guix nicht.<" + +#. type: Plain text +#: doc/guix-cookbook.texi:1977 +msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix." +msgstr "Die Nix-basierten Software-Distributionen Nixpkgs und NixOS waren auch eine Inspiration für Guix." + +#. type: Plain text +#: doc/guix-cookbook.texi:1983 +msgid "GNU@tie{}Guix itself is a collective work with contributions from a number of people. See the @file{AUTHORS} file in Guix for more information on these fine people. The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the infrastructure, providing artwork and themes, making suggestions, and more---thank you!" +msgstr "GNU@tie{}Guix ist selbst das Produkt kollektiver Arbeit mit Beiträgen durch eine Vielzahl von Leuten. Siehe die Datei @file{AUTHORS} in Guix für mehr Informationen, wer diese wunderbaren Menschen sind. In der Datei @file{THANKS} finden Sie eine Liste der Leute, die uns geholfen haben, indem Sie Fehler gemeldet, sich um unsere Infrastruktur gekümmert, künstlerische Arbeit und schön gestaltete Themen beigesteuert, Vorschläge gemacht und noch vieles mehr getan haben — vielen Dank!" + +#. type: Plain text +#: doc/guix-cookbook.texi:1986 +msgid "This document includes adapted sections from articles that have previously been published on the Guix blog at @uref{https://guix.gnu.org/blog}." +msgstr "Dieses Dokument enthält angepasste Abschnitte aus Einträgen, die zuvor auf dem Blog von Guix unter @uref{https://guix.gnu.org/blog} veröffentlicht wurden." + +#. type: cindex +#: doc/guix-cookbook.texi:1991 +#, no-wrap +msgid "license, GNU Free Documentation License" +msgstr "Lizenz, GNU-Lizenz für freie Dokumentation" + +#. type: include +#: doc/guix-cookbook.texi:1992 +#, no-wrap +msgid "fdl-1.3.texi" +msgstr "fdl-1.3.texi" + +#~ msgid "Learn more about build systems in" +#~ msgstr "Sie erfahren mehr über Erstellungssysteme in" + +#~ msgid "@uref{https://www.gnu.org/software/guix/manual/en/html_node/Build-Systems.html#Build-Systems, the manual, section 4.2 Build systems}," +#~ msgstr "@uref{https://guix.gnu.org/manual/de/html_node/Erstellungssysteme.html#Erstellungssysteme, dem Handbuch, Abschnitt 6.3 Erstellungssysteme}," diff --git a/po/doc/local.mk b/po/doc/local.mk index f1a52615c1..27b9e1f3b5 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -23,7 +23,8 @@ DOC_PO_FILES= \ %D%/guix-manual.ru.po \ %D%/guix-manual.zh_CN.po -DOC_COOKBOOK_PO_FILES= +DOC_COOKBOOK_PO_FILES= \ + %D%/guix-manual.de.po EXTRA_DIST = \ %D%/guix-manual.pot \ -- cgit v1.2.3 From db9979e7f9a8f94885ce593d78fe02de6dd71717 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 14 Feb 2020 17:59:18 +0100 Subject: gnu: Add emacs-persist. * gnu/packages/emacs-xyz.scm (emacs-persist): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5c4db0f7b0..f632bdd6ff 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2020 Robert Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -21455,3 +21456,24 @@ (define-public emacs-auto-dictionary-mode language. Auto-dictionary then sets @code{ispell-dictionary} to use the detected language.") (license license:gpl2+))) + +(define-public emacs-persist + (package + (name "emacs-persist") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "persist-" version ".tar")) + (sha256 + (base32 "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/persist.html") + (synopsis "Persist variables between Emacs sessions") + (description + "This package provides variables which persist across sessions. +Values are stored in a directory in @code{user-emacs-directory}, using +one file per value. This makes it easy to delete or remove unused +variables.") + (license license:gpl3+))) -- cgit v1.2.3 From 3dd311e3a059131ef245417106d4fb659222ef3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 11:48:50 +0100 Subject: bootstrap: Fix typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bootstrap: Substitute ‘guix-cookbook’ for copy/pasted ‘guix-manual’. Reported-by: jetomit on #guix --- bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index c9e7a084a1..a47269d87f 100755 --- a/bootstrap +++ b/bootstrap @@ -16,7 +16,7 @@ for lang in ${langs}; do fi done langs=`find po/doc -type f -name 'guix-cookbook*.po' \ - | sed -e 's,guix-manual\.,,' \ + | sed -e 's,guix-cookbook\.,,' \ | xargs -n 1 -I{} basename {} .po` for lang in ${langs}; do if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then -- cgit v1.2.3 From 9900eb1cbb4f50cd39f3ca00e98621fc388a3a0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 16:42:05 +0100 Subject: gnu: xpdf: Update home page. * gnu/packages/pdf.scm (xpdf)[home-page]: Use new (HTTPS) domain. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 13cc384204..173e39a12b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -316,7 +316,7 @@ (define-public xpdf (description "Xpdf is a viewer for Portable Document Format (PDF) files.") (license license:gpl3) ; or gpl2, but not gpl2+ - (home-page "http://www.foolabs.com/xpdf/"))) + (home-page "https://www.xpdfreader.com/"))) (define-public zathura-cb (package -- cgit v1.2.3 From 04761fcc1ac1d6f08a0b63b0a5322de1d0c8ebce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 16:42:47 +0100 Subject: gnu: xpdf: Update to 4.02. * gnu/packages/pdf.scm (xpdf): Update to 4.02. --- gnu/packages/pdf.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 173e39a12b..34a3fba042 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -272,13 +272,14 @@ (define-public libharu (define-public xpdf (package (name "xpdf") - (version "3.04") - (source (origin - (method url-fetch) - (uri (string-append "ftp://ftp.foolabs.com/pub/xpdf/xpdf-" - version ".tar.gz")) - (sha256 (base32 - "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i")))) + (version "4.02") + (source + (origin + (method url-fetch) + (uri (string-append "https://xpdfreader-dl.s3.amazonaws.com/xpdf-" + version "4.02.tar.gz")) + (sha256 + (base32 "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i")))) (build-system gnu-build-system) (inputs `(("freetype" ,freetype) ("gs-fonts" ,gs-fonts) @@ -292,8 +293,8 @@ (define-public xpdf ("libpng" ,libpng) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; there is no check target - #:parallel-build? #f ; build fails randomly on 8-way machines + `(#:tests? #f ; there is no check target + #:parallel-build? #f ; build fails randomly on 8-way machines #:configure-flags (list (string-append "--with-freetype2-includes=" (assoc-ref %build-inputs "freetype") @@ -315,7 +316,7 @@ (define-public xpdf (synopsis "Viewer for PDF files based on the Motif toolkit") (description "Xpdf is a viewer for Portable Document Format (PDF) files.") - (license license:gpl3) ; or gpl2, but not gpl2+ + (license license:gpl3) ; or gpl2, but not gpl2+ (home-page "https://www.xpdfreader.com/"))) (define-public zathura-cb -- cgit v1.2.3 From 364873b508a852579005f90ff8644122f9365568 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 17:12:19 +0100 Subject: gnu: git: Update to 2.25.1. * gnu/packages/version-control.scm (git): Update to 2.25.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e2a06dee59..8335e6c576 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -149,14 +149,14 @@ (define-public git (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.25.0") + (version "2.25.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60")))) + "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -169,7 +169,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "1gf8b1k6i4dlwskwq7dd2vz9bzc3m1qnknj9daq2vp39vmxpg5nk")))) + "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From e04dd2d6d14c7d3c096754fe08a852fc80bd23ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:42:17 +0100 Subject: gnu: slib: Use HTTPS home page. * gnu/packages/scheme.scm (slib)[home-page]: Use HTTPS. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index c891a77a18..66af3fba98 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -694,7 +694,7 @@ (define-public slib (assoc-ref outputs "out")))))))) (native-inputs `(("unzip" ,unzip) ("texinfo" ,texinfo))) - (home-page "http://people.csail.mit.edu/jaffer/SLIB.html") + (home-page "https://people.csail.mit.edu/jaffer/SLIB.html") (synopsis "Compatibility and utility library for Scheme") (description "SLIB is a portable Scheme library providing compatibility and utility functions for all standard Scheme implementations.") -- cgit v1.2.3 From 7969789efe964fe715371e4acee6a915d4987c02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:44:05 +0100 Subject: gnu: rsnapshot: Use HTTPS home page. * gnu/packages/backup.scm (rsnapshot)[home-page]: Use HTTPS. --- gnu/packages/backup.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 00a7bcc70f..9d8d984cb2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -451,7 +451,7 @@ (define-public rsnapshot (inputs `(("perl" ,perl) ("rsync" ,rsync))) - (home-page "http://rsnapshot.org") + (home-page "https://rsnapshot.org") (synopsis "Deduplicating snapshot backup utility based on rsync") (description "rsnapshot is a file system snapshot utility based on rsync. rsnapshot makes it easy to make periodic snapshots of local machines, and -- cgit v1.2.3 From 6420cab3413e13d38a0a768d8227ba82071ab554 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 05:40:38 +0100 Subject: gnu: sxiv: Update to 26. * gnu/packages/image-viewers.scm (sxiv): Update to 26. --- gnu/packages/image-viewers.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 85d3a153e7..989deb1707 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 nee -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Guy Fleury Iteriteka @@ -216,7 +216,7 @@ (define-public gpicview (define-public sxiv (package (name "sxiv") - (version "25") + (version "26") (source (origin (method git-fetch) (uri (git-reference @@ -225,15 +225,15 @@ (define-public sxiv (file-name (git-file-name name version)) (sha256 (base32 - "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp")))) + "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target #:make-flags (list (string-append "PREFIX=" %output) "CC=gcc" - ;; Xft.h #includes (without ‘freetype2/’). The sxiv - ;; Makefile works around this by hard-coding /usr/include instead. + ;; Xft.h #includes without ‘freetype2/’. The Makefile + ;; works around this by hard-coding /usr/include & $PREFIX. (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "freetype") "/include/freetype2") -- cgit v1.2.3 From 70e9d7ebf76d1f2099304c65fc5c99f86f566cdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 05:47:27 +0100 Subject: gnu: weechat: Update to 2.7. * gnu/packages/irc.scm (weechat): Update to 2.7. [inputs]: Use guile-2.2. [arguments]: Explicitly disable languages for which auto-detection broke. --- gnu/packages/irc.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index f39da03815..9b20176f11 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. @@ -170,14 +170,14 @@ (define-public irssi (define-public weechat (package (name "weechat") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "0j2iflnfvv31q2l9r67r8aj3ipggqfm2r2dpy7pvdpxgwwq337ps")))) + "1rwrwfsy6k5bq3aasd95ydr68pjsh5ax38lmgz17prgcmyj45z2n")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -192,14 +192,17 @@ (define-public weechat ("gnutls" ,gnutls) ;; Scripting language plug-ins. - ("guile" ,guile-2.0) + ("guile" ,guile-2.2) ("lua" ,lua-5.1) ("python" ,python) ("perl" ,perl) ("tcl" ,tcl))) (arguments `(#:configure-flags - (list "-DENABLE_TESTS=ON") ; ‘make test’ fails otherwise + (list "-DENABLE_JAVASCRIPT=OFF" + "-DENABLE_PHP=OFF" + "-DENABLE_RUBY=OFF" + "-DENABLE_TESTS=ON") ; ‘make test’ fails otherwise ;; Tests hang indefinately on non-Intel platforms. #:tests? ,(if (any (cute string-prefix? <> (or (%current-target-system) (%current-system))) -- cgit v1.2.3 From a277655f2a3403b8b5ce6069674672913ad5f4d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 05:54:58 +0100 Subject: gnu: liblangtag: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (liblangtag)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 539ada46e5..c24d4c5eb1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -433,7 +433,7 @@ (define-public liblangtag (origin (method url-fetch) (uri (string-append "https://bitbucket.org/tagoh/liblangtag/downloads/" - name "-" version ".tar.bz2")) + "liblangtag-" version ".tar.bz2")) (sha256 (base32 "0bnm4hllr8cfrybm8rw7b8n0nlhzhnv73bkg1bxk452g6a82f96n")))) -- cgit v1.2.3 From 85df46d306162a329696933687df51b82906dd37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 06:07:12 +0100 Subject: gnu: liblangtag: Update to 0.6.3. * gnu/packages/libreoffice.scm (liblangtag): Update to 0.6.3. --- gnu/packages/libreoffice.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index c24d4c5eb1..067ee2eed1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019 Marius Bakke @@ -428,22 +428,20 @@ (define-public libetonyek (define-public liblangtag (package (name "liblangtag") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/tagoh/liblangtag/downloads/" "liblangtag-" version ".tar.bz2")) (sha256 - (base32 - "0bnm4hllr8cfrybm8rw7b8n0nlhzhnv73bkg1bxk452g6a82f96n")))) + (base32 "1g9kwxx60q0hpwvs66ys1cb9qg54hfvbivadwli8sfpc085a44hz")))) (build-system gnu-build-system) (native-inputs `(("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("libxml2" ,libxml2))) - ;; As of December 2017, tagoh.bitbucket.org redirects to a hosting advert. (home-page "https://bitbucket.org/tagoh/liblangtag") (synopsis "Library to access tags for identifying languages") (description "Liblangtag implements an interface to work with tags -- cgit v1.2.3 From 5bcf4d4c35600d1964e4464aef7e7b63c9eced49 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 06:26:33 +0100 Subject: gnu: haveged: Update to 1.9.8. * gnu/packages/linux.scm (haveged): Update to 1.9.8. --- 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 ee3d6a4063..1c36aefb45 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4765,7 +4765,7 @@ (define-public x86-energy-perf-policy (define-public haveged (package (name "haveged") - (version "1.9.6") + (version "1.9.8") (source (origin (method git-fetch) @@ -4774,7 +4774,7 @@ (define-public haveged (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11kr19n2f87izsj341lv5amhd1wc2ckfmqr9pq5fxix8pkbs94rh")))) + (base32 "1znr58fb3faq4nmrvc3c5whkc1f3chivm4vhicdwr9pdsyqqsd51")))) (build-system gnu-build-system) (home-page "https://www.issihosts.com/haveged") (synopsis "Entropy source for the Linux random number generator") -- cgit v1.2.3 From b614a2239384c16111e0c03317c9fbeee5728cb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 15:48:37 +0100 Subject: gnu: ebtables: Update to 2.0.11. * gnu/packages/linux.scm (ebtables): Update to 2.0.11. [arguments]: Remove them all. --- gnu/packages/linux.scm | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c36aefb45..a1920dba35 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1843,46 +1843,16 @@ (define-public iptables (define-public ebtables (package (name "ebtables") - (version "2.0.10-4") + (version "2.0.11") (source (origin (method url-fetch) (uri (string-append - "mirror://netfilter.org/ebtables/ebtables-v" + "mirror://netfilter.org/ebtables/ebtables-" version ".tar.gz")) (sha256 (base32 - "0pa5ljlk970yfyhpf3iqwfpbc30j8mgn90fapw9cfz909x47nvyw")))) + "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp")))) (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no test suite - #:make-flags - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/sbin")) - (lib (string-append out "/lib")) - (man (string-append out "/share/man")) - (iptables (assoc-ref %build-inputs "iptables")) - (ethertypes (string-append iptables "/etc/ethertypes"))) - (list (string-append "LIBDIR=" lib) - (string-append "MANDIR=" man) - (string-append "BINDIR=" bin) - (string-append "ETHERTYPESFILE=" ethertypes) - ;; With the default CFLAGS, it falis with: - ;; communication.c:259:58: error: variable ‘ret’ set but not - ;; used [-Werror=unused-but-set-variable] - "CFLAGS=-Wall")) - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; no configure script - (lambda _ - (substitute* "Makefile" - ;; Remove user and group options from install commands, - ;; otherwise it fails with: invalid user 'root'. - (("-o root -g root") "") - ;; Remove 'ethertypes' from the install target. - (("install: .*") - "install: $(MANDIR)/man8/ebtables.8 exec scripts\n")) - #t))))) (inputs `(("perl" ,perl) ("iptables" ,iptables))) -- cgit v1.2.3 From 7046106ef90e7855311dbb1f1ae9fed3df5cf875 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 04:53:30 +0100 Subject: gnu: upx: Clean up. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (upx)[arguments]: Combine duplicate substitutions. Replace ‘install’ phase. Fix indentation. --- gnu/packages/compression.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3f4b99bfcf..0982173b66 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1922,24 +1922,21 @@ (define-public upx (list "all") #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (delete 'install) + (delete 'configure) ; no configure script + (delete 'check) ; no test suite (add-before 'build 'patch-exec-bin-sh (lambda _ - (substitute* (find-files "Makefile") - (("/bin/sh") (which "sh"))) - (substitute* "src/Makefile" + (substitute* (list "Makefile" + "src/Makefile") (("/bin/sh") (which "sh"))) #t)) - (add-after 'build 'install-upx + (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) + (bin (string-append out "/bin"))) (mkdir-p bin) (copy-file "src/upx.out" (string-append bin "/upx"))) - #t)) - ))) + #t))))) (home-page "https://upx.github.io/") (synopsis "Compression tool for executables") (description -- cgit v1.2.3 From c70261bfb993cebc23cd80042de3f52a8b7932a4 Mon Sep 17 00:00:00 2001 From: Maurice Brémond Date: Mon, 17 Feb 2020 18:19:55 +0100 Subject: gnu: Add MPICH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpi.scm (mpich): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/mpi.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 00e0d12eab..7c16af732c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -27,13 +27,15 @@ (define-module (gnu packages mpi) #:use-module (guix packages) #:use-module ((guix licenses) - #:hide (expat)) + #:hide (expat zlib)) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix deprecation) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) #:use-module (gnu packages java) @@ -393,3 +395,80 @@ (define-public python-mpi4py object as well as optimized communications of Python objects (such as NumPy arrays) that expose a buffer interface.") (license bsd-3))) + +(define-public mpich + (package + (name "mpich") + (version "3.3.2") + (source (origin + (method url-fetch) + (uri (string-append "http://www.mpich.org/static/downloads/" + version "/mpich-" version ".tar.gz")) + (sha256 + (base32 + "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("hwloc" ,hwloc-2 "lib") + ("slurm" ,slurm) + ,@(if (and (not (%current-target-system)) + (member (%current-system) (package-supported-systems ucx))) + `(("ucx" ,ucx)) + '()))) + (native-inputs + `(("perl" ,perl) + ("which" ,which) + ("gfortran" ,gfortran))) + (outputs '("out" "debug")) + (arguments + `(#:configure-flags + (list "--disable-silent-rules" ;let's see what's happening + "--enable-debuginfo" + ;; "--with-device=ch4:ucx" ; --with-device=ch4:ofi segfaults in tests + (string-append "--with-hwloc-prefix=" + (assoc-ref %build-inputs "hwloc")) + + ,@(if (assoc "ucx" (package-inputs this-package)) + `((string-append "--with-ucx=" + (assoc-ref %build-inputs "ucx"))) + '())) + + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "./maint/gen_subcfg_m4" + (("/usr/bin/env") (which "env"))) + (substitute* "src/glue/romio/all_romio_symbols" + (("/usr/bin/env") (which "env"))) + (substitute* (find-files "." "buildiface") + (("/usr/bin/env") (which "env"))) + (substitute* "maint/extracterrmsgs" + (("/usr/bin/env") (which "env"))) + (substitute* (find-files "." "f77tof90") + (("/usr/bin/env") (which "env"))) + (substitute* (find-files "." "\\.sh$") + (("/bin/sh") (which "sh"))) + #t)) + (add-before 'configure 'fix-makefile + (lambda _ + ;; Remove "@hwloclib@" from 'pmpi_convenience_libs'. + ;; This fixes "No rule to make target '-lhwloc', needed + ;; by 'lib/libmpi.la'". + (substitute* "Makefile.in" + (("^pmpi_convenience_libs = (.*) @hwloclib@ (.*)$" _ + before after) + (string-append "pmpi_convenience_libs = " + before " " after))) + #t))))) + (home-page "https://www.mpich.org/") + (synopsis "Implementation of the Message Passing Interface (MPI)") + (description + "MPICH is a high-performance and portable implementation of the Message +Passing Interface (MPI) standard (MPI-1, MPI-2 and MPI-3). MPICH provides an +MPI implementation that efficiently supports different computation and +communication platforms including commodity clusters, high-speed networks (10 +Gigabit Ethernet, InfiniBand, Myrinet, Quadrics), and proprietary high-end +computing systems (Blue Gene, Cray). It enables research in MPI through a +modular framework for other derived implementations.") + (license bsd-2))) -- cgit v1.2.3 From 15e62623cc6cd0cff719e1a77f4dbf91d12379a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 20:53:16 +0200 Subject: gnu: mpi.scm: Use 'license:' prefix. * gnu/packages/mpi.scm: Import (guix licenses) with the 'license:' prefix. --- gnu/packages/mpi.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 7c16af732c..fc4950f519 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -26,8 +26,7 @@ (define-module (gnu packages mpi) #:use-module (guix packages) - #:use-module ((guix licenses) - #:hide (expat zlib)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix deprecation) @@ -130,7 +129,7 @@ (define-public hwloc-1 hwloc may display the topology in multiple convenient formats. It also offers a powerful programming interface to gather information about the hardware, bind processes, and much more.") - (license bsd-3))) + (license license:bsd-3))) (define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. @@ -275,7 +274,7 @@ (define-public openmpi best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.") ;; See file://LICENSE - (license bsd-2))) + (license license:bsd-2))) ;; TODO: javadoc files contain timestamps. (define-public java-openmpi @@ -394,7 +393,7 @@ (define-public python-mpi4py supports point-to-point and collective communications of any picklable Python object as well as optimized communications of Python objects (such as NumPy arrays) that expose a buffer interface.") - (license bsd-3))) + (license license:bsd-3))) (define-public mpich (package @@ -471,4 +470,4 @@ (define-public mpich Gigabit Ethernet, InfiniBand, Myrinet, Quadrics), and proprietary high-end computing systems (Blue Gene, Cray). It enables research in MPI through a modular framework for other derived implementations.") - (license bsd-2))) + (license license:bsd-2))) -- cgit v1.2.3 From 42d42b2ca7111e5f5bac37b8ca4c79cd542264b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:21:59 +0100 Subject: gnu: orcus: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (orcus)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 067ee2eed1..d0440f9419 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -118,8 +118,8 @@ (define-public orcus (source (origin (method url-fetch) - (uri (string-append "http://kohei.us/files/" name "/src/lib" - name "-" version ".tar.xz")) + (uri (string-append "http://kohei.us/files/orcus/src/lib" + "orcus-" version ".tar.xz")) (sha256 (base32 "14gbnqsv5n2fm4sxa17014f440clrzls6p2w2ixk9wipg4950v9s")))) -- cgit v1.2.3 From 72d9a144357912973b4d49f588a87b74e00d465a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:22:36 +0100 Subject: gnu: librevenge: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (librevenge)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d0440f9419..04477e2082 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -148,8 +148,8 @@ (define-public librevenge (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libwpd/librevenge/librevenge-" + version "/librevenge-" version ".tar.xz")) (sha256 (base32 "1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk")))) (build-system gnu-build-system) -- cgit v1.2.3 From 3fc0b54eec9e03607a0d4403148ccc8736f04ac8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:33:52 +0100 Subject: gnu: yapet: Update home page. * gnu/packages/password-utils.scm (yapet)[home-page]: Update. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 1e93e5d9ad..06214297f7 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -319,7 +319,7 @@ (define-public yapet The text based user interface allows you to run YAPET easily in a Secure Shell session. Two companion utilities enable users to convert CSV files to YAPET and vice versa.") - (home-page "http://www.guengel.ch/myapps/yapet/") + (home-page "https://yapet.guengel.ch/") (license license:gpl3+))) (define-public cracklib -- cgit v1.2.3 From cd5b85c3f821fea4fb89513d300d37d3e764e1c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:36:20 +0100 Subject: gnu: mpc: Fix home page domain. * gnu/packages/multiprecision.scm (mpc)[home-page]: Add www. --- gnu/packages/multiprecision.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 36d035ada0..bc5071dad0 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -131,7 +131,7 @@ (define-public mpc for performing arithmetic on complex numbers. It supports arbitrarily high precision and correctly rounds the results.") (license lgpl3+) - (home-page "http://multiprecision.org/mpc/"))) + (home-page "http://www.multiprecision.org/mpc/"))) (define-public mpfi (package -- cgit v1.2.3 From b81789df73b53c548b8ab8bcb829d6ad845c0650 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:40:16 +0100 Subject: gnu: libmpdclient: Update to 2.18. * gnu/packages/mpd.scm (libmpdclient): Update to 2.18. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 2550c124b5..278f5ea325 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -60,7 +60,7 @@ (define-module (gnu packages mpd) (define-public libmpdclient (package (name "libmpdclient") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri @@ -69,7 +69,7 @@ (define-public libmpdclient "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "0n9mrrmk20p4mfsz782jziax9z3bn7vxlm53327mrdlmgqf8z6zf")))) + "1yl123xr25gcd3vlsfmn6p7gbrq029pgnxa8m6n6j0byaqgixc2c")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 79d1550fd47efa1ff79e66e513d88368ff41ba74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:42:15 +0100 Subject: gnu: Follow multiprecision.org subdomain redirections. * gnu/packages/algebra.scm (mpfrcx, cm)[home-page]: Follow permanent redirections. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index f4d427334f..bebf5c99ed 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -91,7 +91,7 @@ (define-public mpfrcx implemented. On the other hand, these comprise asymptotically fast multiplication routines such as Toom–Cook and the FFT.") (license license:lgpl3+) - (home-page "http://mpfrcx.multiprecision.org/"))) + (home-page "http://www.multiprecision.org/mpfrcx/"))) (define-public gf2x (package @@ -140,7 +140,7 @@ (define-public cm that can be called from within a C program and of executable command line applications.") (license license:gpl3+) - (home-page "http://cm.multiprecision.org/"))) + (home-page "http://www.multiprecision.org/cm/"))) (define-public fplll (package -- cgit v1.2.3 From dd70960767beafbdd09f7c10de0d6d3ae0b2dfd1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:47:37 +0100 Subject: gnu: mpd: Update to 0.21.19. * gnu/packages/mpd.scm (mpd): Update to 0.21.19. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 278f5ea325..7f7dcbe674 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.18") + (version "0.21.19") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "0hllkq426hql1s80xxvy28ypvw3dbfrrclbjc0lckmmgsmnfd0l7")))) + "1ydjamnc8gs9cxbhin7h51119hmfynsg7b8c4pgasdsnv08mw9yk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From e9759457cf80dead38eb2651ecce3c81c95d341f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:49:02 +0100 Subject: gnu: ncmpc: Update to 0.37. * gnu/packages/mpd.scm (ncmpc): Update to 0.37. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7f7dcbe674..e7154fd892 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -183,7 +183,7 @@ (define-public mpd-mpc (define-public ncmpc (package (name "ncmpc") - (version "0.36") + (version "0.37") (source (origin (method url-fetch) (uri @@ -192,7 +192,7 @@ (define-public ncmpc "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "0b1yg93is9057p9d7vfv5nz85d11p6jq94fw07jn3zlfzhyqfcj6")))) + "0p31jpv1vj01bqf1589mnfpv9618cfsv259rlnbqybg1yqkvg3kw")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From aa7773402328920f79feebc380e750226cbda5ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 19:50:02 +0100 Subject: gnu: ncdu: Update to 1.14.2. * gnu/packages/ncdu.scm (ncdu): Update to 1.14.2. --- gnu/packages/ncdu.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 62fe84ca07..720b8a7858 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-module (gnu packages ncdu) (define-public ncdu (package (name "ncdu") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy")))) + "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From 41e9104dbac7f5587675cca108285ad77494ebce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:48:53 +0100 Subject: gnu: nethack: Update to 3.6.5. * gnu/packages/games.scm (nethack): Update to 3.6.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cb21a66133..3ec7f18fa2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1050,7 +1050,7 @@ (define-public ltris (define-public nethack (package (name "nethack") - (version "3.6.4") + (version "3.6.5") (source (origin (method url-fetch) @@ -1058,7 +1058,7 @@ (define-public nethack (string-append "https://www.nethack.org/download/" version "/nethack-" (string-join (string-split version #\.) "") "-src.tgz")) (sha256 - (base32 "0ndxgnsprwgjnk0qb24iljkpijnfncgvfb3h3zb129h3cs2anc85")))) + (base32 "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv")))) (inputs `(("ncurses" ,ncurses) ("bison" ,bison) -- cgit v1.2.3 From e19268020f7f64ea48c74855d142ae48ba7496ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:51:05 +0100 Subject: gnu: socat: Update to 1.7.3.4. * gnu/packages/networking.scm (socat): Update to 1.7.3.4. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ae131a5667..fa755fb7eb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -178,7 +178,7 @@ (define-public miredo (define-public socat (package (name "socat") - (version "1.7.3.3") + (version "1.7.3.4") (source (origin (method url-fetch) (uri (string-append @@ -186,9 +186,9 @@ (define-public socat version ".tar.bz2")) (sha256 (base32 - "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd")))) + "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp")))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ;no 'check' phase + (arguments '(#:tests? #f)) ; no test suite (inputs `(("openssl" ,openssl))) (home-page "http://www.dest-unreach.org/socat/") (synopsis -- cgit v1.2.3 From 1f634b81597b378b99da44bf8850155d99d25476 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:53:40 +0100 Subject: gnu: nginx: Update to 1.17.8. * gnu/packages/web.scm (nginx): Update to 1.17.8. --- 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 dc67dbd547..2c977baf14 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -219,14 +219,14 @@ (define-public nginx ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.7") + (version "1.17.8") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1zwiqljhzf0ym6r3hrg6k2qfb2mxi7i0lpafg4xnkr875225c9xn")))) + "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From 16e08820de8be801811e08d61981b2e66c73c8f4 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:43:48 +0300 Subject: gnu: Add rust-block-0.1. * gnu/packages/crates-io.scm (rust-block-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index edbc238ad5..04b095f120 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1071,6 +1071,30 @@ (define-public rust-blobby-0.1 "Iterator over simple binary blob storage.") (license (list license:asl2.0 license:expat)))) +(define-public rust-block-0.1 + (package + (name "rust-block") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "block" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16k9jgll25pzsq14f244q22cdv0zb4bqacldg3kx6h89d7piz30d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-objc-test-utils" ,rust-objc-test-utils-0.0)))) + (home-page "http://github.com/SSheldon/rust-block") + (synopsis "Rust interface for Apple's C language extension of blocks") + (description "This package provides a rust interface for Apple's C language +extension of blocks.") + (license license:expat))) + (define-public rust-block-buffer-0.7 (package (name "rust-block-buffer") -- cgit v1.2.3 From 8a062f6767e11726aef5bbf4b3ff54cb7e1a483f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:44:47 +0300 Subject: gnu: Add rust-objc-foundation-0.1. * gnu/packages/crates-io.scm (rust-objc-foundation-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 04b095f120..101e346ffe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8081,6 +8081,32 @@ (define-public rust-objc-exception-0.1 try/catch statements.") (license license:expat))) +(define-public rust-objc-foundation-0.1 + (package + (name "rust-objc-foundation") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "objc-foundation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y9bwb3m5fdq7w7i4bnds067dhm4qxv4m1mbg9y61j9nkrjipp8s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Only available on macOS. + #:cargo-inputs + (("rust-block" ,rust-block-0.1) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-id" ,rust-objc-id-0.1)))) + (home-page "http://github.com/SSheldon/rust-objc-foundation") + (synopsis "Rust wrapper for Objective-C's Foundation framework") + (description "This package provides a rust wrapper for Objective-C's +Foundation framework.") + (license license:expat))) + (define-public rust-objc-id-0.1 (package (name "rust-objc-id") -- cgit v1.2.3 From e8166e795425b1060bab67b279ccd7619aa7920e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:59:41 +0300 Subject: gnu: Add rust-syntex-pos-0.58. * gnu/packages/crates-io.scm (rust-syntex-pos-0.58): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 101e346ffe..06b76f1fee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12883,6 +12883,28 @@ (define-public rust-synstructure-test-traits-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-syntex-pos-0.58 + (package + (name "rust-syntex-pos") + (version "0.58.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "syntex_pos" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0iqhircpr723da1g97xrrj8smqqz3gxw91cf03sckasjzri4gb8k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) + (home-page "https://github.com/serde-rs/syntex") + (synopsis "Backport of libsyntax_pos") + (description "This package provides a backport of @code{libsyntax_pos}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sysctl-0.4 (package (name "rust-sysctl") -- cgit v1.2.3 From 1244ed1a5d8e23a26370514a0f37de2f31a98a6b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 18:02:50 +0300 Subject: gnu: Add rust-syntex-0.58. * gnu/packages/crates-io.scm (rust-syntex-0.58): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 06b76f1fee..7ea3776b7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12883,6 +12883,32 @@ (define-public rust-synstructure-test-traits-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-syntex-0.58 + (package + (name "rust-syntex") + (version "0.58.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "syntex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03lgd36cxhc6gzaab0wqvckbhml00s6s73lk34ymf6cklymf7xd8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-syntex-errors" ,rust-syntex-errors-0.58) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)))) + (home-page "https://github.com/erickt/rust-syntex") + (synopsis "Compile time syntax extension expansion") + (description + "This package provides a library that enables compile time +syntax extension expansion.") + (license (list license:expat license:asl2.0)))) + (define-public rust-syntex-pos-0.58 (package (name "rust-syntex-pos") -- cgit v1.2.3 From aeb04be332982d3bbaaeacef63950b171b3a84b8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 18:02:08 +0300 Subject: gnu: Add rust-syntex-errors-0.58. * gnu/packages/crates-io.scm (rust-syntex-errors-0.58): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7ea3776b7d..7c14624430 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12909,6 +12909,33 @@ (define-public rust-syntex-0.58 syntax extension expansion.") (license (list license:expat license:asl2.0)))) +(define-public rust-syntex-errors-0.58 + (package + (name "rust-syntex-errors") + (version "0.58.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "syntex_errors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "176vma7sjv6li17q7dsilryac66b76zyis9ampmff2hlsz1caz46")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-syntex-pos" ,rust-syntex-pos-0.58) + ("rust-term" ,rust-term-0.4) + ("rust-unicode-xid" ,rust-unicode-xid-0.0)))) + (home-page "https://github.com/serde-rs/syntex") + (synopsis "Backport of librustc_errors") + (description "This package provides a backport of @code{librustc_errors}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-syntex-pos-0.58 (package (name "rust-syntex-pos") -- cgit v1.2.3 From 7ff032f1bf740319824c5cc072bf5f6e8e06a501 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 18:07:55 +0300 Subject: gnu: Add rust-syntex-syntax-0.58. * gnu/packages/crates-io.scm (rust-syntex-syntax-0.58): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c14624430..ac3961fc02 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12958,6 +12958,34 @@ (define-public rust-syntex-pos-0.58 (description "This package provides a backport of @code{libsyntax_pos}.") (license (list license:expat license:asl2.0)))) +(define-public rust-syntex-syntax-0.58 + (package + (name "rust-syntex-syntax") + (version "0.58.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "syntex_syntax" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14f74l7yzwl6fr9i23k4j23k66qn0gakvhk4jjc9ipb3w6x4s3kf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-0.8) + ("rust-log" ,rust-log-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-syntex-errors" ,rust-syntex-errors-0.58) + ("rust-syntex-pos" ,rust-syntex-pos-0.58) + ("rust-unicode-xid" ,rust-unicode-xid-0.0)))) + (home-page "https://github.com/serde-rs/syntex") + (synopsis "Backport of libsyntax") + (description "This package provides a backport of libsyntax.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sysctl-0.4 (package (name "rust-sysctl") -- cgit v1.2.3 From 72270d7886a0f29ed613ca8d874d65b3dc96866d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 01:45:48 +0300 Subject: gnu: Add rust-rand-isaac-0.2. * gnu/packages/crates-io.scm (rust-rand-isaac-0.2): New variable. (rust-rand-isaac-0.1): Inherit from rust-rand-isaac-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac3961fc02..1cb4ec4f7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10047,8 +10047,36 @@ (define-public rust-rand-hc-0.1 `(#:skip-build? #t #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) +(define-public rust-rand-isaac-0.2 + (package + (name "rust-rand-isaac") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_isaac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xlb9415x518ffkazxhvk8b04i9i548nva4i5l5s34crvjrv1xld")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.5) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) + (home-page "https://crates.io/crates/rand_isaac") + (synopsis "ISAAC random number generator") + (description "This package implements the @code{ISAAC} and @code{ISAAC-64} +random number generators. ISAAC stands for \"Indirection, Shift, Accumulate, +Add, and Count\" which are the principal bitwise operations employed.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-isaac-0.1 (package + (inherit rust-rand-isaac-0.2) (name "rust-rand-isaac") (version "0.1.1") (source @@ -10059,21 +10087,13 @@ (define-public rust-rand-isaac-0.1 (sha256 (base32 "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) - (home-page "https://crates.io/crates/rand_isaac") - (synopsis "ISAAC random number generator") - (description "This package implements the @code{ISAAC} and @code{ISAAC-64} -random number generators. ISAAC stands for \"Indirection, Shift, Accumulate, -Add, and Count\" which are the principal bitwise operations employed.") - (license (list license:asl2.0 - license:expat)))) + (("rust-bincode" ,rust-bincode-1.1)))))) (define-public rust-rand-jitter-0.1 (package -- cgit v1.2.3 From e2936c7db8231d34fe3605fbca6603847de6bb35 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 01:52:00 +0300 Subject: gnu: Add rust-rand-xoshiro-0.4. * gnu/packages/crates-io.scm (rust-rand-xoshiro-0.4): New variable. (rust-rand-xoshiro-0.3, rust-rand-xoshrio-0.1): Inherit from rust-rand-xoshiro-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1cb4ec4f7d..906000d7a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10277,8 +10277,35 @@ (define-public rust-rand-xorshift-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-xoshiro-0.4 + (package + (name "rust-rand-xoshiro") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand-xoshiro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "013h45rikipv5bda2ixmwx5rwsk9wpc7mr0a77cz20hxi0pdvz59")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.5) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) + (home-page "https://crates.io/crates/rand_xoshiro") + (synopsis "Xoshiro, xoroshiro and splitmix64 random number generators") + (description "This package provides the xoshiro, xoroshiro and splitmix64 +random number generators.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-xoshiro-0.3 (package + (inherit rust-rand-xoshiro-0.4) (name "rust-rand-xoshiro") (version "0.3.0") (source @@ -10290,7 +10317,6 @@ (define-public rust-rand-xoshiro-0.3 (sha256 (base32 "07w3qgrac8r356lz5vqff42rly6yd9vs3g5lx5pbn13rcmb05rqb")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -10298,17 +10324,11 @@ (define-public rust-rand-xoshiro-0.3 ("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) - (home-page "https://github.com/rust-random/rand") - (synopsis - "Xoshiro, xoroshiro and splitmix64 random number generators") - (description - "Xoshiro, xoroshiro and splitmix64 random number generators.") - (license (list license:expat license:asl2.0)))) + (("rust-bincode" ,rust-bincode-1.1)))))) (define-public rust-rand-xoshiro-0.1 (package - (inherit rust-rand-xoshiro-0.3) + (inherit rust-rand-xoshiro-0.4) (name "rust-rand-xoshiro") (version "0.1.0") (source -- cgit v1.2.3 From 2e87855bc3620d5becb6e948845b4fea2ce08e99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 21:38:50 +0200 Subject: gnu: rust-rand-xoshiro-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-xoshiro-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 906000d7a8..1f093649d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10318,8 +10318,7 @@ (define-public rust-rand-xoshiro-0.3 (base32 "07w3qgrac8r356lz5vqff42rly6yd9vs3g5lx5pbn13rcmb05rqb")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) ("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) -- cgit v1.2.3 From bafc0a04f583d243560b8709784aae2d2dfc8582 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 21:40:56 +0200 Subject: gnu: rust-rand-xoshiro-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-xoshiro-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1f093649d4..219d24e566 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10341,8 +10341,7 @@ (define-public rust-rand-xoshiro-0.1 "0ac9ha6ll8b6l1930bd99k29jrjpsbpddvr6ycrnbi5rkwb1id03")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) ("rust-rand-core" ,rust-rand-core-0.3)) #:cargo-development-inputs -- cgit v1.2.3 From 863726d9cd214b599e830848b1f2c18539b44462 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:19:17 +0300 Subject: gnu: rust-stdweb-0.4: Update to 0.4.20. * gnu/packages/crates-io.scm (rust-stdweb-0.4): Update to 0.4.20 Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 219d24e566..a76af2eb9d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12415,7 +12415,7 @@ (define-public rust-static-assertions-0.3 (define-public rust-stdweb-0.4 (package (name "rust-stdweb") - (version "0.4.17") + (version "0.4.20") (source (origin (method url-fetch) @@ -12424,7 +12424,7 @@ (define-public rust-stdweb-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "094giad1v81rxxs4izf88ijc9c6w3c7cr5a7cwwr86mc22xn4hy3")))) + "1md14n9rzxzdskz3hpgln8vxfwqsw2cswc0f5nslh4r82rmlj8nh")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 91aee318a407b67893432a9d76f26eb9134769ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 21:48:55 +0200 Subject: gnu: rust-stdweb-derive-0.5: Update to 0.5.3. * gnu/packages/crates-io.scm (rust-stdweb-derive-0.5): Update to 0.5.3. [arguments]: Don't skip build. Skip tests. Replace rust-proc-macro2-0.4 with 1.0, rust-syn-0.15 with 1.0 in cargo-inputs. [description]: Update. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a76af2eb9d..47350d431b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12456,7 +12456,7 @@ (define-public rust-stdweb-0.4 (define-public rust-stdweb-derive-0.5 (package (name "rust-stdweb-derive") - (version "0.5.1") + (version "0.5.3") (source (origin (method url-fetch) @@ -12465,20 +12465,21 @@ (define-public rust-stdweb-derive-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c1rxx6rqcc4iic5hx320ki3vshpi8k58m5600iqzq4x2zcyn88f")))) + "1vsh7g0gaxn4kxqq3knhymdn02p2pfxmnd2j0vplpj6c1yj60yn8")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) + (("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) - ("rust-syn" ,rust-syn-0.15)))) + ("rust-syn" ,rust-syn-1.0)))) (home-page "https://github.com/koute/stdweb") (synopsis "Derive macros for the stdweb crate") (description - "Derive macros for the @code{stdweb} crate.") + "This crate currently defines a derive macro for @code{stdweb} which allows +you to define custom reference types outside of the @code{stdweb} library.") (license (list license:expat license:asl2.0)))) (define-public rust-stdweb-internal-macros-0.2 -- cgit v1.2.3 From b18c509694ecc45f38f55d8f962c4258e4e9e43b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 21:57:19 +0200 Subject: gnu: rust-stdweb-internal-macros-0.2: Update to 0.2.9. * gnu/packages/crates-io.scm (rust-stdweb-internal-macros-0.2): Update to 0.2.9. [arguments]: Don't skip build. Replace rust-proc-macro2-0.4 with 1.0, rust-syn-0.15 with 1.0 in cargo-inputs. [description]: Texify. --- gnu/packages/crates-io.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 47350d431b..a08eaf063c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12485,7 +12485,7 @@ (define-public rust-stdweb-derive-0.5 (define-public rust-stdweb-internal-macros-0.2 (package (name "rust-stdweb-internal-macros") - (version "0.2.7") + (version "0.2.9") (source (origin (method url-fetch) @@ -12494,23 +12494,22 @@ (define-public rust-stdweb-internal-macros-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1yjrmkc6sb1035avic383pa3avk2s9k3n17yjcza8yb9nw47v3z6")))) + "049fq8fl5ny9l5if2qv7kxwng7g6ns95h4fbm3zx360dmpv5zyjq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-base-x" ,rust-base-x-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-sha1" ,rust-sha1-0.6) - ("rust-syn" ,rust-syn-0.15)))) + ("rust-syn" ,rust-syn-1.0)))) (home-page "https://github.com/koute/stdweb") (synopsis "Internal procedural macros for the stdweb crate") (description - "Internal procedural macros for the stdweb crate.") + "Internal procedural macros for the @code{stdweb} crate.") (license (list license:expat license:asl2.0)))) (define-public rust-stdweb-internal-runtime-0.1 -- cgit v1.2.3 From b4e0166e2d7d9d4b57e1caeb026936f957858ec9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:29:13 +0300 Subject: gnu: Add rust-quasi-0.32. * gnu/packages/crates-io.scm (rust-quasi-0.32): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a08eaf063c..092def5222 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9553,6 +9553,32 @@ (define-public rust-quantiles-0.7 "This package provides a collection of approximate quantile algorithms.") (license license:expat))) +(define-public rust-quasi-0.32 + (package + (name "rust-quasi") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quasi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1csqqgz3aw85q570ywmhb34r3sqgi1sprf8xadfwzlfnai45ri0q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-syntex-errors" ,rust-syntex-errors-0.58) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)))) + (home-page "https://github.com/serde-rs/quasi") + (synopsis "Quasi-quoting macro system") + (description + "This package provides a quasi-quoting macro system.") + (license (list license:expat license:asl2.0)))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From 9dd8e3e6f8e12b1a089454463844c8f079acdf38 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:30:55 +0300 Subject: gnu: Add rust-aster-0.41. * gnu/packages/crates-io.scm (rust-aster-0.41): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 092def5222..5d7a66b282 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -501,6 +501,31 @@ (define-public rust-assert-matches-1.3 "This package asserts that a value matches a pattern in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-aster-0.41 + (package + (name "rust-aster") + (version "0.41.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "aster" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q704kn23wnwnrxml7w1mxw6a3xb6386x5wgys6ibnyramrxzksc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-compiletest-rs" ,rust-compiletest-rs-0.2) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)))) + (home-page "https://github.com/serde-rs/aster") + (synopsis "Libsyntax ast builder") + (description "This package provides a libsyntax ast builder.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atty-0.2 (package (name "rust-atty") -- cgit v1.2.3 From 5057a2033591c669c14876709dfc8904c3953682 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:31:26 +0300 Subject: gnu: Add rust-quasi-codegen-0.32. * gnu/packages/crates-io.scm (rust-quasi-codegen-0.32): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d7a66b282..f1de568762 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9604,6 +9604,32 @@ (define-public rust-quasi-0.32 "This package provides a quasi-quoting macro system.") (license (list license:expat license:asl2.0)))) +(define-public rust-quasi-codegen-0.32 + (package + (name "rust-quasi-codegen") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quasi_codegen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m3nwzn5ip8y86cyfk6hdnbhiinsk2faag7l0cc4q11wl9gy5fai")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-aster" ,rust-aster-0.41) + ("rust-clippy" ,rust-clippy-0.0) + ("rust-syntex" ,rust-syntex-0.58) + ("rust-syntex-errors" ,rust-syntex-errors-0.58) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)))) + (home-page "https://github.com/serde-rs/quasi") + (synopsis "Quasi-quoting macro system") + (description "This package provides a quasi-quoting macro system.") + (license (list license:expat license:asl2.0)))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From 0ad5b6814ccbcdc67c54dbe6895d872c3c8e155d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:33:23 +0300 Subject: gnu: Add rust-serde-codegen-0.4. * gnu/packages/crates-io.scm (rust-serde-codegen-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f1de568762..04b75c8818 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11826,6 +11826,37 @@ (define-public rust-serde-cbor-0.10 (description "CBOR support for serde.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-codegen-0.4 + (package + (name "rust-serde-codegen") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_codegen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0167ghvqs0n8qin8fjx2ihn3gx92m55685qpv4nzihw48h4rq0vq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-aster" ,rust-aster-0.41) + ("rust-quasi" ,rust-quasi-0.32) + ("rust-quasi-macros" ,rust-quasi-macros-0.32) + ("rust-syntex" ,rust-syntex-0.58) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58)) + #:cargo-development-inputs + (("rust-quasi-codegen" ,rust-quasi-codegen-0.32) + ("rust-syntex" ,rust-syntex-0.58)))) + (home-page "https://serde.rs") + (synopsis "Macros for the serde framework") + (description "This package provides macros to auto-generate implementations +for the serde framework.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-derive-1.0 (package (name "rust-serde-derive") -- cgit v1.2.3 From eacadcab7a27fdb9c4a67607e66bd9b50ea3dbcb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:31:50 +0300 Subject: gnu: Add rust-quasi-macros-0.32. * gnu/packages/crates-io.scm (rust-quasi-macros-0.32): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 04b75c8818..72daf81ab5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9630,6 +9630,33 @@ (define-public rust-quasi-codegen-0.32 (description "This package provides a quasi-quoting macro system.") (license (list license:expat license:asl2.0)))) +(define-public rust-quasi-macros-0.32 + (package + (name "rust-quasi-macros") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quasi_macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p825s96wa9xcc01pm5f4nlb01nx0pah50qnwkbncrw1q9xwiki9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-quasi-codegen" ,rust-quasi-codegen-0.32)) + #:cargo-development-inputs + (("rust-aster" ,rust-aster-0.41) + ("rust-quasi" ,rust-quasi-0.32)))) + (home-page "https://github.com/serde-rs/quasi") + (synopsis "Quasi-quoting macro system") + (description "This package provides a quasi-quoting macro system.") + (license (list license:expat license:asl2.0)))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From a9c713786c1f93b1f1ee3f0041e661779071dbe9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 02:37:46 +0300 Subject: gnu: Add rust-quickcheck-0.9. * gnu/packages/crates-io.scm (rust-quickcheck-0.9): New variable. (rust-quickcheck-0.8, rust-quickcheck-0.7, rust-quickcheck-0.6, rust-quickcheck-0.5, rust-quickcheck-0.2): Inherit from rust-quickcheck-0.9. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 49 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 72daf81ab5..68f61f97e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9678,10 +9678,37 @@ (define-public rust-quick-error-1.2 (license (list license:asl2.0 license:expat)))) -;; Many circular dependencies. -;; Dev dependencies are allowed to have them in crates.io. +(define-public rust-quickcheck-0.9 + (package + (name "rust-quickcheck") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pwl7j21wmf843kpa9gr0byb40hg975ghjrwp0yxcym99bkq6j54")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.7) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-core" ,rust-rand-core-0.5)))) + (home-page "https://github.com/BurntSushi/quickcheck") + (synopsis "Automatic property based testing with shrinking") + (description + "QuickCheck is a way to do property based testing using randomly generated +input. This crate comes with the ability to randomly generate and shrink +integers, floats, tuples, booleans, lists, strings, options and results.") + (license (list license:unlicense license:expat)))) + (define-public rust-quickcheck-0.8 (package + (inherit rust-quickcheck-0.9) (name "rust-quickcheck") (version "0.8.5") (source @@ -9693,24 +9720,16 @@ (define-public rust-quickcheck-0.8 (sha256 (base32 "0mkl4wnvvjk4m32aq3an4ayfyvnmbxnzcybfm7n3fbsndb1xjdcw")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.6) ("rust-log" ,rust-log-0.4) ("rust-rand" ,rust-rand-0.6) - ("rust-rand-core" ,rust-rand-core-0.4)))) - (home-page - "https://github.com/BurntSushi/quickcheck") - (synopsis - "Automatic property based testing with shrinking") - (description - "Automatic property based testing with shrinking.") - (license (list license:expat license:unlicense)))) + ("rust-rand-core" ,rust-rand-core-0.4)))))) (define-public rust-quickcheck-0.7 (package - (inherit rust-quickcheck-0.8) + (inherit rust-quickcheck-0.9) (name "rust-quickcheck") (version "0.7.2") (source @@ -9732,7 +9751,7 @@ (define-public rust-quickcheck-0.7 (define-public rust-quickcheck-0.6 (package - (inherit rust-quickcheck-0.8) + (inherit rust-quickcheck-0.9) (name "rust-quickcheck") (version "0.6.2") (source @@ -9753,7 +9772,7 @@ (define-public rust-quickcheck-0.6 (define-public rust-quickcheck-0.5 (package - (inherit rust-quickcheck-0.8) + (inherit rust-quickcheck-0.9) (name "rust-quickcheck") (version "0.5.0") (source @@ -9773,7 +9792,7 @@ (define-public rust-quickcheck-0.5 (define-public rust-quickcheck-0.2 (package - (inherit rust-quickcheck-0.8) + (inherit rust-quickcheck-0.9) (name "rust-quickcheck") (version "0.2.27") (source -- cgit v1.2.3 From 767a26bd43710028344c3032d104126e0dfc74ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:35:16 +0200 Subject: gnu: rust-quickcheck-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-quickcheck-0.7)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 68f61f97e1..55208f681f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9742,8 +9742,7 @@ (define-public rust-quickcheck-0.7 (base32 "05pqzja6fwdyrs1za5vmxb9ifb993knmpdsrs1fs2wyz9qz7slyl")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.5) ("rust-log" ,rust-log-0.4) ("rust-rand" ,rust-rand-0.5) -- cgit v1.2.3 From 3e374e8d5426ed93134de8d48a7d58ab0d59f3d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:40:23 +0200 Subject: gnu: rust-quickcheck-0.6: Don't skip build. * gnu/packages/crates-io.scm (rust-quickcheck-0.6)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 55208f681f..3f083f0a89 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9763,8 +9763,7 @@ (define-public rust-quickcheck-0.6 (base32 "1dyazm2fcq0v9fscq1a7597zsvdl9f0j8c2bfj1jm2nlzz2sn6y0")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.5) ("rust-log" ,rust-log-0.4) ("rust-rand" ,rust-rand-0.4)))))) -- cgit v1.2.3 From aeeb7017a5c86c8d6da53d174df7a6b7f9f53a1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:45:28 +0200 Subject: gnu: rust-quickcheck-0.5: Don't skip build. * gnu/packages/crates-io.scm (rust-quickcheck-0.5)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3f083f0a89..46930c64ca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9782,8 +9782,7 @@ (define-public rust-quickcheck-0.5 (base32 "1jzm1ygfbn4igaq14b9nipc8yvsn6c8panpgd1qiy5r2insjllyd")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.4) ("rust-log" ,rust-log-0.3) ("rust-rand" ,rust-rand-0.3)))))) -- cgit v1.2.3 From c2c7256cfa345656a01d72decd18fb90d7f1b378 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:50:43 +0200 Subject: gnu: rust-security-framework-sys-0.3: Update to 0.3. * gnu/packages/crates-io.scm (rust-security-framework-sys-0.3): Update to 0.3.3. [arguments]: Add rust-core-foundation-sys-0.6 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46930c64ca..5b9573c10b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11663,7 +11663,7 @@ (define-public rust-seahash-3.0 (define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") - (version "0.3.1") + (version "0.3.3") (source (origin (method url-fetch) @@ -11671,13 +11671,15 @@ (define-public rust-security-framework-sys-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln")))) + "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)))) (home-page "https://lib.rs/crates/security-framework-sys") (synopsis "Apple `Security.framework` low-level FFI bindings") (description - "Apple `Security.framework` low-level FFI bindings.") - (properties '((hidden? . #t))) + "Apple @code{Security.framework} low-level FFI bindings.") (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 62327ddb9cae461e58e19b88776dbea46d58ccfe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:54:06 +0200 Subject: gnu: rust-winapi-x86-64-pc-windows-gnu-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-winapi-x86-64-pc-windows-gnu-0.4) [properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b9573c10b..aa97996537 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15790,7 +15790,6 @@ (define-public rust-winapi-x86-64-pc-windows-gnu-0.4 (description "This package provides import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 718d52982215800591b95f4aa3942da194e4326e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:55:07 +0200 Subject: gnu: rust-winapi-i686-pc-windows-gnu-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-winapi-i686-pc-windows-gnu-0.4) [properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa97996537..66f8cc3072 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15744,7 +15744,6 @@ (define-public rust-winapi-i686-pc-windows-gnu-0.4 (description "This crate provides import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From d9fa136965d92db651fcdddafdb75e0dc9f6a2cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:57:14 +0200 Subject: gnu: rust-wasi-0.5: Don't hide package. * gnu/packages/crates-io.scm (rust-wasi-0.5)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 66f8cc3072..ef76994359 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15383,7 +15383,6 @@ (define-public rust-wasi-0.5 (synopsis "Experimental WASI API bindings for Rust") (description "This package contains experimental WASI API bindings in Rust.") - (properties '((hidden? . #t))) (license license:asl2.0))) (define-public rust-wasm-bindgen-0.2 -- cgit v1.2.3 From 1d6b9dc850d8f3f0040fe5a38bf028cf0715607a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:58:12 +0200 Subject: gnu: rust-void-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-void-1.0)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ef76994359..8f6d096b57 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15312,7 +15312,6 @@ (define-public rust-void-1.0 (synopsis "Void type for use in statically impossible cases") (description "The uninhabited void type for use in statically impossible cases.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-wait-timeout-0.2 -- cgit v1.2.3 From 80fde95df6f858ea7e6d1c63434286606fec0fb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 22:59:36 +0200 Subject: gnu: rust-version-check-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-version-check-0.1)[properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f6d096b57..5833c3d4f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15260,7 +15260,8 @@ (define-public rust-version-check-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) + "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))) + (properties '()))) (define-public rust-version-sync-0.8 (package -- cgit v1.2.3 From 12a56e93a847188a1baf99480be58e58c8afb71b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 23:00:17 +0200 Subject: gnu: rust-version-check-0.9: Don't hide package. * gnu/packages/crates-io.scm (rust-version-check-0.9)[properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5833c3d4f2..21f81b8541 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15244,7 +15244,6 @@ (define-public rust-version-check-0.9 @code{--version}. The path to the compiler is determined first via the @code{RUSTC} environment variable. If it is not set, then @code{rustc} is used. If that fails, no determination is made, and calls return None.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -15260,8 +15259,7 @@ (define-public rust-version-check-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))) - (properties '()))) + "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) (define-public rust-version-sync-0.8 (package -- cgit v1.2.3 From 8a1a681fc66a360c2886a292872e45f7fc7143bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 23:02:47 +0200 Subject: gnu: rust-vec-map-0.8: Don't hide package. * gnu/packages/crates-io.scm (rust-vec-map-0.8)[arguments]: Add rust-serde-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21f81b8541..5bd0e22adc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15215,11 +15215,13 @@ (define-public rust-vec-map-0.8 (base32 "06n8hw4hlbcz328a3gbpvmy0ma46vg1lc0r5wf55900szf3qdiq5")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0)))) (home-page "https://github.com/contain-rs/vec-map") (synopsis "Simple map based on a vector for small integer keys") (description "This package provides a simple map based on a vector for small integer keys.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 91105ccf125339fd47aeb30c5d888f2a62a0659f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 23:05:03 +0200 Subject: gnu: rust-vcpkg-0.2: Update to 0.2.8. * gnu/packages/crates-io.scm (rust-vcpkg-0.2): Update to 0.2.8. [arguments]: Skip tests. Add rust-lazy-static-1, rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5bd0e22adc..c15aee4063 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15183,7 +15183,7 @@ (define-public rust-uuid-0.7 (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) @@ -15191,14 +15191,18 @@ (define-public rust-vcpkg-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "15dzk1b96q946v9aisbd1bbhi33n93wvgziwh1shmscn1xflbp9k")))) + "0s1ijdrsg6917imja2hb07l0z4vbx7ydm8m2i1n9g62fg7r3ki1z")))) (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests want mysql, harfbuzz, graphite2. + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/mcgoo/vcpkg-rs") (synopsis "Find native dependencies in a vcpkg tree at build time") (description "This package provides a library to find native dependencies in a @code{vcpkg} tree at build time in order to be used in Cargo build scripts.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 76a891c9a27f95897777b2b0e41339df3ed2090c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 23:07:03 +0200 Subject: gnu: rust-untrusted-0.7: Don't hide package. * gnu/packages/crates-io.scm (rust-untrusted-0.7)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c15aee4063..b55da5b7d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14992,7 +14992,6 @@ (define-public rust-untrusted-0.7 (description "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.") - (properties '((hidden? . #t))) (license license:isc))) (define-public rust-url-2.1 -- cgit v1.2.3 From da567fc8bcd0fd5e3e928eb0c05e39c87ce6f380 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 22:37:45 +0100 Subject: gnu: bear: Update to 2.4.3. * gnu/packages/build-tools.scm (bear): Update to 2.4.3. --- gnu/packages/build-tools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 342f5f59cd..63dc72e1a7 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Corentin Bocquillon -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Marius Bakke @@ -80,7 +80,7 @@ (define-public bam (define-public bear (package (name "bear") - (version "2.4.2") + (version "2.4.3") (source (origin (method git-fetch) (uri (git-reference @@ -89,7 +89,7 @@ (define-public bear (file-name (git-file-name name version)) (sha256 (base32 - "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1")))) + "19fk4flfykbzhb89ppmzqf0zlrkbjm6ajl9fsayndj9km5ys0041")))) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) -- cgit v1.2.3 From 949e214509d2c48dba4d3833dc7b70f24b1e6b5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 22:41:27 +0100 Subject: gnu: brial: Update to 1.2.7. * gnu/packages/sagemath.scm (brial): Update to 1.2.7. --- gnu/packages/sagemath.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 2cc50f7b6a..47bf9a9c88 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -331,7 +331,7 @@ (define-public zn-poly (define-public brial (package (name "brial") - (version "1.2.6") + (version "1.2.7") (source (origin (method git-fetch) @@ -340,7 +340,7 @@ (define-public brial (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab")))) + (base32 "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 1943a258bb8f12a7f9cd8313ef4ea6da8af60299 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 22:44:33 +0100 Subject: gnu: connman: Update to 1.38. * gnu/packages/connman.scm (connman): Update to 1.38. [inputs]: Add libmnl. --- gnu/packages/connman.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 0098cb8dc7..5f17a0ea95 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,14 +44,14 @@ (define-module (gnu packages connman) (define-public connman (package (name "connman") - (version "1.37") + (version "1.38") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/network/connman/" "connman-" version ".tar.xz")) (sha256 - (base32 "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc")))) + (base32 "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -74,6 +74,7 @@ (define-public connman ("glib" ,glib) ("gnutls" ,gnutls) ("iptables" ,iptables) + ("libmnl" ,libmnl) ("readline" ,readline) ;; These inputs are needed for connman to include the interface to ;; these technologies so IF they are installed they can be used. -- cgit v1.2.3 From f6516d7954a70318aa085d584c4b3f245b285121 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 22:54:31 +0100 Subject: gnu: uefitool: Update to 0.27.0. * gnu/packages/flashing-tools.scm (uefitool): Update to 0.27.0. --- gnu/packages/flashing-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 2b1338d387..f993912838 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -447,7 +447,7 @@ (define-public me-cleaner (define-public uefitool (package (name "uefitool") - (version "0.26.0") + (version "0.27.0") (source (origin (method git-fetch) (uri (git-reference @@ -455,7 +455,7 @@ (define-public uefitool (commit version))) (sha256 (base32 - "1ka7i12swm9r5bmyz5vjr82abd2f3lj8p35f4208byalfbx51yq7")) + "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ba0b9d410fd608198cdadd5fa0968408a096527e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 23:12:08 +0100 Subject: gnu: packagekit: Update to 1.1.13. * gnu/packages/freedesktop.scm (packagekit): Update to 1.1.13. --- 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 24f33efe35..9d714c38ca 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -506,7 +506,7 @@ (define (source-file regexp) (define-public packagekit (package (name "packagekit") - (version "1.1.12") + (version "1.1.13") (source (origin (method url-fetch) (uri (string-append @@ -515,7 +515,7 @@ (define-public packagekit "PackageKit-" version ".tar.xz")) (sha256 (base32 - "00css16dv3asaxrklvyxy9dyjzhw82wmfrqxqpca9w2xryz58i8z")))) + "1dr1laic65ld95abp2yxbwvijnngh0dwyb1x49x4wjm5rhq43dl8")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From ecc8c5d4340501a7ffcb0333edbc83765c9d0a1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 00:04:45 +0100 Subject: gnu: aspell-dict-da: Update to 1.6.36-11-0. * gnu/packages/aspell.scm (aspell-dict-da): Update to 1.6.36-11-0. --- gnu/packages/aspell.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index c88b8a25a2..b11a2dbe6b 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -183,11 +183,10 @@ (define-public aspell-dict-de (define-public aspell-dict-da (aspell-dictionary "da" "Danish" - #:version "1.4.42-1" - #:prefix "aspell5-" + #:version "1.6.36-11-0" #:sha256 (base32 - "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"))) + "1xz2haayvwlxgss9jf1x2311a1ixbk75q2vgfprjhibsmb7cpinv"))) (define-public aspell-dict-el (aspell-dictionary "el" "Greek" -- cgit v1.2.3 From 0724b73d832504e229c6c53be02803527617544c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 00:31:28 +0100 Subject: gnu: btrfs-progs: Update to 5.4.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.4.1. --- 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 a1920dba35..aff8fd08fc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4095,7 +4095,7 @@ (define-public gpm (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.4") + (version "5.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -4103,7 +4103,7 @@ (define-public btrfs-progs "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg")))) + "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit v1.2.3 From f4db0a7b20cf7bf6d75042e9e1413a11882ba989 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 00:51:52 +0100 Subject: gnu: dovecot: Update to 2.3.9.3 [fixes CVE-2020-7046 & CVE-2020-7957]. * gnu/packages/mail.scm (dovecot): Update to 2.3.9.3. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a9f9e5e5c..43272b1856 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1388,7 +1388,7 @@ (define-public exim (define-public dovecot (package (name "dovecot") - (version "2.3.9.2") + (version "2.3.9.3") (source (origin (method url-fetch) @@ -1396,7 +1396,7 @@ (define-public dovecot (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1yc6hi4hqg4hcc4495sf4m5f1lnargphi6dawj43if21vncgp127")))) + (base32 "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 88a4ec2ce6f9ae6ca5603a07969f9abbb6d675e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 00:54:42 +0100 Subject: gnu: emacs-sml-mode: Update to 6.10. * gnu/packages/emacs-xyz.scm (emacs-sml-mode): Update to 6.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f632bdd6ff..40f604df76 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14686,14 +14686,14 @@ (define-public emacs-slime-company (define-public emacs-sml-mode (package (name "emacs-sml-mode") - (version "6.9") + (version "6.10") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/sml-mode-" version ".el")) (sha256 - (base32 "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij")))) + (base32 "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/sml-mode.html") (synopsis "Major mode for editing (Standard) ML") -- cgit v1.2.3 From 4445b3a7f49951097fa3e16f0824e45cf1ce8bec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 00:58:34 +0100 Subject: gnu: freeciv: Update to 2.6.2. * gnu/packages/games.scm (freeciv): Update to 2.6.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3ec7f18fa2..dfc9f9beba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4190,7 +4190,7 @@ (define-public kobodeluxe (define-public freeciv (package (name "freeciv") - (version "2.6.1") + (version "2.6.2") (source (origin (method url-fetch) @@ -4202,7 +4202,7 @@ (define-public freeciv (version-major+minor version) "/" version "/freeciv-" version ".tar.bz2"))) (sha256 - (base32 "1qmrhrwm0ryvsh1zsxcxj128lhyvaxap7k39sam3hh8rl0fq9rnc")))) + (base32 "13vc2xg1cf19rhbnr7k38b56b2hdapqymq5vma1l69kn7hyyz0b1")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From b6f1c6bb943b9f624af74f88e45cc7f2145d2ab2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 01:09:45 +0100 Subject: gnu: wesnoth: Update to 1.14.11. * gnu/packages/games.scm (wesnoth): Update to 1.14.11. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dfc9f9beba..fe32fb9687 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2582,7 +2582,7 @@ (define-public gnujump (define-public wesnoth (package (name "wesnoth") - (version "1.14.9") + (version "1.14.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -2591,7 +2591,7 @@ (define-public wesnoth "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga")))) + "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no check target -- cgit v1.2.3 From fb31d11b91689e641fe1ad801bb0639b645c9955 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 17 Feb 2020 19:28:11 -0500 Subject: gnu: MPD: Update to 0.21.20. * gnu/packages/mpd.scm (mpd): Update to 0.21.20. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e7154fd892..fe670f6aae 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.19") + (version "0.21.20") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1ydjamnc8gs9cxbhin7h51119hmfynsg7b8c4pgasdsnv08mw9yk")))) + "1q8hwl3i0a4qzdwfh44r0nh5zd2mm3rraqw5qvmz6qfrjslz0bj2")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From 540d41d8d980f0e7de2ded3c7aab8ab16d967f3e Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 17 Feb 2020 14:11:26 +0100 Subject: gnu: Add surgescript. * gnu/packages/game-development.scm (surgescript): New variable. --- gnu/packages/game-development.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6fa4fed74f..24527abae1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -585,6 +585,34 @@ (define-public sfxr (home-page "http://www.drpetter.se/project_sfxr.html") (license license:expat))) +(define-public surgescript + (package + (name "surgescript") + (version "0.5.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alemart/surgescript.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13q81439zg1bn7gskligskjgcfq0rdapp6f3llmrlk48vnyq49s0")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (let ((share (string-append (assoc-ref %outputs "out") "/share"))) + (list (string-append "-DICON_PATH=" share "/pixmaps") + (string-append "-DMETAINFO_PATH=" share "/metainfo"))) + #:tests? #f)) + (home-page "https://docs.opensurge2d.org") + (synopsis "Scripting language for games") + (description "@code{SurgeScript} is a dynamically typed object-oriented +scripting language designed for games. Each object is a state machine that +can be customized by attaching other objects. The language supports automatic +garbage collection and can be extended with plugins.") + (license license:asl2.0))) + (define-public physfs (package (name "physfs") -- cgit v1.2.3 From a02ca03318faa77ab5ef06f4b7a3beed0c7db029 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 17 Feb 2020 14:11:27 +0100 Subject: gnu: Add opensurge. * gnu/packages/games.scm (opensurge): New variable. --- gnu/packages/games.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fe32fb9687..66495489e8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -856,6 +856,74 @@ (define-public meandmyshadow shadow mimic them to reach blocks you couldn't reach alone.") (license license:gpl3+))) +(define-public opensurge + (package + (name "opensurge") + (version "0.5.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alemart/opensurge.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ih7hlqjnp9rv0m4lqf7c0s1ai532way5i4pk45jq1gqm8325dbv")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin") + (string-append "-DGAME_DATADIR=" share "/" ,name) + (string-append "-DDESKTOP_ENTRY_PATH=" share "/applications") + (string-append "-DDESKTOP_ICON_PATH=" share "/pixmaps") + (string-append "-DDESKTOP_METAINFO_PATH=" share "/metainfo"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-xdg-open-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Look for xdg-open in the store. + (substitute* "src/core/web.c" + (("/usr(/bin/xdg-open)" _ bin) + (string-append (assoc-ref inputs "xdg-utils") bin))) + #t)) + (add-after 'unpack 'unbundle-fonts + (lambda* (#:key inputs #:allow-other-keys) + ;; Replace bundled Roboto fonts with links to the store. + (with-directory-excursion "fonts" + (let ((roboto-dir (string-append + (assoc-ref inputs "font-google-roboto") + "/share/fonts/truetype/"))) + (for-each + (lambda (font) + (delete-file font) + (symlink (string-append roboto-dir font) font)) + '("Roboto-Black.ttf" "Roboto-Bold.ttf" "Roboto-Medium.ttf"))) + #t)))))) + (inputs + `(("allegro" ,allegro) + ("font-google-roboto" ,font-google-roboto) + ("surgescript" ,surgescript) + ("xdg-utils" ,xdg-utils))) + (home-page "https://opensurge2d.org") + (synopsis "2D retro side-scrolling game") + (description "@code{Open Surge} is a 2D retro side-scrolling platformer +inspired by the Sonic games. The player runs at high speeds through each +level while collecting items and avoiding obstacles. The game includes a +built-in level editor.") + (license + ;; Code is under GPL 3+, assets are under various licenses. + ;; See src/misc/credits.c for details. + (list license:gpl3+ + license:cc0 + license:cc-by3.0 + license:cc-by-sa3.0 + license:expat + license:public-domain + license:silofl1.1)))) + (define-public knights (package (name "knights") -- cgit v1.2.3 From e9126381574b36026b88b85b78731b791e34248e Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 21:47:10 +0100 Subject: gnu: osinfo-db-tools: Add osinfo-db-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (osinfo-db-tools): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/virtualization.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0e075c3af4..dfbe855375 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages assembly) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -1383,3 +1385,37 @@ (define (filter-environment! filter-predicate ;; TODO: Some files are licensed differently. List those. (license license:gpl2) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")))) + +(define-public osinfo-db-tools + (package + (name "osinfo-db-tools") + (version "1.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-tools-" + version ".tar.xz")) + + (sha256 + (base32 + "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab")))) + (build-system meson-build-system) + (inputs + `(("libsoup" ,libsoup) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("json-glib" ,json-glib) + ("libarchive" ,libarchive))) + (native-inputs + `(("perl" ,perl) + ("gobject-introspection" ,gobject-introspection) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ;; Tests + ("python" ,python) + ("pytest" ,python-pytest) + ("requests" ,python-requests))) + (home-page "https://gitlab.com/libosinfo/osinfo-db-tools") + (synopsis "Tools for managing the osinfo database") + (description "This package contains a set of tools to assist +administrators and developers in managing the database.") + (license license:lgpl2.0+))) -- cgit v1.2.3 From a838fa282c626116308dd2d1b0012d7df6f044a0 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 21:47:11 +0100 Subject: gnu: osinfo-db: Add osinfo-db. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (osinfo-db): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/virtualization.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index dfbe855375..11bf38144d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -93,6 +93,7 @@ (define-module (gnu packages virtualization) #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -1419,3 +1420,39 @@ (define-public osinfo-db-tools (description "This package contains a set of tools to assist administrators and developers in managing the database.") (license license:lgpl2.0+))) + +(define-public osinfo-db + (package + (name "osinfo-db") + (version "20200203") + (source (origin + (method url-fetch) + (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" + version ".tar.xz")) + (sha256 + (base32 + "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (osinfo-dir (string-append out "/share/osinfo")) + (source (assoc-ref %build-inputs "source")) + (osinfo-db-import + (string-append (assoc-ref %build-inputs "osinfo-db-tools") + "/bin/osinfo-db-import"))) + (mkdir-p osinfo-dir) + (invoke osinfo-db-import "--dir" osinfo-dir source) + #t)))) + (native-inputs + `(("intltool" ,intltool) + ("osinfo-db-tools" ,osinfo-db-tools))) + (home-page "https://gitlab.com/libosinfo/osinfo-db") + (synopsis "Database of information about operating systems") + (description "Osinfo-db provides the database files for use with the +libosinfo library. It provides information about guest operating systems for +use with virtualization provisioning tools") + (license license:lgpl2.0+))) -- cgit v1.2.3 From da6f9aceb4851fb475dbbdcbf9ded73c9230d3de Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 21:47:12 +0100 Subject: gnu: libosinfo: Include operating systems list. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (libosinfo)[inputs]: Add osinfo-db and remove gobject-introspection. [native-inputs]: Add gobject-introspection. [arguments]: Add phase patch. squash! gnu: virt-manager: Include operating systems list. Signed-off-by: Jakub Kądziołka --- gnu/packages/virtualization.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 11bf38144d..d3f474d17a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -329,14 +329,24 @@ (define-public libosinfo (list (string-append "-Dwith-usb-ids-path=" (assoc-ref %build-inputs "usb.ids")) (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))))) + (assoc-ref %build-inputs "pci.ids"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-osinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" (assoc-ref inputs "osinfo-db") + "/share/osinfo\";"))) + #t))))) (inputs `(("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("gobject-introspection" ,gobject-introspection))) + ("osinfo-db" ,osinfo-db))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) ("vala" ,vala) ("intltool" ,intltool) -- cgit v1.2.3 From 8d1b22b27fba3d1e4310f02a5897d231b42ca117 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Feb 2020 11:21:27 +0200 Subject: doc: Document packaging guidelines for Rust crates. * doc/contributing.texi (Rust Crates): New section. --- doc/contributing.texi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/doc/contributing.texi b/doc/contributing.texi index c6586a2adf..a0d0925941 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -347,6 +347,7 @@ needed is to review and apply the patch. * Python Modules:: A touch of British comedy. * Perl Modules:: Little pearls. * Java Packages:: Coffee break. +* Rust Crates:: Beware of oxidation. * Fonts:: Fond of fonts. @end menu @@ -685,6 +686,40 @@ dashes and prepend the prefix @code{java-}. So the class @code{java-apache-commons-cli}. +@node Rust Crates +@subsection Rust Crates + +@cindex rust +Rust programs standing for themselves are named as any other package, using the +lowercase upstream name. + +To prevent namespace collisions we prefix all other Rust packages with the +@code{rust-} prefix. The name should be changed to lowercase as appropriate and +dashes should remain in place. + +In the rust ecosystem it is common for multiple incompatible versions of a +package to be used at any given time, so all packages should have a versioned +suffix. If a package has passed version 1.0.0 then just the major version +number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix +should contain both the major and minor version (e.g.@: @code{rust-rand-0.6}). + +Because of the difficulty in reusing rust packages as pre-compiled inputs for +other packages the Cargo build system (@pxref{Build Systems, +@code{cargo-build-system}}) presents the @code{#:cargo-inputs} and +@code{cargo-development-inputs} keywords as build system arguments. It would be +helpful to think of these as similar to @code{propagated-inputs} and +@code{native-inputs}. Rust @code{dependencies} and @code{build-dependencies} +should go in @code{#:cargo-inputs}, and @code{dev-dependencies} should go in +@code{#:cargo-development-inputs}. If a Rust package links to other libraries +then the standard placement in @code{inputs} and the like should be used. + +Care should be taken to ensure the correct version of dependencies are used; to +this end we try to refrain from skipping the tests or using @code{#:skip-build?} +when possible. Of course this is not always possible, as the package may be +developed for a different Operating System, depend on features from the Nightly +Rust compiler, or the test suite may have atrophied since it was released. + + @node Fonts @subsection Fonts -- cgit v1.2.3 From 00dcd11d8a23b34a16e18ab1d6055f8abe430dc8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:05:26 +0200 Subject: gnu: rust-unreachable-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-unreachable-1.0)[arguments]: Add rust-void-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b55da5b7d2..cfe6e185c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14944,11 +14944,13 @@ (define-public rust-unreachable-1.0 (base32 "0mps2il4xy2mjqc3appas27hhn2xmvixc3bzzhfrjj74gy3i0a1q")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-void" ,rust-void-1.0)))) (home-page "https://github.com/reem/rust-unreachable") (synopsis "Unreachable code optimization hint in rust") (description "This package provides an unreachable code optimization hint in rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 983935ced0f8832bf83b5a08e4323a8d68a35b3d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:06:29 +0200 Subject: gnu: rust-unindent-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-unindent-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfe6e185c0..56c3745a99 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14927,7 +14927,6 @@ (define-public rust-unindent-0.1 (synopsis "Remove a column of leading whitespace from a string") (description "This crate allows you to remove a column of leading whitespace from a string.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From f4fc57db6245d90fdccb6692adcdc2fb484c4d1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:09:26 +0200 Subject: gnu: rust-unicode-width-0.1: Upgrade to 0.1.7. * gnu/packages/crates-io.scm (rust-unicode-width-0.1)[arguments]: Add rust-compiler-builtins-0.1, rust-rustc-std-workspace-core-1.0, rust-rustc-std-workspace-std-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 56c3745a99..4e6421fa23 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14844,7 +14844,7 @@ (define-public rust-unicode-segmentation-1.3 (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -14852,13 +14852,17 @@ (define-public rust-unicode-width-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "082f9hv1r3gcd1xl33whjhrm18p0w9i77zhhhkiccb5r47adn1vh")))) + "0yflmxkxmm89ckrb3sz58whn491aycrj8cxra0hzzlb72x9rvana")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) + ("rust-rustc-std-workspace-std" ,rust-rustc-std-workspace-std-1.0)))) (home-page "https://github.com/unicode-rs/unicode-width") (synopsis "Determine displayed width according to Unicode rules") (description "This crate allows you to determine displayed width of @code{char} and @code{str} types according to Unicode Standard Annex #11 rules.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 545c7a4e4a7c4877eec63fb0a85054c9f63c6542 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:36:16 +0200 Subject: gnu: rust-ucd-util-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-ucd-util-0.1): Update to 0.1.7. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4e6421fa23..9cef43a90b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14685,7 +14685,7 @@ (define-public rust-ucd-trie-0.1 (define-public rust-ucd-util-0.1 (package (name "rust-ucd-util") - (version "0.1.5") + (version "0.1.7") (source (origin (method url-fetch) @@ -14693,13 +14693,12 @@ (define-public rust-ucd-util-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0x088q5z0m09a2jqcfgsnq955y8syn1mgn35cl78qinkxm4kp6zs")))) + "13ng291mkc9b132jjf4laj76f5nqm5qd2447rm8bry3wxbdc5kaw")))) (build-system cargo-build-system) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "library for working with the Unicode character database") (description "This package provides a small utility library for working with the Unicode character database.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From dea8c812e6900f67f11338ee7c6490cac3f91a96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:38:24 +0200 Subject: gnu: rust-ucd-trie-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-ucd-trie-0.1)[arguments]: Add rust-lazy-static-1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cef43a90b..caf94ea6d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14674,11 +14674,13 @@ (define-public rust-ucd-trie-0.1 (base32 "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "Trie for storing Unicode codepoint sets and maps") (description "This package provides a trie for storing Unicode codepoint sets and maps.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 24b105ce5fc37fae4befcf163e654894d71b4363 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:39:25 +0200 Subject: gnu: rust-typenum-1.10: Don't hide package. * gnu/packages/crates-io.scm (rust-typenum-1.10)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index caf94ea6d4..1013489008 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14631,7 +14631,6 @@ (define-public rust-typenum-1.10 compile time. It currently supports bits, unsigned integers, and signed integers. It also provides a type-level array of type-level numbers, but its implementation is incomplete.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 4479f8270b31eb54b90873deb59929202060bc2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:41:03 +0200 Subject: gnu: rust-typeable-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-typeable-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1013489008..3a455f3f52 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14566,7 +14566,6 @@ (define-public rust-typeable-0.1 (home-page "https://github.com/reem/rust-typeable") (synopsis "Exposes Typeable, for getting TypeIds at runtime") (description "Exposes Typeable, for getting TypeIds at runtime.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-typed-arena-1.4 -- cgit v1.2.3 From 9dbe9948b551ad3acca2a1dbb0f9fd4c4b4cffed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:41:41 +0200 Subject: gnu: rust-try-lock-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-try-lock-0.2)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a455f3f52..d443ea136f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14518,7 +14518,6 @@ (define-public rust-try-lock-0.2 (synopsis "Lightweight atomic lock") (description "This package provides a lightweight atomic lock.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-trybuild-1.0 -- cgit v1.2.3 From d6aa45aa804b1da7c6bcbdfd57cba7ee883bc879 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:44:06 +0200 Subject: gnu: rust-try-from-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-try-from-0.3)[arguments]: Add rust-cfg-if-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d443ea136f..c167724521 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14494,11 +14494,13 @@ (define-public rust-try-from-0.3 (base32 "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1)))) (home-page "https://github.com/derekjw/try_from") (synopsis "TryFrom and TryInto traits for failable conversions") (description - "TryFrom and TryInto traits for failable conversions that return a Result.") - (properties '((hidden? . #t))) + "TryFrom and TryInto traits for failable conversions that return a Result.") (license license:expat))) (define-public rust-try-lock-0.2 -- cgit v1.2.3 From 5584bf569ab73a42712de5b7b167eea4828be63d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:46:28 +0200 Subject: gnu: rust-tracing-core-0.1: Upgrade to 0.1.9. * gnu/packages/crates-io.scm (rust-tracing-core-0.1): Update to 0.1.9. [arguments]: Add rust-lazy-static-1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c167724521..0b04ec1722 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14444,7 +14444,7 @@ (define-public rust-toml-0.5 (define-public rust-tracing-core-0.1 (package (name "rust-tracing-core") - (version "0.1.2") + (version "0.1.9") (source (origin (method url-fetch) @@ -14452,13 +14452,15 @@ (define-public rust-tracing-core-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi")))) + "0y0rcvvqq89yaiz0qdx88byxgz8j6hsm9slq8d5vvf3jwc8nz90k")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://tokio.rs") (synopsis "Core primitives for application-level tracing") (description "Core primitives for application-level tracing.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From d4bcf8951952ae8ea9dc79e4449f88a32ec653d1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:48:36 +0200 Subject: gnu: rust-tokio-mock-task-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-tokio-mock-task-0.1)[arguments]: Add rust-futures-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0b04ec1722..23a70a0850 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14072,10 +14072,12 @@ (define-public rust-tokio-mock-task-0.1 (base32 "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1)))) (home-page "https://github.com/carllerche/tokio-mock-task") (synopsis "Mock a Tokio task") - (description "Mock a Tokio task") - (properties '((hidden? . #t))) + (description "Mock a Tokio task.") (license license:expat))) (define-public rust-tokio-process-0.2 -- cgit v1.2.3 From 23b9d9271a46b7f703c01d975f2e1d5b2f67b83b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:50:10 +0200 Subject: gnu: rust-threadpool-1.7: Don't hide package. * gnu/packages/crates-io.scm (rust-threadpool-1.7)[arguments]: Add rust-num-cpus-1.11 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23a70a0850..346a4f2385 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13715,12 +13715,14 @@ (define-public rust-threadpool-1.7 (base32 "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-cpus" ,rust-num-cpus-1.11)))) (home-page "https://github.com/rust-threadpool/rust-threadpool") (synopsis "Thread pool for running jobs on a fixed set of worker threads") (description "This package provides a thread pool for running a number of jobs on a fixed set of worker threads.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 9e6ba02cd78bb4b5180d0cdbb6b071d7f032f698 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:53:51 +0200 Subject: gnu: rust-thread-id-3.3: Don't hide package. * gnu/packages/crates-io.scm (rust-thread-id-3.3)[arguments]: Add rust-libc-0.2, rust-redox-syscall-0.1, rust-winapi-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 346a4f2385..42f0f6ebbe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13654,12 +13654,16 @@ (define-public rust-thread-id-3.3 (base32 "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/ruuda/thread-id") (synopsis "Get a unique ID for the current thread in Rust") (description "For diagnostics and debugging it can often be useful to get an ID that is different for every thread.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 71e932df859fac23492c2bd671a4ddb39a972aa7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 10:58:20 +0200 Subject: gnu: rust-termios-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-termios-0.3)[arguments]: Add rust-libc-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 42f0f6ebbe..ac62d424a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13554,6 +13554,9 @@ (define-public rust-termios-0.3 (base32 "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/dcuddeback/termios-rs") (synopsis "Safe bindings for the termios library") (description @@ -13561,7 +13564,6 @@ (define-public rust-termios-0.3 to the terminal I/O interface implemented by Unix operating systems. The safe bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-test-assembler-0.1 -- cgit v1.2.3 From 96737ce3be794d3fdb9c01a8301472d1bdf36d02 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:03:46 +0200 Subject: gnu: rust-termion-1.5: Upgrade to 1.5.5. * gnu/packages/crates-io.scm (rust-termion-1.5): Upgrade to 1.5.5. [arguments]: Skip tests. Add rust-libc-0.2, rust-numtoa-0.1, rust-redox-syscall-0.1, rust-redox-termios-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac62d424a7..c438925642 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13524,7 +13524,7 @@ (define-public rust-termcolor-1.0 (define-public rust-termion-1.5 (package (name "rust-termion") - (version "1.5.3") + (version "1.5.5") (source (origin (method url-fetch) @@ -13532,13 +13532,19 @@ (define-public rust-termion-1.5 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0c634rg520zjjfhwnxrc2jbfjz7db0rcpsjs1qici0nyghpv53va")))) + "01f9787d5nx445bqbj644v38bn0hl2swwjy9baz0dnbqi6fyqb62")))) (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests want a terminal. + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-numtoa" ,rust-numtoa-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-redox-termios" ,rust-redox-termios-0.1)))) (home-page "https://gitlab.redox-os.org/redox-os/termion") (synopsis "Library for manipulating terminals") (description "This package provides a bindless library for manipulating terminals.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-termios-0.3 -- cgit v1.2.3 From 25b4a363e15d3428ec825d5f07e2974854ade618 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:09:48 +0200 Subject: gnu: rust-tar-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-tar-0.4)[arguments]: Skip tests. Add rust-filetime-0.2, rust-libc-0.2, rust-redox-syscall-0.1, rust-xattr-0.2 to cargo-inputs. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c438925642..1d6df2c542 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13239,6 +13239,15 @@ (define-public rust-tar-0.4 (base32 "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk")))) (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Test tarballs not included in crate. + #:cargo-inputs + (("rust-filetime" ,rust-filetime-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-xattr" ,rust-xattr-0.2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/alexcrichton/tar-rs") (synopsis "Tar file reading/writing for Rust") (description @@ -13247,7 +13256,6 @@ (define-public rust-tar-0.4 over all I/O readers and writers. Additionally, great lengths are taken to ensure that the entire contents are never required to be entirely resident in memory all at once.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 4fe024bea40e070d0f595708e7f53d61f860854d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:10:45 +0200 Subject: gnu: rust-synstructure-test-traits-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-synstructure-test-traits-0.1) [properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d6df2c542..98b92101ae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13071,7 +13071,6 @@ (define-public rust-synstructure-test-traits-0.1 (synopsis "Helper test traits for synstructure doctests") (description "This package provides helper test traits for synstructure doctests.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-syntex-0.58 -- cgit v1.2.3 From a4c4b47b122347599e33d1ed6358053619de9f7f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:15:11 +0200 Subject: gnu: rust-owning-ref-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-owning-ref-0.4)[arguments]: Add rust-stable-deref-trait-1.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98b92101ae..e4c9dffaca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8454,13 +8454,15 @@ (define-public rust-owning-ref-0.4 (base32 "04zgwy77lin8qz398s6g44467pd6kjhbrlqifkia5rkr47mbi929")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-stable-deref-trait" ,rust-stable-deref-trait-1.1)))) (home-page "https://github.com/Kimundi/owning-ref-rs") (synopsis "Create references that carry their owner with them") (description "This package provides a library for creating references that carry their owner with them. This can sometimes be useful because Rust borrowing rules normally prevent moving a type that has been borrowed from.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-packed-simd-0.3 -- cgit v1.2.3 From 028b0deebbcff0c28c698c955644749a798faa71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:17:41 +0200 Subject: gnu: rust-nodrop-union-0.1: Upgrade to 0.1.11. * gnu/packages/crates-io.scm (rust-nodrop-union-0.1): Upgrade to 0.1.11. [arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4c9dffaca..3f87b38ec4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7772,12 +7772,10 @@ (define-public rust-nodrop-0.1 (license (list license:asl2.0 license:expat)))) -;; This package requires features which are unavailable -;; on the stable releases of Rust. (define-public rust-nodrop-union-0.1 (package (name "rust-nodrop-union") - (version "0.1.10") + (version "0.1.11") (source (origin (method url-fetch) @@ -7785,14 +7783,14 @@ (define-public rust-nodrop-union-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7")))) + "1h59pph19rxanyqcaid8pg73s7wmzdx3zhjv5snlim5qx606zxkc")))) (build-system cargo-build-system) + (arguments (#:skip-build? #t)) ; Depends on features not in stable Rust. (home-page "https://github.com/bluss/arrayvec") (synopsis "Wrapper type to inhibit drop (destructor)") (description "This package provides a wrapper type to inhibit drop -(destructor). Implementation crate for nodrop, the untagged unions +(destructor). Implementation crate for @code{nodrop}, the untagged unions implementation (which is unstable / requires nightly).") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From d7eff648ba9e4cb4b5d39c94a95af7e3f12b9641 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:22:57 +0200 Subject: gnu: rust-futures-core-preview-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-futures-core-preview-0.3)[arguments]: Skip tests. [properties]: Remove field. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3f87b38ec4..b627540647 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4350,11 +4350,11 @@ (define-public rust-futures-core-preview-0.3 (base32 "1xaq8m609k6cz8xydwhwp8xxyxigabcw1w9ngycfy0bnkg7iq52b")))) (build-system cargo-build-system) + (arguments '(#:tests? #f)) (home-page "https://rust-lang-nursery.github.io/futures-rs/") (synopsis "Core traits and types in for the @code{futures} library.") (description "This crate provides the core traits and types in for the @code{futures} library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From c70f056428f6fe35f1ba9a6b63fa6a5380f16cf2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:24:19 +0200 Subject: gnu: rust-futures-core-io-preview-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-futures-io-preview-0.3) [properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b627540647..99bc13a689 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4452,7 +4452,6 @@ (define-public rust-futures-io-preview-0.3 (synopsis "Async read and write traits for the futures library") (description "This crate provides the @code{AsyncRead} and @code{AsyncWrite} traits for the @code{futures-rs} library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From b1d617baea3cb7e72a95c6e119d2be7163b5692a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 11:26:00 +0200 Subject: gnu: rust-futures-sink-preview-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-futures-sink-preview-0.3)[arguments]: Add rust-futures-core-preview-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 99bc13a689..a54789fc88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4517,12 +4517,14 @@ (define-public rust-futures-sink-preview-0.3 (base32 "1r4d0gy73hdxkh5g1lrhl1kjnwp6mywjgcj70v0z78b921da42a3")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures-core-preview" ,rust-futures-core-preview-0.3)))) (home-page "https://rust-lang-nursery.github.io/futures-rs/") (synopsis "Asynchronous `Sink` trait for the futures-rs library") (description "This package provides the asynchronous @code{Sink} trait for the futures-rs library.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 668740cc055b59a6d343fb256881c3632e050459 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:25:23 +0100 Subject: gnu: guile-ssh: Update to 0.12.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.12.0, [source]: remove snippet that were integrated upstream, [arguments]: Add a fix-guile-path phase to fix tests. (guile3.0-ssh)[arguments]: Remove as this is fixed upstream. --- gnu/packages/ssh.scm | 63 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index eae2f98b53..4b1e02be16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ (define-public openssh (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.3") + (version "0.12.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -237,31 +238,12 @@ (define-public guile-ssh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; libssh >= 0.8.0 no longer provides libssh_threads: see - ;; . - (substitute* "libguile-ssh/Makefile.am" - (("-lssh_threads") "")) - - ;; This test would wrongfully pick DSS keys when running on - ;; libssh >= 0.8.0, which fails: - ;; . - (substitute* "tests/server.scm" - (("= %libssh-minor-version 7") - ">= %libssh-minor-version 7")) - - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*$") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(;; It makes no sense to build libguile-ssh.a. + `(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -280,6 +262,15 @@ (define-public guile-ssh (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile"))) + #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -322,32 +313,6 @@ (define-public guile3.0-ssh (package (inherit guile-ssh) (name "guile3.0-ssh") - (arguments - (substitute-keyword-arguments (package-arguments guile-ssh) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'bootstrap 'delete-old-guile-m4 - (lambda _ - ;; The old 'guile.m4' that's shipped would fail to recognize - ;; Guile 2.9 as "3.0". - (delete-file "m4/guile.m4") - #t)) - (add-before 'build 'adjust-for-guile3 - (lambda _ - ;; Adjust for things that are deprecated in 2.2 and removed in - ;; 3.0. - (substitute* "tests/common.scm" - (("define-module \\(tests common\\)") - "define-module (tests common) - #:use-module (ice-9 threads)\n")) - (substitute* "modules/ssh/tunnel.scm" - (("define-module \\(ssh tunnel\\)") - "define-module (ssh tunnel) - #:use-module (ice-9 threads)")) - (substitute* "modules/srfi/srfi-64.upstream.scm" - (("_IOLBF") - "'line")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From 10cdf1408047f16e02d097c4cd23c8efcddb5814 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. * gnu/packages/ssh.scm (guile-ssh)[native-inputs]: Add guile. --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4b1e02be16..90714a4a92 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -291,7 +291,8 @@ (define-public guile-ssh ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 85e887ddc7037dcf285025ba8eecc0946a1b74fb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:47:32 +0100 Subject: gnu: guile-git: Fix cross-compilation. * gnu/packages/guile.scm (guile-git)[native-inputs]: Add guile and guile-bytestructures. --- gnu/packages/guile.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 289158ea1b..a5466f8672 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -654,7 +654,9 @@ (define-public guile-git "0c5i3d16hp7gp9rd78vk9zc45js8bphf92m4lbb5gyi4l1yl7kkm")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("guile" ,guile-2.2) + ("guile-bytestructures" ,guile-bytestructures))) (inputs `(("guile" ,guile-2.2) ("libgit2" ,libgit2))) -- cgit v1.2.3 From 01005f426958ab9e12f44c5e4a60ec1cdd605d5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 13:31:41 +0200 Subject: gn: edirect: Update to 12.1.20190829. The previous version has disappeared upstream. * gnu/packages/bioinformatics.scm (edirect): Update to 12.1.20190829. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 065555b37b..2ee4f14d25 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2744,7 +2744,7 @@ (define-public eigensoft (define-public edirect (package (name "edirect") - (version "12.1.20190819") + (version "12.1.20190829") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" @@ -2752,7 +2752,7 @@ (define-public edirect "/edirect-" version ".tar.gz")) (sha256 (base32 - "1i9s9mppcfqd60pfywpm8vdyz5vpnyslw22nd7dv0bhykrdnkz9g")))) + "1xb330z28dgp7slrvp8r7rgncsasv9lpcpqim571yg728dq7xdik")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 49380a3a8613d1a9e13007fe3b4bf094ba9b3ffd Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 19:50:05 +0300 Subject: gnu: Add rust-named-pipe-0.4. * gnu/packages/crates-io.scm (rust-named-pipe-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a54789fc88..e35cf774b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7430,6 +7430,29 @@ (define-public rust-modifier-0.1 "Chaining APIs for both self -> Self and &mut self methods.") (license license:expat))) +(define-public rust-named-pipe-0.4 + (package + (name "rust-named-pipe") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "named-pipe" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0azby10wzmsrf66m1bysbil0sjfybnvhsa8py093xz4irqy4975d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Only builds on Windows. + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/blackbeam/named_pipe") + (synopsis "Wrapper for overlapped (asyncronous) IO of Windows's named pipes") + (description "This package provides a wrapper for overlapped (asyncronous) +IO of Windows's named pipes.") + (license (list license:expat license:asl2.0)))) + (define-public rust-natord-1.0 (package (name "rust-natord") -- cgit v1.2.3 From 15b6bb4198e9eeed80c249e46ececfd054018d10 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 20:56:01 +0300 Subject: gnu: Add rust-shared-library-0.1. * gnu/packages/crates-io.scm (rust-shared-library-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e35cf774b5..ae00f6b360 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12172,6 +12172,30 @@ (define-public rust-shared-child-0.3 "A library for using child processes from multiple threads.") (license license:expat))) +(define-public rust-shared-library-0.1 + (package + (name "rust-shared-library") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "shared_library" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04fs37kdak051hm524a360978g58ayrcarjsbf54vqps5c7px7js")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/tomaka/shared_library/") + (synopsis "Bind to and load shared libraries") + (description + "This package allows easy binding to, and loading of, shared libraries.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From 2ebb82cae308c8a10d73626b461c668c301483c8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 Feb 2020 14:06:51 +0200 Subject: gnu: Add rust-bytes-0.3. * gnu/packages/crates-io.scm (rust-bytes-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae00f6b360..3b52ded303 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1352,6 +1352,25 @@ (define-public rust-bytes-0.4 "Types and traits for working with bytes.") (license license:expat))) +(define-public rust-bytes-0.3 + (package + (inherit rust-bytes-0.4) + (name "rust-bytes") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09vcp9kh12pva2xn2ir79k90v1a0id8f4sdv1abn5ifw2bqsyaf1")))) + (arguments + `(#:tests? #f ; Tests not distributed in crate. + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-c2-chacha-0.2 (package (name "rust-c2-chacha") -- cgit v1.2.3 From 815d3ac4c343c75beca2d752adc34312bfeff4fe Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 19:57:33 +0300 Subject: gnu: rust-mio-0.6: Update to 0.6.21. * gnu/packages/crates-io.scm (rust-mio-0.6): Update to 0.6.21. [arguments]: Don't skip build. Skip tests. Add rust-cfg-if-0.1 to cargo-inputs. Replce rust-winapi-0.3 with 0.2 in cargo-inputs. Replace rust-bytes-0.4 with 0.3, rust-env-logger-0.6 with 0.4 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3b52ded303..c455893044 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7261,7 +7261,7 @@ (define-public rust-mint-0.5 (define-public rust-mio-0.6 (package (name "rust-mio") - (version "0.6.19") + (version "0.6.21") (source (origin (method url-fetch) @@ -7270,12 +7270,13 @@ (define-public rust-mio-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08zzs227vrnyz5kvws6awzlgzb8zqpnihs71hkqlw07dlfb1kxc3")))) + "13q02a7cwc140aygf8amadpzpl5lyj3p2r4wnvgydfpnphifqb9h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs - (("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-fuchsia-zircon" ,rust-fuchsia-zircon-0.3) ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys-0.3) ("rust-iovec" ,rust-iovec-0.1) ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) @@ -7284,10 +7285,10 @@ (define-public rust-mio-0.6 ("rust-miow" ,rust-miow-0.2) ("rust-net2" ,rust-net2-0.2) ("rust-slab" ,rust-slab-0.4) - ("rust-winapi" ,rust-winapi-0.3)) + ("rust-winapi" ,rust-winapi-0.2)) #:cargo-development-inputs - (("rust-bytes" ,rust-bytes-0.4) - ("rust-env-logger" ,rust-env-logger-0.6) + (("rust-bytes" ,rust-bytes-0.3) + ("rust-env-logger" ,rust-env-logger-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/tokio-rs/mio") (synopsis "Lightweight non-blocking IO") -- cgit v1.2.3 From 3db8833b4616f84cc8643fb983621e65de0acecd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 14:41:37 +0100 Subject: Revert "gnu: guile-ssh: Update to 0.12.0." This reverts commit 668740cc055b59a6d343fb256881c3632e050459. This causes the following error when running guix pull: ./guix/store.scm:1224:15: Throw to key `srfi-34' with args `(#)'. guix pull: error: You found a bug: the program '/gnu/store/0nbcv4jkhf73qlvc6dsy05iamj6l662c-compute-guix-derivation' --- gnu/packages/ssh.scm | 63 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 90714a4a92..ac9c2f7711 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,7 +12,6 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits -;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -228,7 +227,7 @@ (define-public openssh (define-public guile-ssh (package (name "guile-ssh") - (version "0.12.0") + (version "0.11.3") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -238,12 +237,31 @@ (define-public guile-ssh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) - (modules '((guix build utils))))) + "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; libssh >= 0.8.0 no longer provides libssh_threads: see + ;; . + (substitute* "libguile-ssh/Makefile.am" + (("-lssh_threads") "")) + + ;; This test would wrongfully pick DSS keys when running on + ;; libssh >= 0.8.0, which fails: + ;; . + (substitute* "tests/server.scm" + (("= %libssh-minor-version 7") + ">= %libssh-minor-version 7")) + + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*$") + "GUILE_PKG([3.0 2.2 2.0])\n")) + #t)))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(;; It makes no sense to build libguile-ssh.a. + '(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -262,15 +280,6 @@ (define-public guile-ssh (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) - ,@(if (%current-target-system) - '() - '((add-before 'check 'fix-guile-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((guile (assoc-ref inputs "guile"))) - (substitute* "tests/common.scm" - (("/usr/bin/guile") - (string-append guile "/bin/guile"))) - #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -314,6 +323,32 @@ (define-public guile3.0-ssh (package (inherit guile-ssh) (name "guile3.0-ssh") + (arguments + (substitute-keyword-arguments (package-arguments guile-ssh) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'bootstrap 'delete-old-guile-m4 + (lambda _ + ;; The old 'guile.m4' that's shipped would fail to recognize + ;; Guile 2.9 as "3.0". + (delete-file "m4/guile.m4") + #t)) + (add-before 'build 'adjust-for-guile3 + (lambda _ + ;; Adjust for things that are deprecated in 2.2 and removed in + ;; 3.0. + (substitute* "tests/common.scm" + (("define-module \\(tests common\\)") + "define-module (tests common) + #:use-module (ice-9 threads)\n")) + (substitute* "modules/ssh/tunnel.scm" + (("define-module \\(ssh tunnel\\)") + "define-module (ssh tunnel) + #:use-module (ice-9 threads)")) + (substitute* "modules/srfi/srfi-64.upstream.scm" + (("_IOLBF") + "'line")) + #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From fde46843ecf568da13ba96c19de80c591bb6a05c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 14:45:59 +0100 Subject: Revert "gnu: guile-ssh: Fix cross-compilation." This reverts commit 10cdf1408047f16e02d097c4cd23c8efcddb5814. ./guix/store.scm:1224:15: Throw to key `srfi-34' with args `(#)'. guix pull: error: You found a bug: the program '/gnu/store/0nbcv4jkhf73qlvc6dsy05iamj6l662c-compute-guix-derivation' --- gnu/packages/ssh.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ac9c2f7711..eae2f98b53 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -300,8 +300,7 @@ (define-public guile-ssh ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which) - ("guile" ,guile-2.2))) + ("which" ,which))) (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 08d341003e6903a2869754586bf33da196f668b2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Feb 2020 15:26:49 +0100 Subject: gnu: Add gnome-arcade. * gnu/packages/emulators.scm (gnome-arcade): New variable. --- gnu/packages/emulators.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b9c854ca25..b7f29a6f5b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1463,6 +1463,69 @@ (define-public mame ;; keymaps, languages and samples are under CC0. (license (list license:gpl2+ license:expat license:cc0)))) +(define-public gnome-arcade + (package + (name "gnome-arcade") + (version "0.218.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/strippato/gnome-arcade") + (commit (string-append "v." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qc01a62p65qb6mwjfmxqsd6n3rglsfwrjhsp25nr7q54107n55l")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No tests. + #:configure-flags (list + (string-append "-DMAME_BIN=\"" + (assoc-ref %build-inputs "mame") + "/bin/mame\"") + (string-append "-DAPP_RES=\"" + (assoc-ref %outputs "out") + "/share/gnome-arcade/\"")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (pk 'cwd (getcwd)) + (substitute* "../source/src/config.c" + (("/usr/share") (string-append out "/share")))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (rom (string-append out "/share/gnome-arcade/data/rom")) + (tile (string-append out "/share/gnome-arcade/data/tile"))) + (mkdir-p bin) + (install-file "../gnome-arcade" bin) + (copy-recursively "../source/res" + (string-append out "/share/gnome-arcade/res")) + (mkdir-p rom) + (install-file "../source/data/rom/ROM.TXT" rom) + (mkdir-p tile) + (install-file "../source/data/tile/TILE.TXT" tile)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("mame" ,mame) + ("gtk" ,gtk+) + ("libevdev" ,libevdev) + ("libvlc" ,vlc) + ("libarchive" ,libarchive))) + (home-page "https://github.com/strippato/gnome-arcade") + (synopsis "Minimal MAME frontend") + (description + "A minimal GTK+ frontend for MAME, the multi-purpose arcade and console +emulator.") + (license license:gpl3+))) + (define-public pcsxr ;; No release since 2017. (let ((commit "6484236cb0281e8040ff6c8078c87899a3407534")) -- cgit v1.2.3 From 676e21e4d28978be99585ca79e69703ac25c94fd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Feb 2020 15:36:37 +0100 Subject: gnu: next: Update to 1.5.0. * gnu/packages/web-browsers.scm (next): Update to 1.5.0. [synopsis]: Remove marketing. [description]: Remove marketing. --- gnu/packages/web-browsers.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 3a54f5a50e..c68c91170b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -392,7 +392,7 @@ (define-public vimb (define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -403,7 +403,7 @@ (define next-gtk-webkit (commit version))) (sha256 (base32 - "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl")) + "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments @@ -424,11 +424,10 @@ (define next-gtk-webkit (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://next.atlas.engineer") - (synopsis "Infinitely extensible web-browser (user interface only)") + (synopsis "Extensible web-browser in Common Lisp") (description "Next is a keyboard-oriented, extensible web-browser -inspired by Emacs and designed for power users. The application has familiar -key-bindings, is fully configurable and extensible in Lisp, and has powerful -features for productive professionals.") +designed for power users. The application has familiar Emacs and VI +key-bindings and is fully configurable and extensible in Common Lisp.") (license license:bsd-3))) (define sbcl-next-download-manager @@ -450,7 +449,7 @@ (define sbcl-next-download-manager (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (download manager)"))) + (synopsis "Extensible web-browser in Common Lisp (download manager)"))) (define sbcl-next-ring (package @@ -464,7 +463,7 @@ (define sbcl-next-ring (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (ring)"))) + (synopsis "Extensible web-browser in Common Lisp (ring)"))) (define sbcl-next-history-tree (package @@ -478,7 +477,7 @@ (define sbcl-next-history-tree (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (history-tree)"))) + (synopsis "Extensible web-browser in Common Lisp (history-tree)"))) (define sbcl-next-password-manager (package @@ -498,7 +497,7 @@ (define sbcl-next-password-manager (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (password manager)"))) + (synopsis "Extensible web-browser in Common Lisp (password manager)"))) (define sbcl-next-hooks (package @@ -617,7 +616,7 @@ (define expected-fasl (string-append `(("trivial-features" ,sbcl-trivial-features) ("trivial-types" ,sbcl-trivial-types) ("prove-asdf" ,sbcl-prove-asdf))) - (synopsis "Infinitely extensible web-browser (with Lisp development files)")))) + (synopsis "Extensible web-browser in Common Lisp")))) (define-public sbcl-next (deprecated-package "sbcl-next" next)) -- cgit v1.2.3 From 8c20508f4889bff9d2c5e1a8e0f52aeaa4a7ea82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 15:48:20 +0100 Subject: gnu: rust-nodrop-union-0.1: Fix typo. This follows up on commit 028b0deebbcff0c28c698c955644749a798faa71. * gnu/packages/crates-io.scm (rust-nodrop-union-0.1)[arguments]: Quote. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c455893044..024871b487 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7829,7 +7829,7 @@ (define-public rust-nodrop-union-0.1 (base32 "1h59pph19rxanyqcaid8pg73s7wmzdx3zhjv5snlim5qx606zxkc")))) (build-system cargo-build-system) - (arguments (#:skip-build? #t)) ; Depends on features not in stable Rust. + (arguments '(#:skip-build? #t)) ; depends on features not in stable Rust (home-page "https://github.com/bluss/arrayvec") (synopsis "Wrapper type to inhibit drop (destructor)") (description "This package provides a wrapper type to inhibit drop -- cgit v1.2.3 From 10650b89f174cbb61a693f9b8288f2acfe816890 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 15:05:27 +0100 Subject: gnu: Add wireguard-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ‘wireguard’ repository that included both tools and kernel patch is no longer maintained. I will add this to its description once kernel 5.6 hits Guix. * gnu/packages/linux.scm (wireguard-tools): New public variable. --- gnu/packages/vpn.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e29c1e7d03..78a2c322af 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -519,6 +519,57 @@ (define-public wireguard WireGuard support.") (license license:gpl2))) +(define-public wireguard-tools + (package + (name "wireguard-tools") + (version "1.0.20200206") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.zx2c4.com/wireguard-tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list "CC=gcc" + "WITH_BASHCOMPLETION=yes" + ;; Install the ‘simple and dirty’ helper script wg-quick(8). + "WITH_WGQUICK=yes" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + ;; Currently used only to create an empty /etc/wireguard directory. + (string-append "SYSCONFDIR=no-thanks")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-source-directory + (lambda _ + (chdir "src") + #t)) + (delete 'configure) ; no configure script + (add-after 'install 'reset-cwd + ;; Otherwise the 'install-license-file' phase installs nothing. + ;; + (lambda _ + (chdir "..") + #t))))) + (home-page "https://www.wireguard.com/") + (synopsis "Tools for configuring WireGuard tunnels") + (description + "This package provides the user-space command-line tools for using and +configuring WireGuard tunnels. + +WireGuard is a simple and fast general-purpose @acronym{VPN, Virtual Private +Network} that securely encapsulates IP packets over UDP. It aims to be as easy +to configure and deploy as SSH. VPN connections are made simply by exchanging +public keys and can roam across IP addresses.") + (license + (list license:lgpl2.1+ ; src/netlink.h & contrib/embeddable-wg-library + license:gpl2)))) ; everything else + (define-public xl2tpd (package (name "xl2tpd") -- cgit v1.2.3 From e0318062775f377c66ca2a2b9de11e8a6876580e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:02:57 +0100 Subject: gnu: Always use HTTPS for orthecreedence.github.io. * gnu/packages/lisp-xyz.scm (sbcl-cl-async-future, sbcl-blackbird)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7496dc5ba4..c86d463484 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9646,7 +9646,7 @@ (define-public sbcl-blackbird (description "This is a standalone promise implementation for Common Lisp. It is the successor to the now-deprecated cl-async-future project.") - (home-page "http://orthecreedence.github.io/blackbird/") + (home-page "https://orthecreedence.github.io/blackbird/") (license license:expat)))) (define-public cl-blackbird @@ -9681,7 +9681,7 @@ (define-public sbcl-cl-async-future (description "This is futures implementation for Common Lisp. It plugs in nicely to cl-async.") - (home-page "http://orthecreedence.github.io/cl-async/future") + (home-page "https://orthecreedence.github.io/cl-async/future") (license license:expat)))) (define-public cl-async-future -- cgit v1.2.3 From df71892b21e19bfe4e4d9a604df6e865e538d11a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 16:01:19 +0100 Subject: gnu: libfakekey: Update to 0.3. * gnu/packages/xdisorg.scm (libfakekey): Update to 0.3. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Bootstrap manually. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/xdisorg.scm | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index da84f0f4b8..dd05caa5f0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -342,21 +342,32 @@ (define-public libxkbcommon (define-public libfakekey (package (name "libfakekey") - (version "0.1") + (version "0.3") (source (origin - (method url-fetch) - (uri (string-append "https://downloads.yoctoproject.org/releases" - "/matchbox/libfakekey/" version "/libfakekey-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://git.yoctoproject.org/git/libfakekey") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1501l0bflcrhqbf12n7a7cqilvr0w4xawxw0vw75p2940nkl4464")))) + (base32 "1jw1d4wc1ysiijirc7apnz3sryrxbl9akgb92mh06dvfkz2nblj0")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "AM_LDFLAGS=-lX11"))) + `(#:make-flags (list "AM_LDFLAGS=-lX11") + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + ;; ./autogen.sh calls ./configure before shebangs have been patched. + (lambda _ + (invoke "autoreconf" "-vfi")))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + + ;; For bootstrapping from git. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("libxtst" ,libxtst) ("libx11" ,libx11))) -- cgit v1.2.3 From 7858de3e95b51bda1119566a40ba2b3c05d55e11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:11:39 +0100 Subject: gnu: key-mon: Use HTTPS home page. * gnu/packages/key-mon.scm (key-mon)[home-page]: Use HTTPS. --- gnu/packages/key-mon.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/key-mon.scm b/gnu/packages/key-mon.scm index 1482d07f7c..884bef042f 100644 --- a/gnu/packages/key-mon.scm +++ b/gnu/packages/key-mon.scm @@ -47,7 +47,7 @@ (define-public key-mon `(("python2-xlib" ,python2-xlib) ("python2-pygtk" ,python2-pygtk) ("python2-rsvg" ,python2-rsvg))) - (home-page "http://code.google.com/p/key-mon") + (home-page "https://code.google.com/p/key-mon") (synopsis "Show keyboard and mouse status") (description "The key-mon utility displays the current keyboard and mouse status. -- cgit v1.2.3 From 3e97cf47313d5169218421d28f6a50a4072d1c19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:11:44 +0100 Subject: gnu: pianobar: Update home page. * gnu/packages/music.scm (pianobar)[home-page]: Update & use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5cecfc6a31..da22ef1125 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2646,7 +2646,7 @@ (define-public pianobar ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://6xq.net/projects/pianobar/") + (home-page "https://6xq.net/pianobar/") (synopsis "Console-based pandora.com player") (description "pianobar is a console-based music player for the personalized online radio pandora.com. It has configurable keys for playing -- cgit v1.2.3 From e2f28609dee5dc69a48dd229651c66cea0904807 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:11:59 +0100 Subject: gnu: mrrescue: Use HTTPS home page. * gnu/packages/games.scm (mrrescue)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 66495489e8..0af8d56e00 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4088,7 +4088,7 @@ (define-public mrrescue (inputs `(("bash" ,bash) ("love" ,love))) - (home-page "http://tangramgames.dk/games/mrrescue") + (home-page "https://tangramgames.dk/games/mrrescue") (synopsis "Arcade-style fire fighting game") (description "Mr. Rescue is an arcade styled 2d action game centered around evacuating -- cgit v1.2.3 From 45cf3c30199ef352c6531fc59d186428c906c7b5 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 18 Feb 2020 16:17:19 +0100 Subject: gnu: julius: Update to 1.3.0. * gnu/packages/games.scm (julius): Update to 1.3.0. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0af8d56e00..12b4cdf125 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -798,7 +798,7 @@ (define-public golly (define-public julius (package (name "julius") - (version "1.2.0") + (version "1.3.0") (source (origin (method git-fetch) @@ -807,7 +807,7 @@ (define-public julius (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kgyzfjii4dhpy2h05977alwdmxyxb4jxznnrhlgb21m0ybncmvp")))) + (base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy")))) (build-system cmake-build-system) (inputs `(("sdl2" ,sdl2) -- cgit v1.2.3 From fb9832436ab929c0f75708edbafb811a76627901 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Feb 2020 16:19:27 +0100 Subject: gnu: racket: Update to 7.6. * gnu/packages/scheme.scm (racket): Update to 7.6. [home-page]: Use HTTPS. * gnu/packages/patches/racket-store-checksum-override.patch: Adjust for 7.6. --- .../patches/racket-store-checksum-override.patch | 30 +++++++++++----------- gnu/packages/scheme.scm | 12 +++++---- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/patches/racket-store-checksum-override.patch b/gnu/packages/patches/racket-store-checksum-override.patch index 236c843de1..6c4ebcf022 100644 --- a/gnu/packages/patches/racket-store-checksum-override.patch +++ b/gnu/packages/patches/racket-store-checksum-override.patch @@ -11,26 +11,15 @@ See for details. --- --- a/collects/compiler/private/cm-minimal.rkt +++ b/collects/compiler/private/cm-minimal.rkt -@@ -7,6 +7,7 @@ +@@ -6,6 +6,7 @@ racket/list racket/path racket/promise + racket/string file/sha1 - setup/collects setup/cross-system -@@ -940,6 +941,10 @@ - #f - (list src-hash recorded-hash))) - -+(define (store-reference? path) -+ (let ([store-prefix (or (getenv "NIX_STORE") "/gnu/store")]) -+ (string-prefix? (path->string path) store-prefix))) -+ - (define (rkt->ss p) - (if (path-has-extension? p #".rkt") - (path-replace-extension p #".ss") -@@ -1015,6 +1020,7 @@ + compiler/compilation-path +@@ -268,7 +269,8 @@ (trace-printf "newer src... ~a > ~a" path-time path-zo-time) (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen #:trying-sha1? sha1-only?)] @@ -39,4 +28,15 @@ See for details. + (different-source-sha1-and-dep-recorded path deps)) => (lambda (difference) (trace-printf "different src hash ~a for ~a..." difference path) - (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen \ No newline at end of file + (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen +@@ -1012,5 +1014,9 @@ + #f + (list src-hash recorded-hash))) + ++(define (store-reference? path) ++ (let ([store-prefix (or (getenv "NIX_STORE") "/gnu/store")]) ++ (string-prefix? (path->string path) store-prefix))) ++ + ;; Make sure `recompile-from` is machine-independent so that + ;; recompilation makes sense. + ;; The compilation lock must is held for the source of `recompile-from`. \ No newline at end of file diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 66af3fba98..026c9f2e53 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Gabriel Hondet +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,7 @@ (define-module (gnu packages scheme) #:use-module (gnu packages) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1+ lgpl3+ asl2.0 bsd-3 - cc-by-sa4.0 non-copyleft)) + cc-by-sa4.0 non-copyleft expat)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -394,7 +395,7 @@ (define-public scheme48 (define-public racket (package (name "racket") - (version "7.3") + (version "7.6") (source (origin (method url-fetch) (uri (list (string-append "http://mirror.racket-lang.org/installers/" @@ -404,7 +405,7 @@ (define-public racket version "/racket-" version "-src.tgz"))) (sha256 (base32 - "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl")) + "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8")) (patches (search-patches "racket-store-checksum-override.patch")))) (build-system gnu-build-system) @@ -502,14 +503,15 @@ (define-public racket ("sqlite" ,sqlite) ("unixodbc" ,unixodbc) ("libedit" ,libedit))) - (home-page "http://racket-lang.org") + (home-page "https://racket-lang.org") (synopsis "Implementation of Scheme and related languages") (description "Racket is an implementation of the Scheme programming language (R5RS and R6RS) and related languages, such as Typed Racket. It features a compiler and a virtual machine with just-in-time native compilation, as well as a large set of libraries.") - (license lgpl2.0+))) + ;; https://download.racket-lang.org/license.html + (license (list lgpl3+ asl2.0 expat)))) (define-public gambit-c (package -- cgit v1.2.3 From 4b8450c07e485985ed4b35173f51c1705980bd1a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Feb 2020 16:58:37 +0100 Subject: gnu: Add racket-minimal. * gnu/packages/scheme.scm (racket-minimal): New variable. (racket-minimal)[arguments]: Split 'pre-configure phase so that the non-minimal part can be easily removed in racket-minimal. --- gnu/packages/scheme.scm | 84 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 18 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 026c9f2e53..52c060744b 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -412,22 +412,15 @@ (define-public racket (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure + (add-before 'configure 'pre-configure-minimal (lambda* (#:key inputs #:allow-other-keys) ;; Patch dynamically loaded libraries with their absolute paths. - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path - library-path - (format #f "~a.so" soname)))) - (patch-ffi-libs (lambda (file libs) - (for-each - (lambda (lib) - (substitute* file - (((format #f "\"~a\"" lib)) - (format #f "\"~a\"" (find-so lib))))) - libs)))) + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path + library-path + (format #f "~a.so" soname))))) (substitute* "collects/db/private/sqlite3/ffi.rkt" (("ffi-lib sqlite-so") (format #f "ffi-lib \"~a\"" (find-so "libsqlite3")))) @@ -436,7 +429,25 @@ (define-public racket (format #f "ffi-lib \"~a\"" (find-so "libssl")))) (substitute* "collects/openssl/libcrypto.rkt" (("ffi-lib libcrypto-so") - (format #f "ffi-lib \"~a\"" (find-so "libcrypto")))) + (format #f "ffi-lib \"~a\"" (find-so "libcrypto"))))) + (chdir "src") + #t)) + (add-before 'pre-configure-minimal 'pre-configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch dynamically loaded libraries with their absolute paths. + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path + library-path + (format #f "~a.so" soname)))) + (patch-ffi-libs (lambda (file libs) + (for-each + (lambda (lib) + (substitute* file + (((format #f "\"~a\"" lib)) + (format #f "\"~a\"" (find-so lib))))) + libs)))) (substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt" (("ffi-lib libgmp-so") (format #f "ffi-lib \"~a\"" (find-so "libgmp")))) @@ -474,15 +485,14 @@ (define-public racket ("libGL")) ("share/pkgs/sgl/gl.rkt" ("libGL" "libGLU"))))) - (chdir "src") #t)) (add-after 'unpack 'patch-/bin/sh (lambda _ (substitute* "collects/racket/system.rkt" (("/bin/sh") (which "sh"))) #t))) - #:tests? #f ; XXX: how to run them? - )) + ;; XXX: how to run them? + #:tests? #f)) (inputs `(("libffi" ,libffi) ;; Hardcode dynamically loaded libraries for better functionality. @@ -513,6 +523,44 @@ (define-public racket ;; https://download.racket-lang.org/license.html (license (list lgpl3+ asl2.0 expat)))) +(define-public racket-minimal + (package + (inherit racket) + (name "racket-minimal") + (version (package-version racket)) + (source (origin + (method url-fetch) + (uri (list (string-append "http://mirror.racket-lang.org/installers/" + version "/racket-minimal-" version "-src.tgz") + (string-append + "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" + version "/racket-minimal-" version "-src.tgz"))) + (sha256 + (base32 + "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y")) + (patches (search-patches + "racket-store-checksum-override.patch")))) + (synopsis "Racket without bundled packages such as Dr. Racket") + (arguments + (substitute-keyword-arguments (package-arguments racket) + ((#:phases phases) + `(modify-phases ,phases + ;; Delete fix that applies to files not included in the minimal package. + (delete 'pre-configure))))) + (inputs + `(("libffi" ,libffi) + ("openssl" ,openssl) + ("sqlite" ,sqlite))) + (description + "Racket is an implementation of the Scheme programming language (R5RS and +R6RS) and related languages, such as Typed Racket. It features a compiler and +a virtual machine with just-in-time native compilation, as well as a large set +of libraries. + +In this minimal package, the essential package racket-libs is included, as +well as libraries that live in collections. In particular, @command{raco} and +the @code{pkg} library are still bundled."))) + (define-public gambit-c (package (name "gambit-c") -- cgit v1.2.3 From 38655d7b88ae9d82208e5750480c9b91dd9dda8b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:25:23 +0100 Subject: gnu: guile-ssh: Update to 0.12.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.12.0, [source]: remove snippet that were integrated upstream, [arguments]: Add a fix-guile-path phase to fix tests. (guile3.0-ssh)[arguments]: Remove as this is fixed upstream. --- gnu/packages/ssh.scm | 63 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index eae2f98b53..4b1e02be16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ (define-public openssh (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.3") + (version "0.12.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -237,31 +238,12 @@ (define-public guile-ssh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; libssh >= 0.8.0 no longer provides libssh_threads: see - ;; . - (substitute* "libguile-ssh/Makefile.am" - (("-lssh_threads") "")) - - ;; This test would wrongfully pick DSS keys when running on - ;; libssh >= 0.8.0, which fails: - ;; . - (substitute* "tests/server.scm" - (("= %libssh-minor-version 7") - ">= %libssh-minor-version 7")) - - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*$") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(;; It makes no sense to build libguile-ssh.a. + `(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -280,6 +262,15 @@ (define-public guile-ssh (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile"))) + #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -322,32 +313,6 @@ (define-public guile3.0-ssh (package (inherit guile-ssh) (name "guile3.0-ssh") - (arguments - (substitute-keyword-arguments (package-arguments guile-ssh) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'bootstrap 'delete-old-guile-m4 - (lambda _ - ;; The old 'guile.m4' that's shipped would fail to recognize - ;; Guile 2.9 as "3.0". - (delete-file "m4/guile.m4") - #t)) - (add-before 'build 'adjust-for-guile3 - (lambda _ - ;; Adjust for things that are deprecated in 2.2 and removed in - ;; 3.0. - (substitute* "tests/common.scm" - (("define-module \\(tests common\\)") - "define-module (tests common) - #:use-module (ice-9 threads)\n")) - (substitute* "modules/ssh/tunnel.scm" - (("define-module \\(ssh tunnel\\)") - "define-module (ssh tunnel) - #:use-module (ice-9 threads)")) - (substitute* "modules/srfi/srfi-64.upstream.scm" - (("_IOLBF") - "'line")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From a0d19554cb4c7809d34fd05578bb85c92ce1bf4d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. * gnu/packages/ssh.scm (guile-ssh)[native-inputs]: Add guile. --- gnu/packages/ssh.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4b1e02be16..72b7c745f9 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -291,7 +291,8 @@ (define-public guile-ssh ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("guile" ,guile-2.2))) ;needed when cross-compiling. (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) @@ -306,6 +307,9 @@ (define-public guile2.0-ssh (package (inherit guile-ssh) (name "guile2.0-ssh") + (native-inputs + `(("guile" ,guile-2.0) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) @@ -313,6 +317,9 @@ (define-public guile3.0-ssh (package (inherit guile-ssh) (name "guile3.0-ssh") + (native-inputs + `(("guile" ,guile-next) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From adbdf188c28c503a9c875b793bc88548d3cd702f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Feb 2020 15:06:50 -0500 Subject: scripts: system: Do not validate network file systems. Fixes . * guix/scripts/system.scm (check-file-system-availability): Ignore file systems of the NFS type. --- guix/scripts/system.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index e69a3b6c97..b5e3a5630e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -571,6 +571,8 @@ (define relevant (and (file-system-mount? fs) (not (member (file-system-type fs) %pseudo-file-system-types)) + ;; Don't try to validate network file systems. + (not (string-prefix? "nfs" (file-system-type fs))) (not (memq 'bind-mount (file-system-flags fs))))) file-systems)) -- cgit v1.2.3 From a4e8a9e0f0dbbe9eb980a7fb33846d38f3f67c08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:54:41 +0100 Subject: gnu: Use HTTPS for elephly.net home pages. * gnu/packages/audio.scm (lv2-mda-epiano, lv2-mda-piano)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3cb32d2e0f..5b8c610882 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1988,7 +1988,7 @@ (define-public lv2-mda-piano (list (search-path-specification (variable "LV2_PATH") (files '("lib/lv2"))))) - (home-page "http://elephly.net/lv2/mdapiano.html") + (home-page "https://elephly.net/lv2/mdapiano.html") (synopsis "LV2 port of the mda Piano plugin") (description "An LV2 port of the mda Piano VSTi.") (license license:gpl3+))) @@ -2002,7 +2002,7 @@ (define-public lv2-mda-epiano (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:tests? #f ; no check target #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://elephly.net/lv2/mdaepiano.html") + (home-page "https://elephly.net/lv2/mdaepiano.html") (synopsis "LV2 port of the mda EPiano plugin") (description "An LV2 port of the mda EPiano VSTi."))) -- cgit v1.2.3 From a76e49addf77ba1135bfea82d59ad6beff3a7e31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:49:54 +0100 Subject: gnu: nfs-utils: Use HTTPS home page. * gnu/packages/nfs.scm (nfs-utils)[home-page]: Use HTTPS. --- gnu/packages/nfs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index b81623fd07..3a8467431d 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -118,7 +118,7 @@ (define-public nfs-utils ("libtirpc" ,libtirpc))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.kernel.org/pub/linux/utils/nfs-utils/") + (home-page "https://www.kernel.org/pub/linux/utils/nfs-utils/") (synopsis "Tools for loading and managing Linux NFS mounts") (description "The Network File System (NFS) was developed to allow machines to mount a disk partition on a remote machine as if it were a local -- cgit v1.2.3 From c298063545a81c06bbb8a4d0290892b27a880d97 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:20:09 +0100 Subject: gnu: Use HTTPS for www.dockapps.net home pages. * gnu/packages/gnustep.scm (wmbattery, wmcpuload, wmclock)[home-page]: Use HTTPS. --- gnu/packages/gnustep.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index dd7c67d553..e04755aa52 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -179,7 +179,7 @@ (define-public wmbattery `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) - (home-page "http://www.dockapps.net/wmbattery") + (home-page "https://www.dockapps.net/wmbattery") (synopsis "Display laptop battery info") (description "Wmbattery displays the status of your laptop's battery in a small icon. @@ -233,7 +233,7 @@ (define-public wmcpuload ("libxpm" ,libxpm))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.dockapps.net/wmcpuload") + (home-page "https://www.dockapps.net/wmcpuload") (synopsis "Monitor CPU usage") (description "Wmcpuload displays the current CPU usage, expressed as a percentile and a @@ -265,7 +265,7 @@ (define-public wmclock `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) - (home-page "http://www.dockapps.net/wmclock") + (home-page "https://www.dockapps.net/wmclock") (synopsis "Display the date and time") (description "wmclock is an applet for Window Maker which displays the date and time in -- cgit v1.2.3 From 8cc1fdcee7039498def5198d3ae6d21b6427fa56 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 16:54:29 +0100 Subject: gnu: pianobar: Update to 2019.02.14. * gnu/packages/music.scm (pianobar): Update to 2019.02.14. [inputs]: Use current ffmpeg. --- gnu/packages/music.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index da22ef1125..b6b76f8763 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2017, 2018, 2019 Pierre Langlois ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee ;;; Copyright © 2018 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt @@ -2621,7 +2621,7 @@ (define-public curseradio (define-public pianobar (package (name "pianobar") - (version "2016.06.02") + (version "2019.02.14") (source (origin (method git-fetch) (uri (git-reference @@ -2630,10 +2630,10 @@ (define-public pianobar (file-name (git-file-name name version)) (sha256 (base32 - "058fbdxp7n35hxwy3b8slfy4pb4n63cb173vfmywqa06wh1dv6f6")))) + "1bfabkj3m9kmhxl64w4azmi0xf7w52fmqfbw2ag28hbb5yy01k1m")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" "CFLAGS=-std=c99" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -2643,7 +2643,7 @@ (define-public pianobar ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg-3.4))) + ("ffmpeg" ,ffmpeg))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://6xq.net/pianobar/") -- cgit v1.2.3 From d462bf0e4941ee73881d3a449081c4347e7c966c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 17:37:27 +0100 Subject: gnu: cvs-fast-export: Update to 1.51. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.51. [arguments]: Remove obsolete ‘remove-optimizations’ phase. --- gnu/packages/version-control.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8335e6c576..c5d99b6b64 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1564,26 +1564,20 @@ (define-public cvs (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.45") + (version "1.51") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/" "cvs-fast-export-" version ".tar.gz")) (sha256 (base32 - "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z")))) + "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'remove-optimizations - (lambda _ - ;; Don't optimize for a specific processor architecture. - (substitute* "Makefile" - (("CFLAGS \\+= -march=native") "")) - #t))) - #:parallel-build? #f ; parallel a2x commands fail spectacularly + (delete 'configure)) ; no configure script + #:parallel-build? #f ; parallel a2x commands fail spectacularly #:make-flags (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out"))))) (inputs `(("git" ,git))) -- cgit v1.2.3 From a894ca327b8d05cc16d4657ea3e3af167f55a37b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:09:17 +0100 Subject: gnu: cvs-fast-export: Use non-native Python 3. * gnu/packages/version-control.scm (cvs-fast-export)[native-inputs]: Remove python-2. [inputs]: Add python-wrapper. --- gnu/packages/version-control.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c5d99b6b64..24a7e3590a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1580,12 +1580,14 @@ (define-public cvs-fast-export #:parallel-build? #f ; parallel a2x commands fail spectacularly #:make-flags (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out"))))) - (inputs `(("git" ,git))) - (native-inputs `(("asciidoc" ,asciidoc) - ;; These are needed for the tests. - ("cvs" ,cvs) - ("python" ,python-2) - ("rcs" ,rcs))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (native-inputs + `(("asciidoc" ,asciidoc) + ;; These are needed for the tests. + ("cvs" ,cvs) + ("rcs" ,rcs))) (home-page "http://www.catb.org/esr/cvs-fast-export/") (synopsis "Export an RCS or CVS history as a fast-import stream") (description "This program analyzes a collection of RCS files in a CVS -- cgit v1.2.3 From 59ed95d6b8ba1d17957375a979c8fc1ba784d6b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:14:40 +0100 Subject: gnu: mplayer: Update to 1.4. * gnu/packages/video.scm (mplayer): Update to 1.4. [inputs]: Use default ffmpeg version. --- gnu/packages/video.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ed104b7c3f..783c050386 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1264,7 +1264,7 @@ (define-public vlc (define-public mplayer (package (name "mplayer") - (version "1.3.0") + (version "1.4") (source (origin (method url-fetch) (uri (string-append @@ -1272,7 +1272,7 @@ (define-public mplayer version ".tar.xz")) (sha256 (base32 - "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s")))) + "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2")))) (build-system gnu-build-system) ;; FIXME: Add additional inputs once available. (native-inputs @@ -1281,7 +1281,7 @@ (define-public mplayer (inputs `(("alsa-lib" ,alsa-lib) ("cdparanoia" ,cdparanoia) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5 @@ -1291,7 +1291,7 @@ (define-public mplayer ("libdvdnav" ,libdvdnav) ("libjpeg" ,libjpeg) ("libmpeg2" ,libmpeg2) - ("libmpg123" ,mpg123) ; audio codec for MP3 + ("libmpg123" ,mpg123) ; audio codec for MP3 ("libpng" ,libpng) ("libtheora" ,libtheora) ("libvdpau" ,libvdpau) @@ -1310,7 +1310,7 @@ (define-public mplayer ("speex" ,speex) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; no test target + `(#:tests? #f ; no test target #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From 858b68e491b4d84b9cc70827cba30c6a127edd22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:16:30 +0100 Subject: gnu: mplayer: Don't follow home page browser redirection. * gnu/packages/video.scm (mplayer)[home-page]: Let the browser eat HTML. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 783c050386..f42e11b5c8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1346,7 +1346,7 @@ (define-public mplayer (nix-system->gnu-triplet (%current-system))))))) "--disable-iwmmxt"))))))) - (home-page "https://www.mplayerhq.hu/design7/news.html") + (home-page "https://www.mplayerhq.hu") (synopsis "Audio and video player") (description "MPlayer is a movie player. It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, -- cgit v1.2.3 From 8480bdd32e419c10f45534956768dacd2ea3e0fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:17:16 +0100 Subject: gnu: mplayer: Enable GIF support. * gnu/packages/video.scm (mplayer)[inputs]: Add giflib. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f42e11b5c8..9159435a01 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1284,7 +1284,7 @@ (define-public mplayer ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) -;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5 + ("giflib" ,giflib) ("lame" ,lame) ("libass" ,libass) ("libdvdcss" ,libdvdcss) -- cgit v1.2.3 From e46aacacdf446ab7591b5727e826e21ff57921f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:17:53 +0100 Subject: gnu: mplayer: Fix dvdnav support. * gnu/packages/video.scm (mplayer)[inputs]: Add libdvdread. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9159435a01..f8c9f9e45a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1288,7 +1288,8 @@ (define-public mplayer ("lame" ,lame) ("libass" ,libass) ("libdvdcss" ,libdvdcss) - ("libdvdnav" ,libdvdnav) + ("libdvdnav" ,libdvdnav) ; ignored without libdvdread + ("libdvdread" ,libdvdread) ; ignored without libdvdnav ("libjpeg" ,libjpeg) ("libmpeg2" ,libmpeg2) ("libmpg123" ,mpg123) ; audio codec for MP3 -- cgit v1.2.3 From 97c6670ef79bbf5e82dece2e837ed73b6462da01 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Feb 2020 19:53:33 +0100 Subject: gnu: emacs-racket-mode: Update to 20200115. * gnu/packages/emacs-xyz.scm (emacs-racket-mode): Update to 20200115. --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 40f604df76..e2e8a9e62e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14300,8 +14300,8 @@ (define-public emacs-faceup (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "2a9a102a097d04fbcd2a443fec84078036c2e277") - (revision "4")) + (let ((commit "5f396fa91fc22310f5c519aa658436a1a5251846") + (revision "5")) (package (name "emacs-racket-mode") (version (git-version "0.0.2" revision commit)) @@ -14314,15 +14314,15 @@ (define-public emacs-racket-mode (file-name (git-file-name name version)) (sha256 (base32 - "1n71dxxh62jixq20b5haapv651dxc0zyrxpl1d0yqsg8ncp726bl")))) + "1214y08i0c51d1vzw9jzyf79vyfqizdy6m0980qs13qbdwsj32v0")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) (propagated-inputs `(("emacs-faceup" ,emacs-faceup) ("emacs-s" ,emacs-s))) - (home-page "https://github.com/greghendershott/racket-mode") - (synopsis "Major mode for Racket language") + (home-page "https://www.racket-mode.com/") + (synopsis "Major mode for the Racket language") (description "@code{racket-mode} provides: @itemize -- cgit v1.2.3 From 0372dd1a1e51e39382ee5d1aa968589b40506b8f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 19 Feb 2020 03:35:05 +0100 Subject: gnu: services: Fix openvpn boolean fields. * gnu/services/vpn.scm (serialize-boolean): Do not print #t to the file. --- gnu/services/vpn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index cbb4a79a7b..4602b3f3db 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -61,7 +61,7 @@ (define (serialize-field field-name val) (define serialize-string serialize-field) (define (serialize-boolean field-name val) (if val - (serialize-field field-name val) + (serialize-field field-name "") (format #t ""))) (define (ip-mask? val) -- cgit v1.2.3 From c6c447701c9cfdeedf77224399faa9c07b12d045 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 19 Feb 2020 03:33:12 +0100 Subject: gnu: services: Add openvpn options. * gnu/services/vpn.scm (openvpn-client-configuration) (openvpn-server-configuration): Add fast-io? and auth-user-pass options. --- doc/guix.texi | 22 ++++++++++++++++++++++ gnu/services/vpn.scm | 12 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index aa50340fe2..afb70d5378 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21794,6 +21794,13 @@ Defaults to @samp{#t}. @end deftypevr +@deftypevr {@code{openvpn-client-configuration} parameter} boolean fast-io? +(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to +poll/epoll/select prior to the write operation. + +Defaults to @samp{#f}. +@end deftypevr + @deftypevr {@code{openvpn-client-configuration} parameter} number verbosity Verbosity level. @@ -21809,6 +21816,14 @@ Defaults to @samp{#f}. @end deftypevr +@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string auth-user-pass +Authenticate with server using username/password. The option is a file +containing username/password on 2 lines. Do not use a file-like object as it +would be added to the store and readable by any user. + +Defaults to @samp{'disabled}. +@end deftypevr + @deftypevr {@code{openvpn-client-configuration} parameter} key-usage verify-key-usage? Whether to check the server certificate has server usage extension. @@ -21930,6 +21945,13 @@ Defaults to @samp{#t}. @end deftypevr +@deftypevr {@code{openvpn-server-configuration} parameter} boolean fast-io? +(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to +poll/epoll/select prior to the write operation. + +Defaults to @samp{#f}. +@end deftypevr + @deftypevr {@code{openvpn-server-configuration} parameter} number verbosity Verbosity level. diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 4602b3f3db..658d5c3e88 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -59,6 +59,7 @@ (define (serialize-field field-name val) (format #t "") (format #t "~a ~a\n" (uglify-field-name field-name) val))) (define serialize-string serialize-field) +(define-maybe string) (define (serialize-boolean field-name val) (if val (serialize-field field-name "") @@ -298,6 +299,11 @@ (define-split-configuration openvpn-client-configuration "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts.") + (fast-io? + (boolean #f) + "(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to +poll/epoll/select prior to the write operation.") + (verbosity (number 3) "Verbosity level.")) @@ -307,6 +313,12 @@ (define-split-configuration openvpn-client-configuration "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks.") + (auth-user-pass + (maybe-string 'disabled) + "Authenticate with server using username/password. The option is a file +containing username/password on 2 lines. Do not use a file-like object as it +would be added to the store and readable by any user.") + (verify-key-usage? (key-usage #t) "Whether to check the server certificate has server usage extension.") -- cgit v1.2.3 From f8bf241c933a2a60387e95ee919ce1152cbc868a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 21:04:40 +0300 Subject: gnu: Add rust-osmesa-sys-0.1. * gnu/packages/crates-io.scm (rust-osmesa-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 024871b487..b810127553 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8483,6 +8483,28 @@ (define-public rust-os-pipe-0.8 "A cross-platform library for opening OS pipes.") (license license:expat))) +(define-public rust-osmesa-sys-0.1 + (package + (name "rust-osmesa-sys") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "osmesa-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fq1q1zcgfb0qydrg9r2738jlwc4hqxgb9vj11z72bjxx7kfrkw8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-shared-library" ,rust-shared-library-0.1)))) + (home-page "https://crates.io/crates/osmesa-sys") + (synopsis "OSMesa library bindings for Rust") + (description "This package provides OSMesa library bindings for Rust.") + (license license:cc0))) + (define-public rust-owning-ref-0.4 (package (name "rust-owning-ref") -- cgit v1.2.3 From b08b29879d00030583c66a07a33835877c619d8f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 19 Feb 2020 09:39:22 +0200 Subject: gnu: Add rust-jemalloc-sys-0.1. * gnu/packages/crates-io.scm (rust-jemalloc-sys-0.1): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b810127553..78f8d9b68c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6132,6 +6132,24 @@ (define-public rust-jemalloc-sys-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-jemalloc-sys-0.1 + (package + (inherit rust-jemalloc-sys-0.3) + (name "rust-jemalloc-sys") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "jemalloc-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bh07rlzgg39ys1lsgnpxgvjj6blagp2h17fx267d0g3a272rimz")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "jemalloc") #t)))))) + (define-public rust-jemallocator-0.3 (package (name "rust-jemallocator") -- cgit v1.2.3 From 84eb24b68a39cc10609f93f60d84f34aedfc6129 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 19 Feb 2020 09:40:07 +0200 Subject: gnu: Add rust-jemallocator-0.1. * gnu/packages/crates-io.scm (rust-jemallocator-0.1): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 78f8d9b68c..07679bc0e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6177,6 +6177,36 @@ (define-public rust-jemallocator-0.3 "This package provides a Rust allocator backed by jemalloc.") (license (list license:expat license:asl2.0)))) +(define-public rust-jemallocator-0.1 + (package + (inherit rust-jemallocator-0.3) + (name "rust-jemallocator") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "jemallocator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1csabk36p06nlh3qxxsg6nkf074b2jq2cld5zriq0xazqqmd834z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-jemalloc-sys" ,rust-jemalloc-sys-0.1) + ("rust-libc" ,rust-libc-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc_pic.a"))) + #t))))) + (native-inputs + `(("jemalloc" ,jemalloc))))) + (define-public rust-json-0.11 (package (name "rust-json") -- cgit v1.2.3 From f8d773f43352a3306f99b5ea8253407b4e32e4d8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 21:07:55 +0300 Subject: gnu: rust-nom-4.2: Fix dependencies * gnu/packages/crates-io.scm (rust-nom-4.2)[arguments]: Remove rust-lexical-core-0.4, add rust-version-check-0.1 to cargo-inputs. Remove rust-doc-comment-0.3, rust-version-check-0.9 from cargo-development-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07679bc0e3..ab7909306e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7904,14 +7904,12 @@ (define-public rust-nom-4.2 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-lexical-core" ,rust-lexical-core-0.4) ("rust-memchr" ,rust-memchr-2.2) - ("rust-regex" ,rust-regex-1.1)) + ("rust-regex" ,rust-regex-1.1) + ("rust-version-check" ,rust-version-check-0.1)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) - ("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-version-check" ,rust-version-check-0.9)))) + ("rust-jemallocator" ,rust-jemallocator-0.1)))) (home-page "https://github.com/Geal/nom") (synopsis "Byte-oriented, zero-copy, parser combinators library") -- cgit v1.2.3 From 192363333d039db7786ef24b83f85684e290abb9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 21:10:49 +0300 Subject: gnu: Add rust-lazy-static-0.2. * gnu/packages/crates-io.scm (rust-lazy-static-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ab7909306e..d663db9d77 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6346,6 +6346,26 @@ (define-public rust-lazy-static-1.3 (arguments `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) +(define-public rust-lazy-static-0.2 + (package + (inherit rust-lazy-static-1.4) + (name "rust-lazy-static") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy_static" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wxy8vak7jsx6r8gx475pjqpx11p2bfq4wvw6idmqi31mp3k7w3n")))) + (arguments + `(#:tests? #f ; Tests fail to compile. + #:cargo-inputs + (("rust-compiletest-rs" ,rust-compiletest-rs-0.3) + ("rust-spin" ,rust-spin-0.4)))))) + (define-public rust-lazycell-1.2 (package (name "rust-lazycell") -- cgit v1.2.3 From d20c6d3d0121106ca9a9075595b8d0bb5803c08d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 21:11:08 +0300 Subject: gnu: Add rust-lazy-static-0.1. * gnu/packages/crates-io.scm (rust-lazy-static-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d663db9d77..a708c3e8bb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6366,6 +6366,22 @@ (define-public rust-lazy-static-0.2 (("rust-compiletest-rs" ,rust-compiletest-rs-0.3) ("rust-spin" ,rust-spin-0.4)))))) +(define-public rust-lazy-static-0.1 + (package + (inherit rust-lazy-static-0.2) + (name "rust-lazy-static") + (version "0.1.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy_static" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05vl1h4b0iv800grsdyc3fg2bq29p70wjav6zpjvxxd5i8d6s66g")))) + (arguments '()))) + (define-public rust-lazycell-1.2 (package (name "rust-lazycell") -- cgit v1.2.3 From ba7ead2b507d94397481be014d6ac0c41c7ddbfa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 21:12:47 +0300 Subject: gnu: Add rust-nom-3. * gnu/packages/crates-io.scm (rust-nom-3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a708c3e8bb..02ccfc3979 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7954,6 +7954,29 @@ (define-public rust-nom-4.2 combinators library.") (license license:expat))) +(define-public rust-nom-3 + (package + (inherit rust-nom-4.2) + (name "rust-nom") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yr8fazcspgawl6s7wmx5llz61s68jl88cnrph18fa7xf06cbbh5")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; stream::tests::seeking_consumer fails + #:cargo-inputs + (("rust-compiler-error" ,rust-compiler-error-0.1) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-memchr" ,rust-memchr-1.0) + ("rust-regex" ,rust-regex-0.2)))))) + (define-public rust-nom-1.2 (package (inherit rust-nom-4.2) -- cgit v1.2.3 From 08c7853518d06f8cd00c068452e2182ae800bc21 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 19 Feb 2020 16:53:56 +0100 Subject: gnu: Add libgdiplus. * gnu/packages/mono.scm (libgdiplus): New variable. --- gnu/packages/mono.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 17f90fe30a..5447dd2300 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,9 +19,14 @@ (define-module (gnu packages mono) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages perl) + #:use-module (gnu packages photo) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (gnu packages) @@ -124,3 +130,46 @@ (define-public mono Java.") (home-page "https://www.mono-project.com/") (license license:x11))) + +(define-public libgdiplus + (package + (name "libgdiplus") + (version "6.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "http://download.mono-project.com/sources/libgdiplus/libgdiplus-" + version + ".tar.gz")) + (sha256 + (base32 + "0adz5813f881z65lpyf0g0w9hcn7d7qkai6sncpkwnsxfv4khp5p")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("libtiff" ,libtiff) + ("libjpeg" ,libjpeg) + ("libexif" ,libexif) + ("libungif" ,libungif))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; TODO: See with upstream why they fail. + ;; https://github.com/mono/mono/issues/18934 + (add-before 'configure 'remove-buggy-tests + (lambda _ + (substitute* "tests/Makefile.in" + (("testicocodec\\$\\(EXEEXT\\) ") " ") + (("testfont\\$\\(EXEEXT\\) ") " ")) + #t))))) + (home-page "https://www.mono-project.com/docs/gui/libgdiplus/") + (synopsis "Mono library that provides a GDI+-compatible API") + (description "Libgdiplus is the Mono library that provides a +GDI+-compatible API on non-Windows operating systems. The implementation uses +Cairo to do most of the heavy lifting.") + (license license:gpl3+))) -- cgit v1.2.3 From 5479cef8ef220138577056e3e178496e9480b678 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 15:36:51 +0100 Subject: gnu: Add guile-lens. * gnu/packages/guile-xyz.scm (guile-lens): New variable. --- gnu/packages/guile-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 16b408900c..0c45f42273 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3071,3 +3071,42 @@ (define-public guile-webutils "This package provides tooling to write web applications in Guile, such as signed sessions, multipart message support, etc.") (license license:gpl3+)))) + +(define-public guile-lens + (let ((commit "14b15d07255f9d3f55d40a3b750d13c9ee3a154f") + (revision "0")) + (package + (name "guile-lens") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/a-sassmannshausen/guile-lens.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0w8jzqyla56yrgj7acsgd4nspyir6zgp3vgxid4xmwhg9wmf1ida")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'run-hall + (lambda _ + (setenv "HOME" "/tmp") ; for ~/.hall + (invoke "hall" "dist" "-x")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-2.2) + ("guile-hall" ,guile-hall) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://gitlab.com/a-sassmannshausen/guile-lens.git") + (synopsis "Composable lenses for data structures in Guile") + (description + "Guile-Lens is a library implementing lenses in Guile. The library is +currently a re-implementation of the lentes library for Clojure. Lenses +provide composable procedures, which can be used to focus, apply functions +over, or update a value in arbitrary data structures.") + (license license:gpl3+)))) -- cgit v1.2.3 From bfb6c393b91dc4a236678a0682348d5b7bd77193 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 15:44:50 +0100 Subject: gnu: gwl: Build with Guile 3. * gnu/packages/package-management.scm (gwl)[inputs]: Replace guile-2.2 with guile-3.0. [propagated-inputs]: Replace guix, guile-commonmark, guile-gcrypt, guile-pfds, guile-syntax-highlight, and guile-wisp with their Guile 3.0 variants. --- gnu/packages/package-management.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 09888ca9e2..8443b0a67f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -803,14 +803,14 @@ (define-public gwl ("texinfo" ,texinfo) ("graphviz" ,graphviz))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (propagated-inputs - `(("guix" ,guix) - ("guile-commonmark" ,guile-commonmark) - ("guile-gcrypt" ,guile-gcrypt) - ("guile-pfds" ,guile-pfds) - ("guile-syntax-highlight" ,guile-syntax-highlight) - ("guile-wisp" ,guile-wisp))) + `(("guix" ,guile3.0-guix) + ("guile-commonmark" ,guile3.0-commonmark) + ("guile-gcrypt" ,guile3.0-gcrypt) + ("guile-pfds" ,guile3.0-pfds) + ("guile-syntax-highlight" ,guile3.0-syntax-highlight) + ("guile-wisp" ,guile3.0-wisp))) (home-page "https://workflows.guix.info") (synopsis "Workflow management extension for GNU Guix") (description "The @dfn{Guix Workflow Language} (GWL) provides an -- cgit v1.2.3 From 7c9d8a5d58d6797a4c224bc76b823d826ceede4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 18:46:22 +0100 Subject: gnu: r-nmf: Move to (gnu packages bioconductor). * gnu/packages/statistics.scm (r-nmf): Move this variable from here... * gnu/packages/bioconductor.scm (r-nmf): ...to here. --- gnu/packages/bioconductor.scm | 41 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/statistics.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a6e0c5a1e6..2e0f457321 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -722,6 +722,47 @@ (define-public r-deconstructsigs closely reconstructs the mutational profile.") (license license:gpl2+))) +;; This is a CRAN package, but it depends on Bioconductor packages. +(define-public r-nmf + (package + (name "r-nmf") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "NMF" version)) + (sha256 + (base32 + "1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v")))) + (properties `((upstream-name . "NMF"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cluster" ,r-cluster) + ("r-bigmemory" ,r-bigmemory) ; suggested + ("r-synchronicity" ,r-synchronicity) ; suggested + ("r-colorspace" ,r-colorspace) + ("r-digest" ,r-digest) + ("r-doparallel" ,r-doparallel) + ("r-foreach" ,r-foreach) + ("r-ggplot2" ,r-ggplot2) + ("r-gridbase" ,r-gridbase) + ("r-pkgmaker" ,r-pkgmaker) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-registry" ,r-registry) + ("r-reshape2" ,r-reshape2) + ("r-rngtools" ,r-rngtools) + ("r-stringr" ,r-stringr))) + (home-page "http://renozao.github.io/NMF") + (synopsis "Algorithms and framework for nonnegative matrix factorization") + (description + "This package provides a framework to perform Non-negative Matrix +Factorization (NMF). The package implements a set of already published +algorithms and seeding methods, and provides a framework to test, develop and +plug new or custom algorithms. Most of the built-in algorithms have been +optimized in C++, and the main interface function provides an easy way of +performing parallel computations on multicore machines.") + (license license:gpl2+))) + (define-public r-do-db (package (name "r-do-db") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 313634c29c..4b1b34cd3b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3420,46 +3420,6 @@ (define-public r-bigmemory ;; Users can choose either LGPLv3 or ASL2.0. (license (list license:lgpl3 license:asl2.0)))) -(define-public r-nmf - (package - (name "r-nmf") - (version "0.21.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "NMF" version)) - (sha256 - (base32 - "1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v")))) - (properties `((upstream-name . "NMF"))) - (build-system r-build-system) - (propagated-inputs - `(("r-cluster" ,r-cluster) - ("r-bigmemory" ,r-bigmemory) ; suggested - ("r-synchronicity" ,r-synchronicity) ; suggested - ("r-colorspace" ,r-colorspace) - ("r-digest" ,r-digest) - ("r-doparallel" ,r-doparallel) - ("r-foreach" ,r-foreach) - ("r-ggplot2" ,r-ggplot2) - ("r-gridbase" ,r-gridbase) - ("r-pkgmaker" ,r-pkgmaker) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-registry" ,r-registry) - ("r-reshape2" ,r-reshape2) - ("r-rngtools" ,r-rngtools) - ("r-stringr" ,r-stringr))) - (home-page "http://renozao.github.io/NMF") - (synopsis "Algorithms and framework for nonnegative matrix factorization") - (description - "This package provides a framework to perform Non-negative Matrix -Factorization (NMF). The package implements a set of already published -algorithms and seeding methods, and provides a framework to test, develop and -plug new or custom algorithms. Most of the built-in algorithms have been -optimized in C++, and the main interface function provides an easy way of -performing parallel computations on multicore machines.") - (license license:gpl2+))) - (define-public r-r-methodss3 (package (name "r-r-methodss3") -- cgit v1.2.3 From be1042b326d846737c8b18bd9bc155cdd63b5c3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 18:57:31 +0100 Subject: gnu: r-nmf: Update to 0.22.0. * gnu/packages/bioconductor.scm (r-nmf): Update to 0.22.0. [propagated-inputs]: Add r-biobase and r-biocmanager. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2e0f457321..a99c629cb1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -726,18 +726,20 @@ (define-public r-deconstructsigs (define-public r-nmf (package (name "r-nmf") - (version "0.21.0") + (version "0.22.0") (source (origin (method url-fetch) (uri (cran-uri "NMF" version)) (sha256 (base32 - "1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v")))) + "0b2ls3x1nkrnam45hagpys624nzxj3v7kxnp0q216yakvx5h57cq")))) (properties `((upstream-name . "NMF"))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) + ("r-biobase" ,r-biobase) + ("r-biocmanager" ,r-biocmanager) ("r-bigmemory" ,r-bigmemory) ; suggested ("r-synchronicity" ,r-synchronicity) ; suggested ("r-colorspace" ,r-colorspace) -- cgit v1.2.3 From db092c2a901c863a72314da02ec1a1f46d9244fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:54:45 +0100 Subject: gnu: r-qtl: Update to 1.45-11. * gnu/packages/bioinformatics.scm (r-qtl): Update to 1.45-11. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2ee4f14d25..724e0b89e3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8236,7 +8236,7 @@ (define-public r-motifrg (define-public r-qtl (package (name "r-qtl") - (version "1.44-9") + (version "1.45-11") (source (origin (method url-fetch) @@ -8244,7 +8244,7 @@ (define-public r-qtl version ".tar.gz")) (sha256 (base32 - "03lmvydln8b7666b6w46qbryhf83vsd11d4y2v95rfgvqgq66l1i")))) + "1d6qgj602fm6zia3djl4hmca0ri4v57ffp3g93p2yc3cabx2hq90")))) (build-system r-build-system) (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") -- cgit v1.2.3 From f45ada0fc821599e5d9fabd3d95686b86b80466d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:00 +0100 Subject: gnu: r-seurat: Update to 3.1.3. * gnu/packages/bioinformatics.scm (r-seurat): Update to 3.1.3. [propagated-inputs]: Remove r-sdmtools. --- gnu/packages/bioinformatics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 724e0b89e3..b7706986f3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9504,13 +9504,13 @@ (define-public r-msnid (define-public r-seurat (package (name "r-seurat") - (version "3.1.2") + (version "3.1.3") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "0m1qi39snbmkkv1p07bzg1r7snc9x6a1y0dghvpk1nzgcfpmnsj4")))) + "0962mfgqk1di3wy1j0xdkvnw0q5m3q4xzd67d1l6dijlqiz8nfal")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs @@ -9549,7 +9549,6 @@ (define-public r-seurat ("r-rtsne" ,r-rtsne) ("r-scales" ,r-scales) ("r-sctransform" ,r-sctransform) - ("r-sdmtools" ,r-sdmtools) ("r-tsne" ,r-tsne) ("r-uwot" ,r-uwot))) (home-page "http://www.satijalab.org/seurat") -- cgit v1.2.3 From 74fa293245b5ca95d318be87dcf1bf2fb7801c49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:18 +0100 Subject: gnu: r-lattice: Update to 0.20-40. * gnu/packages/statistics.scm (r-lattice): Update to 0.20-40. --- 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 4b1b34cd3b..3dce917f6b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -548,13 +548,13 @@ (define-public r-kernsmooth (define-public r-lattice (package (name "r-lattice") - (version "0.20-38") + (version "0.20-40") (source (origin (method url-fetch) (uri (cran-uri "lattice" version)) (sha256 (base32 - "0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx")))) + "1w53sfzdy9zsifv44dqf9pl46fk14lnx3fha1k1p660h51lyv56m")))) (build-system r-build-system) (home-page "http://lattice.r-forge.r-project.org/") (synopsis "High-level data visualization system") -- cgit v1.2.3 From 304ea861c339c19371cf4dc84c5cb614003c0a30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:26 +0100 Subject: gnu: r-nlme: Update to 3.1-144. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-144. --- 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 3dce917f6b..a48749f1c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -590,13 +590,13 @@ (define-public r-matrix (define-public r-nlme (package (name "r-nlme") - (version "3.1-143") + (version "3.1-144") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "13iixbs2ibldc75rl7rav5n5kx33zwm33xnfw1yvlkpcqf38bd22")))) + (base32 "1gqyq53fdq23wsi3f4n9vg4mn5i0v18zam5lnzlpg581xifx2779")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 7069e6c2d6eae8334a218d9e2f3bf31909de19d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:35 +0100 Subject: gnu: r-bit: Update to 1.1-15.2. * gnu/packages/statistics.scm (r-bit): Update to 1.1-15.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 a48749f1c2..a47ff59cf7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -739,14 +739,14 @@ (define-public r (define-public r-bit (package (name "r-bit") - (version "1.1-15.1") + (version "1.1-15.2") (source (origin (method url-fetch) (uri (cran-uri "bit" version)) (sha256 (base32 - "0y351ajlrn9ywbiai46mjpwmw5pqc9ik2z24rf0bnbdcvaxdr7r8")))) + "12xjkkkmflkz8s435by4r23b57cz7z67z84907f6qg99hn1yg0qb")))) (build-system r-build-system) (home-page "http://ff.r-forge.r-project.org") (synopsis "Class for vectors of 1-bit booleans") -- cgit v1.2.3 From 26162b8be9b4162060c17111ca980ce088ef3129 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:42 +0100 Subject: gnu: r-digest: Update to 0.6.24. * gnu/packages/statistics.scm (r-digest): Update to 0.6.24. --- 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 a47ff59cf7..08f1a4b05d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -804,13 +804,13 @@ (define-public r-dichromat (define-public r-digest (package (name "r-digest") - (version "0.6.23") + (version "0.6.24") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "18h5s8vkdcz2vhpsx6g3ig00zalrihr03skn95zw3lr2y56pafmp")))) + (base32 "01xsmcgqva9bza30zh7kj4lzapxgg4yiljfk99g4v6xng50mp604")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. -- cgit v1.2.3 From 0f86093cadbb214463890c7d36802002372b069a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:50 +0100 Subject: gnu: r-stringi: Update to 1.4.6. * gnu/packages/statistics.scm (r-stringi): Update to 1.4.6. --- 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 08f1a4b05d..0b00f1fff1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1015,14 +1015,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "0gdmdf4i3ik8rcs7af1vlsfnilcmw3z28jx4278rpq2asigps89k")))) + "1mkgxzf000zdgbbbvg2vf4md4l501n5lfksffq8vdg6pbgd6fgv3")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8bf717ed36ad87d2ed5e576365b5887fa8683088 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:55:59 +0100 Subject: gnu: r-svglite: Update to 1.2.3. * gnu/packages/statistics.scm (r-svglite): Update to 1.2.3. --- 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 0b00f1fff1..3841971a7a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1177,14 +1177,14 @@ (define-public r-gdtools (define-public r-svglite (package (name "r-svglite") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "svglite" version)) (sha256 (base32 - "1gwv51wqp6pgm2f9gavsiq65njs77fr49n8y6y9ax60k3a4vvg14")))) + "1zivykbi1pxdxhrkc1if1ihdn5p27j0nai2q0abca1dwry3wg2yl")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From ebbed19baf6d177aab6f811265f24eeafeafa6f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:08 +0100 Subject: gnu: r-mime: Update to 0.9. * gnu/packages/statistics.scm (r-mime): Update to 0.9. --- 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 3841971a7a..ebfb15a065 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1337,13 +1337,13 @@ (define-public r-highr (define-public r-mime (package (name "r-mime") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (cran-uri "mime" version)) (sha256 (base32 - "18w98prfbivvygiyamsf9yg090kzbnvw2fn9b27823gmis4d08ny")))) + "107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc")))) (build-system r-build-system) (home-page "https://github.com/yihui/mime") (synopsis "R package to map filenames to MIME types") -- cgit v1.2.3 From 67c6d5d000f1d608b911a122c9a75d243f53c20e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:16 +0100 Subject: gnu: r-yaml: Update to 2.2.1. * gnu/packages/statistics.scm (r-yaml): Update to 2.2.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 ebfb15a065..cc6c8d2279 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1382,13 +1382,13 @@ (define-public r-markdown (define-public r-yaml (package (name "r-yaml") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m")))) + "10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit v1.2.3 From 738f3e0bba7ba6a468c91174d4f93cc17ccfdd8c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:23 +0100 Subject: gnu: r-knitr: Update to 1.28. * gnu/packages/statistics.scm (r-knitr): Update to 1.28. --- 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 cc6c8d2279..daf3974eae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1400,13 +1400,13 @@ (define-public r-yaml (define-public r-knitr (package (name "r-knitr") - (version "1.27") + (version "1.28") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "02nysgnx6xv0kd351s1d59yx4g0drsd9lmcgxs0rsw5f1jiycgdg")))) + "0ai382fmpz25qrhdgchs3vph2cdvyd73xyryg4jby5fp67d03vh5")))) (build-system r-build-system) (propagated-inputs `(("r-evaluate" ,r-evaluate) -- cgit v1.2.3 From 3681b1c3337aa6a537cf9f0b55d623357a7214ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:31 +0100 Subject: gnu: r-rlang: Update to 0.4.4. * gnu/packages/statistics.scm (r-rlang): Update to 0.4.4. --- 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 daf3974eae..ce8459d9e4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1607,13 +1607,13 @@ (define-public r-r6 (define-public r-rlang (package (name "r-rlang") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "0qsqfikbsj55x5brghnkzzp7pz0japr4xnzm993f668mlls3f6i4")))) + "1kqmrk00lnkbclnvj1dizjbdav0g1w44yd6ja4yy3bivwan9jf23")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From 26e41929c04153c5a149bb47f647b68c7a35017f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:44 +0100 Subject: gnu: r-chron: Update to 2.3-55. * gnu/packages/statistics.scm (r-chron): Update to 2.3-55. --- 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 ce8459d9e4..1b8c4a5eb0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1781,13 +1781,13 @@ (define-public r-locfit (define-public r-chron (package (name "r-chron") - (version "2.3-54") + (version "2.3-55") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd")))) + "09gbs7c1ynlg0kl1m6nkbn75ysk16g13r17snnaws64qwywiywqg")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") -- cgit v1.2.3 From eea33597e0089eb89ffd1db2efd2ebc3f11a3c3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:56:57 +0100 Subject: gnu: r-checkmate: Update to 2.0.0. * gnu/packages/statistics.scm (r-checkmate): Update to 2.0.0. --- 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 1b8c4a5eb0..4ec8ce464a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2094,14 +2094,14 @@ (define-public r-backports (define-public r-checkmate (package (name "r-checkmate") - (version "1.9.4") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "checkmate" version)) (sha256 (base32 - "08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps")))) + "193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports))) -- cgit v1.2.3 From f5afee1050a615d381296ba5cfd8bd14b95cae94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:57:05 +0100 Subject: gnu: r-rstudioapi: Update to 0.11. * gnu/packages/statistics.scm (r-rstudioapi): Update to 0.11. --- 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 4ec8ce464a..70d80be72c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2375,13 +2375,13 @@ (define-public r-git2r (define-public r-rstudioapi (package (name "r-rstudioapi") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "rstudioapi" version)) (sha256 (base32 - "15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0")))) + "0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rstudioapi") (synopsis "Safely access the RStudio API") -- cgit v1.2.3 From 2d4c4651c57fbab463ce31f9a2322f80009e13db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:57:56 +0100 Subject: gnu: r-devtools: Update to 2.2.2. * gnu/packages/statistics.scm (r-devtools): Update to 2.2.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 70d80be72c..c116507680 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2393,13 +2393,13 @@ (define-public r-rstudioapi (define-public r-devtools (package (name "r-devtools") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "devtools" version)) (sha256 (base32 - "0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f")))) + "1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 0c740489f9f99aeb50bc7fbd6745d340428b67f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:05 +0100 Subject: gnu: r-rcpparmadillo: Update to 0.9.850.1.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.850.1.0. --- 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 c116507680..f201e10e4c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2565,13 +2565,13 @@ (define-public r-latticeextra (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.800.4.0") + (version "0.9.850.1.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1csh54v4d0ccwmk4bqj4rca1d5rqpafvb4459x3q6k9sys0charx")))) + "0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) ;; All needed for vignettes -- cgit v1.2.3 From ff8b5e852edca65985a85a566622a559153c7e73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:14 +0100 Subject: gnu: r-foreach: Update to 1.4.8. * gnu/packages/statistics.scm (r-foreach): Update to 1.4.8. --- 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 f201e10e4c..db985838ee 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3056,14 +3056,14 @@ (define-public r-iterators (define-public r-foreach (package (name "r-foreach") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (cran-uri "foreach" version)) (sha256 (base32 - "0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm")))) + "1xwf5l2fw62w80ji3dvgcc6m9m4s6zygkhi84ypb0gv0ppjffg5c")))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) -- cgit v1.2.3 From f5d0d7e0d7a9b955dc788b4a76e5f00b8c6f5dd0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:23 +0100 Subject: gnu: r-dt: Update to 0.12. * gnu/packages/statistics.scm (r-dt): Update to 0.12. --- 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 db985838ee..ebaedca273 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3130,13 +3130,13 @@ (define-public r-domc (define-public r-dt (package (name "r-dt") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "09k9s07aah1apc308sj1abvr27mky6fkpl9j6lxl2x55n4immvkg")))) + "0089288ma1cj9nf4jscmpbagyqlg4r90mw8bwl4zv1d4hjl0d693")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) -- cgit v1.2.3 From 460ff75a8851a0e01a15c17b461e3d28fe059653 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:31 +0100 Subject: gnu: r-r-methodss3: Update to 1.8.0. * gnu/packages/statistics.scm (r-r-methodss3): Update to 1.8.0. --- 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 ebaedca273..d4747b7685 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3423,13 +3423,13 @@ (define-public r-bigmemory (define-public r-r-methodss3 (package (name "r-r-methodss3") - (version "1.7.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (cran-uri "R.methodsS3" version)) (sha256 (base32 - "11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24")))) + "19c5870v7b59fs6xk58bh3rfkmhfralmgsax86zzpdmz47pga1g0")))) (properties `((upstream-name . "R.methodsS3"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/R.methodsS3") -- cgit v1.2.3 From a9f21dd9d4d0dccd590354c96215582fa9af5742 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:44 +0100 Subject: gnu: r-plotly: Update to 4.9.2. * gnu/packages/statistics.scm (r-plotly): Update to 4.9.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 d4747b7685..08cacbe99e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3753,13 +3753,13 @@ (define-public r-purrr (define-public r-plotly (package (name "r-plotly") - (version "4.9.1") + (version "4.9.2") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "0gadam4qw81q9gpjp7sqrpd7ikmcdsc78d8vjn39g0xzs5j8r845")))) + "19zw3qnhfgqdxlvma8xyikir46aiqhfcwxf072z9xgq0hknpblm5")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From f1c7e1960c78cc04ada1d9ca8c648e9763fb632c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:58:52 +0100 Subject: gnu: r-hmisc: Update to 4.3-1. * gnu/packages/statistics.scm (r-hmisc): Update to 4.3-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 08cacbe99e..588ed843c9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3956,13 +3956,13 @@ (define-public r-base64 (define-public r-hmisc (package (name "r-hmisc") - (version "4.3-0") + (version "4.3-1") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "0rb1m6138lqzb46nss9ggvhghipd10vdnwsy6iq2wzynrynzkwkz")))) + (base32 "02ni7719acdmc8pcbx07b7x2nqsjrwq4smnx9qlzqjmx4pmp3cwc")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 31a0be58d2dbaab218695b87aea7159a675b4cfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:59:01 +0100 Subject: gnu: r-sfsmisc: Update to 1.1-5. * gnu/packages/statistics.scm (r-sfsmisc): Update to 1.1-5. --- 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 588ed843c9..fc3ffc84de 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4085,14 +4085,14 @@ (define-public r-fastcluster (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-4") + (version "1.1-5") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "0zaw617zarmwir8l60riky0z6r1j3mwfnm1f32vqcbljb74akdj4")))) + "173qgm2bn84x544fc3x9gc2rv995sbsvji9lnn2drx8drvzyy8lf")))) (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 9227b59d0d70f99faac1bd8e264087cf77e68746 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:59:12 +0100 Subject: gnu: r-statmod: Update to 1.4.34. * gnu/packages/statistics.scm (r-statmod): Update to 1.4.34. --- 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 fc3ffc84de..5fb8c36f43 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4400,13 +4400,13 @@ (define-public r-ggthemes (define-public r-statmod (package (name "r-statmod") - (version "1.4.33") + (version "1.4.34") (source (origin (method url-fetch) (uri (cran-uri "statmod" version)) (sha256 (base32 - "1fbi5m4c0lingm2vvi0g6jf8f2mg1h01xwyz5rnymrq7gs0ibiks")))) + "0yklg64aw5y8kfq5piafnrj1v3jv563iwzzl75g3kllrw23c508s")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/statmod") (native-inputs -- cgit v1.2.3 From fdfcde2a49161cf38e88458792be591f0d3369c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:59:25 +0100 Subject: gnu: r-trimcluster: Update to 0.1-5. * gnu/packages/statistics.scm (r-trimcluster): Update to 0.1-5. --- 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 5fb8c36f43..33ded56954 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4875,14 +4875,14 @@ (define-public r-robust (define-public r-trimcluster (package (name "r-trimcluster") - (version "0.1-2.1") + (version "0.1-5") (source (origin (method url-fetch) (uri (cran-uri "trimcluster" version)) (sha256 (base32 - "0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn")))) + "12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/trimcluster") (synopsis "Cluster analysis with trimming") -- cgit v1.2.3 From c4c3dfdabb830ac9bf6e3bff8323efcd6f58f6ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:59:33 +0100 Subject: gnu: r-fpc: Update to 2.2-5. * gnu/packages/statistics.scm (r-fpc): Update to 2.2-5. --- 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 33ded56954..e40c009db5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4896,14 +4896,14 @@ (define-public r-trimcluster (define-public r-fpc (package (name "r-fpc") - (version "2.2-4") + (version "2.2-5") (source (origin (method url-fetch) (uri (cran-uri "fpc" version)) (sha256 (base32 - "1gsnl5sbdg86b2wdrsy6wq83xj6mrziiq7rxa8cqksgljc7gp6yf")))) + "10504hzivbn89ip0cd5bcxd36ivbgin1lw1xhyh3xfckcm25v1a5")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit v1.2.3 From c0d106acab59b80de4afe792d451df9871b24791 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 20:59:46 +0100 Subject: gnu: r-rcppprogress: Update to 0.4.2. * gnu/packages/statistics.scm (r-rcppprogress): Update to 0.4.2. [propagated-inputs]: Remove r-devtools and r-rcpp. --- gnu/packages/statistics.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e40c009db5..73f4a290be 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5224,19 +5224,16 @@ (define-public r-car (define-public r-rcppprogress (package (name "r-rcppprogress") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "RcppProgress" version)) (sha256 (base32 - "0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi")))) + "0j2b37gwjpgmrnr00srdzm751hzlpsjb54ph63xxmcdfnwhlnqmi")))) (properties `((upstream-name . "RcppProgress"))) (build-system r-build-system) - (propagated-inputs - `(("r-devtools" ,r-devtools) - ("r-rcpp" ,r-rcpp))) (home-page "https://github.com/kforner/rcpp_progress") (synopsis "Interruptible progress bar for C++ in R packages") (description -- cgit v1.2.3 From 1f029f7f11bf15f794702cf6ba184aaf60726679 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:00:08 +0100 Subject: gnu: r-mnormt: Update to 1.5-6. * gnu/packages/statistics.scm (r-mnormt): Update to 1.5-6. --- 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 73f4a290be..b64c6a4ed0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5245,14 +5245,14 @@ (define-public r-rcppprogress (define-public r-mnormt (package (name "r-mnormt") - (version "1.5-5") + (version "1.5-6") (source (origin (method url-fetch) (uri (cran-uri "mnormt" version)) (sha256 (base32 - "1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z")))) + "0k8y08gj6z525yvc7y3dl2kzgnafbj3i7lvpamypsmqxf74zql99")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 0394d994b52948cb6bc761aca5aa10e74459e1d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:00:19 +0100 Subject: gnu: r-sn: Update to 1.5-5. * gnu/packages/statistics.scm (r-sn): Update to 1.5-5. --- 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 b64c6a4ed0..4727645c18 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5288,14 +5288,14 @@ (define-public r-numderiv (define-public r-sn (package (name "r-sn") - (version "1.5-4") + (version "1.5-5") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6")))) + "0ymyyc0di1g2b11wzljiih05z3rxck48wn74bygg3fiby973z49f")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit v1.2.3 From b8fc0678e77c699a4e853f34d97aed92c7a917f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:00:29 +0100 Subject: gnu: r-directlabels: Update to 2020.1.31. * gnu/packages/statistics.scm (r-directlabels): Update to 2020.1.31. --- 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 4727645c18..bc196c54f4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5560,14 +5560,14 @@ (define-public r-tgconfig (define-public r-directlabels (package (name "r-directlabels") - (version "2018.05.22") + (version "2020.1.31") (source (origin (method url-fetch) (uri (cran-uri "directlabels" version)) (sha256 (base32 - "0xcpc56ssb9430b0xcdhayk3qaak2qcakyss2pz14y5w2027hblv")))) + "08s1gnwp4bn8xahwjaq0f1qzhwh2dvybzhq3z7xyzn8cnyzmis6c")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) -- cgit v1.2.3 From 9970c25eb924bffa2ead30863bcaee3401e107dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:00:57 +0100 Subject: gnu: r-dplyr: Update to 0.8.4. * gnu/packages/statistics.scm (r-dplyr): Update to 0.8.4. [propagated-inputs]: Add r-ellipsis. --- gnu/packages/statistics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index bc196c54f4..ead5243c71 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1651,17 +1651,18 @@ (define-public r-tibble (define-public r-dplyr (package (name "r-dplyr") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "032c89wa04g9rih9shyvwl3il0bsrv3xk489x6867sk9bb3amd38")))) + "1nd0mmvqjbzbknawa520f64p9zlj9lwdlq0hh7c1mciyy7ah6641")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) ("r-bh" ,r-bh) + ("r-ellipsis" ,r-ellipsis) ("r-glue" ,r-glue) ("r-magrittr" ,r-magrittr) ("r-pkgconfig" ,r-pkgconfig) -- cgit v1.2.3 From 98319975bf6476cc8ed02c2433f5550bb59cb49c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:01:17 +0100 Subject: gnu: r-ade4: Update to 1.7-15. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-15. [propagated-inputs]: Add r-pixmap and r-sp. --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ead5243c71..4583ca3a75 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1959,17 +1959,19 @@ (define-public r-coda (define-public r-ade4 (package (name "r-ade4") - (version "1.7-13") + (version "1.7-15") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m")))) + "1xpxznlqm8wb4d5z2dcrl0wi3jjciq2hr5rcx2b5aaipiiyzm1ij")))) (build-system r-build-system) (propagated-inputs - `(("r-mass" ,r-mass))) + `(("r-mass" ,r-mass) + ("r-pixmap" ,r-pixmap) + ("r-sp" ,r-sp))) (home-page "http://pbil.univ-lyon1.fr/ADE-4") (synopsis "Multivariate data analysis and graphical display") (description -- cgit v1.2.3 From d6d08891f440a056c6faa2c8ae117bb4748c658a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:01:33 +0100 Subject: gnu: r-tidyselect: Update to 1.0.0. * gnu/packages/statistics.scm (r-tidyselect): Update to 1.0.0. [propagated-inputs]: Add r-ellipsis and r-vctrs; remove r-rcpp. --- gnu/packages/statistics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4583ca3a75..a0122b2919 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3649,20 +3649,21 @@ (define-public r-viridislite (define-public r-tidyselect (package (name "r-tidyselect") - (version "0.2.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "tidyselect" version)) (sha256 (base32 - "0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw")))) + "1bwwsljkg1bxh7xnqxv7n0n1s9y8x407i6lsv826vy1ss1k1fxpy")))) (build-system r-build-system) (propagated-inputs - `(("r-glue" ,r-glue) + `(("r-ellipsis" ,r-ellipsis) + ("r-glue" ,r-glue) ("r-purrr" ,r-purrr) - ("r-rcpp" ,r-rcpp) - ("r-rlang" ,r-rlang))) + ("r-rlang" ,r-rlang) + ("r-vctrs" ,r-vctrs))) (home-page "https://cran.r-project.org/web/packages/tidyselect") (synopsis "Select from a set of strings") (description -- cgit v1.2.3 From c06d6ebdad6725dc776c005c96e07b6e7262b31e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:02:04 +0100 Subject: gnu: r-hexbin: Update to 1.28.1. * gnu/packages/statistics.scm (r-hexbin): Update to 1.28.1. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a0122b2919..9f68ec3ddd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3712,19 +3712,20 @@ (define-public r-tidyr (define-public r-hexbin (package (name "r-hexbin") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (cran-uri "hexbin" version)) (sha256 (base32 - "0b58jb1kz39wzrnkv077cfzns889xly7psvhxnm3xmnx6yvd986d")))) + "1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://github.com/edzer/hexbin") (synopsis "Hexagonal binning routines") (description -- cgit v1.2.3 From ca61ca930d8e50e92e40d4df70f4f5630c19df3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:02:31 +0100 Subject: gnu: r-mixtools: Update to 1.2.0. * gnu/packages/statistics.scm (r-mixtools): Update to 1.2.0. [propagated-inputs]: Add r-kernlab. --- gnu/packages/statistics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9f68ec3ddd..918d2c8254 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4525,17 +4525,18 @@ (define-public r-cowplot (define-public r-mixtools (package (name "r-mixtools") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "mixtools" version)) (sha256 (base32 - "13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl")))) + "08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) + ("r-kernlab" ,r-kernlab) ("r-segmented" ,r-segmented) ("r-survival" ,r-survival))) (home-page "https://cran.r-project.org/web/packages/mixtools") -- cgit v1.2.3 From ed5e514dff4792f6541a7a4f33c57f87c2eebb6c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:02:52 +0100 Subject: gnu: r-callr: Update to 3.4.2. * gnu/packages/cran.scm (r-callr): Update to 3.4.2. --- 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 4e830fee11..86d37e52f6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -423,14 +423,14 @@ (define-public r-reprex (define-public r-callr (package (name "r-callr") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "0nyba0knzd44zz2xmr7zd9qh3rny0q8msysxf49843d9rlyv6y70")))) + "0bdlp0labwyfl36jqslj2g7zmw7zwr58v9gam435kiblhjimb8fc")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit v1.2.3 From 256761021c47e9b514c8dbf89a2ab140916370c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:03:05 +0100 Subject: gnu: r-jsonlite: Update to 1.6.1. * gnu/packages/cran.scm (r-jsonlite): Update to 1.6.1. --- 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 86d37e52f6..656b28e1c5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -529,13 +529,13 @@ (define-public r-httpuv (define-public r-jsonlite (package (name "r-jsonlite") - (version "1.6") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "jsonlite" version)) (sha256 (base32 - "0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8")))) + "0xrki07wc17bkmhz0h7jay784j1sls2i9bf1mfpj6yl59791v4kl")))) (build-system r-build-system) (home-page "https://arxiv.org/abs/1403.2805") (synopsis "Robust, high performance JSON parser and generator for R") -- cgit v1.2.3 From 437825dd0acd36e965c1451f7c2bb2d5b3091387 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:04:29 +0100 Subject: gnu: r-mapproj: Update to 1.2.7. * gnu/packages/cran.scm (r-mapproj): Update to 1.2.7. --- 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 656b28e1c5..71995aa258 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1271,14 +1271,14 @@ (define-public r-maps (define-public r-mapproj (package (name "r-mapproj") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "mapproj" version)) (sha256 (base32 - "1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2")))) + "0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps))) (home-page "https://cran.r-project.org/web/packages/mapproj") -- cgit v1.2.3 From a7474115bf11a540fc4f8afcd9eb580c955dc609 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:04:51 +0100 Subject: gnu: r-rgooglemaps: Update to 1.4.5.3. * gnu/packages/cran.scm (r-rgooglemaps): Update to 1.4.5.3. [propagated-inputs]: Add r-sp. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 71995aa258..bedb5e6fdb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1293,17 +1293,19 @@ (define-public r-mapproj (define-public r-rgooglemaps (package (name "r-rgooglemaps") - (version "1.4.5.2") + (version "1.4.5.3") (source (origin (method url-fetch) (uri (cran-uri "RgoogleMaps" version)) (sha256 (base32 - "1y2dinxmzx6mg6ynpk2q7f4k4rxjm66my185gafdcvpc4rl7svs7")))) + "02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi")))) (properties `((upstream-name . "RgoogleMaps"))) (build-system r-build-system) - (propagated-inputs `(("r-png" ,r-png))) + (propagated-inputs + `(("r-png" ,r-png) + ("r-sp" ,r-sp))) (home-page "https://cran.r-project.org/web/packages/RgoogleMaps") (synopsis "Use Google Maps in R") (description "This package serves two purposes: -- cgit v1.2.3 From 01fb586285d66c3f9b8155c6067fe0beb1487c20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:05:32 +0100 Subject: gnu: r-ps: Update to 1.3.2. * gnu/packages/cran.scm (r-ps): Update to 1.3.2. --- 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 bedb5e6fdb..efa2036223 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1617,13 +1617,13 @@ (define-public r-pls (define-public r-ps (package (name "r-ps") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "ps" version)) (sha256 - (base32 "1lcq7r0q4jb8x6k023zr2ydj2dg925bqqbkhx1phpnyjrk897498")))) + (base32 "0127q6pw9iw8hhcfp231gmdh29nahh2n5jzc38avrzy7yrm4bwl9")))) (build-system r-build-system) (home-page "https://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") -- cgit v1.2.3 From 4332a46ca7b09960210d122c7cc6ab86f684438b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:05:48 +0100 Subject: gnu: r-dendextend: Update to 1.13.3. * gnu/packages/cran.scm (r-dendextend): Update to 1.13.3. --- 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 efa2036223..ea975aae01 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1916,14 +1916,14 @@ (define-public r-compare (define-public r-dendextend (package (name "r-dendextend") - (version "1.13.2") + (version "1.13.3") (source (origin (method url-fetch) (uri (cran-uri "dendextend" version)) (sha256 (base32 - "1iclvd9cyckd4djpa87ynm05fk6zl4b4m735za1w4irimc130m3r")))) + "1gx6blw644sx2c4s90672scrwl4bv5xlgnfwbcalkh6nff2sai0h")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From d05c224c3bfcb4ae5e1d859d8f41baa3143db9a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:06:04 +0100 Subject: gnu: r-bbmle: Update to 1.0.23.1. * gnu/packages/cran.scm (r-bbmle): Update to 1.0.23.1. --- 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 ea975aae01..b68ad15cdb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2384,14 +2384,14 @@ (define-public r-bdsmatrix (define-public r-bbmle (package (name "r-bbmle") - (version "1.0.22") + (version "1.0.23.1") (source (origin (method url-fetch) (uri (cran-uri "bbmle" version)) (sha256 (base32 - "1idn55w5f3iw4r0ydyww8xyinninw07sxlwfqb565vmdrs87dwl4")))) + "0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0")))) (build-system r-build-system) (propagated-inputs `(("r-bdsmatrix" ,r-bdsmatrix) -- cgit v1.2.3 From 30e1fff333ae1ba299649ad35accf16630c04457 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:06:18 +0100 Subject: gnu: r-emdbook: Update to 1.3.12. * gnu/packages/cran.scm (r-emdbook): Update to 1.3.12. [propagated-inputs]: Remove r-rcpp. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b68ad15cdb..027241c8c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2412,22 +2412,21 @@ (define-public r-bbmle (define-public r-emdbook (package (name "r-emdbook") - (version "1.3.11") + (version "1.3.12") (source (origin (method url-fetch) (uri (cran-uri "emdbook" version)) (sha256 (base32 - "0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q")))) + "0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6")))) (build-system r-build-system) (propagated-inputs `(("r-bbmle" ,r-bbmle) ("r-coda" ,r-coda) ("r-lattice" ,r-lattice) ("r-mass" ,r-mass) - ("r-plyr" ,r-plyr) - ("r-rcpp" ,r-rcpp))) + ("r-plyr" ,r-plyr))) (home-page "http://www.math.mcmaster.ca/bolker/emdbook") (synopsis "Support functions and data for \"Ecological Models and Data\"") (description -- cgit v1.2.3 From e92370a10e2434a6366a9a923f43fb386483a346 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:06:43 +0100 Subject: gnu: r-drr: Update to 0.0.4. * gnu/packages/cran.scm (r-drr): Update to 0.0.4. --- 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 027241c8c7..2688ccf17d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2682,14 +2682,14 @@ (define-public r-lava (define-public r-drr (package (name "r-drr") - (version "0.0.3") + (version "0.0.4") (source (origin (method url-fetch) (uri (cran-uri "DRR" version)) (sha256 (base32 - "1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl")))) + "1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk")))) (properties `((upstream-name . "DRR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From aed2fe3f775cc5689128219bd08c7f246f0889c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:06:54 +0100 Subject: gnu: r-rmysql: Update to 0.10.19. * gnu/packages/cran.scm (r-rmysql): Update to 0.10.19. --- 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 2688ccf17d..042b42d38f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2799,14 +2799,14 @@ (define-public r-magic (define-public r-rmysql (package (name "r-rmysql") - (version "0.10.18") + (version "0.10.19") (source (origin (method url-fetch) (uri (cran-uri "RMySQL" version)) (sha256 (base32 - "0r4626sk78fhlgivr0c7mwg9mj29ayr0iz5x90rdl4d5nc2r6kq4")))) + "0269pfq791qvax69lrwvvzgllyzm3cy3sdp9sakwxzvw5pxk2vhv")))) (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 42e45862ea624815e9f767d9ba4454440850445a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:07:07 +0100 Subject: gnu: r-performanceanalytics: Update to 2.0.4. * gnu/packages/cran.scm (r-performanceanalytics): Update to 2.0.4. --- 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 042b42d38f..b7f8484c3a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3586,14 +3586,14 @@ (define-public r-xts (define-public r-performanceanalytics (package (name "r-performanceanalytics") - (version "1.5.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "PerformanceAnalytics" version)) (sha256 (base32 - "0jhjldwyxwq7a47zmk5y1jjck7hvq92p8rlgjvdfy51hx2dmlqqd")))) + "0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq")))) (properties `((upstream-name . "PerformanceAnalytics"))) (build-system r-build-system) -- cgit v1.2.3 From fa27e4d2ba8809181af5a44dee07f61634594f25 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:07:18 +0100 Subject: gnu: r-laeken: Update to 0.5.1. * gnu/packages/cran.scm (r-laeken): Update to 0.5.1. --- 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 b7f8484c3a..b740ad49ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3616,14 +3616,14 @@ (define-public r-performanceanalytics (define-public r-laeken (package (name "r-laeken") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "laeken" version)) (sha256 (base32 - "1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa")))) + "199rjkhjjygpr6cjzab87as46acb5npi44m4yycvk7lnd0blma8s")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) -- cgit v1.2.3 From 2097da3e8c1457b8bcf5db90d4493fe93d3b9f5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:07:28 +0100 Subject: gnu: r-processx: Update to 3.4.2. * gnu/packages/cran.scm (r-processx): Update to 3.4.2. --- 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 b740ad49ee..583ea335c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3861,14 +3861,14 @@ (define-public r-debugme (define-public r-processx (package (name "r-processx") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 (base32 - "1g6ipcaxg9y94lyrnbp7kkbqfkcdh1fyrqjjclbjp3x7iysdvazi")))) + "02awswxq6wh3rl99dncw5n6c1xmd0v81xcdp2dfyi6vm6b3gz84l")))) (build-system r-build-system) (propagated-inputs `(("r-ps" ,r-ps) -- cgit v1.2.3 From 2d37face530960a6ec87e9139471df1282279dd7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:07:43 +0100 Subject: gnu: r-np: Update to 0.60-10. * gnu/packages/cran.scm (r-np): Update to 0.60-10. --- 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 583ea335c6..c76c44b917 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4715,14 +4715,14 @@ (define-public r-phontools (define-public r-np (package (name "r-np") - (version "0.60-9") + (version "0.60-10") (source (origin (method url-fetch) (uri (cran-uri "np" version)) (sha256 (base32 - "1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy")))) + "06h8k0kdv5s258jr6s08fabvlycrbs7iq34jk2f2hfmqm2y4nyx2")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) -- cgit v1.2.3 From de20b0f2715c24e03e64381cab9ec82278a556d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:08:00 +0100 Subject: gnu: r-vim: Update to 5.1.0. * gnu/packages/cran.scm (r-vim): Update to 5.1.0. [propagated-inputs]: Add r-magrittr. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c76c44b917..b920ff39df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5168,14 +5168,14 @@ (define-public r-prroc (define-public r-vim (package (name "r-vim") - (version "4.8.0") + (version "5.1.0") (source (origin (method url-fetch) (uri (cran-uri "VIM" version)) (sha256 (base32 - "08x4a4yzgp8adgrv7a3666yma4b60n64mcsnvhzmwdy023f4ysrw")))) + "09600piny3qrxrmh8844iwrvgrhwan1c3nlh6irqy1vjha2w4gb3")))) (properties `((upstream-name . "VIM"))) (build-system r-build-system) (propagated-inputs @@ -5184,6 +5184,7 @@ (define-public r-vim ("r-data-table" ,r-data-table) ("r-e1071" ,r-e1071) ("r-laeken" ,r-laeken) + ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-nnet" ,r-nnet) ("r-ranger" ,r-ranger) -- cgit v1.2.3 From ab06092c5ee97a7b5eb3e5fbd39a0a79403e7a63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:08:24 +0100 Subject: gnu: r-renv: Update to 0.9.3. * gnu/packages/cran.scm (r-renv): Update to 0.9.3. --- 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 b920ff39df..60c1a65c85 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5648,14 +5648,14 @@ (define-public r-rappdirs (define-public r-renv (package (name "r-renv") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "1jwnabryn77s29ybwdfzlnd7c8m05xmi69kp5qbvdxy2gjwjzcdr")))) + "02ayfgbpw4b58148dcxz31anaxncwczmxs1zzkskwj0rzhb2x60r")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (home-page "https://rstudio.github.io/renv") -- cgit v1.2.3 From 398c8be0a22c1de872b7d5a39ddd0dfb5aa51060 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:08:36 +0100 Subject: gnu: r-learnr: Update to 0.10.1. * gnu/packages/cran.scm (r-learnr): Update to 0.10.1. --- 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 60c1a65c85..1e87f1e38f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5671,14 +5671,14 @@ (define-public r-renv (define-public r-learnr (package (name "r-learnr") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (cran-uri "learnr" version)) (sha256 (base32 - "0278q9nbkc4nb0rp930kjrwyidf0v7y38d1s187m4f4bs7ha82k6")))) + "08xwmms6x58y3dsfbl9c6d03145hb4ij97nqr1cc9dxxilmr6x31")))) (build-system r-build-system) (propagated-inputs `(("r-checkmate" ,r-checkmate) -- cgit v1.2.3 From d99a211d2d85b4902e4a4eb943c0a3a3bd96ee51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:08:47 +0100 Subject: gnu: r-ggpubr: Update to 0.2.5. * gnu/packages/cran.scm (r-ggpubr): Update to 0.2.5. --- 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 1e87f1e38f..b5874f2236 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5859,14 +5859,14 @@ (define-public r-ggsignif (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "0ln1gh3zlfx5s7zqcpvfdiksq74v1pma5kwkhc6r0riqnjjd19pf")))) + "0kb3hpmnhj4mkbx1kx0kv5y22himr8dijqx7ra0h8hi0pf2l2ha7")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) -- cgit v1.2.3 From 8151a358126a2d4ec13caaa5118a0e5c17280e3b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:08:59 +0100 Subject: gnu: r-factominer: Update to 2.2. * gnu/packages/cran.scm (r-factominer): Update to 2.2. --- 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 b5874f2236..fafa7be5d6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5940,14 +5940,14 @@ (define-public r-flashclust (define-public r-factominer (package (name "r-factominer") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (cran-uri "FactoMineR" version)) (sha256 (base32 - "1b2jsv8vlaynknd7nlra6fdmr56n7678q5s28rqmagbadiqwvj4h")))) + "1hcas9iby95y6xcrf231yrd44s799aaaggb9jd1dcb5nd5vfpzw0")))) (properties `((upstream-name . "FactoMineR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cedf4aa48c9becc6581f1aafe0cb9f7473896d19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:09:10 +0100 Subject: gnu: r-insight: Update to 0.8.1. * gnu/packages/cran.scm (r-insight): Update to 0.8.1. --- 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 fafa7be5d6..8c6156b5fb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6383,14 +6383,14 @@ (define-public r-prediction (define-public r-insight (package (name "r-insight") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1bkcwvjpfy4q4k478x8x42yiqz6v0fk6z6hfp6fli3h63smlmck0")))) + "1y889bydmji3pcq2bdf6xl6ikmd45wbwl53ssvsk05b5ahkyxi76")))) (build-system r-build-system) (home-page "https://easystats.github.io/insight/") (synopsis "Easy access to model information for various model objects") -- cgit v1.2.3 From 544366842bbf1c56a1e0b41949efc5f72fcd2500 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:09:20 +0100 Subject: gnu: r-sjlabelled: Update to 1.1.3. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.1.3. --- 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 8c6156b5fb..66a3b38ac4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6409,14 +6409,14 @@ (define-public r-insight (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "1vnx067mxnvz4jzhmpiarda8ln6habzj02qikvkix5piiy85sqcw")))) + "1amq7i9sxf0pkxhskqc53xq5wvc9rdxm7cxyb4b6xh6qsskjnlsj")))) (build-system r-build-system) (propagated-inputs `(("r-haven" ,r-haven) -- cgit v1.2.3 From bfbb33e8f8eee7f128724608c5738e0f34b4fbb5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:09:30 +0100 Subject: gnu: r-flextable: Update to 0.5.8. * gnu/packages/cran.scm (r-flextable): Update to 0.5.8. --- 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 66a3b38ac4..6c32479e8a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6512,14 +6512,14 @@ (define-public r-moonbook (define-public r-flextable (package (name "r-flextable") - (version "0.5.6") + (version "0.5.8") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1f869f2dfqkzhf6yix7xcbs8rn1nwq3sg623h74zg6h1pl6px66w")))) + "1x24rz1r5xin122czg85d7nrkwpaabb60p50m3yrd3dh81vfp0hk")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From 0048894f33eecb0318e47adf92bb430412eaed6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:09:42 +0100 Subject: gnu: r-doby: Update to 4.6-4.1. * gnu/packages/cran.scm (r-doby): Update to 4.6-4.1. --- 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 6c32479e8a..e87453941d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6755,14 +6755,14 @@ (define-public r-deriv (define-public r-doby (package (name "r-doby") - (version "4.6-3") + (version "4.6-4.1") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "1d0d6pwai1g4i5jls0jm9va29ci5hy92n5957608f3fzi1jwy635")))) + "10qyvavk1pc8rf94q5dd0wrlky145f8ia2p0k8clri5imsrikiqx")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f0e83d68561d3f8fbb7bf24c2b49f34a963ba4b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:09:53 +0100 Subject: gnu: r-ggformula: Update to 0.9.3. * gnu/packages/cran.scm (r-ggformula): Update to 0.9.3. [propagated-inputs]: Add r-ggforce. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e87453941d..d767b51730 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7188,16 +7188,17 @@ (define-public r-mosaiccore (define-public r-ggformula (package (name "r-ggformula") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (cran-uri "ggformula" version)) (sha256 - (base32 "16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr")))) + (base32 "1bpsfp9hx001r91pxfiwgxcn5vw5bl1gclb865wz6g9l0jqjfk2p")))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) + `(("r-ggforce" ,r-ggforce) + ("r-ggplot2" ,r-ggplot2) ("r-ggstance" ,r-ggstance) ("r-magrittr" ,r-magrittr) ("r-mosaiccore" ,r-mosaiccore) -- cgit v1.2.3 From 59987505c031cb868147190ccbccd428c0573f7c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:10:20 +0100 Subject: gnu: r-raster: Update to 3.0-12. * gnu/packages/cran.scm (r-raster): Update to 3.0-12. --- 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 d767b51730..bf6e4766ea 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7237,14 +7237,14 @@ (define-public r-mosaicdata (define-public r-raster (package (name "r-raster") - (version "3.0-7") + (version "3.0-12") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn")))) + "0rrbsigkqxsdic8fly6nrsc79zsliwvr1x2b4xqpl9d34vr50dvg")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 2be78b58a442f0d2dd1fbf272ecb894ada5d0133 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:10:36 +0100 Subject: gnu: r-emmeans: Update to 1.4.4. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.4. --- 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 bf6e4766ea..7b20207443 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8246,14 +8246,14 @@ (define-public r-multcomp (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.3.01") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "16v5j31516nbqnj2zhgqvyp5yxd4zcs5zi0aspa5plr2qikvrkmg")))) + "0l1qj6x834fmcvqbj807p7yz7462df925vw91xvg50faqm19d41x")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From f09351f4c5fd7d594bd40af5c49af01fb9548406 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:10:45 +0100 Subject: gnu: r-sjstats: Update to 0.17.9. * gnu/packages/cran.scm (r-sjstats): Update to 0.17.9. --- 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 7b20207443..a2e6b41a3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8404,13 +8404,13 @@ (define-public r-tmb (define-public r-sjstats (package (name "r-sjstats") - (version "0.17.8") + (version "0.17.9") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 - (base32 "0gagqbcmimlvxhpjkmd3s17mbrz5n937qksca1hvm6kj4rk37hzb")))) + (base32 "0938ac6ixvkif07azd2msa8g3qnn9rabj6jg17almbysl83kg4nm")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) -- cgit v1.2.3 From 0fb7f0accaa101f02e4c632fbf8a532032043bf9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:11:02 +0100 Subject: gnu: r-glmmtmb: Update to 1.0.0. * gnu/packages/cran.scm (r-glmmtmb): Update to 1.0.0. --- 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 a2e6b41a3f..3ebf341721 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8447,14 +8447,14 @@ (define-public r-sjstats (define-public r-glmmtmb (package (name "r-glmmtmb") - (version "0.2.3") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "glmmTMB" version)) (sha256 (base32 - "035hkywa37bz555fv6znxd4hfcs5w884365wfnwk4jx5vann4vvb")))) + "1md4yw4kbng953rz1n9g1v2xffk3cxx1qmp0kvbdayg1s82l1rgx")))) (properties `((upstream-name . "glmmTMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e9f6089744e99026b793c948b72c28d67aa89f84 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:11:17 +0100 Subject: gnu: r-bayestestr: Update to 0.5.2. * gnu/packages/cran.scm (r-bayestestr): Update to 0.5.2. --- 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 3ebf341721..9ee5f6c5d7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8479,14 +8479,14 @@ (define-public r-glmmtmb (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "01kqvky1ndd1q64rzmqh5yfzz36ci8yhy4w16gjnw4c257ikhvd8")))) + "1l0kqw793d8fnk0745fllmqwjwnj9srvqzv4baq5s05ls1gbi2mw")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 155f1886347167c15090bd46d4233a0296992eaf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:11:40 +0100 Subject: gnu: r-performance: Update to 0.4.4. * gnu/packages/cran.scm (r-performance): Update to 0.4.4. --- 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 9ee5f6c5d7..91e7ace442 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8504,14 +8504,14 @@ (define-public r-bayestestr (define-public r-performance (package (name "r-performance") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "1164585ywbnrcy7an57kifh2gdb6g08z9pxw75ywqdcfyd51i3dz")))) + "18h9y66cpsb3k6xnaya87vnpv2s3chf4bzsc4ym3n5sxhh41j7la")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) -- cgit v1.2.3 From 1f4ec0d578aa572a34e6dd6a000b6e3cd834fcdf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:11:50 +0100 Subject: gnu: r-ggeffects: Update to 0.14.1. * gnu/packages/cran.scm (r-ggeffects): Update to 0.14.1. [propagated-inputs]: Remove r-magrittr, r-purrr, and r-sjmisc. --- gnu/packages/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 91e7ace442..e8b8e371e3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8531,22 +8531,19 @@ (define-public r-performance (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.14.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1djz82xww86h8f33m2vm40lliicppgyhm6hyn3h6rzrqjrlrsmdw")))) + "07pvs18vlybp96zz1wjr7cwiwi1cvjwkb9ahxzq0vd6adnd6ya59")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) - ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) - ("r-purrr" ,r-purrr) - ("r-sjlabelled" ,r-sjlabelled) - ("r-sjmisc" ,r-sjmisc))) + ("r-sjlabelled" ,r-sjlabelled))) (home-page "https://github.com/strengejacke/ggeffects") (synopsis "Create tidy data frames of marginal effects for ggplot") (description -- cgit v1.2.3 From a8a261b0f1c656474f46942d68c9bcd1f2a90d77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:12:26 +0100 Subject: gnu: r-remotes: Update to 2.1.1. * gnu/packages/cran.scm (r-remotes): Update to 2.1.1. --- 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 e8b8e371e3..b8a221a00e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8776,14 +8776,14 @@ (define-public r-sessioninfo (define-public r-remotes (package (name "r-remotes") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "remotes" version)) (sha256 (base32 - "19v8dmnk9l4i9m64p7zgmj7y1vhnnwhi5kyn0k5d034zzkvchi49")))) + "12qinl7jv54f2524ri13gcrv6d523rg1harpi500j676zi30fnaf")))) (build-system r-build-system) (home-page "https://github.com/r-lib/remotes#readme") (synopsis "R package installation from remote repositories") -- cgit v1.2.3 From 7bc252902dc299ec65a3017005e4c73a35a505a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:12:39 +0100 Subject: gnu: r-summarytools: Update to 0.9.5. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.5. [propagated-inputs]: Add r-base64enc; remove r-rcurl. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b8a221a00e..5e88a6f006 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8900,17 +8900,18 @@ (define-public r-pander (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "1n695baz56mg4f13xjjadfq0xalw5xsn6xicil0yap5hgi8fsr3a")))) + "0iv5237478y2ggbqln3cppm0crnqk3myrkf6ydkhwsd1z5q538pd")))) (build-system r-build-system) (propagated-inputs - `(("r-checkmate" ,r-checkmate) + `(("r-base64enc" ,r-base64enc) + ("r-checkmate" ,r-checkmate) ("r-dplyr" ,r-dplyr) ("r-htmltools" ,r-htmltools) ("r-lubridate" ,r-lubridate) @@ -8919,7 +8920,6 @@ (define-public r-summarytools ("r-pander" ,r-pander) ("r-pryr" ,r-pryr) ("r-rapportools" ,r-rapportools) - ("r-rcurl" ,r-rcurl) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) (home-page "https://github.com/dcomtois/summarytools") -- cgit v1.2.3 From 969c933fb961e13bb15eb9d8b236092126728b5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:07 +0100 Subject: gnu: r-weights: Update to 1.0.1. * gnu/packages/cran.scm (r-weights): Update to 1.0.1. --- 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 5e88a6f006..1c3d957f72 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9164,14 +9164,14 @@ (define-public r-r2glmm (define-public r-weights (package (name "r-weights") - (version "1.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "weights" version)) (sha256 (base32 - "0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c")))) + "1ka2kvzg464vn80qziqy4mrciy9wwd3jfasgq0d33wbiblhmxkj5")))) (build-system r-build-system) (propagated-inputs `(("r-gdata" ,r-gdata) -- cgit v1.2.3 From 0227947fbf04bbeb684abe4b769a65512c5dc30d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:20 +0100 Subject: gnu: r-rgl: Update to 0.100.47. * gnu/packages/cran.scm (r-rgl): Update to 0.100.47. --- 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 1c3d957f72..5e4878b5f7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9310,14 +9310,14 @@ (define-public r-biocmanager (define-public r-rgl (package (name "r-rgl") - (version "0.100.30") + (version "0.100.47") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5")))) + "19jxf6hz3dsmya6wdgxc3qi5c1pcksizpp0grylpdidsry4ig4pl")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 0c13ce8c7276360a87dd8000456747b72715077d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:31 +0100 Subject: gnu: r-ks: Update to 1.11.7. * gnu/packages/cran.scm (r-ks): Update to 1.11.7. --- 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 5e4878b5f7..3cb6446e55 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9393,13 +9393,13 @@ (define-public r-misc3d (define-public r-ks (package (name "r-ks") - (version "1.11.6") + (version "1.11.7") (source (origin (method url-fetch) (uri (cran-uri "ks" version)) (sha256 - (base32 "0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq")))) + (base32 "1f6jvxy0hmngyvnvrknzbmhl42njk0vqyycvydm4qnp8cqirqvba")))) (build-system r-build-system) (propagated-inputs `(("r-fnn" ,r-fnn) -- cgit v1.2.3 From 846ec722418f734e2a457aa23a3a2c50e73e3ec4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:39 +0100 Subject: gnu: r-waveslim: Update to 1.7.5.2. * gnu/packages/cran.scm (r-waveslim): Update to 1.7.5.2. --- 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 3cb6446e55..5e97220a92 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9753,14 +9753,14 @@ (define-public r-tm (define-public r-waveslim (package (name "r-waveslim") - (version "1.7.5.1") + (version "1.7.5.2") (source (origin (method url-fetch) (uri (cran-uri "waveslim" version)) (sha256 (base32 - "0mky0nb4xxp8rybp87mxw2f1q6k400wpxv01zr4injv7ja6028xk")))) + "166ai4q3mlh3v338si952z7fbgph80h0l4ws6bna8ig5jx81rnmz")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From fb413fff5c670fb54b487e222381d3fb4839a79e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:48 +0100 Subject: gnu: r-rnifti: Update to 1.1.0. * gnu/packages/cran.scm (r-rnifti): Update to 1.1.0. --- 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 5e97220a92..177f2e04f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10213,14 +10213,14 @@ (define-public r-tfmpvalue (define-public r-rnifti (package (name "r-rnifti") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0hfid40pgfi1ykqka8y3v0m7h0iyd6fbvycvqlad3ibmbg621f0w")))) + "1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From 30ef5e8205b0b8b2324f91b7e46acff62a9af9cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:13:59 +0100 Subject: gnu: r-fields: Update to 10.3. * gnu/packages/cran.scm (r-fields): Update to 10.3. --- 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 177f2e04f0..aff1f2859d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11176,13 +11176,13 @@ (define-public r-spam (define-public r-fields (package (name "r-fields") - (version "10.0") + (version "10.3") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 - (base32 "173zm5vr236ydiq0v27qy0l3x7h9fc7jly38iakg77j26i0a01il")))) + (base32 "12k97vfjlz5h8vynirnvik1nyj1iw25n8xl7awmx9mpd6wvgy2s9")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps) -- cgit v1.2.3 From 4e977a9bf26e3dfeaf50a6467ecb4ccb31f0e0f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:08 +0100 Subject: gnu: r-genenet: Update to 1.2.14. * gnu/packages/cran.scm (r-genenet): Update to 1.2.14. --- 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 aff1f2859d..8cc2bb1903 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11342,14 +11342,14 @@ (define-public r-longitudinal (define-public r-genenet (package (name "r-genenet") - (version "1.2.13") + (version "1.2.14") (source (origin (method url-fetch) (uri (cran-uri "GeneNet" version)) (sha256 (base32 - "0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p")))) + "0cdhrj15rz0w0pyw3r8mikrzsdh95y5i1c0pa3cn0c2bjnjx3x3n")))) (properties `((upstream-name . "GeneNet"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From dbfbef87294ffd1bd784dfa0d2b9790c82d46422 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:16 +0100 Subject: gnu: r-protviz: Update to 0.6.0. * gnu/packages/cran.scm (r-protviz): Update to 0.6.0. --- 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 8cc2bb1903..e5d70b846e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11391,14 +11391,14 @@ (define-public r-rbamtools (define-public r-protviz (package (name "r-protviz") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "protViz" version)) (sha256 (base32 - "0cznzm1ijlq33yd5wsa61prav77y2vi698w0n2fx1xcv504c4bjv")))) + "165bh2m6rrcmr0pc2drj6hdg6xfx8k02lznxzj1fmsswsrlfhn3v")))) (properties `((upstream-name . "protViz"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From 8f5468e7e70498e275770fdb06445ebb5426d661 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:24 +0100 Subject: gnu: r-etm: Update to 1.0.5.1. * gnu/packages/cran.scm (r-etm): Update to 1.0.5.1. --- 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 e5d70b846e..83c0164cc3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11441,14 +11441,14 @@ (define-public r-cmprsk (define-public r-etm (package (name "r-etm") - (version "1.0.5") + (version "1.0.5.1") (source (origin (method url-fetch) (uri (cran-uri "etm" version)) (sha256 (base32 - "1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677")))) + "0m41pm277sd50pharigcqzr1a2g92wnmdf6fcab6fx16ia2fzrm7")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From ecf7477b6e34488224beee6837d30d5d1cab456b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:36 +0100 Subject: gnu: r-mcmc: Update to 0.9-6.1. * gnu/packages/cran.scm (r-mcmc): Update to 0.9-6.1. --- 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 83c0164cc3..e396e14747 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11578,14 +11578,14 @@ (define-public r-parcor (define-public r-mcmc (package (name "r-mcmc") - (version "0.9-6") + (version "0.9-6.1") (source (origin (method url-fetch) (uri (cran-uri "mcmc" version)) (sha256 (base32 - "1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4")))) + "1i1nhdapyijvm58zx38q28zk01ndmi6smjivxk5xs2cx9b6v2av9")))) (build-system r-build-system) (home-page "http://www.stat.umn.edu/geyer/mcmc/") (synopsis "Markov chain Monte Carlo") -- cgit v1.2.3 From 8150ebedb8b87bcc48649fa582474db65fed2268 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:45 +0100 Subject: gnu: r-rsvd: Update to 1.0.3. * gnu/packages/cran.scm (r-rsvd): Update to 1.0.3. --- 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 e396e14747..64ce107e84 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11709,14 +11709,14 @@ (define-public r-future-apply (define-public r-rsvd (package (name "r-rsvd") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "rsvd" version)) (sha256 (base32 - "0fia77y5fxnhwkcxlgp98ygb8fdfraky75x80hkf7kvvpwc5rzn8")))) + "1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 2d5c38f5001ecb5e6d336c118a3719a9cd749d4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:14:52 +0100 Subject: gnu: r-blockmodeling: Update to 0.3.6. * gnu/packages/cran.scm (r-blockmodeling): Update to 0.3.6. [propagated-inputs]: Remove r-doparallel, r-dorng, and r-foreach. --- gnu/packages/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64ce107e84..1519dd51a9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11816,20 +11816,17 @@ (define-public r-dorng (define-public r-blockmodeling (package (name "r-blockmodeling") - (version "0.3.4") + (version "0.3.6") (source (origin (method url-fetch) (uri (cran-uri "blockmodeling" version)) (sha256 (base32 - "11v9903y9dwlzaqp8sx0fsibcg82phvappddy37r8lnxd4vchsd2")))) + "12paf76l3wlxad14bkxn37lw9rg6ka473m86wlcf3yhriw8kbaiz")))) (build-system r-build-system) (propagated-inputs - `(("r-doparallel" ,r-doparallel) - ("r-dorng" ,r-dorng) - ("r-foreach" ,r-foreach) - ("r-matrix" ,r-matrix))) + `(("r-matrix" ,r-matrix))) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/blockmodeling") (synopsis "Generalized and classical blockmodeling of valued networks") -- cgit v1.2.3 From 50c0f22fad6b809d8b4eacbc7fbf1f6b6cf808b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:15:20 +0100 Subject: gnu: r-gamlss-dist: Update to 5.1-6. * gnu/packages/cran.scm (r-gamlss-dist): Update to 5.1-6. --- 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 1519dd51a9..4371e0bce4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12065,13 +12065,13 @@ (define-public r-drimpute (define-public r-gamlss-dist (package (name "r-gamlss-dist") - (version "5.1-5") + (version "5.1-6") (source (origin (method url-fetch) (uri (cran-uri "gamlss.dist" version)) (sha256 - (base32 "1rl7hzdg5xpvaq3yyzwxhsaqzzs0qidi3ibv454fisijgv8l4vqw")))) + (base32 "1p904x0b07z4amaqdn2xhs7qzbq8lisr6lqc844s3pkxzmny7w1z")))) (properties `((upstream-name . "gamlss.dist"))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 5e1c84e5f0ad07a482a3ee480c6ed44219ed1945 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:15:30 +0100 Subject: gnu: r-repr: Update to 1.1.0. * gnu/packages/cran.scm (r-repr): Update to 1.1.0. --- 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 4371e0bce4..21ba3c628c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12492,14 +12492,14 @@ (define-public r-pbdzmq (define-public r-repr (package (name "r-repr") - (version "1.0.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "repr" version)) (sha256 (base32 - "0wn9fdddqjgn0bdfl75x89rcxahbgqs324bhg0pfq6va5q2mlbbw")))) + "15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From 3f1c75ee3a0f5c13aff06e221dfdf2b827302e85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:15:37 +0100 Subject: gnu: r-picante: Update to 1.8.1. * gnu/packages/cran.scm (r-picante): Update to 1.8.1. --- 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 21ba3c628c..a0ad8c86d8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12687,14 +12687,14 @@ (define-public r-rematch2 (define-public r-picante (package (name "r-picante") - (version "1.8") + (version "1.8.1") (source (origin (method url-fetch) (uri (cran-uri "picante" version)) (sha256 (base32 - "1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1")))) + "1b16zm8zjjsl181b8krkdcrbcw347kf772c4w7y5332qmfi7jhz0")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) -- cgit v1.2.3 From 7227fd438836e8721a05eec820aabc5dc2c900f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:15:46 +0100 Subject: gnu: r-spdata: Update to 0.3.3. * gnu/packages/cran.scm (r-spdata): Update to 0.3.3. [propagated-inputs]: Add r-raster and r-sp. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a0ad8c86d8..89659c1280 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13061,16 +13061,19 @@ (define-public r-classint (define-public r-spdata (package (name "r-spdata") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw")))) + "1v66qkvsx77hvv5c78v760yp0hknf7xzcjir2ri3ha456mz79yl5")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) + (propagated-inputs + `(("r-raster" ,r-raster) + ("r-sp" ,r-sp))) (home-page "https://github.com/Nowosad/spData") (synopsis "Datasets for spatial analysis") (description -- cgit v1.2.3 From ffe45e0aa07504070d82940bd9f9a30f6ae94e76 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:16:03 +0100 Subject: gnu: r-deldir: Update to 0.1-25. * gnu/packages/cran.scm (r-deldir): Update to 0.1-25. --- 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 89659c1280..e5eebc8802 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13114,14 +13114,14 @@ (define-public r-learnbayes (define-public r-deldir (package (name "r-deldir") - (version "0.1-23") + (version "0.1-25") (source (origin (method url-fetch) (uri (cran-uri "deldir" version)) (sha256 (base32 - "0790dwxb2mz1ffz8gd5vwdr0if2q76dzy3vab5rsykf9kz72n4g0")))) + "0kdglv8rc1pb4ilcid4xc9wpv5kkj2y6x6wg7919k3hya7mz58ph")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/deldir") -- cgit v1.2.3 From 886cd33460733614719e971cd6a03f32fa8338f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:16:11 +0100 Subject: gnu: r-sf: Update to 0.8-1. * gnu/packages/cran.scm (r-sf): Update to 0.8-1. --- 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 e5eebc8802..5a93a74505 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13138,14 +13138,14 @@ (define-public r-deldir (define-public r-sf (package (name "r-sf") - (version "0.8-0") + (version "0.8-1") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf")))) + "17wyv74m1ppc3s5jdv60r74jj23nidxpzl46vjhfclfhnpvm7sx9")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) -- cgit v1.2.3 From 2d1788f48d8b00da68e4bd9cba160b0c0c4f91a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:16:20 +0100 Subject: gnu: r-rmetasim: Update to 3.1.14. * gnu/packages/cran.scm (r-rmetasim): Update to 3.1.14. --- 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 5a93a74505..71ffe9f7d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13271,14 +13271,14 @@ (define-public r-pegas (define-public r-rmetasim (package (name "r-rmetasim") - (version "3.1.7") + (version "3.1.14") (source (origin (method url-fetch) (uri (cran-uri "rmetasim" version)) (sha256 (base32 - "0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r")))) + "0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0")))) (build-system r-build-system) (propagated-inputs `(("r-ade4" ,r-ade4) -- cgit v1.2.3 From 6e94ba488c0c5e30ccb07b6a974fa0f6aa6079b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:16:27 +0100 Subject: gnu: r-ggraph: Update to 2.0.1. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.1. --- 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 71ffe9f7d9..096b2667af 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14274,14 +14274,14 @@ (define-public r-europepmc (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3")))) + "0q2yqsb981a2arf9j530kqs61vw38ixyxbhb6yvv7skgbck02r6y")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From ff92cd1de416ebaee7ae0c14a223faa885159150 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:16:38 +0100 Subject: gnu: r-lintr: Update to 2.0.1. * gnu/packages/cran.scm (r-lintr): Update to 2.0.1. [propagated-inputs]: Remove r-stringdist. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 096b2667af..cd3e8b1385 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14872,14 +14872,14 @@ (define-public r-cyclocomp (define-public r-lintr (package (name "r-lintr") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "lintr" version)) (sha256 (base32 - "09gbci4v5n4gsfzminly8332fw7faxdi1kkyvpa10dydx02sjcwb")))) + "14yfh641afg6griaadbdciyr3k94fl55s055qwzghgk5gdsj61zy")))) (properties `((upstream-name . "lintr"))) (build-system r-build-system) (propagated-inputs @@ -14892,7 +14892,6 @@ (define-public r-lintr ("r-knitr" ,r-knitr) ("r-rex" ,r-rex) ("r-rstudioapi" ,r-rstudioapi) - ("r-stringdist" ,r-stringdist) ("r-testthat" ,r-testthat) ("r-xml2" ,r-xml2) ("r-xmlparsedata" ,r-xmlparsedata))) -- cgit v1.2.3 From 0f303adfe5dff86427013ffba0769145071a045e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:02 +0100 Subject: gnu: r-styler: Update to 1.3.1. * gnu/packages/cran.scm (r-styler): Update to 1.3.1. [propagated-inputs]: Add r-r-cache. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cd3e8b1385..c481813b4b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14936,20 +14936,21 @@ (define-public r-sctransform (define-public r-styler (package (name "r-styler") - (version "1.2.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "styler" version)) (sha256 (base32 - "0rdbz60x8bymis6r6188ia1y0ip3nhf5y363i4cmakr618irjab9")))) + "14vfw1w22b9kbbgz72dcg814ycjvrd91ziva42jmmzqbspfxjvmw")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) ("r-cli" ,r-cli) ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) + ("r-r-cache" ,r-r-cache) ("r-rematch2" ,r-rematch2) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) -- cgit v1.2.3 From 16703ceaea2d6bddda2a598744e3f9394f4dbfde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:18 +0100 Subject: gnu: r-leiden: Update to 0.3.3. * gnu/packages/cran.scm (r-leiden): Update to 0.3.3. --- 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 c481813b4b..2ea9dfd151 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15522,14 +15522,14 @@ (define-public r-rann-l1 (define-public r-leiden (package (name "r-leiden") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "leiden" version)) (sha256 (base32 - "0kf6fxqf5l5vilm9g7vspc18daw84cwhpafs5szb1skwd6vrfdzw")))) + "1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2")))) (properties `((upstream-name . "leiden"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 469c484afc18c157941969d8168740fe837c8fb8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:27 +0100 Subject: gnu: r-assertr: Update to 2.7. * gnu/packages/cran.scm (r-assertr): Update to 2.7. --- 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 2ea9dfd151..d5e1f42fd8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15842,14 +15842,14 @@ (define-public r-soupx (define-public r-assertr (package (name "r-assertr") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (cran-uri "assertr" version)) (sha256 (base32 - "0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj")))) + "1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 5130dd52eb314fe0e2a2b7eef15d1664b5ebec54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:35 +0100 Subject: gnu: r-parameters: Update to 0.5.0. * gnu/packages/cran.scm (r-parameters): Update to 0.5.0. --- 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 d5e1f42fd8..2c39d980f5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15869,14 +15869,14 @@ (define-public r-assertr (define-public r-parameters (package (name "r-parameters") - (version "0.4.1") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0xkdn1079sr6kgyhc1zmn9imca4bghnxs3f91h0z7vkzjj73qdbi")))) + "19cblrq079svp5j3wgikw5fsdbsp1w0f2llm7kcf1rg5w1aagjr7")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6abb66d1be7a62e991d05e0454375952e9aeef0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:43 +0100 Subject: gnu: r-bios2cor: Update to 2.1. * gnu/packages/cran.scm (r-bios2cor): Update to 2.1. --- 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 2c39d980f5..03e525329f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16147,14 +16147,14 @@ (define-public r-bio3d (define-public r-bios2cor (package (name "r-bios2cor") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "Bios2cor" version)) (sha256 (base32 - "1rrz0vs6wbkwys3l5jv1rdnlhyb4r1q9pv7jlnmsx6c1b4f4vz5n")))) + "04wk1cjrrxhpv1kdhd67r1qvjv268xxi0z0r105wy912110z9m6x")))) (properties `((upstream-name . "Bios2cor"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8343dcf1aa8b262c53dd35127ddc694a71d1b6c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:17:52 +0100 Subject: gnu: r-abcrlda: Update to 1.0.2. * gnu/packages/cran.scm (r-abcrlda): Update to 1.0.2. --- 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 03e525329f..0f4521958d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16401,14 +16401,14 @@ (define-public r-abcdefba (define-public r-abcrlda (package (name "r-abcrlda") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "abcrlda" version)) (sha256 (base32 - "0j29ifsvmxfx2g6v4bpbb4s6miwfpf4vlkpbgj6f2q078s4clc85")))) + "0zjdrbg3zx0znqnh0dvmifs9c12b8vjhbaf3nbwab9xh25nsmg75")))) (properties `((upstream-name . "abcrlda"))) (build-system r-build-system) (home-page "https://ieeexplore.ieee.org/document/8720003/") -- cgit v1.2.3 From e7705bc267779a40d8f9763bba59258692794845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:18:00 +0100 Subject: gnu: r-showtext: Update to 0.7-1. * gnu/packages/cran.scm (r-showtext): Update to 0.7-1. --- 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 0f4521958d..d370a59052 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16559,14 +16559,14 @@ (define-public r-showtextdb (define-public r-showtext (package (name "r-showtext") - (version "0.7") + (version "0.7-1") (source (origin (method url-fetch) (uri (cran-uri "showtext" version)) (sha256 (base32 - "1ihgqzfia36b0n9aa41p1w98wxxvs1lxh1zz0570hbfqmph1sk73")))) + "0a5gg72bfrc7wm0phj1aflj1wc08kfi81ac32na6ya9s2ivyimw5")))) (properties `((upstream-name . "showtext"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 1a3a1d66d61a0606c23fd9b31048210262aa51f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:18:07 +0100 Subject: gnu: r-randtoolbox: Update to 1.30.1. * gnu/packages/cran.scm (r-randtoolbox): Update to 1.30.1. --- 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 d370a59052..a2cc441120 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16980,14 +16980,14 @@ (define-public r-rngwell (define-public r-randtoolbox (package (name "r-randtoolbox") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (cran-uri "randtoolbox" version)) (sha256 (base32 - "141p13ajgzmb2s89rlac7zrra92mi1izvpfrngb4kqzlf3igdsqd")))) + "0qg20ar6qns858jdzqhmfq7yji81czhr6cim257958gqpj66sn95")))) (properties `((upstream-name . "randtoolbox"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fd483cb370ebb99ffe8bcf37b60756ad5baadd36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:18:14 +0100 Subject: gnu: r-gamlss: Update to 5.1-6. * gnu/packages/cran.scm (r-gamlss): Update to 5.1-6. --- 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 a2cc441120..21c280dbb3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17145,14 +17145,14 @@ (define-public r-gamlss-data (define-public r-gamlss (package (name "r-gamlss") - (version "5.1-5") + (version "5.1-6") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "0gcngfck0dk2rhjg0z1fnc61dqs0s049jy2rkywaf57531s2k8bc")))) + "16b7ick1khvldbvfmmpw9cjs1vznnrisvifq7717fxzd8c9s5jdr")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 46d833ef98958ab5df2386d483b1d6a4b5ae5fca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:18:22 +0100 Subject: gnu: r-actfrag: Update to 0.1.1. * gnu/packages/cran.scm (r-actfrag): Update to 0.1.1. --- 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 21c280dbb3..dde483806b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17962,14 +17962,14 @@ (define-public r-ineq (define-public r-actfrag (package (name "r-actfrag") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (cran-uri "ActFrag" version)) (sha256 (base32 - "06l5a679j6289008ls57v420mnzpq9a4ln7svi5bh0vpvws7sr9d")))) + "08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1")))) (properties `((upstream-name . "ActFrag"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 90d499782ebdc678de3ab26a860df268218832d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:18:30 +0100 Subject: gnu: r-actigraphy: Update to 1.4.0. * gnu/packages/cran.scm (r-actigraphy): Update to 1.4.0. [propagated-inputs]: Remove r-sdmtools. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dde483806b..622bfd2290 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18013,19 +18013,18 @@ (define-public r-fda (define-public r-actigraphy (package (name "r-actigraphy") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "Actigraphy" version)) (sha256 (base32 - "0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574")))) + "0bpmvszzv5fm72nar3wgnmfl5am7znqfajmlbv38ihkbi7jbwk20")))) (properties `((upstream-name . "Actigraphy"))) (build-system r-build-system) (propagated-inputs - `(("r-fda" ,r-fda) - ("r-sdmtools" ,r-sdmtools))) + `(("r-fda" ,r-fda))) (home-page "https://cran.r-project.org/web/packages/Actigraphy/") (synopsis "Actigraphy data analysis") (description -- cgit v1.2.3 From a3d80e6212861ac9468e9163e8f05ccc3035a4a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:19:04 +0100 Subject: gnu: r-imager: Update to 0.42.1. * gnu/packages/cran.scm (r-imager): Update to 0.42.1. [propagated-inputs]: Remove r-cairo and r-plyr. --- gnu/packages/cran.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 622bfd2290..29106bb3f6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18304,14 +18304,14 @@ (define-public r-readbitmap (define-public r-imager (package (name "r-imager") - (version "0.41.2") + (version "0.42.1") (source (origin (method url-fetch) (uri (cran-uri "imager" version)) (sha256 (base32 - "19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v")))) + "1d7a49lcna77wyfjf5q1b89jck3p3vnysnkgz4drb0qkpy6hz76b")))) (properties `((upstream-name . "imager"))) (build-system r-build-system) (inputs @@ -18320,12 +18320,10 @@ (define-public r-imager ("libx11" ,libx11) ("zlib" ,zlib))) (propagated-inputs - `(("r-cairo" ,r-cairo) - ("r-downloader" ,r-downloader) + `(("r-downloader" ,r-downloader) ("r-igraph" ,r-igraph) ("r-jpeg" ,r-jpeg) ("r-magrittr" ,r-magrittr) - ("r-plyr" ,r-plyr) ("r-png" ,r-png) ("r-purrr" ,r-purrr) ("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 1a060eabf8d30d1d1f5f9c551a7d3840e07651d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:19:39 +0100 Subject: gnu: r-tolerance: Update to 2.0.0. * gnu/packages/cran.scm (r-tolerance): Update to 2.0.0. [propagated-inputs]: Add r-mass. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 29106bb3f6..5c6a4e7a88 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18475,18 +18475,19 @@ (define-public r-univoutl (define-public r-tolerance (package (name "r-tolerance") - (version "1.3.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "tolerance" version)) (sha256 (base32 - "17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86")))) + "001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd")))) (properties `((upstream-name . "tolerance"))) (build-system r-build-system) (propagated-inputs - `(("r-rgl" ,r-rgl))) + `(("r-mass" ,r-mass) + ("r-rgl" ,r-rgl))) (home-page "https://cran.r-project.org/web/packages/tolerance/") (synopsis "Statistical tolerance intervals and regions") (description -- cgit v1.2.3 From e40d6c4c7a74fca3572991c55706a787b19d4d90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 21:19:55 +0100 Subject: gnu: r-biclust: Update to 2.0.2. * gnu/packages/cran.scm (r-biclust): Update to 2.0.2. --- 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 5c6a4e7a88..b731ddc29e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18556,14 +18556,14 @@ (define-public r-flexclust (define-public r-biclust (package (name "r-biclust") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "biclust" version)) (sha256 (base32 - "1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0")))) + "1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b")))) (properties `((upstream-name . "biclust"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b7e86efd3bf5450904bd308f0b2ff04c34d2b9bc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 22:59:35 +0100 Subject: gnu: r-inspect: Update to 1.16.3. * gnu/packages/bioconductor.scm (r-inspect): Update to 1.16.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a99c629cb1..e63a58a625 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2071,14 +2071,14 @@ (define-public r-plgem (define-public r-inspect (package (name "r-inspect") - (version "1.16.2") + (version "1.16.3") (source (origin (method url-fetch) (uri (bioconductor-uri "INSPEcT" version)) (sha256 (base32 - "1g8la7k4pnyr2hvk4yjd1bwvjy6nqbbb0fwxrrh2ifgqf4h21x2p")))) + "0y4gpvrbmcipdnyz9lz9ywn0317xnpcriiisqvxygin05vgcpilp")))) (properties `((upstream-name . "INSPEcT"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From effbf7d986f605da322db9686a236457845e66bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 22:59:44 +0100 Subject: gnu: r-biocsingular: Update to 1.2.2. * gnu/packages/bioconductor.scm (r-biocsingular): Update to 1.2.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e63a58a625..a20a33e3a6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2199,14 +2199,14 @@ (define-public r-biocneighbors (define-public r-biocsingular (package (name "r-biocsingular") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSingular" version)) (sha256 (base32 - "0fjfmmpda7pszsck2hm7bp4509pl3xaz02q2q03d5vla62h1h81k")))) + "1282fdwxrpga87y8xflr0sl8ajwawgn2i9i65my8mbg5vrixs407")))) (properties `((upstream-name . "BiocSingular"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 776e98fe058e5ae1cd50e148c5ef53d0c5b92806 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 22:59:49 +0100 Subject: gnu: r-heatplus: Update to 2.32.1. * gnu/packages/bioconductor.scm (r-heatplus): Update to 2.32.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a20a33e3a6..8d14b64296 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3327,14 +3327,14 @@ (define-public r-varianttools (define-public r-heatplus (package (name "r-heatplus") - (version "2.32.0") + (version "2.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Heatplus" version)) (sha256 (base32 - "0hx5gqgh4xrkx37ccprq7azj9jziff137bdk0gvrixcx52ws6h89")))) + "1ldxj2hasg6ysh70sc73mz2v4h3n8gf3lii09c3sqc4wmz5h7rp1")))) (properties `((upstream-name . "Heatplus"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f86549cbb6a57528f3a3c60369a47bcb361ed450 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 22:59:56 +0100 Subject: gnu: r-atacseqqc: Update to 1.10.2. * gnu/packages/bioconductor.scm (r-atacseqqc): Update to 1.10.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8d14b64296..a572368d54 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3985,14 +3985,14 @@ (define-public r-genomicscores (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.10.1") + (version "1.10.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "12ix0bvwk50d48z85f3453k7szm1j27gk4qgw56az4fxra472rlh")))) + "0dzrizacy3br8fiy1vnsl5zf242lg1hqv9dyv5ayqh2n480is57f")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e01fa33baa4a5d644f43e74a9c5bd0a6eee232d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:02 +0100 Subject: gnu: r-rsubread: Update to 2.0.1. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.0.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a572368d54..f8318ccfb2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5348,14 +5348,14 @@ (define-public r-annotatr (define-public r-rsubread (package (name "r-rsubread") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "0l8q9y2a4m1di0w5nlxhq9jgliinhgr2fwjpm5ixnqx5j3iprlwd")))) + "0pdkx9mhvzw3a4ff725qvda9bxvs9vh2ppb29cc5jrivgjndv5cy")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From f607098f055f40a2fde3c421b6c9ee5f038f06b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:08 +0100 Subject: gnu: r-mixomics: Update to 6.10.8. * gnu/packages/bioconductor.scm (r-mixomics): Update to 6.10.8. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f8318ccfb2..66262bcf07 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5860,14 +5860,14 @@ (define-public r-flowsom (define-public r-mixomics (package (name "r-mixomics") - (version "6.10.6") + (version "6.10.8") (source (origin (method url-fetch) (uri (bioconductor-uri "mixOmics" version)) (sha256 (base32 - "18jwrdyc4pnx917y1kskxz3fqvlrkyy4ny0xqrfcidz0j7p0b7wr")))) + "0307vhx9ck24rxqbvq15815ssxcc226sl2la060n204b51wi9jaa")))) (properties `((upstream-name . "mixOmics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d66901e2c3e5466e80e9738c6d3d1e60c52a82ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:13 +0100 Subject: gnu: r-depecher: Update to 1.2.1. * gnu/packages/bioconductor.scm (r-depecher): Update to 1.2.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 66262bcf07..a6ee0253be 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5902,14 +5902,14 @@ (define-public r-mixomics (define-public r-depecher (package (name "r-depecher") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DepecheR" version)) (sha256 (base32 - "1f6zbc0fq7xjflh3mkjx1n83mpppw663dj22rlpxzwp1kpmf6wm5")))) + "08ja6ayvbax9m3x9w3xzi72z97miiha2nbsild1gp77n6sgn5i35")))) (properties `((upstream-name . "DepecheR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0f72b7abd81f7003a4bba36f7173d8076461e513 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:20 +0100 Subject: gnu: r-shortread: Update to 1.44.3. * gnu/packages/bioinformatics.scm (r-shortread): Update to 1.44.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b7706986f3..c614adedb4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6935,14 +6935,14 @@ (define-public r-gostats (define-public r-shortread (package (name "r-shortread") - (version "1.44.1") + (version "1.44.3") (source (origin (method url-fetch) (uri (bioconductor-uri "ShortRead" version)) (sha256 (base32 - "1dh3q83hmi4l72vpif6dn51dzbi9ljrjgkq2zxg4sqy2jxv4vwza")))) + "0ykyrj4g6vc67d5s46sp4659qvar2iavflzhggm79w4p50hxia4s")))) (properties `((upstream-name . "ShortRead"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From e0ca7b3a144f73e809ec542af1ef3518861dfa97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:25 +0100 Subject: gnu: r-limma: Update to 3.42.2. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.42.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c614adedb4..5199d57fb6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7532,13 +7532,13 @@ (define-public r-variantannotation (define-public r-limma (package (name "r-limma") - (version "3.42.0") + (version "3.42.2") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0cfynv6qbnar5rl7vjh5lvddd381g9wqx1zd6a7l130hf59mwswn")))) + "1nd01r7rd7jb5qz84vbgfnyrmgm9wiq7fsdji68537kjgvrzmm9z")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From 154babb9c4af1bbe4ba8cd1a51ef899e70a8965a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:31 +0100 Subject: gnu: r-rsamtools: Update to 2.2.2. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 2.2.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5199d57fb6..0c36b662ca 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7751,13 +7751,13 @@ (define-public r-biostrings (define-public r-rsamtools (package (name "r-rsamtools") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "0hpdc88prpq1gcja89n5s1ndcg81523qrkbkm9gbhm7rm8wmi8cl")))) + "1larx1a9cngmcsm2n7yyxrlnk69zi8m9dp3b90jva0ynspyi76v7")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From f0e330d68bd461e1dd0f661998c10cd6e84b6f79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:36 +0100 Subject: gnu: r-genomicfeatures: Update to 1.38.2. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.38.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0c36b662ca..81e13555d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7939,13 +7939,13 @@ (define-public r-rtracklayer (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.38.1") + (version "1.38.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "1c1x29f447dv0i1wi88paji645lfsgmg4ckn19hyhlra72smhzqc")))) + "0dd226kgks50jdx5w35f3wmg95hy8aibi4kcn8p5kmqp5i8j580b")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 3f4f3a78229aea29936a05578604d344dc785f59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:42 +0100 Subject: gnu: r-rhtslib: Update to 1.18.1. * gnu/packages/bioinformatics.scm (r-rhtslib): Update to 1.18.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 81e13555d2..f2270a9ed4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8332,14 +8332,14 @@ (define-public r-r4rna (define-public r-rhtslib (package (name "r-rhtslib") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhtslib" version)) (sha256 (base32 - "04inkq44lxwymqv51mxgaphasqjcdc9rl5p58imnrdm0kszs8prm")))) + "0gkbrmrcg55c9s5166ifljlx0v25rv4ijdyp4wf4c292xd6chy2l")))) (properties `((upstream-name . "Rhtslib"))) (build-system r-build-system) ;; Without this a temporary directory ends up in the Rhtslib.so binary, -- cgit v1.2.3 From f2b9f412340f22af82a1e0e4abd60b091f0579f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:48 +0100 Subject: gnu: r-gviz: Update to 1.30.3. * gnu/packages/bioinformatics.scm (r-gviz): Update to 1.30.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f2270a9ed4..0001d8a3d4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10325,14 +10325,14 @@ (define-public r-gqtlstats (define-public r-gviz (package (name "r-gviz") - (version "1.30.1") + (version "1.30.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "03jj193fzmhvkjw8f5zk6wgflkvm3phny0q38scawcplfsyb8z64")))) + "0c9i26h5czm60n1bxzmdxxpywcj0sig6wcj913pb41mr83bbgra3")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9374f550e6bbbeec2cd9044655970e791f34b2a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:53 +0100 Subject: gnu: r-hdf5array: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.14.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0001d8a3d4..f4ef6bed91 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10477,14 +10477,14 @@ (define-public r-hitc (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "04hd02zd5jix5p2zg10asmwjg1fynqgmclbhbmk7fb6arx5hm11f")))) + "0mbx9rsr2571k4k4hmx3dr49rhqb31dhwy2r2bkrd4dbhvriqgld")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From f55084b782f78d76d8ae9aaa3d3df43e45625cbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 19 Feb 2020 23:00:58 +0100 Subject: gnu: r-scran: Update to 1.14.6. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.14.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f4ef6bed91..4adb3137e5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10674,14 +10674,14 @@ (define-public r-scater (define-public r-scran (package (name "r-scran") - (version "1.14.5") + (version "1.14.6") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "0ydy6gvpgpvrs4ryk1qvmmxp6cpaizs294jwg42jawxndkds1l3y")))) + "1y8wlgk5zbv7c7gcp0ahfpbh9lifab7y3zwf0093fzaw7vr1y6cr")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From e48390cb200e66d5313e19167dec4f92dc7c2e8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 17:08:20 +0100 Subject: gnu: libbytesize: Update to 2.2. * gnu/packages/c.scm (libbytesize): Update to 2.2. --- gnu/packages/c.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 921d473cd9..160f456f79 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Guillaume Le Vaillant @@ -132,7 +132,7 @@ (define-public pcc (define-public libbytesize (package (name "libbytesize") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (string-append @@ -140,7 +140,7 @@ (define-public libbytesize "download/" version "/libbytesize-" version ".tar.gz")) (sha256 (base32 - "1bpz9cpb8s47kqplkkiz6ryfahas2ma95g9rh2axnfjp6w1d9ixc")))) + "1aivwypmnqcaj2230pifvf3jcgl5chja8rspkxf0j3480asm8g5r")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) -- cgit v1.2.3 From 3ca6c1a720c8a6460470d17ec1b63277583d0996 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 18:43:39 +0100 Subject: gnu: crypto++: Don't hard-code VERSION. * gnu/packages/crypto.scm (crypto++)[arguments]: Use package VERSION. --- gnu/packages/crypto.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4ce1cc4fc4..8d81fa70df 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -70,6 +70,7 @@ (define-module (gnu packages crypto) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) @@ -635,10 +636,14 @@ (define-public crypto++ ;; Create all the ‘intermediates’ expected by dependent packages. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) + (lib (string-append out "/lib")) + (prefix "libcryptopp.so.") + (target (string-append prefix ,version))) (with-directory-excursion lib - (symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8.0") - (symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8") + (symlink target + (string-append prefix ,(version-major+minor version))) + (symlink target + (string-append prefix ,(version-major version))) #t)))) (add-after 'install 'install-pkg-config (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From bfa3caa2fb1436c4d0e24036a9ea60ccc19aabae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 18:46:04 +0100 Subject: gnu: crypto++: Build in parallel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (crypto++)[arguments]: Make ‘build-shared’ the main ‘build’ phase. Respect MAKE-FLAGS and PARALLEL-JOB-COUNT. --- gnu/packages/crypto.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 8d81fa70df..aa65774c78 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -627,10 +627,12 @@ (define-public crypto++ ((" -march=native") "")) #t)) (delete 'configure) - (add-after 'build 'build-shared - (lambda _ - ;; By default, only the static library is built. - (invoke "make" "shared"))) + (replace 'build + ;; By default, only the static library is built. + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "shared" + "-j" (number->string (parallel-job-count)) + make-flags))) (add-after 'install 'install-shared-library-links ;; By default, only .so and .so.x.y.z are installed. ;; Create all the ‘intermediates’ expected by dependent packages. -- cgit v1.2.3 From e54b381dd4080e70fe2fca4428ea5be3ff6ba63b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 18:48:59 +0100 Subject: gnu: crypto++: Returt #t from all phases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (crypto++)[arguments]: Return #t from ‘install-pkg-config’. --- gnu/packages/crypto.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index aa65774c78..1c665c82bd 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -663,7 +663,8 @@ (define-public crypto++ "Description: Class library of cryptographic schemes" "Version: " ,version "\n" "Libs: -L${libdir} -lcryptopp\n" - "Cflags: -I${includedir}\n")))))))))) + "Cflags: -I${includedir}\n")) + #t)))))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://cryptopp.com/") -- cgit v1.2.3 From 7039b199a2fad6e2afbf8457a8505f0f157f7f83 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 18:50:39 +0100 Subject: gnu: crypto++: Update to 8.2.0. * gnu/packages/crypto.scm (crypto++): Update to 8.2.0. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 1c665c82bd..5ca3ec5b51 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -601,7 +601,7 @@ (define-public perl-math-random-secure (define-public crypto++ (package (name "crypto++") - (version "8.0.0") + (version "8.2.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://cryptopp.com/cryptopp" @@ -609,7 +609,7 @@ (define-public crypto++ ".zip")) (sha256 (base32 - "0b5qrsm4jhy4nzxgrm13nixhvbswr242plx1jw6r4sw492rqkzdv")))) + "0n40hlz5jkvlcp9vxrj0fsrcfp7dm0zmmv6h52dx3f8i5qjf5w03")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 5ee0e01320326ab1ff8c5714ef5ce6338e88703a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Feb 2020 23:36:19 +0100 Subject: gnu: munge: Update to 0.5.14. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (munge): Update to 0.5.14. [source]: Expand snippet. [arguments]: Continue installing pkg-config file. Add new ‘skip-failing-tests’ for the new test suite. --- gnu/packages/admin.scm | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a5f6158f3d..edf8aad335 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2236,7 +2236,7 @@ (define-public iftop (define-public munge (package (name "munge") - (version "0.5.13") + (version "0.5.14") (source (origin (method url-fetch) (uri (string-append "https://github.com/dun/munge/releases/" @@ -2244,20 +2244,45 @@ (define-public munge version ".tar.xz")) (sha256 (base32 - "1nj486bbg1adfg298zck96vgx57kchcypc1zdz1n7w540vyksxcr")) + "0h06sghb4rqvv1ywyd6mzsmbcgh712v6ygrff0gzm440y4ca41k6")) (modules '((guix build utils))) (snippet '(begin ;; Don't insist on write access to /var. (substitute* "src/etc/Makefile.in" (("\\$\\(INSTALL\\)(.*)localstatedir" _ middle) - (string-append "-$(INSTALL)" middle "localstatedir"))) + (string-append "-$(INSTALL)" middle "localstatedir")) + (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*") + "")) #t)))) (inputs `(("openssl" ,openssl) ("libgcrypt" ,libgcrypt))) (build-system gnu-build-system) - (arguments '(#:configure-flags '("--localstatedir=/var"))) + (arguments + '(#:configure-flags + (list "--localstatedir=/var" + (string-append "--with-pkgconfigdir=" + (assoc-ref %outputs "out") "/lib/pkgconfig")) + #:phases + (modify-phases %standard-phases + ;; XXX Many test series fail. Some might be fixable, others do no-no + ;; things like invoking ‘sudo’. + (add-after 'unpack 'skip-failing-tests + (lambda _ + (for-each (lambda (test) + (substitute* "t/Makefile.in" + (((string-append test "\\.t ")) ""))) + (list "0100-munged-lock" + "0010-basic" + "0011-munged-cmdline" + "0012-munge-cmdline" + "0013-unmunge-cmdline" + "0101-munged-security-socket" + "0102-munged-security-keyfile" + "0103-munged-security-logfile" + "0110-munged-origin-addr")) + #t))))) (home-page "https://dun.github.io/munge/") (synopsis "Cluster computing authentication service") (description -- cgit v1.2.3 From 1dc184b4417e6cff06c63ecc9fca74c03be98058 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:06:39 +0100 Subject: gnu: transset-df: Use HTTPS home page. * gnu/packages/xorg.scm (transset-df)[home-page]: Use HTTPS. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cd6c3218a8..f951e565ff 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6303,7 +6303,7 @@ (define-public transset-df adds functionality, including: selecting window by clicking (as transset), selecting windows by pointing select actual focused X11 window, selecting by window name or id, forcing toggle, increase or decrease opacity.") - (home-page "http://forchheimer.se/transset-df/") + (home-page "https://forchheimer.se/transset-df/") (license license:x11))) (define-public bdfresize -- cgit v1.2.3 From 082c733c1d7e20efd736cd79bc2ad7641223d37a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:08:27 +0100 Subject: gnu: python-scikit-image: Use HTTPS home page. * gnu/packages/python-science.scm (python-scikit-image)[home-page]: Use HTTPS. --- gnu/packages/python-science.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index b4241362ba..8dcc6e77e6 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -189,7 +189,7 @@ (define-public python-scikit-image ("python-six" ,python-six))) (native-inputs `(("python-cython" ,python-cython))) - (home-page "http://scikit-image.org/") + (home-page "https://scikit-image.org/") (synopsis "Image processing in Python") (description "Scikit-image is a collection of algorithms for image processing.") -- cgit v1.2.3 From 00c967f6a403f06c2e2217a8b0f208ddc89bca4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:11:11 +0100 Subject: gnu: js-selectize: Use HTTPS home page. * gnu/packages/javascript.scm (js-selectize)[home-page]: Use HTTPS. --- gnu/packages/javascript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 6868a37f86..467a7d0cb9 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -333,7 +333,7 @@ (define-public js-selectize "15gichl8wi6yxag2ps723nxrgyan15976dzsnvw9h9py8sbyyzjn")))) (build-system minify-build-system) (arguments `(#:javascript-files '("src/selectize.js"))) - (home-page "http://selectize.github.io/selectize.js/") + (home-page "https://selectize.github.io/selectize.js/") (synopsis "Hybrid widget between a textbox and } box. It's jQuery based and it has autocomplete and native-feeling keyboard -- cgit v1.2.3 From 6dde98c3d9e7a0385da57abedd9b41ca733acfc6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 20 Feb 2020 01:18:01 +0100 Subject: gnu: libevent: Split into two outputs. This removes python and its dependencies from the libevent closure, reducing it from 180MB to 70MB. * gnu/packages/libevent.scm (libevent): Add bin output. --- gnu/packages/libevent.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 465ed95eb2..338b2afd4e 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -51,6 +51,7 @@ (define-public libevent (base32 "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6")))) (build-system gnu-build-system) + (outputs '("out" "bin")) (arguments ;; This skips some of the tests which fail on armhf and aarch64. '(#:configure-flags '("--disable-libevent-regress"))) -- cgit v1.2.3 From bfab5ce9c4c33fe5aaeccd547236255818b2c4d9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 19 Feb 2020 22:31:21 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.105. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.105. (linux-libre-4.19-pristine-source): 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 aff8fd08fc..7385e19b75 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,10 +367,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.104") +(define-public linux-libre-4.19-version "4.19.105") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3"))) + (hash (base32 "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 3be96aa9d93ea760e2d965cb3ef03540f01a0a22 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 19 Feb 2020 22:32:39 -0500 Subject: gnu: linux-libre: Update to 5.4.21. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.21. (linux-libre-5.4-pristine-source): 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 7385e19b75..f0fd2fb5df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,10 +359,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.20") +(define-public linux-libre-5.4-version "5.4.21") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr"))) + (hash (base32 "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 9b2310a0b49fd4350ea8006ccb1dde1b743f6d61 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 19 Feb 2020 20:14:12 -0500 Subject: gnu: certbot, python-acme: Update to 1.2.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 1.2.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 bc3c8be87f..673f23c20b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -553,13 +553,13 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.0.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1hl62dnh8zsipa5azzpy5kwgjgb5vflinhna1fsn7rcchhpz223a")))) + "1ar6mjax7cyvq3zgh64yrg485l02dy6zqddxjxg99nlvsi0cfc06")))) (build-system python-build-system) (arguments `(#:phases @@ -610,7 +610,7 @@ (define-public certbot (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0aih7sir5byy8ah9lrgzwcaga7hjw98qj8bb1pxzzzqrvcqjvf46")))) + "0g1p4nkaid6davjm5qz8lsln92dhjhlv3rrg8hcfpr7qhphbmp4m")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 7ff86ecae1253035b6894bb5c21ee6d40b181889 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Feb 2020 11:12:33 +0100 Subject: build-self: Show wider backtraces. * build-aux/build-self.scm (build): Add 'setenv' call for "COLUMNS". --- build-aux/build-self.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index fc13032b73..f2e785b7f1 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -420,6 +420,7 @@ (define* (build source ;; $GUILE_LOAD_PATH & co. (with-clean-environment (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive + (setenv "COLUMNS" "120") ;show wider backtraces (when home ;; Inherit HOME so that 'xdg-directory' works. (setenv "HOME" home)) -- cgit v1.2.3 From ef30ddb2c28cd3304b7f78d8782369b5807676f2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 19 Feb 2020 11:13:15 +0100 Subject: gnu: Add Kerberos support to libssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (libssh)[inputs]: Depend on mit-krb5 Signed-off-by: Ludovic Courtès --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 72b7c745f9..fdb3450e01 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -90,7 +90,8 @@ (define-public libssh ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) (inputs `(("zlib" ,zlib) - ("libgcrypt" ,libgcrypt))) + ("libgcrypt" ,libgcrypt) + ("mit-krb5" ,mit-krb5))) (synopsis "SSH client library") (description "libssh is a C library implementing the SSHv2 and SSHv1 protocol for client -- cgit v1.2.3 From 35f35111678e6622301b414f3d464acb71e106bb Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 19 Feb 2020 11:13:54 +0100 Subject: ssh: Add Kerberos-support to ssh:// daemon URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/ssh.scm (open-ssh-session): Fall back to GSSAPI if public key authentication does not work Signed-off-by: Ludovic Courtès --- doc/guix.texi | 5 +++-- guix/ssh.scm | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index afb70d5378..f1ca285a25 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6811,8 +6811,9 @@ instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @item ssh @cindex SSH access to build daemons These URIs allow you to connect to a remote daemon over -SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}. -A typical URL might look like this: +SSH. This feature requires Guile-SSH (@pxref{Requirements}) and a working +@code{guile} binary in @code{PATH} on the destination machine. It supports +public key and GSSAPI authentication. A typical URL might look like this: @example ssh://charlie@@guix.example.org:22 diff --git a/guix/ssh.scm b/guix/ssh.scm index 291ce20b61..56b49b177f 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -157,11 +157,16 @@ (define* (open-ssh-session host #:key user port identity (session-set! session 'timeout timeout) session) (x - (disconnect! session) - (raise (condition - (&message - (message (format #f (G_ "SSH authentication failed for '~a': ~a~%") - host (get-error session))))))))) + (match (userauth-gssapi! session) + ('success + (session-set! session 'timeout timeout) + session) + (x + (disconnect! session) + (raise (condition + (&message + (message (format #f (G_ "SSH authentication failed for '~a': ~a~%") + host (get-error session))))))))))) (x ;; Connection failed or timeout expired. (raise (condition -- cgit v1.2.3 From bf8dfe3df025e4ac80cccb87497b4f072ba10e2a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 20 Feb 2020 14:06:44 +0100 Subject: doc: Use two spaces after full stops. * doc/guix.texi (The Store): Use two spaces after full stops. --- doc/guix.texi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f1ca285a25..2c95dbfe63 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6810,10 +6810,11 @@ instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @item ssh @cindex SSH access to build daemons -These URIs allow you to connect to a remote daemon over -SSH. This feature requires Guile-SSH (@pxref{Requirements}) and a working -@code{guile} binary in @code{PATH} on the destination machine. It supports -public key and GSSAPI authentication. A typical URL might look like this: +These URIs allow you to connect to a remote daemon over SSH. This +feature requires Guile-SSH (@pxref{Requirements}) and a working +@code{guile} binary in @code{PATH} on the destination machine. It +supports public key and GSSAPI authentication. A typical URL might look +like this: @example ssh://charlie@@guix.example.org:22 -- cgit v1.2.3 From 0dc1f651a89518117382b9906762a9eaa431fa38 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 20 Feb 2020 14:31:37 -0500 Subject: gnu: RawTherapee: Update to 5.8. * gnu/packages/photo.scm (rawtherapee): Update to 5.8. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 0867433245..3542a2523a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -498,14 +498,14 @@ (define-public hugin (define-public rawtherapee (package (name "rawtherapee") - (version "5.6") + (version "5.8") (source (origin (method url-fetch) (uri (string-append "http://rawtherapee.com/shared/source/" "rawtherapee-" version ".tar.xz")) (sha256 (base32 - "0x0dcfp6f3j08gr11wq5ah4prp790xy4iadbgsm9kgc0jlalpspr")))) + "0lq8qi7g0a28h3rab7bk5bbbd4gvfma42bvlz1dfn8p9mah2h19n")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From cbfa8bb313afe98bbc097e664fadc5ce6399ef14 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 20 Feb 2020 15:17:19 -0500 Subject: gnu: perl-image-exiftool: Update to 11.85. * gnu/packages/photo.scm (perl-image-exiftool): Update to 11.85. --- gnu/packages/photo.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 3542a2523a..4688629172 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -211,7 +211,7 @@ (define-public gphoto2 (define-public perl-image-exiftool (package (name "perl-image-exiftool") - (version "11.30") + (version "11.85") (source (origin (method url-fetch) @@ -222,7 +222,8 @@ (define-public perl-image-exiftool (string-append "https://www.sno.phy.queensu.ca/~phil/exiftool/" "Image-ExifTool-" version ".tar.gz"))) (sha256 - (base32 "0vkjb2c1a3jdlq8rx1jywx4p3f1bmgjn7rzfwx6dxgij2lx76lrs")))) + (base32 + "15zqm0ly2b3paqg0ym44ib2mvh6k18a9q5rvdirwipqa127al2lb")))) (build-system perl-build-system) (arguments '(#:phases -- cgit v1.2.3 From d4160848a06a390d6d5df9b8506cd796ad1326aa Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 20 Feb 2020 15:31:57 -0500 Subject: gnu: git-annex: Update to 7.20200219. * gnu/packages/haskell-apps.scm (git-annex): Update to 7.20200219. Signed-off-by: Leo Famulari --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3cf6eeafee..6423b910f2 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -270,14 +270,14 @@ (define-public darcs (define-public git-annex (package (name "git-annex") - (version "7.20200202.7") + (version "7.20200219") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1dj1ss7kp82wa0ybilhl88q6w49rj70qh61k2q8qfyx4ghliiigh")))) + (base32 "0pzwjh98jpirgssbd7pqfk7mzraibrk277dn34s2mrah8zy75b58")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From fb36ac61d4c107c8eedf9b2b29ef62c24f95b472 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 20:56:58 +0100 Subject: gnu: ntk: Use git-file-name. * gnu/packages/fltk.scm (ntk): Use git-file-name. --- gnu/packages/fltk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 40d5e7e513..f09b383ef1 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -109,7 +109,7 @@ (define-public ntk (sha256 (base32 "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system waf-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From ec299312a03ca7e2d97c7426b8f9bcb4983f4254 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:37:48 +0100 Subject: gnu: fpga.scm: Use git-version and git-file-name where appropriate. * gnu/packages/fpga.scm (abc): Use git-version. The uri is using an autogenerated commit package, it would ideally use git-fetch. The canonical repository is now on GitHub, but the old commit ID is not present. This means that changing the origin is best done together with an update. (icestorm): Use git-version, git-file-name. (arachne-pnr): Use git-file-name. --- gnu/packages/fpga.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 129b41f99a..dca67ad3ca 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -51,15 +51,15 @@ (define-public abc (revision "1")) (package (name "abc") - (version (string-append "0.0-" revision "-" (string-take commit 9))) + (version (git-version "0.0" revision commit)) (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip")) (file-name (string-append name "-" version "-checkout.zip")) (sha256 - (base32 - "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) + (base32 + "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) (build-system gnu-build-system) (native-inputs `(("unzip" ,unzip))) @@ -216,13 +216,13 @@ (define-public icestorm (revision "2")) (package (name "icestorm") - (version (string-append "0.0-" revision "-" (string-take commit 9))) + (version (git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cliffordwolf/icestorm.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya")))) @@ -267,7 +267,7 @@ (define-public arachne-pnr (uri (git-reference (url "https://github.com/YosysHQ/arachne-pnr.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl")))) -- cgit v1.2.3 From 123334fadd4e2638184300c7ccab6dec06403f11 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:42:22 +0100 Subject: gnu: ath9k-htc-firmware, b43-tools: Use git-file-name. * gnu/packages/firmware.scm (ath9k-htc-firmware): Use git-file-name. (b43-tools): Likewise. --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index d5828deca2..826de90ccc 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -52,7 +52,7 @@ (define-public ath9k-htc-firmware (sha256 (base32 "16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (build-system gnu-build-system) (arguments @@ -106,7 +106,7 @@ (define-public b43-tools (uri (git-reference (url "http://git.bues.ch/git/b43-tools.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1wgmj4d65izbhprwb5bcwimc2ryv19b9066lqzy4sa5m6wncm9cn")))) -- cgit v1.2.3 From d47f96307bd07192cdaeacf701b196b383d610b0 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:43:27 +0100 Subject: gnu: guile-gcrypt: Use git-file-name * gnu/packages/gnupg.scm (guile-gcrypt): Use git-file-name. --- gnu/packages/gnupg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index b31280e39b..2669f52384 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -466,7 +466,7 @@ (define-public guile-gcrypt (sha256 (base32 "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 779ce96faf31901199d8cf654808ce76fb3cb582 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:45:00 +0100 Subject: gnu: libjit: Use git-file-name * gnu/packages/assembly.scm (libjit): Use git-file-name. --- gnu/packages/assembly.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 121035b6d2..1ad49baf8e 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -232,7 +232,7 @@ (define-public libjit (uri (git-reference (url "https://git.savannah.gnu.org/r/libjit.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0p6wklslkkp3s4aisj3w5a53bagqn5fy4m6088ppd4fcfxgqkrcd")))) -- cgit v1.2.3 From bb90beb5bf241de5f4d50375bb34b93bef93a4a5 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 20 Feb 2020 22:46:40 +0100 Subject: gnu: corrode: Use git-file-name. * gnu/packages/haskell-apps.scm (corrode): Use git-file-name. --- gnu/packages/haskell-apps.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 6423b910f2..70348ee3cb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -113,8 +113,7 @@ (define-public corrode (uri (git-reference (url "https://github.com/jameysharp/corrode.git") (commit "b6699fb2fa552a07c6091276285a44133e5c9789"))) - (file-name - (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r")))) (build-system haskell-build-system) -- cgit v1.2.3 From 00500449b0d53bb9219608a3cbee8faf7a3edae1 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 20 Feb 2020 14:05:06 +0100 Subject: services: udev: Do not rely on shepherd inheriting environment variables. Fixes . * gnu/services/base.scm (udev-shepherd-service)[start] Move or copy environment variables to 'fork+exec-command' instead of 'setenv'. --- gnu/services/base.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 0c154d1c4e..706b3ae7ec 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 John Soo ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -2037,11 +2038,6 @@ (define (wait-for-udevd) (setenv "LINUX_MODULE_DIRECTORY" "/run/booted-system/kernel/lib/modules") - ;; The first one is for udev, the second one for eudev. - (setenv "UDEV_CONFIG_FILE" #$udev.conf) - (setenv "EUDEV_RULES_DIRECTORY" - #$(file-append rules "/lib/udev/rules.d")) - (let* ((kernel-release (utsname:release (uname))) (linux-module-directory @@ -2058,7 +2054,18 @@ (define (wait-for-udevd) (make-static-device-nodes directory)) (umask old-umask)) - (let ((pid (fork+exec-command (list udevd)))) + (let ((pid (fork+exec-command (list udevd) + #:environment-variables + (cons* + ;; The first one is for udev, the second one for + ;; eudev. + (string-append "UDEV_CONFIG_FILE=" #$udev.conf) + (string-append "EUDEV_RULES_DIRECTORY=" + #$(file-append + rules "/lib/udev/rules.d")) + (string-append "LINUX_MODULE_DIRECTORY=" + (getenv "LINUX_MODULE_DIRECTORY")) + (default-environment-variables))))) ;; Wait until udevd is up and running. This appears to ;; be needed so that the events triggered below are ;; actually handled. -- cgit v1.2.3 From 2940b3e16ca3ad61b8d9159448a2e42d1fba2c2a Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Thu, 20 Feb 2020 17:55:38 +0100 Subject: gnu: php: Update to 7.4.3. * gnu/packages/php.scm (php): Update to 7.4.3. Signed-off-by: Julien Lepiller --- gnu/packages/php.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index a82257c582..7bb88a7270 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -59,7 +59,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.1") + (version "7.4.3") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "0qn7zwf2jzj3h7p4b1l79lf9gv236mycwkhgw15hj2fmpmkbh6sn")) + "0alqqs5hn4jmz1adrbysbw92n55nkw6f9vfivqj829kwhxnqa7yg")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -237,6 +237,9 @@ (define-public php ;; complete. It's a warning in both cases and test ;; result is the same. "ext/gd/tests/bug77973.phpt" + ;; New test failures added with 7.4.3 + "ext/gd/tests/bug79067.phpt" + "ext/gd/tests/bug79068.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. -- cgit v1.2.3 From fa9f5df7c439083913bc08ec926b7c799704065b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Feb 2020 08:50:48 +0200 Subject: gnu: subversion: Don't build static libraries. This drops the size of the package by about 27%. * gnu/packages/version-control.scm (subversion)[arguments]: Add configure-flag to not build static libraries. --- 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 24a7e3590a..df160bcc53 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1432,6 +1432,7 @@ (define-public subversion (arguments '(#:parallel-tests? #f ; TODO Seems to cause test failures on ; i686-linux + #:configure-flags '("--enable-static=no") #:phases (modify-phases %standard-phases (add-after 'configure 'patch-libtool-wrapper-ls -- cgit v1.2.3 From 6ca4e98c5619699f6ebca6f4d6abafb17a540a1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Feb 2020 09:15:23 +0200 Subject: gnu: tilda: Update to 1.5.0. * gnu/packages/terminals.scm (tilda): Update to 1.5.0. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8773f1969f..885912be41 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Mckinley Olsen ;;; Copyright © 2016, 2017, 2019 Alex Griffin ;;; Copyright © 2016 David Craven @@ -85,7 +85,7 @@ (define-module (gnu packages terminals) (define-public tilda (package (name "tilda") - (version "1.4.1") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -94,7 +94,7 @@ (define-public tilda (file-name (git-file-name name version)) (sha256 (base32 - "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj")))) + "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e90e64049ce160d28d1e8b3014badcc2b214627c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Feb 2020 10:30:31 +0100 Subject: build-system: Add copy-build-system. * guix/build-system/copy.scm: New file. * guix/build/copy-build-system.scm: New file. * Makefile.am (MODULES): Add them. * doc/guix.texi (Build Systems): Document 'copy-build-system'. --- Makefile.am | 2 + doc/guix.texi | 64 +++++++++++++++ guix/build-system/copy.scm | 143 +++++++++++++++++++++++++++++++++ guix/build/copy-build-system.scm | 165 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 374 insertions(+) create mode 100644 guix/build-system/copy.scm create mode 100644 guix/build/copy-build-system.scm diff --git a/Makefile.am b/Makefile.am index c6a2e6cf6c..e18c17d8b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,6 +122,7 @@ MODULES = \ guix/build-system/meson.scm \ guix/build-system/minify.scm \ guix/build-system/asdf.scm \ + guix/build-system/copy.scm \ guix/build-system/glib-or-gtk.scm \ guix/build-system/gnu.scm \ guix/build-system/guile.scm \ @@ -169,6 +170,7 @@ MODULES = \ guix/build/go-build-system.scm \ guix/build/asdf-build-system.scm \ guix/build/bzr.scm \ + guix/build/copy-build-system.scm \ guix/build/git.scm \ guix/build/hg.scm \ guix/build/glib-or-gtk-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 2c95dbfe63..58a4aa65ac 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6154,6 +6154,70 @@ parameters available to cargo. It will also remove an included if they are defined by the crate. @end defvr + +@defvr {Scheme Variable} copy-build-system +@cindex (copy build system) +This variable is exported by @code{(guix build-system copy)}. It +supports builds of simple packages that don't require much compiling, +mostly just moving files around. + +It adds much of the @code{gnu-build-system} packages to the set of +inputs. Because of this, the @code{copy-build-system} does not require +all the boilerplate code often needed for the +@code{trivial-build-system}. + +To further simplify the file installation process, an +@code{#:install-plan} argument is exposed to let the packager specify +which files go where. +The install plan is a list of @code{(SOURCE TARGET [FILTERS])}. +@code{FILTERS} are optional. + +@itemize +@item When @code{SOURCE} matches a file or directory without trailing slash, install it to @code{TARGET}. + @itemize + @item If @code{TARGET} has a trailing slash, install @code{SOURCE} basename beneath @code{TARGET}. + @item Otherwise install @code{SOURCE} as @code{TARGET}. + @end itemize + +@item When @code{SOURCE} is a directory with a trailing slash, or when @code{FILTERS} are used, + the trailing slash of @code{TARGET} is implied with the same meaning + as above. + @itemize + @item Without @code{FILTERS}, install the full @code{SOURCE} @emph{content} to @code{TARGET}. + @item With @code{FILTERS} among @code{#:include}, @code{#:include-regexp}, @code{exclude}, + @code{#:exclude-regexp}, only select files are installed depending on + the filters. Each filters is specified by a list of strings. + @itemize + @item With @code{#:include}, install all the files which path suffix exactly matches + one of the elements in the given list. + @item With @code{#:include-regexp}, install all the files which subpaths match the + regular expressions in the given list. + @item The @code{#:exclude} and @code{#:exclude-regexp} filters + are the complement of their inclusion counterpart. Without @code{#:include} flags, + install all files but those matching the exclusion filters. + If both inclusions and exclusions are specified, the exclusions are done + on top of the inclusions. + @end itemize + @end itemize + In all cases, the paths relative to @code{SOURCE} are preserved within + @code{TARGET}. +@end itemize + +Examples: + +@itemize +@item @code{("foo/bar" "share/my-app/")}: Install @code{bar} to @code{share/my-app/bar}. +@item @code{("foo/bar" "share/my-app/baz")}: Install @code{bar} to @code{share/my-app/baz}. +@item @code{("foo/" "share/my-app")}: Install the content of @code{foo} inside @code{share/my-app}, + e.g. install @code{foo/sub/file} to @code{share/my-app/sub/file}. +@item @code{("foo/" "share/my-app" #:include ("sub/file"))}: Install only @code{foo/sub/file} to +@code{share/my-app/sub/file}. +@item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @code{foo/sub/file} to +@code{share/my-app/file}. +@end itemize +@end defvr + + @cindex Clojure (programming language) @cindex simple Clojure build system @defvr {Scheme Variable} clojure-build-system diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm new file mode 100644 index 0000000000..5fd0da4493 --- /dev/null +++ b/guix/build-system/copy.scm @@ -0,0 +1,143 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2020 Pierre Neidhardt +;;; +;;; 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 (guix build-system copy) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:export (%copy-build-system-modules + default-glibc + lower + copy-build + copy-build-system)) + +;; Commentary: +;; +;; Standard build procedure for simple packages that don't require much +;; compilation, mostly just copying files around. This is implemented as an +;; extension of `gnu-build-system'. +;; +;; Code: + +(define %copy-build-system-modules + ;; Build-side modules imported by default. + `((guix build copy-build-system) + ,@%gnu-build-system-modules)) + +(define (default-glibc) + "Return the default glibc package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages base)))) + (module-ref module 'glibc))) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (glibc (default-glibc)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME from the given arguments." + (define private-keywords + '(#:source #:target #:inputs #:native-inputs)) + + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs native-inputs) + (outputs outputs) + (build copy-build) + (arguments (strip-keyword-arguments private-keywords arguments)))) + +(define* (copy-build store name inputs + #:key (guile #f) + (outputs '("out")) + (install-plan ''(("." (".") "./"))) + (search-paths '()) + (out-of-source? #t) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build copy-build-system) + %standard-phases)) + (system (%current-system)) + (imported-modules %copy-build-system-modules) + (modules '((guix build copy-build-system) + (guix build utils)))) + "Build SOURCE using INSTALL-PLAN, and with INPUTS." + (define builder + `(begin + (use-modules ,@modules) + (copy-build #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:outputs %outputs + #:inputs %build-inputs + #:install-plan ,install-plan + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:phases ,phases + #:out-of-source? ,out-of-source? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:system system + #:inputs inputs + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define copy-build-system + (build-system + (name 'copy) + (description "The standard copy build system") + (lower lower))) + +;;; copy.scm ends here diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm new file mode 100644 index 0000000000..6d9dc8f93b --- /dev/null +++ b/guix/build/copy-build-system.scm @@ -0,0 +1,165 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2020 Pierre Neidhardt +;;; +;;; 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 (guix build copy-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 ftw) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + copy-build)) + +;; Commentary: +;; +;; System for building packages that don't require much compilation, mostly +;; only to copy files around. +;; +;; Code: + +(define* (install #:key install-plan outputs #:allow-other-keys) + "Copy files from the \"source\" build input to the \"out\" output according to INSTALL-PLAN. + +An install plan is a list of plans in the form: + + (SOURCE TARGET [FILTERS]) + +In the above, FILTERS are optional. + +- When SOURCE matches a file or directory without trailing slash, install it to + TARGET. + - If TARGET has a trailing slash, install SOURCE basename beneath TARGET. + - Otherwise install SOURCE as TARGET. + +- When SOURCE is a directory with a trailing slash, or when FILTERS are used, + the trailing slash of TARGET is implied. + - Without FILTERS, install the full SOURCE _content_ to TARGET. + The paths relative to SOURCE are preserved within TARGET. + - With FILTERS among `#:include`, `#:include-regexp`, `#:exclude`, + `#:exclude-regexp`: + - With `#:include`, install only the paths which suffix exactly matches + one of the elements in the list. + - With `#:include-regexp`, install subpaths matching the regexps in the list. + - The `#:exclude*` FILTERS work similarly. Without `#:include*` flags, + install every subpath but the files matching the `#:exlude*` filters. + If both `#:include*` and `#:exclude*` are specified, the exclusion is done + on the inclusion list. + +Examples: + +- `(\"foo/bar\" \"share/my-app/\")`: Install bar to \"share/my-app/bar\". +- `(\"foo/bar\" \"share/my-app/baz\")`: Install bar to \"share/my-app/baz\". +- `(\"foo/\" \"share/my-app\")`: Install the content of foo inside \"share/my-app\", + e.g. install \"foo/sub/file\" to \"share/my-app/sub/file\". +- `(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))`: Install only \"foo/sub/file\" to +\"share/my-app/sub/file\". +- `(\"foo/sub\" \"share/my-app\" #:include (\"file\"))`: Install \"foo/sub/file\" to +\"share/my-app/file\"." + (define (install-simple source target) + "Install SOURCE to TARGET. +TARGET must point to a store location. +SOURCE may be a file or a directory. +If a directory, the directory itself is installed, not its content. +if TARGET ends with a '/', the source is installed underneath." + (let ((target (if (string-suffix? "/" target) + (string-append target (basename source)) + target))) + (mkdir-p (dirname target)) + (copy-recursively source target))) + + (define (install-file file target) + (let ((dest (string-append target + (if (string-suffix? "/" target) + (string-append "/" file) + file)))) + (format (current-output-port) "`~a' -> `~a'~%" file dest) + (mkdir-p (dirname dest)) + (copy-file file dest))) + + (define* (make-file-predicate suffixes matches-regexp #:optional (default-value #t)) + "Return a predicate that returns #t if its file argument matches the +SUFFIXES or the MATCHES-REGEXP. If neither SUFFIXES nor MATCHES-REGEXP is +given, then the predicate always returns DEFAULT-VALUE." + (if (or suffixes matches-regexp) + (let* ((suffixes (or suffixes '())) + (regexps (map make-regexp (or matches-regexp '()))) + (predicates (append + (map (lambda (str) + (cut string-suffix? str <>)) + suffixes) + (map (lambda (regexp) + (cut regexp-exec regexp <>)) + regexps)))) + (lambda (file) + (any (cut <> file) predicates))) + (const default-value))) + + (define* (install-file-list source target #:key include exclude include-regexp exclude-regexp) + ;; We must use switch current directory to source so that `find-files' + ;; returns file paths relative to source. + (with-directory-excursion source + (let* ((exclusion-pred (negate (make-file-predicate exclude exclude-regexp #f))) + (inclusion-pred (make-file-predicate include include-regexp)) + (file-list + (filter! exclusion-pred + (find-files "." (lambda (file _stat) + (inclusion-pred file)))))) + (map (cut install-file <> (if (string-suffix? "/" target) + target + (string-append target "/"))) + file-list)))) + + (define* (install source target #:key include exclude include-regexp exclude-regexp) + (set! target (string-append (assoc-ref outputs "out") "/" target)) + (let ((filters? (or include exclude include-regexp exclude-regexp))) + (when (and (not (file-is-directory? source)) + filters?) + (error "Cannot use filters when SOURCE is a file.")) + (let ((multi-files-in-source? + (or (string-suffix? "/" source) + (and (file-is-directory? source) + filters?)))) + (if multi-files-in-source? + (install-file-list source target + #:include include + #:exclude exclude + #:include-regexp include-regexp + #:exclude-regexp exclude-regexp) + (install-simple source target))))) + + (for-each (lambda (plan) (apply install plan)) install-plan) + #t) + +(define %standard-phases + ;; Everything is as with the GNU Build System except for the `configure' + ;; , `build', `check' and `install' phases. + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install install))) + +(define* (copy-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given package, applying all of PHASES in order." + (apply gnu:gnu-build #:inputs inputs #:phases phases args)) + +;;; copy-build-system.scm ends here -- cgit v1.2.3 From 11386e18013711cf1817ba28ac3c1e33aec9ed38 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Feb 2020 11:04:24 +0100 Subject: gnu: gcide: Use the copy-build-system. * gnu/packages/dictionaries.scm (gcide2)[build-system]: Use the copy-build-system. --- gnu/packages/dictionaries.scm | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 6108a0d56c..98b710ab6d 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -31,6 +31,7 @@ (define-module (gnu packages dictionaries) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix build-system copy) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -109,25 +110,10 @@ (define-public gcide (sha256 (base32 "1n3bp91sik66z3ca7mjqbr9nck3hg5ck0c8g84xc0qnfpx5vznh2")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:builder (begin - (use-modules (guix build utils)) - (let* ((src (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (out (assoc-ref %outputs "out")) - (datadir (string-append out "/share/gcide"))) - (set-path-environment-variable "PATH" '("bin") - (list tar xz)) - (mkdir-p datadir) - (invoke "tar" "-C" datadir - "--strip-components=1" - "-xvf" src))) - #:modules ((guix build utils)))) - (native-inputs - `(("tar" ,tar) - ("xz" ,xz))) + '(#:install-plan + '(("." "share/gcide/" #:exclude ("COPYING"))))) (synopsis "GNU Collaborative International Dictionary of English") (description "GCIDE is a free dictionary based on a combination of sources. It can -- cgit v1.2.3 From fb18f32e5a3a80e809e369ec148b5a8a87d10c86 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 19 Feb 2020 15:46:55 -0600 Subject: gnu: Add gnome-shell-extension-paperwm. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-paperwm): New variable. --- gnu/packages/gnome-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 7f375fefc5..06af41aea6 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu packages gnome-xyz) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) @@ -304,6 +306,32 @@ (define-public gnome-shell-extension-noannoyance (home-page "https://extensions.gnome.org/extension/2182/noannoyance/") (license license:gpl2))) +(define-public gnome-shell-extension-paperwm + (package + (name "gnome-shell-extension-paperwm") + (version "34.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/paperwm/PaperWM.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qry75f696pgmd9yzqvwhq5h6cipin2fvk7h881g29cjcpxim37a")))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("." "share/gnome-shell/extensions/paperwm@hedning:matrix.org" + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" + "\\.xml$" "\\.compiled$"))))) + (home-page "https://github.com/paperwm/PaperWM") + (synopsis "Tiled scrollable window management for GNOME Shell") + (description "PaperWM is an experimental GNOME Shell extension providing +scrollable tiling of windows and per monitor workspaces. It's inspired by paper +notebooks and tiling window managers.") + (license license:gpl3))) + (define-public numix-theme (package (name "numix-theme") -- cgit v1.2.3 From 2cf6366fec410b330f6d5d0da0205ab637e25fcf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Feb 2020 11:27:04 +0100 Subject: doc: Fix typos. * doc/guix.texi (Build Systems): Add missing hash to "#:exclude", and a comma after "e.g.". Use @file and @var appropriately. --- doc/guix.texi | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 58a4aa65ac..10d735431b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6168,23 +6168,22 @@ all the boilerplate code often needed for the To further simplify the file installation process, an @code{#:install-plan} argument is exposed to let the packager specify -which files go where. -The install plan is a list of @code{(SOURCE TARGET [FILTERS])}. -@code{FILTERS} are optional. +which files go where. The install plan is a list of @code{(@var{source} +@var{target} [@var{filters}])}. @var{filters} are optional. @itemize -@item When @code{SOURCE} matches a file or directory without trailing slash, install it to @code{TARGET}. +@item When @var{source} matches a file or directory without trailing slash, install it to @var{target}. @itemize - @item If @code{TARGET} has a trailing slash, install @code{SOURCE} basename beneath @code{TARGET}. - @item Otherwise install @code{SOURCE} as @code{TARGET}. + @item If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}. + @item Otherwise install @var{source} as @var{target}. @end itemize -@item When @code{SOURCE} is a directory with a trailing slash, or when @code{FILTERS} are used, - the trailing slash of @code{TARGET} is implied with the same meaning +@item When @var{source} is a directory with a trailing slash, or when @var{filters} are used, + the trailing slash of @var{target} is implied with the same meaning as above. @itemize - @item Without @code{FILTERS}, install the full @code{SOURCE} @emph{content} to @code{TARGET}. - @item With @code{FILTERS} among @code{#:include}, @code{#:include-regexp}, @code{exclude}, + @item Without @var{filters}, install the full @var{source} @emph{content} to @var{target}. + @item With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude}, @code{#:exclude-regexp}, only select files are installed depending on the filters. Each filters is specified by a list of strings. @itemize @@ -6199,21 +6198,21 @@ The install plan is a list of @code{(SOURCE TARGET [FILTERS])}. on top of the inclusions. @end itemize @end itemize - In all cases, the paths relative to @code{SOURCE} are preserved within - @code{TARGET}. + In all cases, the paths relative to @var{source} are preserved within + @var{target}. @end itemize Examples: @itemize -@item @code{("foo/bar" "share/my-app/")}: Install @code{bar} to @code{share/my-app/bar}. -@item @code{("foo/bar" "share/my-app/baz")}: Install @code{bar} to @code{share/my-app/baz}. -@item @code{("foo/" "share/my-app")}: Install the content of @code{foo} inside @code{share/my-app}, - e.g. install @code{foo/sub/file} to @code{share/my-app/sub/file}. -@item @code{("foo/" "share/my-app" #:include ("sub/file"))}: Install only @code{foo/sub/file} to -@code{share/my-app/sub/file}. -@item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @code{foo/sub/file} to -@code{share/my-app/file}. +@item @code{("foo/bar" "share/my-app/")}: Install @file{bar} to @file{share/my-app/bar}. +@item @code{("foo/bar" "share/my-app/baz")}: Install @file{bar} to @file{share/my-app/baz}. +@item @code{("foo/" "share/my-app")}: Install the content of @file{foo} inside @file{share/my-app}, + e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}. +@item @code{("foo/" "share/my-app" #:include ("sub/file"))}: Install only @file{foo/sub/file} to +@file{share/my-app/sub/file}. +@item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @file{foo/sub/file} to +@file{share/my-app/file}. @end itemize @end defvr -- cgit v1.2.3 From af51d01a8aa8d7cf529173bdb64392f14eb21962 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Feb 2020 12:22:00 +0100 Subject: doc: Fix indentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit e90e64049ce160d28d1e8b3014badcc2b214627c, which broke ‘guix pull’. * doc/guix.texi (Build Systems): Un-indent. --- doc/guix.texi | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 10d735431b..1fc4bd06e3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6173,33 +6173,33 @@ which files go where. The install plan is a list of @code{(@var{source} @itemize @item When @var{source} matches a file or directory without trailing slash, install it to @var{target}. - @itemize - @item If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}. - @item Otherwise install @var{source} as @var{target}. - @end itemize +@itemize +@item If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}. +@item Otherwise install @var{source} as @var{target}. +@end itemize @item When @var{source} is a directory with a trailing slash, or when @var{filters} are used, - the trailing slash of @var{target} is implied with the same meaning - as above. - @itemize - @item Without @var{filters}, install the full @var{source} @emph{content} to @var{target}. - @item With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude}, - @code{#:exclude-regexp}, only select files are installed depending on - the filters. Each filters is specified by a list of strings. - @itemize - @item With @code{#:include}, install all the files which path suffix exactly matches - one of the elements in the given list. - @item With @code{#:include-regexp}, install all the files which subpaths match the - regular expressions in the given list. - @item The @code{#:exclude} and @code{#:exclude-regexp} filters - are the complement of their inclusion counterpart. Without @code{#:include} flags, - install all files but those matching the exclusion filters. - If both inclusions and exclusions are specified, the exclusions are done - on top of the inclusions. - @end itemize - @end itemize - In all cases, the paths relative to @var{source} are preserved within - @var{target}. +the trailing slash of @var{target} is implied with the same meaning +as above. +@itemize +@item Without @var{filters}, install the full @var{source} @emph{content} to @var{target}. +@item With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude}, +@code{#:exclude-regexp}, only select files are installed depending on +the filters. Each filters is specified by a list of strings. +@itemize +@item With @code{#:include}, install all the files which path suffix exactly matches +one of the elements in the given list. +@item With @code{#:include-regexp}, install all the files which subpaths match the +regular expressions in the given list. +@item The @code{#:exclude} and @code{#:exclude-regexp} filters +are the complement of their inclusion counterpart. Without @code{#:include} flags, +install all files but those matching the exclusion filters. +If both inclusions and exclusions are specified, the exclusions are done +on top of the inclusions. +@end itemize +@end itemize +In all cases, the paths relative to @var{source} are preserved within +@var{target}. @end itemize Examples: @@ -6208,7 +6208,7 @@ Examples: @item @code{("foo/bar" "share/my-app/")}: Install @file{bar} to @file{share/my-app/bar}. @item @code{("foo/bar" "share/my-app/baz")}: Install @file{bar} to @file{share/my-app/baz}. @item @code{("foo/" "share/my-app")}: Install the content of @file{foo} inside @file{share/my-app}, - e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}. +e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}. @item @code{("foo/" "share/my-app" #:include ("sub/file"))}: Install only @file{foo/sub/file} to @file{share/my-app/sub/file}. @item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @file{foo/sub/file} to -- cgit v1.2.3 From dd2876aabcc4a62ddb8cbd96738a2bffd41390b1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 21 Feb 2020 13:09:29 +0100 Subject: doc: Fix copy-build-system specification. * doc/guix.texi (Build Systems): Files must match one or more filters, not exactly one. --- doc/guix.texi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1fc4bd06e3..1349d9b27a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6187,10 +6187,11 @@ as above. @code{#:exclude-regexp}, only select files are installed depending on the filters. Each filters is specified by a list of strings. @itemize -@item With @code{#:include}, install all the files which path suffix exactly matches -one of the elements in the given list. -@item With @code{#:include-regexp}, install all the files which subpaths match the -regular expressions in the given list. +@item With @code{#:include}, install all the files which the path suffix matches +at least one of the elements in the given list. +@item With @code{#:include-regexp}, install all the files which the +subpaths match at least one of the regular expressions in the given +list. @item The @code{#:exclude} and @code{#:exclude-regexp} filters are the complement of their inclusion counterpart. Without @code{#:include} flags, install all files but those matching the exclusion filters. -- cgit v1.2.3 From b457f3cc16770dfafe87f86fef002b47f9eef338 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 21 Feb 2020 13:22:22 +0100 Subject: gnu: Add vinci. * gnu/packages/maths.scm (vinci): New variable. --- gnu/packages/maths.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 10071c10d5..535ba02ea6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016, 2017 John Darrington ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier @@ -523,6 +523,51 @@ (define-public lrslib be solved.") (license license:gpl2+))) +(define-public vinci + (package + (name "vinci") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.math.u-bordeaux.fr/~aenge/software/" + "vinci/vinci-" version ".tar.gz")) + (sha256 + (base32 + "1aq0qc1y27iw9grhgnyji3290wwfznsrk3sg6ynqpxwjdda53h4m")))) + (build-system gnu-build-system) + (inputs + `(("lrslib" ,lrslib))) + (arguments + `(#:tests? #f ; no check phase + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; register the lrs location in the config file + (lambda* (#:key inputs #:allow-other-keys) + (let* ((lrs (assoc-ref inputs "lrslib")) + (lrsexec (string-append lrs "/bin/lrs"))) + (substitute* "vinci.h" + (("#define LRS_EXEC \"lrs\"") + (string-append "#define LRS_EXEC \"" lrsexec "\"")))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "vinci" bin)) + #t))))) + (home-page + "https://www.math.u-bordeaux.fr/~aenge/?category=software&page=vinci") + (synopsis "Volume computation for polytopes") + (description + "Vinci implements a number of volume computation algorithms for convex +polytopes in arbitrary dimension. The polytopes can be given by their +V-representation (as the convex hull of a finite number of vertices), by +their H-representation (as the bounded intersection of a finite number of +halfspaces) or by their double description with both representations.") + (license license:gpl2+))) + (define-public arpack-ng (package (name "arpack-ng") -- cgit v1.2.3 From b24d523e74b7999362c517622af5de3f1f9c4c23 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 21 Feb 2020 12:35:07 +0000 Subject: gnu: highlight: Build perl bindings. * gnu/packages/pretty-print.scm (highlight)[native-inputs]: Add swig. [inputs]: Add perl. [arguments]: Specify lua version for pkg-config command, add 'install-perl-bindings' phase. --- gnu/packages/pretty-print.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index fc98478d4c..e6560696f5 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,8 @@ (define-module (gnu packages pretty-print) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages compression)) + #:use-module (gnu packages compression) + #:use-module (gnu packages swig)) (define-public a2ps (package @@ -270,12 +272,29 @@ (define-public highlight (string-append assignment "lua-" ,(version-major+minor (package-version lua)) "\n"))) - #t))))) + (substitute* "extras/swig/makefile" + (("lua") (string-append "lua-" ,(version-major+minor + (package-version lua))))) + #t)) + (add-after 'install 'install-perl-bindings + (lambda* (#:key outputs #:allow-other-keys) + (let* ((perldir (string-append (assoc-ref outputs "out") + "/lib/perl5/site_perl/" + ,(package-version perl))) + (autodir (string-append perldir "/auto/highlight"))) + (with-directory-excursion "extras/swig" + (invoke "make" "perl") + (invoke "perl" "-I" "." "testmod.pl") + (install-file "highlight.pm" perldir) + (install-file "highlight.so" autodir)) + #t)))))) (inputs `(("lua" ,lua) - ("boost" ,boost))) + ("boost" ,boost) + ("perl" ,perl))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("swig" ,swig))) (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php") (synopsis "Convert code to documents with syntax highlighting") (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX, -- cgit v1.2.3 From a3f6c410673d86feb524ff76c71295e9212a2d0b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 21 Feb 2020 14:14:16 +0100 Subject: gnu: Add cl-pzmq. * gnu/packages/lisp-xyz.scm (sbcl-pzmq, cl-pzmq, ecl-pzmq): New variables. --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c86d463484..0ed074b766 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -57,6 +57,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) #:use-module (gnu packages maths) + #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -10598,3 +10599,49 @@ (define-public sbcl-numcl (define-public cl-numcl (sbcl-package->cl-source-package sbcl-numcl)) + +(define-public sbcl-pzmq + (let ((commit "7c7390eedc469d033c72dc497984d1536ee75826") + (revision "1")) + (package + (name "sbcl-pzmq") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orivej/pzmq.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gmwzf7h90wa7v4wnk49g0hv2mdalljpwhyigxcb967wzv8lqci9")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("fiveam" ,sbcl-fiveam) + ("let-plus" ,sbcl-let-plus))) + (inputs + `(("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("zeromq" ,zeromq))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "c-api.lisp" + (("\"libzmq") + (string-append "\"" + (assoc-ref inputs "zeromq") + "/lib/libzmq"))) + #t))))) + (synopsis "Common Lisp bindings for the ZeroMQ library") + (description "This Common Lisp library provides bindings for the ZeroMQ +lightweight messaging kernel.") + (home-page "https://github.com/orivej/pzmq") + (license license:unlicense)))) + +(define-public cl-pzmq + (sbcl-package->cl-source-package sbcl-pzmq)) + +(define-public ecl-pzmq + (sbcl-package->ecl-package sbcl-pzmq)) -- cgit v1.2.3 From 60d5ad8087161451a009d742c8a2980bebda7e38 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 21 Feb 2020 08:20:58 -0600 Subject: gnu: gnome-shell-extension-paperwm: Recompile schemas. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-paperwm) [source]: Remove gschemas.compiled in a snippet. [arguments]: Add compile-schemas phase. [native-inputs]: Add glib. Signed-off-by: Alex Griffin --- gnu/packages/gnome-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 06af41aea6..34c331d195 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -318,13 +319,23 @@ (define-public gnome-shell-extension-paperwm (file-name (git-file-name name version)) (sha256 (base32 - "1qry75f696pgmd9yzqvwhq5h6cipin2fvk7h881g29cjcpxim37a")))) + "1qry75f696pgmd9yzqvwhq5h6cipin2fvk7h881g29cjcpxim37a")) + (snippet + '(begin (delete-file "schemas/gschemas.compiled"))))) (build-system copy-build-system) (arguments '(#:install-plan '(("." "share/gnome-shell/extensions/paperwm@hedning:matrix.org" - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" - "\\.xml$" "\\.compiled$"))))) + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" "\\.xml$"))) + #:phases + (modify-phases %standard-phases + (add-before 'install 'compile-schemas + (lambda _ + (with-directory-excursion "schemas" + (invoke "make")) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin"))) ; for glib-compile-schemas (home-page "https://github.com/paperwm/PaperWM") (synopsis "Tiled scrollable window management for GNOME Shell") (description "PaperWM is an experimental GNOME Shell extension providing -- cgit v1.2.3 From 536cc4aae5b58b45b974530646a4916a29a8aa6c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 19 Feb 2020 14:54:54 +0100 Subject: gnu: nim: Update to 1.0.6. * gnu/packages/nim.scm (nim): Update to 1.0.6. --- gnu/packages/nim.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 22dac0b58a..374a533c30 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,7 @@ (define-module (gnu packages nim) (define-public nim (package (name "nim") - (version "0.17.2") + (version "1.0.6") (source (origin (method url-fetch) @@ -35,7 +36,7 @@ (define-public nim name "-" version ".tar.xz")) (sha256 (base32 - "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa")))) + "1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests. -- cgit v1.2.3 From 2ea6d49913838a7ffe992078a520a3c6bfcfd05c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:29:11 +0100 Subject: gnu: calibre: Use HTTPS home page. * gnu/packages/ebook.scm (calibre)[home-page]: Use HTTPS. --- gnu/packages/ebook.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 7f8aa42e95..5ac0fb1533 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -227,7 +227,7 @@ (define-public calibre (delete-file-recursively font-dest) (symlink font-src font-dest)) #t))))) - (home-page "http://calibre-ebook.com/") + (home-page "https://calibre-ebook.com/") (synopsis "E-book library management software") (description "Calibre is an e-book library manager. It can view, convert and catalog e-books in most of the major e-book formats. It can also talk -- cgit v1.2.3 From 9c99cb2276b7cbc3fa05a8949b92b8197a78707d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:30:14 +0100 Subject: gnu: grisbi: Use HTTPS home page. * gnu/packages/finance.scm (grisbi)[home-page]: Use HTTPS. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2ba413d388..8e12f684e0 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1126,7 +1126,7 @@ (define-public grisbi third party, expenditure and receipt categories, budgetary lines, financial years, budget estimates, bankcard management and other information.") - (home-page "http://grisbi.org") + (home-page "https://grisbi.org") (license license:gpl2+))) (define-public trezord -- cgit v1.2.3 From 059aa850e95ca6a8184db2acc7cc20fc6647c7ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:04:08 +0100 Subject: gnu: rust-yaml-rust: Use HTTPS home page. * gnu/packages/crates-io.scm (rust-yaml-rust)[home-page]: Use HTTPS. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 02ccfc3979..1585ccc4b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16288,7 +16288,7 @@ (define-public rust-yaml-rust-0.4 (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.8)))) - (home-page "http://chyh1990.github.io/yaml-rust/") + (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "The missing YAML 1.2 parser for rust") (description "The missing YAML 1.2 parser for rust.") -- cgit v1.2.3 From 4b17f71de4cafa337f09aef527153c8c4b85a090 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:05:24 +0100 Subject: gnu: emacs-rotate-text: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-rotate-text)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2e8a9e62e..fca6b58b80 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19472,7 +19472,7 @@ (define-public emacs-rotate-text (base32 "1cgxv4aibkvv6lnssynn0438a615fz3zq8hg9sb0lhfgsr99pxln")))) (build-system emacs-build-system) - (home-page "http://nschum.de/src/emacs/rotate-text/") + (home-page "https://nschum.de/src/emacs/rotate-text/") (synopsis "Cycle through words, symbols and patterns in Emacs") (description "@code{rotate-text} allows you rotate to commonly interchanged text with a single keystroke. For example, you can toggle -- cgit v1.2.3 From 2f35985c77dfb44f92220771b8e8bfcbb836ef3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:09:14 +0100 Subject: gnu: python-sympy: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-sympy)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b1fa529911..8a1eaf0145 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6218,7 +6218,7 @@ (define-public python-sympy #t))))) (propagated-inputs `(("python-mpmath" ,python-mpmath))) - (home-page "http://www.sympy.org/") + (home-page "https://www.sympy.org/") (synopsis "Python library for symbolic mathematics") (description "SymPy is a Python library for symbolic mathematics. It aims to become a -- cgit v1.2.3 From 018b72d72414972b932939228b1fb3d38f5cc89d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:22:39 +0100 Subject: gnu: rust-tempfile: Use HTTPS home page. * gnu/packages/crates-io.scm (rust-tempfile)[home-page]: Use HTTPS. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1585ccc4b5..4872aa69a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13520,7 +13520,7 @@ (define-public rust-tempfile-3.1 ("rust-redox-syscall" ,rust-redox-syscall-0.1) ("rust-remove-dir-all" ,rust-remove-dir-all-0.5) ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "http://stebalien.com/projects/tempfile-rs") + (home-page "https://stebalien.com/projects/tempfile-rs") (synopsis "Library for managing temporary files and directories") (description "This package provides a library for managing temporary files and -- cgit v1.2.3 From 92a79fee20c0c072200a759d04ea1b35470f8fae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:55:06 +0100 Subject: gnu: ghc-splitmix: Use HTTPS home page. * gnu/packages/haskell-xyz.scm (ghc-splitmix)[home-page]: Use HTTPS. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7825963523..f9644ecd9a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10689,7 +10689,7 @@ (define-public ghc-splitmix ("ghc-base-compat-batteries" ,ghc-base-compat-batteries) ("ghc-tf-random" ,ghc-tf-random) ("ghc-vector" ,ghc-vector))) - (home-page "http://hackage.haskell.org/package/splitmix") + (home-page "https://hackage.haskell.org/package/splitmix") (synopsis "Fast and splittable pseudorandom number generator") (description "This package provides a Pure Haskell implementation of the SplitMix pseudorandom number generator. SplitMix is a \"splittable\" -- cgit v1.2.3 From 3fbb7bec1cf192d80cddf7fd2a2d3b438b5a6d31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:41:48 +0100 Subject: gnu: proj: Update home page. * gnu/packages/geo.scm (proj)[home-page]: Use new (HTTPS) domain. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 61b8e55e52..b0fdd06d08 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -393,7 +393,7 @@ (define-public proj.4 #t))))) (inputs `(("glib" ,glib))) - (home-page "http://proj4.org/") + (home-page "https://proj.org/") (synopsis "Cartographic Projections Library") (description "Proj.4 is a library for converting coordinates between cartographic -- cgit v1.2.3 From 52888f52e87daa4245a9455126002daa23cb6527 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:11:42 +0100 Subject: gnu: python-pycrypto: Update home page. * gnu/packages/python-crypto.scm (python-pycrypto)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/python-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 71172701ac..c525cf82ab 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -291,7 +291,7 @@ (define-public python-pycrypto (add-before 'build 'set-build-env ;; pycrypto runs an autoconf configure script behind the scenes (lambda _ (setenv "CONFIG_SHELL" (which "bash")) #t))))) - (home-page "http://www.pycrypto.org/") + (home-page "https://www.dlitz.net/software/pycrypto/") (synopsis "Cryptographic modules for Python") (description "Pycrypto is a collection of both secure hash functions (such as SHA256 -- cgit v1.2.3 From 3602de332ba76f94325b5eebcd14ff3acc470c96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:28:47 +0100 Subject: gnu: scons: Use HTTPS home page. * gnu/packages/python-xyz.scm (scons)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8a1eaf0145..4e13c7e367 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1559,7 +1559,7 @@ (define-public scons (invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix") (chdir "build/scons") #t))))) - (home-page "http://scons.org/") + (home-page "https://scons.org/") (synopsis "Software construction tool written in Python") (description "SCons is a software construction tool. Think of SCons as an improved, -- cgit v1.2.3 From e11639f385f7ea2ef0b5b0ede79c83572b33110c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:35:10 +0100 Subject: gnu: openh264: Use HTTPS home page. * gnu/packages/video.scm (openh264)[home-page]: Use HTTPS. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f8c9f9e45a..59cff04a56 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2882,7 +2882,7 @@ (define-public openh264 #:phases (modify-phases %standard-phases ;; no configure script (delete 'configure)))) - (home-page "http://www.openh264.org/") + (home-page "https://www.openh264.org/") (synopsis "H264 decoder library") (description "Openh264 is a library which can decode H264 video streams.") -- cgit v1.2.3 From dd6114dfc59592fb6e28af410a55a5151bc7c589 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 20:35:43 +0100 Subject: gnu: containerd: Use HTTPS home page. * gnu/packages/docker.scm (containerd)[home-page]: Use HTTPS. --- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index cc353fd11f..b23e067888 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -238,7 +238,7 @@ (define-public containerd (description "This package provides the container daemon for Docker. It includes image transfer and storage, container execution and supervision, network attachments.") - (home-page "http://containerd.io/") + (home-page "https://containerd.io/") (license license:asl2.0))) ;;; Private package that shouldn't be used directly; its purposes is to be -- cgit v1.2.3 From d5f344c987c8cc7b597e938c22e02edf1c4335f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Feb 2020 05:19:27 +0100 Subject: gnu: libreoffice: Fix ‘soffice’ in a pure environment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Refer to grep and coreutils by absolute file name in the soffice launcher script. --- gnu/packages/libreoffice.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 04477e2082..b2f18984ad 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1034,6 +1034,14 @@ (define-public libreoffice "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) + ;; Use store references for strictly necessary commands, + ;; but not for optional tools like ‘gdb’ and ‘valgrind’. + (for-each (lambda (command) + (substitute* "desktop/scripts/soffice.sh" + (((format #f"~a " command)) + (format #f "~a " (which command))))) + (list "dirname" "grep" "uname")) + ;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; find them on the include path without a prefix. -- cgit v1.2.3 From 50f02ced92d48e11538ff972be0f06bd0689a460 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Feb 2020 20:03:44 +0100 Subject: gnu: Update fprintd home pages. * gnu/packages/freedesktop.scm (libfprint, fprintd)[home-page]: Update. --- 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 9d714c38ca..392236eba9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1232,7 +1232,7 @@ (define-public libfprint ("glib" ,glib) ("eudev" ,eudev) ("pixman" ,pixman))) - (home-page "https://www.freedesktop.org/wiki/Software/fprint/libfprint/") + (home-page "https://fprint.freedesktop.org/") (synopsis "Library to access fingerprint readers") (description "libfprint is a library designed to make it easy for application @@ -1273,7 +1273,7 @@ (define-public fprintd ("dbus-glib" ,dbus-glib) ("polkit" ,polkit) ("linux-pam" ,linux-pam))) ;for pam_fprintd - (home-page "https://www.freedesktop.org/wiki/Software/fprint/fprintd/") + (home-page "https://fprint.freedesktop.org/") (synopsis "D-Bus daemon that exposes fingerprint reader functionality") (description "fprintd is a D-Bus daemon that offers functionality of libfprint, a -- cgit v1.2.3 From 239d3e9ceff19339dea6681110a6fa4782cd5bf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Feb 2020 18:35:15 +0100 Subject: gnu: libfprint, fprintd: Update to 1.90.1. * gnu/packages/freedesktop.scm (libfprint): Update to 1.90.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [build-system]: Use Meson. [arguments]: Adapt #:configure-flags. [native-inputs]: Add eudev, glib:bin, gobject-introspection, and gtk-doc. [inputs]: Replace libusb with gusb. (fprintd): Update to 1.90.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [build-system]: Use Meson. [arguments]: Add directory #:configure-flags. Work around many exciting new Meson features. [native-inputs]: Replace intltool with gettext-minimal. Add glib:bin, libxslt, and perl. [inputs]: Add elogind and polkit, as well as gusb, nss, and pixman. --- gnu/packages/freedesktop.scm | 149 ++++++++++++++++++++++++++++++------------- 1 file changed, 105 insertions(+), 44 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 392236eba9..9d10f51257 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović ;;; Copyright © 2019 Reza Alizadeh Majd @@ -1211,26 +1211,34 @@ (define-public colord-gtk (define-public libfprint (package (name "libfprint") - (version "0.6.0") - (source (origin - (method url-fetch) - (uri (string-append "https://people.freedesktop.org/~hadess/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5")))) - (build-system gnu-build-system) + (version "1.90.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libfprint/libfprint") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a")))) + (build-system meson-build-system) (arguments - '(#:configure-flags (list (string-append "--with-udev-rules-dir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")))) + '(#:configure-flags + (list (string-append "-Dudev_rules_dir=" (assoc-ref %outputs "out") + "/lib/udev/rules.d")))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("eudev" ,eudev) + ("glib:bin" ,glib "bin") ; for {glib-,}mkenums + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ; for 88 KiB of API documentation + ("pkg-config" ,pkg-config))) (inputs - `(("libusb" ,libusb) - ("nss" ,nss) - ("glib" ,glib) - ("eudev" ,eudev) + `(("glib" ,glib) + ("gusb" ,gusb) + ("nss" ,nss) ; for the URU4x00 driver + + ;; Replacing this with cairo works but just results in a reference + ;; (only) to pixman in the end. ("pixman" ,pixman))) (home-page "https://fprint.freedesktop.org/") (synopsis "Library to access fingerprint readers") @@ -1243,36 +1251,89 @@ (define-public libfprint (define-public fprintd (package (name "fprintd") - (version "0.7.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://people.freedesktop.org/~hadess/fprintd-" - version ".tar.xz")) - (sha256 - (base32 - "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5")))) - (build-system gnu-build-system) + (version "1.90.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libfprint/fprintd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg")))) + (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'build 'set-sysconfdir - (lambda* (#:key outputs #:allow-other-keys) - ;; Work around a bug whereby the 'SYSCONFDIR' macro - ;; expands literally to '${prefix}/etc'. - (let ((out (assoc-ref outputs "out"))) - (substitute* "src/main.c" - (("SYSCONFDIR, \"fprintd.conf\"") - (string-append "\"" out "/etc\", " - "\"fprintd.conf\""))) - #t)))))) + `(#:configure-flags + (list "-Dsystemd_system_unit_dir=/tmp" + (string-append "-Ddbus_service_dir=" (assoc-ref %outputs "out") + "/share/dbus-1/system-services") + (string-append "-Dpam_modules_dir=" (assoc-ref %outputs "out") + "/lib/security")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-output-directories + ;; Install files to our output, not that of the ‘owner’ package. + ;; These are not exposed as Meson options and must be patched. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "meson.build" + (("(dbus_interfaces_dir = ).*" _ set) + (string-append set "'" out "/share/dbus-1/interfaces'\n")) + (("(polkit_policy_directory = ).*" _ set) + (string-append set "'" out "/share/polkit-1/actions/'\n")) + (("(dbus_data_dir = ).*" _ set) + (string-append set "get_option('prefix')" + " / get_option('datadir')\n"))) + #t))) + (add-before 'configure 'patch-mistake + (lambda _ + (substitute* "meson.build" + (("(storage_path = )(get_option\\('prefix'\\))(.*)" + _ set mistake value) + (string-append set "''" value "\n"))) + #t)) + (add-before 'configure 'patch-systemd-dependencies + (lambda _ + (substitute* "meson.build" + (("'(libsystemd|systemd)'") "'libelogind'")) + #t)) + (add-before 'configure 'ignore-test-dependencies + (lambda _ + (substitute* "meson.build" + (("pam_wrapper_dep .*") "") + ((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") "")) + #t)) + (add-before 'install 'no-polkit-magic + ;; Meson ‘magically’ invokes pkexec, which fails (not setuid). + (lambda _ + (setenv "PKEXEC_UID" "something") + #t))) + #:tests? #f)) ; XXX depend on unpackaged packages (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-genmarshal + ("libxslt" ,libxslt) ; for xsltproc + ("perl" ,perl) ; for pod2man + ("pkg-config" ,pkg-config))) + ;; For tests. + ;;("pam_wrapper" ,pam_wrapper) + ;;("python-pycairo" ,python-pycairo) + ;;("python-dbus" ,python-dbus) + ;;("python-dbusmock" ,python-dbusmock) + ;;("python-pygobject" ,python-pygobject) + ;;("python-pypamtest" ,python-pypamtest) (inputs - `(("libfprint" ,libfprint) - ("dbus-glib" ,dbus-glib) + `(("dbus-glib" ,dbus-glib) + ("elogind" ,elogind) + ("libfprint" ,libfprint) + ("linux-pam" ,linux-pam) ("polkit" ,polkit) - ("linux-pam" ,linux-pam))) ;for pam_fprintd + + ;; XXX These are in libfprint's Requires.private. Meson refuses to grant + ;; the ‘libfprint-2’ dependency if they are not provided here. + ("gusb" ,gusb) + ("nss" ,nss) + ("pixman" ,pixman))) (home-page "https://fprint.freedesktop.org/") (synopsis "D-Bus daemon that exposes fingerprint reader functionality") (description -- cgit v1.2.3 From 371a647e8ba637226a01981fa025f01326accdf6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Feb 2020 19:25:52 +0100 Subject: gnu: chroma: Fix description. * gnu/packages/games.scm (chroma)[descrption]: Add missing space and fix indentation. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 12b4cdf125..2e393dac61 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4791,10 +4791,10 @@ (define-public chroma (synopsis "Abstract puzzle game") (description "Chroma is an abstract puzzle game. A variety of colourful shapes are arranged in a series of increasingly complex patterns, forming - fiendish traps that must be disarmed and mysterious puzzles that must be - manipulated in order to give up their subtle secrets. Initially so - straightforward that anyone can pick it up and begin to play, yet gradually - becoming difficult enough to tax even the brightest of minds.") +fiendish traps that must be disarmed and mysterious puzzles that must be +manipulated in order to give up their subtle secrets. Initially so +straightforward that anyone can pick it up and begin to play, yet gradually +becoming difficult enough to tax even the brightest of minds.") (license license:gpl2+))) (define-public fillets-ng -- cgit v1.2.3 From d2b5cdfef7df4b2b640d8f87a36d81ffa8e2b28f Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 21 Feb 2020 19:02:28 +0100 Subject: gnu: profanity: Update to 0.8.1. * gnu/packages/messaging.scm (profanity): Update to 0.8.1. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 120daacdc6..b4628ce8dd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1634,14 +1634,14 @@ (define-public libstrophe (define-public profanity (package (name "profanity") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "https://profanity-im.github.io/profanity-" version ".tar.gz")) (sha256 (base32 - "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z")))) + "15yrx2ir2bilxpjfaxpjb93yjpvpvcvh5r7wbsjx6kmmy7qg2zvb")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From fd62167464a2c0276870596b36b9ba5caa4e8d5f Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 21 Feb 2020 12:45:32 -0600 Subject: gnu: gnome-shell-extension-paperwm: Install compiled gschemas. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-paperwm)[arguments]: Install compiled gschemas. Signed-off-by: Alex Griffin --- gnu/packages/gnome-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 34c331d195..cd334abb53 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -326,7 +326,8 @@ (define-public gnome-shell-extension-paperwm (arguments '(#:install-plan '(("." "share/gnome-shell/extensions/paperwm@hedning:matrix.org" - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" "\\.xml$"))) + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" + "\\.xml$" "\\.compiled$"))) #:phases (modify-phases %standard-phases (add-before 'install 'compile-schemas -- cgit v1.2.3 From 76a8dc3ee289ac4f4b984a3d9d2dcb9d89c01eda Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 21 Feb 2020 15:39:22 -0500 Subject: gnu: Add font-vazir. * gnu/packages/fonts.scm (font-vazir): New variable. --- gnu/packages/fonts.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7297c277f1..6bc95e36fe 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Alva ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2020 Damien Cassou +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; @@ -1585,3 +1586,42 @@ (define-public font-jetbrains-mono Mono’s typeface forms are simple and free from unnecessary details. Rendered in small sizes, the text looks crisper.") (license license:asl2.0))) + +(define-public font-vazir + (package + (name "font-vazir") + (version "22.1.0") + (source + (origin + (method url-fetch/zipbomb) + (uri + (string-append "https://github.com/rastikerdar/vazir-font/" + "releases/download/v" version + "/vazir-font-v" version ".zip")) + (sha256 + (base32 + "0w3gwb5q33x5llw7cfs8qhaxr4ssg6rsx4b9day3993zn24xq031")))) + (build-system font-build-system) + (home-page "https://rastikerdar.github.io/vazir-font/") + (synopsis "Vazir Persian typeface") + (description + "Vazir is a beautiful and elegant Persian typeface originally based on +DejaVu, and comes in six variants: Thin, Light, Normal, Medium, Bold, and +Black. This package provides four versions of Vazir: + +@itemize +@item @code{Vazir}: The main version; includes Latin glyphs from Roboto. +@item @code{Vazir-FD}: Like @code{Vazir}, but (always) uses Farsi digit glyphs +instead of Latin ones. +@item @code{Vazir-WOL}: Like @code{Vazir}, but without Roboto's Latin glyphs. +@item @code{Vazir-FD-WOL}: Combination of @code{Vazir-FD} and @code{Vazir-WOL}: +always uses Farsi digits, and does not include Latin glyphs from Roboto. +@end itemize\n") + (license + ;; See https://github.com/rastikerdar/vazir-font/blob/master/LICENSE for + ;; details. + (list license:public-domain ; the Vazir modifications to DejaVu + ; and the DejaVu modifications to... + (license:x11-style ; ...the Bitstream Vera typeface + "file://LICENSE" "Bitstream Vera License") + license:asl2.0)))) ; Latin glyphs from Roboto -- cgit v1.2.3 From c080beb9c7d0e6b3d1405dd72e32cf8ef40815d5 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 22 Feb 2020 00:09:52 +0100 Subject: gnu: choqok: Update to 1.7.0. * gnu/packages/kde-internet.scm (choqok): Update to 1.7.0. (inputs): Add purpose, qtnetworkauth. (source): Don't apply patch. * gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch: Remove (no longer needed). --- gnu/local.mk | 1 - gnu/packages/kde-internet.scm | 7 +- .../choqok-Fix-building-under-Qt-5.13.patch | 89 ---------------------- 3 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2289518e5..c26ea40a90 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -774,7 +774,6 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ - %D%/packages/patches/choqok-Fix-building-under-Qt-5.13.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 0d5b9788b8..12aa9fe53a 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -51,7 +51,7 @@ (define-module (gnu packages kde-internet) (define-public choqok (package (name "choqok") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch) @@ -59,8 +59,7 @@ (define-public choqok (version-major+minor version) "/src/choqok-" version ".tar.xz")) (sha256 - (base32 "03ri4y1wzyqlixnhczsls5gmy7jzzm67bb5gz8bav51ngc32fxca")) - (patches (search-patches "choqok-Fix-building-under-Qt-5.13.patch")))) + (base32 "0zm4nkpmvd181xlkis7ydzx54p3vn0zgpdzgh54f1hsjy6ahsq16")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -86,9 +85,11 @@ (define-public choqok ("kxmlgui" ,kxmlgui) ;; TODO: telepathy ("oxygen-icons" ,oxygen-icons) ; default icon set + ("purpose" ,purpose) ("qca" ,qca) ("qoauth" ,qoauth) ("qtbase" ,qtbase) + ("qtnetworkauth" ,qtnetworkauth) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) (home-page "https://kde.org/applications/internet/org.kde.choqok") diff --git a/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch b/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch deleted file mode 100644 index 4250106a19..0000000000 --- a/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch +++ /dev/null @@ -1,89 +0,0 @@ -Add QMap include to fix building under Qt 5.13 - -This combines several patches which all add the same missing include: -- e13ab06f65a4e8b6259bccda1401abb9c1c9fdca -- 546ede9ef712bb1b156a55ce30df81c3203dde61 -- 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb -- bef6784596bf0b41287ebad81f138e1c8c2a6be2 - -Include is no longer added transitively. ---- - ---- a/plugins/betternotify/notify.h -+++ b/plugins/betternotify/notify.h -@@ -23,6 +23,7 @@ - #ifndef NOTIFY_H - #define NOTIFY_H - -+#include - #include - #include - #include ---- a/plugins/untiny/untiny.h -+++ b/plugins/untiny/untiny.h -@@ -27,6 +27,7 @@ - - #include "plugin.h" - -+#include - #include - #include - #include ---- a/plugins/uploaders/flickr/flickr.h -+++ b/plugins/uploaders/flickr/flickr.h -@@ -26,6 +26,8 @@ - - #include "uploader.h" - -+#include -+ - /** - @author Andrey Esin \ - */ -diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h -index d9ddc88..63d0e3f 100644 ---- a/plugins/uploaders/imageshack/imageshack.h -+++ b/plugins/uploaders/imageshack/imageshack.h -@@ -26,6 +26,8 @@ - - #include "uploader.h" - -+#include -+ - /** - @author Mehrdad Momeny \ - */ ---- a/plugins/uploaders/mobypicture/mobypicture.h -+++ b/plugins/uploaders/mobypicture/mobypicture.h -@@ -26,6 +26,8 @@ - - #include "uploader.h" - -+#include -+ - class KJob; - - class Mobypicture : public Choqok::Uploader ---- a/plugins/uploaders/posterous/posterous.h -+++ b/plugins/uploaders/posterous/posterous.h -@@ -26,6 +26,8 @@ - - #include "uploader.h" - -+#include -+ - class KJob; - - class Posterous : public Choqok::Uploader ---- a/plugins/uploaders/twitgoo/twitgoo.h -+++ b/plugins/uploaders/twitgoo/twitgoo.h -@@ -26,6 +26,8 @@ - - #include "uploader.h" - -+#include -+ - class KJob; - - class Twitgoo : public Choqok::Uploader --- -- cgit v1.2.3 From 9137e66ba98f2cb2d150be503db9827c6ba3f443 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:03:12 +0100 Subject: gnu: ghc-tagsoup: Update home page. * gnu/packages/haskell-web.scm (ghc-tagsoup)[home-page]: Use new (HTTPS) URI --- gnu/packages/haskell-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index e5ec572e1d..c545a9928b 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -52,7 +52,7 @@ (define-public ghc-tagsoup (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://community.haskell.org/~ndm/tagsoup/") + (home-page "https://github.com/ndmitchell/tagsoup") (synopsis "Parsing and extracting information from (possibly malformed) HTML/XML documents") -- cgit v1.2.3 From 60783303ed211be287fc6224a89a3edafaeab436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:03:15 +0100 Subject: gnu: ruby-thin: Update home page. * gnu/packages/ruby.scm (ruby-thin)[home-page]: Use new (HTTPS) URI. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 98868cdda3..56885fcde3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8708,7 +8708,7 @@ (define-public ruby-thin and stability, @item Rack, a minimal interface between webservers and Ruby frameworks. @end itemize\n") - (home-page "http://code.macournoyer.com/thin/") + (home-page "https://github.com/macournoyer/thin") (license license:ruby))) (define-public ruby-skinny -- cgit v1.2.3 From 2b62f5d0f7a8a965533a7d2c95e707d8a5793b33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:09:51 +0100 Subject: gnu: ghc-xml: Update home page. Before code.galois.com vanished, it redirected here. * gnu/packages/haskell-xyz.scm (ghc-xml)[home-page]: Use new (HTTPS) URI. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f9644ecd9a..885876d77b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -13224,7 +13224,7 @@ (define-public ghc-xml (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) - (home-page "http://code.galois.com") + (home-page "https://github.com/GaloisInc/xml") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") (license license:bsd-3))) -- cgit v1.2.3 From 1b4d40cf7b3c38a1e17cd921e2ee9fd60ffcdedf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:12:19 +0100 Subject: gnu: java-plexus-utils: Use HTTPS home page. * gnu/packages/java.scm (java-plexus-utils)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9cbee0df43..9371901e1f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3578,7 +3578,7 @@ (define-public java-plexus-utils (native-inputs `(("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit))) - (home-page "http://codehaus-plexus.github.io/plexus-utils/") + (home-page "https://codehaus-plexus.github.io/plexus-utils/") (synopsis "Common utilities for the Plexus framework") (description "This package provides various Java utility classes for the Plexus framework to ease working with strings, files, command lines, XML and -- cgit v1.2.3 From f0db77796b372e0375bdb8f6a96f77f3c374546c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:13:14 +0100 Subject: gnu: ecl-clx: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (ecl-clx)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ed074b766..114a83e966 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -603,7 +603,7 @@ (define-public sbcl-clx (build-system asdf-build-system/sbcl) (native-inputs `(("fiasco" ,sbcl-fiasco))) - (home-page "http://www.cliki.net/portable-clx") + (home-page "https://www.cliki.net/portable-clx") (synopsis "X11 client library for Common Lisp") (description "CLX is an X11 client library for Common Lisp. The code was originally taken from a CMUCL distribution, was modified somewhat in order to -- cgit v1.2.3 From d5840fec16ee8f0b0efbd4d2323b56dfb68358a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:13:47 +0100 Subject: gnu: emacs-recent-addresses: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-recent-addresses)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fca6b58b80..96398ff3c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16056,7 +16056,7 @@ (define-public emacs-recent-addresses (revision "1")) (package (name "emacs-recent-addresses") - (home-page "http://nschum.de/src/emacs/recent-addresses/") + (home-page "https://nschum.de/src/emacs/recent-addresses/") (version (git-version "0.1" revision commit)) (source (origin (method git-fetch) -- cgit v1.2.3 From 3ef91e15344c6cade77e27d9c0f7167fc0c83632 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:19:31 +0100 Subject: gnu: Use HTTPS for hackage.haskell.org home pages. * gnu/packages/haskell-xyz.scm (ghc-network-byte-order) (ghc-base-compat-batteries, ghc-regex-tdfa-text, ghc-sdl2-image) (ghc-language-glsl, ghc-sop-core, ghc-libffi, ghc-path, ghc-io-streams) (ghc-openssl-streams, ghc-haskell-lexer, ghc-prettyclass, ghc-ifelse) (ghc-sdl2-mixer, ghc-errorcall-eq-instance, ghc-filepath-bytestring) (ghc-refact, ghc-pointedlist, ghc-string-qq, ghc-tls-session-manager) (ghc-magic, ghc-exactprint, ghc-inline-c, ghc-infer-license) (ghc-unagi-chan)[home-page]: Use HTTPS. --- gnu/packages/haskell-crypto.scm | 2 +- gnu/packages/haskell-web.scm | 2 +- gnu/packages/haskell-xyz.scm | 46 ++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 6467e9bbca..4170ec82f0 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -827,7 +827,7 @@ (define-public ghc-openssl-streams `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "http://hackage.haskell.org/package/openssl-streams") + (home-page "https://hackage.haskell.org/package/openssl-streams") (synopsis "OpenSSL network support for io-streams") (description "This library contains io-streams routines for secure networking using OpenSSL (by way of HsOpenSSL).") diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index c545a9928b..acdc1447a4 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -620,7 +620,7 @@ (define-public ghc-tls-session-manager ("ghc-clock" ,ghc-clock) ("ghc-psqueues" ,ghc-psqueues) ("ghc-tls" ,ghc-tls))) - (home-page "http://hackage.haskell.org/package/tls-session-manager") + (home-page "https://hackage.haskell.org/package/tls-session-manager") (synopsis "In-memory TLS session manager") (description "This Haskell library provides a TLS session manager with limitation, automatic pruning, energy saving and replay resistance.") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 885876d77b..e368082c03 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -790,7 +790,7 @@ (define-public ghc-base-compat-batteries (arguments `(#:cabal-revision ("1" "15sn2qc8k0hxbb2nai341kkrci98hlhzcj2ci087m0zxcg5jcdbp"))) - (home-page "http://hackage.haskell.org/package/base-compat-batteries") + (home-page "https://hackage.haskell.org/package/base-compat-batteries") (synopsis "base-compat with extra batteries") (description "This library provides functions available in later versions of @code{base} to a wider range of compilers, without requiring @@ -3577,7 +3577,7 @@ (define-public ghc-errorcall-eq-instance `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) - (home-page "http://hackage.haskell.org/package/errorcall-eq-instance") + (home-page "https://hackage.haskell.org/package/errorcall-eq-instance") (synopsis "Orphan Eq instance for ErrorCall") (description "Prior to @code{base-4.7.0.0} there was no @code{Eq} instance for @code{ErrorCall}. @@ -3693,7 +3693,7 @@ (define-public ghc-exactprint ("ghc-silently" ,ghc-silently) ("ghc-filemanip" ,ghc-filemanip))) (home-page - "http://hackage.haskell.org/package/ghc-exactprint") + "https://hackage.haskell.org/package/ghc-exactprint") (synopsis "ExactPrint for GHC") (description "Using the API Annotations available from GHC 7.10.2, this library @@ -4018,7 +4018,7 @@ (define-public ghc-filepath-bytestring (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://hackage.haskell.org/package/filepath-bytestring") + (home-page "https://hackage.haskell.org/package/filepath-bytestring") (synopsis "Library for manipulating RawFilePaths in a cross-platform way") (description "This package provides a drop-in replacement for the standard @code{filepath} library, operating on @code{RawFilePath} values rather than @@ -5056,7 +5056,7 @@ (define-public ghc-haskell-lexer (sha256 (base32 "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/haskell-lexer") + (home-page "https://hackage.haskell.org/package/haskell-lexer") (synopsis "Fully compliant Haskell 98 lexer") (description "This package provides a fully compliant Haskell 98 lexer.") @@ -5792,7 +5792,7 @@ (define-public ghc-ifelse (base32 "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/IfElse") + (home-page "https://hackage.haskell.org/package/IfElse") (synopsis "Monadic control flow with anaphoric variants") (description "This library provides functions for control flow inside of monads with anaphoric variants on @code{if} and @code{when} and a C-like @@ -5845,7 +5845,7 @@ (define-public ghc-infer-license (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) - (home-page "http://hackage.haskell.org/package/infer-license") + (home-page "https://hackage.haskell.org/package/infer-license") (synopsis "Infer software license from a given license file") (description "This library provides tools to infer a software license from a given license file.") @@ -5876,7 +5876,7 @@ (define-public ghc-inline-c ("ghc-hspec" ,ghc-hspec) ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) ("ghc-regex-posix" ,ghc-regex-posix))) - (home-page "http://hackage.haskell.org/package/inline-c") + (home-page "https://hackage.haskell.org/package/inline-c") (synopsis "Write Haskell source files including C code inline") (description "inline-c lets you seamlessly call C libraries and embed high-performance @@ -6100,7 +6100,7 @@ (define-public ghc-io-streams ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-zlib" ,ghc-zlib))) - (home-page "http://hackage.haskell.org/package/io-streams") + (home-page "https://hackage.haskell.org/package/io-streams") (synopsis "Simple and composable stream I/O") (description "This library contains simple and easy-to-use primitives for I/O using streams.") @@ -6341,7 +6341,7 @@ (define-public ghc-language-glsl `(#:tests? #f #:cabal-revision ("1" "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5"))) - (home-page "http://hackage.haskell.org/package/language-glsl") + (home-page "https://hackage.haskell.org/package/language-glsl") (synopsis "GLSL abstract syntax tree, parser, and pretty-printer") (description "This package is a Haskell library for the representation, parsing, and pretty-printing of GLSL 1.50 code.") @@ -6445,7 +6445,7 @@ (define-public ghc-libffi (build-system haskell-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libffi" ,libffi))) - (home-page "http://hackage.haskell.org/package/libffi") + (home-page "https://hackage.haskell.org/package/libffi") (synopsis "Haskell binding to libffi") (description "A binding to libffi, allowing C functions of types only known at runtime @@ -6899,7 +6899,7 @@ (define-public ghc-magic (base32 "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/magic") + (home-page "https://hackage.haskell.org/package/magic") (synopsis "Interface to C file/magic library") (description "This package provides a full-featured binding to the C libmagic library. @@ -7786,7 +7786,7 @@ (define-public ghc-network-byte-order (build-system haskell-build-system) (native-inputs `(("ghc-doctest" ,ghc-doctest))) - (home-page "http://hackage.haskell.org/package/network-byte-order") + (home-page "https://hackage.haskell.org/package/network-byte-order") (synopsis "Network byte order utilities") (description "This library provides peek and poke functions for network byte order.") @@ -8568,7 +8568,7 @@ (define-public ghc-path ("ghc-hspec" ,ghc-hspec) ("ghc-validity" ,ghc-validity))) (home-page - "http://hackage.haskell.org/package/path") + "https://hackage.haskell.org/package/path") (synopsis "Support for well-typed paths") (description "This package introduces a type for paths upholding useful invariants.") @@ -8851,7 +8851,7 @@ (define-public ghc-pointedlist "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/pointedlist") + "https://hackage.haskell.org/package/pointedlist") (synopsis "Zipper-like comonad which works as a list, tracking a position") (description @@ -8946,7 +8946,7 @@ (define-public ghc-prettyclass (base32 "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/prettyclass") + (home-page "https://hackage.haskell.org/package/prettyclass") (synopsis "Pretty printing class similar to Show") (description "This package provides a pretty printing class similar to @code{Show}, based on the HughesPJ pretty printing library. It @@ -9313,7 +9313,7 @@ (define-public ghc-refact (base32 "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/refact") + (home-page "https://hackage.haskell.org/package/refact") (synopsis "Specify refactorings to perform with apply-refact") (description "This library provides a datatype which can be interpreted by @@ -9581,7 +9581,7 @@ (define-public ghc-regex-tdfa-text `(("ghc-regex-base" ,ghc-regex-base) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page - "http://hackage.haskell.org/package/regex-tdfa-text") + "https://hackage.haskell.org/package/regex-tdfa-text") (synopsis "Text interface for regex-tdfa") (description "This provides an extra text interface for regex-tdfa.") @@ -10098,7 +10098,7 @@ (define-public ghc-sdl2-image ("sdl2-image" ,sdl2-image))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2-image") + (home-page "https://hackage.haskell.org/package/sdl2-image") (synopsis "Bindings to SDL2_image") (description "This package provides Haskell bindings to @code{SDL2_image}.") @@ -10126,7 +10126,7 @@ (define-public ghc-sdl2-mixer ("sdl2-mixer" ,sdl2-mixer))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (home-page "https://hackage.haskell.org/package/sdl2-mixer") (synopsis "Bindings to SDL2 mixer") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") @@ -10630,7 +10630,7 @@ (define-public ghc-sop-core (base32 "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/sop-core") + (home-page "https://hackage.haskell.org/package/sop-core") (synopsis "True Sums of Products") (description "This package provides an implementation of @math{n}-ary sums and @math{n}-ary products. The module @code{Data.SOP} @@ -11084,7 +11084,7 @@ (define-public ghc-string-qq (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) - (home-page "http://hackage.haskell.org/package/string-qq") + (home-page "https://hackage.haskell.org/package/string-qq") (synopsis "QuasiQuoter for non-interpolated strings, texts and bytestrings.") (description @@ -12213,7 +12213,7 @@ (define-public ghc-unagi-chan #:cabal-revision ("1" "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6"))) - (home-page "http://hackage.haskell.org/package/unagi-chan") + (home-page "https://hackage.haskell.org/package/unagi-chan") (synopsis "Fast concurrent queues with a Chan-like API, and more") (description "This library provides implementations of concurrent FIFO queues (for -- cgit v1.2.3 From 3c4c60fa79aac43aa31c1d27732b067ad3842528 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Feb 2020 21:20:43 +0100 Subject: gnu: bind: Update to 9.16.0. * gnu/packages/dns.scm (isc-bind): Update to 9.16.0. [inputs]: Add libuv. [native-inputs]: Add pkg-config. Remove net-tools. [arguments]: Remove obsolete --with-openssl= from #:configure-flags. --- gnu/packages/dns.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b23a7fc9d5..192761b42e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -114,32 +114,32 @@ (define-public dnsmasq (define-public isc-bind (package (name "bind") - (version "9.14.10") + (version "9.16.0") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/bind9/" version - "/bind-" version ".tar.gz")) + "/bind-" version ".tar.xz")) (sha256 (base32 - "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa")))) + "0a1f1wrlbnmq79q6s15fny36ip81malg6wlr8acp7amimsyxjjxg")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs ;; It would be nice to add GeoIP and gssapi once there are packages. `(("libcap" ,libcap) + ("libuv" ,libuv) ("libxml2" ,libxml2) ("openssl" ,openssl) ("p11-kit" ,p11-kit) ("python" ,python) ("python-ply" ,python-ply))) - (native-inputs `(("perl" ,perl) - ("net-tools" ,net-tools))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - (list (string-append "--with-openssl=" - (assoc-ref %build-inputs "openssl")) - (string-append "--with-pkcs11=" + (list (string-append "--with-pkcs11=" (assoc-ref %build-inputs "p11-kit"))) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 1708ed6e9d778795558ea4a2fd949270abd79797 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Feb 2020 18:21:55 +0100 Subject: marionette: 'wait-for' procedures no longer leak a port. * gnu/build/marionette.scm (wait-for-tcp-port): Close SOCK upon success. (wait-for-unix-socket): Likewise. --- gnu/build/marionette.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 1dbe385e89..a9dbce538f 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. @@ -204,6 +204,7 @@ (define* (wait-for-tcp-port port marionette (catch 'system-error (lambda () (connect sock AF_INET INADDR_LOOPBACK ,port) + (close-port sock) 'success) (lambda args (if (< i ,timeout) @@ -227,6 +228,7 @@ (define* (wait-for-unix-socket file-name marionette (catch 'system-error (lambda () (connect sock AF_UNIX ,file-name) + (close-port sock) 'success) (lambda args (if (< i ,timeout) -- cgit v1.2.3 From b6ec284fe8b67bba4b17aab98641a91a17658133 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Feb 2020 15:04:17 +0100 Subject: marionette: Provide portable US-layout keystrokes for "<" and ">". * gnu/build/marionette.scm (%qwerty-us-keystrokes): Use shit-comma and shift-dot for #\< and #\> because the "less" key doesn't work the same in "US intl." layouts. --- gnu/build/marionette.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index a9dbce538f..fe754cd147 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -317,8 +317,8 @@ (define %qwerty-us-keystrokes (#\( . "shift-9") (#\) . "shift-0") (#\/ . "slash") - (#\< . "less") - (#\> . "shift-less") + (#\< . "shift-comma") + (#\> . "shift-dot") (#\. . "dot") (#\, . "comma") (#\; . "semicolon") -- cgit v1.2.3 From 2cf65e1d543407bc7db43e7c7d39a215907efebc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Feb 2020 18:23:19 +0100 Subject: installer: Add 'syslog' macro to write to syslog. * gnu/installer/utils.scm (open-syslog-port, syslog-port): New procedures. (syslog): New macro. --- gnu/installer/utils.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index ddb96bc338..a5f390e7a2 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,12 +24,16 @@ (define-module (gnu installer utils) #:use-module (srfi srfi-34) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) + #:use-module (ice-9 format) #:use-module (ice-9 textual-ports) #:export (read-lines read-all nearest-exact-integer read-percentage - run-shell-command)) + run-shell-command + + syslog-port + syslog)) (define* (read-lines #:optional (port (current-input-port))) "Read lines from PORT and return them as a list." @@ -91,3 +95,38 @@ (define (pause) (newline) (pause) #t)))) + + +;;; +;;; Logging. +;;; + +(define (open-syslog-port) + "Return an open port (a socket) to /dev/log or #f if that wasn't possible." + (let ((sock (socket AF_UNIX SOCK_DGRAM 0))) + (catch 'system-error + (lambda () + (connect sock AF_UNIX "/dev/log") + (setvbuf sock 'line) + sock) + (lambda args + (close-port sock) + #f)))) + +(define syslog-port + (let ((port #f)) + (lambda () + "Return an output port to syslog." + (unless port + (set! port (open-syslog-port))) + (or port (%make-void-port "w"))))) + +(define-syntax syslog + (lambda (s) + "Like 'format', but write to syslog." + (syntax-case s () + ((_ fmt args ...) + (string? (syntax->datum #'fmt)) + (with-syntax ((fmt (string-append "installer[~d]: " + (syntax->datum #'fmt)))) + #'(format (syslog-port) fmt (getpid) args ...)))))) -- cgit v1.2.3 From 5c04b00cf463a543b8ffc9eb55991f6b4cc145dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 Feb 2020 12:08:40 +0100 Subject: installer: Log important bits to syslog. * gnu/installer.scm (installer-program): Log crashes with 'syslog'. * gnu/installer/parted.scm (luks-format-and-open, luks-close) (mount-user-partitions, umount-user-partitions): Add 'syslog' calls. * gnu/installer/steps.scm (run-installer-steps): Log the running step with 'syslog'. * gnu/installer/utils.scm (run-shell-command): Add calls to 'syslog'. --- gnu/installer.scm | 5 ++++- gnu/installer/parted.scm | 7 ++++++- gnu/installer/steps.scm | 1 + gnu/installer/utils.scm | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 3f4ae4bf53..edef3fde62 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Mathieu Othacehe -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -26,6 +26,7 @@ (define-module (gnu installer) #:use-module (guix utils) #:use-module (guix ui) #:use-module ((guix self) #:select (make-config.scm)) + #:use-module (gnu installer utils) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -395,6 +396,8 @@ (define results #f))) (const #f) (lambda (key . args) + (syslog "crashing due to uncaught exception: ~s ~s~%" + key args) (let ((error-file "/tmp/last-installer-error")) (call-with-output-file error-file (lambda (port) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index c2b02c9281..6c805cc053 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Mathieu Othacehe -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -1070,6 +1070,8 @@ (define (luks-format-and-open user-partition) (call-with-luks-key-file password (lambda (key-file) + (syslog "formatting and opening LUKS entry ~s at ~s~%" + label file-name) (system* "cryptsetup" "-q" "luksFormat" file-name key-file) (system* "cryptsetup" "open" "--type" "luks" "--key-file" key-file file-name label))))) @@ -1077,6 +1079,7 @@ (define (luks-format-and-open user-partition) (define (luks-close user-partition) "Close the encrypted partition pointed by USER-PARTITION." (let ((label (user-partition-crypt-label user-partition))) + (syslog "closing LUKS entry ~s~%" label) (system* "cryptsetup" "close" label))) (define (format-user-partitions user-partitions) @@ -1150,6 +1153,7 @@ (define (mount-user-partitions user-partitions) (file-name (user-partition-upper-file-name user-partition))) (mkdir-p target) + (syslog "mounting ~s on ~s~%" file-name target) (mount file-name target mount-type))) sorted-partitions))) @@ -1165,6 +1169,7 @@ (define (umount-user-partitions user-partitions) (target (string-append (%installer-target-dir) mount-point))) + (syslog "unmounting ~s~%" target) (umount target) (when crypt-label (luks-close user-partition)))) diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 4e90f32f95..b2fc819d89 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -177,6 +177,7 @@ (define* (run result #:key todo-steps done-steps) #:done-steps '()))))) ((installer-step-break? c) (reverse result))) + (syslog "running step '~a'~%" (installer-step-id step)) (let* ((id (installer-step-id step)) (compute (installer-step-compute step)) (res (compute result done-steps))) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index a5f390e7a2..842bd02ced 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -89,9 +89,13 @@ (define (pause) (format (current-error-port) (G_ "Command failed with exit code ~a.~%") (invoke-error-exit-status c)) + (syslog "command ~s failed with exit code ~a" + command (invoke-error-exit-status c)) (pause) #f)) + (syslog "running command ~s~%" command) (invoke "bash" "--init-file" file) + (syslog "command ~s succeeded~%" command) (newline) (pause) #t)))) -- cgit v1.2.3 From 43e282accc17c8ff2156448e4e8fdd0d04d7ba1c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Feb 2020 20:49:46 +0100 Subject: tests: Factorize LUKS passphrase. * gnu/tests/install.scm (%luks-passphrase): New variable. (%encrypted-root-installation-script): Use it. (enter-luks-passphrase): Use it. --- gnu/tests/install.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index d475bda2c7..335efbd468 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -651,9 +651,13 @@ (define-os-with-source (%encrypted-root-os %encrypted-root-os-source) (guix combinators))))) %base-services)))) +(define %luks-passphrase + ;; LUKS encryption passphrase used in tests. + "thepassphrase") + (define %encrypted-root-installation-script ;; Shell script of a simple installation. - "\ + (string-append "\ . /etc/profile set -e -x guix --version @@ -665,9 +669,9 @@ (define %encrypted-root-installation-script mkpart primary ext2 3M 1.4G \\ set 1 boot on \\ set 1 bios_grub on -echo -n thepassphrase | \\ +echo -n " %luks-passphrase " | \\ cryptsetup luksFormat --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb2 - -echo -n thepassphrase | \\ +echo -n " %luks-passphrase " | \\ cryptsetup open --type luks --key-file - /dev/vdb2 the-root-device mkfs.ext4 -L my-root /dev/mapper/the-root-device mount LABEL=my-root /mnt @@ -677,7 +681,7 @@ (define %encrypted-root-installation-script guix system build /mnt/etc/config.scm guix system init /mnt/etc/config.scm /mnt --no-substitutes sync -reboot\n") +reboot\n")) (define (enter-luks-passphrase marionette) "Return a gexp to be inserted in the basic system test running on MARIONETTE @@ -698,7 +702,8 @@ (define (bios-boot-screen? text) ;; when the passphrase should be entered. (wait-for-screen-text #$marionette passphrase-prompt? #:ocrad #$ocrad) - (marionette-type "thepassphrase\n" #$marionette) + (marionette-type #$(string-append %luks-passphrase "\n") + #$marionette) ;; Now wait until we leave the boot screen. This is necessary so ;; we can then be sure we match the "Enter passphrase" prompt from @@ -714,7 +719,8 @@ (define (bios-boot-screen? text) (wait-for-screen-text #$marionette passphrase-prompt? #:ocrad #$ocrad #:timeout 60) - (marionette-type "thepassphrase\n" #$marionette) + (marionette-type #$(string-append %luks-passphrase "\n") + #$marionette) ;; Take a screenshot for debugging purposes. (marionette-control (string-append "screendump " #$output -- cgit v1.2.3 From 378918725259d221222dd0b1831fbaa3e0a17e1f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 20 Feb 2020 12:36:10 +0100 Subject: build: Depend on guile-ssh 0.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 35f35111678e6622301b414f3d464acb71e106bb. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Check for userauth-gssapi! * doc/guix.texi: Document version requirement Signed-off-by: Ludovic Courtès --- doc/guix.texi | 4 ++-- m4/guix.m4 | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1349d9b27a..a66bb3d646 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -772,11 +772,11 @@ The following dependencies are optional: @itemize @item -@c Note: We need at least 0.10.2 for 'channel-send-eof'. +@c Note: We need at least 0.12.0 for 'userauth-gssapi!'. Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, -version 0.10.2 or later. +version 0.12.0 or later. @item When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib diff --git a/m4/guix.m4 b/m4/guix.m4 index 8be7cca54f..961ce838ac 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,13 +142,14 @@ dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ - dnl Check whether 'channel-send-eof' (introduced in 0.10.2) is present. + dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], [guix_cv_have_recent_guile_ssh], [GUILE_CHECK([retval], [(and (@ (ssh channel) channel-send-eof) (@ (ssh popen) open-remote-pipe) - (@ (ssh dist node) node-eval))]) + (@ (ssh dist node) node-eval) + (@ (ssh auth) userauth-gssapi!))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else -- cgit v1.2.3 From 4cb63a564d413c745983a608790a943ac07f8d67 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 22 Feb 2020 00:40:30 +0100 Subject: deduplication: Use nix-base32 encoding for link names. Fixes . * guix/store/deduplication.scm (deduplicate): Use 'bytevector->nix-base32-string' instead of 'bytevector->base16-string'. --- guix/store/deduplication.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm index d42c40932c..80868692c0 100644 --- a/guix/store/deduplication.scm +++ b/guix/store/deduplication.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Caleb Ristvedt -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +23,7 @@ (define-module (guix store deduplication) #:use-module (gcrypt hash) #:use-module (guix build utils) - #:use-module (guix base16) + #:use-module (guix base32) #:use-module (srfi srfi-11) #:use-module (rnrs io ports) #:use-module (ice-9 ftw) @@ -140,7 +140,7 @@ (define* (deduplicate path hash #:key (store %store-directory)) under STORE." (let* ((links-directory (string-append store "/.links")) (link-file (string-append links-directory "/" - (bytevector->base16-string hash)))) + (bytevector->nix-base32-string hash)))) (mkdir-p links-directory) (if (eq? 'directory (stat:type (lstat path))) ;; Can't hardlink directories, so hardlink their atoms. -- cgit v1.2.3 From 447f834263a26fe62d86f1a655ba01b88efeafde Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 22 Feb 2020 00:48:27 +0100 Subject: git-authenticate: Store the sub-key fingerprint of mab. This is a followup to 76a8dc3ee289ac4f4b984a3d9d2dcb9d89c01eda, signed with this sub-key. * build-aux/git-authenticate.scm (%committers): Store the sub-key fingerprint of mab. --- build-aux/git-authenticate.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index aa9103a372..8d05f0ee40 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -134,7 +134,8 @@ (define %committers ("lsl88" "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") ("mab" - "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") + ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("marusich" "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") ("mbakke" -- cgit v1.2.3 From cfc9004e3fa7128f0972aa2d4b6653b962771b4d Mon Sep 17 00:00:00 2001 From: Dimakakos Dimos Date: Sat, 22 Feb 2020 00:28:40 +0100 Subject: gnu: Add cl-clss. * gnu/packages/lisp-xyz.scm (cl-clss, sbcl-clss, ecl-clss): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 114a83e966..aeeb90e76c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen +;;; Copyright © 2020 Dimakis Dimakakos ;;; ;;; This file is part of GNU Guix. ;;; @@ -10645,3 +10646,35 @@ (define-public cl-pzmq (define-public ecl-pzmq (sbcl-package->ecl-package sbcl-pzmq)) + +(define-public sbcl-clss + (let ((revision "1") + (commit "2a8e8615ab55870d4ca01928f3ed3bbeb4e75c8d")) + (package + (name "sbcl-clss") + (version (git-version "0.3.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/clss.git") + (commit commit))) + (sha256 + (base32 "0la4dbcda78x29szanylccrsljqrn9d1mhh569sqkyp44ni5fv91")) + (file-name (git-file-name name version)))) + (inputs + `(("array-utils" ,sbcl-array-utils) + ("plump" ,sbcl-plump))) + (build-system asdf-build-system/sbcl) + (synopsis "DOM tree searching engine based on CSS selectors") + (description "CLSS is a DOM traversal engine based on CSS +selectors. It makes use of the Plump-DOM and is used by lQuery.") + (home-page "https://github.com/Shinmera/clss") + (license license:zlib)))) + +(define-public cl-clss + (sbcl-package->cl-source-package sbcl-clss)) + +(define-public ecl-clss + (sbcl-package->ecl-package sbcl-clss)) -- cgit v1.2.3 From eb85995738e4cf8098b9b16a0ddd84bdd02704cb Mon Sep 17 00:00:00 2001 From: Dimakakos Dimos Date: Sat, 22 Feb 2020 00:29:35 +0100 Subject: gnu: Add cl-lquery. * gnu/packages/lisp-xyz.scm (sbcl-lquery, cl-lquery, ecl-lquery): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index aeeb90e76c..897980ab34 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10678,3 +10678,43 @@ (define-public cl-clss (define-public ecl-clss (sbcl-package->ecl-package sbcl-clss)) + +(define-public sbcl-lquery + (let ((revision "1") + (commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d")) + (package + (name "sbcl-lquery") + (version (git-version "3.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Shinmera/lquery.git") + (commit commit))) + (sha256 + (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w")) + (file-name (git-file-name name version)))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("array-utils" ,sbcl-array-utils) + ("form-fiddle" ,sbcl-form-fiddle) + ("plump" ,sbcl-plump) + ("clss" ,sbcl-clss))) + (build-system asdf-build-system/sbcl) + (synopsis "Library to allow jQuery-like HTML/DOM manipulation") + (description "@code{lQuery} is a DOM manipulation library written in +Common Lisp, inspired by and based on the jQuery syntax and +functions. It uses Plump and CLSS as DOM and selector engines. The +main idea behind lQuery is to provide a simple interface for crawling +and modifying HTML sites, as well as to allow for an alternative +approach to templating.") + (home-page "https://github.com/Shinmera/lquery") + (license license:zlib)))) + +(define-public cl-lquery + (sbcl-package->cl-source-package sbcl-lquery)) + +(define-public ecl-lquery + (sbcl-package->ecl-package sbcl-lquery)) -- cgit v1.2.3 From 3d1e42321f091b815835e28b54b37b7e9c79b9bb Mon Sep 17 00:00:00 2001 From: Matt Wette Date: Sat, 22 Feb 2020 11:48:29 +0100 Subject: import: github: Use HTTP "Authorization" header for access tokens. Fixes . The "access_token" query parameter is now deprecated: https://developer.github.com/changes/2019-11-05-deprecated-passwords-and-authorizations-api/#authenticating-using-query-parameters * guix/import/github.scm (fetch-releases-or-tags)[headers]: Add "Authorization" header when (%github-token) is true. [decorate]: Remove, and remove callers. --- guix/import/github.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index df5f6ff32f..7136e7a34f 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -154,18 +154,16 @@ (define headers ;; Ask for version 3 of the API as suggested at ;; . `((Accept . "application/vnd.github.v3+json") - (user-agent . "GNU Guile"))) + (user-agent . "GNU Guile") + ,@(if (%github-token) + `((Authorization . ,(string-append "token " (%github-token)))) + '()))) - (define (decorate url) - (if (%github-token) - (string-append url "?access_token=" (%github-token)) - url)) - - (match (json-fetch (decorate release-url) #:headers headers) + (match (json-fetch release-url #:headers headers) (#() ;; We got the empty list, presumably because the user didn't use GitHub's ;; "release" mechanism, but hopefully they did use Git tags. - (json-fetch (decorate tag-url) #:headers headers)) + (json-fetch tag-url #:headers headers)) (x x))) (define (latest-released-version url package-name) -- cgit v1.2.3 From e36826b2baed8ec39f968a6859584206160c46b8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Note Date: Sun, 9 Feb 2020 22:29:44 +0100 Subject: gnu: emacs-gnuplot: Install to site-lisp instead of guix.d. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . This is a followup to 65a7dd2950ca13a8b942b2836260a2192351b271. * gnu/packages/emacs-xyz.scm (emacs-gnuplot)[arguments]: Change ELISP-DIR. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 96398ff3c8..3a026bec9a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9763,8 +9763,7 @@ (define-public emacs-gnuplot (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) (arguments - (let ((elisp-dir (string-append "/share/emacs/site-lisp/guix.d" - "/gnuplot-" version))) + (let ((elisp-dir "/share/emacs/site-lisp")) `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) -- cgit v1.2.3 From 582a79d3a9593d969757ec398c84ef8d63a94fb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Feb 2020 03:40:44 +0100 Subject: gnu: Add unoconv. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (unoconv): New public variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/libreoffice.scm | 60 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b2f18984ad..e7878ea014 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -31,11 +31,12 @@ (define-module (gnu packages libreoffice) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) - #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 + #:select (gpl2 gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 non-copyleft x11-style bsd-3)) #:use-module (guix packages) #:use-module (guix utils) @@ -141,6 +142,63 @@ (define-public orcus CSV, CSS and XML.") (license mpl2.0))) +(define-public unoconv + (package + (name "unoconv") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "unoconv" version)) + (sha256 + (base32 "0cb0bvyxib3xrj0jdgizhp6p057lr8kqnd3n921rin37ivcvz3ih")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'stop-hash-sniffing + ;; Fixes . + ;; Submitted upsteam: . + (lambda _ + (substitute* "unoconv" + (("sys.argv\\[0\\]\\.split\\('2'\\)") + "os.path.basename(sys.argv[0]).split('2')")) + #t)) + (add-after 'unpack 'patch-find_offices + ;; find_offices is a convoluted cross-platform treasure hunt. + ;; Keep things simple and return the correct paths immediately. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((libreoffice (assoc-ref inputs "libreoffice"))) + (substitute* "unoconv" + (("def find_offices\\(\\):" match) + (string-append + match "\n" + " return [Office(" + "'" libreoffice "/lib/libreoffice', " + "'" libreoffice "/lib/libreoffice/program', " + "'" libreoffice "/lib/libreoffice/program', " + "'" libreoffice "/lib/libreoffice/program/pyuno.so', " + "'" libreoffice "/bin/soffice', " + "sys.executable, " + "None)]\n"))) + #t)))))) + (inputs + `(("libreoffice" ,libreoffice))) + (home-page "http://dag.wiee.rs/home-made/unoconv/") + (synopsis "Convert between any document format supported by LibreOffice") + (description + "Unoconv is a command-line utility to convert documents from any format +that LibreOffice can import, to any format it can export. It can be used for +batch processing and can apply custom style templates and filters. + +Unoconv converts between over a hundred formats, including Open Document +Format (@file{.odt}, @file{.ods}, @file{.odp})), Portable Document Format +(@file{.pdf}), HTML and XHTML, RTF, DocBook (@file{.xml}), @file{.doc} and +@file{.docx}), @file{.xls} and @file{.xlsx}). + +All required fonts must be installed on the converting system.") + (license gpl2))) + (define-public librevenge (package (name "librevenge") -- cgit v1.2.3 From 9a3971143854bf877c0739fc8fdf7b945a2e3935 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 22 Feb 2020 17:54:25 +0300 Subject: etc: Add copyright. * etc/copyright.el: New file. * doc/contributing.texi (The Perfect Setup): Document this. --- doc/contributing.texi | 27 +++++++++++++++++++++++++++ etc/copyright.el | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 etc/copyright.el diff --git a/doc/contributing.texi b/doc/contributing.texi index a0d0925941..9d45becf86 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -274,6 +274,33 @@ trigger string @code{origin...}, which can be expanded further. The @code{origin} snippet in turn may insert other trigger strings ending on @code{...}, which also can be expanded further. +@cindex insert or update copyright +@cindex @code{M-x guix-copyright} +@cindex @code{M-x copyright-update} +Additionaly we provide insertion and automatic update of a copyright in +@file{etc/copyright.el}. You may want to set your full name, mail, and +load a file. + +@lisp +(setq user-full-name "Alice Doe") +(setq user-mail-address "alice@@mail.org") +;; @r{Assuming the Guix checkout is in ~/src/guix.} +(load-file "~/src/guix/etc/copyright.el") +@end lisp + +To insert a copyright at the current line invoke @code{M-x guix-copyright}. + +To update a copyright you need to specify a @code{copyright-names-regexp}. + +@lisp +(setq copyright-names-regexp + (format "%s <%s>" user-full-name user-mail-address)) +@end lisp + +You can check if your copyright is up to date by evaluating @code{M-x +copyright-update}. If you want to do it automatically after each buffer +save then add @code{(add-hook 'after-save-hook 'copyright-update)} in +Emacs. @node Packaging Guidelines @section Packaging Guidelines diff --git a/etc/copyright.el b/etc/copyright.el new file mode 100644 index 0000000000..f5ed723cea --- /dev/null +++ b/etc/copyright.el @@ -0,0 +1,34 @@ +;;; copyright.el --- Insert a Guix copyright. + +;; Copyright © 2020 Oleg Pykhalov + +;; 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 this program. If not, see . + +;;; Commentary: + +;; This package provides skeleton to insert a copyright with `guix-copyright'. + +;;; Code: + +(define-skeleton guix-copyright + "Insert a copyright by $USER notice at cursor." + "FULL_NAME : " + comment-start + ";; Copyright © " `(format-time-string "%Y") " " + (or (format "%s <%s>" user-full-name user-mail-address) str) + comment-end) + +;;; copyright.el ends here -- cgit v1.2.3 From 7dc0f1d5a8c248addfcaadf76e45bf601bc51411 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Sat, 22 Feb 2020 17:38:29 +0100 Subject: gnu: qdbm: Fix segfault during tests. gnu/packages/databses.scm (qdbm): Add "CFLAGS=-fPIC" to make-flags. --- gnu/packages/databases.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 587d993918..0f023e0c46 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018 Julien Lepiller -;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017, 2020 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Arun Isaac @@ -1060,9 +1060,10 @@ (define-public qdbm "0gmpvhn02pkq280ffmn4da1g4mdr1xxz7l80b7y4n7km1mrzwrml")))) (build-system gnu-build-system) (arguments - `( #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib")))) + `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")) + #:make-flags (list "CFLAGS=-fPIC"))) (home-page "http://fallabs.com/qdbm") (synopsis "Key-value database") (description "QDBM is a library of routines for managing a -- cgit v1.2.3 From 5508d9a8d7b29ac9a1398ba5a0423523477803b4 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 20 Feb 2020 17:05:25 -0800 Subject: gnu: Add emacs-persp-mode. * gnu/packages/emacs-xyz.scm (emacs-persp-mode): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3a026bec9a..1247c01e63 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5259,6 +5259,28 @@ (define-public emacs-perspective ;; the Expat license. (license license:gpl3+))) +(define-public emacs-persp-mode + (package + (name "emacs-persp-mode") + (version "2.9.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Bad-ptr/persp-mode.el.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g")))) + (build-system emacs-build-system) + (home-page "https://github.com/Bad-ptr/persp-mode.el") + (synopsis "Switch between named \"perspectives\" shared among frames") + (description + "This package extends @code{perspective.el} to enable perspectives that +can be saved to and restored from a file.") + (license license:gpl2+))) + (define-public emacs-test-simple (package (name "emacs-test-simple") -- cgit v1.2.3 From 3ec74f9de94585f83ee8203e3022d036fe7bc0be Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:01:03 +0100 Subject: gnu: Add r-fracdiff. * gnu/packages/cran.scm (r-fracdiff): 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 b731ddc29e..71a7cc250e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19257,3 +19257,25 @@ (define-public r-adaptalint another. This makes it easier to find and correct the most important problems first.") (license license:gpl3))) + +(define-public r-fracdiff + (package + (name "r-fracdiff") + (version "1.5-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "fracdiff" version)) + (sha256 + (base32 + "1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q")))) + (properties `((upstream-name . "fracdiff"))) + (build-system r-build-system) + (home-page "https://github.com/mmaechler/fracdiff") + (synopsis + "Fractionally differenced ARIMA aka ARFIMA(P,d,q) models") + (description + "This package provides tools for the maximum likelihood estimation of the +parameters of a fractionally differenced ARIMA(p,d,q) model (Haslett and +Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") + (license license:gpl2+))) -- cgit v1.2.3 From dfecd5598e3d997a5729b228154f349c171dd03a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:04:16 +0100 Subject: gnu: Add r-forecast. * gnu/packages/cran.scm (r-forecast): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 71a7cc250e..9fb160ba34 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19279,3 +19279,39 @@ (define-public r-fracdiff parameters of a fractionally differenced ARIMA(p,d,q) model (Haslett and Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") (license license:gpl2+))) + +(define-public r-forecast + (package + (name "r-forecast") + (version "8.10") + (source + (origin + (method url-fetch) + (uri (cran-uri "forecast" version)) + (sha256 + (base32 + "0jccr2wg7sii38lyqrs58fkxf2az7nw6v0jya27hpbz9bg8ib3kr")))) + (properties `((upstream-name . "forecast"))) + (build-system r-build-system) + (propagated-inputs + `(("r-colorspace" ,r-colorspace) + ("r-fracdiff" ,r-fracdiff) + ("r-ggplot2" ,r-ggplot2) + ("r-lmtest" ,r-lmtest) + ("r-magrittr" ,r-magrittr) + ("r-nnet" ,r-nnet) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-timedate" ,r-timedate) + ("r-tseries" ,r-tseries) + ("r-urca" ,r-urca) + ("r-zoo" ,r-zoo))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; needed for vignettes + (home-page "https://pkg.robjhyndman.com/forecast/") + (synopsis "Forecasting functions for time series and linear models") + (description + "This package provides methods and tools for displaying and analysing +univariate time series forecasts including exponential smoothing via state +space models and automatic ARIMA modelling.") + (license license:gpl3))) -- cgit v1.2.3 From 532b318020748c035b43f83611899e4ba0875ae1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:06:29 +0100 Subject: gnu: Add r-xmisc. * gnu/packages/cran.scm (r-xmisc): 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 9fb160ba34..310b80a520 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19315,3 +19315,25 @@ (define-public r-forecast univariate time series forecasts including exponential smoothing via state space models and automatic ARIMA modelling.") (license license:gpl3))) + +(define-public r-xmisc + (package + (name "r-xmisc") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "Xmisc" version)) + (sha256 + (base32 + "11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1")))) + (properties `((upstream-name . "Xmisc"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=Xmisc") + (synopsis + "Xiaobei's miscellaneous classes and functions") + (description + "This package provides Xiaobei's miscellaneous classes and functions, +which are useful when developing R packages for @dfn{object oriented +programming} (OOP) using R Reference Class.") + (license license:gpl2+))) -- cgit v1.2.3 From 38339c4cab9f40db7c70c15b56827f1954b4f53b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:55:46 +0100 Subject: gnu: Add r-proxyc. * gnu/packages/cran.scm (r-proxyc): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 310b80a520..243f692e04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19337,3 +19337,31 @@ (define-public r-xmisc which are useful when developing R packages for @dfn{object oriented programming} (OOP) using R Reference Class.") (license license:gpl2+))) + +(define-public r-proxyc + (package + (name "r-proxyc") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "proxyC" version)) + (sha256 + (base32 + "159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6")))) + (properties `((upstream-name . "proxyC"))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rcppparallel" ,r-rcppparallel))) + (home-page "https://cran.r-project.org/package=proxyC") + (synopsis "Compute proximity in large sparse matrices") + (description + "This package provides efficient tools to compute the proximity between +rows or columns of large matrices. Functions are optimised for large sparse +matrices using the Armadillo and Intel TBB libraries. Among several built-in +similarity/distance measures, computation of correlation, cosine similarity +and Euclidean distance is particularly fast.") + (license license:gpl3))) -- cgit v1.2.3 From 4f53ac4b9b5f92240fcdf9b3696de580a7647c7e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:57:10 +0100 Subject: gnu: Add r-isocodes. * gnu/packages/cran.scm (r-isocodes): 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 243f692e04..638be689cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19365,3 +19365,25 @@ (define-public r-proxyc similarity/distance measures, computation of correlation, cosine similarity and Euclidean distance is particularly fast.") (license license:gpl3))) + +(define-public r-isocodes + (package + (name "r-isocodes") + (version "2019.12.22") + (source + (origin + (method url-fetch) + (uri (cran-uri "ISOcodes" version)) + (sha256 + (base32 + "1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874")))) + (properties `((upstream-name . "ISOcodes"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=ISOcodes") + (synopsis "Selected ISO codes") + (description + "This package provides ISO language, territory, currency, script and +character codes. It provides ISO 639 language codes, ISO 3166 territory +codes, ISO 4217 currency codes, ISO 15924 script codes, and the ISO 8859 +character codes as well as the UN M.49 area codes.") + (license license:gpl2))) -- cgit v1.2.3 From 6daed861a6bfef12765a4588a3cd5e83841aaa44 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:57:46 +0100 Subject: gnu: Add r-stopwords. * gnu/packages/cran.scm (r-stopwords): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 638be689cb..bfd71600d4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19387,3 +19387,24 @@ (define-public r-isocodes codes, ISO 4217 currency codes, ISO 15924 script codes, and the ISO 8859 character codes as well as the UN M.49 area codes.") (license license:gpl2))) + +(define-public r-stopwords + (package + (name "r-stopwords") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "stopwords" version)) + (sha256 + (base32 + "1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv")))) + (properties `((upstream-name . "stopwords"))) + (build-system r-build-system) + (propagated-inputs `(("r-isocodes" ,r-isocodes))) + (home-page "https://github.com/quanteda/stopwords") + (synopsis "Multilingual stopword lists") + (description + "This package provides multiple sources of stopwords, for use in text +analysis and natural language processing.") + (license license:expat))) -- cgit v1.2.3 From 982a9fb6c64255205fb7e8c358f47f30f43710cf Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:58:57 +0100 Subject: gnu: Add r-spacyr. * gnu/packages/cran.scm (r-spacyr): 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 bfd71600d4..6bcc38c791 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19408,3 +19408,26 @@ (define-public r-stopwords "This package provides multiple sources of stopwords, for use in text analysis and natural language processing.") (license license:expat))) + +(define-public r-spacyr + (package + (name "r-spacyr") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "spacyr" version)) + (sha256 + (base32 + "1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks")))) + (properties `((upstream-name . "spacyr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-reticulate" ,r-reticulate))) + (home-page "https://spacyr.quanteda.io") + (synopsis "R wrapper for the spaCy NLP library") + (description + "This package provides an R wrapper to the Python @dfn{natural language +processing} (NLP) library @code{spaCy}, from @url{http://spacy.io}.") + (license license:gpl3))) -- cgit v1.2.3 From e525c866d38b6c7498375f38eea7c92b0f7b6a4f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 16:59:39 +0100 Subject: gnu: Add r-snowballc. * gnu/packages/cran.scm (r-snowballc): 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 6bcc38c791..109616049c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19431,3 +19431,26 @@ (define-public r-spacyr "This package provides an R wrapper to the Python @dfn{natural language processing} (NLP) library @code{spaCy}, from @url{http://spacy.io}.") (license license:gpl3))) + +(define-public r-snowballc + (package + (name "r-snowballc") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "SnowballC" version)) + (sha256 + (base32 + "0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1")))) + (properties `((upstream-name . "SnowballC"))) + (build-system r-build-system) + (home-page "https://r-forge.r-project.org/projects/r-temis/") + (synopsis "Snowball stemmers based on the C libstemmer UTF-8 library") + (description + "This package provides an R interface to the C @code{libstemmer} library +that implements Porter's word stemming algorithm for collapsing words to a +common root to aid comparison of vocabulary. Currently supported languages +are Danish, Dutch, English, Finnish, French, German, Hungarian, Italian, +Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") + (license license:bsd-3))) -- cgit v1.2.3 From 09df4c2aa2b65fda3568215418a02e19e9d23eb6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 17:00:45 +0100 Subject: gnu: Add r-quanteda. * gnu/packages/cran.scm (r-quanteda): New variable. --- gnu/packages/cran.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 109616049c..2e929fc115 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19454,3 +19454,50 @@ (define-public r-snowballc are Danish, Dutch, English, Finnish, French, German, Hungarian, Italian, Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (license license:bsd-3))) + +(define-public r-quanteda + (package + (name "r-quanteda") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "quanteda" version)) + (sha256 + (base32 + "0iv25rpx5cl9ansazjs0qb97pniajrxf4mqsnb5q98y2hil9ipd3")))) + (properties `((upstream-name . "quanteda"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-extrafont" ,r-extrafont) + ("r-fastmatch" ,r-fastmatch) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-lubridate" ,r-lubridate) + ("r-magrittr" ,r-magrittr) + ("r-matrix" ,r-matrix) + ("r-network" ,r-network) + ("r-proxyc" ,r-proxyc) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rcppparallel" ,r-rcppparallel) + ("r-rspectra" ,r-rspectra) + ("r-sna" ,r-sna) + ("r-snowballc" ,r-snowballc) + ("r-spacyr" ,r-spacyr) + ("r-stopwords" ,r-stopwords) + ("r-stringi" ,r-stringi) + ("r-xml2" ,r-xml2) + ("r-yaml" ,r-yaml))) + (home-page "https://quanteda.io") + (synopsis "Quantitative analysis of textual data") + (description + "This package provides a fast, flexible, and comprehensive framework for +quantitative text analysis in R. It provides functionality for corpus +management, creating and manipulating tokens and ngrams, exploring keywords in +context, forming and manipulating sparse matrices of documents by features and +feature co-occurrences, analyzing keywords, computing feature similarities and +distances, applying content dictionaries, applying supervised and unsupervised +machine learning, visually representing text and text analyses, and more.") + (license license:gpl3))) -- cgit v1.2.3 From d94d34c4a5ca0b832e2cf140c547253d693fb140 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 17:55:05 +0100 Subject: gnu: Add r-topicmodels. * gnu/packages/cran.scm (r-topicmodels): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2e929fc115..9a343ba507 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19501,3 +19501,32 @@ (define-public r-quanteda distances, applying content dictionaries, applying supervised and unsupervised machine learning, visually representing text and text analyses, and more.") (license license:gpl3))) + +(define-public r-topicmodels + (package + (name "r-topicmodels") + (version "0.2-9") + (source + (origin + (method url-fetch) + (uri (cran-uri "topicmodels" version)) + (sha256 + (base32 + "1757r5x8bsl4dk106xg6481mvdkdz9vwg87n7rpbvdkavsvhyxs0")))) + (properties `((upstream-name . "topicmodels"))) + (build-system r-build-system) + (native-inputs + `(("gsl" ,gsl))) + (propagated-inputs + `(("r-modeltools" ,r-modeltools) + ("r-slam" ,r-slam) + ("r-tm" ,r-tm))) + (home-page "https://cran.r-project.org/package=topicmodels") + (synopsis "Topic models") + (description + "This package provides an interface to the C code for @dfn{Latent +Dirichlet Allocation} (LDA) models and @dfn{Correlated Topics Models} (CTM) by +David M. Blei and co-authors and the C++ code for fitting LDA models using +Gibbs sampling by Xuan-Hieu Phan and co-authors.") + (license license:gpl2))) + -- cgit v1.2.3 From 7a19c76f00e9bd6444a2e1f3d313d66232df7d92 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 17:57:12 +0100 Subject: gnu: Add r-stm. * gnu/packages/cran.scm (r-stm): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9a343ba507..92b48741d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19530,3 +19530,37 @@ (define-public r-topicmodels Gibbs sampling by Xuan-Hieu Phan and co-authors.") (license license:gpl2))) +(define-public r-stm + (package + (name "r-stm") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "stm" version)) + (sha256 + (base32 + "1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn")))) + (properties `((upstream-name . "stm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-glmnet" ,r-glmnet) + ("r-lda" ,r-lda) + ("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-quadprog" ,r-quadprog) + ("r-quanteda" ,r-quanteda) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-slam" ,r-slam) + ("r-stringr" ,r-stringr))) + (home-page "http://www.structuraltopicmodel.com/") + (synopsis "Estimation of the Structural Topic Model") + (description + "The @dfn{Structural Topic Model} (STM) allows researchers to estimate +topic models with document-level covariates. The package also includes tools +for model selection, visualization, and estimation of topic-covariate +regressions.") + (license license:expat))) + -- cgit v1.2.3 From c56a2440048575dcf4cfcf15222183ea58df5d48 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 18:27:31 +0100 Subject: gnu: Add r-polycor. * gnu/packages/cran.scm (r-polycor): 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 92b48741d1..f024d0598d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19564,3 +19564,26 @@ (define-public r-stm regressions.") (license license:expat))) +(define-public r-polycor + (package + (name "r-polycor") + (version "0.7-10") + (source + (origin + (method url-fetch) + (uri (cran-uri "polycor" version)) + (sha256 + (base32 + "0wzwzklflbhi8sv9m7ijwr16v9zmkk0j0v4pbcpf32f8lbn3psna")))) + (properties `((upstream-name . "polycor"))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix) + ("r-mvtnorm" ,r-mvtnorm))) + (home-page "https://r-forge.r-project.org/projects/polycor/") + (synopsis "Polychoric and polyserial correlations") + (description + "This package provides tools to compute polychoric and polyserial +correlations by quick \"two-step\" methods or ML, optionally with standard +errors; tetrachoric and biserial correlations are special cases.") + (license license:gpl2+))) -- cgit v1.2.3 From 3385908e6b916b5b97b504fac47647eb60a92da1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 18:32:17 +0100 Subject: gnu: Add r-msm. * gnu/packages/cran.scm (r-msm): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f024d0598d..adc4bd84fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19587,3 +19587,31 @@ (define-public r-polycor correlations by quick \"two-step\" methods or ML, optionally with standard errors; tetrachoric and biserial correlations are special cases.") (license license:gpl2+))) + +(define-public r-msm + (package + (name "r-msm") + (version "1.6.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "msm" version)) + (sha256 + (base32 + "1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk")))) + (properties `((upstream-name . "msm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-expm" ,r-expm) + ("r-mvtnorm" ,r-mvtnorm) + ("r-survival" ,r-survival))) + (home-page "https://github.com/chjackson/msm") + (synopsis "Multi-state Markov and hidden Markov models in continuous time") + (description + "This package provides functions for fitting continuous-time Markov and +hidden Markov multi-state models to longitudinal data. It was designed for +processes observed at arbitrary times in continuous time (panel data) but some +other observation schemes are supported. Both Markov transition rates and the +hidden Markov output process can be modelled in terms of covariates, which may +be constant or piecewise-constant in time.") + (license license:gpl2+))) -- cgit v1.2.3 From 07f3e9b93c8421e046f6af5635a059e065481799 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 31 Jan 2020 18:32:48 +0100 Subject: gnu: Add r-ltm. * gnu/packages/cran.scm (r-ltm): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index adc4bd84fe..238fc5c65a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19615,3 +19615,31 @@ (define-public r-msm hidden Markov output process can be modelled in terms of covariates, which may be constant or piecewise-constant in time.") (license license:gpl2+))) + +(define-public r-ltm + (package + (name "r-ltm") + (version "1.1-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ltm" version)) + (sha256 + (base32 + "1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7")))) + (properties `((upstream-name . "ltm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-msm" ,r-msm) + ("r-polycor" ,r-polycor))) + (home-page "https://github.com/drizopoulos/ltm") + (synopsis "Latent trait models under IRT") + (description + "This is a package supporting the analysis of multivariate dichotomous +and polytomous data using latent trait models under the Item Response Theory +approach. It includes the Rasch, the Two-Parameter Logistic, the Birnbaum's +Three-Parameter, the Graded Response, and the Generalized Partial Credit +Models.") + (license license:gpl2+))) + -- cgit v1.2.3 From 8ef53c2255841a8a0f3504d031f69e8765d9a572 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 13:30:50 +0100 Subject: gnu: Add r-mi. * gnu/packages/cran.scm (r-mi): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 238fc5c65a..32c6663780 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19643,3 +19643,28 @@ (define-public r-ltm Models.") (license license:gpl2+))) +(define-public r-mi + (package + (name "r-mi") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mi" version)) + (sha256 + (base32 + "1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l")))) + (properties `((upstream-name . "mi"))) + (build-system r-build-system) + (propagated-inputs + `(("r-arm" ,r-arm) + ("r-matrix" ,r-matrix))) + (home-page "http://www.stat.columbia.edu/~gelman/") + (synopsis "Missing data imputation and model checking") + (description + "This package provides functions for data manipulation, imputing missing +values in an approximate Bayesian framework, diagnostics of the models used to +generate the imputations, confidence-building mechanisms to validate some of +the assumptions of the imputation algorithm, and functions to analyze multiply +imputed data sets with the appropriate degree of sampling uncertainty.") + (license license:gpl2+))) -- cgit v1.2.3 From 247bd124dbbaa5f1f24920aade3f2a4c2db7e7d2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 13:31:48 +0100 Subject: gnu: Add r-matrixcalc. * gnu/packages/cran.scm (r-matrixcalc): 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 32c6663780..1902ea4f08 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19668,3 +19668,25 @@ (define-public r-mi the assumptions of the imputation algorithm, and functions to analyze multiply imputed data sets with the appropriate degree of sampling uncertainty.") (license license:gpl2+))) + +(define-public r-matrixcalc + (package + (name "r-matrixcalc") + (version "1.0-3") + (source + (origin + (method url-fetch) + (uri (cran-uri "matrixcalc" version)) + (sha256 + (base32 + "1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp")))) + (properties `((upstream-name . "matrixcalc"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/matrixcalc/") + (synopsis "Collection of functions for matrix calculations") + (description + "This package provides a collection of functions to support matrix +calculations for probability, econometric and numerical analysis. There are +additional functions that are comparable to APL functions which are useful for +actuarial models such as pension mathematics.") + (license license:gpl2+))) -- cgit v1.2.3 From 3d7115398f3cb1be7609f9ff852292db7c3ac78a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:07:00 +0100 Subject: gnu: Add r-sem. * gnu/packages/cran.scm (r-sem): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1902ea4f08..30eee24d60 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19690,3 +19690,30 @@ (define-public r-matrixcalc additional functions that are comparable to APL functions which are useful for actuarial models such as pension mathematics.") (license license:gpl2+))) + +(define-public r-sem + (package + (name "r-sem") + (version "3.1-9") + (source + (origin + (method url-fetch) + (uri (cran-uri "sem" version)) + (sha256 + (base32 + "1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa")))) + (properties `((upstream-name . "sem"))) + (build-system r-build-system) + (propagated-inputs + `(("r-boot" ,r-boot) + ("r-mass" ,r-mass) + ("r-matrixcalc" ,r-matrixcalc) + ("r-mi" ,r-mi))) + (home-page "https://cran.r-project.org/package=sem") + (synopsis "Structural equation models") + (description + "This package provides functions for fitting general linear structural +equation models (with observed and latent variables) using the RAM approach, +and for fitting structural equations in observed-variable models by two-stage +least squares.") + (license license:gpl2+))) -- cgit v1.2.3 From 27d9764d063b0f607fe7635366eedea166f7fda7 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:07:41 +0100 Subject: gnu: Add r-semtools. * gnu/packages/cran.scm (r-semtools): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 30eee24d60..67546a513c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19717,3 +19717,24 @@ (define-public r-sem and for fitting structural equations in observed-variable models by two-stage least squares.") (license license:gpl2+))) + +(define-public r-semtools + (package + (name "r-semtools") + (version "0.5-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "semTools" version)) + (sha256 + (base32 + "1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6")))) + (properties `((upstream-name . "semTools"))) + (build-system r-build-system) + (propagated-inputs + `(("r-lavaan" ,r-lavaan))) + (home-page "https://github.com/simsem/semTools/wiki") + (synopsis "Useful tools for structural equation modeling") + (description + "This package provides useful tools for structural equation modeling.") + (license license:gpl2+))) -- cgit v1.2.3 From 8b217feb3b242484de1917a1c19402281eb95cf7 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:08:09 +0100 Subject: gnu: Add r-regsem. * gnu/packages/cran.scm (r-regsem): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67546a513c..b69311a39b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19738,3 +19738,31 @@ (define-public r-semtools (description "This package provides useful tools for structural equation modeling.") (license license:gpl2+))) + +(define-public r-regsem + (package + (name "r-regsem") + (version "1.3.9") + (source + (origin + (method url-fetch) + (uri (cran-uri "regsem" version)) + (sha256 + (base32 + "1klml4bp76mplipxaca7fk653cjxgdmmiciksxgiglxkzmf2bdps")))) + (properties `((upstream-name . "regsem"))) + (build-system r-build-system) + (propagated-inputs + `(("r-lavaan" ,r-lavaan) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rsolnp" ,r-rsolnp))) + (home-page "https://cran.r-project.org/package=regsem") + (synopsis "Regularized structural equation modeling") + (description + "This package uses both ridge and lasso penalties (and extensions) to +penalize specific parameters in structural equation models. The package +offers additional cost functions, cross validation, and other extensions +beyond traditional structural equation models. It also contains a function to +perform @dfn{exploratory mediation} (XMed).") + (license license:gpl2+))) -- cgit v1.2.3 From d228795210de4535d817f8fbc696e82c0800e2f3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:08:37 +0100 Subject: gnu: Add r-stanheaders. * gnu/packages/cran.scm (r-stanheaders): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b69311a39b..1f778d73d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19766,3 +19766,39 @@ (define-public r-regsem beyond traditional structural equation models. It also contains a function to perform @dfn{exploratory mediation} (XMed).") (license license:gpl2+))) + +(define-public r-stanheaders + (package + (name "r-stanheaders") + (version "2.19.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "StanHeaders" version)) + (sha256 + (base32 + "0kyka130sin4nbji7p840394ynhmaynv9jyi94ddbplj83i2nhx3")))) + (properties `((upstream-name . "StanHeaders"))) + (build-system r-build-system) + (inputs `(("pandoc" ,ghc-pandoc))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://mc-stan.org/") + (synopsis "C++ header files for Stan") + (description + "The C++ header files of the Stan project are provided by this package. +There is a shared object containing part of the @code{CVODES} library, but it +is not accessible from R. @code{r-stanheaders} is only useful for developers +who want to utilize the @code{LinkingTo} directive of their package's +DESCRIPTION file to build on the Stan library without incurring unnecessary +dependencies. + +The Stan project develops a probabilistic programming language that implements +full or approximate Bayesian statistical inference via Markov Chain Monte +Carlo or variational methods and implements (optionally penalized) maximum +likelihood estimation via optimization. The Stan library includes an advanced +automatic differentiation scheme, templated statistical and linear algebra +functions that can handle the automatically differentiable scalar types (and +doubles, ints, etc.), and a parser for the Stan language. The @code{r-rstan} +package provides user-facing R functions to parse, compile, test, estimate, +and analyze Stan models.") + (license license:bsd-3))) -- cgit v1.2.3 From da9f63eeea22f705d9104464ba96b222f6f779ad Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:09:10 +0100 Subject: gnu: Add r-rpf. * gnu/packages/cran.scm (r-rpf): 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 1f778d73d1..2d00c11201 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19802,3 +19802,29 @@ (define-public r-stanheaders package provides user-facing R functions to parse, compile, test, estimate, and analyze Stan models.") (license license:bsd-3))) + +(define-public r-rpf + (package + (name "r-rpf") + (version "0.62") + (source + (origin + (method url-fetch) + (uri (cran-uri "rpf" version)) + (sha256 + (base32 + "1vgqhwi676bi9jjxljnxblw65b5szjwbp87wnsabc11vfjzc9wki")))) + (properties `((upstream-name . "rpf"))) + (build-system r-build-system) + (propagated-inputs + `(("r-mvtnorm" ,r-mvtnorm) + ("r-rcppeigen" ,r-rcppeigen))) + (home-page "https://github.com/jpritikin/rpf") + (synopsis "Response probability functions") + (description + "The purpose of this package is to factor out logic and math common to +Item Factor Analysis fitting, diagnostics, and analysis. It is envisioned as +core support code suitable for more specialized IRT packages to build upon. +Complete access to optimized C functions is made available with +@code{R_RegisterCCallable()}.") + (license license:gpl3+))) -- cgit v1.2.3 From 3be13aa8ca8044e7e77e142f7fab489044a06663 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:09:42 +0100 Subject: gnu: Add r-openmx. * gnu/packages/cran.scm (r-openmx): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2d00c11201..96f7fd034e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19828,3 +19828,35 @@ (define-public r-rpf Complete access to optimized C functions is made available with @code{R_RegisterCCallable()}.") (license license:gpl3+))) + +(define-public r-openmx + (package + (name "r-openmx") + (version "2.15.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "OpenMx" version)) + (sha256 + (base32 + "1wbzhmyb1lnk39dkcyccmblxvniwsghh0jd94x05pk6yrcq8im5v")))) + (properties `((upstream-name . "OpenMx"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-digest" ,r-digest) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-rpf" ,r-rpf) + ("r-stanheaders" ,r-stanheaders))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "http://openmx.ssri.psu.edu") + (synopsis "Extended structural equation modelling") + (description + "This package allows for the estimation of a wide variety of advanced +multivariate statistical models. It consists of a library of functions and +optimizers that allow you to quickly and flexibly define an SEM model and +estimate parameters given observed data.") + (license license:asl2.0))) -- cgit v1.2.3 From fe0020609a2e6287b31aae1159cb11dfc9506ca2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:10:25 +0100 Subject: gnu: Add r-kutils. * gnu/packages/cran.scm (r-kutils): 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 96f7fd034e..bda87d1a2d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19860,3 +19860,34 @@ (define-public r-openmx optimizers that allow you to quickly and flexibly define an SEM model and estimate parameters given observed data.") (license license:asl2.0))) + +(define-public r-kutils + (package + (name "r-kutils") + (version "1.69") + (source + (origin + (method url-fetch) + (uri (cran-uri "kutils" version)) + (sha256 + (base32 + "12pg26a85h0jxlfcyai68dbh4bq1gnq8v1ngi8k9qvafbrpc6gx8")))) + (properties `((upstream-name . "kutils"))) + (build-system r-build-system) + (propagated-inputs + `(("r-foreign" ,r-foreign) + ("r-lavaan" ,r-lavaan) + ("r-openxlsx" ,r-openxlsx) + ("r-plyr" ,r-plyr) + ("r-runit" ,r-runit) + ("r-xtable" ,r-xtable))) + (home-page "https://cran.r-project.org/package=kutils") + (synopsis "Project management tools") + (description + "This package provides tools for data importation, recoding, and +inspection. There are functions to create new project folders, R code +templates, create uniquely named output directories, and to quickly obtain a +visual summary for each variable in a data frame. The main feature here is +the systematic implementation of the \"variable key\" framework for data +importation and recoding.") + (license license:gpl2))) -- cgit v1.2.3 From c86473c2281cec91bcf166646f565ae7fb1c1547 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:10:55 +0100 Subject: gnu: Add r-rockchalk. * gnu/packages/cran.scm (r-rockchalk): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bda87d1a2d..32b3b23274 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19891,3 +19891,33 @@ (define-public r-kutils the systematic implementation of the \"variable key\" framework for data importation and recoding.") (license license:gpl2))) + +(define-public r-rockchalk + (package + (name "r-rockchalk") + (version "1.8.144") + (source + (origin + (method url-fetch) + (uri (cran-uri "rockchalk" version)) + (sha256 + (base32 + "07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb")))) + (properties `((upstream-name . "rockchalk"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cardata" ,r-cardata) + ("r-kutils" ,r-kutils) + ("r-lme4" ,r-lme4) + ("r-mass" ,r-mass))) + (home-page "https://cran.r-project.org/package=rockchalk") + (synopsis "Regression estimation and presentation") + (description + "This package provides a collection of functions for interpretation and +presentation of regression analysis. These functions are used to produce the +statistics lectures in @url{http://pj.freefaculty.org/guides}. The package +includes regression diagnostics, regression tables, and plots of interactions +and \"moderator\" variables. The emphasis is on \"mean-centered\" and +\"residual-centered\" predictors. The vignette @code{rockchalk} offers a +fairly comprehensive overview.") + (license license:gpl3+))) -- cgit v1.2.3 From 6998b6f7aa132b2ae1e5e583d8251cc8285c216a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:11:25 +0100 Subject: gnu: Add r-lisreltor. * gnu/packages/cran.scm (r-lisreltor): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 32b3b23274..36af4f054d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19921,3 +19921,23 @@ (define-public r-rockchalk \"residual-centered\" predictors. The vignette @code{rockchalk} offers a fairly comprehensive overview.") (license license:gpl3+))) + +(define-public r-lisreltor + (package + (name "r-lisreltor") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "lisrelToR" version)) + (sha256 + (base32 + "0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5")))) + (properties `((upstream-name . "lisrelToR"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=lisrelToR") + (synopsis "Import output from LISREL into R") + (description + "This is an unofficial package aimed at automating the import of LISREL +output in R.") + (license license:gpl2))) -- cgit v1.2.3 From 1c9089d2fcbfcff37b81af15b2004c6387504af3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:11:51 +0100 Subject: gnu: Add r-bdgraph. * gnu/packages/cran.scm (r-bdgraph): 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 36af4f054d..afbb563684 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19941,3 +19941,27 @@ (define-public r-lisreltor "This is an unofficial package aimed at automating the import of LISREL output in R.") (license license:gpl2))) + +(define-public r-bdgraph + (package + (name "r-bdgraph") + (version "2.62") + (source + (origin + (method url-fetch) + (uri (cran-uri "BDgraph" version)) + (sha256 + (base32 + "1b1vfar940swvn3pcil848qsp8ji50fjjll8jjzp6y2adx0f8pby")))) + (properties `((upstream-name . "BDgraph"))) + (build-system r-build-system) + (propagated-inputs + `(("r-igraph" ,r-igraph))) + (home-page "https://www.uva.nl/profile/a.mohammadi") + (synopsis "Bayesian structure learning in graphical models") + (description + "This package provides statistical tools for Bayesian structure learning +in undirected graphical models for continuous, discrete, and mixed data. It +uses a trans-dimensional @dfn{Markov Chain Monte Carlo} (MCMC) approach based +on a continuous-time birth-death process.") + (license license:gpl2+))) -- cgit v1.2.3 From 2919b3ce40b18d73c3348cc59008f6d2be4a0b3e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:12:19 +0100 Subject: gnu: Add r-ggm. * gnu/packages/cran.scm (r-ggm): 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 afbb563684..b528e0bf9d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19965,3 +19965,25 @@ (define-public r-bdgraph uses a trans-dimensional @dfn{Markov Chain Monte Carlo} (MCMC) approach based on a continuous-time birth-death process.") (license license:gpl2+))) + +(define-public r-ggm + (package + (name "r-ggm") + (version "2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggm" version)) + (sha256 + (base32 + "1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3")))) + (properties `((upstream-name . "ggm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-igraph" ,r-igraph))) + (home-page "https://cran.r-project.org/package=ggm") + (synopsis "Functions for graphical Markov models") + (description + "This package provides functions and datasets for maximum likelihood +fitting of some classes of graphical Markov models.") + (license license:gpl2+))) -- cgit v1.2.3 From d74e9f8fe9dca2960b3108d4c4ce5937df7c1635 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:12:49 +0100 Subject: gnu: Add r-d3network. * gnu/packages/cran.scm (r-d3network): 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 b528e0bf9d..99b7805190 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19987,3 +19987,27 @@ (define-public r-ggm "This package provides functions and datasets for maximum likelihood fitting of some classes of graphical Markov models.") (license license:gpl2+))) + +(define-public r-d3network + (package + (name "r-d3network") + (version "0.5.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "d3Network" version)) + (sha256 + (base32 + "1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw")))) + (properties `((upstream-name . "d3Network"))) + (build-system r-build-system) + (propagated-inputs + `(("r-plyr" ,r-plyr) + ("r-rjson" ,r-rjson) + ("r-whisker" ,r-whisker))) + (home-page "http://christophergandrud.github.io/d3Network/") + (synopsis "Create D3 JavaScript network, tree, dendrogram, and Sankey graphs") + (description + "This packages is intended to make it easy to create D3 JavaScript +network, tree, dendrogram, and Sankey graphs from R using data frames.") + (license license:gpl3+))) -- cgit v1.2.3 From 50de6fde50470db76372d5df4acbcba94c61b7d2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:15:00 +0100 Subject: gnu: Add r-qgraph. * gnu/packages/cran.scm (r-qgraph): New variable. --- gnu/packages/cran.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 99b7805190..8a0dc2de48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20011,3 +20011,52 @@ (define-public r-d3network "This packages is intended to make it easy to create D3 JavaScript network, tree, dendrogram, and Sankey graphs from R using data frames.") (license license:gpl3+))) + +(define-public r-qgraph + (package + (name "r-qgraph") + (version "1.6.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "qgraph" version)) + (sha256 + (base32 + "1glg814h7fwl1jfm6dw1d9i80bilmj5jcjjrfln15byrdh4mm1j3")))) + (properties `((upstream-name . "qgraph"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-bdgraph" ,r-bdgraph) + ("r-colorspace" ,r-colorspace) + ("r-corpcor" ,r-corpcor) + ("r-d3network" ,r-d3network) + ("r-dplyr" ,r-dplyr) + ("r-fdrtool" ,r-fdrtool) + ("r-ggm" ,r-ggm) + ("r-ggplot2" ,r-ggplot2) + ("r-ggraph" ,r-ggraph) + ("r-glasso" ,r-glasso) + ("r-gtools" ,r-gtools) + ("r-hmisc" ,r-hmisc) + ("r-huge" ,r-huge) + ("r-igraph" ,r-igraph) + ("r-jpeg" ,r-jpeg) + ("r-lavaan" ,r-lavaan) + ("r-matrix" ,r-matrix) + ("r-pbapply" ,r-pbapply) + ("r-plyr" ,r-plyr) + ("r-png" ,r-png) + ("r-psych" ,r-psych) + ("r-rcpp" ,r-rcpp) + ("r-reshape2" ,r-reshape2) + ("r-tidygraph" ,r-tidygraph))) + (home-page "http://sachaepskamp.com/qgraph/") + (synopsis "Weighted network visualization and analysis") + (description + "This package implements tools for weighted network visualization and +analysis, as well as Gaussian graphical model computation. It contains graph +plotting methods, and tools for psychometric data visualization and graphical +model estimation. See Epskamp et al. (2012) +@url{doi:10.18637/jss.v048.i04}.") + (license license:gpl2))) -- cgit v1.2.3 From fbf76ad58399d0168ea43a9d4ecf48bba91955d8 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:15:25 +0100 Subject: gnu: Add r-semplot. * gnu/packages/cran.scm (r-semplot): New variable. --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8a0dc2de48..fa11470aa7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20060,3 +20060,42 @@ (define-public r-qgraph model estimation. See Epskamp et al. (2012) @url{doi:10.18637/jss.v048.i04}.") (license license:gpl2))) + +(define-public r-semplot + (package + (name "r-semplot") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "semPlot" version)) + (sha256 + (base32 + "0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr")))) + (properties `((upstream-name . "semPlot"))) + (build-system r-build-system) + (propagated-inputs + `(("r-colorspace" ,r-colorspace) + ("r-corpcor" ,r-corpcor) + ("r-igraph" ,r-igraph) + ("r-lavaan" ,r-lavaan) + ("r-lisreltor" ,r-lisreltor) + ("r-openmx" ,r-openmx) + ("r-plyr" ,r-plyr) + ("r-qgraph" ,r-qgraph) + ("r-regsem" ,r-regsem) + ("r-rockchalk" ,r-rockchalk) + ("r-sem" ,r-sem) + ("r-xml" ,r-xml))) + (home-page "https://github.com/SachaEpskamp/semPlot") + (synopsis "Unified visualizations of structural equation models") + (description + "Structural equation modeling (SEM) has a long history of representing +models graphically as path diagrams. The semPlot package for R fills the gap +between advanced, but time-consuming, graphical software and the limited +graphics produced automatically by SEM software. In addition, semPlot offers +more functionality than drawing path diagrams: it can act as a common ground +for importing SEM results into R. Any result usable as input to semPlot can +also be represented in any of the three popular SEM frame-works, as well as +translated to input syntax for the R packages @code{sem} and @code{lavaan}.") + (license license:gpl2))) -- cgit v1.2.3 From 55c067a309e5321e8232849609f64a5790ddec18 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:15:51 +0100 Subject: gnu: Add r-cdm. * gnu/packages/cran.scm (r-cdm): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fa11470aa7..5bbc975c06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20099,3 +20099,37 @@ (define-public r-semplot also be represented in any of the three popular SEM frame-works, as well as translated to input syntax for the R packages @code{sem} and @code{lavaan}.") (license license:gpl2))) + +(define-public r-cdm + (package + (name "r-cdm") + (version "7.4-19") + (source + (origin + (method url-fetch) + (uri (cran-uri "CDM" version)) + (sha256 + (base32 + "1ln1r3rk004fmk55iy08bjh3vv4wnkb8zg2wj3r9rq7pi8jn8fv4")))) + (properties `((upstream-name . "CDM"))) + (build-system r-build-system) + (propagated-inputs + `(("r-mvtnorm" ,r-mvtnorm) + ("r-polycor" ,r-polycor) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page + "https://github.com/alexanderrobitzsch/CDM") + (synopsis "Cognitive diagnosis modeling") + (description + "This package provides functions for cognitive diagnosis modeling and +multidimensional item response modeling for dichotomous and polytomous item +responses. It enables the estimation of the DINA and DINO model, the multiple +group (polytomous) GDINA model, the multiple choice DINA model, the general +diagnostic model (GDM), the structured latent class model (SLCA), and +regularized latent class analysis. See George, Robitzsch, Kiefer, Gross, and +Uenlue (2017) @url{doi:10.18637/jss.v074.i02} for further details on +estimation and the package structure. For tutorials on how to use the CDM +package see George and Robitzsch (2015, @url{doi:10.20982/tqmp.11.3.p189}) as +well as Ravand and Robitzsch (2015).") + (license license:gpl2+))) -- cgit v1.2.3 From 9cc3cfcbe8754dc205e5d08273a56784418115c6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:16:30 +0100 Subject: gnu: Add r-tam. * gnu/packages/cran.scm (r-tam): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5bbc975c06..d8e6488700 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20133,3 +20133,32 @@ (define-public r-cdm package see George and Robitzsch (2015, @url{doi:10.20982/tqmp.11.3.p189}) as well as Ravand and Robitzsch (2015).") (license license:gpl2+))) + +(define-public r-tam + (package + (name "r-tam") + (version "3.3-10") + (source + (origin + (method url-fetch) + (uri (cran-uri "TAM" version)) + (sha256 + (base32 + "1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq")))) + (properties `((upstream-name . "TAM"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cdm" ,r-cdm) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "http://www.edmeasurementsurveys.com/TAM/Tutorials/") + (synopsis "Test analysis modules") + (description + "This package includes tools for marginal maximum likelihood estimation +and joint maximum likelihood estimation for unidimensional and +multidimensional item response models. The package functionality covers the +Rasch model, 2PL model, 3PL model, generalized partial credit model, +multi-faceted Rasch model, nominal item response model, structured latent +class model, mixture distribution IRT models, and located latent class models. +Latent regression models and plausible value imputation are also supported.") + (license license:gpl2+))) -- cgit v1.2.3 From a21ff0724b3680732fcc48981d656f3656375be4 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:16:57 +0100 Subject: gnu: Add r-erm. * gnu/packages/cran.scm (r-erm): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d8e6488700..f307c116df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20162,3 +20162,35 @@ (define-public r-tam class model, mixture distribution IRT models, and located latent class models. Latent regression models and plausible value imputation are also supported.") (license license:gpl2+))) + +(define-public r-erm + (package + (name "r-erm") + (version "1.0-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "eRm" version)) + (sha256 + (base32 + "11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly")))) + (properties `((upstream-name . "eRm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-lattice" ,r-lattice) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/package=eRm") + (synopsis "Extended Rasch modeling") + (description + "This package provides tools to fit @dfn{Rasch models} (RM), @dfn{linear +logistic test models} (LLTM), @dfn{rating scale model} (RSM), @dfn{linear +rating scale models} (LRSM), @dfn{partial credit models} (PCM), and +@dfn{linear partial credit models} (LPCM). Missing values are allowed in the +data matrix. Additional features are the ML estimation of the person +parameters, Andersen's LR-test, item-specific Wald test, Martin-Loef-Test, +nonparametric Monte-Carlo Tests, itemfit and personfit statistics including +infit and outfit measures, ICC and other plots, automated stepwise item +elimination, and a simulation module for various binary data matrices.") + (license license:gpl3))) -- cgit v1.2.3 From 4b9bb70fa5389c326f35d9e71f2aace8d6875bc1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Feb 2020 14:17:17 +0100 Subject: gnu: Add r-irtoys. * gnu/packages/cran.scm (r-irtoys): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f307c116df..23d40f60e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20194,3 +20194,33 @@ (define-public r-erm infit and outfit measures, ICC and other plots, automated stepwise item elimination, and a simulation module for various binary data matrices.") (license license:gpl3))) + +(define-public r-irtoys + (package + (name "r-irtoys") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "irtoys" version)) + (sha256 + (base32 + "0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q")))) + (properties `((upstream-name . "irtoys"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ltm" ,r-ltm) + ("r-sm" ,r-sm))) + (home-page "https://cran.r-project.org/package=irtoys") + (synopsis "Collection of functions related to Item Response Theory (IRT)") + (description + "This package provides a collection of functions useful in learning and +practicing @dfn{Item Response Theory} (IRT), which can be combined into larger +programs. It provides basic CTT analysis, a simple common interface to the +estimation of item parameters in IRT models for binary responses with three +different programs (ICL, BILOG-MG, and ltm), ability estimation (MLE, BME, +EAP, WLE, plausible values), item and person fit statistics, scaling +methods (MM, MS, Stocking-Lord, and the complete Hebaera method), and a rich +array of parametric and non-parametric (kernel) plots. It estimates and plots +Haberman's interaction model when all items are dichotomously scored.") + (license license:gpl2+))) -- cgit v1.2.3 From 0a7a3634921115338d32dfbca18633e6f4234ad2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:51:08 +0100 Subject: gnu: r-sp: Update to 1.4-0. * gnu/packages/cran.scm (r-sp): Update to 1.4-0. --- 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 23d40f60e4..4d79205307 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2157,13 +2157,13 @@ (define-public r-proxy (define-public r-sp (package (name "r-sp") - (version "1.3-2") + (version "1.4-0") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "0kpjsqh3lzqp1m0avsvm54lazlgwfx3hyf0av3mvbyslsanj42ll")))) + (base32 "0mgjrlviv6qapgpiqdjcbsygzfs8bf5c64krh2rk555vf5njmnh7")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From b47b08fc478b2cff1f9bcf900d35fa24b1b113a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:51:17 +0100 Subject: gnu: r-squarem: Update to 2020.2. * gnu/packages/cran.scm (r-squarem): Update to 2020.2. --- 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 4d79205307..d31e953fff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2636,14 +2636,14 @@ (define-public r-cvst (define-public r-squarem (package (name "r-squarem") - (version "2020.1") + (version "2020.2") (source (origin (method url-fetch) (uri (cran-uri "SQUAREM" version)) (sha256 (base32 - "0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs")))) + "1j6sa93xjvynnzx9jx79a3fysbykmbqyknknsqif5bcha6xp6cvf")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) (home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html") -- cgit v1.2.3 From 5fe7834417d94b2ec906e3b2d6d45d95ffa4d7f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:51:28 +0100 Subject: gnu: r-tsp: Update to 1.1-9. * gnu/packages/cran.scm (r-tsp): Update to 1.1-9. --- 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 d31e953fff..d43ae5a350 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3888,14 +3888,14 @@ (define-public r-processx (define-public r-tsp (package (name "r-tsp") - (version "1.1-8") + (version "1.1-9") (source (origin (method url-fetch) (uri (cran-uri "TSP" version)) (sha256 (base32 - "0g44f2a4m7rfx6y51cdbr6vcmmpbwgyzpvfjksq3lb7gcpbr7xrx")))) + "183m6crb0dv17llj86059n3hbgsahbhfcqlx0ijdzkssg11i1cy7")))) (properties `((upstream-name . "TSP"))) (build-system r-build-system) (propagated-inputs `(("r-foreach" ,r-foreach))) -- cgit v1.2.3 From a7b7fba0e2d502f87dced487ec1c674cedec26a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:51:37 +0100 Subject: gnu: r-vctrs: Update to 0.2.3. * gnu/packages/cran.scm (r-vctrs): Update to 0.2.3. --- 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 d43ae5a350..302deee086 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4068,14 +4068,14 @@ (define-public r-zeallot (define-public r-vctrs (package (name "r-vctrs") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "008xjmlj5a5vm303wxac7bliamqwaj7mcj0jv6n9ibc8p8h93aqd")))) + "1pnjnxp1pwsr083qa6xp5akls6q0pnjz8pq2m9d7z3kc1886sw8w")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From f069fba9dfe9a7c4d4911bd8e578e6824e1f514b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:51:48 +0100 Subject: gnu: r-doby: Update to 4.6.5. * gnu/packages/cran.scm (r-doby): Update to 4.6.5. --- 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 302deee086..9937e363d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6755,14 +6755,14 @@ (define-public r-deriv (define-public r-doby (package (name "r-doby") - (version "4.6-4.1") + (version "4.6.5") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "10qyvavk1pc8rf94q5dd0wrlky145f8ia2p0k8clri5imsrikiqx")))) + "1ckazh701b4ilg8bj17ji903538jmb49d997gm49ah5j5jc1x0g7")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 17c98b536cbfe3f5fef35ecbbd09093261403896 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:03 +0100 Subject: gnu: r-rgl: Update to 0.100.50. * gnu/packages/cran.scm (r-rgl): Update to 0.100.50. --- 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 9937e363d1..725bd6bca1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9310,14 +9310,14 @@ (define-public r-biocmanager (define-public r-rgl (package (name "r-rgl") - (version "0.100.47") + (version "0.100.50") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "19jxf6hz3dsmya6wdgxc3qi5c1pcksizpp0grylpdidsry4ig4pl")))) + "165p932ml7dpjkm41zc47p5cdxar69il0m5yvg0avi8q01vr17ay")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f4c29145316ab98af22235754dfb3ba0475212f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:11 +0100 Subject: gnu: r-dalex: Update to 1.0. * gnu/packages/cran.scm (r-dalex): Update to 1.0. --- 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 725bd6bca1..e3d28cc78c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15142,14 +15142,14 @@ (define-public r-dqrng (define-public r-dalex (package (name "r-dalex") - (version "0.4.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "1zviaf7530v8w996lbma0vplabrapgwldi7h70pr0439sxaqd421")))) + "0fcyk1zhpw5yyppyw45rplx8603mrbp4vxq8398h2lswgy1nmls4")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) -- cgit v1.2.3 From f2bb1ae03c28c03619e807490e20e230df9c7781 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:19 +0100 Subject: gnu: r-acebayes: Update to 1.9. * gnu/packages/cran.scm (r-acebayes): Update to 1.9. --- 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 e3d28cc78c..349c2c5f26 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17038,14 +17038,14 @@ (define-public r-lhs (define-public r-acebayes (package (name "r-acebayes") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "acebayes" version)) (sha256 (base32 - "1xm6bw0qm2vlcrk274x0bawzb2lnacb1wsmzba5mg3i75a55pqln")))) + "1imfwm1vpbb24vfmfn1nljhmaz8429mwjihw34892p387s8h7xz2")))) (properties `((upstream-name . "acebayes"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3df9f357ecb24325ac8b448da1fa2fd52407a093 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:28 +0100 Subject: gnu: r-fda: Update to 2.4.8.1. * gnu/packages/cran.scm (r-fda): Update to 2.4.8.1. --- 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 349c2c5f26..8e34e42bc3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17989,14 +17989,14 @@ (define-public r-actfrag (define-public r-fda (package (name "r-fda") - (version "2.4.8") + (version "2.4.8.1") (source (origin (method url-fetch) (uri (cran-uri "fda" version)) (sha256 (base32 - "0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2")))) + "0g50kj1dx7zarjv0lgwyzd2c7bv6di7nkndmywday5vjywgl8m7a")))) (properties `((upstream-name . "fda"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 970d8139376a9046473c5f3b7f5cd0c361377807 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:36 +0100 Subject: gnu: r-forecast: Update to 8.11. * gnu/packages/cran.scm (r-forecast): Update to 8.11. --- 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 8e34e42bc3..eb088466e2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19283,14 +19283,14 @@ (define-public r-fracdiff (define-public r-forecast (package (name "r-forecast") - (version "8.10") + (version "8.11") (source (origin (method url-fetch) (uri (cran-uri "forecast" version)) (sha256 (base32 - "0jccr2wg7sii38lyqrs58fkxf2az7nw6v0jya27hpbz9bg8ib3kr")))) + "0ayidhnk9cxav2qi83jrvqlg2jh4zlf4lki4xw48gdqsmjvih9x1")))) (properties `((upstream-name . "forecast"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7c138b11491164271e73b2c1a1ea6433fd73b570 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:45 +0100 Subject: gnu: r-regsem: Update to 1.5.2. * gnu/packages/cran.scm (r-regsem): Update to 1.5.2. --- 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 eb088466e2..069ce2e963 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19742,14 +19742,14 @@ (define-public r-semtools (define-public r-regsem (package (name "r-regsem") - (version "1.3.9") + (version "1.5.2") (source (origin (method url-fetch) (uri (cran-uri "regsem" version)) (sha256 (base32 - "1klml4bp76mplipxaca7fk653cjxgdmmiciksxgiglxkzmf2bdps")))) + "0ch057010xfsw0nqcsarzakdbiplvxaldyqlbbacspqs65ax1yk7")))) (properties `((upstream-name . "regsem"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1381743bbe70dc6afbc40a6be88eb93d6c947f65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:52:54 +0100 Subject: gnu: r-stanheaders: Update to 2.19.2. * gnu/packages/cran.scm (r-stanheaders): Update to 2.19.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 069ce2e963..50b3309dce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19770,18 +19770,20 @@ (define-public r-regsem (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.19.0") + (version "2.19.2") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "0kyka130sin4nbji7p840394ynhmaynv9jyi94ddbplj83i2nhx3")))) + "0cmk0fzczx7dcywcw1dhm6gfq84qlsx77qrsk4z3bf3dhr4bznam")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc))) - (native-inputs `(("gfortran" ,gfortran))) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://mc-stan.org/") (synopsis "C++ header files for Stan") (description -- cgit v1.2.3 From 01d34f1a508947d784128b682f71dcfd9f80a900 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:53:06 +0100 Subject: gnu: r-openmx: Update to 2.17.2. * gnu/packages/cran.scm (r-openmx): Update to 2.17.2. --- 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 50b3309dce..9c9fd6982b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19834,14 +19834,14 @@ (define-public r-rpf (define-public r-openmx (package (name "r-openmx") - (version "2.15.5") + (version "2.17.2") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "1wbzhmyb1lnk39dkcyccmblxvniwsghh0jd94x05pk6yrcq8im5v")))) + "092xbwgi72ihxv45qmzm6lv0470rsrqsn7l2jh61jnkx95n72zbb")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 20639438e346efe497ace4874513e2c0badd5b1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:53:15 +0100 Subject: gnu: r-ggm: Update to 2.5. * gnu/packages/cran.scm (r-ggm): Update to 2.5. [propagated-inputs]: Add r-graph. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9c9fd6982b..c7867f3000 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19971,18 +19971,19 @@ (define-public r-bdgraph (define-public r-ggm (package (name "r-ggm") - (version "2.3") + (version "2.5") (source (origin (method url-fetch) (uri (cran-uri "ggm" version)) (sha256 (base32 - "1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3")))) + "11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di")))) (properties `((upstream-name . "ggm"))) (build-system r-build-system) (propagated-inputs - `(("r-igraph" ,r-igraph))) + `(("r-graph" ,r-graph) + ("r-igraph" ,r-igraph))) (home-page "https://cran.r-project.org/package=ggm") (synopsis "Functions for graphical Markov models") (description -- cgit v1.2.3 From 5d947fab43c293b03a8a2fe618e48a9733a627c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:53:39 +0100 Subject: gnu: r-qgraph: Update to 1.6.5. * gnu/packages/cran.scm (r-qgraph): Update to 1.6.5. [propagated-inputs]: Remove r-ggm. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c7867f3000..b97cd06a72 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20018,14 +20018,14 @@ (define-public r-d3network (define-public r-qgraph (package (name "r-qgraph") - (version "1.6.4") + (version "1.6.5") (source (origin (method url-fetch) (uri (cran-uri "qgraph" version)) (sha256 (base32 - "1glg814h7fwl1jfm6dw1d9i80bilmj5jcjjrfln15byrdh4mm1j3")))) + "0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592")))) (properties `((upstream-name . "qgraph"))) (build-system r-build-system) (propagated-inputs @@ -20036,7 +20036,6 @@ (define-public r-qgraph ("r-d3network" ,r-d3network) ("r-dplyr" ,r-dplyr) ("r-fdrtool" ,r-fdrtool) - ("r-ggm" ,r-ggm) ("r-ggplot2" ,r-ggplot2) ("r-ggraph" ,r-ggraph) ("r-glasso" ,r-glasso) -- cgit v1.2.3 From 051d8f439ee6e715f3d483f24e2cd02664911236 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:53:56 +0100 Subject: gnu: r-mice: Update to 3.8.0. * gnu/packages/cran.scm (r-mice): Update to 3.8.0. [propagated-inputs]: Remove r-mass, r-mitml, r-nnet, r-rlang, r-rpart, and r-survival; add r-tidyr. --- gnu/packages/cran.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b97cd06a72..f074cd3de8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3357,26 +3357,21 @@ (define-public r-mitml (define-public r-mice (package (name "r-mice") - (version "3.7.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "1wx1s1gc07iz63w4m8z0i1n5mc273f89grp5d3hfla7ypicjkasf")))) + "1ibybvigqkkla4xwhqs2w4m6c68alfcdsljx99nn4p92rzb1ig04")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) ("r-lattice" ,r-lattice) - ("r-mass" ,r-mass) - ("r-mitml" ,r-mitml) - ("r-nnet" ,r-nnet) ("r-rcpp" ,r-rcpp) - ("r-rlang" ,r-rlang) - ("r-rpart" ,r-rpart) - ("r-survival" ,r-survival))) + ("r-tidyr" ,r-tidyr))) (home-page "https://cran.r-project.org/web/packages/mice/") (synopsis "Multivariate imputation by chained equations") (description -- cgit v1.2.3 From 36633217c3278e97286536d18c63267224cadba2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:54:27 +0100 Subject: gnu: r-rpf: Update to 1.0.2. * gnu/packages/cran.scm (r-rpf): Update to 1.0.2. [propagated-inputs]: Add r-lifecycle and r-rcpp. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f074cd3de8..f8eb99ddda 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19803,18 +19803,20 @@ (define-public r-stanheaders (define-public r-rpf (package (name "r-rpf") - (version "0.62") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "rpf" version)) (sha256 (base32 - "1vgqhwi676bi9jjxljnxblw65b5szjwbp87wnsabc11vfjzc9wki")))) + "0j1229qc1mg0vy3msk3yzrpk2r64b8zvnk4rj8q27s38pgz9mix3")))) (properties `((upstream-name . "rpf"))) (build-system r-build-system) (propagated-inputs - `(("r-mvtnorm" ,r-mvtnorm) + `(("r-lifecycle" ,r-lifecycle) + ("r-mvtnorm" ,r-mvtnorm) + ("r-rcpp" ,r-rcpp) ("r-rcppeigen" ,r-rcppeigen))) (home-page "https://github.com/jpritikin/rpf") (synopsis "Response probability functions") -- cgit v1.2.3 From ae55cd9630f43ad974f5cdc0558cbf67b8f37c19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 13:54:47 +0100 Subject: gnu: r-pbkrtest: Update to 0.4-8.6. * gnu/packages/statistics.scm (r-pbkrtest): Update to 0.4-8.6. [propagated-inputs]: Add r-magrittr. --- gnu/packages/statistics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 918d2c8254..46cd691ed3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5157,17 +5157,18 @@ (define-public r-lme4 (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.4-7") + (version "0.4-8.6") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw")))) + "0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) + ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix))) (home-page "http://people.math.aau.dk/~sorenh/software/pbkrtest/") -- cgit v1.2.3 From 8017eb0ae8d7fee1669e909b116670da374d0ce3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 14:12:22 +0100 Subject: gnu: r-ggm: Move to (gnu packages bioconductor). * gnu/packages/cran.scm (r-ggm): Move this variable from here... * gnu/packages/bioconductor.scm (r-ggm): ...to here. --- gnu/packages/bioconductor.scm | 24 ++++++++++++++++++++++++ gnu/packages/cran.scm | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a6ee0253be..9546b466c4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1569,6 +1569,30 @@ (define-public r-graph "This package implements some simple graph handling capabilities for R.") (license license:artistic2.0))) +;; This is a CRAN package, but it depends on a Bioconductor package. +(define-public r-ggm + (package + (name "r-ggm") + (version "2.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggm" version)) + (sha256 + (base32 + "11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di")))) + (properties `((upstream-name . "ggm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-graph" ,r-graph) + ("r-igraph" ,r-igraph))) + (home-page "https://cran.r-project.org/package=ggm") + (synopsis "Functions for graphical Markov models") + (description + "This package provides functions and datasets for maximum likelihood +fitting of some classes of graphical Markov models.") + (license license:gpl2+))) + (define-public r-codedepends (package (name "r-codedepends") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f8eb99ddda..60947c5f3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19965,29 +19965,6 @@ (define-public r-bdgraph on a continuous-time birth-death process.") (license license:gpl2+))) -(define-public r-ggm - (package - (name "r-ggm") - (version "2.5") - (source - (origin - (method url-fetch) - (uri (cran-uri "ggm" version)) - (sha256 - (base32 - "11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di")))) - (properties `((upstream-name . "ggm"))) - (build-system r-build-system) - (propagated-inputs - `(("r-graph" ,r-graph) - ("r-igraph" ,r-igraph))) - (home-page "https://cran.r-project.org/package=ggm") - (synopsis "Functions for graphical Markov models") - (description - "This package provides functions and datasets for maximum likelihood -fitting of some classes of graphical Markov models.") - (license license:gpl2+))) - (define-public r-d3network (package (name "r-d3network") -- cgit v1.2.3 From 24719e8a0dc77bdbe637907501f4a337f571d5e2 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Fri, 4 Oct 2019 15:21:57 +0200 Subject: gnu: Add aha. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/textutils.scm (aha): new variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/textutils.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index cc38ee25f1..1be7c69154 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2019 Mădălin Ionel Patrașcu +;;; Copyright © 2019 Wiktor Żelazny ;;; ;;; This file is part of GNU Guix. ;;; @@ -1016,3 +1017,33 @@ (define-public python-pandocfilters This package provides Python bindings.") (license license:bsd-3))) + +(define-public aha + (package + (name "aha") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/theZiz/aha") + (commit version))) + (sha256 + (base32 + "0byml4rmpiaalwx69jcixl3yvpvwmwiss1jzgsqwshilb2p4qnmz")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure)) + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + ;; no check target + #:tests? #f)) + (home-page "https://github.com/theZiz/aha") + (synopsis "Converts terminal escape sequences to HTML") + (description "@command{aha} (Ansi Html Adapter) converts ANSI escape sequences +of a Unix terminal to HTML code.") + (license (list license:lgpl2.0+ license:mpl1.1)))) -- cgit v1.2.3 From 93e0ae08a8cfd2278cde4678237f92f57596e167 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 22:47:58 +0300 Subject: gnu: Add rust-foreign-types-macros-0.2. * gnu/packages/crates-io.scm (rust-foreign-types-macros-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4872aa69a8..00698b6ab4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4094,6 +4094,31 @@ (define-public rust-foreign-types-0.3 APIs.") (license (list license:expat license:asl2.0)))) +(define-public rust-foreign-types-macros-0.2 + (package + (name "rust-foreign-types-macros") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x71sdffjfb123l2jn5vhz0ni09b4rdq3h3gpczd1dj1g5qlr2yv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/sfackler/foreign-types") + (synopsis "Internal crate used by foreign-types") + (description + "This package is an internal crate used by foreign-types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-foreign-types-macros-0.1 (package (name "rust-foreign-types-macros") -- cgit v1.2.3 From d12bb31d9a4957291b49e2bd3354ba600f5c4d81 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 22:54:54 +0300 Subject: gnu: rust-foreign-types-macros-0.1: Inherit from rust-foreign-types-macros-0.2. * gnu/packages/crates-io.scm (rust-foreign-types-macros-0.1): Inherit from rust-foreign-types-macros-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00698b6ab4..212061e241 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4121,6 +4121,7 @@ (define-public rust-foreign-types-macros-0.2 (define-public rust-foreign-types-macros-0.1 (package + (inherit rust-foreign-types-macros-0.2) (name "rust-foreign-types-macros") (version "0.1.0") (source @@ -4132,18 +4133,12 @@ (define-public rust-foreign-types-macros-0.1 (sha256 (base32 "16yjigjcsklcwy2ad32l24k1nwm9n3bsnyhxc3z9whjbsrj60qk6")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15)))) - (home-page "https://github.com/sfackler/foreign-types") - (synopsis "Internal crate used by foreign-types") - (description - "An internal crate used by foreign-types.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-0.15)))))) (define-public rust-foreign-types-shared-0.2 (package -- cgit v1.2.3 From 2243f1972022d75959a8528ba795a2f33703608e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 21:26:15 +0200 Subject: gnu: rust-foreign-types-macros-0.1: Upgrade to 0.1.1. * gnu/packages/crates-io.scm (rust-foreign-types-macros-0.1): Upgrade to 0.1.1. [arguments]: Inherit from rust-foreign-types-macros-0.2. --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 212061e241..3d0f7a7a5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4123,7 +4123,7 @@ (define-public rust-foreign-types-macros-0.1 (package (inherit rust-foreign-types-macros-0.2) (name "rust-foreign-types-macros") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) @@ -4132,13 +4132,7 @@ (define-public rust-foreign-types-macros-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16yjigjcsklcwy2ad32l24k1nwm9n3bsnyhxc3z9whjbsrj60qk6")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15)))))) + "0bh6z5rwdhfm987idal8r0ha5svz1li7md5l1g2a5966gya1jns0")))))) (define-public rust-foreign-types-shared-0.2 (package -- cgit v1.2.3 From e7a5b8ebfbecf60fc6e77530fe8560e8036dc616 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 22:56:53 +0300 Subject: gnu: Add rust-foreign-types-shared-0.3. * gnu/packages/crates-io.scm (rust-foreign-types-shared-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3d0f7a7a5e..fad2732270 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4134,6 +4134,26 @@ (define-public rust-foreign-types-macros-0.1 (base32 "0bh6z5rwdhfm987idal8r0ha5svz1li7md5l1g2a5966gya1jns0")))))) +(define-public rust-foreign-types-shared-0.3 + (package + (name "rust-foreign-types-shared") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types-shared" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mg85r21bxg2i97zl3q8l3cviqz4wcbwziz875wlja3zpcrwz13n")))) + (build-system cargo-build-system) + (home-page "https://github.com/sfackler/foreign-types") + (synopsis "Internal crate used by foreign-types") + (description + "An internal crate used by foreign-types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-foreign-types-shared-0.2 (package (name "rust-foreign-types-shared") -- cgit v1.2.3 From 166ba78af0bb6f80ece4b91334c7bc5e2ef8411e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 22:58:04 +0300 Subject: gnu: rust-foreign-types-shared-0.2: Inherit from rust-foreign-types-shared-0.3. * gnu/packages/crates-io.scm (rust-foreign-types-shared-0.2): Inherit from rust-foreign-types-shared-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fad2732270..fec7501a69 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4156,6 +4156,7 @@ (define-public rust-foreign-types-shared-0.3 (define-public rust-foreign-types-shared-0.2 (package + (inherit rust-foreign-types-shared-0.3) (name "rust-foreign-types-shared") (version "0.2.0") (source @@ -4165,15 +4166,7 @@ (define-public rust-foreign-types-shared-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))) - (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page "https://github.com/sfackler/foreign-types") - (synopsis "Internal crate used by foreign-types") - (description - "An internal crate used by foreign-types.") - (license (list license:asl2.0 - license:expat)))) + "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))))) (define-public rust-foreign-types-shared-0.1 (package -- cgit v1.2.3 From 079c2aaf491568c70c230469ee45d2ebecd7899d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:04:24 +0300 Subject: gnu: Add rust-foreign-types-0.5. * gnu/packages/crates-io.scm (rust-foreign-types-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fec7501a69..7826c2e37b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4068,6 +4068,30 @@ (define-public rust-fnv-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-foreign-types-0.5 + (package + (name "rust-foreign-types") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rfr2zfxnx9rz3292z5nyk8qs2iirznn5ff3rd4vgdwza6mdjdyp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-foreign-types-macros" ,rust-foreign-types-macros-0.2) + ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.3)))) + (home-page "https://github.com/sfackler/foreign-types") + (synopsis "Framework for Rust wrappers over C APIs") + (description + "This package provides a framework for Rust wrappers over C APIs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-foreign-types-0.3 (package (name "rust-foreign-types") -- cgit v1.2.3 From d2d0cb8c1efa660b56bb69e056fcf11226ef5483 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:05:02 +0300 Subject: gnu: rust-foreign-types-0.3: Inherit from rust-foreign-types-0.5. * gnu/packages/crates-io.scm (rust-foreign-types-0.3): Inherit from rust-foreign-types-0.5. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7826c2e37b..23189d2397 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4094,6 +4094,7 @@ (define-public rust-foreign-types-0.5 (define-public rust-foreign-types-0.3 (package + (inherit rust-foreign-types-0.5) (name "rust-foreign-types") (version "0.3.2") (source @@ -4105,18 +4106,11 @@ (define-public rust-foreign-types-0.3 (sha256 (base32 "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-foreign-types-macros" ,rust-foreign-types-macros-0.1) - ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)))) - (home-page "https://github.com/sfackler/foreign-types") - (synopsis "Framework for Rust wrappers over C APIs") - (description - "This package provides a framework for Rust wrappers over C -APIs.") - (license (list license:expat license:asl2.0)))) + ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)))))) (define-public rust-foreign-types-macros-0.2 (package -- cgit v1.2.3 From ab5c5e625b6b2fce6c4d170b6063a895c907fc9a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 21:31:45 +0200 Subject: gnu: rust-foreign-types-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-foreign-types-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23189d2397..cf341cf085 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4107,8 +4107,7 @@ (define-public rust-foreign-types-0.3 (base32 "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-foreign-types-macros" ,rust-foreign-types-macros-0.1) ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)))))) -- cgit v1.2.3 From 722e5f8476d0b136c0c2da13bbc3ec7b11cc0583 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:11:42 +0300 Subject: gnu: Add rust-criterion-plot-0.4. * gnu/packages/crates-io.scm (rust-criterion-plot-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cf341cf085..ece24cc264 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2234,6 +2234,33 @@ (define-public rust-criterion-0.2 "Statistics-driven micro-benchmarking library.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-plot-0.4 + (package + (name "rust-criterion-plot") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion-plot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0id5sfww0hjxlzvkzacdlgbls3lxza8iysqljr7j7s2qxbh1a7m0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cast" ,rust-cast-0.2) + ("rust-itertools" ,rust-itertools-0.8)) + #:cargo-development-inputs + (("rust-itertools-num" ,rust-itertools-num-0.1) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/bheisler/criterion.rs") + (synopsis "Criterion's plotting library") + (description "This package provides criterion's plotting library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-criterion-plot-0.3 (package (name "rust-criterion-plot") -- cgit v1.2.3 From 48b4a2f9d07e93177514c3facea881982ca2ddc7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:13:00 +0300 Subject: gnu: rust-criterion-plot-0.3: Inherit from rust-criterion-plot-0.4. * gnu/packages/crates-io.scm (rust-criterion-plot-0.3): Inherit from rust-criterion-plot-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ece24cc264..496c237ae7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2263,6 +2263,7 @@ (define-public rust-criterion-plot-0.4 (define-public rust-criterion-plot-0.3 (package + (inherit rust-criterion-plot-0.4) (name "rust-criterion-plot") (version "0.3.1") (source @@ -2274,7 +2275,6 @@ (define-public rust-criterion-plot-0.3 (sha256 (base32 "13pv09z4ryp70qyzablkibwa2mh6c2852qq1sjr9wjigvwnj3ybn")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -2284,11 +2284,7 @@ (define-public rust-criterion-plot-0.3 #:cargo-development-inputs (("rust-itertools-num" ,rust-itertools-num-0.1) ("rust-num-complex" ,rust-num-complex-0.2) - ("rust-rand" ,rust-rand-0.4)))) - (home-page "https://github.com/bheisler/criterion.rs") - (synopsis "Criterion's plotting library") - (description "Criterion's plotting library.") - (license (list license:expat license:asl2.0)))) + ("rust-rand" ,rust-rand-0.4)))))) (define-public rust-crossbeam-0.7 (package -- cgit v1.2.3 From 46aa0825e74bc49417712bbf70b8c334a4391362 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 21:36:57 +0200 Subject: gnu: rust-criterion-plot-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-criterion-plot-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 496c237ae7..f276abd0b7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2276,8 +2276,7 @@ (define-public rust-criterion-plot-0.3 (base32 "13pv09z4ryp70qyzablkibwa2mh6c2852qq1sjr9wjigvwnj3ybn")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) ("rust-cast" ,rust-cast-0.2) ("rust-itertools" ,rust-itertools-0.8)) -- cgit v1.2.3 From 537f2401e31024b5a7f8e6129988a4dae39d59aa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:15:12 +0300 Subject: gnu: Add rust-criterion-0.3. * gnu/packages/crates-io.scm (rust-criterion-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f276abd0b7..de13b30467 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2187,6 +2187,50 @@ (define-public rust-crc32fast-1.2 "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-0.3 + (package + (name "rust-criterion") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iig7r9c6bkn5qb6axxkblc1amif6k49lix35rhqs728cphh71wk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-cast" ,rust-cast-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-criterion-plot" ,rust-criterion-plot-0.4) + ("rust-csv" ,rust-csv-1.1) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand-os" ,rust-rand-os-0.2) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.3) + ("rust-rayon" ,rust-rayon-1.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-tinytemplate" ,rust-tinytemplate-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://bheisler.github.io/criterion.rs/book/index.html") + (synopsis "Statistics-driven micro-benchmarking library") + (description + "This package provides a statistics-driven micro-benchmarking library.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-criterion-0.2 (package (name "rust-criterion") -- cgit v1.2.3 From eb60b03a6df901d2e6b1fb2ceaff2c49e54571ca Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:16:00 +0300 Subject: gnu: rust-criterion-0.2: Inherit from rust-criterion-0.3. * gnu/packages/crates-io.scm (rust-criterion-0.2): Inherit from rust-criterion-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index de13b30467..0dbf886910 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2233,6 +2233,7 @@ (define-public rust-criterion-0.3 (define-public rust-criterion-0.2 (package + (inherit rust-criterion-0.3) (name "rust-criterion") (version "0.2.11") (source @@ -2244,7 +2245,6 @@ (define-public rust-criterion-0.2 (sha256 (base32 "1543wlpc4p1kz7sqqa7ylr8bkdr8l4f34hy4bxj7krpkahwhaqq3")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -2271,12 +2271,7 @@ (define-public rust-criterion-0.2 (("rust-approx" ,rust-approx-0.3) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) - ("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://bheisler.github.io/criterion.rs/book/index.html") - (synopsis "Statistics-driven micro-benchmarking library") - (description - "Statistics-driven micro-benchmarking library.") - (license (list license:expat license:asl2.0)))) + ("rust-tempdir" ,rust-tempdir-0.3)))))) (define-public rust-criterion-plot-0.4 (package -- cgit v1.2.3 From aba73899e3d42cca6d13c4afb983d0aecbe279fc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:16:59 +0300 Subject: gnu: Add rust-base64-0.11. * gnu/packages/crates-io.scm (rust-base64-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0dbf886910..3dd34a1a8b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -687,6 +687,31 @@ (define-public rust-backtrace-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-base64-0.11 + (package + (name "rust-base64") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "base64" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iqmims6yvr6vwzyy54qd672zw29ipjj17p8klcr578c9ajpw6xl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-rand" ,rust-rand-0.6)))) + (home-page "https://github.com/marshallpierce/rust-base64") + (synopsis "Encodes and decodes base64 as bytes or utf8") + (description + "This package encodes and decodes base64 as bytes or utf8.") + (license (list license:expat license:asl2.0)))) + (define-public rust-base64-0.10 (package (name "rust-base64") -- cgit v1.2.3 From 4f3fd61031a4c58b02d9ccbb857976f35680fd1b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:17:28 +0300 Subject: gnu: rust-base64-0.10: Inherit from rust-base64-0.11. * gnu/packages/crates-io.scm (rust-base64-0.10): Inherit from rust-base64-0.11. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3dd34a1a8b..4e9a001658 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -714,6 +714,7 @@ (define-public rust-base64-0.11 (define-public rust-base64-0.10 (package + (inherit rust-base64-0.11) (name "rust-base64") (version "0.10.1") (source @@ -725,19 +726,13 @@ (define-public rust-base64-0.10 (sha256 (base32 "13k6bvd3n6dm7jqn9x918w65dd9xhx454bqphbnv0bkd6n9dj98b")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) - ("rust-rand" ,rust-rand-0.4)))) - (home-page "https://github.com/marshallpierce/rust-base64") - (synopsis "Encodes and decodes base64 as bytes or utf8") - (description - "Encodes and decodes base64 as bytes or utf8.") - (license (list license:expat license:asl2.0)))) + ("rust-rand" ,rust-rand-0.4)))))) (define-public rust-base-x-0.2 (package -- cgit v1.2.3 From 3c1290026b4c508827fa83ee97156dbb79e88709 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sat, 18 Jan 2020 23:21:48 +0300 Subject: gnu: Add rust-docopt-0.7. * gnu/packages/crates-io.scm (rust-docopt-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4e9a001658..a61115555e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3189,6 +3189,27 @@ (define-public rust-docopt-1.1 (description "Command line argument parsing.") (license (list license:expat license:unlicense)))) +(define-public rust-docopt-0.7 + (package + (inherit rust-docopt-1.1) + (name "rust-docopt") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "docopt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n6gbhsks2w9y0b4bwqyawh4ghbkka09w6pjcrq9i1sd51pflcmb")))) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-regex" ,rust-regex-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-strsim" ,rust-strsim-0.6)))))) + (define-public rust-downcast-rs-1.1 (package (name "rust-downcast-rs") -- cgit v1.2.3 From 93769609573825e3b3a1397a365717ff2d6b092d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 22:10:59 +0200 Subject: gnu: rust-criterion-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-criterion-0.2)[arguments]: Don't skip build. Replace rust-rand-core-0.5 with 0.3, rust-rand-os-0.2 with 0.1, rust-rand-xoshiro-0.3 with 0.1 in cargo-inputs. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a61115555e..adadf71478 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2266,8 +2266,7 @@ (define-public rust-criterion-0.2 (base32 "1543wlpc4p1kz7sqqa7ylr8bkdr8l4f34hy4bxj7krpkahwhaqq3")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-cast" ,rust-cast-0.2) ("rust-clap" ,rust-clap-2) @@ -2277,9 +2276,9 @@ (define-public rust-criterion-0.2 ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-rand-core" ,rust-rand-core-0.5) - ("rust-rand-os" ,rust-rand-os-0.2) - ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.3) + ("rust-rand-core" ,rust-rand-core-0.3) + ("rust-rand-os" ,rust-rand-os-0.1) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1) ("rust-rayon" ,rust-rayon-1.1) ("rust-rayon-core" ,rust-rayon-core-1.5) ("rust-serde" ,rust-serde-1.0) @@ -2290,7 +2289,7 @@ (define-public rust-criterion-0.2 #:cargo-development-inputs (("rust-approx" ,rust-approx-0.3) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4) + ("rust-rand" ,rust-rand-0.6) ("rust-tempdir" ,rust-tempdir-0.3)))))) (define-public rust-criterion-plot-0.4 -- cgit v1.2.3 From 7abd6eecbb12513f0143e9d77d32d53bf14cf691 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 01:14:15 +0300 Subject: gnu: Add rust-same-file-0.1. * gnu/packages/crates-io.scm (rust-same-file-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index adadf71478..a8d8f0fa19 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11765,6 +11765,28 @@ (define-public rust-same-file-1.0 (license (list license:unlicense license:expat)))) +(define-public rust-same-file-0.1 + (package + (inherit rust-same-file-1.0) + (name "rust-same-file") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "same-file" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19qpl6j8s3ph9jm8rh1k0wp2nkyw5ah34xly00vqcfx4v97s8cfr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-schannel-0.1 (package (name "rust-schannel") -- cgit v1.2.3 From f039fbabad3de71ee0cc743ab083adc00a3367ea Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 01:55:06 +0300 Subject: gnu: Add rust-gdi32-sys-0.2. * gnu/packages/crates-io.scm (rust-gdi32-sys-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a8d8f0fa19..3ed7135668 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4804,6 +4804,32 @@ (define-public rust-gcc-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-gdi32-sys-0.2 + (package + (name "rust-gdi32-sys") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdi32-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0605d4ngjsspghwjv4jicajich1gnl0aik9f880ajjzjixd524h9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Function definitions for the Windows API library gdi32") + (description "This package contains function definitions for the Windows +API library @code{gdi32}.") + (license license:expat))) + (define-public rust-generic-array-0.13 (package (name "rust-generic-array") -- cgit v1.2.3 From 73a51ad01d0aefdccf140b0f51fdad5af2e4aae8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:02:52 +0300 Subject: gnu: Add rust-which-1.0. * gnu/packages/crates-io.scm (rust-which-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ed7135668..c6825dc70b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16059,6 +16059,27 @@ (define-public rust-which-2.0 Locate installed executable in cross platforms.") (license license:expat))) +(define-public rust-which-1.0 + (package + (inherit rust-which-2.0) + (name "rust-which") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "which" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cjwa57kzfgzs681a27m5pjmq580pv3hkcg23smf270bgqz60jp8")))) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))))) + (define-public rust-widestring-0.4 (package (name "rust-widestring") -- cgit v1.2.3 From 2cb32a3afedaadab4d44c5ef720369b8839ec2cc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:03:51 +0300 Subject: gnu: Add rust-winreg-0.6. * gnu/packages/crates-io.scm (rust-winreg-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c6825dc70b..bc96fda916 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16259,6 +16259,35 @@ (define-public rust-wincolor-1.0 (license (list license:unlicense license:expat)))) +(define-public rust-winreg-0.6 + (package + (name "rust-winreg") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "winreg" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jdcqr6zmvwyrp87h48miasfdvv16gjsb60rc8dy2kqwb3mnv65j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/gentoo90/winreg-rs") + (synopsis "Rust bindings to MS Windows Registry API") + (description + "This package provides Rust bindings to MS Windows Registry API.") + (license license:expat))) + (define-public rust-winutil-0.1 (package (name "rust-winutil") -- cgit v1.2.3 From 10975d5ce749c3c0a45ba9f44a32b7a3ba990061 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:04:12 +0300 Subject: gnu: Add rust-raw-window-handle-0.3. * gnu/packages/crates-io.scm (rust-raw-window-handle-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc96fda916..405d24f22d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10809,6 +10809,28 @@ (define-public rust-rand-xoshiro-0.1 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) +(define-public rust-raw-window-handle-0.3 + (package + (name "rust-raw-window-handle") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "raw-window-handle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/rust-windowing/raw-window-handle") + (synopsis "Interoperability library for Rust Windowing applications") + (description + "Interoperability library for Rust Windowing applications.") + (license license:expat))) + (define-public rust-rawpointer-0.1 (package (name "rust-rawpointer") -- cgit v1.2.3 From 8be94795c91233f9673a96ee9e371ef3ca03d6da Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:05:44 +0300 Subject: gnu: Add rust-spsc-buffer-0.1. * gnu/packages/crates-io.scm (rust-spsc-buffer-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 405d24f22d..1c763f65de 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12876,6 +12876,29 @@ (define-public rust-spin-0.4 "07ywqn1vrpi3c43fmvsx7pawk9h3rb77yyqbnhap2micl454kb6f")))) (arguments '(#:skip-build? #t)))) +(define-public rust-spsc-buffer-0.1 + (package + (name "rust-spsc-buffer") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "spsc-buffer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fsv5zpxkax2n46flxhyajq1yblgh8f33la39gp86hksqcwkyv5y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2)))) + (home-page "https://github.com/davidhewitt/spsc-buffer") + (synopsis "Single-producer single-consumer lock-free buffer") + (description + "This package provides a single-producer single-consumer lock-free buffer.") + (license license:expat))) + (define-public rust-stable-deref-trait-1.1 (package (name "rust-stable-deref-trait") -- cgit v1.2.3 From 0cc8248bb6da78a2a51a44810a7704f3d09a2ee9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:06:19 +0300 Subject: gnu: Add rust-mio-anonymous-pipes-0.1. * gnu/packages/crates-io.scm (rust-mio-anonymous-pipes-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c763f65de..24df6882e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7550,6 +7550,33 @@ (define-public rust-mio-0.6 (description "Lightweight non-blocking IO.") (license license:expat))) +(define-public rust-mio-anonymous-pipes-0.1 + (package + (name "rust-mio-anonymous-pipes") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-anonymous-pipes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bqs8wncd73q4pnbiwskhgds57hyr8g89vfpqmw1vk9dqp1p9hpq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-mio" ,rust-mio-0.6) + ("rust-miow" ,rust-miow-0.3) + ("rust-spsc-buffer" ,rust-spsc-buffer-0.1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/davidhewitt/mio-anonymous-pipes") + (synopsis "Asynchronous wrapper for Windows synchronous pipes") + (description + "This package provides asynchronous wrapper for Windows synchronous pipes.") + (license license:expat))) + (define-public rust-mio-named-pipes-0.1 (package (name "rust-mio-named-pipes") -- cgit v1.2.3 From fb194747e933bed9d2b3fe0cba5ffaec33c67ad3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:06:52 +0300 Subject: gnu: Add rust-mio-extras-2. * gnu/packages/crates-io.scm (rust-mio-extras-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 24df6882e3..4635c65561 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7577,6 +7577,31 @@ (define-public rust-mio-anonymous-pipes-0.1 "This package provides asynchronous wrapper for Windows synchronous pipes.") (license license:expat))) +(define-public rust-mio-extras-2 + (package + (name "rust-mio-extras") + (version "2.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-extras" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "069gfhlv0wlwfx1k2sriwfws490kjp490rv2qivyfb01j3i3yh2j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazycell" ,rust-lazycell-1.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-slab" ,rust-slab-0.4)))) + (home-page "https://github.com/dimbleby/mio-extras") + (synopsis "Extra components for use with Mio") + (description "Extra components for use with Mio.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-named-pipes-0.1 (package (name "rust-mio-named-pipes") -- cgit v1.2.3 From 1ed60222878f1212cecdfb7783f0f6e78ddf5e4c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:17:38 +0300 Subject: gnu: Add rust-freetype-sys-0.9. * gnu/packages/crates-io.scm (rust-freetype-sys-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4635c65561..6fb3eb89b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29,6 +29,7 @@ (define-module (gnu packages crates-io) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -4301,6 +4302,34 @@ (define-public rust-foreign-types-shared-0.1 (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-freetype-sys-0.9 + (package + (name "rust-freetype-sys") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i309xc6gcsgdfiim3j5f0sk08imr4frlzfa185iaxqciysqgikx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs + `(("freetype" ,freetype) + ("zlib" ,zlib))) + (home-page "https://github.com/PistonDevelopers/freetype-sys") + (synopsis "Low level binding for FreeType font library") + (description + "This package provides low level binding for FreeType font library.") + (license license:expat))) + (define-public rust-fs-extra-1.1 (package (name "rust-fs-extra") -- cgit v1.2.3 From 6be9107582ca8bb36dcf651840ebbfecde928e8f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:18:59 +0300 Subject: gnu: Add rust-freetype-rs-0.23. * gnu/packages/crates-io.scm (rust-freetype-rs-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fb3eb89b1..7a3a99ad2a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4302,6 +4302,35 @@ (define-public rust-foreign-types-shared-0.1 (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-freetype-rs-0.23 + (package + (name "rust-freetype-rs") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06yn6l44wad0h0i4nzs5jfq64zgf89xr01fy1w22i90j22ilnkmd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-freetype-sys" ,rust-freetype-sys-0.9) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) + (inputs + `(("freetype" ,freetype) + ("zlib" ,zlib))) + (home-page "https://github.com/PistonDevelopers/freetype-rs") + (synopsis "Bindings for FreeType font library") + (description "This package provides bindings for FreeType font library.") + (license license:expat))) + (define-public rust-freetype-sys-0.9 (package (name "rust-freetype-sys") -- cgit v1.2.3 From 5ccc095b83bc67c74940dd76e27f0b26b3505f46 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:20:11 +0300 Subject: gnu: Add rust-fs2-0.2. * gnu/packages/crates-io.scm (rust-fs2-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7a3a99ad2a..4056bda330 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4380,6 +4380,34 @@ (define-public rust-fs-extra-1.1 process and much more.") (license license:expat))) +(define-public rust-fs2-0.2 + (package + (name "rust-fs2") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "fs2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vsih93cvds3x6f3w9bc5rnkyv8haix1px4jpcqvjyd9l7ji9m5w")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/danburkert/fs2-rs") + (synopsis "File locks and file duplication") + (description + "This package provides cross-platform file locks and file duplication.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fuchsia-cprng-0.1 (package (name "rust-fuchsia-cprng") -- cgit v1.2.3 From 16e151a69ac714a0ca407966d42ec4b015ec3cd5 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 02:20:55 +0300 Subject: gnu: Add rust-fsevent-sys-2. * gnu/packages/crates-io.scm (rust-fsevent-sys-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4056bda330..f64aa74390 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4408,6 +4408,29 @@ (define-public rust-fs2-0.2 "This package provides cross-platform file locks and file duplication.") (license (list license:expat license:asl2.0)))) +(define-public rust-fsevent-sys-2 + (package + (name "rust-fsevent-sys") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "fsevent-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18246vxk7rqn52m0sfrhivxq802i34p2wqqx5zsa0pamjj5086zl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only available on macOS + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys") + (synopsis "Rust bindings to the fsevent macOS API") + (description "This package provides Rust bindings to the @code{fsevent} +macOS API for file changes notifications") + (license license:expat))) + (define-public rust-fuchsia-cprng-0.1 (package (name "rust-fuchsia-cprng") -- cgit v1.2.3 From f13ddb46b5d32a6f6a6f83562e268fbbcaf74ef3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 22:56:39 +0200 Subject: gnu: rust-byteorder-1.3: Upgrade to 1.3.4. * gnu/packages/crates-io.scm (rust-byteorder-1.3): Upgrade to 1.3.4. [arguments]: Don't skip build. Replace rust-rand-0.4 with 0.6 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f64aa74390..4f2687060e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1317,7 +1317,7 @@ (define-public rust-bytecount-0.5 (define-public rust-byteorder-1.3 (package (name "rust-byteorder") - (version "1.3.2") + (version "1.3.4") (source (origin (method url-fetch) @@ -1326,14 +1326,13 @@ (define-public rust-byteorder-1.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xbwjlmq2ziqjmjvkqxdx1yh136xxhilxd40bky1w4d7hn4xvhx7")))) + "1pkjfhgjnq898g1d38ygcfi0msg3m6756cwv0sgysj1d26p8mi08")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4)))) + ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/BurntSushi/byteorder") (synopsis -- cgit v1.2.3 From 7473d73ed09d7d614d111454c9acbffdf2b86c3d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:47:14 +0300 Subject: gnu: Add rust-fsevent-0.4. * gnu/packages/crates-io.scm (rust-fsevent-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4f2687060e..21c40cd93a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4407,6 +4407,35 @@ (define-public rust-fs2-0.2 "This package provides cross-platform file locks and file duplication.") (license (list license:expat license:asl2.0)))) +(define-public rust-fsevent-0.4 + (package + (name "rust-fsevent") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fsevent" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1djxnc2fmv265xqf1iyfz56smh13v9r1p0w9125wjg6k3fyx3dss")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only available on macOS + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-fsevent-sys" ,rust-fsevent-sys-2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3) + ("rust-time" ,rust-time-0.1)))) + (home-page "https://github.com/octplane/fsevent-rust") + (synopsis "Rust bindings to the fsevent-sys macOS API") + (description + "This package provides Rust bindings to the @code{fsevent-sys} macOS API +for file changes notifications") + (license license:expat))) + (define-public rust-fsevent-sys-2 (package (name "rust-fsevent-sys") -- cgit v1.2.3 From a9a279b6af2969b33659ed65d0ca8878354cedd4 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:48:03 +0300 Subject: gnu: Add rust-inflate-0.4. * gnu/packages/crates-io.scm (rust-inflate-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21c40cd93a..fd4563489b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6107,6 +6107,27 @@ (define-public rust-indexmap-1.0 renamed to indexmap.") (license (list license:expat license:asl2.0)))) +(define-public rust-inflate-0.4 + (package + (name "rust-inflate") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "inflate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zxjdn8iwa0ssxrnjmywm3r1v284wryvzrf8vkc7nyf5ijbjknqw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1.0)))) + (home-page "https://github.com/PistonDevelopers/inflate.git") + (synopsis "DEFLATE decoding") + (description "This package provides DEFLATE decoding.") + (license license:expat))) + (define-public rust-insta-0.8 (package (name "rust-insta") -- cgit v1.2.3 From e8f03c505902aff526540f17f0e45001c45d5202 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:48:52 +0300 Subject: gnu: Add rust-inotify-sys-0.1. * gnu/packages/crates-io.scm (rust-inotify-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fd4563489b..d8df944c02 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6128,6 +6128,28 @@ (define-public rust-inflate-0.4 (description "This package provides DEFLATE decoding.") (license license:expat))) +(define-public rust-inotify-sys-0.1 + (package + (name "rust-inotify-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "inotify-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h2nwgajz80qddjm4mpma94zahxw84nscbycy9pgzbjrgjl1ljp7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/inotify-rs/inotify-sys") + (synopsis "Inotify bindings for Rust") + (description + "This package provides inotify bindings for the Rust programming language.") + (license license:isc))) + (define-public rust-insta-0.8 (package (name "rust-insta") -- cgit v1.2.3 From c5ac44e659be44dd43cbd1d30515ab868e169ca1 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:50:47 +0300 Subject: gnu: Add rust-futures-macro-0.3. * gnu/packages/crates-io.scm (rust-futures-macro-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d8df944c02..7787710551 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4756,6 +4756,32 @@ (define-public rust-futures-io-preview-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-macro-0.3 + (package + (name "rust-futures-macro") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-macro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0r3px32wgqfbmfyb1lrj9wplvjris5magdyhfr7xnyjk2mncbrsj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Futures-rs procedural macro implementations") + (description + "This package provides the @code{futures-rs} procedural macro implementations.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-select-macro-preview-0.3 (package (name "rust-futures-select-macro-preview") -- cgit v1.2.3 From edf11836cb0f9cb5651790ece26d876953e34f3c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 23:11:47 +0200 Subject: gnu: rust-proc-macro-hack-0.5: Update to 0.5.11. * gnu/packages/crates-io.scm (rust-proc-macro-hack-0.5): Upgrade to 0.5.11. [arguments]: Don't skip build. Replace rust-proc-macro2-0.4 with 1.0, rust-syn-0.15 with 1.0 in cargo-inputs. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7787710551..86ac463642 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9943,7 +9943,7 @@ (define-public rust-precomputed-hash-0.1 (define-public rust-proc-macro-hack-0.5 (package (name "rust-proc-macro-hack") - (version "0.5.7") + (version "0.5.11") (source (origin (method url-fetch) @@ -9952,14 +9952,13 @@ (define-public rust-proc-macro-hack-0.5 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1www5lrvsk7pq04clgfmjlnnrshikgs1h51l17vrc7qy58bx878c")))) + "1idz5vmnjjhvr51yvwyjb45mza18wa53fr05m1skqvbdyw15gm7c")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15)) + ("rust-syn" ,rust-syn-1.0)) #:cargo-development-inputs (("rust-demo-hack" ,rust-demo-hack-0.0) ("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0)))) -- cgit v1.2.3 From abc226f2c26aa738b5fb3f0005f833a2f4133e98 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Feb 2020 23:14:58 +0200 Subject: gnu: rust-proc-macro2-1.0: Update to 1.0.8. * gnu/packages/crates-io.scm (rust-proc-macro2-1.0): Update to 1.0.8. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 86ac463642..94a20e9a72 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10014,7 +10014,7 @@ (define-public rust-proc-macro-nested-0.1 (define-public rust-proc-macro2-1.0 (package (name "rust-proc-macro2") - (version "1.0.6") + (version "1.0.8") (source (origin (method url-fetch) @@ -10022,11 +10022,10 @@ (define-public rust-proc-macro2-1.0 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "09rgb5ab0jgw39kyad0lgqs4nb9yaf7mwcrgxqnsxbn4il54g7lw")))) + "0j45p176fnw0d02dzcky9sxyr4fadiggq07skmblwspqdxy33jrs")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.2)) #:cargo-development-inputs (("rust-quote" ,rust-quote-1.0)))) -- cgit v1.2.3 From 25f9fa17d1c2013d2b8b23182b92f1a1ccaa714e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:51:36 +0300 Subject: gnu: Add rust-futures-util-0.3. * gnu/packages/crates-io.scm (rust-futures-util-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 94a20e9a72..84a61739ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4875,6 +4875,41 @@ (define-public rust-futures-task-0.3 (description "Tools for working with tasks.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-util-0.3 + (package + (name "rust-futures-util") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-util" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xlyqdn6lnpkw27lwxczihx91h64gbdd31n8c8y5v63nzds65mn0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-macro" ,rust-futures-macro-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio-io" ,rust-tokio-io-0.1)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Common utilities and extension traits for the futures-rs library") + (description "This package provides common utilities and extension traits +for the futures-rs library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-util-preview-0.3 (package (name "rust-futures-util-preview") -- cgit v1.2.3 From 5ea4f604abba1fc844fa37d2701d00364074636f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 22:33:57 +0100 Subject: gnu: r-cicero: Update to 1.4.1. * gnu/packages/bioconductor.scm (r-cicero): Update to 1.4.1. [propagated-inputs]: Add r-tidyr. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9546b466c4..55b3f5f16d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6004,14 +6004,14 @@ (define-public r-rcistarget (define-public r-cicero (package (name "r-cicero") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "cicero" version)) (sha256 (base32 - "0mmm7vvzq50b5fayid0bw82b5lar3xm9fwl2ya30q0p4db2y6wnz")))) + "07g6r335zqqy3r5v4x4glxdrcsq9bjhs9jmgvppiggv1h630a22w")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -6033,6 +6033,7 @@ (define-public r-cicero ("r-s4vectors" ,r-s4vectors) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) ("r-vgam" ,r-vgam))) (home-page "https://bioconductor.org/packages/cicero/") (synopsis "Predict cis-co-accessibility from single-cell data") -- cgit v1.2.3 From 5bf7102265775c763fb6cddd1f55869dfdf0228d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 22 Feb 2020 22:34:22 +0100 Subject: gnu: r-genomicinteractions: Update to 1.20.1. * gnu/packages/bioconductor.scm (r-genomicinteractions): Update to 1.20.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 55b3f5f16d..e004560d58 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1934,14 +1934,14 @@ (define-public r-interactionset (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "10kwb70c9aq0bfqpq48h186lsbwgrg18m14r9z8x6n8l7cds5azc")))) + "140bp7c8p079xh5wwxmrq3a73pm6mdc9czq5w2gzjml7dgrca38a")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) -- cgit v1.2.3 From 85ced6651f9c875a0425d11d7d3293593d22d3bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Feb 2020 17:37:41 -0500 Subject: gnu: guile-semver: Update to 0.1.1. * gnu/packages/guile-xyz.scm (guile-semver): Update to 0.1.1. [native-inputs]: Remove srfi-64-driver. --- gnu/packages/guile-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0c45f42273..37a5198e4e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2960,18 +2960,17 @@ (define-public srfi-64-driver (define-public guile-semver (package (name "guile-semver") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/guile-semver/" "guile-semver-" version ".tar.gz")) (sha256 (base32 - "06b66rj7nyhr6i3dpkwvfw1xb10w2pngrsw2hxfxkznwsbh9byfz")))) + "109p4n39ln44cxvwdccf9kgb96qx54makvd2ir521ssz6wchjyag")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("srfi-64-driver" ,srfi-64-driver))) + `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) (home-page "https://ngyro.com/software/guile-semver.html") -- cgit v1.2.3 From 90d192b2f7f060e4d2e5c827533e6fe0545a04ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 22 Feb 2020 23:33:38 +0100 Subject: gnu: wslay: Fix build. * gnu/packages/web.scm (wslay)[arguments]: Don't build in parallel. --- gnu/packages/web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2c977baf14..4976059203 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1163,10 +1163,13 @@ (define-public wslay (sha256 (base32 "0ak9a6hsanhys40yhv7c2gqkfghpm6jx36j1pnml8ajvgaky5q98")))) (build-system gnu-build-system) + (arguments + ;; Parallel builds don't reliably succeed. + `(#:parallel-build? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cunit" ,cunit) ; For tests. + ("cunit" ,cunit) ; for tests ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) -- cgit v1.2.3 From 414b8d9e499470dcfaadb518d36529a1627c2a72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:16:48 +0100 Subject: gnu: python2-wxpython: Use HTTPS home page. * gnu/packages/wxwidgets.scm (python2-wxpython)[home-page]: Use HTTPS. --- gnu/packages/wxwidgets.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 48e6c31f6c..6010de781f 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -296,7 +296,7 @@ (define-public python2-wxpython ("wxwidgets" ,wxwidgets-gtk2))) (synopsis "Python 2 Bindings for wxWidgets") (description "@code{wxpython} provides Python 2 bindings for wxWidgets.") - (home-page "http://wxpython.org/") + (home-page "https://wxpython.org/") (license (package-license wxwidgets)))) (define-public wxsvg -- cgit v1.2.3 From 8680eff30d6b41993dde8e5c03ec184475889820 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:21:30 +0100 Subject: gnu: python-singledispatch: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-singledispatch)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e13c7e367..dd6c5a7507 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6303,7 +6303,7 @@ (define-public python-singledispatch (native-inputs `(("python-six" ,python-six))) ; required for conversion, not at run-time (home-page - "http://docs.python.org/3/library/functools.html#functools.singledispatch") + "https://docs.python.org/3/library/functools.html#functools.singledispatch") (synopsis "Backport of singledispatch feature from Python 3.4") (description "This library brings functools.singledispatch from Python 3.4 to Python -- cgit v1.2.3 From 77e1fe31b35b54a2c7fb88f49aa796fdabe5b955 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:23:08 +0100 Subject: gnu: java-commons-codec: Use HTTPS home page. * gnu/packages/java.scm (java-commons-codec)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9371901e1f..3ec3369a6d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6634,7 +6634,7 @@ (define-public java-commons-codec (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://commons.apache.org/codec/") + (home-page "https://commons.apache.org/codec/") (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") (description "The codec package contains simple encoder and decoders for various formats such as Base64 and Hexadecimal. In addition to these widely -- cgit v1.2.3 From 57163f91cf97fbf481e3b0938a8bab5c68cdbd5e Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 15 Feb 2020 20:43:44 +0100 Subject: gnu: Add mtxclient. * gnu/packages/messaging.scm (mtxclient): New variable. --- gnu/packages/messaging.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b4628ce8dd..f465b868ce 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -48,6 +48,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) @@ -68,6 +69,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) @@ -1787,6 +1789,56 @@ (define-public libqmatrixclient QMatrixClient project.") (license license:lgpl2.1+))) +(define-public mtxclient + (package + (name "mtxclient") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/mtxclient.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj")))) + (arguments + `(#:configure-flags + (list + ;; Disable example binaries (not installed) + "-DBUILD_LIB_EXAMPLES=OFF") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'disable-network-tests + (lambda _ + (substitute* "CMakeLists.txt" + (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption)") + "# add_test")) + #t)) + (add-before 'configure 'set-home + (lambda _ + ;; Tries to create package registry file + ;; So, set HOME. + (setenv "HOME" "/tmp") + #t))))) + (build-system cmake-build-system) + (inputs + `(("boost" ,boost) + ("json-modern-cxx" ,json-modern-cxx) + ("libolm" ,libolm) + ("libsodium" ,libsodium) + ("openssl" ,openssl) + ("spdlog" ,spdlog) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/Nheko-Reborn/mtxclient") + (synopsis "Client API library for the Matrix protocol") + (description "@code{mtxclient} is a C++ library that implements client API +for the Matrix protocol. It is built on to of @code{Boost.Asio}.") + (license license:expat))) + (define-public quaternion (package (name "quaternion") -- cgit v1.2.3 From 999f1f0bb42be6a43455332fc3642dc568af8d56 Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 15 Feb 2020 20:59:10 +0100 Subject: gnu: Add tweeny. * gnu/packages/cpp.scm (tweeny): New variable. --- gnu/packages/cpp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ae1e3e3356..8b32c3f0a9 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,3 +411,31 @@ (define-public sobjectizer Model and CSP-like channels. The goal of SObjectizer is to simplify development of concurrent and multithreaded applications in C++.") (license license:bsd-3))) + +(define-public tweeny + (package + (name "tweeny") + (version "3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mobius3/tweeny.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1adm4c17pi7xf3kf6sjyxibz5rdg1ka236p72xsm6js4j9gzlbp4")))) + (arguments + '(#:tests? #f)) ;no check target + (build-system cmake-build-system) + (home-page "https://mobius3.github.io/tweeny/") + (synopsis "Modern C++ tweening library") + (description "@code{Tweeny} is an inbetweening library designed for the +creation of complex animations for games and other beautiful interactive +software. It leverages features of modern @code{C++} to empower developers with +an intuitive API for declaring tweenings of any type of value, as long as they +support arithmetic operations. The goal of @code{Tweeny} is to provide means to +create fluid interpolations when animating position, scale, rotation, frames or +other values of screen objects, by setting their values as the tween starting +point and then, after each tween step, plugging back the result.") + (license license:expat))) -- cgit v1.2.3 From 659bc4362d97c1e668ec05ec7f4a0fb09bcd440a Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 15 Feb 2020 21:04:07 +0100 Subject: gnu: Add lmdbxx. * gnu/packages/databases.scm (lmdbxx): New variable. --- gnu/packages/databases.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0f023e0c46..c21ca5a490 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -2106,6 +2107,35 @@ (define-public lmdb virtual address space — not physical RAM.") (license license:openldap2.8))) +(define-public lmdbxx + (package + (name "lmdbxx") + (version "0.9.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drycpp/lmdbxx.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6")))) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (build-system gnu-build-system) + (inputs `(("lmdb" ,lmdb))) + (home-page "http://lmdbxx.sourceforge.net") + (synopsis "C++11 wrapper for the LMDB embedded B+ tree database library") + (description "@code{lmdbxx} is a comprehensive @code{C++} wrapper for the +@code{LMDB} embedded database library, offering both an error-checked +procedural interface and an object-oriented resource interface with RAII +semantics.") + (license license:unlicense))) + (define-public libpqxx (package (name "libpqxx") -- cgit v1.2.3 From b40f4052891886348b10164f304d1c848bb2eeea Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 15 Feb 2020 21:08:12 +0100 Subject: gnu: Add nheko. * gnu/packages/messaging.scm (nheko): New variable. --- gnu/packages/messaging.scm | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f465b868ce..c1d4d93c32 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Timotej Lazar +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages pcre) @@ -1839,6 +1841,80 @@ (define-public mtxclient for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (license license:expat))) +(define-public nheko + (package + (name "nheko") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/nheko.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm")))) + (arguments + `(#:tests? #f ;no test target + #:configure-flags + (list + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-fpermissive") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-Werror + (lambda _ + (substitute* "CMakeLists.txt" + (("-Werror") "")) + #t)) + (add-after 'unpack 'fix-determinism + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t))))) + (build-system qt-build-system) + (inputs + `(("boost" ,boost) + ("cmark" ,cmark) + ("json-modern-cxx" ,json-modern-cxx) + ("libolm" ,libolm) + ("lmdb" ,lmdb) + ("lmdbxx" ,lmdbxx) + ("mtxclient" ,mtxclient) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtmultimedia" ,qtmultimedia) + ("spdlog" ,spdlog) + ("tweeny" ,tweeny) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (home-page "https://github.com/Nheko-Reborn/nheko") + (synopsis "Desktop client for Matrix using Qt and C++14") + (description "@code{Nheko} want to provide a native desktop app for the +Matrix protocol that feels more like a mainstream chat app and less like an IRC +client. + +There is support for: +@itemize +@item E2E encryption (text messages only: attachments are currently sent unencrypted). +@item User registration. +@item Creating, joining & leaving rooms. +@item Sending & receiving invites. +@item Sending & receiving files and emoji. +@item Typing notifications. +@item Username auto-completion. +@item Message & mention notifications. +@item Redacting messages. +@item Read receipts. +@item Basic communities support. +@item Room switcher (@key{ctrl-K}). +@item Light, Dark & System themes. +@end itemize") + (license license:gpl3+))) + (define-public quaternion (package (name "quaternion") -- cgit v1.2.3 From bee2c1a9183cf2298e74ec36efcce77462527581 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 11:29:04 +0200 Subject: gnu: weechat: Update to 2.7.1. * gnu/packages/irc.scm (weechat): Update to 2.7.1. --- gnu/packages/irc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 9b20176f11..fd7eff0905 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Kevin Lemonnier ;;; Copyright © 2015, 2017 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -170,14 +170,14 @@ (define-public irssi (define-public weechat (package (name "weechat") - (version "2.7") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1rwrwfsy6k5bq3aasd95ydr68pjsh5ax38lmgz17prgcmyj45z2n")))) + "0haw0c35mf4r47j24issc9caq0da3fy7gjfq3454fm3ap3n2yxcx")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 6634b29f501764f542e3a5fc91bb691ef18b5702 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 11:30:17 +0200 Subject: gnu: weechat: Sort inputs alphabetically. * gnu/packages/irc.scm (weechat)[inputs]: Sort alphabetically. --- gnu/packages/irc.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index fd7eff0905..acaf25f745 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -184,19 +184,20 @@ (define-public weechat ("pkg-config" ,pkg-config) ;; For tests. ("cpputest" ,cpputest))) - (inputs `(("ncurses" ,ncurses) - ("libgcrypt" ,libgcrypt "out") - ("zlib" ,zlib) - ("aspell" ,aspell) - ("curl" ,curl) - ("gnutls" ,gnutls) + (inputs + `(("aspell" ,aspell) + ("curl" ,curl) + ("gnutls" ,gnutls) + ("libgcrypt" ,libgcrypt "out") + ("ncurses" ,ncurses) + ("zlib" ,zlib) - ;; Scripting language plug-ins. - ("guile" ,guile-2.2) - ("lua" ,lua-5.1) - ("python" ,python) - ("perl" ,perl) - ("tcl" ,tcl))) + ;; Scripting language plug-ins. + ("guile" ,guile-2.2) + ("lua" ,lua-5.1) + ("perl" ,perl) + ("python" ,python) + ("tcl" ,tcl))) (arguments `(#:configure-flags (list "-DENABLE_JAVASCRIPT=OFF" -- cgit v1.2.3 From 5ce67a1c202d3cddf5d3b98a72eea78e02d4a681 Mon Sep 17 00:00:00 2001 From: "LaFreniere, Joseph" Date: Sat, 22 Feb 2020 17:08:51 -0600 Subject: gnu: Add emacs-rg. * gnu/packages/emacs-xyz.scm (emacs-rg): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1247c01e63..16e5a32574 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -135,6 +135,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) #:use-module (gnu packages speech) #:use-module (gnu packages xiph) @@ -2779,6 +2780,43 @@ (define-public emacs-grep-a-lot "This Emacs package allows managing multiple grep buffers.") (license license:gpl3+))) +(define-public emacs-rg + (package + (name "emacs-rg") + (version "1.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dajva/rg.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k7x5z7mh9flwih35cqy8chs54rack3nswdcpw5wcpgv6xim227y")))) + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'hardcode-rg-path + ;; Hardcode the path to ripgrep. + (lambda _ + (let ((file "rg.el")) + (chmod file #o644) + (emacs-substitute-sexps file + ("(defcustom rg-executable" (which "rg"))))))))) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-wgrep" ,emacs-wgrep))) + (inputs + `(("ripgrep" ,ripgrep))) + (home-page "https://rgel.readthedocs.io/en/latest/") + (synopsis "Search tool based on @code{ripgrep}") + (description + "@code{rg} is an Emacs search package based on the @code{ripgrep} command +line tool. It allows one to interactively search based on the editing context +then refine or modify the search results.") + (license license:gpl3+))) + (define-public emacs-inf-ruby (package (name "emacs-inf-ruby") -- cgit v1.2.3 From 6a3911b88f84eff6b3268b4687caea405f43e39b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 23 Feb 2020 12:06:31 +0100 Subject: swh: Handle absolute URLs being returned by the API. * guix/swh.scm (swh-url): Don't prepend (%swh-base-url) if a domain is already present. This fixes the "guix lint: warning: while connecting to Software Heritage: host lookup failure: Name or service not known" error message. --- guix/swh.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index 8bdf9965f6..ec744fed2f 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,9 +127,16 @@ (define %swh-base-url (make-parameter "https://archive.softwareheritage.org")) (define (swh-url path . rest) + ;; URLs returned by the API may be relative or absolute. This has changed + ;; without notice before. Handle both cases by detecting whether the path + ;; starts with a domain. + (define root + (if (string-prefix? "/" path) + (string-append (%swh-base-url) path) + path)) + (define url - (string-append (%swh-base-url) path - (string-join rest "/" 'prefix))) + (string-append root (string-join rest "/" 'prefix))) ;; Ensure there's a trailing slash or we get a redirect. (if (string-suffix? "/" url) -- cgit v1.2.3 From 9f2fef4fb164df81034c2b114292d836a9f6d4f8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Feb 2020 11:47:41 +0100 Subject: gnu: gnome: Re-add key propagated inputs. Fixes . Reported by Andy Wingo . * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Re-add packages inadvertently removed in a8cda7f57992e9ce9ae4a694eba54e3eab42c39b. --- gnu/packages/gnome.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c63ab283d..c64b182869 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7906,7 +7906,29 @@ (define-public gnome ("yelp" ,yelp) ;; Others ("hicolor-icon-theme" ,hicolor-icon-theme) - ("gnome-online-accounts" ,gnome-online-accounts))) + ("gnome-online-accounts" ,gnome-online-accounts) + + ;; Packages not part of GNOME proper but that are needed for a good + ;; experience. See . + ;; XXX: Find out exactly which ones are needed and why. + ("font-cantarell" ,font-cantarell) + ("font-dejavu" ,font-dejavu) + ("at-spi2-core" ,at-spi2-core) + ("dbus" ,dbus) + ("dconf" ,dconf) + ("desktop-file-utils" ,desktop-file-utils) + ("gnome-default-applications" ,gnome-default-applications) + ("gnome-themes-standard" ,gnome-themes-standard) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gucharmap" ,gucharmap) + ("pinentry-gnome3" ,pinentry-gnome3) + ("pulseaudio" ,pulseaudio) + ("shared-mime-info" ,shared-mime-info) + ("system-config-printer" ,system-config-printer) + ("xdg-user-dirs" ,xdg-user-dirs) + ("yelp" ,yelp) + ("zenity" ,zenity))) (synopsis "The GNU desktop environment") (home-page "https://www.gnome.org/") (description -- cgit v1.2.3 From fa99c4bbc7acdb8def9ce14a05aacb73f99fe3b1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Feb 2020 12:42:58 +0100 Subject: ui: (size->number "1.M") is correctly parsed. Reported by Pierre Neidhardt . * guix/ui.scm (size->number)[unit-pos]: Add #\. to CHAR-SET:DIGIT. * tests/ui.scm ("size->number, 1.M"): New test. --- guix/ui.scm | 3 ++- tests/ui.scm | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index dce97fb7b9..db932ecacb 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -591,7 +591,8 @@ (define (size->number str) \"1MiB\", to a number of bytes. Raise an error if STR could not be interpreted." (define unit-pos - (string-rindex str char-set:digit)) + (string-rindex str + (char-set-union (char-set #\.) char-set:digit))) (define unit (and unit-pos (substring str (+ 1 unit-pos)))) diff --git a/tests/ui.scm b/tests/ui.scm index d8573e88d8..05eace6721 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,6 +227,10 @@ (define guile-2.0.9 (expt 2 40) (size->number "1T")) +(test-equal "size->number, 1.M" + (expt 2 20) + (size->number "1.M")) + (test-assert "size->number, invalid unit" (catch 'quit (lambda () -- cgit v1.2.3 From 3d314a5642a57aa70248c7ee61789d4d53aedae6 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 21 Feb 2020 23:39:48 +0100 Subject: gnu: debootstrap: Update to 1.0.118 The attached patch has been tested by creating arm64, mipsel & amd64 chroots and the amd64 one has been actually run. -- Vincent Legoll From a23b962c21e20c72f425675e6ea6e11cd0f944d0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 21 Feb 2020 23:34:40 +0100 Subject: [PATCH] gnu: debootstrap: Update to 1.0.118. * gnu/packages/debian.scm (debootstrap): Update to 1.0.118. Signed-off-by: Efraim Flashner --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index f94f49c51b..bd80fb297f 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -117,7 +117,7 @@ (define-public ubuntu-keyring (define-public debootstrap (package (name "debootstrap") - (version "1.0.114") + (version "1.0.118") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ (define-public debootstrap (file-name (git-file-name name version)) (sha256 (base32 - "147308flz9y8g6f972izi3szmsywf5f8xm64z2smy1cayd340i63")))) + "07x1x67dli6qwrlaribi07wgjp7fs1gzwkqgq1xy6lq1xz1xfdl2")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7da1e8f9b4545faeda19b58f59e135b205f197da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 14:18:49 +0200 Subject: gnu: jetring: Update to 0.29. * gnu/packages/gnupg.scm (jetring): Update to 0.29. [source]: Download using git-fetch. --- gnu/packages/gnupg.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2669f52384..c5c3d5263f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 ng0 @@ -1090,15 +1090,17 @@ (define-public parcimonie (define-public jetring (package (name "jetring") - (version "0.27") + (version "0.29") (source (origin - (method url-fetch) - (uri (string-append "mirror://debian/pool/main/j/" name "/" - name "_" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/jetring") + (commit (string-append "debian/" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0jy0x5zj7v87xgyldlsx1knzp0mv10wzamblrw1b61i2m1ii4pxz")))) + "1acbx2vnbkms1c0wgcnh05d4g359sg5z0aiw541vx2qq9sgdhlv6")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 1d0e8ec19e1810c242df2e46f01d956c0d29dc2a Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 23 Feb 2020 13:43:50 +0100 Subject: gnu: mgba: Update to 0.8.1. * gnu/packages/emulators.scm (mgba): Update to 0.8.1. [inputs, native-inputs]: Move qttools to native-inputs as per guix lint (guix size says it's not used at runtime). [license]: Add expat for src/third-party/discord-rpc. --- gnu/packages/emulators.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b7f29a6f5b..92e50d1484 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -419,7 +419,7 @@ (define-public higan (define-public mgba (package (name "mgba") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -428,7 +428,7 @@ (define-public mgba (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m3rgcdv32ms98j7rrmk2hphvn462bwsd6xfz2ssy05398pj4ljh")) + (base32 "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. @@ -445,7 +445,8 @@ (define-public mgba #:configure-flags (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("ffmpeg" ,ffmpeg) ("imagemagick" ,imagemagick) ("libedit" ,libedit) @@ -457,7 +458,6 @@ (define-public mgba ("ncurses" ,ncurses) ("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) - ("qttools" ,qttools) ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("zlib" ,zlib))) @@ -468,9 +468,9 @@ (define-public mgba faster and more accurate than many existing Game Boy Advance emulators, as well as adding features that other emulators lack. It also supports Game Boy and Game Boy Color games.") - ;; Code is mainly MPL 2.0. "blip_buf.c" is LGPL 2.1+ and "inih.c" is - ;; BSD-3. - (license (list license:mpl2.0 license:lgpl2.1+ license:bsd-3)))) + ;; Code is mainly MPL 2.0. "blip_buf.c" is LGPL 2.1+, "inih.c" is + ;; BSD-3, and "discord-rpc" is Expat. + (license (list license:mpl2.0 license:lgpl2.1+ license:bsd-3 license:expat)))) (define-public sameboy (package -- cgit v1.2.3 From 40cae204b994300452571f2c9e86d7dc6b83f627 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 16:42:53 +0200 Subject: gnu: vim: Update to 8.2.0303. * gnu/packages/vim.scm (vim): Update to 8.2.0303. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1d4a7a3f94..67f245b26d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -68,7 +68,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0236") + (version "8.2.0303") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) + "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From b85417d972a02abc4e309912433fb1f080a694b0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:51:59 +0300 Subject: gnu: Add rust-futures-executor-0.3. * gnu/packages/crates-io.scm (rust-futures-executor-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 84a61739ba..18c8f9ad0f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4684,6 +4684,34 @@ (define-public rust-futures-cpupool-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-executor-0.3 + (package + (name "rust-futures-executor") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-executor" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cf24wbgxqh4kdjbb557vk1axzmbpmwb8s05ga1nls1zaqv4f9qy")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-num-cpus" ,rust-num-cpus-1.11)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Executors for asynchronous tasks based on the futures-rs library") + (description + "This package provides executors for asynchronous tasks based on the +@code{futures-rs} library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-executor-preview-0.3 (package (name "rust-futures-executor-preview") -- cgit v1.2.3 From ee24071f5eb625207754f416ccca1d6748d2e17d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:53:31 +0300 Subject: gnu: Add rust-rustversion-1.0. * gnu/packages/crates-io.scm (rust-rustversion-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18c8f9ad0f..1f3347f9f9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12006,6 +12006,32 @@ (define-public rust-rustfix-0.4 "Automatically apply the suggestions made by rustc.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustversion-1.0 + (package + (name "rust-rustversion") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustversion" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xkr1g792w728py2qpg2zj0vfviv2xzmxkkd9w6035l9d5ss3fxk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/dtolnay/rustversion") + (synopsis "Conditional compilation according to rustc compiler version") + (description + "This package provides conditional compilation according to the +@code{rustc} compiler version.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustversion-0.1 (package (name "rust-rustversion") -- cgit v1.2.3 From b148b5fa980de3802ac1b9976335daf4d85841c0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:52:34 +0300 Subject: gnu: Add rust-futures-0.3. * gnu/packages/crates-io.scm (rust-futures-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1f3347f9f9..ea034f7cc6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4546,6 +4546,41 @@ (define-public rust-futf-0.1 (description "Handling fragments of UTF-8.") (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-0.3 + (package + (name "rust-futures") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11srrbc0hp7pgz142qjfx2z07kfhc98rbfwqyrgm4mxvxib61wdn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-futures-util" ,rust-futures-util-0.3)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1.3) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-tokio" ,rust-tokio-0.1)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Rust implementation of futures and streams") + (description + "A Rust implementation of futures and streams featuring zero allocations, +composability, and iterator-like interfaces.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-0.1 (package (name "rust-futures") -- cgit v1.2.3 From 8b4f3d7fb6d6e8bbea853a4839cedb5a55b78e68 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 15:54:07 +0300 Subject: gnu: Add rust-thiserror-impl-1.0. * gnu/packages/crates-io.scm (rust-thiserror-impl-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea034f7cc6..6e82f8d874 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14469,6 +14469,32 @@ (define-public rust-textwrap-0.11 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-thiserror-impl-1.0 + (package + (name "rust-thiserror-impl") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "thiserror-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vxzhb98pm5yrq9mmcz50bgpml35iyx7lwjgi4v89sq7ag92abpb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/dtolnay/thiserror") + (synopsis "Implementation detail of the thiserror crate") + (description "This package provides an implementation detail of the +@code{thiserror} crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-thread-id-3.3 (package (name "rust-thread-id") -- cgit v1.2.3 From 9e12b6373c4b85072bdb31f0dae79e4fa2ffb170 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:01:57 +0300 Subject: gnu: Add rust-ref-cast-impl-1.0. * gnu/packages/crates-io.scm (rust-ref-cast-impl-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e82f8d874..27474a9da6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11478,6 +11478,31 @@ (define-public rust-ref-cast-0.2 "Safely cast &T to &U where the struct U contains a single field of type T.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ref-cast-impl-1.0 + (package + (name "rust-ref-cast-impl") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ref-cast-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07rc752npmkyc5b8xcqk2ydbl3gxi1n4fzrq0wx9wz5qd4mvavn3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/dtolnay/ref-cast") + (synopsis "Derive implementation for @code{ref_cast::RefCast}") + (description + "Derive implementation for @code{ref_cast::RefCast}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ref-cast-impl-0.2 (package (name "rust-ref-cast-impl") -- cgit v1.2.3 From afa0a59eb0b0feafcf4677c30b54bc5757bf4b98 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:03:14 +0300 Subject: gnu: rust-ref-cast-impl-0.2: Inherit from rust-ref-cast-impl-1.0. * gnu/packages/crates-io.scm (rust-ref-cast-impl-0.2): Inherit from rust-ref-cast-impl-1.0. [arugments]: Skip build. Replace rust-quote-1.0 with 0.6 in cargo-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 27474a9da6..57bccf81d5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11505,6 +11505,7 @@ (define-public rust-ref-cast-impl-1.0 (define-public rust-ref-cast-impl-0.2 (package + (inherit rust-ref-cast-impl-1.0) (name "rust-ref-cast-impl") (version "0.2.6") (source @@ -11516,18 +11517,11 @@ (define-public rust-ref-cast-impl-0.2 (sha256 (base32 "0hw0frpzna5rf5szix56zyzd0vackcb3svj94ndj629xi75dkb32")))) - (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15)))) - (home-page "https://github.com/dtolnay/ref-cast") - (synopsis "Derive implementation for @code{ref_cast::RefCast}") - (description - "Derive implementation for ref_cast::RefCast.") - (license (list license:asl2.0 license:expat)))) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))))) (define-public rust-regex-1.3 (package -- cgit v1.2.3 From 73c59b3f512030d4746a126cc6b800758fdd39b2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:05:30 +0300 Subject: gnu: Add rust-ref-cast-1.0. * gnu/packages/crates-io.scm (rust-ref-cast-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57bccf81d5..d6b2663c46 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11454,6 +11454,32 @@ (define-public rust-redox-users-0.3 functionality.") (license license:expat))) +(define-public rust-ref-cast-1.0 + (package + (name "rust-ref-cast") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ref-cast" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vy378bdzb4kcz13kh96c5n5qw1jinhfrya5j4bf9rxz65x1jzq7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ref-cast-impl" ,rust-ref-cast-impl-1.0)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1.0) + ("rust-trybuild" ,rust-trybuild-1.0)))) + (home-page "https://github.com/dtolnay/ref-cast") + (synopsis "Safely cast &T to &U") + (description + "Safely cast &T to &U where the struct U contains a single field of type T.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ref-cast-0.2 (package (name "rust-ref-cast") -- cgit v1.2.3 From 31d647478cc945445acd30c6d2d216a195cacce5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Feb 2020 03:43:22 +0100 Subject: gnu: diffoscope: Update to 137. * gnu/packages/diffoscope.scm (diffoscope): Update to 137. --- gnu/packages/diffoscope.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 3b3540b5b0..0e452d6df8 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Vagrant Cascadian @@ -68,7 +68,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "136")) + (let ((version "137")) (package (name "diffoscope") (version version) @@ -80,7 +80,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "1wp4fnmwcsgv17dmvk9xr3h63gp4nmmpysr248qvxs8s5qy5xlyk")))) + "11llnh2h2mx3xygj4482ld1rnjnhszk4828pmcbi75kanxfrqzq6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ab99ef659b01ca4a80a5274d8c0fffe73006960c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Feb 2020 05:25:44 +0100 Subject: gnu: libostree: Update to 2020.1. * gnu/packages/package-management.scm (libostree): Update to 2020.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8443b0a67f..6c80806457 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -973,7 +973,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2019.3") + (version "2020.1") (source (origin (method url-fetch) (uri (string-append @@ -981,7 +981,7 @@ (define-public libostree (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 (base32 - "1r07yqbc9iiq0lzv1pryppd35fv695ym8r040msbfc93pmiy77y0")))) + "0sgx81w6skiivbr2gfhljf9nvnqfwwnwfgpqqa10fjdkjrqwvpk8")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From c917c23e7295370e42c4aff40219a60066607378 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Feb 2020 05:29:05 +0100 Subject: gnu: hevea: Update to 2.33. * gnu/packages/ocaml.scm (hevea): Update to 2.33. --- gnu/packages/ocaml.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3adc872ed0..2bf9672bf1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -582,21 +582,21 @@ (define-public camlp5 (define-public hevea (package (name "hevea") - (version "2.32") + (version "2.33") (source (origin (method url-fetch) (uri (string-append "http://hevea.inria.fr/old/" - name "-" version ".tar.gz")) + "hevea-" version ".tar.gz")) (sha256 (base32 - "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy")))) + "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (arguments - `(#:tests? #f ; no test suite + `(#:tests? #f ; no test suite #:make-flags (list (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Feb 2020 17:15:12 +0100 Subject: gnu: vim: Fix build on CoW file systems. * gnu/packages/vim.scm (vim)[arguments]: Add disable-CoW phase. --- gnu/packages/vim.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 67f245b26d..579b21524e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -84,6 +84,12 @@ (define-public vim #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-CoW + ;; Disable copy-on-write (CoW) in the build directory. Tests fail on + ;; btrfs (and possibly other CoW file systems) for unclear reasons. + ;; This needs to be run early as it only affects newly-created files. + (lambda _ + (invoke "chattr" "-R" "+C" "."))) (add-after 'configure 'patch-config-files (lambda _ (substitute* "runtime/tools/mve.awk" @@ -128,6 +134,7 @@ (define-public vim `(("libtool" ,libtool) ;; For tests. + ("e2fsprogs" ,e2fsprogs) ; for chattr in disable-CoW above ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") -- cgit v1.2.3 From 8be58b487c904fb71d61fccbdf9b6ba625f6c2e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:23:42 +0100 Subject: gnu: python-prettytable: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-prettytable)[home-page]: Follow permanent redirection using HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dd6c5a7507..84b70954bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7186,7 +7186,7 @@ (define-public python-prettytable (base32 "0diwsicwmiq2cpzpxri7cyl5fmsvicafw6nfqf6p6p322dji2g45")))) (build-system python-build-system) - (home-page "http://code.google.com/p/prettytable/") + (home-page "https://code.google.com/archive/p/prettytable/") (synopsis "Display tabular data in an ASCII table format") (description "A library designed to represent tabular data in visually appealing ASCII -- cgit v1.2.3 From aec92d0be43ccb50735a1916fc8be63520b44bd8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:24:39 +0100 Subject: gnu: ecl-trivial-features: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (ecl-trivial-features)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 897980ab34..7afd409e9e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1132,7 +1132,7 @@ (define-public sbcl-trivial-features (base32 "0ccv7dqyrk55xga78i5vzlic7mdwp28in3g1a8fqhlk6626scsq9")))) (build-system asdf-build-system/sbcl) (arguments '(#:tests? #f)) - (home-page "http://cliki.net/trivial-features") + (home-page "https://cliki.net/trivial-features") (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp") (description "Trivial-features ensures that @code{*FEATURES*} is consistent across multiple Common Lisp implementations.") -- cgit v1.2.3 From 62290cd45d0baeb71d7e9254137c7cecdd4ecc38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:25:36 +0100 Subject: gnu: libsvm: Use HTTPS home page. * gnu/packages/machine-learning.scm (libsvm)[home-page]: Use HTTPS. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 36df9fad0c..8262a418cc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -144,7 +144,7 @@ (define-public libsvm "svm-predict" "svm-scale"))) #t))))) - (home-page "http://www.csie.ntu.edu.tw/~cjlin/libsvm/") + (home-page "https://www.csie.ntu.edu.tw/~cjlin/libsvm/") (synopsis "Library for Support Vector Machines") (description "LIBSVM is a machine learning library for support vector -- cgit v1.2.3 From faa8dfd1416676ea3231aa6aa20a10e6ac5ed7e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:25:47 +0100 Subject: gnu: radicale: Use HTTPS home page. * gnu/packages/dav.scm (radicale)[home-page]: Use HTTPS. --- gnu/packages/dav.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index fb370fd716..5362d3505f 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -54,7 +54,7 @@ (define-public radicale Radicale intentionally does not fully comply with the CalDAV and CardDAV RFCs. Instead, it supports the CalDAV and CardDAV implementations of popular clients.") - (home-page "http://radicale.org/") + (home-page "https://radicale.org/") (license gpl3+))) (define-public vdirsyncer -- cgit v1.2.3 From 4fed945280ce32f87d804d171f827c81ffd64a2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:26:39 +0100 Subject: gnu: font-google-material-design-icons: Use HTTPS home page. * gnu/packages/fonts.scm (font-google-material-design-icons)[home-page]: Use HTTPS. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6bc95e36fe..b248b27ce2 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1222,7 +1222,7 @@ (define-public font-google-material-design-icons (base32 "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0")))) (build-system font-build-system) - (home-page "http://google.github.io/material-design-icons") + (home-page "https://google.github.io/material-design-icons") (synopsis "Icon font of Google Material Design icons") (description "Material design system icons are simple, modern, friendly, and sometimes -- cgit v1.2.3 From f6b4d395fd321d43fd548ba832c78320ac3f8d51 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 23 Feb 2020 16:11:30 +0100 Subject: gnu: z3: Build the Python bindings * gnu/packages/maths.scm (z3)[arguments]: Add the --python and --pypkgdir flags to configure. To facilitate the latter, add (guix build python-build-system) to #:modules and #:imported-modules. --- gnu/packages/maths.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 535ba02ea6..cab84a520b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -4181,7 +4182,12 @@ (define-public z3 "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build python-build-system) #:select (site-packages)) + (guix build gnu-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-compatability ;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only. @@ -4198,7 +4204,9 @@ (define-public z3 (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "./configure" - (string-append "--prefix=" (assoc-ref outputs "out"))))) + "--python" + (string-append "--prefix=" (assoc-ref outputs "out")) + (string-append "--pypkgdir=" (site-packages inputs outputs))))) (add-after 'configure 'change-directory (lambda _ (chdir "build") -- cgit v1.2.3 From f267420707142dc17f8e9f976f98447697823c85 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 19 Feb 2020 14:36:26 +0100 Subject: gnu: desmume: fix build on new GCC versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emulation.scm (desmume): add patches * gnu/packages/patches/desmume-gcc6-fixes.patch: new file * gnu/packages/patches/desmume-gcc7-fixes.patch: new file * gnu/local.mk (dist_patch_DATA): register the above Note: desmume-gcc6-fixes.patch contains some CRLF line endings. Signed-off-by: Jakub Kądziołka --- gnu/local.mk | 2 + gnu/packages/emulators.scm | 4 +- gnu/packages/patches/desmume-gcc6-fixes.patch | 59 +++++++++++++++++++++++++++ gnu/packages/patches/desmume-gcc7-fixes.patch | 18 ++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/desmume-gcc6-fixes.patch create mode 100644 gnu/packages/patches/desmume-gcc7-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index c26ea40a90..94b07c93b2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -809,6 +809,8 @@ dist_patch_DATA = \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ + %D%/packages/patches/desmume-gcc6-fixes.patch \ + %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 92e50d1484..5e1ab6cb3f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -102,7 +102,9 @@ (define-public desmume version "/desmume-" version ".tar.gz")) (sha256 (base32 - "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")))) + "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")) + (patches (search-patches "desmume-gcc6-fixes.patch" + "desmume-gcc7-fixes.patch")))) (build-system gnu-build-system) (arguments ;; Enable support for WiFi and microphone. diff --git a/gnu/packages/patches/desmume-gcc6-fixes.patch b/gnu/packages/patches/desmume-gcc6-fixes.patch new file mode 100644 index 0000000000..6eb9576f64 --- /dev/null +++ b/gnu/packages/patches/desmume-gcc6-fixes.patch @@ -0,0 +1,59 @@ +From: zeromus +Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430 +Subject: fix GCC6 issues +Bug: https://sourceforge.net/p/desmume/bugs/1570/ +Bug-Debian: http://bugs.debian.org/811691 + +Index: desmume/src/MMU_timing.h +=================================================================== +--- desmume/src/MMU_timing.h (revision 5513) ++++ desmume/src/MMU_timing.h (revision 5517) +@@ -155,8 +155,8 @@ + enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; + enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; + enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; +- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; +- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; ++ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; ++ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; + enum { WORDSIZE = sizeof(u32) }; + enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; + enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; +Index: desmume/src/ctrlssdl.cpp +=================================================================== +--- desmume/src/ctrlssdl.cpp (revision 5513) ++++ desmume/src/ctrlssdl.cpp (revision 5517) +@@ -200,7 +200,7 @@ + break; + case SDL_JOYAXISMOTION: + /* Dead zone of 50% */ +- if( (abs(event.jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) + { + key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + if (event.jaxis.value > 0) { +@@ -370,7 +370,7 @@ + Note: button constants have a 1bit offset. */ + case SDL_JOYAXISMOTION: + key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); +- if( (abs(event->jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) + { + if (event->jaxis.value > 0) + key_code |= 1; +Index: desmume/src/wifi.cpp +=================================================================== +--- desmume/src/wifi.cpp (revision 5429) ++++ desmume/src/wifi.cpp (revision 5430) +@@ -320,9 +320,9 @@ + + #if (WIFI_LOGGING_LEVEL >= 1) + #if WIFI_LOG_USE_LOGC +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); + #else +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); + #endif + #else + #define WIFI_LOG(level, ...) {} diff --git a/gnu/packages/patches/desmume-gcc7-fixes.patch b/gnu/packages/patches/desmume-gcc7-fixes.patch new file mode 100644 index 0000000000..a4934ff6e6 --- /dev/null +++ b/gnu/packages/patches/desmume-gcc7-fixes.patch @@ -0,0 +1,18 @@ +From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Mon, 17 Aug 2015 21:15:04 +0000 +Subject: Fix bug with libfat string handling. + +diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp +index 765d7ae5..b6d7f01f 100644 +--- a/src/utils/libfat/directory.cpp ++++ b/src/utils/libfat/directory.cpp +@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len + int bytes; + size_t count = 0; + +- while (count < len-1 && src != '\0') { ++ while (count < len-1 && *src != '\0') { + bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); + if (bytes > 0) { + *dst = (ucs2_t)tempChar; -- cgit v1.2.3 From 1063dea4ff8a5106b51de8d6de7e23753403c81e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 23 Feb 2020 17:42:54 +0000 Subject: gnu: cedille: Update to 1.1.2. * gnu/packages/cedille.scm (cedille): Update to 1.1.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/cedille.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm index 80ed7e9759..d3a6850f9f 100644 --- a/gnu/packages/cedille.scm +++ b/gnu/packages/cedille.scm @@ -30,7 +30,7 @@ (define-module (gnu packages cedille) (define-public cedille (package (name "cedille") - (version "1.1.1") + (version "1.1.2") (source (origin (method git-fetch) @@ -40,7 +40,7 @@ (define-public cedille (file-name (git-file-name name version)) (sha256 (base32 - "07kv9wncyipfjf5w4ax8h2p35g70zb1qw6zc4afd7c225xia55wp")))) + "1h5s6ayh3s76z184jai3jidcs4cjk8s4nvkkv2am8dg4gfsybq22")))) (inputs `(("agda" ,agda) ("agda-ial" ,agda-ial) -- cgit v1.2.3 From 64bb237eb887c2e0d83f77dde40bc6e593fb03ba Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:09:48 +0300 Subject: gnu: Add rust-anyhow-1.0 and rust-thiserror-1.0. * gnu/packages/crates-io.scm (rust-anyhow-1.0, rust-thiserror-1.0): New variables. Add them together because they have cyclic dependencies on each other. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6b2663c46..7f51308e43 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -277,6 +277,33 @@ (define-public rust-antidote-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-anyhow-1.0 + (package + (name "rust-anyhow") + (version "1.0.26") + (source + (origin + (method url-fetch) + (uri (crate-uri "anyhow" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g6mzcxyj88k8bv8rr3zx4yczgimqvvgr12n14a29sqj6s1zc9bq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-rustversion" ,rust-rustversion-1.0) + ("rust-thiserror" ,rust-thiserror-1.0) + ("rust-trybuild" ,rust-trybuild-1.0)))) + (home-page "https://github.com/dtolnay/anyhow") + (synopsis "Flexible concrete Error type") + (description "This package provides a flexible concrete Error type built on +@code{std::error::Error}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-approx-0.3 (package (name "rust-approx") @@ -14514,6 +14541,34 @@ (define-public rust-textwrap-0.11 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-thiserror-1.0 + (package + (name "rust-thiserror") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "thiserror" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zlp3kzjssl1ndqmn7cipqnyggq4851ghhqj4bfc4fxk2hc7sdbg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-thiserror-impl" ,rust-thiserror-impl-1.0)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1.0) + ("rust-ref-cast" ,rust-ref-cast-1.0) + ("rust-rustversion" ,rust-rustversion-1.0) + ("rust-trybuild" ,rust-trybuild-1.0)))) + (home-page "https://github.com/dtolnay/thiserror") + (synopsis "derive(Error)") + (description "This package provides @code{derive(Error)} in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-thiserror-impl-1.0 (package (name "rust-thiserror-impl") -- cgit v1.2.3 From 791a8e533115c2b8633d3ab7d2f773dad7494d9b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:14:31 +0300 Subject: gnu: Add rust-vte-0.3. * gnu/packages/crates-io.scm (rust-vte-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7f51308e43..1bbde4342f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16287,6 +16287,30 @@ (define-public rust-void-1.0 "The uninhabited void type for use in statically impossible cases.") (license license:expat))) +(define-public rust-vte-0.3 + (package + (name "rust-vte") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "vte" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests not included in release + #:cargo-inputs + (("rust-utf8parse" ,rust-utf8parse-0.1)))) + (home-page "https://github.com/jwilm/vte") + (synopsis "Parser for implementing terminal emulators") + (description + "This package provides a parser for implementing terminal emulators.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-wait-timeout-0.2 (package (name "rust-wait-timeout") -- cgit v1.2.3 From 94ddb94acc0ff2a8a4a06ccbd4b02cf3a9042a48 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:15:06 +0300 Subject: gnu: Add rust-vswhom-sys-0.1. * gnu/packages/crates-io.scm (rust-vswhom-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1bbde4342f..cfde654185 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16287,6 +16287,30 @@ (define-public rust-void-1.0 "The uninhabited void type for use in statically impossible cases.") (license license:expat))) +(define-public rust-vswhom-sys-0.1 + (package + (name "rust-vswhom-sys") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "vswhom-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0clm4dx4amwlhg5lkh52fmvvwq6c7s7b9xqljw39mryhsc158bzw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/nabijaczleweli/vswhom-sys.rs") + (synopsis "Pure FFI to Jon Blow's VS discovery script") + (description + "This package provides a pure FFI to Jon Blow's VS discovery script.") + (license license:expat))) + (define-public rust-vte-0.3 (package (name "rust-vte") -- cgit v1.2.3 From e47ea56918ef889766f82512ad6da7291d317937 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:15:24 +0300 Subject: gnu: Add rust-vswhom-0.1. * gnu/packages/crates-io.scm (rust-vswhom-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfde654185..58d1d3003b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16287,6 +16287,30 @@ (define-public rust-void-1.0 "The uninhabited void type for use in statically impossible cases.") (license license:expat))) +(define-public rust-vswhom-0.1 + (package + (name "rust-vswhom") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "vswhom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12v0fjjzxdc3y5c0lcwycfhphz7zf2s06hl5krwhawah0xzrp5xy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-vswhom-sys" ,rust-vswhom-sys-0.1)))) + (home-page "https://github.com/nabijaczleweli/vswhom.rs") + (synopsis "FFI to Jon Blow's VS discovery script") + (description + "This package provides a pure FFI to Jon Blow's VS discovery script.") + (license license:expat))) + (define-public rust-vswhom-sys-0.1 (package (name "rust-vswhom-sys") -- cgit v1.2.3 From c0312f94759cd352c74f753730a5610083c5eacc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 16:16:40 +0300 Subject: gnu: Add rust-embed-resource-1.3. * gnu/packages/crates-io.scm (rust-embed-resource-1.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58d1d3003b..8d880cec5c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3377,6 +3377,32 @@ (define-public rust-either-1.5 @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) +(define-public rust-embed-resource-1.3 + (package + (name "rust-embed-resource") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "embed-resource" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v1adsw9mq7gjjjhx4hcjhqppdf4vm0gbcgh7sxirbxh99la9axv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-vswhom" ,rust-vswhom-0.1) + ("rust-winreg" ,rust-winreg-0.6)))) + (home-page "https://github.com/nabijaczleweli/rust-embed-resource") + (synopsis + "Cargo library to handle compilation and inclusion of Windows resources") + (description + "This package provides a Cargo library to handle compilation and +inclusion of Windows resources in the most resilient fashion imaginable.") + (license license:expat))) + (define-public rust-encode-unicode-0.3 (package (name "rust-encode-unicode") -- cgit v1.2.3 From 85725ed7b81c40a4140e3675b864dd1ff6901753 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 19:50:41 +0300 Subject: gnu: Add rust-inotify-0.6. * gnu/packages/crates-io.scm (rust-inotify-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d880cec5c..9e25825962 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6305,6 +6305,37 @@ (define-public rust-inflate-0.4 (description "This package provides DEFLATE decoding.") (license license:expat))) +(define-public rust-inotify-0.6 + (package + (name "rust-inotify") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "inotify" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0627k5aq44knjlrc09hl017nxap3svpl79przf26y3ciycwlbda0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures" ,rust-futures-0.1) + ("rust-inotify-sys" ,rust-inotify-sys-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/inotify-rs/inotify") + (synopsis "Idiomatic wrapper for inotify") + (description "This package provides an idiomatic wrapper for inotify written +in Rust.") + (license license:isc))) + (define-public rust-inotify-sys-0.1 (package (name "rust-inotify-sys") -- cgit v1.2.3 From 4bc4189c5d723a52b2771ba5579c1f043557019f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 19:54:21 +0300 Subject: gnu: Add rust-notify-4. * gnu/packages/crates-io.scm (rust-notify-4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e25825962..eca5d070d1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8458,6 +8458,41 @@ (define-public rust-no-panic-0.1 prove a function can't ever panic.") (license (list license:expat license:asl2.0)))) +(define-public rust-notify-4 + (package + (name "rust-notify") + (version "4.0.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "notify" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12vpbg8j49196rxkm01hw2xfr0mk005ljmx0p9kwf6xj6gy2i5hr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-fsevent" ,rust-fsevent-0.4) + ("rust-fsevent-sys" ,rust-fsevent-sys-2) + ("rust-inotify" ,rust-inotify-0.6) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/passcod/notify") + (synopsis "Cross-platform filesystem notification library") + (description + "Cross-platform filesystem notification library.") + (license license:cc0))) + (define-public rust-nix-0.14 (package (inherit rust-nix-0.15) -- cgit v1.2.3 From 69ecc4495be9276322950692a325d04f16fe0f72 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 19:58:57 +0300 Subject: gnu: Add rust-quickcheck-macros-0.8. * gnu/packages/crates-io.scm (rust-quickcheck-macros-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eca5d070d1..71aabaa466 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10622,6 +10622,33 @@ (define-public rust-quickcheck-0.2 ("rust-rand" ,rust-rand-0.3)) #:skip-build? #t)))) ; Package needs 'unicode' crate. +(define-public rust-quickcheck-macros-0.8 + (package + (name "rust-quickcheck-macros") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck_macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0b3mhn0xcrdd3fkbkx3rghhivwzwil8w991ngp6gaj70l72c3pyp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/BurntSushi/quickcheck") + (synopsis "Macro attribute for quickcheck") + (description + "This package provides a macro attribute for quickcheck.") + (license (list license:unlicense license:expat)))) + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From 881bb7335519ed05c19977784b6073753eeb84ad Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 19:59:49 +0300 Subject: gnu: Add rust-num-bigint-0.2. * gnu/packages/crates-io.scm (rust-num-bigint-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 71aabaa466..6ecac751f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8641,6 +8641,37 @@ (define-public rust-nom-1.2 ;; This is an ancient version and all inputs are optional. `(#:skip-build? #t)))) +(define-public rust-num-bigint-0.2 + (package + (name "rust-num-bigint") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-bigint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "015k3wixdi4w698sappvy43pf8bvkw0f88xplmdgc3zfk2cpy309")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.8) + ("rust-rand" ,rust-rand-0.5) + ("rust-serde" ,rust-serde-1.0) + ("rust-autocfg" ,rust-autocfg-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/rust-num/num-bigint") + (synopsis "Big integer implementation for Rust") + (description + "Big integer implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-complex-0.2 (package (name "rust-num-complex") -- cgit v1.2.3 From c2b63428f62bf90830a0f627dabf4fe9515bdcd9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 20:02:39 +0300 Subject: gnu: Add rust-stb-truetype-0.3. * gnu/packages/crates-io.scm (rust-stb-truetype-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ecac751f3..fca70bde86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13600,6 +13600,34 @@ (define-public rust-static-assertions-0.3 are met.") (license (list license:expat license:asl2.0)))) +(define-public rust-stb-truetype-0.3 + (package + (name "rust-stb-truetype") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "stb_truetype" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lgvnh3ma6cz811bk8imj45djz76zs47b8327sgnmik2x03nnyzp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests not included in release + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-libm" ,rust-libm-0.2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.3)))) + (home-page "https://gitlab.redox-os.org/redox-os/stb_truetype-rs") + (synopsis "Translation of the font loading code to Rust") + (description + "This package provides a straight translation of the font loading code +in @code{stb_truetype.h} from C to Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-stdweb-0.4 (package (name "rust-stdweb") -- cgit v1.2.3 From 8ac3903bba548a37cd06fd8df1ef35fa5c1f9b08 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:00:23 +0300 Subject: gnu: Add rust-num-rational-0.2. * gnu/packages/crates-io.scm (rust-num-rational-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fca70bde86..673232e610 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8798,6 +8798,33 @@ (define-public rust-num-iter-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-num-rational-0.2 + (package + (name "rust-num-rational") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-rational" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18q3vq3xldhaj0z3f92am8f59m1awywgdj28c7wvx0bcksgwfkfs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-autocfg" ,rust-autocfg-1.0)))) + (home-page "https://github.com/rust-num/num-rational") + (synopsis "Rational numbers implementation for Rust") + (description + "Rational numbers implementation for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-traits-0.2 (package (name "rust-num-traits") -- cgit v1.2.3 From d47514d970e88d0a876705d6c9e9c84fca8246ea Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:01:51 +0300 Subject: gnu: Add rust-num-0.2. * gnu/packages/crates-io.scm (rust-num-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 673232e610..d848450430 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8641,6 +8641,35 @@ (define-public rust-nom-1.2 ;; This is an ancient version and all inputs are optional. `(#:skip-build? #t)))) +(define-public rust-num-0.2 + (package + (name "rust-num") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "num" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dhcvhprvvx1iaaq7sxlgxw5awmj8dibni8vhizi59zyz4q60lxq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)))) + (home-page "https://github.com/rust-num/num") + (synopsis "Collection of numeric types and traits for Rust") + (description + "This package provides a collection of numeric types and traits for Rust, +including bigint, complex, rational, range iterators, generic integers, and more.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-bigint-0.2 (package (name "rust-num-bigint") -- cgit v1.2.3 From d4cbecc02f4cae34fd3a2604c0fafbe29bd977d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 20:56:05 +0200 Subject: gnu: rust-complex-0.2: Upgrade to 0.2.4. * gnu/packages/crates-io.scm (rust-num-complex-0.2): Update to 0.2.4. [arguments]: Don't skip build. Replace rust-rand-0.4 with 0.5 in cargo-inputs. Add rust-autocfg-1.0 to cargo-inputs. Remove rust-autocfg-0.1 from cargo-development-inputs. --- gnu/packages/crates-io.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d848450430..d697ffc6b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8704,7 +8704,7 @@ (define-public rust-num-bigint-0.2 (define-public rust-num-complex-0.2 (package (name "rust-num-complex") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) @@ -8713,16 +8713,14 @@ (define-public rust-num-complex-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z6zjdzx1g1hj4y132ddy83d3p3zvw06igbf59npxxrzzcqwzc7w")))) + "15dwaksw729r3v14sgzc9723s3fnfixiir8jzwx7b7kim48r9cdn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2) - ("rust-rand" ,rust-rand-0.4) - ("rust-serde" ,rust-serde-1.0)) - #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg-0.1)))) + ("rust-rand" ,rust-rand-0.5) + ("rust-serde" ,rust-serde-1.0) + ("rust-autocfg" ,rust-autocfg-1.0)))) (home-page "https://github.com/rust-num/num-complex") (synopsis -- cgit v1.2.3 From d39efce8bca5e796e53c8a07e33588f61f899cf2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:05:32 +0300 Subject: gnu: Add rust-num-derive-0.2. * gnu/packages/crates-io.scm (rust-num-derive-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d697ffc6b5..730f5659b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8775,6 +8775,33 @@ (define-public rust-num-cpus-1.10 #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))))) +(define-public rust-num-derive-0.2 + (package + (name "rust-num-derive") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wnv7776fh4i40r3zfxcxcmm0dh029skx7gp4sjknz2kqm2hpzga")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) + #:cargo-development-inputs + (("rust-num" ,rust-num-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)))) + (home-page "https://github.com/rust-num/num-derive") + (synopsis "Numeric syntax extensions") + (description "Numeric syntax extensions in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-integer-0.1 (package (name "rust-num-integer") -- cgit v1.2.3 From b950135eb753d152de9c4f1af97591a25851658d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:06:36 +0300 Subject: gnu: Add rust-ordered-float-1.0. * gnu/packages/crates-io.scm (rust-ordered-float-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 730f5659b2..cb90641e65 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9286,6 +9286,32 @@ (define-public rust-openssl-sys-0.9 "This package provides FFI bindings to OpenSSL for use in rust crates.") (license license:expat))) +(define-public rust-ordered-float-1.0 + (package + (name "rust-ordered-float") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordered-float" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0625x96987kspdxbikry5mb7hsf5pdc5bbanxd8wjwqlx0ar71hq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/reem/rust-ordered-float") + (synopsis "Wrappers for total ordering on floats") + (description + "This package provides wrappers for total ordering on floats in Rust.") + (license license:expat))) + (define-public rust-ordermap-0.3 (package (name "rust-ordermap") -- cgit v1.2.3 From 30ceaf3700b3569a911c90fa56bd15a55f5c0467 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:15:31 +0300 Subject: gnu: Add rust-smallvec-1. * gnu/packages/crates-io.scm (rust-smallvec-1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb90641e65..fd5ed8687d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13441,6 +13441,32 @@ (define-public rust-slog-2.4 license:expat license:asl2.0)))) +(define-public rust-smallvec-1 + (package + (name "rust-smallvec") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "smallvec" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z6f47i3qpg9pdjzzvb0g5i1vvdm2ymk3kqc1mdnl8fdkgnb4bsw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) + (home-page "https://github.com/servo/rust-smallvec") + (synopsis "Small vector optimization") + (description + "'Small vector' optimization: store up to a small number of items on the +stack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-smallvec-0.6 (package (name "rust-smallvec") -- cgit v1.2.3 From f628bf4952fe7427ec7fce1cbb7f324bf8e973d5 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:18:01 +0300 Subject: gnu: rust-smallvec-0.6: Inherit from rust-smallvec-1.0. * gnu/packages/crates-io.scm (rust-smallvec-0.6): Inherit from rust-smallvec-1.0. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fd5ed8687d..595c31537d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13469,6 +13469,7 @@ (define-public rust-smallvec-1 (define-public rust-smallvec-0.6 (package + (inherit rust-smallvec-1) (name "rust-smallvec") (version "0.6.10") (source @@ -13479,20 +13480,7 @@ (define-public rust-smallvec-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dyl43rgzny79jjpgzi07y0ly2ggx1xwsn64csxj0j91bsf6lq5b")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1.0)) - #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1)))) - (home-page "https://github.com/servo/rust-smallvec") - (synopsis "Small vector optimization") - (description - "'Small vector' optimization: store up to a small number of items on the -stack.") - (license (list license:expat license:asl2.0)))) + "1dyl43rgzny79jjpgzi07y0ly2ggx1xwsn64csxj0j91bsf6lq5b")))))) (define-public rust-socket2-0.3 (package -- cgit v1.2.3 From d9d4d4f9fabc1514da86a96725f9c35ac3c1e17d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 21:07:25 +0200 Subject: gnu: rust-smallvec-0.6: Update to 0.6.13. * gnu/packages/crates-io.scm (rust-smallvec-0.6): Upgrade to 0.6.13. [arguments]: Add rust-maybe-uninit-2.0 to cargo-inputs. --- gnu/packages/crates-io.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 595c31537d..f839d6d350 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13471,7 +13471,7 @@ (define-public rust-smallvec-0.6 (package (inherit rust-smallvec-1) (name "rust-smallvec") - (version "0.6.10") + (version "0.6.13") (source (origin (method url-fetch) @@ -13480,7 +13480,13 @@ (define-public rust-smallvec-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dyl43rgzny79jjpgzi07y0ly2ggx1xwsn64csxj0j91bsf6lq5b")))))) + "1dl219vnfkmsfx28lm3f83lyw24zap6fdsli6rg8nnp1aa67bc7p")))) + (arguments + `(#:cargo-inputs + (("rust-maybe-uninit" ,rust-maybe-uninit-2.0) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))))) (define-public rust-socket2-0.3 (package -- cgit v1.2.3 From f291ce184d46cb5f433a5acc6469c6158c03f461 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:19:28 +0300 Subject: gnu: Add rust-parking-lot-core-0.7. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f839d6d350..7b93844e58 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9552,6 +9552,37 @@ (define-public rust-parking-lot-0.7 ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) +(define-public rust-parking-lot-core-0.7 + (package + (name "rust-parking-lot-core") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot_core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wdbrvh35nn09ga570vl5062dpwfbrwgzyrlhhy78ifzhj2870km")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cloudabi" ,rust-cloudabi-0.0) + ("rust-libc" ,rust-libc-0.2) + ("rust-petgraph" ,rust-petgraph-0.4) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thread-id" ,rust-thread-id-3.3) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis "API for creating custom synchronization primitives") + (description + "An advanced API for creating custom synchronization primitives in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-parking-lot-core-0.6 (package (name "rust-parking-lot-core") -- cgit v1.2.3 From c6c87f4b7910912614c51dd1981f9ff4404da744 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:20:28 +0300 Subject: gnu: rust-parking-lot-core-0.6: Inherit from rust-parking-lot-core-0.7. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.6): Inherit from rust-parking-lot-core-0.7. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7b93844e58..040da2f519 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9585,6 +9585,7 @@ (define-public rust-parking-lot-core-0.7 (define-public rust-parking-lot-core-0.6 (package + (inherit rust-parking-lot-core-0.7) (name "rust-parking-lot-core") (version "0.6.2") (source @@ -9596,7 +9597,6 @@ (define-public rust-parking-lot-core-0.6 (sha256 (base32 "0ay67dpnrn68ryyvp720m9i8hzp189fd4d6slrs1lvmcwywv2xmq")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -9611,13 +9611,7 @@ (define-public rust-parking-lot-core-0.6 ("rust-thread-id" ,rust-thread-id-3.3) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)))) - (home-page "https://github.com/Amanieu/parking_lot") - (synopsis - "Advanced API for creating custom synchronization primitives") - (description - "An advanced API for creating custom synchronization primitives.") - (license (list license:asl2.0 license:expat)))) + (("rust-rustc-version" ,rust-rustc-version-0.2)))))) (define-public rust-parking-lot-core-0.5 (package -- cgit v1.2.3 From 85f90a96f1655f0d318ebe33750aa57e2bc8dc16 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:23:58 +0300 Subject: gnu: Add rust-parking-lot-0.10. * gnu/packages/crates-io.scm (rust-parking-lot-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 040da2f519..4776679492 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9471,6 +9471,35 @@ (define-public rust-pad-0.1 "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-parking-lot-0.10 + (package + (name "rust-parking-lot") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parking_lot" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z0wgf2sd1266y768kxxs3313zjfzj9r3k7j4arfaz0bmd4qrscj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lock-api" ,rust-lock-api-0.3) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.7)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-rand" ,rust-rand-0.7)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis "Compact standard synchronization primitives") + (description + "More compact and efficient implementations of the standard +synchronization primitives.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-parking-lot-0.9 (package (name "rust-parking-lot") -- cgit v1.2.3 From 9068ccbadde0e9d9e203794be04bb57062363039 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:24:26 +0300 Subject: gnu: rust-parking-lot-0.9: Inherit from rust-parking-lot-0.10. * gnu/packages/crates-io.scm (rust-parking-lot-0.9): Inherit from rust-parking-lot-0.10. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4776679492..81e9396755 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9502,6 +9502,7 @@ (define-public rust-parking-lot-0.10 (define-public rust-parking-lot-0.9 (package + (inherit rust-parking-lot-0.10) (name "rust-parking-lot") (version "0.9.0") (source @@ -9513,7 +9514,6 @@ (define-public rust-parking-lot-0.9 (sha256 (base32 "0lk2vq3hp88ygpgsrypdr3ss71fidnqbykva0csgxhmn5scb2hpq")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -9523,13 +9523,7 @@ (define-public rust-parking-lot-0.9 (("rust-bincode" ,rust-bincode-1.1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) - ("rust-rustc-version" ,rust-rustc-version-0.2)))) - (home-page "https://github.com/Amanieu/parking_lot") - (synopsis "Compact standard synchronization primitives") - (description - "More compact and efficient implementations of the standard -synchronization primitives.") - (license (list license:asl2.0 license:expat)))) + ("rust-rustc-version" ,rust-rustc-version-0.2)))))) (define-public rust-parking-lot-0.8 (package -- cgit v1.2.3 From 9c754174f1767f148de49491fd25d59060cb1136 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:26:27 +0300 Subject: gnu: Add rust-crypto-mac-0.7. * gnu/packages/crates-io.scm (rust-crypto-mac-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 81e9396755..0bb34aa7e9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2662,6 +2662,31 @@ (define-public rust-crossbeam-utils-0.6 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-crypto-mac-0.7 + (package + (name "rust-crypto-mac") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crypto-mac" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rbrq6qy9dl0pj4ym2zy33miaaa8vpzdss60p9bdb58xy46l0d24")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-blobby" ,rust-blobby-0.1) + ("rust-generic-array" ,rust-generic-array-0.12) + ("rust-subtle" ,rust-subtle-1.0)))) + (home-page "https://github.com/RustCrypto/traits") + (synopsis "Trait for Message Authentication Code (MAC) algorithms") + (description "This package provides trait for @dfn{Message Authentication +Code} (MAC) algorithms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-csv-1.1 (package (name "rust-csv") -- cgit v1.2.3 From b3857bd0e4891b3ef4ab93551a75fe8924c51756 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:27:50 +0300 Subject: gnu: Add rust-proc-macro-hack-0.4. * gnu/packages/crates-io.scm (rust-proc-macro-hack-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0bb34aa7e9..d3b8a8ebb7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10397,6 +10397,28 @@ (define-public rust-proc-macro-hack-0.5 "Procedural macros in expression position.") (license (list license:expat license:asl2.0)))) +(define-public rust-proc-macro-hack-0.4 + (package + (inherit rust-proc-macro-hack-0.5) + (name "rust-proc-macro-hack") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-hack" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fxn3qfhw76c518dfal2qqjwj5dbf0a1f7z0r5c4wd0igygg4fs6")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro-hack-impl" ,rust-proc-macro-hack-impl-0.4)) + #:cargo-development-inputs + (("rust-demo-hack" ,rust-demo-hack-0.0) + ("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0)))))) + (define-public rust-proc-macro-hack-impl-0.4 (package (name "rust-proc-macro-hack-impl") -- cgit v1.2.3 From 87786e13bafbcb9efd27d53e0855cac0a264e23f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:28:17 +0300 Subject: gnu: Add rust-hex-literal-impl-0.1. * gnu/packages/crates-io.scm (rust-hex-literal-impl-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d3b8a8ebb7..7264ed1c95 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6020,6 +6020,24 @@ (define-public rust-hex-literal-impl-0.2 "Internal implementation of the hex-literal crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hex-literal-impl-0.1 + (package + (inherit rust-hex-literal-impl-0.2) + (name "rust-hex-literal-impl") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex-literal-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nnxqhyn9l998ma04ip79bmpqv1as6003s03g26ynhrr471p022j")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4)))))) + (define-public rust-html5ever-0.23 (package (name "rust-html5ever") -- cgit v1.2.3 From dd6e098281abde0a97dad33877cceeffc1f3726a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:28:54 +0300 Subject: gnu: Add rust-hex-literal-0.1. * gnu/packages/crates-io.scm (rust-hex-literal-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7264ed1c95..bd033dd61e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5996,6 +5996,25 @@ (define-public rust-hex-literal-0.2 compile time.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hex-literal-0.1 + (package + (inherit rust-hex-literal-0.2) + (name "rust-hex-literal") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex-literal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ffnn5g9q5xhdmzj2ic5hk9y18kyqflbmqcssqcya9gixs5r5hnx")))) + (arguments + `(#:cargo-inputs + (("rust-hex-literal-impl" ,rust-hex-literal-impl-0.1) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4)))))) + (define-public rust-hex-literal-impl-0.2 (package (name "rust-hex-literal-impl") -- cgit v1.2.3 From fecf61d2ac2cfddaff66596d16b2bafc0b6a5fad Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 19 Jan 2020 22:29:23 +0300 Subject: gnu: Add rust-blake2-0.8. * gnu/packages/crates-io.scm (rust-blake2-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bd033dd61e..9c5b1af15c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1038,6 +1038,35 @@ (define-public rust-bitflags-0.7 (base32 "0v8hh6wdkpk9my8z8442g4hqrqf05h0qj53dsay6mv18lqvqklda")))))) +(define-public rust-blake2-0.8 + (package + (name "rust-blake2") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "blake2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c4k11j04kqhkci6i9b7lz6p13kpcv228pdqixgrawvavaq0gjwl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byte-tools" ,rust-byte-tools-0.3) + ("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-digest" ,rust-digest-0.8) + ("rust-opaque-debug" ,rust-opaque-debug-0.2)) + #:cargo-development-inputs + (("rust-crypto-mac" ,rust-crypto-mac-0.7) + ("rust-digest" ,rust-digest-0.8) + ("rust-hex-literal" ,rust-hex-literal-0.1)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "BLAKE2 hash functions") + (description "This package provides BLAKE2 hash functions in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-blake2-rfc-0.2 (package (name "rust-blake2-rfc") -- cgit v1.2.3 From ce0d84d1747d09af4d64450e1f3b8762a38af32c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 00:14:36 +0300 Subject: gnu: Add rust-proptest-0.8. * gnu/packages/crates-io.scm (rust-proptest-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c5b1af15c..6f997bc524 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10610,6 +10610,37 @@ (define-public rust-proptest-0.9 "Hypothesis-like property-based testing and shrinking.") (license (list license:asl2.0 license:expat)))) +(define-public rust-proptest-0.8 + (package + (inherit rust-proptest-0.9) + (name "rust-proptest") + (version "0.8.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "proptest" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07qrxwsd72wr1cqs0b5b159lnagjffp0l4s4zriz8jak8w20cvcj")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; 1 doc test fails + #:cargo-inputs + (("rust-bit-set" ,rust-bit-set-0.5) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-quick-error" ,rust-quick-error-1.2) + ("rust-rand" ,rust-rand-0.5) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-rusty-fork" ,rust-rusty-fork-0.2) + ("rust-tempfile" ,rust-tempfile-3.0)) + #:cargo-development-inputs + (("rust-regex" ,rust-regex-1.1)))))) + (define-public rust-psm-0.1 (package (name "rust-psm") -- cgit v1.2.3 From fa2fd513abd974be2ad53b159843b06dd9ea31f7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 00:15:15 +0300 Subject: gnu: Add rust-arc-swap-0.4. * gnu/packages/crates-io.scm (rust-arc-swap-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6f997bc524..73eb0dfbe9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -346,6 +346,34 @@ (define-public rust-approx-0.1 "153awzwywmb61xg857b80l63b1x6hifx2pha7lxf6fck9qxwraq8")))) (arguments '()))) +(define-public rust-arc-swap-0.4 + (package + (name "rust-arc-swap") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "arc-swap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zwswfi9n7n3hiq51w1xv34572k2diazx680rrxlc9w07c9akf6p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-model" ,rust-model-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-once-cell" ,rust-once-cell-1.2) + ("rust-proptest" ,rust-proptest-0.8) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/vorner/arc-swap") + (synopsis "Atomically swappable Arc") + (description "This package provides an atomically swappable Arc.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-arc-swap-0.3 (package (name "rust-arc-swap") -- cgit v1.2.3 From 3ceb20988a34ba2058b4a359f43d522c65adb4c2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 00:16:02 +0300 Subject: gnu: rust-arc-swap-0.3: Inherit from rust-arc-swap-0.4. * gnu/packages/crates-io.scm (rust-arc-swap-0.3): Inherit from rust-arc-swap-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 73eb0dfbe9..920fb281dc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -376,6 +376,7 @@ (define-public rust-arc-swap-0.4 (define-public rust-arc-swap-0.3 (package + (inherit rust-arc-swap-0.4) (name "rust-arc-swap") (version "0.3.11") (source @@ -387,7 +388,6 @@ (define-public rust-arc-swap-0.3 (sha256 (base32 "0ha8724dpki985v52ifq5sd98xvpa5q51hyma52di75dbqbn4imw")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-development-inputs @@ -399,11 +399,7 @@ (define-public rust-arc-swap-0.3 ("rust-num-cpus" ,rust-num-cpus-1.10) ("rust-parking-lot" ,rust-parking-lot-0.8) ("rust-proptest" ,rust-proptest-0.9) - ("rust-version-sync" ,rust-version-sync-0.8)))) - (home-page "https://github.com/vorner/arc-swap") - (synopsis "Atomically swappable Arc") - (description "This package provides an atomically swappable Arc.") - (license (list license:expat license:asl2.0)))) + ("rust-version-sync" ,rust-version-sync-0.8)))))) (define-public rust-argon2rs-0.2 (package -- cgit v1.2.3 From 343417b0b8c96be15db3e406a8203ee8bb67e16b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 00:43:50 +0300 Subject: gnu: Add rust-term-0.6. * gnu/packages/crates-io.scm (rust-term-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 920fb281dc..8167298b73 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14792,6 +14792,30 @@ (define-public rust-tendril-0.4 "Compact buffer/string type for zero-copy parsing.") (license (list license:expat license:asl2.0)))) +(define-public rust-term-0.6 + (package + (name "rust-term") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ddqxq9hrk8zqq1f8pqhz72vrlfc8vh2xcza2gb623z78lrkm1n0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dirs" ,rust-dirs-2.0) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Stebalien/term") + (synopsis "Terminal formatting library") + (description + "This package provides a terminal formatting library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-term-0.5 (package (name "rust-term") -- cgit v1.2.3 From ba16a5641d50992b013c8606e44217846bd91a04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 21:53:27 +0200 Subject: gnu: rust-term-0.5: Inherit from rust-term--0.6. * gnu/packages/crates-io.scm (rust-term-0.5): Inherit from rust-term-0.6. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8167298b73..abf2b90522 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14818,6 +14818,7 @@ (define-public rust-term-0.6 (define-public rust-term-0.5 (package + (inherit rust-term-0.6) (name "rust-term") (version "0.5.2") (source @@ -14829,19 +14830,11 @@ (define-public rust-term-0.5 (sha256 (base32 "0hkgjrfisj6zjwz525639pmsvzhlc48a0h65nw87qrdp6jihdlgd")))) - (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) ("rust-dirs" ,rust-dirs-1.0) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/Stebalien/term") - (synopsis "Terminal formatting library") - (description - "This package provides a terminal formatting library in rust.") - (license (list license:asl2.0 - license:expat)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-term-0.4 (package -- cgit v1.2.3 From b5478ee6a5a17b59e46ece190533bb7c9c5fe482 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 21:54:44 +0200 Subject: gnu: rust-term-0.4: Inherit from rust-term-0.6. * gnu/packages/crates-io.scm (rust-term-0.4): Inherit from rust-term-0.6. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index abf2b90522..144cf6d76b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14838,7 +14838,7 @@ (define-public rust-term-0.5 (define-public rust-term-0.4 (package - (inherit rust-term-0.5) + (inherit rust-term-0.6) (name "rust-term") (version "0.4.6") (source @@ -14850,8 +14850,7 @@ (define-public rust-term-0.4 (base32 "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-winapi" ,rust-winapi-0.2)))))) -- cgit v1.2.3 From 14bae8e7204ff8df203d8baf59a4b2187677be3b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:02:37 +0300 Subject: gnu: Add rust-terminfo-0.6. * gnu/packages/crates-io.scm (rust-terminfo-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 144cf6d76b..7db29f48bd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14950,6 +14950,31 @@ (define-public rust-termcolor-1.0 (license (list license:unlicense license:expat)))) +(define-public rust-terminfo-0.6 + (package + (name "rust-terminfo") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "terminfo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17k8vqvicd6yg0iqmkjnxjhz8h8pknv86r03nq3f3ayjmxdhclcf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fnv" ,rust-fnv-1.0) + ("rust-nom" ,rust-nom-4.2) + ("rust-phf" ,rust-phf-0.7) + ("rust-phf-codegen" ,rust-phf-codegen-0.7)))) + (home-page "https://github.com/meh/rust-terminfo") + (synopsis "Terminal information") + (description "Terminal capabilities with type-safe getters.") + (license license:wtfpl2))) + (define-public rust-termion-1.5 (package (name "rust-termion") -- cgit v1.2.3 From c7690cc0ced4a739de5047f4108eb8595c40a49d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 22:02:25 +0200 Subject: gnu: rust-phf-generator-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-phf-generator-0.7)[arguments]: Don't skip build. Replace rust-rand-0.4 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7db29f48bd..5bee17cf61 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10198,10 +10198,9 @@ (define-public rust-phf-generator-0.7 "0qi62gxk3x3whrmw5c4i71406icqk11qmpgln438p6qm7k4lqdh9")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-phf-shared" ,rust-phf-shared-0.7) - ("rust-rand" ,rust-rand-0.4)))) + ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/sfackler/rust-phf") (synopsis "PHF generation logic") (description "PHF generation logic") -- cgit v1.2.3 From 3b8f797fe80de21c4f08094304b0e7c8c44c9700 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 22:05:58 +0200 Subject: gnu: Add rust-unicase-1. * gnu/packages/crates-io.scm (rust-unicase-1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5bee17cf61..5b73e728b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16271,6 +16271,26 @@ (define-public rust-unicase-2.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-unicase-1 + (package + (inherit rust-unicase-2.4) + (name "rust-unicase") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicase" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cwazh4qsmm9msckjk86zc1z35xg7hjxjykrgjalzdv367w6aivz")))) + (arguments + `(#:cargo-inputs + (("rust-heapsize" ,rust-heapsize-0.3) + ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1) + ("rust-version-check" ,rust-version-check-0.1)))))) + (define-public rust-unicode-bidi-0.3 (package (name "rust-unicode-bidi") -- cgit v1.2.3 From 5cbb5cb4505feb4e798eb2e0865428dd8fa980a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 22:07:49 +0200 Subject: gnu: rust-phf-shared-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-phf-shared-0.7)[arguments]: Don't skip build. Replace rust-unicase-2.4 with 1 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b73e728b3..430b94185a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10253,10 +10253,9 @@ (define-public rust-phf-shared-0.7 "18371fla0vsj7d6d5rlfb747xbr2in11ar9vgv5qna72bnhp2kr3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-siphasher" ,rust-siphasher-0.2) - ("rust-unicase" ,rust-unicase-2.4)))) + ("rust-unicase" ,rust-unicase-1)))) (home-page "https://github.com/sfackler/rust-phf") (synopsis "Support code shared by PHF libraries") (description -- cgit v1.2.3 From 666ec58fd3769c87462450f207fa5f50b4dc3d54 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 22:19:11 +0200 Subject: gnu: rust-phf-macros-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-phf-macros-0.7)[arguments]: Don't skip build. Skip tests. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 430b94185a..42b0efc7af 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10221,12 +10221,12 @@ (define-public rust-phf-macros-0.7 "0dzylcy14ksy60h265l433j9ra8xhg8xlq3pd5qk658m6f1mxd5x")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Depends on features not in Rust's stable release channel. #:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.7) ("rust-phf-shared" ,rust-phf-shared-0.7) ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)) #:cargo-development-inputs (("rust-compiletest-rs" ,rust-compiletest-rs-0.3)))) -- cgit v1.2.3 From da6f1bf0a10caa0d8cd97aad15fff914adf5f903 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 22:21:09 +0200 Subject: gnu: rust-phf-codegen-0.7: Don't skip build. * gnu/packages/crates-io.scm (rust-phf-codegen-0.7)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 42b0efc7af..b11bf6c944 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10173,8 +10173,7 @@ (define-public rust-phf-codegen-0.7 "0zjiblicfm0nrmr2xxrs6pnf6zz2394wgch6dcbd8jijkq98agmh")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.7) ("rust-phf-shared" ,rust-phf-shared-0.7)))) (home-page -- cgit v1.2.3 From 08fee94d0fd96ea2b40f9fec80dc3fa19e283019 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 23 Feb 2020 23:54:38 +0100 Subject: gnu: cpuid: Update to 20200211. * gnu/packages/linux.scm (cpuid): Update to 20200211. Signed-off-by: Tobias Geerinckx-Rice --- 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 f0fd2fb5df..3fdc716545 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5626,14 +5626,14 @@ (define-public proot-static (define-public cpuid (package (name "cpuid") - (version "20200116") + (version "20200211") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "1gxi4iwy6j366l6bkj1yyxhrk1rxmwfp498gikfxn8xwhij9dn0a")))) + "06sjbqqp80l7nhsp6khglkzdp9qy4vhbvjxbfilznhsmrqiwlw55")))) (build-system gnu-build-system) (arguments '(#:make-flags '("CC=gcc") -- cgit v1.2.3 From 98f790405c326cde29000e3834a0001ea4dd6d0e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 23 Feb 2020 20:31:32 -0500 Subject: gnu: roguebox-adventures: Update to 3.0.1. * gnu/packages/games.scm (roguebox-adventures): Update to 3.0.1. [arguments]: Adjust 'build' phase accordingly. --- gnu/packages/games.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2e393dac61..d46253cda1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1388,7 +1388,7 @@ (define-public retux (define-public roguebox-adventures (package (name "roguebox-adventures") - (version "2.2.1") + (version "3.0.1") (source (origin (method url-fetch) @@ -1398,7 +1398,7 @@ (define-public roguebox-adventures (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "0kmzdgnik8fsf3bg55546l77p3mfxn2awkzfzzdn20n82rd2babw")))) + "05zd03s5w9kcpklfgcggbaa6rwf59nm0q9vcj6gh9v2lh402k067")))) (build-system python-build-system) (arguments `(#:tests? #f ; no check target @@ -1424,6 +1424,9 @@ (define-public roguebox-adventures (string-append "'" data "'")) (("^basic_path.*$") (string-append "basic_path ='" data "'\n"))) + (substitute* "LIB/dialog.py" + (("d_path = os\\.path\\.dirname\\(.*\\)\\)") + (string-append "d_path = '" data "'"))) (substitute* "LIB/gra_files.py" (("basic_path = b_path\\.replace\\('/LIB',''\\)") (string-append "basic_path ='" data "'\n"))) -- cgit v1.2.3 From 99fa3a2fc93c83bc2e0aec3f03f7f967c0a51714 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 24 Feb 2020 03:28:01 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.106. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.106. (linux-libre-4.19-pristine-source): 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 3fdc716545..4bca8ce852 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,10 +367,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.105") +(define-public linux-libre-4.19-version "4.19.106") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q"))) + (hash (base32 "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 73970fd2c88606771c23a04b7b26c9d2e2b175f4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 24 Feb 2020 03:29:16 -0500 Subject: gnu: linux-libre: Update to 5.4.22. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.22. (linux-libre-5.4-pristine-source): 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 4bca8ce852..78182555c1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,10 +359,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.21") +(define-public linux-libre-5.4-version "5.4.22") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd"))) + (hash (base32 "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 84c86dcebead3b8422bd413fff545e8e76b3f3e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 08:55:40 +0100 Subject: gnu: emacs-slack: Update to 0.0.2-7.b7b9ead. * gnu/packages/emacs-xyz.scm (emacs-slack): Update to 0.0.2-7.b7b9ead. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 16e5a32574..be0e6a84c2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11016,8 +11016,8 @@ (define-public emacs-tracking (license license:gpl3+))) (define-public emacs-slack - (let ((commit "10fbb81f567b44647ad125a48ecd72df106fb624") - (revision "6")) + (let ((commit "b7b9eada0bf62d40dfe764b00f55913a2d3d742e") + (revision "7")) (package (name "emacs-slack") (version (git-version "0.0.2" revision commit)) @@ -11029,7 +11029,7 @@ (define-public emacs-slack (file-name (git-file-name name commit)) (sha256 (base32 - "01ln9rbalgpxw6rbr4czhy6bd8wrrpyf0qgn2chcq3zmmrn4sy1z")))) + "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 08048ce994a52440162c3a5fc9bf3f17c9affa24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 09:44:38 +0100 Subject: gnu: Add r-iheatmapr. * gnu/packages/cran.scm (r-iheatmapr): New variable. Co-authored-by: Marcel Schilling --- gnu/packages/cran.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 60947c5f3f..67f14a3b88 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20200,3 +20200,41 @@ (define-public r-irtoys array of parametric and non-parametric (kernel) plots. It estimates and plots Haberman's interaction model when all items are dichotomously scored.") (license license:gpl2+))) + +(define-public r-iheatmapr + (package + (name "r-iheatmapr") + (version "0.4.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "iheatmapr" version)) + (sha256 + (base32 + "0s479j9l35xiss599vablxgvg6i2j9zq9sxphsq4vdk3bafg84bw")))) + (properties `((upstream-name . "iheatmapr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-fastcluster" ,r-fastcluster) + ("r-ggdendro" ,r-ggdendro) + ("r-htmlwidgets" ,r-htmlwidgets) + ("r-jsonlite" ,r-jsonlite) + ("r-knitr" ,r-knitr) + ("r-magrittr" ,r-magrittr) + ("r-plyr" ,r-plyr) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-s4vectors" ,r-s4vectors) + ("r-scales" ,r-scales))) + (home-page "https://docs.ropensci.org/iheatmapr") + (synopsis "Interactive, Complex Heatmaps") + (description + "iheatmapr is an R package for building complex, interactive heatmaps +using modular building blocks. \"Complex\" heatmaps are heatmaps in which +subplots along the rows or columns of the main heatmap add more information +about each row or column. For example, a one column additional heatmap may +indicate what group a particular row or column belongs to. Complex heatmaps +may also include multiple side by side heatmaps which show different types of +data for the same conditions. Interactivity can improve complex heatmaps by +providing tooltips with information about each cell and enabling zooming into +interesting features. iheatmapr uses the plotly library for interactivity.") + (license license:expat))) -- cgit v1.2.3 From 5213b6975aef23cca2fc9dd8d9f201907e5548f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Feb 2020 09:09:45 +0200 Subject: gnu: librsvg-next: Update dependencies. * gnu/packages/gnome.scm (librsvg-next-source): Update rust dependencies. --- gnu/packages/gnome.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c64b182869..af45ceb505 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2181,7 +2181,15 @@ (define librsvg-next-source ;; The following crate(s) are needed in addition to the ones replaced: (begin (invoke - "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")) + "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor") + (invoke + "tar" "xvf" #+(package-source rust-proc-macro2-0.4) "-C" "vendor") + (invoke + "tar" "xvf" #+(package-source rust-quote-0.6) "-C" "vendor") + (invoke + "tar" "xvf" #+(package-source rust-unicode-xid-0.1) "-C" "vendor") + (invoke + "tar" "xvf" #+(package-source rust-maybe-uninit-2.0) "-C" "vendor")) (for-each (lambda (crate) (delete-file-recursively (string-append "vendor/" (car crate))) @@ -2246,7 +2254,7 @@ (define librsvg-next-source ;; locale_config 0.3 ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) -;; malloc_buf 0.0 + ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) ;; markup5ever 0.9 ("matches" . #+(package-source rust-matches-0.1)) ;; matrixmultiply 0.2 @@ -2257,12 +2265,12 @@ (define librsvg-next-source ("nodrop" . #+(package-source rust-nodrop-0.1)) ("num-complex" . #+(package-source rust-num-complex-0.2)) ("num-integer" . #+(package-source rust-num-integer-0.1)) -;; num-rational 0.2 + ("num-rational" . #+(package-source rust-num-rational-0.2)) ("num-traits" . #+(package-source rust-num-traits-0.2)) ("num_cpus" . #+(package-source rust-num-cpus-1.10)) -;; objc 0.2 -;; objc-foundation 0.1 -;; objc_id 0.1 + ("objc" . #+(package-source rust-objc-0.2)) + ("objc-foundation" . #+(package-source rust-objc-foundation-0.1)) + ("objc_id" . #+(package-source rust-objc-id-0.1)) ;; pango 0.7 ;; pango-sys 0.9 ;; pangocairo 0.8 @@ -2308,7 +2316,7 @@ (define librsvg-next-source ("siphasher" . #+(package-source rust-siphasher-0.2)) ("smallvec" . #+(package-source rust-smallvec-0.6)) ("string_cache" . #+(package-source rust-string-cache-0.7)) - ;("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4)) + ("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4)) ("string_cache_shared" . #+(package-source rust-string-cache-shared-0.3)) ("syn" . #+(package-source rust-syn-1.0)) ("tendril" . #+(package-source rust-tendril-0.4)) @@ -2327,8 +2335,7 @@ (define librsvg-next-source ("winapi-i686-pc-windows-gnu" . #+(package-source rust-winapi-i686-pc-windows-gnu-0.4)) ("winapi-util" . #+(package-source rust-winapi-util-0.1)) ("winapi-x86_64-pc-windows-gnu" . #+(package-source rust-winapi-x86-64-pc-windows-gnu-0.4)) -;; xml-rs 0.8 - ))) + ("xml-rs" . #+(package-source rust-xml-rs-0.8))))) (format #t "Replacing vendored crates in the tarball and repacking ...~%") (force-output) (invoke "tar" "cfa" #$output -- cgit v1.2.3 From dd44f126bd82c2c0f817dae7a58582a01ce199db Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:04:02 +0300 Subject: gnu: Add rust-thread-id-2.0. * gnu/packages/crates-io.scm (rust-thread-id-2.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b11bf6c944..13e33b4731 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15180,6 +15180,25 @@ (define-public rust-thread-id-3.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-thread-id-2.0 + (package + (inherit rust-thread-id-3.3) + (name "rust-thread-id") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread-id" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00zzs2bx1xw8aqm5plqqgr7bc2zz6zkqrdxq8vpiqb8hc2srslx9")))) + (arguments + `(#:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-thread-local-1.0 (package (name "rust-thread-local") -- cgit v1.2.3 From a4a82cda205933d40c42f2e08ec74f5ac1887f6a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:05:22 +0300 Subject: gnu: Add rust-thread-local-0.2. * gnu/packages/crates-io.scm (rust-thread-local-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 13e33b4731..002eb458b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15238,6 +15238,24 @@ (define-public rust-thread-local-0.3 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) +(define-public rust-thread-local-0.2 + (package + (inherit rust-thread-local-0.3) + (name "rust-thread-local") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread_local" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mgxikqvhpsic6xk7pan95lvgsky1sdxzw2w5m2l35pgrazxnxl5")))) + (arguments + `(#:cargo-inputs + (("rust-thread-id" ,rust-thread-id-2.0)))))) + (define-public rust-threadpool-1.7 (package (name "rust-threadpool") -- cgit v1.2.3 From b6d435dacbd046e9b00511b25e07c6badffcd5d8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:10:21 +0300 Subject: gnu: Add rust-calloop-0.4. * gnu/packages/crates-io.scm (rust-calloop-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 002eb458b9..7c8889c9ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1500,6 +1500,39 @@ (define-public rust-c2-chacha-0.2 "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-calloop-0.4 + (package + (name "rust-calloop") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "calloop" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0q6ic9lr0s86886mbyn4yncg68b2sykgwjf3iygdw01swmxhk8ks")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("=1.0.0") "^1.0.0")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-nix" ,rust-nix-0.14)) + #:cargo-development-inputs + (("rust-lazycell" ,rust-lazycell-1.2)))) + (home-page "https://github.com/Smithay/calloop") + (synopsis "Callback-based event loop") + (description + "This package provides a callback-based event loop") + (license license:expat))) + (define-public rust-caps-0.3 (package (name "rust-caps") -- cgit v1.2.3 From 84ab590cc01fffaf2fc6161271359a9db265904f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:15:57 +0300 Subject: gnu: Add rust-cgl-0.3. * gnu/packages/crates-io.scm (rust-cgl-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c8889c9ef..1a81695bf6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1747,6 +1747,28 @@ (define-public rust-cfg-if-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-cgl-0.3 + (package + (name "rust-cgl") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cgl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zs7skrsyrsm759vfy2cygkx52fx91b567a12bpaz1sf4d8hbv8c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only available on macOS + #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/cgl-rs") + (synopsis "Rust bindings for CGL on Mac") + (description "Rust bindings for CGL on Mac.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From c916b87ce96b30cab2163e09b790e5667fe49169 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:12:19 +0300 Subject: gnu: Add rust-clang-sys-0.22. * gnu/packages/crates-io.scm (rust-clang-sys-0.22): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a81695bf6..15e90da432 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1855,6 +1855,36 @@ (define-public rust-clang-sys-0.26 (string-append clang "/lib"))) #t))))))) +(define-public rust-clang-sys-0.22 + (package + (inherit rust-clang-sys-0.26) + (name "rust-clang-sys") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clang-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f65dw1ydnzq4wrv894fql78n4ikb53jjp53xck0s4hb64s1m6lk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-glob" ,rust-glob-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.5)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))))) + (define-public rust-clap-2 (package (name "rust-clap") -- cgit v1.2.3 From 2eddc2a25165eea1a00767cf183f0c62964da866 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:17:06 +0300 Subject: gnu: Add rust-gl-generator-0.14. * gnu/packages/crates-io.scm (rust-gl-generator-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15e90da432..40fbb0e558 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5522,6 +5522,31 @@ (define-public rust-git2-0.9 ("rust-thread-id" ,rust-thread-id-3.3) ("rust-time" ,rust-time-0.1)))))) +(define-public rust-gl-generator-0.14 + (package + (name "rust-gl-generator") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gl-generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k8j1hmfnff312gy7x1aqjzcm8zxid7ij7dlb8prljib7b1dz58s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-khronos-api" ,rust-khronos-api-3) + ("rust-log" ,rust-log-0.4) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (home-page "https://github.com/brendanzab/gl-rs/") + (synopsis "Code generators for bindings to the Khronos OpenGL APIs") + (description + "Code generators for creating bindings to the Khronos OpenGL APIs.") + (license license:asl2.0))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From 056be0d2fc104e6a16b7f949e7eebc620863929d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:17:36 +0300 Subject: gnu: Add rust-gl-generator-0.13. * gnu/packages/crates-io.scm (rust-gl-generator-0.13): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 40fbb0e558..09736048b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5547,6 +5547,21 @@ (define-public rust-gl-generator-0.14 "Code generators for creating bindings to the Khronos OpenGL APIs.") (license license:asl2.0))) +(define-public rust-gl-generator-0.13 + (package + (inherit rust-gl-generator-0.14) + (name "rust-gl-generator") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gl-generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jpqjqpyrl73sf8y20p5rv50qz8glnsvv9infg8h4vi52zgbp66a")))))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From 0389f288d6d8902dc67f89802676c462b4608055 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:18:50 +0300 Subject: gnu: Add rust-gleam-0.6. * gnu/packages/crates-io.scm (rust-gleam-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09736048b5..332ce2ee05 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5562,6 +5562,29 @@ (define-public rust-gl-generator-0.13 (base32 "0jpqjqpyrl73sf8y20p5rv50qz8glnsvv9infg8h4vi52zgbp66a")))))) +(define-public rust-gleam-0.6 + (package + (name "rust-gleam") + (version "0.6.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "gleam" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iazvk3kvw3620gm6x8hy2x1lz51k04acl78cr3ppryhk5y0vqfa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.13)))) + (home-page "https://github.com/servo/gleam") + (synopsis "Generated OpenGL bindings and wrapper for Servo") + (description + "Generated OpenGL bindings and wrapper for Servo.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From 23b1519e902792ee1e2162ca99cbd914846ffb2b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:19:25 +0300 Subject: gnu: Add rust-cgl-0.2. * gnu/packages/crates-io.scm (rust-cgl-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 332ce2ee05..751e94916f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1769,6 +1769,26 @@ (define-public rust-cgl-0.3 (description "Rust bindings for CGL on Mac.") (license (list license:expat license:asl2.0)))) +(define-public rust-cgl-0.2 + (package + (inherit rust-cgl-0.3) + (name "rust-cgl") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "cgl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0j8ayr8pbwvyv6l8r7m5z197rs3pqn97085w9j4rfn7yfh5yrrsm")))) + (arguments + `(#:skip-build? #t ; only available on macOS + #:cargo-inputs + (("rust-gleam" ,rust-gleam-0.6) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From b7fce0bf18c965b5ba6a9b486623dc0bfcce4422 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:17:50 +0300 Subject: gnu: Add rust-gl-generator-0.11. * gnu/packages/crates-io.scm (rust-gl-generator-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 751e94916f..1aab55c46f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5582,6 +5582,21 @@ (define-public rust-gl-generator-0.13 (base32 "0jpqjqpyrl73sf8y20p5rv50qz8glnsvv9infg8h4vi52zgbp66a")))))) +(define-public rust-gl-generator-0.11 + (package + (inherit rust-gl-generator-0.13) + (name "rust-gl-generator") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gl-generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gdchvay0k0g931b2ki33mkfixcw4radk5b8sqsm29rahxg3v8ir")))))) + (define-public rust-gleam-0.6 (package (name "rust-gleam") -- cgit v1.2.3 From 7b656f0ef5ebc4204a7f2c3c262e1fc9f425e49c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:21:34 +0300 Subject: gnu: Add rust-signal-hook-registry-1.2. * gnu/packages/crates-io.scm (rust-signal-hook-registry-1.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1aab55c46f..a745c93d26 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13714,6 +13714,32 @@ (define-public rust-signal-hook-0.1 (description "Unix signal handling.") (license (list license:asl2.0 license:expat)))) +(define-public rust-signal-hook-registry-1.2 + (package + (name "rust-signal-hook-registry") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "signal-hook-registry" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0haz828bif1lbp3alx17zkcy5hwy15bbpmvks72j8iznx7npix4l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arc-swap" ,rust-arc-swap-0.4) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/vorner/signal-hook") + (synopsis "Backend crate for signal-hook") + (description "Backend crate for signal-hook.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-signal-hook-registry-1.0 (package (name "rust-signal-hook-registry") -- cgit v1.2.3 From b2843488d9dcb4de5a2115e37e2d827498dbf799 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:22:10 +0300 Subject: gnu: rust-signal-hook-0.1: Update to 0.1.13. * gnu/packages/crates-io.scm (rust-signal-hook-0.1): Update to 0.1.13. [arguments]: Don't skip build. Replace rust-signal-hook-registry-1.0 with 1.2 in cargo-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a745c93d26..d4b5c40409 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13686,7 +13686,7 @@ (define-public rust-shlex-0.1 (define-public rust-signal-hook-0.1 (package (name "rust-signal-hook") - (version "0.1.9") + (version "0.1.13") (source (origin (method url-fetch) @@ -13695,16 +13695,15 @@ (define-public rust-signal-hook-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nlw1gwi58ppds5klyy8vp2ickx3majvdp1pcdz8adm4zpqmiavj")))) + "0b0yh6hlb5hs5kq6adyk0bn168y1ncymxvlizlygaabad2hz7f8h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-mio-uds" ,rust-mio-uds-0.6) - ("rust-signal-hook-registry" ,rust-signal-hook-registry-1.0) + ("rust-signal-hook-registry" ,rust-signal-hook-registry-1.2) ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.1) -- cgit v1.2.3 From f9a796c36b0590236eac97ce716768d60f983734 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:25:03 +0300 Subject: gnu: rust-signal-hook-registry-1.0: Inherit from rust-signal-hook-registry-1.2. * gnu/packages/crates-io.scm (rust-signal-hook-registry-1.0): Inherit from from rust-signal-hook-registry-1.2. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4b5c40409..58ddba0c3f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13741,6 +13741,7 @@ (define-public rust-signal-hook-registry-1.2 (define-public rust-signal-hook-registry-1.0 (package + (inherit rust-signal-hook-registry-1.2) (name "rust-signal-hook-registry") (version "1.0.1") (source @@ -13754,17 +13755,12 @@ (define-public rust-signal-hook-registry-1.0 "1mw5v909fn99h5qb96ma4almlik80lr1c7xbakn24rql6bx4zvfd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-0.3) ("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-signal-hook" ,rust-signal-hook-0.1) - ("rust-version-sync" ,rust-version-sync-0.8)))) - (home-page "https://github.com/vorner/signal-hook") - (synopsis "Backend crate for signal-hook") - (description "Backend crate for signal-hook.") - (license (list license:expat license:asl2.0)))) + ("rust-version-sync" ,rust-version-sync-0.8)))))) (define-public rust-siphasher-0.2 (package -- cgit v1.2.3 From 86234fb6d468965451a47c7a5d2c352e170f9b02 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Feb 2020 10:08:30 +0200 Subject: gnu: rust-siphasher-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-siphasher-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58ddba0c3f..913c42f850 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13776,7 +13776,6 @@ (define-public rust-siphasher-0.2 (base32 "1b53m53l24lyhr505lwqzrpjyq5qfnic71mynrcfvm43rybf938b")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://docs.rs/siphasher") (synopsis "SipHash functions from rust-core < 1.13") (description -- cgit v1.2.3 From 074f9ad441bb2b0d33322b2c75975bdaf687d8aa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 01:28:23 +0300 Subject: gnu: Add rust-simd-0.2. * gnu/packages/crates-io.scm (rust-simd-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 913c42f850..8f45da74e0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13762,6 +13762,36 @@ (define-public rust-signal-hook-registry-1.0 (("rust-signal-hook" ,rust-signal-hook-0.1) ("rust-version-sync" ,rust-version-sync-0.8)))))) +(define-public rust-simd-0.2 + (package + (name "rust-simd") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dgpmfzd4favsckd5m0p6bna1dcgw19hjigkqcgwfhc4d05hxczj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Crate no longer builds on Rust 1.33+ + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1)))) + (home-page "https://github.com/hsivonen/simd") + (synopsis "Limited cross-platform access to SIMD instructions on CPUs") + (description + "@code{simd} offers limited cross-platform access to SIMD instructions on +CPUs, as well as raw interfaces to platform-specific instructions. +(To be obsoleted by the @code{std::simd} implementation RFC 2366.) +") + (license (list license:expat license:asl2.0)))) + (define-public rust-siphasher-0.2 (package (name "rust-siphasher") -- cgit v1.2.3 From 8d2576a8aa21dbdfc0ec8849d5bc327762048a2d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:42:19 +0300 Subject: gnu: Add rust-bumpalo-3. * gnu/packages/crates-io.scm (rust-bumpalo-3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f45da74e0..b27987e9dc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1272,6 +1272,31 @@ (define-public rust-block-padding-0.1 "Padding and unpadding of messages divided into blocks.") (license (list license:asl1.1 license:expat)))) +(define-public rust-bumpalo-3 + (package + (name "rust-bumpalo") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bumpalo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hpp4wfcn04gnl1ji4a80b85xwknsci81xqyllq174gq9z0rsd8z")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cargo_readme_up_to_date test fails + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/fitzgen/bumpalo") + (synopsis "Fast bump allocation arena for Rust") + (description + "This package provides a fast bump allocation arena for Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-bumpalo-2.5 (package (name "rust-bumpalo") -- cgit v1.2.3 From 873c37b7e7c369b570ae29461e2f58ec152f8ca9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:42:46 +0300 Subject: gnu: rust-bumpalo-2.5: Inherit from rust-bumpalo-3. * gnu/packages/crates-io.scm (rust-bumpalo-2.5): Inherit from from rust-bumpalo-3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b27987e9dc..90473b99cd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1299,6 +1299,7 @@ (define-public rust-bumpalo-3 (define-public rust-bumpalo-2.5 (package + (inherit rust-bumpalo-3) (name "rust-bumpalo") (version "2.5.0") (source @@ -1310,17 +1311,11 @@ (define-public rust-bumpalo-2.5 (sha256 (base32 "018b5calz3895v04shk9bn7i73r4zf8yf7p1dqg92s3xya13vm1c")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) - ("rust-quickcheck" ,rust-quickcheck-0.8)))) - (home-page "https://github.com/fitzgen/bumpalo") - (synopsis "Fast bump allocation arena for Rust") - (description - "This package provides a fast bump allocation arena for Rust.") - (license (list license:asl2.0 license:expat)))) + ("rust-quickcheck" ,rust-quickcheck-0.8)))))) (define-public rust-bstr-0.2 (package -- cgit v1.2.3 From e78e3be3e5d77166e21f9b42d4fe288df9a8f026 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:43:57 +0300 Subject: gnu: Add rust-bzip2-sys-0.1. * gnu/packages/crates-io.scm (rust-bzip2-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 90473b99cd..43411d7a8c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1491,6 +1491,43 @@ (define-public rust-bytes-0.3 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-bzip2-sys-0.1 + (package + (name "rust-bzip2-sys") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "bzip2-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pz2mdhkk8yphiqdh2kghdxb60kqyd10lfrjym3r4k5dylvam135")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "bzip2-1.0.6") + (delete-file "build.rs") + ;; Inspired by Debian's patch. + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=bz2\");~@ + }~%"))) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/alexcrichton/bzip2-rs") + (synopsis "Rust bindings to libbzip2") + (description + "Bindings to @code{libbzip2} for bzip2 compression and decompression +exposed as Reader/Writer streams.") + (license (list license:expat license:asl2.0)))) + (define-public rust-c2-chacha-0.2 (package (name "rust-c2-chacha") -- cgit v1.2.3 From 56042d790aa226c6c334be949b88877171a00c73 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:45:26 +0300 Subject: gnu: Add rust-gzip-header-0.3. * gnu/packages/crates-io.scm (rust-gzip-header-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 43411d7a8c..0ba6b3f5d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6012,6 +6012,30 @@ (define-public rust-grep-searcher-0.1 "Fast line oriented regex searching as a library.") (license (list license:unlicense license:expat)))) +(define-public rust-gzip-header-0.3 + (package + (name "rust-gzip-header") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gzip-header" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fg6vm8sgsm69szwqyz7abfbyziv6pv0jkcailimlamvsfrzwc81")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-crc32fast" ,rust-crc32fast-1.2)))) + (home-page "https://github.com/oyvindln/gzip-header") + (synopsis "Decoding and encoding the header part of gzip files") + (description + "This package provides a crate for decoding and encoding the header part +of gzip files based on the gzip header implementation in the @code{flate2} crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-half-1.3 (package (name "rust-half") -- cgit v1.2.3 From 7c1ad5dd852785a1afb11f25fc269d21b0308b6e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:45:59 +0300 Subject: gnu: Add rust-deflate-0.7. * gnu/packages/crates-io.scm (rust-deflate-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ba6b3f5d4..34580207f7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3100,6 +3100,32 @@ (define-public rust-datetime-0.4 and arithmetic.") (license license:expat))) +(define-public rust-deflate-0.7 + (package + (name "rust-deflate") + (version "0.7.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "deflate" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d7d9fpmgjnznrksmd3vlv3dyw01wsrm11ifil6ag22871xnlyvh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-adler32" ,rust-adler32-1.0) + ("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gzip-header" ,rust-gzip-header-0.3) + ("rust-flate2" ,rust-flate2-1.0)))) + (home-page "https://github.com/image-rs/deflate-rs") + (synopsis "DEFLATE, zlib and gzip encoder written in rust") + (description + "This package provides a DEFLATE, zlib and gzip encoder written in rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-defmac-0.2 (package (name "rust-defmac") -- cgit v1.2.3 From 9e24643d675672271e593b6c3f0df806285cba39 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:46:42 +0300 Subject: gnu: Add rust-dlib-0.4. * gnu/packages/crates-io.scm (rust-dlib-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 34580207f7..1c72ffce8f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3160,6 +3160,30 @@ (define-public rust-defmac-0.1 (base32 "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) +(define-public rust-dlib-0.4 + (package + (name "rust-dlib") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "dlib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0smp2cdvy12xfw26qyqms273w5anszfadv73g75s88yqm54i5rbp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libloading" ,rust-libloading-0.5)))) + (home-page "https://github.com/vberger/dlib") + (synopsis "Helper macros for manually loading optional system libraries") + (description + "This package provides helper macros for handling manually loading optional +system libraries.") + (license license:expat))) + (define-public rust-cpp-demangle-0.2 (package (name "rust-cpp-demangle") -- cgit v1.2.3 From 3d916a115b3e1d95918b38119ff1999e4953032c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:47:17 +0300 Subject: gnu: Add rust-euclid-0.20. * gnu/packages/crates-io.scm (rust-euclid-0.20): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c72ffce8f..b570b65ec5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4199,6 +4199,32 @@ (define-public rust-error-chain-0.12 "Yet another error boilerplate library.") (license (list license:asl2.0 license:expat)))) +(define-public rust-euclid-0.20 + (package + (name "rust-euclid") + (version "0.20.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "euclid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pa8kxblvc0s9gia9n0966w7169aswpg7knw2pmwrqa204r2v19z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page "https://github.com/servo/euclid") + (synopsis "Geometry primitives") + (description "Geometry primitives written in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fake-simd-0.1 (package (name "rust-fake-simd") -- cgit v1.2.3 From 0aa0e1f8f49263975095fa9b485f48d17ae0914d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 10:39:49 +0100 Subject: gnu: wxwidgets-2: Fix build. * gnu/packages/wxwidgets.scm (wxwidgets-2)[arguments]: Add phase ignore-narrowing-errors to patch "configure" script. --- gnu/packages/wxwidgets.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 6010de781f..6d5c2b3921 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Rene Saavedra @@ -126,7 +126,14 @@ (define-public wxwidgets-2 (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; No 'check' target. - #:tests? #f)))) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'ignore-narrowing-errors + (lambda _ + (substitute* "configure" + (("-Wall") "-Wall -Wno-narrowing")) + #t))))))) (define-public wxwidgets-gtk2 (package (inherit wxwidgets) -- cgit v1.2.3 From d7545a6b538813e88195d084f75a3e87065c999e Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 17 Feb 2020 14:16:53 +0100 Subject: ui: Only display link in capable terminals. * guix/ui.scm (display-generation): Display generation path on new line. * guix/scripts/describe.scm (channel-commit-hyperlink): Add TRANSFORMER argument. (display-profile-content): Use TRANSFORMER argument to display URL explicitly when terminal does not support hyperlinks. --- guix/scripts/describe.scm | 15 +++++++++++---- guix/ui.scm | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index f13f221da9..5e00067ef8 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -201,7 +201,11 @@ (define (display-profile-content profile number) (format #t (G_ " commit: ~a~%") (if (supports-hyperlinks?) (channel-commit-hyperlink channel commit) - commit)))) + commit)) + (when (not (supports-hyperlinks?)) + (format #t (G_ " URL: ~a~%") + (channel-commit-hyperlink channel commit + (lambda (url msg) url)))))) (_ #f))) ;; Show most recently installed packages last. @@ -233,9 +237,12 @@ (define %vcs-web-views (define* (channel-commit-hyperlink channel #:optional - (commit (channel-commit channel))) + (commit (channel-commit channel)) + (transformer hyperlink)) "Return a hyperlink for COMMIT in CHANNEL, using COMMIT as the hyperlink's -text. The hyperlink links to a web view of COMMIT, when available." +text. The hyperlink links to a web view of COMMIT, when available. +TRANSFORMER is a procedure of 2 arguments, a URI and text, and returns a +string for display." (let* ((url (channel-url channel)) (uri (string->uri url)) (host (and uri (uri-host uri)))) @@ -244,7 +251,7 @@ (define* (channel-commit-hyperlink channel (#f commit) ((_ template) - (hyperlink (template url commit) commit))) + (transformer (template url commit) commit))) commit))) diff --git a/guix/ui.scm b/guix/ui.scm index db932ecacb..371af4e047 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1637,7 +1637,7 @@ (define (display-generation profile number) (let* ((file (generation-file-name profile number)) (link (if (supports-hyperlinks?) (cut file-hyperlink file <>) - identity)) + (cut format #f (G_ "~a~%file: ~a") <> file))) (header (format #f (link (highlight (G_ "Generation ~a\t~a"))) number (date->string -- cgit v1.2.3 From 672d3d4a87839b0692c307df0edb66cd16bcbf1a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 17 Feb 2020 14:27:52 +0100 Subject: ui: Don't disable colors when INSIDE_EMACS is set. * guix/colors.scm (color-output?): Remove INSIDE_EMACS condition. --- guix/colors.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/colors.scm b/guix/colors.scm index b63ac37027..3031f54799 100644 --- a/guix/colors.scm +++ b/guix/colors.scm @@ -131,8 +131,7 @@ (define isatty?* (define (color-output? port) "Return true if we should write colored output to PORT." - (and (not (getenv "INSIDE_EMACS")) - (not (getenv "NO_COLOR")) + (and (not (getenv "NO_COLOR")) (isatty?* port))) (define (coloring-procedure color) -- cgit v1.2.3 From 9b7f9e6f9ba8dc9ea8b99573e0862856ff1b9475 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 17 Feb 2020 14:38:48 +0100 Subject: ui: Don't truncate search output when inside Emacs. * guix/ui.scm (display-search-results): Loop over all results when INSIDE_EMACS is set. --- guix/ui.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index 371af4e047..22a6d6c8e3 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1473,7 +1473,8 @@ (define (line-count str) #:hyperlinks? links? #:extra-fields `((relevance . ,score))))))) - (if (and max-rows + (if (and (not (getenv "INSIDE_EMACS")) + max-rows (> (port-line port) first-line) ;print at least one result (> (+ 4 (line-count text) (port-line port)) max-rows)) -- cgit v1.2.3 From 9ea458c57a1c539669e0976011215d021a79d614 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 24 Feb 2020 11:22:02 +0100 Subject: build-system: Fix copy-build-system default install plan. * guix/build-system/copy.scm (copy-build): Set install-plan default value to copy everything from source to the output. --- guix/build-system/copy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 5fd0da4493..d1bf8fb654 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -78,7 +78,7 @@ (define private-keywords (define* (copy-build store name inputs #:key (guile #f) (outputs '("out")) - (install-plan ''(("." (".") "./"))) + (install-plan ''(("." "./"))) (search-paths '()) (out-of-source? #t) (validate-runpath? #t) -- cgit v1.2.3 From fbf983c013299616b77fb97af595edd104eee28d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Feb 2020 11:51:02 +0200 Subject: gnu: Add rust-serde-cbor-0.11. * gnu/packages/crates-io.scm (rust-serde-cbor-0.11): New variable. (rust-serde-cbor-0.10): Inherit from rust-serde-cbor-0.11. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b570b65ec5..f8fb2f3867 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13492,8 +13492,34 @@ (define-public rust-serde-bytes-0.11 "Optimized handling of @code{&[u8]} and @code{Vec} for Serde.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-cbor-0.11 + (package + (name "rust-serde-cbor") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-cbor" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08m62mfqjnpa543kd9r9cyxlqc6y73avhsl3n8svgs4h5zxaq60y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-half" ,rust-half-1.3) + ("rust-serde" ,rust-serde-1.0)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/pyfisch/cbor") + (synopsis "CBOR support for serde") + (description "CBOR support for serde.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-cbor-0.10 (package + (inherit rust-serde-cbor-0.11) (name "rust-serde-cbor") (version "0.10.2") (source @@ -13505,7 +13531,6 @@ (define-public rust-serde-cbor-0.10 (sha256 (base32 "0kyizacjabsa78p9f7qvj31zirpnsgsr4zpfv1p6lwpcb3biw27p")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -13513,11 +13538,7 @@ (define-public rust-serde-cbor-0.10 ("rust-half" ,rust-half-1.3) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-serde-derive" ,rust-serde-derive-1.0)))) - (home-page "https://github.com/pyfisch/cbor") - (synopsis "CBOR support for serde") - (description "CBOR support for serde.") - (license (list license:expat license:asl2.0)))) + (("rust-serde-derive" ,rust-serde-derive-1.0)))))) (define-public rust-serde-codegen-0.4 (package -- cgit v1.2.3 From 103e05654ff9388a776da8dda1b2bb90368a3675 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Feb 2020 11:55:46 +0200 Subject: gnu: rust-encoding-rs-io-0.1: Upgrade to 0.1.7. * gnu/packages/crates-io.scm (rust-encoding-rs-io-0.1): Upgrade to 0.1.7. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f8fb2f3867..699fb52d11 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3935,7 +3935,7 @@ (define-public rust-encoding-rs-0.8 (define-public rust-encoding-rs-io-0.1 (package (name "rust-encoding-rs-io") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -3944,11 +3944,10 @@ (define-public rust-encoding-rs-io-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0b7k9p7inkrcanh7h6q4m278y05gmcwi8p5r43h7grzl5dxfw6cn")))) + "10ra4l688cdadd8h1lsbahld1zbywnnqv68366mbhamn3xjwbhqw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8)))) (home-page "https://github.com/BurntSushi/encoding_rs_io") (synopsis "Streaming transcoding for encoding_rs") -- cgit v1.2.3 From eab07e78b691ae7866267fc04d31c7c3ad6b0eeb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Feb 2020 13:29:30 +0200 Subject: gnu: rust-cbindgen: Update to 0.13.1. * gnu/packages/rust-apps.scm (rust-cbindgen): Update to 0.13.1. --- gnu/packages/rust-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ac50f9591a..72c982f23c 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -270,7 +270,7 @@ (define-public ripgrep (define-public rust-cbindgen (package (name "rust-cbindgen") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) @@ -278,7 +278,7 @@ (define-public rust-cbindgen (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1kywaz62cglg8fv0p7mp1m946gwmrf62s8ffndd5zpf1mz21j472")))) + "0w70bnwwqyf9fr6z3rcs7m7ad791fmfmhxy828va0dkfwvamp59c")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From af52ba64fa6350690d65a1aca9c89e13103fd8d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 24 Feb 2020 09:31:12 -0500 Subject: gnu: git-repo: Update to 2.3. * gnu/packages/android.scm (git-repo): Update to 2.3. [arguments]: Remove the #:python argument. git-repo v2.x is now compatible with Python 3. [phases]{configure-git}: New phase. {set-executable-paths}: Adapt the substitution rule for the GIT command. {check}: Use the "run_tests" script to launch tests. [native-inputs]: Replace python2-nose by python-test. --- gnu/packages/android.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 30dd8925a4..ba883f1ff9 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -716,7 +717,7 @@ (define-public android-udev-rules (define-public git-repo (package (name "git-repo") - (version "1.12.37") + (version "2.3") (source (origin (method git-fetch) @@ -725,11 +726,10 @@ (define-public git-repo (commit (string-append "v" version)))) (file-name (string-append "git-repo-" version "-checkout")) (sha256 - (base32 "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd")))) + (base32 "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; code says: "Python 3 support is … experimental." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'set-executable-paths (lambda* (#:key inputs outputs #:allow-other-keys) @@ -738,8 +738,8 @@ (define-public git-repo (gpg (assoc-ref inputs "gnupg")) (ssh (assoc-ref inputs "ssh"))) (substitute* '("repo" "git_command.py") - (("^GIT = 'git' ") - (string-append "GIT = '" git "/bin/git' "))) + (("^GIT = 'git'") + (string-append "GIT = '" git "/bin/git'"))) (substitute* "repo" ((" cmd = \\['gpg',") (string-append " cmd = ['" gpg "/bin/gpg',"))) @@ -777,9 +777,14 @@ (define-public git-repo ((" rev = _Verify\\(.*\\)") " rev = None")) #t))) (delete 'build) ; nothing to build + (add-before 'check 'configure-git + (lambda _ + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.email" "you@example.com") + (invoke "git" "config" "--global" "user.name" "Your Name"))) (replace 'check (lambda _ - (invoke "python" "-m" "nose"))) + (invoke "./run_tests"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -798,7 +803,7 @@ (define-public git-repo ("gnupg" ,gnupg) ("ssh" ,openssh))) (native-inputs - `(("nose" ,python2-nose))) + `(("pytest" ,python-pytest))) (home-page "https://code.google.com/p/git-repo/") (synopsis "Helps to manage many Git repositories.") (description "Repo is a tool built on top of Git. Repo helps manage many -- cgit v1.2.3 From f2774824d4753ea7787f852fa2b1fa6cc89077c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 17:06:24 +0100 Subject: gnu: python-libarchive-c: Update to 2.9. * gnu/packages/python-xyz.scm (python-libarchive-c): Update to 2.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 84b70954bd..bbbb35ce8c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7538,13 +7538,13 @@ (define-public python2-termcolor (define-public python-libarchive-c (package (name "python-libarchive-c") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) (uri (pypi-uri "libarchive-c" version)) (sha256 (base32 - "0qg0v1s9c1xdk9philhnv8k6c6nicvnvfwlc0j9srg90jmdlvm06")))) + "0q7g6a97110bk0j5x81555kajyxh4sybaabab6v5sgr0xi6386cr")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 0375adac22fc85fb932eb7c9abcf289b4f6e7e22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 18:11:11 +0100 Subject: gnu: libgme: Remove obsolete workaround. * gnu/packages/music.scm (libgme)[native-inputs]: Remove. --- gnu/packages/music.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b6b76f8763..16e69840df 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -876,11 +876,6 @@ (define-public libgme (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check target - (native-inputs - `(;; Use gcc-4.9 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-4.9))) (home-page "https://bitbucket.org/mpyne/game-music-emu") (synopsis "Video game music file playback library") (description -- cgit v1.2.3 From f175fa49875c4b756277370a225f919f24503ac6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 20:34:24 +0100 Subject: gnu: espeak-ng: Update to 1.50. * gnu/packages/speech.scm (espeak-ng): Update to 1.50. [source]: Change to GIT-FETCH. [native-inputs]: Add AUTOCONF, AUTOMAKE, LIBTOOL, and WHICH. --- gnu/packages/speech.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 21ad6f8928..5fdf2cdbd8 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2019 Marius Bakke +;;; Copyright © 2016, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Kei Kebreau @@ -31,6 +31,7 @@ (define-module (gnu packages speech) #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) ;for 'which' #:use-module (gnu packages compression) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) @@ -101,14 +102,18 @@ (define-public espeak (define-public espeak-ng (package (name "espeak-ng") - (version "1.49.2") + (version "1.50") (home-page "https://github.com/espeak-ng/espeak-ng") + ;; Note: eSpeak NG publishes release tarballs, but the 1.50 tarball is + ;; broken: . + ;; Download the raw repository to work around it; remove 'native-inputs' + ;; below when switching back to the release tarball. (source (origin - (method url-fetch) - (uri (string-append home-page "/releases/download/" version - "/espeak-ng-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1d10x9rbvqi2zwcz65fxh04k0x0scnk7732l37laz6xra1ldhzng")))) + (base32 "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static") @@ -116,6 +121,11 @@ (define-public espeak-ng #:parallel-build? #f ;; XXX: Some tests require an audio device. #:tests? #f)) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("which" ,which))) (inputs `(("libcap" ,libcap) ("pcaudiolib" ,pcaudiolib))) -- cgit v1.2.3 From b4481f2df1ac0e24a41a06671e99e88a5e2c9d2d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 20:39:44 +0100 Subject: gnu: node: Increase build timeouts. * gnu/packages/node.scm (node)[properties]: Add MAX-SILENT-TIME. Increase TIMEOUT from 3600 seconds to 14400. --- gnu/packages/node.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1494e2ecfe..ee35d76852 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -182,4 +182,5 @@ (define-public node devices.") (home-page "https://nodejs.org/") (license expat) - (properties '((timeout . 3600))))) ; 1 h + (properties '((max-silent-time . 7200) ;2h, needed on ARM + (timeout . 21600))))) ;6h -- cgit v1.2.3 From 233deb82f3b1c9b66b33b709426ab76bd274bb75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Feb 2020 17:07:39 +0100 Subject: gnu: clang@9: Fix search path handling. * gnu/packages/patches/clang-9.0-libc-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/llvm.scm (clang-9): Add #:patches. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 5 +- .../patches/clang-9.0-libc-search-path.patch | 83 ++++++++++++++++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-9.0-libc-search-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 94b07c93b2..412bcb0dd4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -781,6 +781,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ %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-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a6f779e7f8..e7b196be86 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Dennis Mungai ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018, 2019 Marius Bakke +;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen @@ -479,7 +479,8 @@ (define-public clang-runtime-9 (define-public clang-9 (clang-from-llvm llvm-9 clang-runtime-9 - "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v")) + "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v" + #:patches '("clang-9.0-libc-search-path.patch"))) (define-public clang-toolchain-9 (make-clang-toolchain clang-9)) diff --git a/gnu/packages/patches/clang-9.0-libc-search-path.patch b/gnu/packages/patches/clang-9.0-libc-search-path.patch new file mode 100644 index 0000000000..be34344842 --- /dev/null +++ b/gnu/packages/patches/clang-9.0-libc-search-path.patch @@ -0,0 +1,83 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on non-GuixSD systems. + +diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp +--- 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()); + + 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 + + // 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 { -- cgit v1.2.3 From cd16014f7c22481a488415c82950072a5fd9fe4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Feb 2020 17:38:28 +0100 Subject: gnu: llvm: Add helper procedure for constructing download URLs. ...in preparation for LLVM 9.0.1 which is no longer hosted on llvm.org. * gnu/packages/llvm.scm (llvm-download-uri): New procedure. (llvm-8, clang-runtime-from-llvm, clang-from-llvm, libcxx, libomp, llvm-9, llvm-7, llvm-6, libcxx-6, llvm-3.9.1, llvm-3.8, llvm-3.7, llvm-3.6, llvm-3.5)[source](uri): Use it. --- gnu/packages/llvm.scm | 53 +++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index e7b196be86..608e52a1b1 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -76,6 +76,13 @@ (define* (system->llvm-target #:optional ("x86_64" => "X86") ("i686" => "X86")))) +(define (llvm-download-uri component version) + (if (version>=? version "9.0.1") + (string-append "https://github.com/llvm/llvm-project/releases/download" + "/llvmorg-" version "/" component "-" version ".src.tar.xz") + (string-append "https://releases.llvm.org/" version "/" component "-" + version ".src.tar.xz"))) + (define-public llvm-8 (package (name "llvm") @@ -83,8 +90,7 @@ (define-public llvm-8 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) @@ -137,8 +143,7 @@ (define* (clang-runtime-from-llvm llvm hash (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/compiler-rt-" version ".src.tar.xz")) + (uri (llvm-download-uri "compiler-rt" version)) (sha256 (base32 hash)) (patches (map search-patch patches)))) (build-system cmake-build-system) @@ -169,8 +174,10 @@ (define* (clang-from-llvm llvm clang-runtime hash (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/cfe-" version ".src.tar.xz")) + (uri (llvm-download-uri (if (version>=? version "9.0.1") + "clang" + "cfe") + version)) (sha256 (base32 hash)) (patches (map search-patch patches)))) ;; Using cmake allows us to treat llvm as an external library. There @@ -354,8 +361,7 @@ (define-public libcxx (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" - version "/libcxx-" version ".src.tar.xz")) + (uri (llvm-download-uri "libcxx" version)) (sha256 (base32 "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462")))) @@ -415,9 +421,7 @@ (define-public libomp (version (package-version llvm)) (source (origin (method url-fetch) - (uri (string-append "https://releases.llvm.org/" - version "/openmp-" version - ".src.tar.xz")) + (uri (llvm-download-uri "openmp" version)) (sha256 (base32 "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp")) @@ -465,8 +469,7 @@ (define-public llvm-9 (version "9.0.0") (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n")))) @@ -491,8 +494,7 @@ (define-public llvm-7 (version "7.0.1") (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))))) @@ -516,8 +518,7 @@ (define-public llvm-6 (version "6.0.1") (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))))) @@ -543,8 +544,7 @@ (define-public libcxx-6 (source (origin (inherit (package-source libcxx)) - (uri (string-append "http://llvm.org/releases/" - version "/libcxx-" version ".src.tar.xz")) + (uri (llvm-download-uri "libcxx" version)) (sha256 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) @@ -559,8 +559,7 @@ (define-public llvm-3.9.1 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))))) @@ -585,8 +584,7 @@ (define-public llvm-3.8 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) @@ -609,8 +607,7 @@ (define-public llvm-3.7 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))))) @@ -633,8 +630,7 @@ (define-public llvm-3.6 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (sha256 (base32 "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn")))))) @@ -656,8 +652,7 @@ (define-public llvm-3.5 (source (origin (method url-fetch) - (uri (string-append "https://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) + (uri (llvm-download-uri "llvm" version)) (patches (search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch")) (sha256 -- cgit v1.2.3 From dbf15d86e980c399f357f081d7753814ee1b9640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Feb 2020 17:40:29 +0100 Subject: gnu: clang@9: Update to 9.0.1. * gnu/packages/llvm.scm (llvm-9): Update to 9.0.1. clang-runtime-9, clang-9): Update hashes. --- gnu/packages/llvm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 608e52a1b1..665e20600f 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -466,23 +466,23 @@ (define-public clang-toolchain (define-public llvm-9 (package (inherit llvm) - (version "9.0.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (llvm-download-uri "llvm" version)) (sha256 (base32 - "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n")))) + "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")))) (license license:asl2.0))) (define-public clang-runtime-9 (clang-runtime-from-llvm llvm-9 - "03ni43lbkp63lr3p6sc94dphqmvnz5av5mml0xmk930xvnbcvr2n")) + "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2")) (define-public clang-9 (clang-from-llvm llvm-9 clang-runtime-9 - "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v" + "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p" #:patches '("clang-9.0-libc-search-path.patch"))) (define-public clang-toolchain-9 -- cgit v1.2.3 From e2546bb472b6285a8856cacf686c5e0ce9bb62c5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 21 Feb 2020 21:13:47 -0800 Subject: gnu: qtbase: Add variant that fixes file name handling in CMake macros. * gnu/packages/patches/qtbase-QTBUG-81715.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (qtbase-patched): New public variable. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/patches/qtbase-QTBUG-81715.patch | 40 +++++++++++++++++++++++++++ gnu/packages/qt.scm | 13 +++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/qtbase-QTBUG-81715.patch diff --git a/gnu/local.mk b/gnu/local.mk index 412bcb0dd4..b85c289c4e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1355,6 +1355,7 @@ dist_patch_DATA = \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ + %D%/packages/patches/qtbase-QTBUG-81715.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/patches/qtbase-QTBUG-81715.patch b/gnu/packages/patches/qtbase-QTBUG-81715.patch new file mode 100644 index 0000000000..70b83b97d2 --- /dev/null +++ b/gnu/packages/patches/qtbase-QTBUG-81715.patch @@ -0,0 +1,40 @@ +From 8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915 Mon Sep 17 00:00:00 2001 +From: Joerg Bornemann +Date: Wed, 29 Jan 2020 11:06:35 +0100 +Subject: [PATCH] Fix qt5_make_output_file macro for paths containing dots + +Commit 89bd5a7e broke CMake projects that use dots in their build +paths, because the used regular expression matches the directory part +of the path as well. + +The regex wants to achieve the same as get_filename_component(... +NAME_WLE) which is available since CMake 3.14. Re-implement the +NAME_WLE functionality for older CMake versions by using multiple +get_filename_component calls. + +Fixes: QTBUG-81715 +Task-number: QTBUG-80295 +Change-Id: I2ef053300948f6e1b2c0c5eafac35105f193d4e6 +Reviewed-by: Alexandru Croitor +--- + +diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake +index 7735e51..b3da640 100644 +--- a/src/corelib/Qt5CoreMacros.cmake ++++ b/src/corelib/Qt5CoreMacros.cmake +@@ -59,7 +59,14 @@ + set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") + string(REPLACE ".." "__" _outfile ${_outfile}) + get_filename_component(outpath ${_outfile} PATH) +- string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile}) ++ if(CMAKE_VERSION VERSION_LESS "3.14") ++ get_filename_component(_outfile_ext ${_outfile} EXT) ++ get_filename_component(_outfile_ext ${_outfile_ext} NAME_WE) ++ get_filename_component(_outfile ${_outfile} NAME_WE) ++ string(APPEND _outfile ${_outfile_ext}) ++ else() ++ get_filename_component(_outfile ${_outfile} NAME_WLE) ++ endif() + file(MAKE_DIRECTORY ${outpath}) + set(${outfile} ${outpath}/${prefix}${_outfile}.${ext}) + endmacro() diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 466c6ba358..7aa9d0f0f9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -598,6 +598,19 @@ (define-public qtbase developers using C++ or QML, a CSS & JavaScript like language.") (license (list license:lgpl2.1 license:lgpl3)))) +;; This variant fixes a problem with the CMake macros shipped by qtbase. See +;; discussion at . +(define-public qtbase-patched + (let ((src (package-source qtbase))) + (hidden-package + (package + (inherit qtbase) + (source + (origin + (inherit src) + (patches + (append (search-patches "qtbase-QTBUG-81715.patch") + (origin-patches src))))))))) ;; qt used to refer to the monolithic Qt 5.x package (define-deprecated qt qtbase) -- cgit v1.2.3 From 3c60d85f313f910282ed884eead80061faf6ee78 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 21 Feb 2020 21:14:57 -0800 Subject: gnu: freecad. Fix build failure. * gnu/packages/engineering.scm (freecad)[inputs]: Use qtbase-patched instead of qtbase. Signed-off-by: Marius Bakke --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 73fea26695..5eee90e450 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2282,7 +2282,7 @@ (define-public freecad ("python-pyside-2-tools" ,python-pyside-2-tools) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-patched) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) -- cgit v1.2.3 From 25b9992181a7bb651ef7ada5a42d111104ea8093 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 21 Feb 2020 21:15:38 -0800 Subject: gnu: freecad. Use qt-build-system. * gnu/packages/engineering.scm (freecad)[build-system]: Use qt-build-system. Signed-off-by: Marius Bakke --- gnu/packages/engineering.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5eee90e450..33c12215e3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -44,6 +44,7 @@ (define-module (gnu packages engineering) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -2256,7 +2257,7 @@ (define-public freecad (sha256 (base32 "170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) -- cgit v1.2.3 From 52f9c3b88ac9890db666d3de0e82063281db97f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 23:45:32 +0100 Subject: gnu: Reorganize llvm.scm. * gnu/packages/llvm.scm (libcxx, libclc, libomp, libcxx-6): Move package definitions below the various LLVM/Clang variants. --- gnu/packages/llvm.scm | 224 +++++++++++++++++++++++++------------------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 665e20600f..effd2793d3 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -354,102 +354,6 @@ (define (make-clang-toolchain clang) ("libc-debug" ,glibc "debug") ("libc-static" ,glibc "static"))))) -(define-public libcxx - (package - (name "libcxx") - (version (package-version llvm)) - (source - (origin - (method url-fetch) - (uri (llvm-download-uri "libcxx" version)) - (sha256 - (base32 - "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462")))) - (build-system cmake-build-system) - (native-inputs - `(("clang" ,clang) - ("llvm" ,llvm))) - (home-page "https://libcxx.llvm.org") - (synopsis "C++ standard library") - (description - "This package provides an implementation of the C++ standard library for -use with Clang, targeting C++11, C++14 and above.") - (license license:expat))) - -(define-public libclc - (package - (name "libclc") - (version (package-version llvm)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project.git") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DLLVM_CLANG=" - (assoc-ref %build-inputs "clang") - "/bin/clang") - (string-append "-DPYTHON=" - (assoc-ref %build-inputs "python") - "/bin/python3")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "libclc") #t))))) - (native-inputs - `(("clang" ,clang) - ("llvm" ,llvm) - ("python" ,python))) - (home-page "https://libclc.llvm.org") - (synopsis "Libraries for the OpenCL programming language") - (description - "This package provides an implementation of the OpenCL library -requirements according to version 1.1 of the OpenCL specification.") - ;; Apache license 2.0 with LLVM exception - (license license:asl2.0))) - -(define-public libomp - (package - (name "libomp") - (version (package-version llvm)) - (source (origin - (method url-fetch) - (uri (llvm-download-uri "openmp" version)) - (sha256 - (base32 - "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp")) - (file-name (string-append "libomp-" version ".tar.xz")))) - (build-system cmake-build-system) - ;; XXX: Note this gets built with GCC because building with Clang itself - ;; fails (missing , even when libcxx is added as an input.) - (arguments - '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" - "-DOPENMP_TEST_C_COMPILER=clang" - "-DOPENMP_TEST_CXX_COMPILER=clang++") - #:test-target "check-libomp")) - (native-inputs - `(("clang" ,clang) - ("llvm" ,llvm) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) - (inputs - `(("hwloc" ,hwloc "lib"))) - (home-page "https://openmp.llvm.org") - (synopsis "OpenMP run-time support library") - (description - "This package provides the run-time support library developed by the LLVM -project for the OpenMP multi-theaded programming extension. This package -notably provides @file{libgomp.so}, which is has a binary interface compatible -with that of libgomp, the GNU Offloading and Multi Processing Library.") - (license license:expat))) - (define-public clang-runtime (clang-runtime-from-llvm llvm @@ -536,22 +440,6 @@ (define-public clang-6 (define-public clang-toolchain-6 (make-clang-toolchain clang-6)) -;; Libcxx files specifically used by PySide2. -(define-public libcxx-6 - (package - (inherit libcxx) - (version (package-version llvm-6)) - (source - (origin - (inherit (package-source libcxx)) - (uri (llvm-download-uri "libcxx" version)) - (sha256 - (base32 - "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) - (native-inputs - `(("clang" ,clang-6) - ("llvm" ,llvm-6))))) - (define-public llvm-3.9.1 (package (inherit llvm) (name "llvm") @@ -681,6 +569,118 @@ (define-public llvm-for-extempore ;; Extempore refuses to build on architectures other than x86_64 (supported-systems '("x86_64-linux")))) +(define-public libcxx + (package + (name "libcxx") + (version (package-version llvm)) + (source + (origin + (method url-fetch) + (uri (llvm-download-uri "libcxx" version)) + (sha256 + (base32 + "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462")))) + (build-system cmake-build-system) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm))) + (home-page "https://libcxx.llvm.org") + (synopsis "C++ standard library") + (description + "This package provides an implementation of the C++ standard library for +use with Clang, targeting C++11, C++14 and above.") + (license license:expat))) + +;; Libcxx files specifically used by PySide2. +(define-public libcxx-6 + (package + (inherit libcxx) + (version (package-version llvm-6)) + (source + (origin + (inherit (package-source libcxx)) + (uri (llvm-download-uri "libcxx" version)) + (sha256 + (base32 + "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) + (native-inputs + `(("clang" ,clang-6) + ("llvm" ,llvm-6))))) + +(define-public libclc + (package + (name "libclc") + (version (package-version llvm)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/llvm/llvm-project.git") + (commit (string-append "llvmorg-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DLLVM_CLANG=" + (assoc-ref %build-inputs "clang") + "/bin/clang") + (string-append "-DPYTHON=" + (assoc-ref %build-inputs "python") + "/bin/python3")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "libclc") #t))))) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm) + ("python" ,python))) + (home-page "https://libclc.llvm.org") + (synopsis "Libraries for the OpenCL programming language") + (description + "This package provides an implementation of the OpenCL library +requirements according to version 1.1 of the OpenCL specification.") + ;; Apache license 2.0 with LLVM exception + (license license:asl2.0))) + +(define-public libomp + (package + (name "libomp") + (version (package-version llvm)) + (source (origin + (method url-fetch) + (uri (llvm-download-uri "openmp" version)) + (sha256 + (base32 + "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (build-system cmake-build-system) + ;; XXX: Note this gets built with GCC because building with Clang itself + ;; fails (missing , even when libcxx is added as an input.) + (arguments + '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" + "-DOPENMP_TEST_C_COMPILER=clang" + "-DOPENMP_TEST_CXX_COMPILER=clang++") + #:test-target "check-libomp")) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("hwloc" ,hwloc "lib"))) + (home-page "https://openmp.llvm.org") + (synopsis "OpenMP run-time support library") + (description + "This package provides the run-time support library developed by the LLVM +project for the OpenMP multi-theaded programming extension. This package +notably provides @file{libgomp.so}, which is has a binary interface compatible +with that of libgomp, the GNU Offloading and Multi Processing Library.") + (license license:expat))) + (define-public python-llvmlite (package (name "python-llvmlite") -- cgit v1.2.3 From 501672d754f44d6e5e9f9de0886281158f9b363f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 00:36:55 +0100 Subject: gnu: clang: Use the correct CLANG-RUNTIME for versions 6 and 7. * gnu/packages/llvm.scm (clang-7): Use CLANG-RUNTIME-7. (clang-6): Use CLANG-RUNTIME-6. --- gnu/packages/llvm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index effd2793d3..865657455c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -409,7 +409,7 @@ (define-public clang-runtime-7 "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq")) (define-public clang-7 - (clang-from-llvm llvm-7 clang-runtime + (clang-from-llvm llvm-7 clang-runtime-7 "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4" #:patches '("clang-7.0-libc-search-path.patch"))) @@ -433,7 +433,7 @@ (define-public clang-runtime-6 "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) (define-public clang-6 - (clang-from-llvm llvm-6 clang-runtime + (clang-from-llvm llvm-6 clang-runtime-6 "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) -- cgit v1.2.3 From b77a901e06dbaf62f59de8d148938276f9d73f71 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 00:53:24 +0100 Subject: gnu: mesa: Build with llvm@8 explicitly. * gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM to LLVM-8. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e610fe1dd7..2a15d36cce 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -268,7 +268,7 @@ (define-public mesa ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + `(("llvm" ,llvm-8))) (_ `())) ("makedepend" ,makedepend) -- cgit v1.2.3 From 00ede15708867693fe70fa1ff316fef7f31fe275 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 00:54:06 +0100 Subject: gnu: LLVM: Promote LLVM 9 to the default 'llvm' package. * gnu/packages/llvm.scm (llvm-8): Rename to ... (llvm): ... this. Update to 9.0.1. [license]: Change to ASL2.0. (clang-runtime-from-llvm)[license]: Inherit from LLVM. (clang-from-llvm)[license]: Conditionally choose license based on version. (llvm-9, clang-runtime-8, clang-8, clang-toolchain-8): New public variables. (llvm-7): Inherit from LLVM-8 (for the license change). (llvm-6): Inherit from LLVM-7. (llvm-3.9.1): Inherit from LLVM-6. (llvm-3.8): Inherit from LLVM-3.9.1. (llvm-3.7): Inherit from LLVM-3.8. (llvm-3.6): Inherit from LLVM-3.7. (llvm-3.5): Inherit from LLVM-3.6. (libcxx, libclc, libomp): Update to 9.0.1. --- gnu/packages/llvm.scm | 79 +++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 865657455c..e819625a46 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -83,17 +83,17 @@ (define (llvm-download-uri component version) (string-append "https://releases.llvm.org/" version "/" component "-" version ".src.tar.xz"))) -(define-public llvm-8 +(define-public llvm (package (name "llvm") - (version "8.0.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (llvm-download-uri "llvm" version)) (sha256 (base32 - "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) + "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 @@ -131,9 +131,7 @@ (define-public llvm-8 front-ends derived from GCC 4.0.1. A new front-end for the C family of languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") - (license license:ncsa))) - -(define-public llvm llvm-8) + (license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) @@ -161,7 +159,7 @@ (define* (clang-runtime-from-llvm llvm hash functions for C and C++ programs. It also provides header files that allow C and C++ source code to interface with the \"sanitization\" passes of the clang compiler. In LLVM this library is called \"compiler-rt\".") - (license license:ncsa) + (license (package-license llvm)) ;; doesn't list MIPS as supported. (supported-systems (delete "mips64el-linux" %supported-systems)))) @@ -307,7 +305,9 @@ (define* (clang-from-llvm llvm clang-runtime hash Objective-C++ programming languages. It uses LLVM as its back end. The Clang project includes the Clang front end, the Clang static analyzer, and several code analysis tools.") - (license license:ncsa))) + (license (if (version>=? version "9.0") + license:asl2.0 ;with LLVM exceptions + license:ncsa)))) (define (make-clang-toolchain clang) (package @@ -357,44 +357,49 @@ (define (make-clang-toolchain clang) (define-public clang-runtime (clang-runtime-from-llvm llvm - "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl")) + "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2")) (define-public clang (clang-from-llvm llvm clang-runtime - "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08" - #:patches '("clang-7.0-libc-search-path.patch"))) + "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p" + #:patches '("clang-9.0-libc-search-path.patch"))) (define-public clang-toolchain (make-clang-toolchain clang)) -(define-public llvm-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) + +(define-public llvm-8 (package (inherit llvm) - (version "9.0.1") + (version "8.0.0") (source (origin (method url-fetch) (uri (llvm-download-uri "llvm" version)) (sha256 (base32 - "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")))) - (license license:asl2.0))) + "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) + (license license:ncsa))) -(define-public clang-runtime-9 +(define-public clang-runtime-8 (clang-runtime-from-llvm - llvm-9 - "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2")) + llvm-8 + "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl")) -(define-public clang-9 - (clang-from-llvm llvm-9 clang-runtime-9 - "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p" - #:patches '("clang-9.0-libc-search-path.patch"))) +(define-public clang-8 + (clang-from-llvm llvm-8 clang-runtime-8 + "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08" + #:patches '("clang-7.0-libc-search-path.patch"))) -(define-public clang-toolchain-9 - (make-clang-toolchain clang-9)) +(define-public clang-toolchain-8 + (make-clang-toolchain clang-8)) (define-public llvm-7 (package - (inherit llvm) + (inherit llvm-8) (version "7.0.1") (source (origin (method url-fetch) @@ -418,7 +423,7 @@ (define-public clang-toolchain-7 (define-public llvm-6 (package - (inherit llvm) + (inherit llvm-7) (version "6.0.1") (source (origin (method url-fetch) @@ -441,7 +446,7 @@ (define-public clang-toolchain-6 (make-clang-toolchain clang-6)) (define-public llvm-3.9.1 - (package (inherit llvm) + (package (inherit llvm-6) (name "llvm") (version "3.9.1") (source @@ -466,7 +471,7 @@ (define-public clang-3.9.1 #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.8 - (package (inherit llvm) + (package (inherit llvm-3.9.1) (name "llvm") (version "3.8.1") (source @@ -490,7 +495,7 @@ (define-public clang-3.8 #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.7 - (package (inherit llvm) + (package (inherit llvm-3.8) (version "3.7.1") (source (origin @@ -513,7 +518,7 @@ (define-public clang-3.7 #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-3.6 - (package (inherit llvm) + (package (inherit llvm-3.7) (version "3.6.2") (source (origin @@ -535,7 +540,7 @@ (define-public clang-3.6 #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-3.5 - (package (inherit llvm) + (package (inherit llvm-3.6) (version "3.5.2") (source (origin @@ -572,14 +577,14 @@ (define-public llvm-for-extempore (define-public libcxx (package (name "libcxx") - (version (package-version llvm)) + (version "9.0.1") (source (origin (method url-fetch) (uri (llvm-download-uri "libcxx" version)) (sha256 (base32 - "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462")))) + "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) (build-system cmake-build-system) (native-inputs `(("clang" ,clang) @@ -610,7 +615,7 @@ (define-public libcxx-6 (define-public libclc (package (name "libclc") - (version (package-version llvm)) + (version "9.0.1") (source (origin (method git-fetch) @@ -620,7 +625,7 @@ (define-public libclc (file-name (git-file-name name version)) (sha256 (base32 - "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa")))) + "1d1qayvrvvc1di7s7jfxnjvxq2az4lwq1sw1b2gq2ic0nksvajz0")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -649,13 +654,13 @@ (define-public libclc (define-public libomp (package (name "libomp") - (version (package-version llvm)) + (version "9.0.1") (source (origin (method url-fetch) (uri (llvm-download-uri "openmp" version)) (sha256 (base32 - "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp")) + "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w")) (file-name (string-append "libomp-" version ".tar.xz")))) (build-system cmake-build-system) ;; XXX: Note this gets built with GCC because building with Clang itself -- cgit v1.2.3 From c9677ce5f7cf50b25d7be3a18ad33ff5160c21db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 02:13:56 +0100 Subject: gnu: mesa-opencl: Build with clang@8. * gnu/packages/gl.scm (mesa-opencl)[native-inputs]: Change from CLANG to CLANG-8. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2a15d36cce..b0e0a43761 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -453,7 +453,7 @@ (define-public mesa-opencl `(("libclc" ,libclc) ,@(package-inputs mesa))) (native-inputs - `(("clang" ,clang) + `(("clang" ,clang-8) ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd -- cgit v1.2.3 From f7abd6fef1e11e70b516f7f56ac6a2094889e160 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Feb 2020 18:39:03 +0100 Subject: gnu: opensmtpd: Update to 6.6.4p1 [security fixes]. See . * gnu/packages/mail.scm (opensmtpd): Update to 6.6.4p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 43272b1856..a2e8503ccd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2306,14 +2306,14 @@ (define-public sendmail (define-public opensmtpd (package (name "opensmtpd") - (version "6.6.3p1") + (version "6.6.4p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy")))) + (base32 "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From 06b13f51f8efd9955f0e36a9dec6ad958fd48e6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 14:10:49 +0100 Subject: gnu: igraph: Update to 0.8.0. * gnu/packages/graph.scm (igraph): Update to 0.8.0. --- gnu/packages/graph.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 7b51a4fd90..b372ed919c 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner @@ -56,15 +56,15 @@ (define-module (gnu packages graph) (define-public igraph (package (name "igraph") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append "http://igraph.org/nightly/get/c/igraph-" - version ".tar.gz")) + (uri (string-append "https://github.com/igraph/igraph/releases/" + "download/" version "/igraph-" version ".tar.gz")) (sha256 (base32 - "1pxh8sdlirgvbvsw8v65h6prn7hlm45bfsl1yfcgd6rn4w706y6r")))) + "0jcnfvahrlj08y46vnax5y5bb294v4b9n00qsy7pbx0cc0sp6qvj")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 02422b3b669e120dcd8b8888893a84909b5b9b87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 19:22:49 +0100 Subject: gnu: python-texttable: Update to 1.6.2. * gnu/packages/python-xyz.scm (python-texttable): Update to 1.6.2. [arguments]: Replace check phase. [native-inputs]: Add python-pytest. [license]: Change to Expat. --- gnu/packages/python-xyz.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bbbb35ce8c..7a335c04b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson @@ -8339,21 +8339,27 @@ (define-public python2-contextlib2 (define-public python-texttable (package (name "python-texttable") - (version "0.9.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (pypi-uri "texttable" version)) (sha256 (base32 - "0yawv64c0zbawwv6zz84whb32fnb2n9jylwjcfsrcdgh7xvl340i")))) + "1x5l77akfc20x52jma9573qp8l8r07q103pm4l0pbizvh4vp1wzg")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; no tests + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "pytest" "tests.py")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/foutaise/texttable/") (synopsis "Python module for creating simple ASCII tables") (description "Texttable is a Python module for creating simple ASCII tables.") - (license license:lgpl2.1+))) + (license license:expat))) (define-public python2-texttable (package-with-python2 python-texttable)) -- cgit v1.2.3 From 7daae3c9d09a4d27586824a1d1af99e7af454d26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Feb 2020 19:27:46 +0100 Subject: gnu: python-igraph: Update to 0.8.0. * gnu/packages/graph.scm (python-igraph): Update to 0.8.0. [arguments]: Replace build phase; move check phase after install phase; pass "--use-pkg-config" to avoid rebuilding igraph. [propagated-inputs]: Add python-texttable. [native-inputs]: Add python-pytest. --- gnu/packages/graph.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index b372ed919c..63eb36fd7d 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -90,20 +90,35 @@ (define-public igraph (define-public python-igraph (package (inherit igraph) (name "python-igraph") - (version "0.7.1.post6") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "python-igraph" version)) (sha256 (base32 - "0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5")))) + "13mbrlmnbgbzw6y8ws7wj0a3ly3in8j4l1ngi6yxvgvxxi4bprj7")))) (build-system python-build-system) - (arguments '()) + (arguments + '(#:configure-flags + (list "--use-pkg-config") + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "python" "./setup.py" "build" "--use-pkg-config"))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v")))))) (inputs `(("igraph" ,igraph))) + (propagated-inputs + `(("python-texttable" ,python-texttable))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python-pytest" ,python-pytest))) (home-page "http://pypi.python.org/pypi/python-igraph") (synopsis "Python bindings for the igraph network analysis library"))) -- cgit v1.2.3 From 7eed584507738c11df178740bba2980f1e4d307e Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 16 Feb 2020 22:21:32 +0100 Subject: gnu: Add lodepng. * gnu/packages/image.scm (lodepng): New variable. Signed-off-by: Marius Bakke --- gnu/packages/image.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f9da1e9e89..106b733673 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -1844,3 +1845,58 @@ (define-public sng SNG is implemented by a compiler/decompiler called sng that losslessly translates between SNG and PNG.") (license license:zlib))) + +(define-public lodepng + ;; There are no tags in the repository, so we take the version as defined in + ;; lodepng.cpp. + (let ((commit "48e5364ef48ec2408f44c727657ac1b6703185f8") + (revision "1") + (version "20200215")) + (package + (name "lodepng") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lvandeve/lodepng") + (commit commit))) + (sha256 + (base32 + "1a1x8ag2scanzb2066jm9hg2y9kaa3wmpgmz10l1x9bkpik612lw")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (setenv "CXXFLAGS" "-fPIC") + (invoke "make" "lodepng.o") + (invoke "make" "lodepng_util.o") + (invoke "g++" "-fPIC" "-O3" + "-o" "liblodepng.so" + "-shared" "lodepng.o" "lodepng_util.o") + #t)) + (replace 'check + (lambda _ + (invoke "make" "unittest") + (invoke "./unittest") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc")) + (lib (string-append out "/lib")) + (include (string-append out "/include"))) + (install-file "lodepng.h" include) + (install-file "lodepng_util.h" include) + (install-file "liblodepng.so" lib) + (install-file "README.md" doc) + #t)))))) + (home-page "https://lodev.org/lodepng/") + (synopsis "PNG encoder and decoder in C and C++, without dependencies") + (description "LodePNG is a PNG image decoder and encoder, all in one, +no dependency or linkage required. It's made for C (ISO C90), and has a C++ +wrapper with a more convenient interface on top.") + (license license:zlib)))) -- cgit v1.2.3 From 2e0787a5750dc4682505e284f3a0b399c99985db Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 16 Feb 2020 22:42:42 +0100 Subject: gnu: Add libtcod. * gnu/packages/game-development.scm (libtcod): New variable. Signed-off-by: Marius Bakke --- gnu/packages/game-development.scm | 74 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 24527abae1..05e026a846 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages sphinx) #:use-module (gnu packages stb) #:use-module (gnu packages texinfo) + #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) @@ -2114,3 +2116,75 @@ (define-public chipmunk (description "Chipmunk is a simple, lightweight, fast and portable 2D rigid body physics library written in C.") (license license:expat))) + +(define-public libtcod + (package + (name "libtcod") + (version "1.15.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libtcod/libtcod.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pzr8ajmbqvh43ldjajx962xirj3rf8ayh344p6mqlrmb8gxrfr5")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "src/vendor/utf8proc") + (delete-file-recursively "src/vendor/zlib") + (delete-file "src/vendor/stb_truetype.h") + (delete-file "src/vendor/stb_sprintf.h") + (delete-file "src/vendor/lodepng.cpp") + (delete-file "src/vendor/lodepng.h") + + (substitute* "buildsys/autotools/sources.am" + (("\\.\\./\\.\\./src/vendor/lodepng\\.cpp \\\\\n") "") + (("\\.\\./\\.\\./src/vendor/stb\\.c \\\\") + "../../src/vendor/stb.c") + (("\\.\\./\\.\\./src/vendor/utf8proc/utf8proc\\.c") "")) + + (substitute* "src/libtcod/sys_sdl_img_png.cpp" + (("\\.\\./vendor/") "")) + + (substitute* '("src/libtcod/color/canvas.cpp" + "src/libtcod/sys_sdl_img_png.cpp" + "src/libtcod/tileset/truetype.cpp" + "src/libtcod/tileset/tilesheet.cpp") + (("\\.\\./\\.\\./vendor/") "")) + + (substitute* "src/libtcod/console/printing.cpp" + (("\\.\\./\\.\\./vendor/utf8proc/") "")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-gnu-ld" + "LIBS=-lutf8proc -llodepng") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-to-build-dir + (lambda _ + (chdir "buildsys/autotools") + (patch-shebang "get_version.py") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("python" ,python) + ("pkg-config" ,pkg-config) + ("stb-sprintf" ,stb-sprintf) + ("stb-truetype" ,stb-truetype))) + (inputs + `(("lodepng" ,lodepng) + ("sdl2" ,sdl2) + ("utf8proc" ,utf8proc) + ("zlib" ,zlib))) + (home-page "https://github.com/libtcod/libtcod") + (synopsis "Library specifically designed for writing roguelikes") + (description + "libtcod is a fast, portable and uncomplicated API for roguelike +developers providing an advanced true color console, input, and lots of other +utilities frequently used in roguelikes.") + (license license:bsd-3))) -- cgit v1.2.3 From 25590118ad1a9e93b9f438c668bf1de020fd36d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 22:46:03 +0100 Subject: gnu: Add ld wrapper variant that supports quotes in response files. * gnu/packages/ld-wrapper-next.in: New file. * gnu/local.mk (MISC_DISTRO_FILES): Adjust accordingly. * gnu/packages/chromium.scm (ld-wrapper-next): New variable. --- gnu/local.mk | 3 +- gnu/packages/chromium.scm | 15 +- gnu/packages/ld-wrapper-next.in | 305 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 321 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/ld-wrapper-next.in diff --git a/gnu/local.mk b/gnu/local.mk index b85c289c4e..857345cfad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,4 +1515,5 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-tighten-default-umask.patch MISC_DISTRO_FILES = \ - %D%/packages/ld-wrapper.in + %D%/packages/ld-wrapper.in \ + %D%/packages/ld-wrapper-next.in diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 49ad8de84c..06e259b985 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -70,7 +70,8 @@ (define-module (gnu packages chromium) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1)) (define %preserved-third-party-files '("base/third_party/cityhash" ;Expat @@ -423,6 +424,18 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) +;; Add a custom ld wrapper that supports quoted strings in response files. +;; To be merged with 'ld-wrapper' in a future rebuild cycle. +(define-public ld-wrapper-next + (let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper")))) + (package + (inherit orig) + (name "ld-wrapper-next") + (inputs + `(("wrapper" ,(search-path %load-path + "gnu/packages/ld-wrapper-next.in")) + ,@(alist-delete "wrapper" (package-inputs orig))))))) + (define-public ungoogled-chromium (package (name "ungoogled-chromium") diff --git a/gnu/packages/ld-wrapper-next.in b/gnu/packages/ld-wrapper-next.in new file mode 100644 index 0000000000..5d5756f6a3 --- /dev/null +++ b/gnu/packages/ld-wrapper-next.in @@ -0,0 +1,305 @@ +#!@BASH@ +# -*- mode: scheme; coding: utf-8; -*- + +# XXX: We have to go through Bash because there's no command-line switch to +# augment %load-compiled-path, and because of the silly 127-byte limit for +# the shebang line in Linux. +# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our +# .go file (see ). +# Unset 'GUILE_LOAD_COMPILED_PATH' to make sure we do not stumble upon +# incompatible .go files. See +# . + +unset GUILE_LOAD_COMPILED_PATH +main="(@ (gnu build-support ld-wrapper) ld-wrapper)" +exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@" +!# +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2020 Marius Bakke +;;; +;;; 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 build-support ld-wrapper) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:autoload (ice-9 rdelim) (read-delimited) + #:export (ld-wrapper)) + +;;; Commentary: +;;; +;;; This is a wrapper for the linker. Its purpose is to inspect the -L and +;;; -l switches passed to the linker, add corresponding -rpath arguments, and +;;; invoke the actual linker with this new set of arguments. +;;; +;;; The alternatives to this hack would be: +;;; +;;; 1. Using $LD_RUN_PATH. However, that would tend to include more than +;;; needed in the RPATH; for instance, given a package with `libfoo' as +;;; an input, all its binaries would have libfoo in their RPATH, +;;; regardless of whether they actually NEED it. +;;; +;;; 2. Use a GCC "lib" spec string such as `%{L*:-rpath %*}', which adds a +;;; `-rpath LIBDIR' argument for each occurrence of `-L LIBDIR'. +;;; However, this doesn't work when $LIBRARY_PATH is used, because the +;;; additional `-L' switches are not matched by the above rule, because +;;; the rule only matches explicit user-provided switches. See +;;; for details. +;;; +;;; As a bonus, this wrapper checks for "impurities"--i.e., references to +;;; libraries outside the store. +;;; +;;; Code: + +(define %real-ld + ;; Name of the linker that we wrap. + "@LD@") + +(define %store-directory + ;; File name of the store. + (or (getenv "NIX_STORE") "/gnu/store")) + +(define %temporary-directory + ;; Temporary directory. + (or (getenv "TMPDIR") "/tmp")) + +(define %build-directory + ;; Top build directory when run from a builder. + (getenv "NIX_BUILD_TOP")) + +(define %allow-impurities? + ;; Whether to allow references to libraries outside the store. + ;; Allow them by default for convenience. + (let ((value (getenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES"))) + (or (not value) + (let ((value (string-downcase value))) + (cond ((member value '("yes" "y" "t" "true" "1")) + #t) + ((member value '("no" "n" "f" "false" "0")) + #f) + (else + (format (current-error-port) + "ld-wrapper: ~s: invalid value for \ +'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'~%" + value))))))) + +(define %debug? + ;; Whether to emit debugging output. + (getenv "GUIX_LD_WRAPPER_DEBUG")) + +(define %disable-rpath? + ;; Whether to disable automatic '-rpath' addition. + (getenv "GUIX_LD_WRAPPER_DISABLE_RPATH")) + +(define (readlink* file) + ;; Call 'readlink' until the result is not a symlink. + (define %max-symlink-depth 50) + + (let loop ((file file) + (depth 0)) + (define (absolute target) + (if (absolute-file-name? target) + target + (string-append (dirname file) "/" target))) + + (if (>= depth %max-symlink-depth) + file + (call-with-values + (lambda () + (catch 'system-error + (lambda () + (values #t (readlink file))) + (lambda args + (let ((errno (system-error-errno args))) + (if (or (= errno EINVAL) (= errno ENOENT)) + (values #f file) + (apply throw args)))))) + (lambda (success? target) + (if success? + (loop (absolute target) (+ depth 1)) + file)))))) + +(define (pure-file-name? file) + ;; Return #t when FILE is the name of a file either within the store + ;; (possibly via a symlink) or within the build directory. + (let ((file (readlink* file))) + (or (not (string-prefix? "/" file)) + (string-prefix? %store-directory file) + (string-prefix? %temporary-directory file) + (and %build-directory + (string-prefix? %build-directory file))))) + +(define (store-file-name? file) + ;; Return #t when FILE is a store file, possibly indirectly. + (string-prefix? %store-directory (readlink* file))) + +(define (shared-library? file) + ;; Return #t when FILE denotes a shared library. + (or (string-suffix? ".so" file) + (let ((index (string-contains file ".so."))) + ;; Since we cannot use regexps during bootstrap, roll our own. + (and index + (string-every (char-set-union (char-set #\.) char-set:digit) + (string-drop file (+ index 3))))))) + +(define (library-search-path args) + ;; Return the library search path as a list of directory names. The GNU ld + ;; manual notes that "[a]ll `-L' options apply to all `-l' options, + ;; regardless of the order in which the options appear", so we must compute + ;; the search path independently of the -l options. + (let loop ((args args) + (path '())) + (match args + (() + (reverse path)) + (("-L" directory . rest) + (loop rest (cons directory path))) + ((argument . rest) + (if (string-prefix? "-L" argument) ;augment the search path + (loop rest + (cons (string-drop argument 2) path)) + (loop rest path)))))) + +(define (library-files-linked args library-path) + ;; Return the absolute file names of shared libraries explicitly linked + ;; against via `-l' or with an absolute file name in ARGS, looking them up + ;; in LIBRARY-PATH. + (define files+args + (fold (lambda (argument result) + (match result + ((library-files ((and flag + (or "-dynamic-linker" "-plugin")) + . rest)) + ;; When passed '-dynamic-linker ld.so', ignore 'ld.so'; when + ;; passed '-plugin liblto_plugin.so', ignore + ;; 'liblto_plugin.so'. See . + (list library-files + (cons* argument flag rest))) + ((library-files previous-args) + (cond ((string-prefix? "-l" argument) ;add library + (let* ((lib (string-append "lib" + (string-drop argument 2) + ".so")) + (full (search-path library-path lib))) + (list (if full + (cons full library-files) + library-files) + (cons argument previous-args)))) + ((and (string-prefix? %store-directory argument) + (shared-library? argument)) ;add library + (list (cons argument library-files) + (cons argument previous-args))) + (else + (list library-files + (cons argument previous-args))))))) + (list '() '()) + args)) + + (match files+args + ((files arguments) + (reverse files)))) + +(define (rpath-arguments library-files) + ;; Return the `-rpath' argument list for each of LIBRARY-FILES, a list of + ;; absolute file names. + (fold-right (lambda (file args) + ;; Add '-rpath' if and only if FILE is in the store; we don't + ;; want to add '-rpath' for files under %BUILD-DIRECTORY or + ;; %TEMPORARY-DIRECTORY because that could leak to installed + ;; files. + (cond ((and (not %disable-rpath?) + (store-file-name? file)) + (cons* "-rpath" (dirname file) args)) + ((or %allow-impurities? + (pure-file-name? file)) + args) + (else + (begin + (format (current-error-port) + "ld-wrapper: error: attempt to use \ +library outside of ~a: ~s~%" + %store-directory file) + (exit 1))))) + '() + library-files)) + +(define (expand-arguments args) + ;; Expand ARGS such that "response file" arguments, such as "@args.txt", are + ;; expanded (info "(gcc) Overall Options"). + (define (response-file-arguments file) + (define (tokenize port) + ;; Return a list of all strings found in PORT. Quote characters are removed, + ;; but whitespaces within quoted strings are preserved. + (let loop ((words '())) + (let* ((word (read-delimited " '\"" port 'split)) + (token (car word)) + (delim (cdr word))) + (if (eof-object? delim) + (reverse words) + (case delim + ((#\") (loop (cons (read-delimited "\"" port) words))) + ((#\') (loop (cons (read-delimited "'" port) words))) + ((#\ ) (if (> 0 (string-length token)) + (loop (cons token words)) + (loop words))) + (else (loop words))))))) + + (when %debug? + (format (current-error-port) + "ld-wrapper: attempting to read arguments from '~a'~%" file)) + + (call-with-input-file file tokenize)) + + (define result + (fold-right (lambda (arg result) + (if (string-prefix? "@" arg) + (let ((file (string-drop arg 1))) + (append (catch 'system-error + (lambda () + (response-file-arguments file)) + (lambda args + ;; FILE doesn't exist or cannot be read so + ;; leave ARG as is. + (list arg))) + result)) + (cons arg result))) + '() + args)) + + ;; If there are "@" arguments in RESULT *and* we can expand them (they don't + ;; refer to nonexistent files), then recurse. + (if (equal? result args) + result + (expand-arguments result))) + +(define (ld-wrapper . args) + ;; Invoke the real `ld' with ARGS, augmented with `-rpath' switches. + (let* ((args (expand-arguments args)) + (path (library-search-path args)) + (libs (library-files-linked args path)) + (args (append args (rpath-arguments libs)))) + (when %debug? + (format (current-error-port) + "ld-wrapper: library search path: ~s~%" path) + (format (current-error-port) + "ld-wrapper: libraries linked: ~s~%" libs) + (format (current-error-port) + "ld-wrapper: invoking `~a' with ~s~%" + %real-ld args) + (force-output (current-error-port))) + (apply execl %real-ld (basename %real-ld) args))) + +;;; ld-wrapper.scm ends here -- cgit v1.2.3 From f613d459be9a91ca778d1a2d5ece941ee21469b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 22:56:30 +0100 Subject: gnu: ungoogled-chromium: Update to 80.0.3987.116-0.bb952f1. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for Chromium 80. (%chromium-version): Set to 80.0.3987.116. (%ungoogled-revision): Set to bb952f18c8c80c569583edd8dbb0b54443f49043. (%debian-revision): Set to debian/80.0.3987.116-1. (%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes. (ungoogled-chromium)[arguments]: In #:configure-flags, add "is_cfi=false". Remove "is_clang", "enable_iterator_debugging", "exclude_unwind_tables", "use_jumbo_build", "jumbo_file_merge_limit". Adjust environment for building with Clang. [native-inputs]: Remove GCC-8. Add CLANG-9 and LD-WRAPPER-NEXT. --- gnu/packages/chromium.scm | 59 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 06e259b985..24879dfdcd 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -37,7 +37,6 @@ (define-module (gnu packages chromium) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -49,6 +48,7 @@ (define-module (gnu packages chromium) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages kerberos) #:use-module (gnu packages ninja) #:use-module (gnu packages node) @@ -107,10 +107,6 @@ (define %preserved-third-party-files "third_party/blink" ;BSD-3, LGPL2+ "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC) "third_party/boringssl/src/third_party/fiat" ;Expat - "third_party/boringssl/src/third_party/sike" ;Expat - ;; XXX: these files are generated by fp-$arch.pl in the above directory. - "third_party/boringssl/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S" - "third_party/boringssl/linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S" "third_party/breakpad" ;BSD-3 "third_party/brotli" ;Expat "third_party/cacheinvalidation" ;ASL2.0 @@ -118,11 +114,14 @@ (define %preserved-third-party-files "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0 "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0 "third_party/catapult/third_party/polymer" ;BSD-3 + ;; XXX: This is a minified version of . "third_party/catapult/tracing/third_party/d3" ;BSD-3 "third_party/catapult/tracing/third_party/gl-matrix" ;Expat + ;; XXX: Minified version of . "third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3 "third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat "third_party/catapult/tracing/third_party/oboe" ;BSD-2 + ;; XXX: Minified version of . "third_party/catapult/tracing/third_party/pako" ;Expat "third_party/ced" ;BSD-3 "third_party/cld_3" ;ASL2.0 @@ -135,6 +134,9 @@ (define %preserved-third-party-files "third_party/dav1d" ;BSD-2 "third_party/dawn" ;ASL2.0 "third_party/depot_tools/owners.py" ;BSD-3 + "third_party/devtools-frontend" ;BSD-3 + "third_party/devtools-frontend/src/third_party/axe-core" + "third_party/devtools-frontend/src/third_party/pyjson5" "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 @@ -155,6 +157,7 @@ (define %preserved-third-party-files "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" "third_party/libaom/source/libaom/third_party/vector" ;Expat "third_party/libaom/source/libaom/third_party/x86inc" ;ISC + "third_party/libgifcodec" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3, BSD-2 "third_party/libjingle_xmpp" ;BSD-3 "third_party/libphonenumber" ;ASL2.0 "third_party/libsecret" ;LGPL2.1+ @@ -182,6 +185,7 @@ (define %preserved-third-party-files "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3 "third_party/pdfium/third_party/skia_shared" ;BSD-3 "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType + "third_party/perfetto" "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 "third_party/ply" ;BSD-3 "third_party/polymer" ;BSD-3 @@ -195,7 +199,6 @@ (define %preserved-third-party-files "third_party/sfntly" ;ASL2.0 "third_party/skia" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3 - "third_party/skia/third_party/gif" ;MPL1.1/GPL2+/LGPL2.1+ "third_party/skia/third_party/skcms" ;BSD-3 "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat "third_party/smhasher" ;Expat, public domain @@ -244,9 +247,9 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "79.0.3945.130") -(define %ungoogled-revision "e2fae994d786b6716fb473a47b0c880bcfdc2497") -(define %debian-revision "debian/79.0.3945.130-2") +(define %chromium-version "80.0.3987.116") +(define %ungoogled-revision "bb952f18c8c80c569583edd8dbb0b54443f49043") +(define %debian-revision "debian/80.0.3987.116-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" package-revision "." @@ -260,7 +263,7 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an")))) + "00c9czjyk1h3i40lvmh2rshp1mq7pcxwsfh1qrq22w8ba6ydkib5")))) (define %ungoogled-origin (origin @@ -271,7 +274,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "15vmc07iba1zmzn4j7c5n2hyvyxzwwf9hc3kyym0m4jajlsyxr5f")))) + "0lvj3mjwnxvd3kjl2ikl5f0ddrwnp2xsycfx296nwnrimx0frcmg")))) (define %debian-origin (origin @@ -285,7 +288,7 @@ (define %debian-origin (_ (string-take %debian-revision 7))))) (sha256 (base32 - "1rbzxcwfp7v0c6rkvn9jl9by7p363cnbdyqazwiak1z03kmw3nkz")))) + "1cc5sp566dd8f2grgr770xwbxgxf58dk1w7q3s8pmv4js5h3pwq8")))) ;; This is a "computed" origin that does the following: ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. @@ -345,7 +348,7 @@ (define ungoogled-chromium-source (with-directory-excursion chromium-dir - (format #t "applying Debian patches...~%") + (format #t "Applying Debian patches...~%") (force-output) (let* ((debian #+debian-source) (patches (string-append debian "/debian/patches")) @@ -459,8 +462,10 @@ (define-public ungoogled-chromium ;; directory for an exhaustive list of supported flags. ;; (Note: The 'configure' phase will do that for you.) (list "is_debug=false" + "is_cfi=false" "use_gold=false" "use_lld=false" + "clang_use_chrome_plugins=false" "linux_use_bundled_binutils=false" "use_custom_libcxx=false" "use_sysroot=false" @@ -490,18 +495,6 @@ (define-public ungoogled-chromium ;; friends from the environment. "custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - ;; Don't assume it's clang. - "is_clang=false" - ;; Disable debugging features to save space. These are normally - ;; pulled in by "is_official_build", but that requires "is_clang". - "enable_iterator_debugging=false" - "exclude_unwind_tables=true" - ;; Optimize for building everything at once, as opposed to - ;; incrementally for development. See "docs/jumbo.md". - "use_jumbo_build=true" - ;; The default file merge limit of 50 requires huge amounts of RAM. - ;; Cap it to make sure the build succeeds on commodity hardware. - "jumbo_file_merge_limit=8" ;; Prefer system libraries. "use_system_freetype=true" @@ -597,6 +590,10 @@ (define-public ungoogled-chromium (substitute* "third_party/webrtc/rtc_base/strings/json.h" (("#include \"third_party/jsoncpp/") "#include \"json/")) + (substitute* "gpu/config/gpu_util.cc" + (("third_party/vulkan/include/") + "")) + (substitute* '("components/viz/common/gpu/vulkan_context_provider.h" "components/viz/common/resources/resource_format_utils.h") (("third_party/vulkan/include/") "")) @@ -649,14 +646,19 @@ (define-public ungoogled-chromium ;; Make sure the right build tools are used. (setenv "AR" "ar") (setenv "NM" "nm") - (setenv "CC" "gcc") (setenv "CXX" "g++") + (setenv "CC" "clang") (setenv "CXX" "clang++") - ;; Prevent GCC from optimizing away null pointer safety checks. + ;; Do not optimize away null pointer safety checks. (setenv "CXXFLAGS" "-fno-delete-null-pointer-checks") ;; TODO: pre-compile instead. Avoids a race condition. (setenv "PYTHONDONTWRITEBYTECODE" "1") + (substitute* + ;; From Debians 'system/node.patch'. + "third_party/devtools-frontend/src/scripts/devtools_paths.py" + (("/usr/bin/nodejs") (which "node"))) + ;; XXX: How portable is this. (mkdir-p "third_party/node/linux/node-linux-x64") (symlink (string-append (assoc-ref inputs "node") "/bin") @@ -761,9 +763,10 @@ (define-public ungoogled-chromium #t)))))) (native-inputs `(("bison" ,bison) - ("gcc" ,gcc-8) + ("clang" ,clang-9) ("gn" ,gn) ("gperf" ,gperf) + ("ld-wrapper" ,ld-wrapper-next) ("ninja" ,ninja) ("node" ,node) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From c23b42dd55e014a5a79032cc0ef85e775cb02e8b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 25 Feb 2020 00:26:16 +0100 Subject: guix: node-build-system: Do not symlink /bin. * guix/build/node-build-system.scm (install): Do not add a symlink for /bin. --- guix/build/node-build-system.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 3c0ac2a12b..7799f03595 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -133,10 +133,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) (symlink (string-append target "/node_modules/" modulename "/" value) (string-append binaries "/" key)))))) - binary-configuration)) - (else - (symlink (string-append target "/node_modules/" modulename "/bin") - binaries))) + binary-configuration))) (when dependencies (mkdir-p (string-append target "/node_modules/" modulename "/node_modules")) -- cgit v1.2.3 From 679d41b4406d30ec5805ee8015d2ffa446a4e334 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Feb 2020 01:59:37 +0100 Subject: Revert "gnu: vim: Fix build on CoW file systems." This reverts commit b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7. --- gnu/packages/vim.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 579b21524e..67f245b26d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -84,12 +84,6 @@ (define-public vim #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-CoW - ;; Disable copy-on-write (CoW) in the build directory. Tests fail on - ;; btrfs (and possibly other CoW file systems) for unclear reasons. - ;; This needs to be run early as it only affects newly-created files. - (lambda _ - (invoke "chattr" "-R" "+C" "."))) (add-after 'configure 'patch-config-files (lambda _ (substitute* "runtime/tools/mve.awk" @@ -134,7 +128,6 @@ (define-public vim `(("libtool" ,libtool) ;; For tests. - ("e2fsprogs" ,e2fsprogs) ; for chattr in disable-CoW above ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") -- cgit v1.2.3 From 0d197a63d1c2751c562f44046b089017cd246574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Jan 2020 16:51:05 +0100 Subject: gnu: font-fantasque-sans: Update to 1.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-fantasque-sans): Update to 1.8.0. [native-inputs]: Remove ttf2eot. [arguments]: Rename the ‘xrange->range’ phase to ‘support-python@3’. Patch another Python twoism. --- gnu/packages/fonts.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b248b27ce2..186e1eecff 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -781,7 +781,7 @@ (define-public font-un (define-public font-fantasque-sans (package (name "font-fantasque-sans") - (version "1.7.2") + (version "1.8.0") (source (origin (method git-fetch) @@ -790,26 +790,27 @@ (define-public font-fantasque-sans (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1gjranq7qf20rfxnpxsckv1hl35nzsal0rjs475nhfbpqy5wmly6")))) + (base32 "17l18488qyl9gdj80r8pcym3gp3jkgsdikwalnrp5rgvwidqx507")))) (build-system gnu-build-system) (native-inputs `(("ttfautohint" ,ttfautohint) ("woff-tools" ,woff-tools) ("fontforge" ,fontforge) ("woff2" ,woff2) - ("ttf2eot" ,ttf2eot) ("zip" ,zip))) (arguments `(#:tests? #f ;test target intended for visual inspection #:phases (modify-phases %standard-phases (delete 'configure) ;no configuration - (add-before 'build 'xrange->range - ;; Rather than use a python2 fontforge, just replace the - ;; offending function. + (add-before 'build 'support-python@3 + ;; Rather than use a Python 2 fontforge, replace Python-2- + ;; specific code with a passable Python 3 equivalent. (lambda _ (substitute* "Scripts/fontbuilder.py" (("xrange") "range")) + (substitute* "Scripts/features.py" + (("f\\.write\\(fea_code\\)") + "f.write(str.encode(fea_code))")) #t)) (replace 'install ;; 'make install' wants to install to ~/.fonts, install to -- cgit v1.2.3 From d70e74ce0eb036095bf7d9e06bbfe2bf669dd05a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Feb 2020 08:53:50 +0200 Subject: gnu: datamash: Update to 1.6. * gnu/packages/datamash.scm (datamash): Update to 1.6. --- gnu/packages/datamash.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm index ac1b71e63b..a61ee96fec 100644 --- a/gnu/packages/datamash.scm +++ b/gnu/packages/datamash.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +29,7 @@ (define-module (gnu packages datamash) (define-public datamash (package (name "datamash") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (define-public datamash version ".tar.gz")) (sha256 (base32 - "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2")))) + "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr")))) (native-inputs `(("which" ,which) ;for tests ("perl" ,perl))) ;for help2man -- cgit v1.2.3 From 54a968258317df628a57d9cb739b81f45a8171da Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:49:00 +0300 Subject: gnu: Add rust-color-quant-1.0. * gnu/packages/crates-io.scm (rust-color-quant-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 699fb52d11..f58745f199 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2122,6 +2122,27 @@ (define-public rust-cmake-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-color-quant-1.0 + (package + (name "rust-color-quant") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "color-quant" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ga56jrafnjm80903nnqjkyii4bwd6a7visxh0g8hgi6cmrvbfqd")))) + (build-system cargo-build-system) + (home-page "https://github.com/PistonDevelopers/color_quant.git") + (synopsis + "Color quantization library to reduce n colors to 256 colors") + (description + "Color quantization library to reduce n colors to 256 colors.") + (license license:expat))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-compiler-builtins-0.1 -- cgit v1.2.3 From c6f876c889561ea29cc9c1bf7b1a34bf7d839d1c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:53:25 +0300 Subject: gnu: Add rust-memmap-0.2. * gnu/packages/crates-io.scm (rust-memmap-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f58745f199..54e2e597b8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8200,6 +8200,29 @@ (define-public rust-memmap-0.6 (base32 "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))))) +(define-public rust-memmap-0.2 + (package + (inherit rust-memmap-0.6) + (name "rust-memmap") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0li737lakqcbbgd87x7h8d4vp0r1fqcbn5lb5vi746i9jgnp43zj")))) + (arguments + `(#:cargo-inputs + (("rust-fs2" ,rust-fs2-0.2) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))))) + (define-public rust-memoffset-0.5 (package (name "rust-memoffset") -- cgit v1.2.3 From 519c7d056c9ff3f0219f8d9c100d4c57787cd473 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:49:33 +0300 Subject: gnu: Add rust-gif-0.10. * gnu/packages/crates-io.scm (rust-gif-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54e2e597b8..17269f6afe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5581,6 +5581,33 @@ (define-public rust-getrandom-0.1 retrieving random data from system source.") (license (list license:expat license:asl2.0)))) +(define-public rust-gif-0.10 + (package + (name "rust-gif") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "gif" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bw174f7civdfgryvc8pvyhicpr96hzdajnda4s3y8iv3ch907a7")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests not included in release + #:cargo-inputs + (("rust-color-quant" ,rust-color-quant-1.0) + ("rust-libc" ,rust-libc-0.2) + ("rust-lzw" ,rust-lzw-0.10)) + #:cargo-development-inputs + (("rust-glob" ,rust-glob-0.3)))) + (home-page "https://github.com/image-rs/image-gif") + (synopsis "GIF decoder and encoder") + (description "This package provides a GIF decoder and encoder in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gimli-0.18 (package (name "rust-gimli") -- cgit v1.2.3 From 8b2708a5660bd74a87c0247c43bdbba38632015a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:47:41 +0300 Subject: gnu: Add rust-expat-sys-2.1. * gnu/packages/crates-io.scm (rust-expat-sys-2.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 17269f6afe..7756a4d997 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38,6 +38,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) ;;; @@ -4245,6 +4246,36 @@ (define-public rust-euclid-0.20 (description "Geometry primitives written in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-expat-sys-2.1 + (package + (name "rust-expat-sys") + (version "2.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "expat-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yj5pqynds776ay8wg9mhi3hvna4fv7vf244yr1864r0i5r1k3v5")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "expat") #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("expat" ,expat))) + (home-page "http://www.libexpat.org/") + (synopsis "XML parser library written in C") + (description "XML parser library written in C") + (license license:expat))) + (define-public rust-fake-simd-0.1 (package (name "rust-fake-simd") -- cgit v1.2.3 From 3800d492caaf10b09f5d94d19025fafdb793c631 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:55:45 +0300 Subject: gnu: Add rust-sema-0.1. * gnu/packages/crates-io.scm (rust-sema-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7756a4d997..515a7e5e9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13432,6 +13432,38 @@ (define-public rust-security-framework-sys-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-sema-0.1 + (package + (name "rust-sema") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "sema" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ckq33sg84785p195m54h03jcn7fai8w08hjnb94nzaakgzibbz3")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("libc.*") "libc = \"0.2\"\n")) + #t)))) + (build-system cargo-build-system) + (arguments + `( #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rand" ,rust-rand-0.3) + ("rust-time" ,rust-time-0.1)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nix" ,rust-nix-0.15)))) + (home-page "https://github.com/cpjreynolds/sema") + (synopsis "Rust semaphore library") + (description "Rust semaphore library.") + (license license:expat))) + (define-public rust-semver-0.9 (package (name "rust-semver") -- cgit v1.2.3 From 2a7940e83ea7911788b76e25f7eb213db7c3d2b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Feb 2020 09:56:46 +0200 Subject: gnu: rust-nix-0.15: Don't skip build. * gnu/packages/crates-io.scm (rust-nix-0.15)[arguments]: Don't skip build. Skip tests. Move rust-cc-1.0 from cargo-development-inputs to cargo-inputs. Replace rust-rand-0.4 with 0.6, rust-sysctl-0.4 with 0.1 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 515a7e5e9e..037e9981f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8966,19 +8966,19 @@ (define-public rust-nix-0.15 "0aa2l7wg9pzx24ks4p97gdy09a4hhs1sr9drxnm75v906d7hnbiv")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; test suite hangs #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1.0) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-void" ,rust-void-1.0)) #:cargo-development-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-caps" ,rust-caps-0.3) - ("rust-cc" ,rust-cc-1.0) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-rand" ,rust-rand-0.4) - ("rust-sysctl" ,rust-sysctl-0.4) + ("rust-rand" ,rust-rand-0.6) + ("rust-sysctl" ,rust-sysctl-0.1) ("rust-tempfile" ,rust-tempfile-3.0)))) (home-page "https://github.com/nix-rust/nix") (synopsis "Rust friendly bindings to *nix APIs") -- cgit v1.2.3 From 448a63ee411b03a92fec7c2203b528be82bd80b6 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:58:31 +0300 Subject: gnu: Add rust-servo-freetype-sys-4. * gnu/packages/crates-io.scm (rust-servo-freetype-sys-4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 037e9981f3..9195528caa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13843,6 +13843,37 @@ (define-public rust-serde-yaml-0.8 (description "YAML support for Serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-servo-freetype-sys-4 + (package + (name "rust-servo-freetype-sys") + (version "4.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-freetype-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z0dvnakans4vn4vlpx4nxg984427lh8dskxxz9pglij1mnwnk1c")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "freetype2") #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("freetype" ,freetype))) + (home-page "http://www.freetype.org/") + (synopsis "Rust wrapper around freetype") + (description + "This package provides a Rust wrapper around the FreeType library.") + (license license:mpl2.0))) ; build.rs is mpl2.0 + (define-public rust-sha-1-0.8 (package (name "rust-sha-1") -- cgit v1.2.3 From 935cfbae63234211af31adb3c21213ed6dfa05bc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:58:55 +0300 Subject: gnu: Add rust-servo-fontconfig-sys-4. * gnu/packages/crates-io.scm (rust-servo-fontconfig-sys-4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9195528caa..5774a45ff5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13874,6 +13874,41 @@ (define-public rust-servo-freetype-sys-4 "This package provides a Rust wrapper around the FreeType library.") (license license:mpl2.0))) ; build.rs is mpl2.0 +(define-public rust-servo-fontconfig-sys-4 + (package + (name "rust-servo-fontconfig-sys") + (version "4.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-fontconfig-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v0mbicy74wd6cjd5jyqnm4nvrrr5lmg053cn16kylhg8mkf3cv2")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + (find-files "." "[^Cargo.toml,^build\\.rs]")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-expat-sys" ,rust-expat-sys-2.1) + ("rust-servo-freetype-sys" ,rust-servo-freetype-sys-4) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig))) + (home-page "https://crates.io/crates/servo-fontconfig-sys") + (synopsis "Rust wrapper around Fontconfig") + (description + "This package provides a Rust wrapper around Fontxonfig.") + (license license:mpl2.0))) ; build.rs is mpl2.0 + (define-public rust-sha-1-0.8 (package (name "rust-sha-1") -- cgit v1.2.3 From 753a43c2e8dd8f954e4d9bceccdd4d71a111af0a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Mon, 20 Jan 2020 03:59:16 +0300 Subject: gnu: Add rust-servo-fontconfig-0.4. * gnu/packages/crates-io.scm (rust-servo-fontconfig-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5774a45ff5..2f1106fc3d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13874,6 +13874,33 @@ (define-public rust-servo-freetype-sys-4 "This package provides a Rust wrapper around the FreeType library.") (license license:mpl2.0))) ; build.rs is mpl2.0 +(define-public rust-servo-fontconfig-0.4 + (package + (name "rust-servo-fontconfig") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-fontconfig" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nach6s4hdf86jz5hlm4p5r7vin91cs7gg89mr533id5fpbzi250")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-servo-fontconfig-sys" ,rust-servo-fontconfig-sys-4)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig))) + (home-page "https://github.com/servo/rust-fontconfig/") + (synopsis "Rust bindings for fontconfig") + (description "This package provides Rust bindings for fontconfig.") + (license (list license:expat license:asl2.0)))) + (define-public rust-servo-fontconfig-sys-4 (package (name "rust-servo-fontconfig-sys") -- cgit v1.2.3 From c67c3a676c0f974882df65b42bdee1c4eadefa4a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:20:29 +0300 Subject: gnu: Add rust-png-0.15. * gnu/packages/crates-io.scm (rust-png-0.15): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f1106fc3d..3179a0a0fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10811,6 +10811,40 @@ (define-public rust-plugin-0.2 "Lazily evaluated, order-independent plugins for extensible types.") (license license:expat))) +(define-public rust-png-0.15 + (package + (name "rust-png") + (version "0.15.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10x2qkhyfnm3si5vgx77r2ik811gaap7ahi825wfxgsb0lirm1gg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-deflate" ,rust-deflate-0.7) + ("rust-inflate" ,rust-inflate-0.4)) + #:cargo-development-inputs + (("rust-getopts" ,rust-getopts-0.2) + ;; TODO: glium has many cyclic dependencies with other packages + ;;("rust-glium" ,rust-glium-0.24) + ("rust-glob" ,rust-glob-0.3) + ("rust-rand" ,rust-rand-0.7) + ("rust-term" ,rust-term-0.6)))) + (home-page "https://github.com/image-rs/image-png.git") + (synopsis "PNG decoding and encoding library in pure Rust") + (description + "PNG decoding and encoding library in pure Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pocket-resources-0.3 (package (name "rust-pocket-resources") -- cgit v1.2.3 From b043a3404b659b926088fdfa09ce899afc579e6a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:23:20 +0300 Subject: gnu: Add rust-png-0.14. * gnu/packages/crates-io.scm (rust-png-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3179a0a0fa..de9a9b5ce2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10845,6 +10845,35 @@ (define-public rust-png-0.15 "PNG decoding and encoding library in pure Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-png-0.14 + (package + (inherit rust-png-0.15) + (name "rust-png") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nf3a8r9p9zrj4x30b48f7yv18dz9xkmrq9b3lnzmpnhzn0z9nk3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-deflate" ,rust-deflate-0.7) + ("rust-inflate" ,rust-inflate-0.4) + ("rust-num-iter" ,rust-num-iter-0.1)) + #:cargo-development-inputs + (("rust-getopts" ,rust-getopts-0.2) + ;; TODO: glium has many cyclic dependencies with other packages + ;; ("rust-glium" ,rust-glium-0.22) + ("rust-glob" ,rust-glob-0.2) + ("rust-rand" ,rust-rand-0.5) + ("rust-term" ,rust-term-0.4)))))) + (define-public rust-pocket-resources-0.3 (package (name "rust-pocket-resources") -- cgit v1.2.3 From 2a9521f7cc584caf65ef50b1d020722971a3b1e2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:23:56 +0300 Subject: gnu: Add rust-png-0.12. * gnu/packages/crates-io.scm (rust-png-0.12): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index de9a9b5ce2..7966a5c9d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10874,6 +10874,34 @@ (define-public rust-png-0.14 ("rust-rand" ,rust-rand-0.5) ("rust-term" ,rust-term-0.4)))))) +(define-public rust-png-0.12 + (package + (inherit rust-png-0.14) + (name "rust-png") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nqlc8lqf8ncv3kj0gzlxwli61dbbxcjlrp176kvilw4sl09cjzm")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-deflate" ,rust-deflate-0.7) + ("rust-inflate" ,rust-inflate-0.4) + ("rust-num-iter" ,rust-num-iter-0.1)) + #:cargo-development-inputs + (("rust-getopts" ,rust-getopts-0.2) + ;; TODO: gluum has many cyclic dependencies with other packages + ;; ("rust-glium" ,rust-glium-0.21) + ("rust-glob" ,rust-glob-0.2) + ("rust-term" ,rust-term-0.4)))))) + (define-public rust-pocket-resources-0.3 (package (name "rust-pocket-resources") -- cgit v1.2.3 From 12f0aefd1418443823450fdd111259269ad3d9cb Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 18 Feb 2020 10:42:06 +0100 Subject: build-system/linux-module: Disable depmod. * guix/build/linux-module-build-system.scm (install): Disable depmod. --- guix/build/linux-module-build-system.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm index cd76df2de7..8145d5a724 100644 --- a/guix/build/linux-module-build-system.scm +++ b/guix/build/linux-module-build-system.scm @@ -60,15 +60,18 @@ (define* (build #:key inputs make-flags #:allow-other-keys) ;; part. (define* (install #:key inputs native-inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (moddir (string-append out "/lib/modules")) - (kmod (assoc-ref (or native-inputs inputs) "kmod"))) + (moddir (string-append out "/lib/modules"))) ;; Install kernel modules (mkdir-p moddir) (invoke "make" "-C" (string-append (assoc-ref inputs "linux-module-builder") "/lib/modules/build") (string-append "M=" (getcwd)) - (string-append "DEPMOD=" kmod "/bin/depmod") + ;; Disable depmod because the Guix system's module directory + ;; is an union of potentially multiple packages. It is not + ;; possible to use depmod to usefully calculate a dependency + ;; graph while building only one of those packages. + "DEPMOD=true" (string-append "MODULE_DIR=" moddir) (string-append "INSTALL_PATH=" out) (string-append "INSTALL_MOD_PATH=" out) -- cgit v1.2.3 From 1fc47a9b491bcc6d3a216592f00f71468a2c80f0 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 25 Feb 2020 13:47:40 +0100 Subject: gnu: plantuml: Update to 1.2020.1. * gnu/packages/uml.scm (plantuml): Update to 1.2020.1. [arguments]<#:phases>[delete-extra-from-classpath]: Modify. --- gnu/packages/uml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index 41fb66c3b9..b3b4505938 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -30,14 +30,14 @@ (define-module (gnu packages uml) (define-public plantuml (package (name "plantuml") - (version "1.2019.3") + (version "1.2020.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/plantuml/" version "/plantuml-" version ".tar.gz")) (sha256 (base32 - "0p2mqav0qfc6kmkhb2n1vjysffnvpsx4yal68nl0yrh5vd3bnmza")))) + "1mywv4m6v1y2wpfz9vqriw6cdq1d2md5k2vf244ldbd9s6j45467")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests @@ -49,7 +49,7 @@ (define-public plantuml (substitute* "build.xml" (("1.6") "1.7") (("") "-->")) + (("ditaa0_9.jar\" />") "-->")) #t)) (add-after 'delete-extra-from-classpath 'patch-usr-bin-dot (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From c51c0033d00da046ff3fa573e99000b5b723cc05 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Tue, 25 Feb 2020 14:52:25 +0100 Subject: gnu: Add r-bsgenome-hsapiens-ncbi-grch38. * gnu/packages/bioconductor.scm (r-bsgenome-hsapiens-ncbi-grch38): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e004560d58..e14f7bc93e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -224,6 +224,30 @@ (define-public r-bsgenome-hsapiens-1000genomes-hs37d5 1000genomes phase2 reference genome sequence (hs37d5), based on NCBI GRCh37.") (license license:artistic2.0))) +(define-public r-bsgenome-hsapiens-ncbi-grch38 + (package + (name "r-bsgenome-hsapiens-ncbi-grch38") + (version "1.3.1000") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BSgenome.Hsapiens.NCBI.GRCh38" + version 'annotation)) + (sha256 + (base32 + "0y75qdq578fh6420vbvsbwmdw8jvr3g06qli2h3vj3pxmjykh9c1")))) + (properties `((upstream-name . "BSgenome.Hsapiens.NCBI.GRCh38"))) + (build-system r-build-system) + (propagated-inputs `(("r-bsgenome" ,r-bsgenome))) + (home-page + "https://bioconductor.org/packages/release/data/annotation/html/\ +BSgenome.Hsapiens.NCBI.GRCh38.html") + (synopsis "Full genome sequences for Homo sapiens (GRCh38)") + (description + "This package provides full genome sequences for Homo sapiens (Human) as +provided by NCBI (GRCh38, 2013-12-17) and stored in Biostrings objects.") + (license license:artistic2.0))) + (define-public r-bsgenome-hsapiens-ucsc-hg19-masked (package (name "r-bsgenome-hsapiens-ucsc-hg19-masked") -- cgit v1.2.3 From 788de3aec8faa7b54ccb978860f1a6a57be6b8fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Feb 2020 15:33:44 +0100 Subject: gnu: jamm: Update to 1.0.7.6. * gnu/packages/bioinformatics.scm (jamm): Update to 1.0.7.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4adb3137e5..753b7fd0f5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13882,7 +13882,7 @@ (define-public r-absfiltergsea (define-public jamm (package (name "jamm") - (version "1.0.7.5") + (version "1.0.7.6") (source (origin (method git-fetch) @@ -13892,7 +13892,7 @@ (define-public jamm (file-name (git-file-name name version)) (sha256 (base32 - "0ls889jcma1ch9h21jjhnkadgszgqj41842hhcjh6cg88f85qf3i")))) + "0bsa5mf9n9q5jz7mmacrra41l7r8rac5vgsn6wv1fb52ya58b970")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are none -- cgit v1.2.3 From def0676b0bbaa1fff2d5b0a18af172966bafbced Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:24:31 +0300 Subject: gnu: Add rust-jpeg-decoder-0.1. * gnu/packages/crates-io.scm (rust-jpeg-decoder-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7966a5c9d2..07e40c36e7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7156,6 +7156,34 @@ (define-public rust-jobserver-0.1 "An implementation of the GNU make jobserver for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-jpeg-decoder-0.1 + (package + (name "rust-jpeg-decoder") + (version "0.1.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "jpeg-decoder" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lc428qgffh2a1agkq0p26mvf9rjaiswpywy5883j99mqypg0mh2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files missing. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-rayon" ,rust-rayon-1.1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-png" ,rust-png-0.14) + ("rust-walkdir" ,rust-walkdir-2.2)))) + (home-page "https://github.com/image-rs/jpeg-decoder") + (synopsis "JPEG decoder") + (description "JPEG decoder written in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-js-sys-0.3 (package (name "rust-js-sys") -- cgit v1.2.3 From 48748d53de47daae8f70595b8988bb7f711cf63a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:25:57 +0300 Subject: gnu: Add rust-tiff-0.3. * gnu/packages/crates-io.scm (rust-tiff-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07e40c36e7..f813ef4b6e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16036,6 +16036,36 @@ (define-public rust-threadpool-1.7 (license (list license:asl2.0 license:expat)))) +(define-public rust-tiff-0.3 + (package + (name "rust-tiff") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tiff" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zgmbny2f8rssqmjdfvnysy0vqwcvlwl6q9f5yixhavlqk7w5dyp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests images not included with release. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lzw" ,rust-lzw-0.10) + ("rust-num-derive" ,rust-num-derive-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.0)))) + (home-page "https://github.com/image-rs/image-tiff") + (synopsis + "TIFF decoding and encoding library in pure Rust") + (description + "TIFF decoding and encoding library in pure Rust.") + (license license:expat))) + (define-public rust-time-0.1 (package (name "rust-time") -- cgit v1.2.3 From 9fba0256cb6c5fcefc938dd6bf85071cde17cc9a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:27:00 +0300 Subject: gnu: Add rust-tiff-0.2. * gnu/packages/crates-io.scm (rust-tiff-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f813ef4b6e..3fe0558ddc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16066,6 +16066,27 @@ (define-public rust-tiff-0.3 "TIFF decoding and encoding library in pure Rust.") (license license:expat))) +(define-public rust-tiff-0.2 + (package + (inherit rust-tiff-0.3) + (name "rust-tiff") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tiff" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kn7psgpacns337vvqh272rkqwnakmjd51rc7ygwnc03ibr38j0y")))) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-lzw" ,rust-lzw-0.10) + ("rust-num-derive" ,rust-num-derive-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)))))) + (define-public rust-time-0.1 (package (name "rust-time") -- cgit v1.2.3 From 4aaa7e13d9411b9c0187ea926065187abfd79f87 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:28:24 +0300 Subject: gnu: Add rust-image-0.22. * gnu/packages/crates-io.scm (rust-image-0.22): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3fe0558ddc..26ae682657 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6775,6 +6775,44 @@ (define-public rust-ignore-0.4 ignore files such as .gitignore against file paths.") (license (list license:unlicense license:expat)))) +(define-public rust-image-0.22 + (package + (name "rust-image") + (version "0.22.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "image" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jpbd0p1q7xx6395ba9ikz2k4cfp26qczisa8m2v15w3hzd2mv88")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test images are missing from the release. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gif" ,rust-gif-0.10) + ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-png" ,rust-png-0.15) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-tiff" ,rust-tiff-0.3)) + #:cargo-development-inputs + (("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-glob" ,rust-glob-0.3) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/image-rs/image") + (synopsis "Imaging library written in Rust") + (description + "Imaging library written in Rust. Provides basic filters and decoders +for the most common image formats.") + (license license:expat))) + (define-public rust-indexmap-1.0 (package (name "rust-indexmap") -- cgit v1.2.3 From 4e832827e2b25aaf78c1d7a81bc396482c026ae0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:29:21 +0300 Subject: gnu: Add rust-image-0.21. * gnu/packages/crates-io.scm (rust-image-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 26ae682657..b1325a421b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6813,6 +6813,37 @@ (define-public rust-image-0.22 for the most common image formats.") (license license:expat))) +(define-public rust-image-0.21 + (package + (inherit rust-image-0.22) + (name "rust-image") + (version "0.21.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "image" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sv534xp8yyn7jj0q6yn2bgng1350f962g81sv8v7c6pgi31wdrm")))) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gif" ,rust-gif-0.10) + ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) + ("rust-lzw" ,rust-lzw-0.10) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-png" ,rust-png-0.14) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-tiff" ,rust-tiff-0.2)) + #:cargo-development-inputs + (("rust-glob" ,rust-glob-0.3) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.6)))))) + (define-public rust-indexmap-1.0 (package (name "rust-indexmap") -- cgit v1.2.3 From d899e93052644a3bc850ca0ee87d4cb539beece1 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:30:07 +0300 Subject: gnu: Add rust-image-0.20. * gnu/packages/crates-io.scm (rust-image-0.20): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b1325a421b..a14cf7a152 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6844,6 +6844,37 @@ (define-public rust-image-0.21 ("rust-num-complex" ,rust-num-complex-0.2) ("rust-quickcheck" ,rust-quickcheck-0.6)))))) +(define-public rust-image-0.20 + (package + (inherit rust-image-0.21) + (name "rust-image") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "image" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01058n0jcw25pq5shn7lkvywv8c28xsxb3nwwyb4r16ijm1mnrj4")))) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-gif" ,rust-gif-0.10) + ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) + ("rust-lzw" ,rust-lzw-0.10) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-png" ,rust-png-0.12) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-tiff" ,rust-tiff-0.2)) + #:cargo-development-inputs + (("rust-glob" ,rust-glob-0.2) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.6)))))) + (define-public rust-indexmap-1.0 (package (name "rust-indexmap") -- cgit v1.2.3 From a36b06561f955d4bcafe4200bc27dcca0fbac1f9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:30:49 +0300 Subject: gnu: Add rust-line-drawing-0.7. * gnu/packages/crates-io.scm (rust-line-drawing-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a14cf7a152..1b906d47c8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8980,6 +8980,36 @@ (define-public rust-libz-sys-1.0 (license (list license:asl2.0 license:expat)))) +(define-public rust-line-drawing-0.7 + (package + (name "rust-line-drawing") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "line_drawing" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fcna7hq1g1kkkqy07hydscx5d2zgb6gskz3vnsvsif8h8ysvisw")))) + (build-system cargo-build-system) + (arguments + ;; This version does not specify any versions on dependants. + `(#:tests? #f ; Cannot compile line_drawing for the test suite. + #:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-bresenham" ,rust-bresenham-0.1) + ("rust-image" ,rust-image-0.22) ; 0.17? + ("rust-rand" ,rust-rand-0.6)))) + (home-page "https://github.com/expenses/line_drawing") + (synopsis "Collection of line-drawing algorithms") + (description + "This package provides a collection of line-drawing algorithms for use in +graphics and video games.") + (license license:expat))) + (define-public rust-linked-hash-map-0.5 (package (name "rust-linked-hash-map") -- cgit v1.2.3 From b2ebcacd2d044d3dc9ba25ca15338386378c020b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:33:47 +0300 Subject: gnu: Add rust-rusttype-0.8. * gnu/packages/crates-io.scm (rust-rusttype-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b906d47c8..595f82d8b7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13273,6 +13273,42 @@ (define-public rust-rustfix-0.4 "Automatically apply the suggestions made by rustc.") (license (list license:expat license:asl2.0)))) +(define-public rust-rusttype-0.8 + (package + (name "rust-rusttype") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusttype" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12hwfg85iii7sbgsyyr23yw862dzp7f8zwn9xv5iqydm5w1i3a8l")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Artifacts for tests not included. + #:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-libm" ,rust-libm-0.2) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-ordered-float" ,rust-ordered-float-1.0) + ("rust-rustc-hash" ,rust-rustc-hash-1.0) + ("rust-stb-truetype" ,rust-stb-truetype-0.3)))) + (home-page "https://gitlab.redox-os.org/redox-os/rusttype") + (synopsis "Pure Rust alternative to libraries like FreeType") + (description + "This package provides a pure Rust alternative to libraries like FreeType. +RustType provides an API for loading, querying and rasterising TrueType fonts. +It also provides an implementation of a dynamic GPU glyph cache for hardware +font rendering.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustversion-1.0 (package (name "rust-rustversion") -- cgit v1.2.3 From a836f50b46937949d68943bc922594dd2455c5c8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:44:47 +0300 Subject: gnu: Add rust-cgmath-0.17. * gnu/packages/crates-io.scm (rust-cgmath-0.17): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 595f82d8b7..16937d7faf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1847,6 +1847,39 @@ (define-public rust-cgl-0.2 (("rust-gleam" ,rust-gleam-0.6) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-cgmath-0.17 + (package + (name "rust-cgmath") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cgmath" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rvgila6ivr0dh1bxza450a4yfwdi2pwj3h1vnwg0jy4xk6l8f98")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Crate won't build without glium. + #:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde" ,rust-serde-1.0) + ("rust-simd" ,rust-simd-0.2)) + #:cargo-development-inputs + (;("rust-glium" ,rust-glium-0.23) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/brendanzab/cgmath") + (synopsis "Linear algebra and mathematics library") + (description + "This package provides a linear algebra and mathematics library +for computer graphics.") + (license license:asl2.0))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From ef6242415b4918a4efc70f35c960ea37c5d6b114 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:45:36 +0300 Subject: gnu: Add rust-cgmath-0.16. * gnu/packages/crates-io.scm (rust-cgmath-0.16): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16937d7faf..035a747dc9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1880,6 +1880,33 @@ (define-public rust-cgmath-0.17 for computer graphics.") (license license:asl2.0))) +(define-public rust-cgmath-0.16 + (package + (inherit rust-cgmath-0.17) + (name "rust-cgmath") + (version "0.16.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cgmath" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07754c03v3srzf64ghsl3fggrdi4kjy6l3vyq2d2wfjfixybb934")))) + (arguments + `(#:skip-build? #t ; Crate won't build without glium. + #:cargo-inputs + (("rust-approx" ,rust-approx-0.1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.1) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-simd" ,rust-simd-0.2)) + #:cargo-development-inputs + (;("rust-glium" ,rust-glium-0.19) + ("rust-serde-json" ,rust-serde-json-1.0)))))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From 341069bac61ed83eab9771839cae0214a8c1ddd7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:46:08 +0300 Subject: gnu: Add rust-genmesh-0.6. * gnu/packages/crates-io.scm (rust-genmesh-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 035a747dc9..98bcccaafe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5616,6 +5616,30 @@ (define-public rust-generic-array-0.12 (base32 "1v5jg7djicq34nbiv1dwaki71gkny002wyy9qfn3y0hfmrs053y6")))))) +(define-public rust-genmesh-0.6 + (package + (name "rust-genmesh") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "genmesh" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17qybydyblf3hjiw7mq181jpi4vrbb8dmsj0wi347r8k0m354g89")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cgmath" ,rust-cgmath-0.16) + ("rust-mint" ,rust-mint-0.5)))) + (home-page "https://github.com/gfx-rs/genmesh") + (synopsis "Package for generating 3D meshes") + (description + "This package provides a package for generating 3D meshes/") + (license license:asl2.0))) + (define-public rust-getopts-0.2 (package (name "rust-getopts") -- cgit v1.2.3 From 2a7524304201da4a22eb007e310584b6e278b751 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 01:46:39 +0300 Subject: gnu: Add rust-obj-0.9. * gnu/packages/crates-io.scm (rust-obj-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98bcccaafe..790425931d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9759,6 +9759,28 @@ (define-public rust-numtoa-0.1 "This package can convert numbers into stack-allocated byte arrays.") (license (list license:expat license:asl2.0)))) +(define-public rust-obj-0.9 + (package + (name "rust-obj") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "obj" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10z1r2r0xyhr4j1n07135kz4bc0zhqy98vabs99vz0x171bi8gy0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-genmesh" ,rust-genmesh-0.6)))) + (home-page "https://github.com/kvark/obj") + (synopsis "Package for loading Wavefront .obj files") + (description + "This package provides a package for loading Wavefront @code{.obj} files.") + (license license:asl2.0))) + (define-public rust-objc-0.2 (package (name "rust-objc") -- cgit v1.2.3 From d3237cd302ea9fb563336515e4cc2c4fe056437e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 02:03:55 +0300 Subject: gnu: Add rust-regex-0.1 and its cyclic dependencies. * gnu/packages/crates-io.scm (rust-regex-0.1, rust-aho-corasick-0.5, rust-byteorder-0.5, rust-csv-0.14, rust-docopt-0.6, rust-memchr-0.1, rust-utf8-ranges-0.1): New variables. (rust-env-logger-0.3)[arguments]: Add missing input. (rust-quickcheck-0.2)[arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 159 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 790425931d..37b05db568 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -191,6 +191,31 @@ (define-public rust-aho-corasick-0.6 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))))) +(define-public rust-aho-corasick-0.5 + (package + (inherit rust-aho-corasick-0.6) + (name "rust-aho-corasick") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "aho-corasick" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rnvdmlajikq0i4zdy1p3pv699q6apvsxfc7av7byhppllp2r5ya")))) + (arguments + `(#:cargo-inputs + (("rust-memchr" ,rust-memchr-0.1)) + #:cargo-development-inputs + (("rust-csv" ,rust-csv-0.14) + ("rust-docopt" ,rust-docopt-0.6) + ("rust-memmap" ,rust-memmap-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-rand" ,rust-rand-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) + (define-public rust-android-glue-0.2 (package (name "rust-android-glue") @@ -1443,6 +1468,26 @@ (define-public rust-byteorder-1.3 little-endian.") (license (list license:expat license:unlicense)))) +(define-public rust-byteorder-0.5 + (package + (inherit rust-byteorder-1.3) + (name "rust-byteorder") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "byteorder" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ma8pkyz1jbglr29m1yzlc9ghmv6672nvsrn7zd0yn5jqs60xh8g")))) + (arguments + `(#:tests? #f + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-bytes-0.4 (package (name "rust-bytes") @@ -3014,6 +3059,27 @@ (define-public rust-csv-1.1 "Fast CSV parsing with support for serde.") (license (list license:unlicense license:expat)))) +(define-public rust-csv-0.14 + (package + (inherit rust-csv-1.1) + (name "rust-csv") + (version "0.14.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "csv" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g0qvr9fj25fq1fy0p758glrb30yz7x46h18hsysaqyaswaihv16")))) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-0.5) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)) + #:cargo-development-inputs + (("rust-regex" ,rust-regex-0.1)))))) + (define-public rust-csv-core-0.1 (package (name "rust-csv-core") @@ -3608,6 +3674,27 @@ (define-public rust-docopt-0.7 ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-strsim" ,rust-strsim-0.6)))))) +(define-public rust-docopt-0.6 + (package + (inherit rust-docopt-0.7) + (name "rust-docopt") + (version "0.6.86") + (source + (origin + (method url-fetch) + (uri (crate-uri "docopt" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nf4f4zf5yk0d0l4kl7hkii4na22fhn0l2hgfb46yzv08l2g6zja")))) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-regex" ,rust-regex-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-strsim" ,rust-strsim-0.5)))))) + (define-public rust-downcast-rs-1.1 (package (name "rust-downcast-rs") @@ -4149,7 +4236,7 @@ (define-public rust-env-logger-0.3 (arguments `(#:skip-build? #t ; Cannot find dependent crates. #:cargo-inputs - (;("rust-regex" ,rust-regex-0.1) + (("rust-regex" ,rust-regex-0.1) ("rust-log" ,rust-log-0.3)))))) (define-public rust-envmnt-0.6 @@ -8428,6 +8515,27 @@ (define-public rust-memchr-1.0 (base32 "0yjyja34pzhipdl855q3m21w1lyih4lw79x2dp3czwdla4pap3ql")))))) +(define-public rust-memchr-0.1 + (package + (inherit rust-memchr-1.0) + (name "rust-memchr") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "memchr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "084d85hjfa3xf5kwdms2mhbkh78m1gl2254cp5swcxj3a7xjkdnq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2)))))) + (define-public rust-memmap-0.7 (package (name "rust-memmap") @@ -11766,8 +11874,7 @@ (define-public rust-quickcheck-0.2 `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.3) ("rust-log" ,rust-log-0.3) - ("rust-rand" ,rust-rand-0.3)) - #:skip-build? #t)))) ; Package needs 'unicode' crate. + ("rust-rand" ,rust-rand-0.3)))))) (define-public rust-quickcheck-macros-0.8 (package @@ -12929,6 +13036,34 @@ (define-public rust-regex-0.2 ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-regex-0.1 + (package + (inherit rust-regex-0.2) + (name "rust-regex") + (version "0.1.80") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bs036h3vzc6pj5jj4vc909s9rppq7b808ic99qn0y6gm3karm2g")))) + (arguments + `(#:skip-build? #t ; Can't find dependent crates. + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.5) + ("rust-memchr" ,rust-memchr-0.1) + ("rust-regex-syntax" ,rust-regex-syntax-0.3) + ("rust-simd" ,rust-simd-0.2) ; 0.1? + ("rust-thread-local" ,rust-thread-local-0.2) + ("rust-utf8-ranges" ,rust-utf8-ranges-0.1)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-0.1) + ("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-regex-automata-0.1 (package (name "rust-regex-automata") @@ -17789,6 +17924,24 @@ (define-public rust-utf8-ranges-1.0 "Convert ranges of Unicode codepoints to UTF-8 byte ranges.") (license (list license:expat license:unlicense)))) +(define-public rust-utf8-ranges-0.1 + (package + (inherit rust-utf8-ranges-1.0) + (name "rust-utf8-ranges") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "utf8-ranges" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03xf604b2v51ag3jgzw92l97xnb10kw9zv948bhc7ja1ik017jm1")))) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2)))))) + (define-public rust-utf8parse-0.1 (package (name "rust-utf8parse") -- cgit v1.2.3 From ba8984cf3d5cc3c4017762574c347274a2d6616a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Feb 2020 16:18:22 +0200 Subject: gnu: rust-conv-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-conv-0.3)[source]: Add snippet to relax version requirements. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37b05db568..3a384c5b8d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2451,11 +2451,15 @@ (define-public rust-conv-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "168j1npqrif1yqxbgbk0pdrx9shzhs5ylc5a4xw49b6hbxi11zvq")))) + "168j1npqrif1yqxbgbk0pdrx9shzhs5ylc5a4xw49b6hbxi11zvq")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("0.2.21.*") "0.2.21\"\n")) + #t)))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; Package needs 'unicode' crate. - #:cargo-inputs + `(#:cargo-inputs (("rust-custom-derive" ,rust-custom-derive-0.1)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.2) -- cgit v1.2.3 From 8d90f2c786b97cee66fcf26d86aced39faf71a3f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 02:07:15 +0300 Subject: gnu: Add rust-quickcheck-0.4. * gnu/packages/crates-io.scm (rust-quickcheck-0.4): New variable. (rust-quickcheck-0.2): Inherit from rust-quickcheck-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a384c5b8d..c1f8570557 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11861,25 +11861,40 @@ (define-public rust-quickcheck-0.5 ("rust-log" ,rust-log-0.3) ("rust-rand" ,rust-rand-0.3)))))) -(define-public rust-quickcheck-0.2 +(define-public rust-quickcheck-0.4 (package - (inherit rust-quickcheck-0.9) + (inherit rust-quickcheck-0.5) (name "rust-quickcheck") - (version "0.2.27") + (version "0.4.1") (source (origin (method url-fetch) (uri (crate-uri "quickcheck" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vb4acppaavlnchzc1jmn5wlkgir9x9gmhgp97bavyxxqxgsg1nh")))) + "01hligcv1h4pvc8ykch65qjzi7jgcq2s462v69j27slc84fl3hh2")))) (arguments `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.3) ("rust-log" ,rust-log-0.3) ("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-quickcheck-0.2 + (package + (inherit rust-quickcheck-0.4) + (name "rust-quickcheck") + (version "0.2.27") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vb4acppaavlnchzc1jmn5wlkgir9x9gmhgp97bavyxxqxgsg1nh")))))) + (define-public rust-quickcheck-macros-0.8 (package (name "rust-quickcheck-macros") -- cgit v1.2.3 From 40b4b6dfee241dbddc1f2b84e499e382431f2811 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Feb 2020 16:28:05 +0200 Subject: gnu: rust-regex-syntax-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-regex-syntax-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1f8570557..f108bd5b4c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13170,8 +13170,7 @@ (define-public rust-regex-syntax-0.3 (base32 "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r")))) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.2) ("rust-rand" ,rust-rand-0.3)))))) -- cgit v1.2.3 From d489351cf801df0aeecbc5da42192521a34a23d9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 15:58:49 +0300 Subject: gnu: Add rust-walkdir-1.0. * gnu/packages/crates-io.scm (rust-walkdir-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f108bd5b4c..ad29303059 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18275,6 +18275,31 @@ (define-public rust-walkdir-2.2 (license (list license:unlicense license:expat)))) +(define-public rust-walkdir-1.0 + (package + (inherit rust-walkdir-2.2) + (name "rust-walkdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "walkdir" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zw8safzqpsrvfn0256cngq2fr9d4lmwv5qb8ycn1f7sf3kgj25v")))) + (arguments + `(#:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-same-file" ,rust-same-file-0.1) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-docopt" ,rust-docopt-0.7) + ("rust-quickcheck" ,rust-quickcheck-0.4) + ("rust-rand" ,rust-rand-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) + (define-public rust-wasi-0.5 (package (name "rust-wasi") -- cgit v1.2.3 From f93a13c44adae9e3942cff2b1b4c8a449fa8442d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:00:43 +0300 Subject: gnu: Add rust-syn-0.11 and rust-synom-0.11. * gnu/packages/crates-io.scm (rust-syn-0.11, rust-synom-0.11): New variables. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad29303059..95ccbdfaa7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15609,6 +15609,71 @@ (define-public rust-syn-0.15 ("rust-walkdir" ,rust-walkdir-2.2)))) (properties '()))) +(define-public rust-syn-0.11 + (package + (inherit rust-syn-0.15) + (name "rust-syn") + (version "0.11.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fixup-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*,") ",")) + #t))) + #:cargo-inputs + (("rust-quote" ,rust-quote-0.3) + ("rust-synom" ,rust-synom-0.11) + ("rust-unicode-xid" ,rust-unicode-xid-0.0)) + #:cargo-development-inputs + (("rust-syntex-pos" ,rust-syntex-pos-0.58) + ("rust-syntex-syntax" ,rust-syntex-syntax-0.58) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-walkdir" ,rust-walkdir-1.0)))))) + +(define-public rust-synom-0.11 + (package + (name "rust-synom") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "synom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; doc tests fail + #:phases + (modify-phases %standard-phases + (add-before 'build 'fixup-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + (("^path =.*") "")) + #t))) + #:cargo-inputs + (("rust-unicode-xid" ,rust-unicode-xid-0.0)) + #:cargo-development-inputs + (("rust-syn" ,rust-syn-0.11)))) + (home-page "https://github.com/dtolnay/syn") + (synopsis "Stripped-down Nom parser used by Syn") + (description + "Stripped-down Nom parser used by Syn.") + (license (list license:expat license:asl2.0)))) + (define-public rust-synstructure-0.10 (package (name "rust-synstructure") -- cgit v1.2.3 From f5520827b53104901b7f4eb88ac64900b82400d4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Feb 2020 15:52:38 +0100 Subject: gnu: emacs-geiser: Update to 0.11.2. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.11.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be0e6a84c2..0932c87e9a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -165,7 +165,7 @@ (define-module (gnu packages emacs-xyz) (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.11") + (version "0.11.2") (source (origin (method git-fetch) (uri (git-reference @@ -174,7 +174,7 @@ (define-public emacs-geiser (file-name (git-file-name name version)) (sha256 (base32 - "0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd")))) + "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From d64584cfb3f1d95749c9e3605a6e1079137a2e42 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:14:23 +0100 Subject: gnu: ungoogled-chromium: Add license information about preserved files. This is a follow-up to commit f613d459be9a91ca778d1a2d5ece941ee21469b5. * gnu/packages/chromium.scm (%preserved-third-party-files): Annotate newly added entries with license information. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 24879dfdcd..5697c80ed1 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -135,8 +135,8 @@ (define %preserved-third-party-files "third_party/dawn" ;ASL2.0 "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 - "third_party/devtools-frontend/src/third_party/axe-core" - "third_party/devtools-frontend/src/third_party/pyjson5" + "third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0 + "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 @@ -185,7 +185,7 @@ (define %preserved-third-party-files "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3 "third_party/pdfium/third_party/skia_shared" ;BSD-3 "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType - "third_party/perfetto" + "third_party/perfetto" ;ASL2.0 "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 "third_party/ply" ;BSD-3 "third_party/polymer" ;BSD-3 -- cgit v1.2.3 From bfce33cdff32ec9bbe163bbf7270fe7477e4fdde Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:14:54 +0100 Subject: gnu: ungoogled-chromium-wayland: Fix build. * gnu/packages/chromium.scm (ungoogled-chromium/wayland)[arguments]: Add #:phases. --- gnu/packages/chromium.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 5697c80ed1..ae7691d26c 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -868,6 +868,16 @@ (define-public ungoogled-chromium/wayland ,@(package-inputs ungoogled-chromium))) (arguments (substitute-keyword-arguments (package-arguments ungoogled-chromium) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'add-ozone-patch + (lambda _ + ;; Add missing include statement required when using libstdc++, + ;; Clang and Ozone. Fixed in M81. + (substitute* "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc" + (("#include \"base/logging\\.h" all) + (string-append "#include \n" all))) + #t)))) ((#:configure-flags flags) `(append (list "use_ozone=true" "ozone_platform_wayland=true" -- cgit v1.2.3 From adf323e0d76ce9da9c4e4b46ce9d92aa3dbdbbc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:28:59 +0100 Subject: gnu: ungoogled-chromium: Update to 80.0.3987.122-0.bb952f1 [security fixes]. This release fixes CVE-2020-6407 and CVE-2020-6418. * gnu/packages/chromium.scm (%chromium-version): Set to 80.0.3987.122. (%ungoogled-revision): Update to 6056988937eb. (%chromium-origin): Update hash. (%ungoogled-origin): Download from pull request, update hash. --- gnu/packages/chromium.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index ae7691d26c..be33e5b363 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -247,8 +247,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "80.0.3987.116") -(define %ungoogled-revision "bb952f18c8c80c569583edd8dbb0b54443f49043") +(define %chromium-version "80.0.3987.122") +(define %ungoogled-revision "6056988937ebc32f14293809487dbaaa65939834") (define %debian-revision "debian/80.0.3987.116-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -263,18 +263,21 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "00c9czjyk1h3i40lvmh2rshp1mq7pcxwsfh1qrq22w8ba6ydkib5")))) + "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8")))) (define %ungoogled-origin (origin (method git-fetch) - (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") + ;; XXX: Temporarily download from a third party because the main + ;; ungoogled-chromium repo is stale. Code taken from this pull + ;; request: https://github.com/Eloston/ungoogled-chromium/pull/942 + (uri (git-reference (url "https://github.com/Zoraver/ungoogled-chromium") (commit %ungoogled-revision))) (file-name (git-file-name "ungoogled-chromium" (string-take %ungoogled-revision 7))) (sha256 (base32 - "0lvj3mjwnxvd3kjl2ikl5f0ddrwnp2xsycfx296nwnrimx0frcmg")))) + "0s4bfj5lr49hknb6d7vp3zah70w9sq5cdhhlyihnl7f9jlrrnwsi")))) (define %debian-origin (origin -- cgit v1.2.3 From 1b01c103db1698cf2e71bc4a352e705d4527e7d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:33:02 +0100 Subject: gnu: mbedtls-apache: Update to 2.16.5. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.16.5. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 673f23c20b..86910a63fd 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -858,7 +858,7 @@ (define-public acme-client (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.16.4") + (version "2.16.5") (source (origin (method url-fetch) @@ -868,7 +868,7 @@ (define-public mbedtls-apache version "-apache.tgz")) (sha256 (base32 - "1yxj5wahaj87xhdi89zbk78ig77b166h464yrj5gb3lwv8mz6h9l")))) + "0kdhwy241xsk4isbadqx6z80m8sf76da5sbmqv8qy11yr37cdd35")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From eab27d227750a218bd88d778a3f601291516c45f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:37:51 +0100 Subject: gnu: fluidsynth: Update to 2.1.1. * gnu/packages/audio.scm (fluidsynth): Update to 2.1.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5b8c610882..ac486aabfb 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1193,7 +1193,7 @@ (define-public g2reverb (define-public fluidsynth (package (name "fluidsynth") - (version "2.1.0") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -1202,7 +1202,7 @@ (define-public fluidsynth (file-name (git-file-name name version)) (sha256 (base32 - "0jhla1641rx77va4b6n4shn8srj87rpwvp170byj1bg8z8g89ji1")))) + "09jq04hrasidf6b5gkk4aba13fq55z3bmn7bq35rdaikz26xiij4")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From cbd8d8a879fcf656f0f596228e658e85a78aee39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:41:46 +0100 Subject: gnu: libgphoto2: Update to 2.5.24. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.24. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4688629172..069767e414 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -133,14 +133,14 @@ (define-public libexif (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.23") + (version "2.5.24") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "0bc5x2bkqbfi4hbkz8ab5xc0bkks9vvks1vygxhdh3x498v27byq")))) + "0cgvsk06c4kcfj16plc27nm7g16r9ci0y4k83sf3iyphd63mfg7x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From cce590367280c54ec7abc087d30af09ee860edcf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 16:55:15 +0100 Subject: gnu: xapian: Update to 1.4.15. * gnu/packages/search.scm (xapian, python-xapian-bindings): Update to 1.4.15. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 3b7bc36889..d1b67a3943 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -49,14 +49,14 @@ (define-module (gnu packages search) (define-public xapian (package (name "xapian") - (version "1.4.14") + (version "1.4.15") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp")))) + (base32 "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -94,7 +94,7 @@ (define-public python-xapian-bindings "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0qb17cw8n0g5gcg8dq5b3hs6i16w74rgxcryd0ja9n2h0rlda2an")))) + "0364nalvh13c7wzx52mz4gaf8wg1rm17lw75cs8a813rv091ci38")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From 93f71b29a5ae19ba943b05ed96cec8e2da8cd2be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 17:18:32 +0100 Subject: gnu: python-xmlschema: Update to 1.1.1. * gnu/packages/xml.scm (python-xmlschema): Update to 1.1.1. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5e40ba1ec2..704839e5f3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2108,7 +2108,7 @@ (define-public python2-lxml (define-public python-xmlschema (package (name "python-xmlschema") - (version "1.1.0") + (version "1.1.1") (source (origin ;; Unit tests are not distributed with the PyPI archive. (method git-fetch) @@ -2118,7 +2118,7 @@ (define-public python-xmlschema (file-name (git-file-name name version)) (sha256 (base32 - "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy")))) + "0nqhqbvp0kpd1bz11b6gpkc0mkg068mqs56ww4k5ang1cl9d8gd6")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From dcc3f2158678734555b0b8522e55673eb06b93ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 25 Feb 2020 17:40:43 +0100 Subject: gnu: libzip: Update to 1.6.1. * gnu/packages/compression.scm (libzip): Update to 1.6.1. [inputs]: Add XZ. --- gnu/packages/compression.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0982173b66..ee10bd03ce 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1624,18 +1624,19 @@ (define-public zziplib (define-public libzip (package (name "libzip") - (version "1.5.2") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://libzip.org/download/libzip-" version ".tar.xz")) (sha256 (base32 - "1d53shcy7nvls5db573bbdlm25lfz1iw2zshng5f00cssi5lvpmk")))) + "0h9nsgkw0dk4srsvmz6xy6f9l4h815xn07j8h40l8gqvcxxaqpbh")))) (native-inputs `(("perl" ,perl))) (inputs `(("gnutls" ,gnutls) + ("liblzma" ,xz) ("openssl" ,openssl) ("zlib" ,zlib))) (build-system cmake-build-system) -- cgit v1.2.3 From 6616b22b12f682955610bed800e3497e0cdc801b Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 15:22:53 +0000 Subject: gnu: zrythm: Update to 0.7.573. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (zrythm): Update to 0.7.573. Signed-off-by: Jakub Kądziołka --- gnu/packages/music.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 16e69840df..eecc4f1626 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5138,7 +5138,7 @@ (define-public helm (define-public zrythm (package (name "zrythm") - (version "0.7.474") + (version "0.7.573") (source (origin (method url-fetch) @@ -5146,7 +5146,7 @@ (define-public zrythm version ".tar.xz")) (sha256 (base32 - "0qq9v8y27zhamcb7nq7pl76874ws8x8cxhp5r685b8binvl9p0az")))) + "075gq478xbzz5ql4fsrgfzhgxi7z26k6034lhlkmm0klfcb8j9mg")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -5164,24 +5164,25 @@ (define-public zrythm (inputs `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) - ("font-dseg", font-dseg) - ("ffmpeg", ffmpeg) - ("fftw", fftw) - ("fftwf", fftwf) - ("gettext", gettext-minimal) - ("glibc", glibc) - ("gtk+", gtk+) + ("font-dseg" ,font-dseg) + ("ffmpeg" ,ffmpeg) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("gettext" ,gettext-minimal) + ("glibc" ,glibc) + ("gtk+" ,gtk+) + ("libcyaml" ,libcyaml) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) - ("lilv", lilv) - ("xdg-utils", xdg-utils) - ("rubberband", rubberband))) + ("lilv" ,lilv) + ("xdg-utils" ,xdg-utils) + ("rubberband" ,rubberband))) (native-inputs - `(("pkg-config", pkg-config) - ("help2man", help2man) + `(("pkg-config" ,pkg-config) + ("help2man" ,help2man) ("libaudec" ,libaudec) - ("lv2", lv2) + ("lv2" ,lv2) ("glib" ,glib "bin"))) ;for 'glib-compile-resources' (synopsis "Digital audio workstation focusing on usability") (description "Zrythm is a digital audio workstation designed to be -- cgit v1.2.3 From 91f242357d0a3c42b0b32db24775949695546769 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Feb 2020 22:07:51 +0100 Subject: gnu: Add r-packrat. * gnu/packages/cran.scm (r-packrat): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67f14a3b88..c6514c7a94 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20238,3 +20238,24 @@ (define-public r-iheatmapr providing tooltips with information about each cell and enabling zooming into interesting features. iheatmapr uses the plotly library for interactivity.") (license license:expat))) + +(define-public r-packrat + (package + (name "r-packrat") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "packrat" version)) + (sha256 + (base32 + "1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n")))) + (properties `((upstream-name . "packrat"))) + (build-system r-build-system) + (home-page "https://github.com/rstudio/packrat/") + (synopsis "Dependency management R projects") + (description + "This package provides a dependency manager for R projects that allows +you to manage the R packages your project depends on in an isolated, portable, +and reproducible way.") + (license license:gpl2))) -- cgit v1.2.3 From d2ebdb795d00ae57199491af678ba97a905abc55 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Feb 2020 22:08:38 +0100 Subject: gnu: Add r-rsconnect. * gnu/packages/cran.scm (r-rsconnect): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c6514c7a94..39d80e08b4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20259,3 +20259,32 @@ (define-public r-packrat you to manage the R packages your project depends on in an isolated, portable, and reproducible way.") (license license:gpl2))) + +(define-public r-rsconnect + (package + (name "r-rsconnect") + (version "0.8.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "rsconnect" version)) + (sha256 + (base32 + "05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz")))) + (properties `((upstream-name . "rsconnect"))) + (build-system r-build-system) + (propagated-inputs + `(("r-curl" ,r-curl) + ("r-digest" ,r-digest) + ("r-jsonlite" ,r-jsonlite) + ("r-openssl" ,r-openssl) + ("r-packrat" ,r-packrat) + ("r-rstudioapi" ,r-rstudioapi) + ("r-yaml" ,r-yaml))) + (home-page "https://github.com/rstudio/rsconnect") + (synopsis "Deployment interface for R Markdown documents and Shiny applications") + (description + "This package provides a programmatic deployment interface for RPubs, +shinyapps.io, and RStudio Connect. Supported content types include R Markdown +documents, Shiny applications, Plumber APIs, plots, and static web content.") + (license license:gpl2))) -- cgit v1.2.3 From 290b55c55a5cecd686bd294a33e97f023e04a85b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Feb 2020 22:47:17 +0100 Subject: gnu: clang-runtime-3.5: Fix build. * gnu/packages/llvm.scm (clang-runtime-3.5) [inputs]: Add libtirpc. [arguments]: Add phase to find rpc headers. --- gnu/packages/llvm.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index e819625a46..38f2118173 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Dennis Mungai -;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -48,6 +48,7 @@ (define-module (gnu packages llvm) #:use-module (gnu packages compression) #:use-module (gnu packages libffi) #:use-module (gnu packages mpi) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -553,11 +554,33 @@ (define-public llvm-3.5 "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4")))))) (define-public clang-runtime-3.5 - (clang-runtime-from-llvm - llvm-3.5 - "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal" - '("clang-runtime-asan-build-fixes.patch" - "clang-3.5-libsanitizer-ustat-fix.patch"))) + (let ((runtime (clang-runtime-from-llvm + llvm-3.5 + "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal" + '("clang-runtime-asan-build-fixes.patch" + "clang-3.5-libsanitizer-ustat-fix.patch")))) + (package + (inherit runtime) + (arguments + (substitute-keyword-arguments (package-arguments runtime) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + ;; glibc no longer includes rpc/xdr.h, so we use the headers from + ;; libtirpc. + (add-after 'unpack 'find-rpc-includes + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc/:" + (or (getenv "CPATH") ""))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc/:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + #t)))))) + (inputs + `(("libtirpc" ,libtirpc) + ("llvm" ,llvm-3.5)))))) (define-public clang-3.5 (clang-from-llvm llvm-3.5 clang-runtime-3.5 -- cgit v1.2.3 From 4f19106770e52a54c54640b8931fd0e3250bc3b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 08:58:06 +0100 Subject: gnu: pigx-scrnaseq: Update to 1.1.3. * gnu/packages/bioinformatics.scm (pigx-scrnaseq): Update to 1.1.3. [arguments]: Remove. [inputs]: Remove dropseq-tools and java-picard; add flexbar, jellyfish, and r-seurat; replace python-loompy-for-pigx-scrnaseq with python-loompy. --- gnu/packages/bioinformatics.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 753b7fd0f5..e64842b9d6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12770,7 +12770,7 @@ (define-public pigx-bsseq (define-public pigx-scrnaseq (package (name "pigx-scrnaseq") - (version "0.0.8") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/" @@ -12778,27 +12778,21 @@ (define-public pigx-scrnaseq "/pigx_scrnaseq-" version ".tar.gz")) (sha256 (base32 - "0zv0sc5amivxhb95vx2gfx6l9bh7n80fh7h47dalnwxxnfvnzai4")))) + "0ga2jr4968qzwml6aycky4603q64lny3y7lzw6dmafch5pydl1qi")))) (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")))) (inputs `(("coreutils" ,coreutils) ("perl" ,perl) - ("dropseq-tools" ,dropseq-tools) ("fastqc" ,fastqc) - ("java-picard" ,java-picard-2.10.3) ; same as for dropseq + ("flexbar" ,flexbar) ("java" ,icedtea-8) + ("jellyfish" ,jellyfish) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml) ("python-pandas" ,python-pandas) ("python-magic" ,python-magic) ("python-numpy" ,python-numpy) - ("python-loompy" ,python-loompy-for-pigx-scrnaseq) + ("python-loompy" ,python-loompy) ("ghc-pandoc" ,ghc-pandoc) ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("samtools" ,samtools) @@ -12825,6 +12819,7 @@ (define-public pigx-scrnaseq ("r-rtsne" ,r-rtsne) ("r-scater" ,r-scater) ("r-scran" ,r-scran) + ("r-seurat" ,r-seurat) ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-stringr" ,r-stringr) ("r-yaml" ,r-yaml))) -- cgit v1.2.3 From 59c5f85d06c9e540477270b035431de7825e32b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 08:59:11 +0100 Subject: gnu: Remove python-loompy-for-pigx-scrnaseq. * gnu/packages/bioinformatics.scm (python-loompy-for-pigx-scrnaseq): Remove variable. --- gnu/packages/bioinformatics.scm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e64842b9d6..97d766b053 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12010,23 +12010,6 @@ (define-public python-loompy single-cell RNA-seq data.") (license license:bsd-3))) -;; pigx-scrnaseq does not work with the latest version of loompy. -(define-public python-loompy-for-pigx-scrnaseq - (package (inherit python-loompy) - (name "python-loompy") - (version "2.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/linnarsson-lab/loompy.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pjyl532pl8sbv71yci6h0agchn0naw2qjcwj50n6afrsahbsag3")))) - ;; There are none. - (arguments '(#:tests? #f)))) - ;; We cannot use the latest commit because it requires Java 9. (define-public java-forester (let ((commit "86b07efe302d5094b42deed9260f719a4c4ac2e6") -- cgit v1.2.3 From 0ecb3a8bb44d4287063b85174aeeaaf048a9ace3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 09:18:17 +0100 Subject: gnu: Add r-dygraphs. * gnu/packages/cran.scm (r-dygraphs): New variable. --- gnu/packages/cran.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 39d80e08b4..0ca3297304 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20288,3 +20288,82 @@ (define-public r-rsconnect shinyapps.io, and RStudio Connect. Supported content types include R Markdown documents, Shiny applications, Plumber APIs, plots, and static web content.") (license license:gpl2))) + +;; This package includes minified JavaScript files. When upgrading please +;; check that there are no new minified JavaScript files. +(define-public r-dygraphs + (package + (name "r-dygraphs") + (version "1.1.1.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "dygraphs" version)) + (sha256 + (base32 + "022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3")))) + (properties `((upstream-name . "dygraphs"))) + (build-system r-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build r-build-system) + (srfi srfi-1) + (ice-9 popen)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/htmlwidgets/lib/" + (call-with-values + (lambda () + (unzip2 + `(("dygraphs/dygraph-combined-dev.js" + "dygraph-combined.js") + (,(assoc-ref inputs "js-jquery") + "jquery/jquery.min.js") + (,(assoc-ref inputs "js-fquarter") + "fquarter/moment-fquarter.min.js")))) + (lambda (sources targets) + (for-each (lambda (source target) + (format #t "Processing ~a --> ~a~%" + source target) + (let ((minified (open-pipe* OPEN_READ "uglify-js" source))) + (call-with-output-file target + (lambda (port) + (dump-port minified port))))) + sources targets)))) + #t))))) + (native-inputs + `(("uglify-js" ,uglify-js) + ;; They actually use version 1.11.1, but this more recent version + ;; should be just fine. + ("js-jquery" + ,(origin + (method url-fetch) + (uri "https://code.jquery.com/jquery-1.12.4.js") + (sha256 + (base32 + "0x9mrc1668icvhpwzvgafm8xm11x9lfai9nwr66aw6pjnpwkc3s3")))) + ("js-fquarter" + ,(origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/robgallen/" + "moment-fquarter/1.0.1/moment-fquarter.js")) + (sha256 + (base32 + "01mdnsaibm9jy2f1qpbn692hpv309lhj5si9nagib4dawmrkffij")))))) + (propagated-inputs + `(("r-htmltools" ,r-htmltools) + ("r-htmlwidgets" ,r-htmlwidgets) + ("r-magrittr" ,r-magrittr) + ("r-xts" ,r-xts) + ("r-zoo" ,r-zoo))) + (home-page "https://github.com/rstudio/dygraphs") + (synopsis "Interface to Dygraphs interactive time series charting library") + (description + "This package provides an R interface to the dygraphs JavaScript charting +library (a copy of which is included in the package). It provides rich +facilities for charting time-series data in R, including highly configurable +series- and axis-display and interactive features like zoom/pan and +series/point highlighting.") + (license license:expat))) -- cgit v1.2.3 From 410cfa78be1a47f5f280acb7195a0264c4ec2810 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 10:11:51 +0100 Subject: gnu: Add r-shinystan. * gnu/packages/cran.scm (r-shinystan): New variable. --- gnu/packages/cran.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0ca3297304..7d53e5e623 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20367,3 +20367,45 @@ (define-public r-dygraphs series- and axis-display and interactive features like zoom/pan and series/point highlighting.") (license license:expat))) + +(define-public r-shinystan + (package + (name "r-shinystan") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "shinystan" version)) + (sha256 + (base32 + "18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5")))) + (properties `((upstream-name . "shinystan"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bayesplot" ,r-bayesplot) + ("r-colourpicker" ,r-colourpicker) + ("r-dt" ,r-dt) + ("r-dygraphs" ,r-dygraphs) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-gtools" ,r-gtools) + ("r-markdown" ,r-markdown) + ("r-reshape2" ,r-reshape2) + ("r-rsconnect" ,r-rsconnect) + ("r-rstan" ,r-rstan) + ("r-shiny" ,r-shiny) + ("r-shinyjs" ,r-shinyjs) + ("r-shinythemes" ,r-shinythemes) + ("r-threejs" ,r-threejs) + ("r-xtable" ,r-xtable) + ("r-xts" ,r-xts))) + (home-page "https://mc-stan.org/") + (synopsis "Interactive visual and numerical analysis for Bayesian models") + (description + "This package provides a graphical user interface for interactive +@dfn{Markov chain Monte Carlo} (MCMC) diagnostics and plots and tables helpful +for analyzing a posterior sample. The interface is powered by the Shiny web +application framework and works with the output of MCMC programs written in +any programming language (and has extended functionality for Stan models fit +using the @code{rstan} and @code{rstanarm} packages).") + (license license:gpl3+))) -- cgit v1.2.3 From 70af390f62262ca52173d908a9ffeb334f0e4589 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 10:12:02 +0100 Subject: gnu: Add r-rstantools. * gnu/packages/cran.scm (r-rstantools): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7d53e5e623..618f892cc9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20409,3 +20409,30 @@ (define-public r-shinystan any programming language (and has extended functionality for Stan models fit using the @code{rstan} and @code{rstanarm} packages).") (license license:gpl3+))) + +(define-public r-rstantools + (package + (name "r-rstantools") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rstantools" version)) + (sha256 + (base32 + "1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa")))) + (properties `((upstream-name . "rstantools"))) + (build-system r-build-system) + (inputs `(("pandoc" ,ghc-pandoc))) + (propagated-inputs + `(("r-desc" ,r-desc) + ("r-rcpp" ,r-rcpp))) + (home-page "https://mc-stan.org/rstantools/") + (synopsis "Tools for developing R packages interfacing with Stan") + (description + "This package provides various tools for developers of R packages +interfacing with @url{https://mc-stan.org, Stan}, including functions to set +up the required package structure, S3 generics and default methods to unify +function naming across Stan-based R packages, and vignettes with +recommendations for developers.") + (license license:gpl3+))) -- cgit v1.2.3 From 762d3ca3dd201e3a0ae15adf128354bf70c918a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 10:12:14 +0100 Subject: gnu: Add r-loo. * gnu/packages/cran.scm (r-loo): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 618f892cc9..15a39c9cad 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20436,3 +20436,36 @@ (define-public r-rstantools function naming across Stan-based R packages, and vignettes with recommendations for developers.") (license license:gpl3+))) + +(define-public r-loo + (package + (name "r-loo") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "loo" version)) + (sha256 + (base32 + "1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6")))) + (properties `((upstream-name . "loo"))) + (build-system r-build-system) + (inputs + `(("pandoc" ,ghc-pandoc) + ("pandoc-citeproc" ,ghc-pandoc-citeproc))) + (propagated-inputs + `(("r-checkmate" ,r-checkmate) + ("r-matrixstats" ,r-matrixstats))) + (home-page "https://mc-stan.org/loo/") + (synopsis "Leave-One-Out cross-validation and WAIC for Bayesian models") + (description + "This package provides an implementation of efficient approximate +@dfn{leave-one-out} (LOO) cross-validation for Bayesian models fit using +Markov chain Monte Carlo, as described in @url{doi:10.1007/s11222-016-9696-4}. +The approximation uses @dfn{Pareto smoothed importance sampling} (PSIS), a new +procedure for regularizing importance weights. As a byproduct of the +calculations, we also obtain approximate standard errors for estimated +predictive errors and for the comparison of predictive errors between models. +The package also provides methods for using stacking and other model weighting +techniques to average Bayesian predictive distributions.") + (license license:gpl3+))) -- cgit v1.2.3 From f3de8b6c8a5a7e1404b234de37cac5ef71484c24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 10:12:28 +0100 Subject: gnu: Add r-rstan. * gnu/packages/cran.scm (r-rstan): New variable. --- gnu/packages/cran.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 15a39c9cad..e6a350d07e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20469,3 +20469,54 @@ (define-public r-loo The package also provides methods for using stacking and other model weighting techniques to average Bayesian predictive distributions.") (license license:gpl3+))) + +(define-public r-rstan + (package + (name "r-rstan") + (version "2.19.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "rstan" version)) + (sha256 + (base32 + "128ndwjrhf8b1qvvqz4bl13qlm8718z9qs5ryc6gsdr3vk65s0np")))) + (properties `((upstream-name . "rstan"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'set-timezone + ;; This 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))))) + (native-inputs + `(("tzdata" ,tzdata) + ("pandoc" ,ghc-pandoc))) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-inline" ,r-inline) + ("r-loo" ,r-loo) + ("r-pkgbuild" ,r-pkgbuild) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-stanheaders" ,r-stanheaders))) + (home-page "https://discourse.mc-stan.org/") + (synopsis "R interface to Stan") + (description + "User-facing R functions are provided to parse, compile, test, estimate, +and analyze Stan models by accessing the header-only Stan library provided by +the StanHeaders package. The Stan project develops a probabilistic +programming language that implements full Bayesian statistical inference via +Markov Chain Monte Carlo, rough Bayesian inference via 'variational' +approximation, and (optionally penalized) maximum likelihood estimation via +optimization. In all three cases, automatic differentiation is used to +quickly and accurately evaluate gradients without burdening the user with the +need to derive the partial derivatives.") + (license license:gpl3+))) -- cgit v1.2.3 From 849f6bc20bcb3280b3dee9e5555224d32796b575 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 10:12:36 +0100 Subject: gnu: Add r-rstanarm. * gnu/packages/cran.scm (r-rstanarm): New variable. --- gnu/packages/cran.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e6a350d07e..7ff282bde1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20520,3 +20520,44 @@ (define-public r-rstan quickly and accurately evaluate gradients without burdening the user with the need to derive the partial derivatives.") (license license:gpl3+))) + +(define-public r-rstanarm + (package + (name "r-rstanarm") + (version "2.19.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "rstanarm" version)) + (sha256 + (base32 + "0gxjq8bdlvdd8kn3dhp12xlymdab036r7n12lzmd3xlkl4cnxq3s")))) + (properties `((upstream-name . "rstanarm"))) + (build-system r-build-system) + (inputs + `(("pandoc" ,ghc-pandoc) + ("pandoc-citeproc" ,ghc-pandoc-citeproc))) + (propagated-inputs + `(("r-bayesplot" ,r-bayesplot) + ("r-bh" ,r-bh) + ("r-ggplot2" ,r-ggplot2) + ("r-lme4" ,r-lme4) + ("r-loo" ,r-loo) + ("r-matrix" ,r-matrix) + ("r-nlme" ,r-nlme) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-rcppparallel" ,r-rcppparallel) + ("r-rstan" ,r-rstan) + ("r-rstantools" ,r-rstantools) + ("r-shinystan" ,r-shinystan) + ("r-stanheaders" ,r-stanheaders) + ("r-survival" ,r-survival))) + (home-page "https://mc-stan.org/rstanarm/") + (synopsis "Bayesian applied regression modeling via Stan") + (description + "This package estimates previously compiled regression models using the +@code{rstan} package, which provides the R interface to the Stan C++ library +for Bayesian estimation. Users specify models via the customary R syntax with +a formula and @code{data.frame} plus some additional arguments for priors.") + (license license:gpl3+))) -- cgit v1.2.3 From 8a6c0f55152f95dcff675960d5870b1acdfc9a34 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 18:33:30 +0100 Subject: gnu: Add cl-mysql. * gnu/packages/lisp-xyz.scm (sbcl-cl-mysql, cl-mysql): New variables. --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7afd409e9e..c6610d8425 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -51,6 +51,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (guix build-system trivial) #:use-module (gnu packages c) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages imagemagick) @@ -10718,3 +10719,45 @@ (define-public cl-lquery (define-public ecl-lquery (sbcl-package->ecl-package sbcl-lquery)) + +(define-public sbcl-cl-mysql + (let ((commit "ab56c279c1815aec6ca0bfe85164ff7e85cfb6f9") + (revision "1")) + (package + (name "sbcl-cl-mysql") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hackinghat/cl-mysql.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dg5ynx2ww94d0qfwrdrm7plkn43h64hs4iiq9mj2s1s4ixnp3lr")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("stefil" ,sbcl-stefil))) + (inputs + `(("cffi" ,sbcl-cffi) + ("mariadb-lib" ,mariadb "lib"))) + (arguments + `(#:tests? #f ; TODO: Tests require a running server + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "system.lisp" + (("libmysqlclient_r" all) + (string-append (assoc-ref inputs "mariadb-lib") + "/lib/" + all))) + #t))))) + (synopsis "Common Lisp wrapper for MySQL") + (description + "@code{cl-mysql} is a Common Lisp implementation of a MySQL wrapper.") + (home-page "http://www.hackinghat.com/index.php/cl-mysql") + (license license:expat)))) + +(define-public cl-mysql + (sbcl-package->cl-source-package sbcl-cl-mysql)) -- cgit v1.2.3 From c79ea1a217691a337f7831d5a2fe6a94f6accd14 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 19:00:58 +0100 Subject: gnu: Add cl-simple-date. * gnu/packages/lisp-xyz.scm (sbcl-simple-date, cl-simple-date, ecl-simple-date): New variables. --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c6610d8425..1955c943e1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10761,3 +10761,34 @@ (define-public sbcl-cl-mysql (define-public cl-mysql (sbcl-package->cl-source-package sbcl-cl-mysql)) + +(define-public sbcl-simple-date + (let ((commit "74469b25bbda990ec9b77e0d0eccdba0cd7e721a") + (revision "1")) + (package + (name "sbcl-simple-date") + (version (git-version "1.19" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marijnh/Postmodern.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0im7ymnyxjhn2w74jfg76k5gpr0gl33n31akx33hl28722ljd0hd")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "Basic date and time objects for Common Lisp") + (description + "@code{simple-date} is a very basic implementation of date and time +objects, used to support storing and retrieving time-related SQL types.") + (home-page "https://marijnhaverbeke.nl/postmodern/") + (license license:zlib)))) + +(define-public cl-simple-date + (sbcl-package->cl-source-package sbcl-simple-date)) + +(define-public ecl-simple-date + (sbcl-package->ecl-package sbcl-simple-date)) -- cgit v1.2.3 From f5203d25847c3ee1f094946362fd5d9e64838328 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 19:11:58 +0100 Subject: gnu: Add cl-postgres. * gnu/packages/lisp-xyz.scm (sbcl-cl-postgres, cl-postgres): New variables. --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1955c943e1..2f84ad2694 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10792,3 +10792,24 @@ (define-public cl-simple-date (define-public ecl-simple-date (sbcl-package->ecl-package sbcl-simple-date)) + +(define-public sbcl-cl-postgres + (package + (inherit sbcl-simple-date) + (name "sbcl-cl-postgres") + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("simple-date" ,sbcl-simple-date))) + (inputs + `(("md5" ,sbcl-md5) + ("split-sequence" ,sbcl-split-sequence) + ("usocket" ,sbcl-usocket))) + (arguments + `(#:tests? #f)) ; TODO: Break simple-date/postgres-glue circular dependency + (synopsis "Common Lisp interface for PostgreSQL") + (description + "@code{cl-postgres} is a low-level library used for interfacing with +a PostgreSQL server over a socket."))) + +(define-public cl-postgres + (sbcl-package->cl-source-package sbcl-cl-postgres)) -- cgit v1.2.3 From acba62d9bd80a8fd4e9bd91073db037ba5094d09 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 19:48:30 +0100 Subject: gnu: Add cl-simple-date-postgres-glue. * gnu/packages/lisp-xyz.scm (sbcl-simple-date-postgres-glue, cl-simple-date-postgres-glue): New variables. --- gnu/packages/lisp-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2f84ad2694..736efc79f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10813,3 +10813,17 @@ (define-public sbcl-cl-postgres (define-public cl-postgres (sbcl-package->cl-source-package sbcl-cl-postgres)) + +(define-public sbcl-simple-date-postgres-glue + (package + (inherit sbcl-simple-date) + (name "sbcl-simple-date-postgres-glue") + (inputs + `(("cl-postgres" ,sbcl-cl-postgres) + ("simple-date" ,sbcl-simple-date))) + (arguments + `(#:asd-file "simple-date.asd" + #:asd-system-name "simple-date/postgres-glue")))) + +(define-public cl-simple-date-postgres-glue + (sbcl-package->cl-source-package sbcl-simple-date-postgres-glue)) -- cgit v1.2.3 From 88dbe39b16a53d1f1fa7b4dad97f10bca22f7d02 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 22:14:11 +0100 Subject: gnu: Add cl-s-sql. * gnu/packages/lisp-xyz.scm (sbcl-s-sql, cl-s-sql): New variables. --- gnu/packages/lisp-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 736efc79f9..0f5e995afa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10827,3 +10827,21 @@ (define-public sbcl-simple-date-postgres-glue (define-public cl-simple-date-postgres-glue (sbcl-package->cl-source-package sbcl-simple-date-postgres-glue)) + +(define-public sbcl-s-sql + (package + (inherit sbcl-simple-date) + (name "sbcl-s-sql") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-postgres" ,sbcl-cl-postgres))) + (arguments + `(#:tests? #f)) ; TODO: Break postmodern circular dependency + (synopsis "Lispy DSL for SQL") + (description + "@code{s-sql} is a Common Lisp library that can be used to compile +s-expressions to strings of SQL code, escaping any Lisp values inside, and +doing as much as possible of the work at compile time."))) + +(define-public cl-s-sql + (sbcl-package->cl-source-package sbcl-s-sql)) -- cgit v1.2.3 From add1a3561f697df0ea8bbd0c9b1c11fdf7334352 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 22:35:49 +0100 Subject: gnu: Add cl-postmodern. * gnu/packages/lisp-xyz.scm (sbcl-postmodern, cl-postmodern): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0f5e995afa..5d30446b43 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10845,3 +10845,40 @@ (define-public sbcl-s-sql (define-public cl-s-sql (sbcl-package->cl-source-package sbcl-s-sql)) + +(define-public sbcl-postmodern + (package + (inherit sbcl-simple-date) + (name "sbcl-postmodern") + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("simple-date" ,sbcl-simple-date) + ("simple-date-postgres-glue" ,sbcl-simple-date-postgres-glue))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-postgres" ,sbcl-cl-postgres) + ("closer-mop" ,sbcl-closer-mop) + ("global-vars" ,sbcl-global-vars) + ("s-sql" ,sbcl-s-sql) + ("split-sequence" ,sbcl-split-sequence))) + (arguments + ;; TODO: Fix missing dependency errors for simple-date/postgres-glue, + ;; cl-postgres/tests and s-sql/tests. + `(#:tests? #f)) + (synopsis "Common Lisp library for interacting with PostgreSQL") + (description + "@code{postmodern} is a Common Lisp library for interacting with +PostgreSQL databases. It provides the following features: + +@itemize +@item Efficient communication with the database server without need for +foreign libraries. +@item Support for UTF-8 on Unicode-aware Lisp implementations. +@item A syntax for mixing SQL and Lisp code. +@item Convenient support for prepared statements and stored procedures. +@item A metaclass for simple database-access objects. +@end itemize\n"))) + +(define-public cl-postmodern + (sbcl-package->cl-source-package sbcl-postmodern)) -- cgit v1.2.3 From 47a6cde09c4c3b028ae7ec3b675579a9a369e8f7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 25 Feb 2020 22:53:36 +0100 Subject: gnu: Add cl-dbi. * gnu/packages/lisp-xyz.scm (sbcl-dbi, cl-dbi): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5d30446b43..77323cb17b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10882,3 +10882,33 @@ (define-public sbcl-postmodern (define-public cl-postmodern (sbcl-package->cl-source-package sbcl-postmodern)) + +(define-public sbcl-dbi + (package + (name "sbcl-dbi") + (version "0.9.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/cl-dbi.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m1fsravfaizamdak84adh3jxc4j91maqnrb4m08bfbmb04cdqhs")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("closer-mop" ,sbcl-closer-mop) + ("split-sequence" ,sbcl-split-sequence))) + (arguments + `(#:tests? #f)) ; TODO: Break circular dependency with dbd-* + (synopsis "Database independent interface for Common Lisp") + (description + "@code{dbi} is a Common Lisp library providing a database independent +interface for MySQL, PostgreSQL and SQLite.") + (home-page "https://github.com/fukamachi/cl-dbi") + (license license:llgpl))) + +(define-public cl-dbi + (sbcl-package->cl-source-package sbcl-dbi)) -- cgit v1.2.3 From 903d0e81a10444d377c5516e704a67b66695f895 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 10:51:19 +0100 Subject: gnu: Add cl-dbd-mysql. * gnu/packages/lisp-xyz.scm (sbcl-dbd-mysql, cl-dbd-mysql): New variables. --- gnu/packages/lisp-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 77323cb17b..d0e7524e9b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10912,3 +10912,15 @@ (define-public sbcl-dbi (define-public cl-dbi (sbcl-package->cl-source-package sbcl-dbi)) + +(define-public sbcl-dbd-mysql + (package + (inherit sbcl-dbi) + (name "sbcl-dbd-mysql") + (inputs + `(("cl-mysql" ,sbcl-cl-mysql) + ("dbi" ,sbcl-dbi))) + (synopsis "Database driver for MySQL"))) + +(define-public cl-dbd-mysql + (sbcl-package->cl-source-package sbcl-dbd-mysql)) -- cgit v1.2.3 From af469826e2579074f9f88099d0ec55c5ccac8e26 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 11:00:25 +0100 Subject: gnu: Add cl-dbd-postgres. * gnu/packages/lisp-xyz.scm (sbcl-dbd-postgres, cl-dbd-postgres): New variables. --- gnu/packages/lisp-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d0e7524e9b..a45f14e5e1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10924,3 +10924,16 @@ (define-public sbcl-dbd-mysql (define-public cl-dbd-mysql (sbcl-package->cl-source-package sbcl-dbd-mysql)) + +(define-public sbcl-dbd-postgres + (package + (inherit sbcl-dbi) + (name "sbcl-dbd-postgres") + (inputs + `(("cl-postgres" ,sbcl-cl-postgres) + ("dbi" ,sbcl-dbi) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (synopsis "Database driver for PostgreSQL"))) + +(define-public cl-dbd-postgres + (sbcl-package->cl-source-package sbcl-dbd-postgres)) -- cgit v1.2.3 From 0e9fc3d61f41d83775b74c6f81789cd840f68fc5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 11:07:13 +0100 Subject: gnu: Add cl-dbd-sqlite3. * gnu/packages/lisp-xyz.scm (sbcl-dbd-sqlite3, cl-dbd-sqlite3): New variables. --- gnu/packages/lisp-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a45f14e5e1..292c9d7317 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10937,3 +10937,16 @@ (define-public sbcl-dbd-postgres (define-public cl-dbd-postgres (sbcl-package->cl-source-package sbcl-dbd-postgres)) + +(define-public sbcl-dbd-sqlite3 + (package + (inherit sbcl-dbi) + (name "sbcl-dbd-sqlite3") + (inputs + `(("cl-sqlite" ,sbcl-cl-sqlite) + ("dbi" ,sbcl-dbi) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (synopsis "Database driver for SQLite3"))) + +(define-public cl-dbd-sqlite3 + (sbcl-package->cl-source-package sbcl-dbd-sqlite3)) -- cgit v1.2.3 From 640d910427f3e7128be3702a261a1bb40264040b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 12:51:57 +0100 Subject: gnu: macs: Update to 2.2.6. * gnu/packages/bioinformatics.scm (macs): Update to 2.2.6. [source]: Fetch from git. [arguments]: Enable tests, build with default Python. [inputs]: Replace python2-numpy with python-numpy. [native-inputs]: Add python-pytest. --- gnu/packages/bioinformatics.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 97d766b053..7f2a852fb0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4274,19 +4274,30 @@ (define-public kaiju (define-public macs (package (name "macs") - (version "2.1.1.20160309") + (version "2.2.6") (source (origin - (method url-fetch) - (uri (pypi-uri "MACS2" version)) + ;; The PyPi tarball does not contain tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/taoliu/MACS.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "09ixspd1vcqmz1c81ih70xs4m7qml2iy5vyx1y74zww3iy1vl210")))) + "1c5gxr0mk6hkd4vclf0k00wvyvzw2vrmk52c85338p7aqjwg6n15")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; only compatible with Python 2.7 - #:tests? #f)) ; no test target + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v")))))) (inputs - `(("python-numpy" ,python2-numpy))) + `(("python-numpy" ,python-numpy))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/taoliu/MACS/") (synopsis "Model based analysis for ChIP-Seq data") (description -- cgit v1.2.3 From 8119352ffaf5249a814f7ffc939ab811f2a5057a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:03:07 +0300 Subject: gnu: Add rust-serde-codegen-internals-0.14. * gnu/packages/crates-io.scm (rust-serde-codegen-internals-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 95ccbdfaa7..eb73004ad9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14248,6 +14248,28 @@ (define-public rust-serde-codegen-0.4 for the serde framework.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-codegen-internals-0.14 + (package + (name "rust-serde-codegen-internals") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_codegen_internals" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0004s3wlc85vi6hq62hq84cv5b6qbbin1n6hdaqj095xhg98p25w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-syn" ,rust-syn-0.11)))) + (home-page "https://serde.rs") + (synopsis "AST representation used by Serde codegen") + (description + "Unstable AST representation used by Serde codegen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-derive-1.0 (package (name "rust-serde-derive") -- cgit v1.2.3 From 7881fc114efcd4c107d0d8cbb55729b67ec4e8b3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:03:36 +0300 Subject: gnu: Add rust-serde-derive-0.9. * gnu/packages/crates-io.scm (rust-serde-derive-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eb73004ad9..3a8c043a80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14298,6 +14298,33 @@ (define-public rust-serde-derive-1.0 "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-derive-0.9 + (package + (inherit rust-serde-derive-1.0) + (name "rust-serde-derive") + (version "0.9.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fkldf0lnl6pwxs00qpyp79m30qmfpi3bk0wm22211ylyikdi3wp")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))) + #:cargo-inputs + (("rust-quote" ,rust-quote-0.3) + ("rust-serde-codegen-internals" ,rust-serde-codegen-internals-0.14) + ("rust-syn" ,rust-syn-0.11)))))) + (define-public rust-serde-json-1.0 (package (name "rust-serde-json") -- cgit v1.2.3 From 1516f20a2708255ba694e33582b3592c8eb6991e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:04:07 +0300 Subject: gnu: Add rust-serde-0.9. * gnu/packages/crates-io.scm (rust-serde-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a8c043a80..e1ca2bdac2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14097,6 +14097,33 @@ (define-public rust-serde-1.0 "This package provides a generic serialization/deserialization framework.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-0.9 + (package + (inherit rust-serde-1.0) + (name "rust-serde") + (version "0.9.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bsla8l5xr9pp5sirkal6mngxcq6q961km88jvf339j5ff8j7dil")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))) + #:cargo-inputs + (("rust-serde-derive" ,rust-serde-derive-0.9)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-0.9)))))) + (define-public rust-serde-0.8 (package (inherit rust-serde-1.0) -- cgit v1.2.3 From 87c1e7f5c976ba729e8e3cf51a0acfc6d7639408 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:04:19 +0300 Subject: gnu: Add rust-serde-0.4. * gnu/packages/crates-io.scm (rust-serde-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1ca2bdac2..2005b81fd1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14142,6 +14142,24 @@ (define-public rust-serde-0.8 (("rust-clippy" ,rust-clippy-0.0)) #:tests? #f)))) +(define-public rust-serde-0.4 + (package + (inherit rust-serde-0.9) + (name "rust-serde") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06s2ayx1p5zzj4q7bfld60c9iprsk1256pnh8qj6h794mjinw11b")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-num" ,rust-num-0.2)))))) + (define-public rust-serde-big-array-0.1 (package (name "rust-serde-big-array") -- cgit v1.2.3 From be9655d96d294e1ac9915c30e0d506ad3a8de4db Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:05:22 +0300 Subject: gnu: Add rust-serde-test-0.9. * gnu/packages/crates-io.scm (rust-serde-test-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2005b81fd1..2041e0e3cb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14428,6 +14428,30 @@ (define-public rust-serde-test-1.0 "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-test-0.9 + (package + (inherit rust-serde-test-1.0) + (name "rust-serde-test") + (version "0.9.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))) + #:cargo-inputs (("rust-serde" ,rust-serde-0.9)))))) + (define-public rust-serde-test-0.8 (package (inherit rust-serde-test-1.0) -- cgit v1.2.3 From 537f998be7200adc59a200f8209e3514c120f099 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:06:46 +0300 Subject: gnu: Add rust-serde-macros-0.4. * gnu/packages/crates-io.scm (rust-serde-macros-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2041e0e3cb..a68ddcd2ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14400,6 +14400,42 @@ (define-public rust-serde-json-1.0 "This package provides a JSON serialization file format.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-macros-0.4 + (package + (name "rust-serde-macros") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1717rpncvvyvyrpb7hdjgxpiki9vdgygwv2r3d9aal5n8cm8xi8i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))) + #:cargo-inputs + (("rust-serde-codegen" ,rust-serde-codegen-0.4)) + #:cargo-development-inputs + (("rust-num" ,rust-num-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.4)))) + (home-page "https://serde.rs") + (synopsis + "Macros to auto-generate implementations for the serde framework") + (description + "Macros to auto-generate implementations for the serde framework.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-test-1.0 (package (name "rust-serde-test") -- cgit v1.2.3 From 6b11c1e401c242eea3d53cc40e314c017701836d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:07:47 +0300 Subject: gnu: Add rust-linked-hash-map-0.4. * gnu/packages/crates-io.scm (rust-linked-hash-map-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a68ddcd2ff..edae31ce6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9237,6 +9237,27 @@ (define-public rust-linked-hash-map-0.5 (license (list license:asl2.0 license:expat)))) +(define-public rust-linked-hash-map-0.4 + (package + (inherit rust-linked-hash-map-0.5) + (name "rust-linked-hash-map") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fd958y02ggwpa2246kmjky9xmnww7vxg0ik3rxgy23hgwlyqq3q")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-heapsize" ,rust-heapsize-0.3) + ("rust-serde" ,rust-serde-0.9) + ("rust-serde-test" ,rust-serde-test-0.9)))))) + (define-public rust-linked-hash-map-0.3 (package (inherit rust-linked-hash-map-0.5) -- cgit v1.2.3 From c7d5b98dd9a593564a73ef3e1f532a77d473597d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:09:06 +0300 Subject: gnu: Add rust-serde-json-0.9. * gnu/packages/crates-io.scm (rust-serde-json-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index edae31ce6c..a735df49d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14421,6 +14421,31 @@ (define-public rust-serde-json-1.0 "This package provides a JSON serialization file format.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-json-0.9 + (package + (inherit rust-serde-json-1.0) + (name "rust-serde-json") + (version "0.9.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_json" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "188nbf56m7p6mnh3xd71rwqxd4g95lqh8gsl7mfy3lp7gd4cz2xd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dtoa" ,rust-dtoa-0.4) + ("rust-itoa" ,rust-itoa-0.3) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.4) + ("rust-num-traits" ,rust-num-traits-0.1) + ("rust-serde" ,rust-serde-0.9)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-0.9)))))) + (define-public rust-serde-macros-0.4 (package (name "rust-serde-macros") -- cgit v1.2.3 From f6a57eecbe4385c4dc33d9d6e1035a85c5a195e9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:09:36 +0300 Subject: gnu: Add rust-target-build-utils-0.3. * gnu/packages/crates-io.scm (rust-target-build-utils-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a735df49d7..b41be6160a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16127,6 +16127,32 @@ (define-public rust-takeable-option-0.4 "This package provides a small wrapper around option.") (license (list license:asl2.0 license:expat)))) +(define-public rust-target-build-utils-0.3 + (package + (name "rust-target-build-utils") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "target_build_utils" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p7713x4bpbwi11l196z1mi8ym8qj1cdnab1mm2ffpm2wi516g81")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-phf" ,rust-phf-0.7) + ("rust-serde-json" ,rust-serde-json-0.9) + ("rust-phf-codegen" ,rust-phf-codegen-0.7)))) + (home-page "https://github.com/nagisa/target_build_utils.rs") + (synopsis "Rust utility to handle TARGET environment variable") + (description + "Utility crate to handle the @code{TARGET} environment variable passed into +@code{build.rs} scripts.") + (license (list license:isc license:asl2.0)))) + (define-public rust-tempdir-0.3 (package (name "rust-tempdir") -- cgit v1.2.3 From a83d31ef844ada117e21e803cadcacc8e9d6358e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:11:32 +0300 Subject: gnu: Add rust-libloading-0.3. * gnu/packages/crates-io.scm (rust-libloading-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b41be6160a..9d2dab60ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7970,6 +7970,29 @@ (define-public rust-libloading-0.5 functions and static variables these libraries contain.") (license license:isc))) +(define-public rust-libloading-0.3 + (package + (inherit rust-libloading-0.5) + (name "rust-libloading") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "libloading" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0risz19rllhdc0d7nkpwkf4pcbjjgg1iim0kkmzb6kkp874hl0ha")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test libraries not included in release. + #:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-winapi" ,rust-winapi-0.2) + ("rust-target-build-utils" ,rust-target-build-utils-0.3)))))) + (define-public rust-libm-0.2 (package (name "rust-libm") -- cgit v1.2.3 From 389f9ab6ab52d73cfd82b6ef1fc5e07098357ea5 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:12:40 +0300 Subject: gnu: Add rust-clang-sys-0.11. * gnu/packages/crates-io.scm (rust-clang-sys-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9d2dab60ef..db52c144c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2068,6 +2068,38 @@ (define-public rust-clang-sys-0.22 (string-append clang "/lib"))) #t))))))) +(define-public rust-clang-sys-0.11 + (package + (inherit rust-clang-sys-0.22) + (name "rust-clang-sys") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "clang-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17i47skqp1d9svil2m1wspnhz7ci1x0fipia70ns0qffciwiz48r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-0.7) + ("rust-clippy" ,rust-clippy-0.0) + ("rust-glob" ,rust-glob-0.2) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))))) + (define-public rust-clap-2 (package (name "rust-clap") -- cgit v1.2.3 From d1e647e3638e1c2bcedfc918ccbd34a7ad78315a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:13:24 +0300 Subject: gnu: Add rust-cexpr-0.2. * gnu/packages/crates-io.scm (rust-cexpr-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db52c144c9..39332dd78a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1789,6 +1789,37 @@ (define-public rust-cexpr-0.3 "This package provides a C expression parser and evaluator.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cexpr-0.2 + (package + (inherit rust-cexpr-0.3) + (name "rust-cexpr") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "cexpr" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v1xa3758czmj8h97gh548mr8g0v13ixxvrlm1s79nb7jmgc9aj2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nom" ,rust-nom-3)) + #:cargo-development-inputs + (("rust-clang-sys" ,rust-clang-sys-0.11)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))))) + (define-public rust-chrono-0.4 (package (name "rust-chrono") -- cgit v1.2.3 From bb088feeff52db2069b1cb64745b0f6ff66caff0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:14:43 +0300 Subject: gnu: Add rust-bindgen-0.33. * gnu/packages/crates-io.scm (rust-bindgen-0.33): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 39332dd78a..d403e387d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -985,6 +985,39 @@ (define-public rust-bindgen-0.50 libraries.") (license license:bsd-3))) +(define-public rust-bindgen-0.33 + (package + (inherit rust-bindgen-0.50) + (name "rust-bindgen") + (version "0.33.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vnw5fb74gl9pgnimgbrkac1xgwrjz86pqilx20rbkia77cdhgk0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cexpr" ,rust-cexpr-0.2) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-0.22) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-quote" ,rust-quote-0.3) + ("rust-regex" ,rust-regex-0.2) + ("rust-which" ,rust-which-1.0)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)))))) + (define-public rust-bit-set-0.5 (package (name "rust-bit-set") -- cgit v1.2.3 From 63502072bdc9b2408812b83a3157439743d52678 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:15:16 +0300 Subject: gnu: Add rust-winpty-sys-0.4. * gnu/packages/crates-io.scm (rust-winpty-sys-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d403e387d4..5799d953ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19183,6 +19183,30 @@ (define-public rust-wincolor-1.0 (license (list license:unlicense license:expat)))) +(define-public rust-winpty-sys-0.4 + (package + (name "rust-winpty-sys") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "winpty-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0s5m2vvlw7wphc466s47zfmp08zk00wzj999l1w3ajqlxbnfgb9x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.33) + ("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/rprichard/winpty") + (synopsis "Rust winpty bindings") + (description "Rust winpty bindings.") + (license license:expat))) + (define-public rust-winreg-0.6 (package (name "rust-winreg") -- cgit v1.2.3 From 66d27f5d779507ac56e7f4df36b4d2e04bee41f6 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:27:15 +0300 Subject: gnu: Add rust-partial-io-0.2. * gnu/packages/crates-io.scm (rust-partial-io-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5799d953ee..18b502b751 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10763,6 +10763,36 @@ (define-public rust-parity-wasm-0.40 (license (list license:asl2.0 license:expat)))) +(define-public rust-partial-io-0.2 + (package + (name "rust-partial-io") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "partial-io" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03iynvayh11a4mckhwflm5y1qmnkw5m3b20gzi1crpasndy3h8xx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-quickcheck" ,rust-quickcheck-0.4) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.4) + ("rust-tokio-core" ,rust-tokio-core-0.1)))) + (home-page "https://github.com/facebookincubator/rust-partial-io") + (synopsis + "Helpers to test partial, interrupted and would-block I/O operations") + (description + "Helpers to test partial, interrupted and would-block I/O operations.") + (license license:bsd-3))) + (define-public rust-paste-0.1 (package (name "rust-paste") -- cgit v1.2.3 From f4b8c2729793d61dfcd7b5533e55461598d035cd Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:27:58 +0300 Subject: gnu: Add rust-bzip2-0.3. * gnu/packages/crates-io.scm (rust-bzip2-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18b502b751..b9ec9fcc29 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1570,6 +1570,39 @@ (define-public rust-bytes-0.3 #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-bzip2-0.3 + (package + (name "rust-bzip2") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "bzip2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bzip2-sys" ,rust-bzip2-sys-0.1) + ("rust-futures" ,rust-futures-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + (("rust-partial-io" ,rust-partial-io-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.4) + ("rust-rand" ,rust-rand-0.3) + ("rust-tokio-core" ,rust-tokio-core-0.1)))) + (home-page "https://github.com/alexcrichton/bzip2-rs") + (synopsis + "Rust bindings to libbzip2 for bzip2 compression and decompression") + (description + "Bindings to @code{libbzip2} for @code{bzip2} compression and decompression +exposed as Reader/Writer streams.") + (license (list license:expat license:asl2.0)))) + (define-public rust-bzip2-sys-0.1 (package (name "rust-bzip2-sys") -- cgit v1.2.3 From b7c40a971344dcf214f1fe9ae657130e55efe89b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:29:32 +0300 Subject: gnu: Add rust-zip-0.5. * gnu/packages/crates-io.scm (rust-zip-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9ec9fcc29..9cf62015ce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19566,6 +19566,38 @@ (define-public rust-yaml-rust-0.3 (("rust-clippy" ,rust-clippy-0.0) ("rust-linked-hash-map" ,rust-linked-hash-map-0.3)))))) +(define-public rust-zip-0.5 + (package + (name "rust-zip") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "zip" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1biv5kh4fl7wpjlsxfczvgrdjlybf0xjaw7s36didql8lxxz67z4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bzip2" ,rust-bzip2-0.3) + ("rust-crc32fast" ,rust-crc32fast-1.2) + ("rust-flate2" ,rust-flate2-1.0) + ("rust-podio" ,rust-podio-0.1) + ("rust-time" ,rust-time-0.1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-rand" ,rust-rand-0.4) + ("rust-walkdir" ,rust-walkdir-1.0)))) + (home-page "https://github.com/mvdnes/zip-rs.git") + (synopsis + "Library to support the reading and writing of zip files") + (description + "Library to support the reading and writing of zip files.") + (license license:expat))) + (define-public rust-zoneinfo-compiled-0.4 (package (name "rust-zoneinfo-compiled") -- cgit v1.2.3 From 754917c903c80429b29df657311c148cf8a846bf Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:34:41 +0300 Subject: gnu: Add rust-pnacl-build-helper-1.4. * gnu/packages/crates-io.scm (rust-pnacl-build-helper-1.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cf62015ce..2a4605d23f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11390,6 +11390,31 @@ (define-public rust-plugin-0.2 "Lazily evaluated, order-independent plugins for extensible types.") (license license:expat))) +(define-public rust-pnacl-build-helper-1.4 + (package + (name "rust-pnacl-build-helper") + (version "1.4.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "pnacl-build-helper" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "145hxz3m3sg8mm9sfqqqaarnna43v65l6whwswrvcvy0fzp17gnz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-tempdir" ,rust-tempdir-0.3) + ("rust-walkdir" ,rust-walkdir-1.0)))) + (home-page "https://github.com/DiamondLovesYou/cargo-pnacl-helper") + (synopsis + "Build script helper for building PNaCl/NaCl C/CXX libraries from source") + (description + "Build script helper for building PNaCl/NaCl C/CXX libraries from source") + (license license:mpl2.0))) + (define-public rust-png-0.15 (package (name "rust-png") -- cgit v1.2.3 From a86fc40dc384ae237b10a1d401f984c6f277aa88 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:35:52 +0300 Subject: gnu: Add rust-libressl-pnacl-sys-2. * gnu/packages/crates-io.scm (rust-libressl-pnacl-sys-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a4605d23f..5b5c36525c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8161,6 +8161,30 @@ (define-public rust-libm-0.1 (base32 "16pc0gx4gkg0q2s1ssq8268brn14j8344623vwhadmivc4lsmivz")))))) +(define-public rust-libressl-pnacl-sys-2 + (package + (name "rust-libressl-pnacl-sys") + (version "2.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "libressl-pnacl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w9yvgrf591phpr1222j0dj7x1n489v2sihnr8syz8xn3aamih6b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-pnacl-build-helper" ,rust-pnacl-build-helper-1.4)))) + (home-page "https://github.com/DiamondLovesYou/libressl-pnacl-sys") + (synopsis "Openssl linking provider for PNaCl/NaCl targets") + (description + "This package provides an openssl linking provider for PNaCl/NaCl targets.") + (license license:expat))) + (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") -- cgit v1.2.3 From b38dd34f40ff9a779f9e8faf2c8d3739b6d6270f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 13:14:57 +0100 Subject: gnu: crossmap: Update to 0.3.8. * gnu/packages/bioinformatics.scm (crossmap): Update to 0.3.8. [arguments]: Remove to build with default Python. [inputs]: Add python-pybigwig; replace python2-bx-python, python2-numpy, and python2-pysam with their Python 3 variants. [native-inputs]: Replace python2-cython and python2-nose with their Python 3 variants. --- gnu/packages/bioinformatics.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7f2a852fb0..1f17c019f0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2272,23 +2272,23 @@ (define-public clustal-omega (define-public crossmap (package (name "crossmap") - (version "0.2.9") + (version "0.3.8") (source (origin (method url-fetch) (uri (pypi-uri "CrossMap" version)) (sha256 (base32 - "1byhclrqnqpvc1rqkfh4jwj6yhn0x9y7jk47i0qcjlhk0pjkw92p")))) + "1sb2f2qbxya4fzw3yjl09vbrs8vfmw22zrygrvz004sf9gb1vkan")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) (inputs - `(("python-bx-python" ,python2-bx-python) - ("python-numpy" ,python2-numpy) - ("python-pysam" ,python2-pysam) + `(("python-bx-python" ,python-bx-python) + ("python-numpy" ,python-numpy) + ("python-pybigwig" ,python-pybigwig) + ("python-pysam" ,python-pysam) ("zlib" ,zlib))) (native-inputs - `(("python-cython" ,python2-cython) - ("python-nose" ,python2-nose))) + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose))) (home-page "http://crossmap.sourceforge.net/") (synopsis "Convert genome coordinates between assemblies") (description -- cgit v1.2.3 From 920757566996f6a22b14074b92acd4bdf29a47cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 14:05:12 +0100 Subject: gnu: diamond: Update to 0.9.30. * gnu/packages/bioinformatics.scm (diamond): Update to 0.9.30. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1f17c019f0..546be38ab0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2578,7 +2578,7 @@ (define-public delly (define-public diamond (package (name "diamond") - (version "0.9.22") + (version "0.9.30") (source (origin (method git-fetch) (uri (git-reference @@ -2587,7 +2587,7 @@ (define-public diamond (file-name (git-file-name name version)) (sha256 (base32 - "0bky78v79g3wmdpsd706cscckgw1v09fg8vdd0z8z0d5b97aj9zl")))) + "0k6f3kb6cniw11xw6763kkbs1sl0yack7xsy7q5fl5v170ssphq4")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit v1.2.3 From 146430ea0e0008ff91972f944920dfa01d1ab360 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 14:05:36 +0100 Subject: gnu: proteinortho: Update to 6.0.14. * gnu/packages/bioinformatics.scm (proteinortho): Update to 6.0.14. [source]: Fetch from git; remove pre-built scripts. [arguments]: Set make-flags; update wrap-programs phase to wrap all scripts. [inputs]: Add guile-3.0, diamond, python-wrapper, lapack, and openblas; remove python-2. [native-inputs]: Add which. [license]: Update to GPLv3+ --- gnu/packages/bioinformatics.scm | 52 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 546be38ab0..8ed13b22e5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4921,20 +4921,26 @@ (define-public prank (define-public proteinortho (package (name "proteinortho") - (version "5.16b") - (source - (origin - (method url-fetch) - (uri - (string-append - "http://www.bioinf.uni-leipzig.de/Software/proteinortho/proteinortho_v" - version "_src.tar.gz")) - (sha256 - (base32 - "1wl0dawpssqwfjvr651r4wlww8hhjin8nba6xh71ks7sbypx886j")))) + (version "6.0.14") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/paulklemm_PHD/proteinortho.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pmy617zy2z2w6hjqxjhf3rzikf5n3mpia80ysq8233vfr7wrzff")) + (modules '((guix build utils))) + (snippet + '(begin + ;; remove pre-built scripts + (delete-file-recursively "src/BUILD/") + #t)))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:make-flags '("CC=gcc") #:phases (modify-phases %standard-phases (replace 'configure @@ -4952,15 +4958,23 @@ (define-public proteinortho #t)) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((path (getenv "PATH")) - (out (assoc-ref outputs "out")) - (binary (string-append out "/bin/proteinortho5.pl"))) - (wrap-program binary `("PATH" ":" prefix (,path)))) + (let ((path (getenv "PATH")) + (out (assoc-ref outputs "out"))) + (for-each (lambda (script) + (wrap-script script `("PATH" ":" prefix (,path)))) + (cons (string-append out "/bin/proteinortho") + (find-files out "\\.(pl|py)$")))) #t))))) (inputs - `(("perl" ,perl) - ("python" ,python-2) - ("blast+" ,blast+))) + `(("guile" ,guile-3.0) ; for wrap-script + ("diamond" ,diamond) + ("perl" ,perl) + ("python" ,python-wrapper) + ("blast+" ,blast+) + ("lapack" ,lapack) + ("openblas" ,openblas))) + (native-inputs + `(("which" ,which))) (home-page "http://www.bioinf.uni-leipzig.de/Software/proteinortho") (synopsis "Detect orthologous genes across species") (description @@ -4968,7 +4982,7 @@ (define-public proteinortho species. For doing so, it compares similarities of given gene sequences and clusters them to find significant groups. The algorithm was designed to handle large-scale data and can be applied to hundreds of species at once.") - (license license:gpl2+))) + (license license:gpl3+))) (define-public pyicoteo (package -- cgit v1.2.3 From b68f5a68f895307ee184da725882d6f243ccded6 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Sat, 22 Feb 2020 19:48:54 -0800 Subject: gnu: Add emacs-company-emoji. [[PGP Signed Part:No public key for F530C3B4A2A9F06D created at 2020-02-23T04:48:54+0100 using RSA]] From 6c23c5966a3c7ed01c784874e410d5fe3009bfc5 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Sat, 22 Feb 2020 19:47:19 -0800 Subject: [PATCH] gnu: Add emacs-company-emoji. * gnu/packages/emacs-xyz.scm (emacs-company-emoji): New variable. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0932c87e9a..1025529fd4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Robert Smith +;;; Copyright © 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -21536,3 +21537,26 @@ (define-public emacs-persist one file per value. This makes it easy to delete or remove unused variables.") (license license:gpl3+))) + +(define-public emacs-company-emoji + (package + (name "emacs-company-emoji") + (version "2.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dunn/company-emoji/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company))) + (home-page "https://github.com/dunn/company-emoji/") + (synopsis "Company completion back-end for emoji") + (description + "This library is a Company back-end providing auto-completion for +emoji.") + (license license:gpl3+))) -- cgit v1.2.3 From 6fda3a6cb421121d6ff600b9bc836e24c18a433a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 17:00:21 +0100 Subject: gnu: pocl: Build with LLVM@9. * gnu/packages/opencl.scm (pocl)[inputs]: Change from LLVM-8 to LLVM. --- gnu/packages/opencl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 04b3cb0524..32eb360e04 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -315,7 +315,7 @@ (define-public pocl (inputs `(("clang" ,clang) ("hwloc" ,hwloc-2 "lib") - ("llvm" ,llvm-8) + ("llvm" ,llvm) ("ocl-icd" ,ocl-icd))) (arguments `(#:configure-flags -- cgit v1.2.3 From ae9cfc647daea456823adecba28021896b51407e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 16:15:18 +0100 Subject: gnu: LibUV: Add version 1.34.2. * gnu/packages/libevent.scm (libuv/latest): New public variable. --- gnu/packages/libevent.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 338b2afd4e..3754a5c427 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2017 Mark H Weaver ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 David Thompson -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt @@ -130,6 +130,20 @@ (define-public libuv ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) +;; This newer version of LibUV is required by 'node'. Package it separately +;; to avoid massive rebuilds. +(define-public libuv/latest + (package/inherit + libuv + (version "1.34.2") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "0inzk8qpw78im3fiazrc54qi1gcapbs8dhf0hk3kwpzg0i2kpnb5")))))) + (define-public perl-anyevent (package (name "perl-anyevent") -- cgit v1.2.3 From bbd804b29bbb9bc7739688bca192eb83d0edb882 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 16:15:47 +0100 Subject: gnu: nghttp2: Add version 1.40.0. * gnu/packages/web.scm (nghttp2-1.40): New public variable. --- gnu/packages/web.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4976059203..2be3dfefe4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Pierre Langlois @@ -7025,6 +7025,20 @@ (define nghttp2-1.39.2 (base32 "12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2")))))) +;; 'Node' requires this newer version, to be removed on the next rebuild cycle. +(define-public nghttp2-1.40 + (package/inherit + nghttp2 + (version "1.40.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09")))))) + (define-public hpcguix-web (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") (revision "4")) -- cgit v1.2.3 From 458c3ff552005cbf69ed4a1daee3529214ae73cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 16:16:29 +0100 Subject: gnu: node: Update to 10.19.0. * gnu/packages/node.scm (node): Update to 10.19.0. [inputs]: Remove LIBUV and NGHTTP2:LIB. Add LIBUV/LATEST and NGHTTP2-1.40:LIB. --- gnu/packages/node.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ee35d76852..296a5e1980 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Marius Bakke +;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,14 +45,14 @@ (define-module (gnu packages node) (define-public node (package (name "node") - (version "10.16.0") + (version "10.19.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq")) + "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2")) (modules '((guix build utils))) (snippet `(begin @@ -170,8 +170,8 @@ (define-public node `(("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) - ("libuv" ,libuv) - ("nghttp2" ,nghttp2 "lib") + ("libuv" ,libuv/latest) + ("nghttp2" ,nghttp2-1.40 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") -- cgit v1.2.3 From 5cfc6a88e9fbb9f34855ebd43264266b0201ce50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 17:22:22 +0100 Subject: gnu: node: Disable failing tests on armhf-linux. * gnu/packages/node.scm (node)[arguments]: When building on armhf-linux, disable several zlib tests. --- gnu/packages/node.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 296a5e1980..eb8c83d831 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -74,8 +74,7 @@ (define-public node #t)))) (build-system gnu-build-system) (arguments - ;; TODO: Purge the bundled copies from the source. - '(#:configure-flags '("--shared-cares" + `(#:configure-flags '("--shared-cares" "--shared-http-parser" "--shared-libuv" "--shared-nghttp2" @@ -121,6 +120,20 @@ (define-public node ;; https://github.com/nodejs/node/issues/31213 (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") + ;; FIXME: These tests fail on armhf-linux: + ;; https://github.com/nodejs/node/issues/31970 + ,@(if (string-prefix? "arm" (%current-system)) + '((for-each delete-file + '("test/parallel/test-zlib.js" + "test/parallel/test-zlib-brotli.js" + "test/parallel/test-zlib-brotli-flush.js" + "test/parallel/test-zlib-brotli-from-brotli.js" + "test/parallel/test-zlib-brotli-from-string.js" + "test/parallel/test-zlib-convenience-methods.js" + "test/parallel/test-zlib-random-byte-pipes.js" + "test/parallel/test-zlib-write-after-flush.js"))) + '()) + ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. -- cgit v1.2.3 From f5cc5de8b6c542295b08c108d9a6f1ca52cdc37a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 20:59:09 +0100 Subject: gnu: clang: Fix C++ search path handling on non-x86_64. * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Add phase 'add-missing-triplets'. --- gnu/packages/llvm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 38f2118173..4a1a1239d7 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -208,6 +208,24 @@ (define* (clang-from-llvm llvm clang-runtime hash #:build-type "Release" #:phases (modify-phases %standard-phases + (add-after 'unpack 'add-missing-triplets + (lambda _ + ;; Clang iterates through known triplets to search for + ;; GCC's headers, but does not recognize some of the + ;; triplets that are used in Guix. + (substitute* ,@(if (version>=? version "6.0") + '("lib/Driver/ToolChains/Gnu.cpp") + '("lib/Driver/ToolChains.cpp")) + (("\"aarch64-linux-gnu\"," all) + (string-append "\"aarch64-unknown-linux-gnu\", " + all)) + (("\"arm-linux-gnueabihf\"," all) + (string-append all + " \"arm-unknown-linux-gnueabihf\",")) + (("\"i686-pc-linux-gnu\"," all) + (string-append "\"i686-unknown-linux-gnu\", " + all))) + #t)) (add-after 'unpack 'set-glibc-file-names (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 5041cc28cb33a714ea40c91e14e55706d6dbb9dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 21:06:01 +0100 Subject: gnu: clang: Move version conditionals out of the builder. * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Rewrite phase 'set-glibc-file-names' to use VERSION>=? from (guix utils) and splice in the relevant build code, instead of doing the comparison at build time. --- gnu/packages/llvm.scm | 107 ++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4a1a1239d7..41217d14f0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -226,64 +226,59 @@ (define* (clang-from-llvm llvm clang-runtime hash (string-append "\"i686-unknown-linux-gnu\", " all))) #t)) - (add-after - 'unpack 'set-glibc-file-names - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc")) - (compiler-rt (assoc-ref inputs "clang-runtime")) - (gcc (assoc-ref inputs "gcc")) - (version - (string->number - ,(version-major (package-version clang-runtime))))) - (cond - ((> version 3) - ;; Link to libclang_rt files from clang-runtime. - (substitute* "lib/Driver/ToolChain.cpp" - (("getDriver\\(\\)\\.ResourceDir") - (string-append "\"" compiler-rt "\""))) - - ;; Make "LibDir" refer to /lib so that it - ;; uses the right dynamic linker file name. - (substitute* "lib/Driver/ToolChains/Linux.cpp" - (("(^[[:blank:]]+LibDir = ).*" _ declaration) - (string-append declaration "\"" libc "/lib\";\n")) - - ;; Make clang look for libstdc++ in the right - ;; location. - (("LibStdCXXIncludePathCandidates\\[\\] = \\{") - (string-append - "LibStdCXXIncludePathCandidates[] = { \"" gcc "/include/c++\",")) - - ;; Make sure libc's libdir is on the search path, to - ;; allow crt1.o & co. to be found. - (("@GLIBC_LIBDIR@") - (string-append libc "/lib")))) - (else - (substitute* "lib/Driver/Tools.cpp" - ;; Patch the 'getLinuxDynamicLinker' function so that - ;; it uses the right dynamic linker file name. - (("/lib64/ld-linux-x86-64.so.2") - (string-append libc - ,(glibc-dynamic-linker)))) - - ;; Link to libclang_rt files from clang-runtime. - ;; This substitution needed slight adjustment in 3.8. - (if (< 3.8 (string->number ,(version-major+minor - (package-version - clang-runtime)))) - (substitute* "lib/Driver/Tools.cpp" - (("TC\\.getDriver\\(\\)\\.ResourceDir") - (string-append "\"" compiler-rt "\""))) + (add-after 'unpack 'set-glibc-file-names + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc")) + (compiler-rt (assoc-ref inputs "clang-runtime")) + (gcc (assoc-ref inputs "gcc"))) + ,@(cond + ((version>=? version "6.0") + `(;; Link to libclang_rt files from clang-runtime. (substitute* "lib/Driver/ToolChain.cpp" (("getDriver\\(\\)\\.ResourceDir") - (string-append "\"" compiler-rt "\"")))) - - ;; Make sure libc's libdir is on the search path, to - ;; allow crt1.o & co. to be found. - (substitute* "lib/Driver/ToolChains.cpp" - (("@GLIBC_LIBDIR@") - (string-append libc "/lib"))))) - #t))) + (string-append "\"" compiler-rt "\""))) + + ;; Make "LibDir" refer to /lib so that it + ;; uses the right dynamic linker file name. + (substitute* "lib/Driver/ToolChains/Linux.cpp" + (("(^[[:blank:]]+LibDir = ).*" _ declaration) + (string-append declaration "\"" libc "/lib\";\n")) + + ;; Make clang look for libstdc++ in the right + ;; location. + (("LibStdCXXIncludePathCandidates\\[\\] = \\{") + (string-append + "LibStdCXXIncludePathCandidates[] = { \"" gcc + "/include/c++\",")) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))) + (else + `((substitute* "lib/Driver/Tools.cpp" + ;; Patch the 'getLinuxDynamicLinker' function so that + ;; it uses the right dynamic linker file name. + (("/lib64/ld-linux-x86-64.so.2") + (string-append libc + ,(glibc-dynamic-linker)))) + + ;; Link to libclang_rt files from clang-runtime. + ;; This substitution needed slight adjustment in 3.8. + ,@(if (version>=? version "3.8") + '((substitute* "lib/Driver/Tools.cpp" + (("TC\\.getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\"")))) + '((substitute* "lib/Driver/ToolChain.cpp" + (("getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))))) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (substitute* "lib/Driver/ToolChains.cpp" + (("@GLIBC_LIBDIR@") + (string-append libc "/lib")))))) + #t))) (add-after 'install 'install-clean-up-/share/clang (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 66ed570a05c0363b8aa856469bddf0775a4554ee Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 22 Feb 2020 16:48:02 -0500 Subject: gnu: emacs-elixir-mode: Fix capitalization in description. * gnu/packages/emacs-xyz.scm (emacs-elixir-mode)[description]: Downcase incorrectly capitalized word. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1025529fd4..cfc92cecc5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20371,7 +20371,7 @@ (define-public emacs-elixir-mode "https://github.com/elixir-editors/emacs-elixir") (synopsis "Major mode for editing Elixir files") (description - "Elixir-Mode Provides font-locking, indentation and navigation support + "Elixir-Mode provides font-locking, indentation and navigation support for the Elixir programming language.") (license license:gpl3+))) -- cgit v1.2.3 From b18d3c526834a58d71566be6f0f0453dc55881e2 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 22 Feb 2020 16:49:00 -0500 Subject: gnu: emacs-eacl: Fix typo in description. * gnu/packages/emacs-xyz.scm (emacs-eacl)[description]: Correct misspelling of "commands". Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cfc92cecc5..b61eb19069 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19361,7 +19361,7 @@ (define-public emacs-eacl `(("emacs-ivy" ,emacs-ivy))) (home-page "https://github.com/redguardtoo/eacl") (synopsis "Auto-complete lines by using @code{grep} on a project") - (description "This package provides auto-completion cammands for single + (description "This package provides auto-completion commands for single and multiple lines of code in a project.") (license license:gpl3+))) -- cgit v1.2.3 From 176dd26b38410b371a6283813698d6d7a419ada3 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 22 Feb 2020 00:37:23 +0100 Subject: gnu: benchmark: Add bonnie++. * gnu/packages/benchmark.scm (bonnie++): New variable. Signed-off-by: Marius Bakke --- gnu/packages/benchmark.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 602681ac86..9ae30eefc8 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Eric Bavier ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (gnu packages benchmark) #:use-module (gnu packages linux) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) @@ -231,3 +233,28 @@ (define-public benchmark "Benchmark is a library to benchmark code snippets, similar to unit tests.") (license license:asl2.0))) + +(define-public bonnie++ + (package + (name "bonnie++") + (version "1.98") + (source (origin + (method url-fetch) + (uri (string-append "https://www.coker.com.au/bonnie++/bonnie++-" + version ".tgz")) + (sha256 + (base32 + "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) + (arguments '(#:tests? #f)) ; there are no tests + (home-page "https://doc.coker.com.au/projects/bonnie/") + (synopsis "Hard drive and file system benchmark suite") + (description + "Bonnie++ is a benchmark suite that is aimed at performing a number of +simple tests of hard drive and file system performance. Bonnie++ allows you to +benchmark how your file systems perform with respect to data read and write +speed, the number of seeks that can be performed per second, and the number of +file metadata operations that can be performed per second.") + (license license:gpl2))) ;GPL 2 only, see copyright.txt -- cgit v1.2.3 From 233332c2e9cb76927dd7573b24bd7cdf7afca993 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 24 Feb 2020 23:42:35 +0100 Subject: gnu: musl: Update to 1.2.0. * gnu/packages/musl (musl): Update to 1.2.0. Signed-off-by: Marius Bakke --- gnu/packages/musl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 7e4e27d00d..44c39750d6 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -28,14 +28,14 @@ (define-module (gnu packages musl) (define-public musl (package (name "musl") - (version "1.1.24") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://www.musl-libc.org/releases/" "musl-" version ".tar.gz")) (sha256 (base32 - "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k")))) + "1s6lix02k1ijm4nmhzpmwzk5w6xfkhn70nvvk8zjs51r24cpppn6")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; musl has no tests -- cgit v1.2.3 From cae3b3774ea9905bbf6a7299c3cd964cfa48a705 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Tue, 25 Feb 2020 14:16:07 -0500 Subject: gnu: vim-full: Describe differences from vim. * gnu/packages/vim.scm (vim-full)[description]: New field. Explain what vim-full provides over vim. Signed-off-by: Marius Bakke --- gnu/packages/vim.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 67f245b26d..a94a677b25 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,6 +132,8 @@ (define-public vim ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") + ;; The description shares language with the vim-full package. When making + ;; changes, check if the other description also needs to be updated. (description "Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX @@ -254,7 +257,21 @@ (define-public vim-full ("python-3" ,python) ("ruby" ,ruby) ("tcl" ,tcl) - ,@(package-inputs vim))))) + ,@(package-inputs vim))) + ;; The description shares language with the vim package. When making + ;; changes, check if the other description also needs to be updated. + (description "Vim is a highly configurable text editor built to enable efficient text +editing. It is an improved version of the vi editor distributed with most UNIX +systems. + +Vim is often called a \"programmer's editor,\" and so useful for programming +that many consider it an entire IDE. It's not just for programmers, though. +Vim is perfect for all kinds of text editing, from composing email to editing +configuration files. + +This package provides a version of Vim with many optional features enabled. +It includes a graphical interface, @command{gvim}, and support for plugins +written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages."))) (define-public vim-neocomplete (package -- cgit v1.2.3 From e524b57740cd6ac51613b5072b6e43b4c5aab281 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Tue, 25 Feb 2020 11:27:16 -0800 Subject: gnu: awscli: Update to 1.18.6. * gnu/packages/python-web.scm (awscli): Update to 1.18.6. Signed-off-by: Marius Bakke --- gnu/packages/python-web.scm | 73 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f9981454fb..310fec4edf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -1600,43 +1601,43 @@ (define-public python2-urllib3 (define-public awscli (package - (name "awscli") - (version "1.14.41") - (source - (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 - (base32 - "0sispclx263lybbk19zp1n9yhg8xxx4jddypzgi24vpjaqnsbwlc")))) - (build-system python-build-system) - (arguments - ;; FIXME: The 'pypi' release does not contain tests. - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-reference-to-groff - (lambda _ - (substitute* "awscli/help.py" - (("if not self._exists_on_path\\('groff'\\):") "") - (("raise ExecutableNotFoundError\\('groff'\\)") "") - (("cmdline = \\['groff'") - (string-append "cmdline = ['" (which "groff") "'"))) - #t))))) - (propagated-inputs - `(("python-colorama" ,python-colorama) - ("python-botocore" ,python-botocore) - ("python-s3transfer" ,python-s3transfer) - ("python-docutils" ,python-docutils) - ("python-pyyaml" ,python-pyyaml) - ("python-rsa" ,python-rsa))) - (inputs - `(("groff" ,groff))) - (home-page "https://aws.amazon.com/cli/") - (synopsis "Command line client for AWS") - (description "AWS CLI provides a unified command line interface to the + (name "awscli") + (version "1.18.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "0p479mfs9r0m82a217pap8156ijwvhv6r3kqa4k267gd05wgvygm")))) + (build-system python-build-system) + (arguments + ;; FIXME: The 'pypi' release does not contain tests. + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-reference-to-groff + (lambda _ + (substitute* "awscli/help.py" + (("if not self._exists_on_path\\('groff'\\):") "") + (("raise ExecutableNotFoundError\\('groff'\\)") "") + (("cmdline = \\['groff'") + (string-append "cmdline = ['" (which "groff") "'"))) + #t))))) + (propagated-inputs + `(("python-colorama" ,python-colorama) + ("python-botocore" ,python-botocore) + ("python-s3transfer" ,python-s3transfer) + ("python-docutils" ,python-docutils) + ("python-pyyaml" ,python-pyyaml) + ("python-rsa" ,python-rsa))) + (native-inputs + `(("groff" ,groff))) + (home-page "https://aws.amazon.com/cli/") + (synopsis "Command line client for AWS") + (description "AWS CLI provides a unified command line interface to the Amazon Web Services (AWS) API.") - (license license:asl2.0))) + (license license:asl2.0))) (define-public python-wsgiproxy2 (package -- cgit v1.2.3 From 513c0a0f4602018a49d8fd2dfa24670a3fa08ac9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Feb 2020 21:44:48 +0100 Subject: daemon: Drop 'AT_STATX_DONT_SYNC' flag upon EINVAL. Fixes . Reported by Paul Garlick . * nix/libstore/gc.cc (LocalStore::removeUnusedLinks) [HAVE_STATX]: Add 'statx_flags' static variables. Clear 'AT_STATX_DONT_SYNC' flag from 'statx_flags' when 'statx' returns EINVAL. --- nix/libstore/gc.cc | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 77d7fa2dc7..8bc4e01eb0 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -581,15 +581,27 @@ void LocalStore::removeUnusedLinks(const GCState & state) #ifdef HAVE_STATX # define st_size stx_size # define st_nlink stx_nlink + static int statx_flags = AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC; struct statx st; - if (statx(AT_FDCWD, path.c_str(), - AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC, - STATX_SIZE | STATX_NLINK, &st) == -1) + + if (statx(AT_FDCWD, path.c_str(), statx_flags, + STATX_SIZE | STATX_NLINK, &st) == -1) { + if (errno == EINVAL) { + /* Old 3.10 kernels (CentOS 7) don't support + AT_STATX_DONT_SYNC, so try again without it. */ + statx_flags &= ~AT_STATX_DONT_SYNC; + if (statx(AT_FDCWD, path.c_str(), statx_flags, + STATX_SIZE | STATX_NLINK, &st) == -1) + throw SysError(format("statting `%1%'") % path); + } else { + throw SysError(format("statting `%1%'") % path); + } + } #else struct stat st; if (lstat(path.c_str(), &st) == -1) -#endif throw SysError(format("statting `%1%'") % path); +#endif if (st.st_nlink != 1) { actualSize += st.st_size; -- cgit v1.2.3 From fb7eec3a84afd7464027d2492a8b551a61df2725 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Feb 2020 11:23:30 +0100 Subject: scripts: Emit GC hint if free space is lower than absolute and relative threshold. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts.scm (%disk-space-warning-absolute): New variable. (warn-about-disk-space): Test against %disk-space-warning-absolute. Fix error in display-hint due to extraneous 'profile' argument. Signed-off-by: Ludovic Courtès --- guix/scripts.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index 77cbf12350..7ad1d5194c 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -181,32 +181,69 @@ (define age (newline (guix-warning-port)))) (define %disk-space-warning - ;; The fraction (between 0 and 1) of free disk space below which a warning - ;; is emitted. - (make-parameter (match (and=> (getenv "GUIX_DISK_SPACE_WARNING") - string->number) - (#f .05) ;5% - (threshold (/ threshold 100.))))) + ;; Return a pair of absolute threshold (number of bytes) and relative + ;; threshold (fraction between 0 and 1) for the free disk space below which + ;; a warning is emitted. + ;; GUIX_DISK_SPACE_WARNING can contain both thresholds. A value in [0;100) + ;; is a relative threshold, otherwise it's absolute. The following + ;; example values are valid: + ;; - 1GiB;10% ;1 GiB absolute, and 10% relative. + ;; - 15G ;15 GiB absolute, and default relative. + ;; - 99% ;99% relative, and default absolute. + ;; - 99 ;Same. + ;; - 100 ;100 absolute, and default relative. + (let* ((default-absolute-threshold (size->number "5GiB")) + (default-relative-threshold 0.05) + (percentage->float (lambda (percentage) + (or (and=> (string->number + (car (string-split percentage #\%))) + (lambda (n) (/ n 100.0))) + default-relative-threshold))) + (size->number* (lambda (size) + (or (false-if-exception (size->number size)) + default-absolute-threshold))) + (absolute? (lambda (size) + (not (or (string-suffix? "%" size) + (false-if-exception (< (size->number size) 100))))))) + (make-parameter + (match (getenv "GUIX_DISK_SPACE_WARNING") + (#f (list default-absolute-threshold + default-relative-threshold)) + (env-string (match (string-split env-string #\;) + ((threshold) + (if (absolute? threshold) + (list (size->number* threshold) + default-relative-threshold) + (list default-absolute-threshold + (percentage->float threshold)))) + ((threshold1 threshold2) + (if (absolute? threshold1) + (list (size->number* threshold1) + (percentage->float threshold2)) + (list (size->number* threshold2) + (percentage->float threshold1)))))))))) (define* (warn-about-disk-space #:optional profile #:key - (threshold (%disk-space-warning))) + (thresholds (%disk-space-warning))) "Display a hint about 'guix gc' if less than THRESHOLD of /gnu/store is -available." +available. +THRESHOLD is a pair of (ABSOLUTE-THRESHOLD RELATIVE-THRESHOLD)." (let* ((stats (statfs (%store-prefix))) (block-size (file-system-block-size stats)) (available (* block-size (file-system-blocks-available stats))) (total (* block-size (file-system-block-count stats))) - (ratio (/ available total 1.))) - (when (< ratio threshold) - (warning (G_ "only ~,1f% of free space available on ~a~%") - (* ratio 100) (%store-prefix)) + (relative-threshold-in-bytes (* total (cadr thresholds))) + (absolute-threshold-in-bytes (* 1024 1024 1024 (car thresholds)))) + (when (< available (min relative-threshold-in-bytes + absolute-threshold-in-bytes)) + (warning (G_ "only ~,1f GiB of free space available on ~a~%") + available (%store-prefix)) (display-hint (format #f (G_ "Consider deleting old profile generations and collecting garbage, along these lines: @example guix gc --delete-generations=1m -@end example\n") - profile))))) +@end example\n")))))) ;;; scripts.scm ends here -- cgit v1.2.3 From a73a530df2b5bac3d82f074b13fe41cc1ea8ba12 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Feb 2020 22:09:44 +0100 Subject: git-authenticate: Add sub-key for thomasd. This is a followup to commit 7dc0f1d5a8c248addfcaadf76e45bf601bc51411, signed with sub-key "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726". * build-aux/git-authenticate.scm (%committers): Provide fingerprint of subkey for thomasd. --- build-aux/git-authenticate.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 8d05f0ee40..4f9ef7c886 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -193,7 +193,8 @@ (define %committers ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html ("thomasd" - "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD") + ;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD" + "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726") ("thomasd (old)" "A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08") -- cgit v1.2.3 From 2e4011465b6c0757c45ddf118c9f406df045b376 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Feb 2020 22:11:19 +0100 Subject: git-authenticate: Remove duplicate entry. * build-aux/git-authenticate.scm (%committers): Remove duplicate of snape. --- build-aux/git-authenticate.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 4f9ef7c886..640dedbff5 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -184,8 +184,6 @@ (define %committers "77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423") ("snape" "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") - ("snape" - "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") ("steap" "4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336") ("taylanub" -- cgit v1.2.3 From 37db2370db884ceac3bc97123aaaed84377398eb Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 12 Feb 2020 20:24:31 +0100 Subject: gnu: icecat: Remove about:buildconfig store references. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/gnuzilla.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 863edb3b4e..bb2a4d60dc 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -882,6 +883,7 @@ (define-public icecat #:modules ((ice-9 ftw) (ice-9 rdelim) + (ice-9 regex) (ice-9 match) (srfi srfi-34) (srfi srfi-35) @@ -1067,6 +1069,20 @@ (define-public icecat (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-df-np-sv-z]{32})" + (regexp-quote (%store-directory))) + _ store hash) + (string-append store + (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. -- cgit v1.2.3 From c3435e2e60be3382863b3ae3061dff0ec8642151 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Feb 2020 22:31:46 +0100 Subject: gnu: Add emacs-org-superstar. * gnu/packages/emacs-xyz.scm (emacs-org-superstar): New variable. --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b61eb19069..fdd4ffe648 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4711,6 +4711,47 @@ (define-public emacs-org-bullets @code{org-mode} to be rendered as UTF-8 characters.") (license license:gpl3+))) +(define-public emacs-org-superstar + (package + (name "emacs-org-superstar") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/integral-dw/org-superstar-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org))) + (home-page "https://github.com/integral-dw/org-superstar-mode") + (synopsis "Prettify headings and plain lists in Org mode") + (description "This package prettifies headings and plain lists in +Org mode. It is a direct descendant of @code{org-bullets}, with most +of the code base completely rewritten. + +Currently, this package prettifies Org heading lines by: +@itemize +@item replacing trailing bullets by UTF-8 bullets, +@item hiding leading stars, customizing their look or removing them from vision, +@item applying a custom face to the header bullet, +@item applying a custom face to the leading bullets, +@item using double-bullets for inline tasks, +@item (optional) using special bullets for TODO keywords. +@end itemize + +It also prettifies Org plain list bullets by: +@itemize +@item replacing each bullet type (*, + and -) with UTF-8 bullets, +@item applying a custom face to item bullets. +@end itemize + +Features degrade gracefully when viewed from terminal.") + (license license:gpl3+))) + (define-public emacs-org-pomodoro ;; Last release version was from 2016. (let ((commit "aa07c11318f91219336197e62c47bc7a3d090479") -- cgit v1.2.3 From 760dfc67cd37fffea57803d2637468a19c345de6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 15 Feb 2020 07:16:08 +0000 Subject: gnu: u-boot-pinebook: Fix LCD video output. * gnu/packages/bootloaders (u-boot-pinebook): Add phase applying patch submitted upstream. --- gnu/packages/bootloaders.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 63a88dd7ec..770647935a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -670,7 +670,20 @@ (define-public u-boot-pine64-lts (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) (define-public u-boot-pinebook - (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) + (let ((base (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-pinebook-config + ;; Fix regression with LCD video output introduced in 2020.01 + ;; https://patchwork.ozlabs.org/patch/1225130/ + (lambda _ + (substitute* "configs/pinebook_defconfig" + (("CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y") "CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y\nCONFIG_VIDEO_BPP32=y")) + #t))))))))) (define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) -- cgit v1.2.3 From d854ab159544cb20ff3956aa1f134e07403c01e2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 05:35:51 +0000 Subject: gnu: python-construct: Update to 2.10.56. * gnu/packages/python-xyz (python-construct): Update to 2.10.56. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7a335c04b6..4ea09b756e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16366,14 +16366,14 @@ (define-public python-attr (define-public python-construct (package (name "python-construct") - (version "2.9.45") + (version "2.10.56") (source (origin (method url-fetch) (uri (pypi-uri "construct" version)) (sha256 (base32 - "130iy05awzigm2xah2yvlmb08mac5bi4gzr5m3g7k1krs3ps0w92")))) + "0q86jjzsvy835h3c8pjj4619vbp7ihfg8njmyw86ym4qrpni7flp")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; No tests exist. -- cgit v1.2.3 From 5eeb70a7092b0c3bc1d9a333f5f0ec06e12fb294 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:40:33 +0000 Subject: gnu: opensbi: Update to 0.6. * gnu/packages/firmware (make-opensbi-package): Update to 0.6. --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 826de90ccc..abe8b0eca6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -188,7 +188,7 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) (name (string-replace-substring (string-append "opensbi-" platform "-" variant) "_" "-")) - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -197,7 +197,7 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qc73xbiy79qqkwxmp4mg15q8n8k26njkyqb6n0jw5dyibd6hb85")))) + (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) (build-system gnu-build-system) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) -- cgit v1.2.3 From 2d9b05817dbc75d7a57ae296069529ade2119419 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:43:23 +0000 Subject: gnu: opensbi-qemu-sifive-u: Mark as deprecated. * gnu/packages/firmware (opensbi-qemu-sifive-u): Deprecated by opensbi-sifive-fu540. --- gnu/packages/firmware.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index abe8b0eca6..8822ff35da 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -240,12 +240,14 @@ (define* (make-opensbi-package platform variant #:optional (arch "riscv64")) (define-public opensbi-qemu-virt (make-opensbi-package "qemu" "virt")) -(define-public opensbi-qemu-sifive-u - (make-opensbi-package "qemu" "sifive_u")) - (define-public opensbi-sifive-fu540 (make-opensbi-package "sifive" "fu540")) +(define-public opensbi-qemu-sifive-u + ;; Dropped upstream, as all functionality is present in the sifive-fu540 + ;; target for recent versions of qemu, u-boot and linux. + (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540)) + (define-public seabios (package (name "seabios") -- cgit v1.2.3 From b4e0f0dc37d6a3a887e85008194daf4178f827ef Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 27 Feb 2020 10:42:14 +0100 Subject: gnu: Add emacs-exiftool. * gnu/packages/emacs-xyz.scm (emacs-exiftool): New variable. --- gnu/packages/emacs-xyz.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fdd4ffe648..177b2f3406 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016, 2019 Alex Griffin ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019 Clément Lassieur @@ -155,6 +155,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages video) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages wordnet) + #:use-module (gnu packages photo) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -21601,3 +21602,40 @@ (define-public emacs-company-emoji "This library is a Company back-end providing auto-completion for emoji.") (license license:gpl3+))) + +(define-public emacs-exiftool + (package + (name "emacs-exiftool") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.systemreboot.net/exiftool.el/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bv58is66cz21yhc0qqkp1z4nk13zfi2l7i6pjbhyi0g1n88qqyv")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("make" "-C" "tests") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "exiftool.el") + (emacs-substitute-variables "exiftool.el" + ("exiftool-executable" + (string-append (assoc-ref inputs "perl-image-exiftool") + "/bin/exiftool"))) + #t))))) + (inputs + `(("perl-image-exiftool" ,perl-image-exiftool))) + (home-page "https://git.systemreboot.net/exiftool.el/about/") + (synopsis "Elisp wrapper around ExifTool") + (description "@code{emacs-exiftool} is an Elisp wrapper around ExifTool. +ExifTool supports reading and writing metadata in various formats including +EXIF, XMP and IPTC.") + (license license:gpl3+))) -- cgit v1.2.3 From 83ee1e91b05e324edcdfbafe5b203064f1caf802 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 26 Feb 2020 23:36:01 +0530 Subject: gnu: Add emacs-password-generator. * gnu/packages/emacs-xyz.scm (emacs-password-generator): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 177b2f3406..0120392eaf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21639,3 +21639,25 @@ (define-public emacs-exiftool ExifTool supports reading and writing metadata in various formats including EXIF, XMP and IPTC.") (license license:gpl3+))) + +(define-public emacs-password-generator + (package + (name "emacs-password-generator") + (version "1.01") + (home-page "https://github.com/zargener/emacs-password-genarator") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit "904cdb591a04305ba882ce19e1d117f5fa60f7d3"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qgvn79qz1h8ykm5i1qv2fja4v2y0g2i0n5sf7byhnqhqlwn63nv")))) + (build-system emacs-build-system) + (synopsis "Generate passwords inside Emacs") + (description "@code{emacs-password-generator} provides simple functions to +generate random passwords and insert them into the current buffer. It also +supports generation of phonetic and numeric passwords.") + (license license:artistic2.0))) -- cgit v1.2.3 From b7d0590bb2179f659ff800d8b8b801f2a06db6d7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 10:57:57 +0100 Subject: gnu: emacs-evil-collection: Update to 20200219. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20200219. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0120392eaf..76b9746f69 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7683,7 +7683,7 @@ (define-public emacs-evil (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "eb36c82a84d313e961777dc78fd4ff1d718efdf6") + (let ((commit "a478a95a8a3665e40bdae3bab2a0519db6c1f29c") (revision "13")) (package (name "emacs-evil-collection") @@ -7696,7 +7696,7 @@ (define-public emacs-evil-collection (file-name (git-file-name name version)) (sha256 (base32 - "0wi84x9176y4xjl7zpn882achfamx3a2ixlj4nvflxfh6q1qg7bz")))) + "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From fdd481354705d8f7ec64f0383ecdfee587fb7a71 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 21 Feb 2020 16:25:27 -0600 Subject: gnu: Add gnome-shell-extension-gsconnect. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): New variable. --- gnu/packages/gnome-xyz.scm | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index cd334abb53..a3074288de 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -24,15 +24,20 @@ (define-module (gnu packages gnome-xyz) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module (guix build-system copy) + #:use-module (guix build-system meson) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ssh) + #:use-module (gnu packages tls) #:use-module (gnu packages ruby) #:use-module (gnu packages xml)) @@ -188,6 +193,100 @@ (define-public gnome-shell-extension-dash-to-dock (home-page "https://micheleg.github.io/dash-to-dock/") (license license:gpl2+))) +(define-public gnome-shell-extension-gsconnect + (package + (name "gnome-shell-extension-gsconnect") + ;; v28 is the last version to support GNOME 3.32 + (version "28") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/andyholmes" + "/gnome-shell-extension-gsconnect.git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0grqkzqm7mlkbzin4nx9w7bh5cgygph8pn0cvim4a4gg99nfcp5z")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (name+version (strip-store-file-name out)) + (gschema-dir (string-append out + "/share/gsettings-schemas/" + name+version + "/glib-2.0/schemas")) + (gnome-shell (assoc-ref %build-inputs "gnome-shell")) + (openssh (assoc-ref %build-inputs "openssh")) + (openssl (assoc-ref %build-inputs "openssl"))) + (list + (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") + (string-append "-Dgsettings_schemadir=" gschema-dir) + (string-append "-Dopenssl_path=" openssl "/bin/openssl") + (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") + (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") + (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services") + "-Dpost_install=true")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((glib (assoc-ref inputs "glib:bin")) + (gapplication (string-append glib "/bin/gapplication")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop" + (("gapplication") gapplication)) + (for-each + (lambda (file) + (substitute* file + (("'use strict';") + (string-append "'use strict';\n\n" + "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));")))) + '("src/extension.js" "src/prefs.js")) + #t))) + (add-after 'install 'wrap-daemons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (service-dir + (string-append out "/share/gnome-shell/extensions" + "/gsconnect@andyholmes.github.io/service")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append service-dir "/daemon.js") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) + #t)))))) + (inputs + `(("at-spi2-core" ,at-spi2-core) + ("caribou" ,caribou) + ("evolution-data-server" ,evolution-data-server) + ("folks" ,folks) + ("gjs" ,gjs) + ("glib" ,glib) + ("glib:bin" ,glib "bin") + ("gsound" ,gsound) + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("nautilus" ,nautilus) + ("openssh" ,openssh) + ("openssl" ,openssl) + ("python-nautilus" ,python-nautilus) + ("python-pygobject" ,python-pygobject) + ("upower" ,upower))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki") + (synopsis "Connect GNOME Shell with your Android phone") + (description "GSConnect is a complete implementation of KDE Connect +especially for GNOME Shell, allowing devices to securely share content, like +notifications or files, and other features like SMS messaging and remote +control.") + (license license:gpl2))) + (define-public gnome-shell-extension-hide-app-icon (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab") (revision "0")) -- cgit v1.2.3 From f6a151cdc620b037fed1b899ad40a073111786e3 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:32:14 +0100 Subject: gnu: gnome-shell-extension-appindicator: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): Use the copy-build-system. --- gnu/packages/gnome-xyz.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a3074288de..87830194fd 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -136,19 +136,11 @@ (define-public gnome-shell-extension-appindicator (base32 "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((source (assoc-ref %build-inputs "source")) - (install-dir (string-append (assoc-ref %outputs "out") - "/share/gnome-shell/extensions" - "/appindicatorsupport@rgcjonas.gmail.com"))) - (mkdir-p install-dir) - (copy-recursively source install-dir) - #t)))) + `(#:install-plan + '(("." ,(string-append "share/gnome-shell/extensions/" + "appindicatorsupport@rgcjonas.gmail.com"))))) (synopsis "Adds KStatusNotifierItem support to GNOME Shell") (description "This extension integrates Ubuntu AppIndicators and KStatusNotifierItems (KDE's successor of the systray) into -- cgit v1.2.3 From c456d18b50f764d008ef46029201ef20584cd6f7 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:32:15 +0100 Subject: gnu: gnome-shell-extension-noannoyance: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance): Use the copy-build-system. --- gnu/packages/gnome-xyz.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 87830194fd..5215658912 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -380,18 +380,10 @@ (define-public gnome-shell-extension-noannoyance (base32 "0fa8l3xlh8kbq07y4385wpb908zm6x53z81q16xlmin97dln32hh")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((dst (string-append - (assoc-ref %outputs "out") - "/share/gnome-shell/extensions/" - "noannoyance@daase.net"))) - (mkdir-p dst) - (copy-recursively (assoc-ref %build-inputs "source") dst))))) + '(#:install-plan + '(("." "share/gnome-shell/extensions/noannoyance@daase.net")))) (synopsis "Removes 'Window is ready' annotation") (description "One of the many extensions, that remove this message. It uses ES6 syntax and claims to be more actively maintained than others.") -- cgit v1.2.3 From e10587c5a597a62178cfa5bcc7242f94728ccd0b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 11:32:37 +0100 Subject: gnu: gnome-shell-extension-noannoyance: Fix synopsis and description. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance)[synopsis]: Use imperative form. [description]: Remove spurious comma. --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 5215658912..bedaacf092 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -384,8 +384,8 @@ (define-public gnome-shell-extension-noannoyance (arguments '(#:install-plan '(("." "share/gnome-shell/extensions/noannoyance@daase.net")))) - (synopsis "Removes 'Window is ready' annotation") - (description "One of the many extensions, that remove this message. + (synopsis "Remove 'Window is ready' annotation") + (description "One of the many extensions that remove this message. It uses ES6 syntax and claims to be more actively maintained than others.") (home-page "https://extensions.gnome.org/extension/2182/noannoyance/") (license license:gpl2))) -- cgit v1.2.3 From a69bc7386f22687015bcb326e7f13f353b8fedc4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 14:06:57 +0100 Subject: gnu: Add lttng-ust. * gnu/packages/linux.scm (lttng-ust): New variable. --- gnu/packages/linux.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 78182555c1..0b656629df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -6382,3 +6383,28 @@ (define-public ell ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems.") (license license:lgpl2.1+))) + +(define-public lttng-ust + (package + (name "lttng-ust") + (version "2.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://lttng.org/files/lttng-ust/" + "lttng-ust-" version ".tar.bz2")) + (sha256 + (base32 + "1n646yz7882svf5a4ay3vqiiz3qjn3pgkkij9kk22871wp7q0ck8")))) + (build-system gnu-build-system) + (inputs + `(("liburcu" ,liburcu) + ("numactl" ,numactl))) + (native-inputs + `(("python" ,python-3))) + (home-page "https://lttng.org/") + (synopsis "LTTng userspace tracer libraries") + (description "The user space tracing library, liblttng-ust, is the LTTng +user space tracer. It receives commands from a session daemon, for example to +enable and disable specific instrumentation points, and writes event records +to ring buffers shared with a consumer daemon.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 259e65aac183c76323a15de18bc2c2897e728dba Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:29 +0100 Subject: gnu: Add kicad-footprints. * gnu/packages/engineering.scm (kicad-footprints): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 33c12215e3..5a1554c6aa 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 John Soo +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -954,6 +955,23 @@ (define-public kicad-symbols ;; See . (license license:cc-by-sa4.0))) +(define-public kicad-footprints + (package + (inherit kicad-symbols) + (name "kicad-footprints") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-footprints.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j")))) + (synopsis "Official KiCad footprint libraries") + (description "This package contains the official KiCad footprint libraries."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From c595150709f6ead12d17f303821a7a6e916aa1d0 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:30 +0100 Subject: gnu: Add kicad-packages3d. * gnu/packages/engineering.scm (kicad-packages3d): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5a1554c6aa..c22432bafa 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -972,6 +972,23 @@ (define-public kicad-footprints (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) +(define-public kicad-packages3d + (package + (inherit kicad-symbols) + (name "kicad-packages3d") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-packages3d.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz")))) + (synopsis "Official KiCad 3D model libraries") + (description "This package contains the official KiCad 3D model libraries."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From ca839f3c1867903d217a2a61ebcc7dfb250b5e5f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:31 +0100 Subject: gnu: Add kicad-templates. * gnu/packages/engineering.scm (kicad-templates): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c22432bafa..28a10bb90e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -989,6 +989,24 @@ (define-public kicad-packages3d (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) +(define-public kicad-templates + (package + (inherit kicad-symbols) + (name "kicad-templates") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-templates.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g")))) + (synopsis "Official KiCad project and worksheet templates") + (description "This package contains the official KiCad project and +worksheet templates."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From 052847422341e580f79bda8384f03746baa5b5e2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:32 +0100 Subject: gnu: Remove kicad-library. * gnu/packages/engineering.scm (kicad-library): Remove variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 62 -------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 28a10bb90e..00971cd0fd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -865,68 +865,6 @@ (define-public kicad electrical diagrams), gerbview (viewing Gerber files) and others.") (license license:gpl3+))) -(define-public kicad-library - (let ((version "4.0.7")) - (package - (name "kicad-library") - (version version) - (source - (origin - (method url-fetch) - (uri (string-append - "https://kicad-downloads.s3.cern.ch/libraries/kicad-library-" - version ".tar.gz")) - (sha256 - (base32 "1azb7v1y3l6j329r9gg7f4zlg0wz8nh4s4i5i0l9s4yh9r6i9zmv")))) - (build-system cmake-build-system) - (arguments - `(#:out-of-source? #t - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-footprints ; from footprints tarball - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "tar" "xvf" - (assoc-ref inputs "kicad-footprints") - "-C" (string-append (assoc-ref outputs "out") - "/share/kicad/modules") - "--strip-components=1"))) - ;; We change the default global footprint file, which is generated if - ;; it doesn't exist in user's home directory, from the one using the - ;; github plugin, to the one using the KISYSMOD environment path. - (add-after 'install-footprints 'use-pretty-footprint-table - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (template-dir (string-append out "/share/kicad/template")) - (fp-lib-table (string-append template-dir "/fp-lib-table"))) - (delete-file fp-lib-table) - (copy-file (string-append fp-lib-table ".for-pretty") - fp-lib-table)) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "KISYSMOD") ; footprint path - (files '("share/kicad/modules"))) - (search-path-specification - (variable "KISYS3DMOD") ; 3D model path - (files '("share/kicad/modules/packages3d"))))) - ;; Kicad distributes footprints in a separate tarball. - (native-inputs - `(("kicad-footprints" - ,(origin - (method url-fetch) - (uri (string-append - "http://downloads.kicad-pcb.org/libraries/kicad-footprints-" - version ".tar.gz")) - (sha256 - (base32 - "08qrz5zzsb5127jlnv24j0sgiryd5nqwg3lfnwi8j9a25agqk13j")))))) - (home-page "https://kicad-pcb.org/") - (synopsis "Libraries for kicad") - (description "This package provides Kicad component, footprint and 3D -render model libraries.") - (license license:lgpl2.0+)))) - (define-public kicad-symbols (package (name "kicad-symbols") -- cgit v1.2.3 From badc3c6783c37d88bcea5b8905f76841c76c1b99 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:33 +0100 Subject: gnu: kicad-symbols: Update synopsis and description. * gnu/packages/engineering.scm (kicad-symbols)[synopsis]: Update. [description]: Update. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 00971cd0fd..b25de15a27 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -882,9 +882,9 @@ (define-public kicad-symbols (arguments `(#:tests? #f)) ; no tests exist (home-page "https://kicad-pcb.org/") - (synopsis "Official KiCad schematic symbol libraries for KiCad 5") + (synopsis "Official KiCad schematic symbol libraries") (description "This package contains the official KiCad schematic symbol -libraries for KiCad 5.") +libraries.") ;; TODO: Exception: "To the extent that the creation of electronic designs ;; that use 'Licensed Material' can be considered to be 'Adapted Material', ;; then the copyright holder waives article 3 of the license with respect to -- cgit v1.2.3 From e7075353e02a761e8cfb71afb1496da0418edcf2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:34 +0100 Subject: gnu: kicad: Add translations and search paths. * gnu/packages/engineering.scm (kicad)[arguments]<#:phases>[install-translations]: New phase. [native-search-paths]: Add specification for KICAD_TEMPLATE_DIR, KICAD_SYMBOL_DIR, KISYSMOD and KISYS3DMOD. [native-inputs]: Add desktop-file-utils and kicad-i18l. [inputs]: Remove desktop-file-utils. Replace python by python-wrapper. (kicad-i18l): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 179 +++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 66 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b25de15a27..f06125db0b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -794,76 +794,123 @@ (define-public libfive (define-public ao (deprecated-package "ao-cad" libfive)) +;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master (define-public kicad - (package - (name "kicad") - (version "5.1.5") - (source - (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.xz")) - (uri (string-append - "https://launchpad.net/kicad/" (version-major version) - ".0/" version "/+download/kicad-" version ".tar.xz")) - (sha256 - (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) - (build-system cmake-build-system) - (arguments - `(#:out-of-source? #t - #:tests? #f ; no tests - #:build-type "Release" - #:configure-flags - (list "-DKICAD_SCRIPTING_PYTHON3=ON" - "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - ;; Ensure correct Python at runtime. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python")) - (file (string-append out "/bin/kicad")) - (path (string-append - out - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH")))) - (wrap-program file - `("PYTHONPATH" ":" prefix (,path)) - `("PATH" ":" prefix - (,(string-append python "/bin:"))))) - #t))))) - (native-inputs - `(("boost" ,boost) - ("gettext" ,gnu-gettext) - ("pkg-config" ,pkg-config) - ("swig" ,swig) - ("zlib" ,zlib))) - (inputs - `(("cairo" ,cairo) - ("curl" ,curl) - ("desktop-file-utils" ,desktop-file-utils) - ("glew" ,glew) - ("glm" ,glm) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libngspice" ,libngspice) - ("libsm" ,libsm) - ("mesa" ,mesa) - ("opencascade-oce" ,opencascade-oce) - ("openssl" ,openssl) - ("python" ,python) - ("wxwidgets" ,wxwidgets) - ("wxpython" ,python-wxpython))) - (home-page "https://kicad-pcb.org/") - (synopsis "Electronics Design Automation Suite") - (description "Kicad is a program for the formation of printed circuit + (package + (name "kicad") + (version "5.1.5") + (source + (origin + (method url-fetch) + (file-name (string-append name "-" version ".tar.xz")) + (uri (string-append + "https://launchpad.net/kicad/" (version-major version) + ".0/" version "/+download/kicad-" version ".tar.xz")) + (sha256 + (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) + (build-system cmake-build-system) + (arguments + `(#:out-of-source? #t + #:tests? #f ; no tests + #:build-type "Release" + #:configure-flags + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-translations + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "kicad-i18l") + (assoc-ref outputs "out")) + #t)) + (add-after 'install 'wrap-program + ;; Ensure correct Python at runtime. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (file (string-append out "/bin/kicad")) + (path (string-append + out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH")))) + (wrap-program file + `("PYTHONPATH" ":" prefix (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) + #t))))) + (native-search-paths + (list (search-path-specification + (variable "KICAD_TEMPLATE_DIR") + (files '("share/kicad/template"))) + (search-path-specification + (variable "KICAD_SYMBOL_DIR") ; symbol path + (files '("share/kicad/library"))) + (search-path-specification + (variable "KISYSMOD") ; footprint path + (files '("share/kicad/modules"))) + (search-path-specification + (variable "KISYS3DMOD") ; 3D model path + (files '("share/kicad/modules/packages3d"))))) + (native-inputs + `(("boost" ,boost) + ("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gnu-gettext) + ("kicad-i18l" ,kicad-i18l) + ("pkg-config" ,pkg-config) + ("swig" ,swig) + ("zlib" ,zlib))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("glew" ,glew) + ("glm" ,glm) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libngspice" ,libngspice) + ("libsm" ,libsm) + ("mesa" ,mesa) + ("opencascade-oce" ,opencascade-oce) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("wxwidgets" ,wxwidgets) + ("wxpython" ,python-wxpython))) + (home-page "https://kicad-pcb.org/") + (synopsis "Electronics Design Automation Suite") + (description "Kicad is a program for the formation of printed circuit boards and electrical circuits. The software has a number of programs that perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") - (license license:gpl3+))) + (license license:gpl3+))) + +(define kicad-i18l + (package + (name "kicad-i18l") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/kicad/code/kicad-i18n.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'check)))) + (native-inputs + `(("gettext" ,gnu-gettext))) + (home-page "https://kicad-pcb.org/") + (synopsis "KiCad GUI translations") + (description "This package contains the po files that are used for the GUI +translations for KiCad.") + (license license:gpl3+))) (define-public kicad-symbols (package -- cgit v1.2.3 From 0c0156089cac0b8d4d3c761ba27d3e7e8d6d3bca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 26 Feb 2020 09:13:03 -0500 Subject: gnu: git-repo: Update to 2.4.1. * gnu/packages/android.scm (git-repo): Update to 2.4.1. --- gnu/packages/android.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index ba883f1ff9..e4f3bff17c 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -717,7 +717,7 @@ (define-public android-udev-rules (define-public git-repo (package (name "git-repo") - (version "2.3") + (version "2.4.1") (source (origin (method git-fetch) @@ -726,7 +726,7 @@ (define-public git-repo (commit (string-append "v" version)))) (file-name (string-append "git-repo-" version "-checkout")) (sha256 - (base32 "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4")))) + (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e64c5a8fe4e99eb4af24ca37574b5d4ab5a389d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 26 Feb 2020 11:20:54 -0500 Subject: gnu: git-repo: Really disable self update. * gnu/packages/android.scm (git-repo)[phases]{do-not-self-update}: Rename phase from 'do-not-clone-this-source. Rework the patching done to prevent repo from self updating. {set-executable-paths}: Do not patch the reference to GnuPG, as it is only necessary for the self update mechanism, which is disabled. [inputs]: Remove gnupg. --- gnu/packages/android.scm | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index e4f3bff17c..17f5f41fcb 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -735,47 +735,48 @@ (define-public git-repo (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (git (assoc-ref inputs "git")) - (gpg (assoc-ref inputs "gnupg")) (ssh (assoc-ref inputs "ssh"))) (substitute* '("repo" "git_command.py") (("^GIT = 'git'") (string-append "GIT = '" git "/bin/git'"))) - (substitute* "repo" - ((" cmd = \\['gpg',") - (string-append " cmd = ['" gpg "/bin/gpg',"))) (substitute* "git_config.py" ((" command_base = \\['ssh',") (string-append " command_base = ['" ssh "/bin/ssh',"))) #t))) - (add-before 'build 'do-not-clone-this-source + (add-before 'build 'do-not-self-update (lambda* (#:key outputs #:allow-other-keys) + ;; Setting the REPO_MAIN variable to an absolute file name is + ;; enough to have _FindRepo return the store main.py file. The + ;; self update mechanism is activated with the call to _Init() in + ;; main(), so we bypass it. + + ;; Ticket requesting upstream to provide a mean to disable the + ;; self update mechanism: + ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407. (let* ((out (assoc-ref outputs "out")) - (repo-dir (string-append out "/share/" ,name))) + (repo-main (string-append out "/share/git-repo/main.py"))) (substitute* "repo" - (("^def _FindRepo\\(\\):.*") - (format #f " -def _FindRepo(): - '''Look for a repo installation, starting at the current directory.''' - # Use the installed version of git-repo. - repo_main = '~a/main.py' - curdir = os.getcwd() - olddir = None - while curdir != '/' and curdir != olddir: - dot_repo = os.path.join(curdir, repodir) - if os.path.isdir(dot_repo): - return (repo_main, dot_repo) - else: - olddir = curdir - curdir = os.path.dirname(curdir) - return None, '' - - # The remaining of this function is dead code. It was used to - # find a git-checked-out version in the local project.\n" repo-dir)) - ;; Neither clone, check out, nor verify the git repository - (("(^\\s+)_Clone\\(.*\\)") "") - (("(^\\s+)_Checkout\\(.*\\)") "") - ((" rev = _Verify\\(.*\\)") " rev = None")) - #t))) + (("^REPO_MAIN = .*") + (format #f "REPO_MAIN = ~s~%" repo-main)) + ((" _Init\\(args, gitc_init=\\(cmd ==.*" all) + (string-append "True #" all))) + ;; Prevent repo from trying to git describe its version from + ;; the (disabled) self updated copy. + (substitute* "git_command.py" + (("ver = getattr\\(RepoSourceVersion.*") + (format #f "ver = ~s~%" ,version))) + (substitute* "subcmds/version.py" + (("rp_ver = .*") + (format #f "rp_ver = ~s~%" ,version))) + ;; Prevent repo from adding its (disabled) self update copy to + ;; the list of projects to fetch when using 'repo sync'. + (substitute* "subcmds/sync.py" + (("to_fetch\\.extend\\(all_projects\\).*" all) + (string-append "#" all)) + (("self\\._Fetch\\(to_fetch") + "self._Fetch(all_projects") + (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all) + (string-append "#" all)))))) (delete 'build) ; nothing to build (add-before 'check 'configure-git (lambda _ @@ -800,7 +801,6 @@ (define-public git-repo (inputs ;; TODO: Add git-remote-persistent-https once it is available in guix `(("git" ,git) - ("gnupg" ,gnupg) ("ssh" ,openssh))) (native-inputs `(("pytest" ,python-pytest))) -- cgit v1.2.3 From faa0fa3978bad240f245c79aa487e0594ae9fc9a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 09:27:14 -0500 Subject: gnu: earlyoom: Update to latest commit to resolve a test failure. * gnu/packages/linux.scm (earlyoom): Update to commit 7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea. --- gnu/packages/linux.scm | 85 ++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b656629df..50fa7b31d0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2737,49 +2737,54 @@ (define-public kmod from the module-init-tools project.") (license license:gpl2+))) ; library under lgpl2.1+ +;;; Use a recent commit, because the latest 1.3 tag suffers from test failures +;;; (see: +;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405). (define-public earlyoom - (package - (name "earlyoom") - (version "1.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rfjakob/earlyoom.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr")))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t)) - (add-after 'build 'install-contribs - ;; Install what seems useful from the contrib directory. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (contrib (string-append - out "/share/earlyoom/contrib"))) - (install-file "contrib/notify_all_users.py" contrib) - #t)))) - #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" - (string-append "VERSION=v" ,version) - (string-append "PREFIX=" prefix) - (string-append "SYSCONFDIR=" prefix "/etc"))) - #:test-target "test")) - (native-inputs `(("go" ,go) ;for the test suite - ("pandoc" ,ghc-pandoc))) ;to generate the manpage - (home-page "https://github.com/rfjakob/earlyoom") - (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") - (description "Early OOM is a minimalist out of memory (OOM) daemon that + (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea") + (revision "1")) + (package + (name "earlyoom") + (version (git-version "1.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rfjakob/earlyoom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-after 'build 'install-contribs + ;; Install what seems useful from the contrib directory. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (contrib (string-append + out "/share/earlyoom/contrib"))) + (install-file "contrib/notify_all_users.py" contrib) + #t)))) + #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) + (list "CC=gcc" + (string-append "VERSION=v" ,version) + (string-append "PREFIX=" prefix) + (string-append "SYSCONFDIR=" prefix "/etc"))) + #:test-target "test")) + (native-inputs `(("go" ,go) ;for the test suite + ("pandoc" ,ghc-pandoc))) ;to generate the manpage + (home-page "https://github.com/rfjakob/earlyoom") + (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") + (description "Early OOM is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.") - (license license:expat))) + (license license:expat)))) (define-public eudev ;; The post-systemd fork, maintained by Gentoo. -- cgit v1.2.3 From d24b3b02133e5e3ccc4236656c60377a369bd7b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 14:19:03 +0100 Subject: gnu: rseqc: Update to 3.0.1. * gnu/packages/bioinformatics.scm (rseqc): Update to 3.0.1. [source]: Remove snippet. [arguments]: Remove to build with Python 3. [inputs]: Replace python2-cython, python2-pysam, and python2-numpy with python-cython, python-pysam, and python-numpy, respectively; add python-bx-python and python-pybigwig. [native-inputs]: Replace python2-nose with python-nose. --- gnu/packages/bioinformatics.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8ed13b22e5..51ffa00860 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5306,7 +5306,7 @@ (define-public rsem (define-public rseqc (package (name "rseqc") - (version "2.6.1") + (version "3.0.1") (source (origin (method url-fetch) @@ -5314,28 +5314,18 @@ (define-public rseqc (string-append "mirror://sourceforge/rseqc/" "RSeQC-" version ".tar.gz")) (sha256 - (base32 "15ly0254yi032qzkdplg00q144qfdsd986gh62829rl5bkxhj330")) - (modules '((guix build utils))) - (snippet - '(begin - ;; remove bundled copy of pysam - (delete-file-recursively "lib/pysam") - (substitute* "setup.py" - ;; remove dependency on outdated "distribute" module - (("^from distribute_setup import use_setuptools") "") - (("^use_setuptools\\(\\)") "") - ;; do not use bundled copy of pysam - (("^have_pysam = False") "have_pysam = True")) - #t)))) + (base32 + "0gbb9iyb7swiv5455fm5rg98r7l6qn27v564yllqjd574hncpx6m")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) (inputs - `(("python-cython" ,python2-cython) - ("python-pysam" ,python2-pysam) - ("python-numpy" ,python2-numpy) + `(("python-cython" ,python-cython) + ("python-bx-python" ,python-bx-python) + ("python-pybigwig" ,python-pybigwig) + ("python-pysam" ,python-pysam) + ("python-numpy" ,python-numpy) ("zlib" ,zlib))) (native-inputs - `(("python-nose" ,python2-nose))) + `(("python-nose" ,python-nose))) (home-page "http://rseqc.sourceforge.net/") (synopsis "RNA-seq quality control package") (description -- cgit v1.2.3 From 6c32e9b4dc7e7cbf6580e7b97d1c526cb15c6099 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 17:37:32 +0100 Subject: gnu: bedtools: Update to 2.29.2. * gnu/packages/bioinformatics.scm (bedtools): Update to 2.29.2. [native-inputs]: Replace python-2 with python-wrapper. [license]: Change to Expat. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 51ffa00860..2b13ad4839 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -410,7 +410,7 @@ (define-public bedops (define-public bedtools (package (name "bedtools") - (version "2.27.1") + (version "2.29.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/releases/" @@ -418,7 +418,7 @@ (define-public bedtools "bedtools-" version ".tar.gz")) (sha256 (base32 - "1ndg5yknrxl4djx8ddzgk12rrbiidfpmkkg5z3f95jzryfxarhn8")))) + "0m3hk6548846w83a9s5drsczvy67n2azx41kj71n03klb2gbzwg3")))) (build-system gnu-build-system) (arguments '(#:test-target "test" @@ -427,7 +427,8 @@ (define-public bedtools #:phases (modify-phases %standard-phases (delete 'configure)))) - (native-inputs `(("python" ,python-2))) + (native-inputs + `(("python" ,python-wrapper))) (inputs `(("samtools" ,samtools) ("zlib" ,zlib))) @@ -440,7 +441,7 @@ (define-public bedtools allows one to intersect, merge, count, complement, and shuffle genomic intervals from multiple files in widely-used genomic file formats such as BAM, BED, GFF/GTF, VCF.") - (license license:gpl2))) + (license license:expat))) ;; Later releases of bedtools produce files with more columns than ;; what Ribotaper expects. -- cgit v1.2.3 From 0b61e1a0966943a343b49dabebdd344ec43641bc Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 26 Feb 2020 21:38:06 -0500 Subject: gnu: git-annex: Update to 8.20200226. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200226. Signed-off-by: Jakub Kądziołka --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 70348ee3cb..662f084fad 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -269,14 +269,14 @@ (define-public darcs (define-public git-annex (package (name "git-annex") - (version "7.20200219") + (version "8.20200226") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0pzwjh98jpirgssbd7pqfk7mzraibrk277dn34s2mrah8zy75b58")))) + (base32 "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From e6cc426fbb1687f8a88256154f11dd213dd725cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 17:42:14 +0100 Subject: gnu: vcftools: Update to 0.1.16. * gnu/packages/bioinformatics.scm (vcftools): Update to 0.1.16. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b13ad4839..4cce508c09 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6572,7 +6572,7 @@ (define-public taxtastic (define-public vcftools (package (name "vcftools") - (version "0.1.15") + (version "0.1.16") (source (origin (method url-fetch) (uri (string-append @@ -6580,7 +6580,7 @@ (define-public vcftools version "/vcftools-" version ".tar.gz")) (sha256 (base32 - "1qw30c45wihgy632rbz4rh3njnwj4msj46l1rsgdhyg6bgypmr1i")))) + "1qqlx7flfv7axrjwkaz6njkscsl1d0jw98ns8d8bh1n1hd1pgz6v")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From 643d90bf7475d2939b1fbd437965a5b978c8d3ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 18:18:06 +0100 Subject: gnu: infernal: Update to 1.1.3. * gnu/packages/bioinformatics.scm (infernal): Update to 1.1.3. [native-inputs]: Add python. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4cce508c09..3df146c40d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6608,17 +6608,18 @@ (define-public vcftools (define-public infernal (package (name "infernal") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "http://eddylab.org/software/infernal/" "infernal-" version ".tar.gz")) (sha256 (base32 - "0sr2hiz3qxfwqpz3whxr6n82p3x27336v3f34iqznp10hks2935c")))) + "0pm8bm3s6nfa0av4x6m6h27lsg12b3lz3jm0fyh1mc77l2isd61v")))) (build-system gnu-build-system) (native-inputs - `(("perl" ,perl))) ; for tests + `(("perl" ,perl) + ("python" ,python))) ; for tests (home-page "http://eddylab.org/infernal/") (synopsis "Inference of RNA alignments") (description "Infernal (\"INFERence of RNA ALignment\") is a tool for @@ -6629,7 +6630,7 @@ (define-public infernal structure consensus, so in many cases, it is more capable of identifying RNA homologs that conserve their secondary structure more than their primary sequence.") - ;; Infernal 1.1.2 requires VMX or SSE capability for parallel instructions. + ;; Infernal 1.1.3 requires VMX or SSE capability for parallel instructions. (supported-systems '("i686-linux" "x86_64-linux")) (license license:bsd-3))) -- cgit v1.2.3 From af5271b275cda8a92d698e846aa1e21e722974a0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:38:02 +0300 Subject: gnu: Add rust-user32-sys-0.2. * gnu/packages/crates-io.scm (rust-user32-sys-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b5c36525c..413599d064 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18394,6 +18394,39 @@ (define-public rust-url-1.7 ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-user32-sys-0.2 + (package + (name "rust-user32-sys") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "user32-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Function definitions for the Windows API library user32") + (description + "Contains function definitions for the Windows API library user32. +See winapi for types and constants.") + (license license:expat))) + (define-public rust-users-0.9 (package (name "rust-users") -- cgit v1.2.3 From 1f38bd3394fc05802ba19f83ead034951ada347f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:38:54 +0300 Subject: gnu: Add rust-urlocator-0.1. * gnu/packages/crates-io.scm (rust-urlocator-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 413599d064..98ecb9055b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18394,6 +18394,25 @@ (define-public rust-url-1.7 ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-urlocator-0.1 + (package + (name "rust-urlocator") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "urlocator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xzhwmqrqyk8p3s5npqpidrn0gjapqx5fshrx633fk56j7cm8qm1")))) + (build-system cargo-build-system) + (home-page "https://github.com/chrisduerr/urlocator.git") + (synopsis "Locate URLs in character streams") + (description "Locate URLs in character streams.") + (license (list license:expat license:asl2.0)))) + (define-public rust-user32-sys-0.2 (package (name "rust-user32-sys") -- cgit v1.2.3 From ad9e129f1ed2923ddcd848dc59ea99240b05905a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:40:04 +0300 Subject: gnu: Add rust-openssl-sys-0.7. * gnu/packages/crates-io.scm (rust-openssl-sys-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98ecb9055b..9495d0b7d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10415,6 +10415,42 @@ (define-public rust-openssl-sys-0.9 "This package provides FFI bindings to OpenSSL for use in rust crates.") (license license:expat))) +(define-public rust-openssl-sys-0.7 + (package + (inherit rust-openssl-sys-0.9) + (name "rust-openssl-sys") + (version "0.7.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gswbbfkhhj8f9jifwvdssv3p2lpgyz69qzqvafylbim9klpxi49")) + (modules '((guix build utils))) + (snippet + '(begin + ;; rust-libressl-pnacl-sys vendors libressl. + (substitute* "Cargo.toml" + ((".*nacl.*") "")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gdi32-sys" ,rust-gdi32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-user32-sys" ,rust-user32-sys-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From 1240782c9940a6d935bda6b14627f1c185eeac42 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Feb 2020 18:40:32 +0200 Subject: gnu: rust-gdi31-sys-0.2: Fix inputs. * gnu/packages/crates-io.scm (rust-gdi32-sys-0.2)[arguments]: Move rust-winapi-build-0.1 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9495d0b7d9..1586e431b8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5782,9 +5782,8 @@ (define-public rust-gdi32-sys-0.2 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.2)) - #:cargo-development-inputs - (("rust-winapi-build" ,rust-winapi-build-0.1)))) + (("rust-winapi" ,rust-winapi-0.2) + ("rust-winapi-build" ,rust-winapi-build-0.1)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library gdi32") (description "This package contains function definitions for the Windows -- cgit v1.2.3 From 7c4e3488ff1fa1e374440ba728316a0534802179 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Feb 2020 18:41:08 +0200 Subject: Revert "gnu: Add rust-libressl-pnacl-sys-2." This crate includes a vendored copy of libressl. This reverts commit a86fc40dc384ae237b10a1d401f984c6f277aa88. --- gnu/packages/crates-io.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1586e431b8..ac3f1bba5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8160,30 +8160,6 @@ (define-public rust-libm-0.1 (base32 "16pc0gx4gkg0q2s1ssq8268brn14j8344623vwhadmivc4lsmivz")))))) -(define-public rust-libressl-pnacl-sys-2 - (package - (name "rust-libressl-pnacl-sys") - (version "2.1.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "libressl-pnacl-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0w9yvgrf591phpr1222j0dj7x1n489v2sihnr8syz8xn3aamih6b")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pnacl-build-helper" ,rust-pnacl-build-helper-1.4)))) - (home-page "https://github.com/DiamondLovesYou/libressl-pnacl-sys") - (synopsis "Openssl linking provider for PNaCl/NaCl targets") - (description - "This package provides an openssl linking provider for PNaCl/NaCl targets.") - (license license:expat))) - (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") -- cgit v1.2.3 From f1e4f87e77994b5021b676cf6c48e343744519f9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:40:51 +0300 Subject: gnu: Add rust-openssl-sys-extras-0.7. * gnu/packages/crates-io.scm (rust-openssl-sys-extras-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac3f1bba5e..6138a0e01c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10426,6 +10426,41 @@ (define-public rust-openssl-sys-0.7 (setenv "OPENSSL_DIR" openssl)) #t))))))) +(define-public rust-openssl-sys-extras-0.7 + (package + (name "rust-openssl-sys-extras") + (version "0.7.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl-sys-extras" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ymrmfnknyjji74fflbnnq9r5ihx25h0vgs5y203vl6klzdy3i8i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.7) + ("rust-gcc" ,rust-gcc-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))) ; openssl-1.0 specifically + (home-page "https://github.com/sfackler/rust-openssl") + (synopsis + "Extra FFI bindings to OpenSSL that require a C shim") + (description + "Extra FFI bindings to OpenSSL that require a C shim.") + (license license:expat))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From b090c2fd80f16cbbd9b1770673407ed17a62fb78 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:41:25 +0300 Subject: gnu: Add rust-openssl-0.7. * gnu/packages/crates-io.scm (rust-openssl-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6138a0e01c..c637fbc711 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10332,6 +10332,44 @@ (define-public rust-openssl-0.10 (description "OpenSSL bindings.") (license license:asl2.0))) +(define-public rust-openssl-0.7 + (package + (inherit rust-openssl-0.10) + (name "rust-openssl") + (version "0.7.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cw767rbasg4dbsfcsnxqm3q5ljkv6s1jq0a2p82xi5a8ii7n4f4")))) + (arguments + `(#:tests? #f ; Test directory not included in release + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-0.7) + ("rust-gcc" ,rust-gcc-0.3) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.7) + ("rust-openssl-sys-extras" ,rust-openssl-sys-extras-0.7)) + #:cargo-development-inputs + (("rust-net2" ,rust-net2-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-winapi" ,rust-winapi-0.2) + ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras + (define-public rust-openssl-probe-0.1 (package (name "rust-openssl-probe") -- cgit v1.2.3 From e3249fe2cec9f49bdbafe53f31953f4f1c7ced0f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:41:45 +0300 Subject: gnu: Add rust-sha1-0.2. * gnu/packages/crates-io.scm (rust-sha1-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c637fbc711..e648e217c4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15053,6 +15053,34 @@ (define-public rust-sha1-0.6 "Minimal implementation of SHA1 for Rust.") (license license:bsd-3))) +(define-public rust-sha1-0.2 + (package + (inherit rust-sha1-0.6) + (name "rust-sha1") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha1" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p09zfhd27z6yr5in07gfjcx345010rw51ivlcf14364x3hv2c6c")))) + (arguments + `(#:cargo-development-inputs + (("rust-openssl" ,rust-openssl-0.7) + ("rust-rand" ,rust-rand-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras + (define-public rust-sha1-asm-0.4 (package (name "rust-sha1-asm") -- cgit v1.2.3 From 355658ee60cd4a2f1ee1b2ff1fb671486b118236 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:42:33 +0300 Subject: gnu: Add rust-uuid-0.5. * gnu/packages/crates-io.scm (rust-uuid-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e648e217c4..e5a089fbf9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18700,6 +18700,28 @@ (define-public rust-uuid-0.7 "This package provides a library to generate and parse UUIDs.") (license (list license:asl2.0 license:expat)))) +(define-public rust-uuid-0.5 + (package + (inherit rust-uuid-0.7) + (name "rust-uuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "uuid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08nw3famk1w1zf9ck32pmklk24wd4n4nqnr9wl46qvxak2wf7ixw")))) + (arguments + `(#:cargo-inputs + (("rust-md5" ,rust-md5-0.3) + ("rust-rand" ,rust-rand-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-sha1" ,rust-sha1-0.2)))))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") -- cgit v1.2.3 From 4b6f844ec25477ccbfcdb774767bccfdc1531f9b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:43:08 +0300 Subject: gnu: Add rust-core-foundation-0.6. * gnu/packages/crates-io.scm (rust-core-foundation-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5a089fbf9..3ba5058c35 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2626,6 +2626,34 @@ (define-public rust-core-arch-0.1 intrinsics.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-foundation-0.6 + (package + (name "rust-core-foundation") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-foundation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0va97wf49c8dzm9c8pgyk1jn7z21rl0bj1syf2zz5m2z2hzy1f95")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-uuid" ,rust-uuid-0.5)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis + "Bindings to Core Foundation for macOS") + (description + "Bindings to Core Foundation for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-foundation-sys-0.6 (package (name "rust-core-foundation-sys") -- cgit v1.2.3 From 67aee1c04623082da914e42f05e8799eebc71d59 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:43:56 +0300 Subject: gnu: Add rust-core-graphics-0.17. * gnu/packages/crates-io.scm (rust-core-graphics-0.17): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ba5058c35..e09e6932c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2675,6 +2675,33 @@ (define-public rust-core-foundation-sys-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-core-graphics-0.17 + (package + (name "rust-core-graphics") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1acm3vygngnilzlr6klym5ywh7kfzh2xxrh2l41152hwmdl0jyan")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-graphics-rs") + (synopsis "Bindings to Core Graphics for macOS") + (description + "Bindings to Core Graphics for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From b5bda2cda4a6d0ac7e3c1349a8bdde82e0fc5923 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:44:33 +0300 Subject: gnu: Add rust-core-text-13. * gnu/packages/crates-io.scm (rust-core-text-13): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e09e6932c2..cc6048ec98 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2702,6 +2702,33 @@ (define-public rust-core-graphics-0.17 "Bindings to Core Graphics for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-text-13 + (package + (name "rust-core-text") + (version "13.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-text" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v9lxn277p39cf81pb45r7k0lzf17pwgd5cpry1c04ajv556b16v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to the Core Text framework") + (description + "Bindings to the Core Text framework.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From db8da4de980bd0a499d45694b83d66e7676eb2eb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:46:12 +0300 Subject: gnu: Add rust-cocoa-0.19. * gnu/packages/crates-io.scm (rust-cocoa-0.19): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc6048ec98..107578407b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2357,6 +2357,35 @@ (define-public rust-cmake-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-cocoa-0.19 + (package + (name "rust-cocoa") + (version "0.19.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0034vahbfv574q4b63rj241b8rnka5cjiqsqc6wiggnin9l7g7zj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to Cocoa for macOS") + (description "Bindings to Cocoa for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-color-quant-1.0 (package (name "rust-color-quant") -- cgit v1.2.3 From f78f0d7ffee6a51d997705038842b3f8341bfa4b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:46:28 +0300 Subject: gnu: Add rust-cocoa-0.18. * gnu/packages/crates-io.scm (rust-cocoa-0.18): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 107578407b..e51ed9331a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2386,6 +2386,21 @@ (define-public rust-cocoa-0.19 (description "Bindings to Cocoa for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-cocoa-0.18 + (package + (inherit rust-cocoa-0.19) + (name "rust-cocoa") + (version "0.18.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp")))))) + (define-public rust-color-quant-1.0 (package (name "rust-color-quant") -- cgit v1.2.3 From 4199ee10509356166b352842d6a527c291bd282e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:20:01 +0300 Subject: gnu: Add rust-glutin-egl-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-egl-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e51ed9331a..a4768973ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6333,6 +6333,29 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-glutin-egl-sys-0.1 + (package + (name "rust-glutin-egl-sys") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-egl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k1x1frdp4wp47qkai8zzmgqxzpfcn7780m29qgd92lbnbrxwbkp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3) + ("rust-gl-generator" ,rust-gl-generator-0.13)))) + (home-page "https://github.com/rust-windowing/glutin") + (synopsis "Egl bindings for glutin") + (description "The egl bindings for glutin.") + (license license:asl2.0))) + (define-public rust-glutin-emscripten-sys-0.1 (package (name "rust-glutin-emscripten-sys") -- cgit v1.2.3 From 0d35d892203e50603f3c2cdd2b39fb8496a10c66 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:21:15 +0300 Subject: gnu: Add rust-glutin-gles2-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-gles2-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4768973ab..719fce3e4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6375,6 +6375,29 @@ (define-public rust-glutin-emscripten-sys-0.1 (description "The emscripten bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-gles2-sys-0.1 + (package + (name "rust-glutin-gles2-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin_gles2_sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pswvl5zyqmqwzjr674yzslj0al2xbqsp2ai9ggb9qbshlq6r6c9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-objc" ,rust-objc-0.2) + ("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "The gles2 bindings for glutin") + (description "The gles2 bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From 4bf45749b83c1c01d934891fee847c466070d019 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:21:53 +0300 Subject: gnu: Add rust-glutin-glx-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-glx-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 719fce3e4a..9fc4b57926 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6398,6 +6398,29 @@ (define-public rust-glutin-gles2-sys-0.1 (description "The gles2 bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-glx-sys-0.1 + (package + (name "rust-glutin-glx-sys") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-glx-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mxs3mil68xqqb49466n5rpwpcllj6fwqjgrcrzzmz26bv5ab40j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-x11-dl" ,rust-x11-dl-2) + ("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Glx bindings for glutin") + (description "The glx bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From 8d715e6e75cadfcfaf14c7f527974a9a491b7581 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:23:32 +0300 Subject: gnu: Add rust-glutin-wgl-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-wgl-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fc4b57926..ad6f39566e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6421,6 +6421,28 @@ (define-public rust-glutin-glx-sys-0.1 (description "The glx bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-wgl-sys-0.1 + (package + (name "rust-glutin-wgl-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-wgl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08chlfzpj59q36qm212i4k879gvjzha7i90q90fds8pw3v4vn0gq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Wgl bindings for glutin") + (description "The wgl bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From c4f37fc1e0671589cb610e6296a524eeb8dd0dcf Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:53:45 +0300 Subject: gnu: Add rust-weedle-0.10. * gnu/packages/crates-io.scm (rust-weedle-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad6f39566e..4d10562c2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19470,6 +19470,28 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-weedle-0.10 + (package + (name "rust-weedle") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "weedle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0r0i2kllvkn9jil6cjzxdi1zsc6p1gjyk751w8lyclaii1q3zd1v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-nom" ,rust-nom-4.2)))) + (home-page "https://github.com/rustwasm/weedle") + (synopsis "WebIDL Parser") + (description + "This package provides a WebIDL Parser.") + (license license:expat))) + (define-public rust-which-2.0 (package (name "rust-which") -- cgit v1.2.3 From 11b8038d6f00289685823c51fe63bcaa190dacd7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:07:36 +0300 Subject: gnu: Add rust-wasm-bindgen-webidl-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-webidl-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d10562c2f..ca68074998 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19470,6 +19470,37 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-webidl-0.2 + (package + (name "rust-wasm-bindgen-webidl") + (version "0.2.58") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-webidl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pcpaw8w3xgfrg9y24ljrsl2bkidgdaaz3ka2bgk417wjc6jl0gg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1.0) + ("rust-heck" ,rust-heck-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0) + ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2) + ("rust-weedle" ,rust-weedle-0.10)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Support for parsing WebIDL specific to wasm-bindgen") + (description + "Support for parsing WebIDL specific to wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-weedle-0.10 (package (name "rust-weedle") -- cgit v1.2.3 From 7c1396236064c12fa05e4768d66f6aba223e6d51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 09:09:10 +0200 Subject: gnu: rust-wasm-bindgen-test-macro-0.2: Update to 0.2.50. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.2): Update to 0.2.50. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ca68074998..0684b3c4f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19448,7 +19448,7 @@ (define-public rust-wasm-bindgen-test-0.2 (define-public rust-wasm-bindgen-test-macro-0.2 (package (name "rust-wasm-bindgen-test-macro") - (version "0.2.48") + (version "0.2.50") (source (origin (method url-fetch) @@ -19456,11 +19456,10 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) + "19bvmw8mqlwh6wkbzgs3cnlkywrv8q2kkqggz6y0p158930xm287")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6)))) (home-page "https://github.com/rustwasm/wasm-bindgen") -- cgit v1.2.3 From d125c4f428c20d75c72ef21455649ca76f1bfeba Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:36:44 +0300 Subject: gnu: Add rust-wasm-bindgen-test-macro-0.3. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.3): New variable. (rust-wasm-bindgen-test-macro-0.2): Inherit from rust-wasm-bindgen-test-macro-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0684b3c4f3..37b97b5ca8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19445,8 +19445,33 @@ (define-public rust-wasm-bindgen-test-0.2 "Internal testing crate for wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-test-macro-0.3 + (package + (name "rust-wasm-bindgen-test-macro") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-macro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kybf3shpp8ysz4v4j259d7vad9kw5bs4i4dlfrs895bhdp7m0wp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal testing macro for wasm-bindgen") + (description + "This library contains the internal testing macro for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-macro-0.2 (package + (inherit rust-wasm-bindgen-test-macro-0.3) (name "rust-wasm-bindgen-test-macro") (version "0.2.50") (source @@ -19457,17 +19482,10 @@ (define-public rust-wasm-bindgen-test-macro-0.2 (sha256 (base32 "19bvmw8mqlwh6wkbzgs3cnlkywrv8q2kkqggz6y0p158930xm287")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6)))) - (home-page "https://github.com/rustwasm/wasm-bindgen") - (synopsis "Internal testing macro for wasm-bindgen") - (description - "This library contains the internal testing macro for wasm-bindgen.") - (license (list license:asl2.0 - license:expat)))) + ("rust-quote" ,rust-quote-0.6)))))) (define-public rust-wasm-bindgen-webidl-0.2 (package -- cgit v1.2.3 From ede4cbc0ba4276004f83762ff030a22b25f1c72b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:42:30 +0300 Subject: gnu: Add rust-wasm-bindgen-futures-0.4 and its dependencies. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.4): New variable. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.3): New variable. * gnu/packages/crates-io.scm (rust-web-sys-0.3): New variable. Added in one commit because they have cyclic dependencies on each other. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37b97b5ca8..968b75a56d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19302,6 +19302,37 @@ (define-public rust-wasm-bindgen-backend-0.2 "Backend code generation of the wasm-bindgen tool.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-futures-0.4 + (package + (name "rust-wasm-bindgen-futures") + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-futures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n9ma4kinr4w6r2sh4wm04my6p14k1vx3a4vdbn0vd187sgd9gcb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis + "Bridging the gap between Rust Futures and JavaScript Promises") + (description + "Bridging the gap between Rust Futures and JavaScript Promises.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-futures-0.3 (package (name "rust-wasm-bindgen-futures") @@ -19415,6 +19446,36 @@ (define-public rust-wasm-bindgen-shared-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-test-0.3 + (package + (name "rust-wasm-bindgen-test") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bn833hghwbcg9cqz1bx9biq271bc4jcbgn2nqk1fkf4ab1hxzcq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.3)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis + "Internal testing crate for wasm-bindgen") + (description + "Internal testing crate for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-0.2 (package (name "rust-wasm-bindgen-test") @@ -19518,6 +19579,39 @@ (define-public rust-wasm-bindgen-webidl-0.2 "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-web-sys-0.3 + (package + (name "rust-web-sys") + (version "0.3.35") + (source + (origin + (method url-fetch) + (uri (crate-uri "web-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzmxcyahy3ghl8lkjkchj9krmnr56shvbqgr7db3hm8dappryda")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-anyhow" ,rust-anyhow-1.0) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-sourcefile" ,rust-sourcefile-0.1) + ("rust-wasm-bindgen-webidl" ,rust-wasm-bindgen-webidl-0.2)) + #:cargo-development-inputs + (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html") + (synopsis + "Bindings for all Web APIs, a procedurally generated crate from WebIDL") + (description + "Bindings for all Web APIs, a procedurally generated crate from WebIDL.") + (license (list license:expat license:asl2.0)))) + (define-public rust-weedle-0.10 (package (name "rust-weedle") -- cgit v1.2.3 From deeedc269b30ed6e75a92dca0914e4193c2a88f7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:47:12 +0300 Subject: gnu: rust-wasm-bindgen-test-0.2: Inherit from rust-wasm-bindgen-test-0.3. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.2): Inherit from rust-wasm-bindgen-test-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 968b75a56d..60fb5dc5c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19478,6 +19478,7 @@ (define-public rust-wasm-bindgen-test-0.3 (define-public rust-wasm-bindgen-test-0.2 (package + (inherit rust-wasm-bindgen-test-0.3) (name "rust-wasm-bindgen-test") (version "0.2.48") (source @@ -19489,7 +19490,6 @@ (define-public rust-wasm-bindgen-test-0.2 (sha256 (base32 "0gwslc2sfkghzzb3r0gvd8i5rig2nlqgpl1rn43y2w4mr1ci494k")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -19499,12 +19499,7 @@ (define-public rust-wasm-bindgen-test-0.2 ("rust-scoped-tls" ,rust-scoped-tls-1.0) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) - ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))) - (home-page "https://github.com/rustwasm/wasm-bindgen") - (synopsis "Internal testing crate for wasm-bindgen") - (description - "Internal testing crate for wasm-bindgen.") - (license (list license:expat license:asl2.0)))) + ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))))) (define-public rust-wasm-bindgen-test-macro-0.3 (package -- cgit v1.2.3 From 0f71a6a750c609a065ec1b26df24850edc04156b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:49:25 +0300 Subject: gnu: rust-wasm-bindgen-futures-0.3: Inherit from rust-wasm-bindgen-futures-0.4. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.3): Inherit rust-wasm-bindgen-futures-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 60fb5dc5c0..647e62e2cf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19335,6 +19335,7 @@ (define-public rust-wasm-bindgen-futures-0.4 (define-public rust-wasm-bindgen-futures-0.3 (package + (inherit rust-wasm-bindgen-futures-0.4) (name "rust-wasm-bindgen-futures") (version "0.3.24") (source @@ -19346,7 +19347,6 @@ (define-public rust-wasm-bindgen-futures-0.3 (sha256 (base32 "0bf9x6qfjczspc4zs605z1n4j15cdd8kk2z7rah0yggw8b6zl5nc")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -19358,13 +19358,7 @@ (define-public rust-wasm-bindgen-futures-0.3 ("rust-lazy-static" ,rust-lazy-static-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs - (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) - (home-page "https://rustwasm.github.io/wasm-bindgen/") - (synopsis - "Bridging the gap between Rust Futures and JavaScript Promises") - (description - "Bridging the gap between Rust Futures and JavaScript Promises.") - (license (list license:expat license:asl2.0)))) + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))))) (define-public rust-wasm-bindgen-macro-0.2 (package -- cgit v1.2.3 From c6ce1477ea752ef813ab363aa90d3708044d1ec5 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:50:52 +0300 Subject: gnu: Add rust-wasm-bindgen-test-crate-a-0.1. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-crate-a-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 647e62e2cf..a5d13cdaf1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19495,6 +19495,30 @@ (define-public rust-wasm-bindgen-test-0.2 ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))))) +(define-public rust-wasm-bindgen-test-crate-a-0.1 + (package + (name "rust-wasm-bindgen-test-crate-a") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-crate-a" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06l9rcxykg2vnp706a6axchjp6lh9ym1awwyyxzmbkv410kqwvsp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal test crate for wasm-bindgen") + (description + "Internal test crate for wasm-bindgen.") + (license license:expat))) + (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") -- cgit v1.2.3 From bed6f02e51916e6dd25c6c148f52b291627ab513 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:51:35 +0300 Subject: gnu: Add rust-wasm-bindgen-test-crate-b-0.1. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-crate-b-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5d13cdaf1..1dc52b42b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19519,6 +19519,30 @@ (define-public rust-wasm-bindgen-test-crate-a-0.1 "Internal test crate for wasm-bindgen.") (license license:expat))) +(define-public rust-wasm-bindgen-test-crate-b-0.1 + (package + (name "rust-wasm-bindgen-test-crate-b") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-crate-b" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16p3gx9vhngdf236zxx2qijqx5sq0lid25j8wy6j522ybxs4vbh8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal test crate for wasm-bindgen") + (description + "Internal test crate for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") -- cgit v1.2.3 From bf7ac9dc5574886b9e6f79d49356c2213a431338 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:52:36 +0300 Subject: gnu: rust-js-sys-0.3: Update to 0.3.35. * gnu/packages/crates-io.scm (rust-js-sys-0.3): Update to 0.3.35. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1dc52b42b1..caf20783f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7807,7 +7807,7 @@ (define-public rust-jpeg-decoder-0.1 (define-public rust-js-sys-0.3 (package (name "rust-js-sys") - (version "0.3.24") + (version "0.3.35") (source (origin (method url-fetch) @@ -7816,16 +7816,15 @@ (define-public rust-js-sys-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "045fgafggkjdfg4f33vb87silyl9xpbifrhx1ciqi4wvm90nzhga")))) + "1ybwazllkbif71i195dadgrsw64k6l04ggk5yimiy5c2cb1wg2bq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs - (("rust-futures" ,rust-futures-0.1) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) - ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Bindings for all JS global objects and functions in WASM") (description -- cgit v1.2.3 From b8dbebdd733b1281eb8b76e05479d5758dc05d4e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:11:45 +0300 Subject: gnu: rust-wasm-bindgen-0.2: Update to 0.2.58. * gnu/packages/crates-io.scm (rust-wasm-bindgen-0.2, (rust-wasm-bindgen-backend-0.2, rust-wasm-bindgen-macro-0.2 rust-wasm-bindgen-macro-support-0.2, rust-wasm-bindgen-shared-0.2): Update to 0.2.58. They all update at the same time. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 63 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index caf20783f8..6f9128e527 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19247,7 +19247,7 @@ (define-public rust-wasi-0.5 (define-public rust-wasm-bindgen-0.2 (package (name "rust-wasm-bindgen") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19256,15 +19256,23 @@ (define-public rust-wasm-bindgen-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0m8vq3jkhz04fn3wjvb7ii7xql60w32nlvr10jcskcbbh2hpzsad")))) + "0v31s91andxcj73w63g3fkbw3ld6cfsaa4135qcjna22vypyj1aj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1.0) - ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-wasm-bindgen-macro" - ,rust-wasm-bindgen-macro-0.2)))) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-wasm-bindgen-macro" ,rust-wasm-bindgen-macro-0.2)) + #:cargo-development-inputs + (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-wasm-bindgen-test-crate-a" + ,rust-wasm-bindgen-test-crate-a-0.1) + ("rust-wasm-bindgen-test-crate-b" + ,rust-wasm-bindgen-test-crate-b-0.1)))) (home-page "https://rustwasm.github.io/") (synopsis "Easy support for interacting between JS and Rust") (description @@ -19274,7 +19282,7 @@ (define-public rust-wasm-bindgen-0.2 (define-public rust-wasm-bindgen-backend-0.2 (package (name "rust-wasm-bindgen-backend") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19283,17 +19291,16 @@ (define-public rust-wasm-bindgen-backend-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qxqkbjkjg4pphhcr91nk95c0gizx77dyq24mmijqnwzxxqc30jx")))) + "0icskn0qlj30np6x6nbyl1i9dndckx0pczaq69dm42r92rcbkk8i")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bumpalo" ,rust-bumpalo-2.5) + `(#:cargo-inputs + (("rust-bumpalo" ,rust-bumpalo-3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15) + ("rust-syn" ,rust-syn-1.0) ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Backend code generation of the wasm-bindgen tool") @@ -19362,7 +19369,7 @@ (define-public rust-wasm-bindgen-futures-0.3 (define-public rust-wasm-bindgen-macro-0.2 (package (name "rust-wasm-bindgen-macro") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19371,17 +19378,18 @@ (define-public rust-wasm-bindgen-macro-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07fqzzlbncccmnxbbkg9v4n53qc1lps5g0bb9wq3i9zp9gvm0zgh")))) + "1hwxw0nhi2n4izhjn2fvnrrn59xqjxs3ybkgzdv1b4p65ivr8h2p")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; 'Async blocks are unstable' #:cargo-inputs (("rust-quote" ,rust-quote-1.0) ("rust-wasm-bindgen-macro-support" ,rust-wasm-bindgen-macro-support-0.2)) #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1.0) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Definition of the @code{#[wasm_bindgen]} attribute") (description @@ -19392,7 +19400,7 @@ (define-public rust-wasm-bindgen-macro-0.2 (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19401,14 +19409,13 @@ (define-public rust-wasm-bindgen-macro-support-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mxi6rj11k67sks88pfqiqylnijxmb1s0gcgpj8mzfj5gvkqzkwm")))) + "0s3n7v741i4wkzib41m126li40qlhqyirnxpigkypsi59wsk2l78")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15) + ("rust-syn" ,rust-syn-1.0) ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2) ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") @@ -19421,7 +19428,7 @@ (define-public rust-wasm-bindgen-macro-support-0.2 (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19429,9 +19436,9 @@ (define-public rust-wasm-bindgen-shared-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr")))) + "00cnbabf4k9bahb217vkilmjwqwzpwp112vlvgfw1x19r4gydrzm")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) + ;(arguments '(#:skip-build? #t)) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") (description "This package provides shared support between -- cgit v1.2.3 From d5eee77850c313d5bc235740f052cf1f08c166f6 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:22:11 +0300 Subject: gnu: Add rust-wayland-sys-0.23. * gnu/packages/crates-io.scm (rust-wayland-sys-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6f9128e527..220bcbfefd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19622,6 +19622,33 @@ (define-public rust-wasm-bindgen-webidl-0.2 "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-wayland-sys-0.23 + (package + (name "rust-wayland-sys") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "FFI bindings to the various libwayland-*.so libraries") + (description + "FFI bindings to the various libwayland-*.so libraries. +You should only need this crate if you are working on custom wayland +protocol extensions. Look at the crate wayland-client for usable bindings.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 36908ef9f0af65bf32949a427c27410980d70b49 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:23:33 +0300 Subject: gnu: Add rust-wayland-commons-0.23. * gnu/packages/crates-io.scm (rust-wayland-commons-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 220bcbfefd..a86e91cc86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19649,6 +19649,31 @@ (define-public rust-wayland-sys-0.23 protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-commons-0.23 + (package + (name "rust-wayland-commons") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nyvcs6xxxzqgh0wvc7z0fgi89bf3h9p4qrbf77bnfbwlb8v0rmv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-wayland-sys" ,rust-wayland-sys-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Common types and structures used by wayland-client and wayland-server") + (description + "Common types and structures used by wayland-client and wayland-server.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 7d28b64dd9a0591aa86ec0a4f1b0cdb1c57d4700 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:29:35 +0300 Subject: gnu: Add rust-wayland-scanner-0.23. * gnu/packages/crates-io.scm (rust-wayland-scanner-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a86e91cc86..41728bf87e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19674,6 +19674,35 @@ (define-public rust-wayland-commons-0.23 "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-scanner-0.23 + (package + (name "rust-wayland-scanner") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g8wcphykjrcpslznyi3qccx1pckw97rckq5b295nfbg6r3j5c4k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Wayland Scanner for generating rust APIs from XML wayland protocol files") + (description + "Wayland Scanner for generating rust APIs from XML wayland protocol files. +Intented for use with wayland-sys. You should only need this crate if +you are working on custom wayland protocol extensions. +Look at the crate wayland-client for usable bindings.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 63f130193510727ab7a3f6726f3c8e121dd33793 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:30:31 +0300 Subject: gnu: Add rust-wayland-client-0.23. * gnu/packages/crates-io.scm (rust-wayland-client-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 41728bf87e..6ce3ee10e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19649,6 +19649,42 @@ (define-public rust-wayland-sys-0.23 protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-client-0.23 + (package + (name "rust-wayland-client") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-sys" ,rust-wayland-sys-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Rust bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, client side.") + (license license:expat))) + (define-public rust-wayland-commons-0.23 (package (name "rust-wayland-commons") -- cgit v1.2.3 From 895bb1f7d24d41dde90de185abd9d37856dc7f43 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:33:51 +0300 Subject: gnu: Add rust-wayland-server-0.23. * gnu/packages/crates-io.scm (rust-wayland-server-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ce3ee10e3..8f105ba1a5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19739,6 +19739,39 @@ (define-public rust-wayland-scanner-0.23 Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-server-0.23 + (package + (name "rust-wayland-server") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ccsalq6gnf07klnbjx2dxcbibhw03rqsgi578p913s3zsjlcg8a")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-sys" ,rust-wayland-sys-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, server side.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 07a7f722e6d7e71cb0eac8a6f75d1e8e539195a0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:37:06 +0300 Subject: gnu: Add rust-wayland-protocols-0.23. * gnu/packages/crates-io.scm (rust-wayland-protocols-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f105ba1a5..25497bbb44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19710,6 +19710,34 @@ (define-public rust-wayland-commons-0.23 "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-protocols-0.23 + (package + (name "rust-wayland-protocols") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-server" ,rust-wayland-server-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Generated API for the officials wayland protocol extensions") + (description + "Generated API for the officials wayland protocol extensions.") + (license license:expat))) + (define-public rust-wayland-scanner-0.23 (package (name "rust-wayland-scanner") -- cgit v1.2.3 From abd2e421d07490271a45c27063df8c5eef3c77fb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:39:46 +0300 Subject: gnu: Add rust-smithay-client-toolkit-0.6. * gnu/packages/crates-io.scm (rust-smithay-client-toolkit-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25497bbb44..d413343159 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15641,6 +15641,40 @@ (define-public rust-smallvec-0.6 #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1)))))) +(define-public rust-smithay-client-toolkit-0.6 + (package + (name "rust-smithay-client-toolkit") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m20687zs36l6xak2s5k9s7qp78ly8xfjpbmrhacp7whfn4hx5lk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-andrew" ,rust-andrew-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.23)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-image" ,rust-image-0.21) + ("rust-wayland-client" ,rust-wayland-client-0.23)))) + (home-page "https://github.com/smithay/client-toolkit") + (synopsis "Toolkit for making client wayland applications") + (description + "Toolkit for making client wayland applications.") + (license license:expat))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From 3571af3e0f3be2e0eadc53914e2a00fb7077615d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 20:56:13 +0200 Subject: gnu: Add rust-console-log-0.1. * gnu/packages/crates-io.scm (rust-console-log-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d413343159..191a786671 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2590,6 +2590,31 @@ (define-public rust-console-error-panic-hook-0.1 that logs panics to @code{console.error}.") (license (list license:expat license:asl2.0)))) +(define-public rust-console-log-0.1 + (package + (name "rust-console-log") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "console-log" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0j1wd2885m3245bhsb2qjvw08lzplbi1rgg2v3yv0hbljk972y0y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/iamcodemaker/console_log") + (synopsis "Route Rust log messages to the browser's console") + (description + "This package provides a logging facility that routes Rust log messages to +the browser's console.") + (license (list license:expat license:asl2.0)))) + (define-public rust-constant-time-eq-0.1 (package (name "rust-constant-time-eq") -- cgit v1.2.3 From 97d8c6cd1512cad0574d9737bd6d666061cadf1e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:41:00 +0300 Subject: gnu: Add rust-winit-0.20. * gnu/packages/crates-io.scm (rust-winit-0.20): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 191a786671..18719511a6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20142,6 +20142,67 @@ (define-public rust-wincolor-1.0 (license (list license:unlicense license:expat)))) +(define-public rust-winit-0.20 + (package + (name "rust-winit") + (version "0.20.0-alpha6") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g5cchl97zcg525j6jdr77yby8cmhwv1qqwcd3sf4l4zl263195z")) + (patches + (list + (origin + (method url-fetch) + (uri "https://github.com/rust-windowing/winit/commit/d1c6506865c7bddbb5fb4d80a613e43ddc1370b5.patch") + (file-name (string-append name "-fix-bindings.patch")) + (sha256 + (base32 + "03q4bvdq86kii53d0vsywv08g8vqirf9h1lz2cl6rcc7gjfynpds"))))))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-cocoa" ,rust-cocoa-0.19) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-core-video-sys" ,rust-core-video-sys-0.1) + ("rust-dispatch" ,rust-dispatch-0.1) + ("rust-instant" ,rust-instant-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)) + #:cargo-development-inputs + (("rust-console-log" ,rust-console-log-0.1) + ("rust-env-logger" ,rust-env-logger-0.5) + ("rust-image" ,rust-image-0.21)))) + (home-page "https://github.com/rust-windowing/winit") + (synopsis + "Cross-platform window creation library") + (description + "Cross-platform window creation library.") + (license license:asl2.0))) + (define-public rust-winpty-sys-0.4 (package (name "rust-winpty-sys") -- cgit v1.2.3 From 41c4270724def1fd1f946e8b73c00d8f49edd1c0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:43:30 +0300 Subject: gnu: Add rust-glutin-0.22. * gnu/packages/crates-io.scm (rust-glutin-0.22): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18719511a6..ba13289cdb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6358,6 +6358,48 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-glutin-0.22 + (package + (name "rust-glutin") + (version "0.22.0-alpha5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lilr4f335m1fq1acmshd51zblfaglw1hha6lhalnc1fw3cg0aag")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-cgl" ,rust-cgl-0.3) + ("rust-cocoa" ,rust-cocoa-0.19) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1) + ("rust-glutin-emscripten-sys" ,rust-glutin-emscripten-sys-0.1) + ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1) + ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1) + ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libloading" ,rust-libloading-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.20)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis + "Cross-platform OpenGL context provider") + (description + "Cross-platform OpenGL context provider.") + (license license:asl2.0))) + (define-public rust-glutin-egl-sys-0.1 (package (name "rust-glutin-egl-sys") -- cgit v1.2.3 From d78c798bd70219307d6a7554d9380709fce7be87 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:47:57 +0300 Subject: gnu: Add rust-wayland-sys-0.21. * gnu/packages/crates-io.scm (rust-wayland-sys-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba13289cdb..5bc939a098 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19750,6 +19750,21 @@ (define-public rust-wayland-sys-0.23 protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-sys-0.21 + (package + (inherit rust-wayland-sys-0.23) + (name "rust-wayland-sys") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) + (define-public rust-wayland-client-0.23 (package (name "rust-wayland-client") -- cgit v1.2.3 From 75e4ad671307a2ab6d725738d84d7dc8d8ba2c15 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:48:44 +0300 Subject: gnu: Add rust-wayland-scanner-0.21. * gnu/packages/crates-io.scm (rust-wayland-scanner-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5bc939a098..cdf02bbce4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19883,6 +19883,21 @@ (define-public rust-wayland-scanner-0.23 Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-scanner-0.21 + (package + (inherit rust-wayland-scanner-0.23) + (name "rust-wayland-scanner") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z")))))) + (define-public rust-wayland-server-0.23 (package (name "rust-wayland-server") -- cgit v1.2.3 From 7592c7c3e416f7c5199ec461840182067f4d9f83 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:49:16 +0300 Subject: gnu: Add rust-wayland-commons-0.21. * gnu/packages/crates-io.scm (rust-wayland-commons-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cdf02bbce4..643e634a25 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19826,6 +19826,25 @@ (define-public rust-wayland-commons-0.23 "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-commons-0.21 + (package + (inherit rust-wayland-commons-0.23) + (name "rust-wayland-commons") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1v1jpcsnn6cwwy5ii5pdl58i6b9slmi8mn4my4fpwrlbfsb8ih20")))) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-wayland-sys" ,rust-wayland-sys-0.21)))))) + (define-public rust-wayland-protocols-0.23 (package (name "rust-wayland-protocols") -- cgit v1.2.3 From 77f099aa5f2e8951a1ec45d77e4d83aa4b8a0aaa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:52:23 +0300 Subject: gnu: Add rust-wayland-client-0.21. * gnu/packages/crates-io.scm (rust-wayland-client-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 643e634a25..99c1e20355 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19801,6 +19801,35 @@ (define-public rust-wayland-client-0.23 the wayland protocol, client side.") (license license:expat))) +(define-public rust-wayland-client-0.21 + (package + (inherit rust-wayland-client-0.23) + (name "rust-wayland-client") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04r7dy074hhdalsi1day482wvmczr40hg7qvrnzkgxpakrgkx5j9")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-wayland-commons-0.23 (package (name "rust-wayland-commons") -- cgit v1.2.3 From 4bf64e891cfb4907332235c39346c95cf35bb555 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:52:56 +0300 Subject: gnu: Add rust-wayland-server-0.21. * gnu/packages/crates-io.scm (rust-wayland-server-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 99c1e20355..c756b5575d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19979,6 +19979,32 @@ (define-public rust-wayland-server-0.23 the wayland protocol, server side.") (license license:expat))) +(define-public rust-wayland-server-0.21 + (package + (inherit rust-wayland-server-0.23) + (name "rust-wayland-server") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ayn4wlrpg0fw04prri9awpkjvbzjil0d3l3a8zs9pdbnspvw6ah")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From bef445485089689ba1ad124429d2d479a2831ba2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:53:10 +0300 Subject: gnu: Add rust-wayland-protocols-0.21. * gnu/packages/crates-io.scm (rust-wayland-protocols-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c756b5575d..74f66d1e32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19902,6 +19902,29 @@ (define-public rust-wayland-protocols-0.23 "Generated API for the officials wayland protocol extensions.") (license license:expat))) +(define-public rust-wayland-protocols-0.21 + (package + (inherit rust-wayland-protocols-0.23) + (name "rust-wayland-protocols") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i91yh3nxk9llhly2ly3nvlfx0lbpvyq919cgmnyx3j25bmf5zaa")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-server" ,rust-wayland-server-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) + (define-public rust-wayland-scanner-0.23 (package (name "rust-wayland-scanner") -- cgit v1.2.3 From 78afc9a1bff4141e83ac545dfb85a307f937e330 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:57:48 +0300 Subject: gnu: Add rust-smithay-client-toolkit-0.4. * gnu/packages/crates-io.scm (rust-smithay-client-toolkit-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 74f66d1e32..def0900177 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15742,6 +15742,36 @@ (define-public rust-smithay-client-toolkit-0.6 "Toolkit for making client wayland applications.") (license license:expat))) +(define-public rust-smithay-client-toolkit-0.4 + (package + (inherit rust-smithay-client-toolkit-0.6) + (name "rust-smithay-client-toolkit") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yj8yzd0lhqpsgq0x4iikl9a02q2hnkky81brk938alv0ibqrjrc")))) + (arguments + `(#:cargo-inputs + (("rust-andrew" ,rust-andrew-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.21)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-image" ,rust-image-0.20) + ("rust-wayland-client" ,rust-wayland-client-0.21)))))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From b6bbd9f248882a04e881fde520df1048ecb59046 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:59:04 +0300 Subject: gnu: Add rust-winit-0.19. * gnu/packages/crates-io.scm (rust-winit-0.19): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index def0900177..08e8bd2cb7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20402,6 +20402,42 @@ (define-public rust-winit-0.20 "Cross-platform window creation library.") (license license:asl2.0))) +(define-public rust-winit-0.19 + (package + (inherit rust-winit-0.20) + (name "rust-winit") + (version "0.19.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a4lnfyvlc4jabhs30wlmkgdjv7qhbplmyp833kl7ykjni5yp5hy")))) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-image" ,rust-image-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)))))) + (define-public rust-winpty-sys-0.4 (package (name "rust-winpty-sys") -- cgit v1.2.3 From b4d0afdfbdf37f119e9d891368faf11417532477 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:03:35 +0300 Subject: gnu: Add rust-metal-0.14. * gnu/packages/crates-io.scm (rust-metal-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 08e8bd2cb7..3137b9f172 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9082,6 +9082,41 @@ (define-public rust-memoffset-0.2 "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g")))) (arguments `(#:skip-build? #t)))) +(define-public rust-metal-0.14 + (package + (name "rust-metal") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "metal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0my1xwlv562i80y3jbk0nygayi383j5skdwk48clb286b7922gyd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-objc-id" ,rust-objc-id-0.1)) + #:cargo-development-inputs + (("rust-sema" ,rust-sema-0.1) + ("rust-winit" ,rust-winit-0.19)))) ; 0.17? + (home-page "https://github.com/gfx-rs/metal-rs") + (synopsis "Rust bindings for Metal") + (description "Rust bindings for Metal.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mime-0.3 (package (name "rust-mime") -- cgit v1.2.3 From 61de013c2451b4fdb6314b6c8d4e25b8c8a462ac Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:04:34 +0300 Subject: gnu: Add rust-core-video-sys-0.1. * gnu/packages/crates-io.scm (rust-core-video-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3137b9f172..50e4f456ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2798,6 +2798,36 @@ (define-public rust-core-text-13 "Bindings to the Core Text framework.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-video-sys-0.1 + (package + (name "rust-core-video-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-video-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l59cg88482hkl95ssb30ac9x65hpbdsmxz9s5r6y222jlhnbh4d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-metal" ,rust-metal-0.14) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/luozijun/rust-core-video-sys") + (synopsis + "Bindings to CoreVideo.framework for macOS and iOS") + (description + "Bindings to CoreVideo.framework for macOS and iOS.") + (license license:expat))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From da9c2c1bc408184070eb124b6ac431696ae894cb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:06:39 +0300 Subject: gnu: Add rust-glutin-0.21. * gnu/packages/crates-io.scm (rust-glutin-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 50e4f456ba..efe8d7eea3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6430,6 +6430,41 @@ (define-public rust-glutin-0.22 "Cross-platform OpenGL context provider.") (license license:asl2.0))) +(define-public rust-glutin-0.21 + (package + (inherit rust-glutin-0.22) + (name "rust-glutin") + (version "0.21.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ggyyqn7dvz4yx5ygqfvnxwfb78wvdm5y6xqw5my1b4x61dv6wak")))) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-cgl" ,rust-cgl-0.2) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1) + ("rust-glutin-emscripten-sys" ,rust-glutin-emscripten-sys-0.1) + ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1) + ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1) + ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libloading" ,rust-libloading-0.5) + ("rust-objc" ,rust-objc-0.2) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.19)))))) + (define-public rust-glutin-egl-sys-0.1 (package (name "rust-glutin-egl-sys") -- cgit v1.2.3 From a9e090cba0f4d8536142ebe6e03548c5e204e4dc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:09:37 +0300 Subject: gnu: Add rust-glium-0.25. * gnu/packages/crates-io.scm (rust-glium-0.25): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index efe8d7eea3..6cc0a60c4e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6315,6 +6315,44 @@ (define-public rust-gleam-0.6 "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glium-0.25 + (package + (name "rust-glium") + (version "0.25.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glium" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mhjly07x10lxg802ppg16wbxddhh4fdnlg10i99qwpfamvqhzbd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-glutin" ,rust-glutin-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-takeable-option" ,rust-takeable-option-0.4)) + #:cargo-development-inputs + (("rust-cgmath" ,rust-cgmath-0.17) + ("rust-genmesh" ,rust-genmesh-0.6) + ("rust-gl-generator" ,rust-gl-generator-0.11) + ("rust-image" ,rust-image-0.21) + ("rust-obj" ,rust-obj-0.9) + ("rust-rand" ,rust-rand-0.6)))) + (home-page "https://github.com/glium/glium") + (synopsis + "OpenGL wrapper") + (description + "Glium is an intermediate layer between OpenGL and your application. You +still need to manually handle the graphics pipeline, but without having to use +OpenGL's old and error-prone API.") + (license license:asl2.0))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From eadeca1f6b01d6f2972e696a103869d1de809370 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:10:49 +0300 Subject: gnu: Add rust-rusttype-0.7. * gnu/packages/crates-io.scm (rust-rusttype-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6cc0a60c4e..4d008cb78b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14325,6 +14325,32 @@ (define-public rust-rusttype-0.8 font rendering.") (license (list license:expat license:asl2.0)))) +(define-public rust-rusttype-0.7 + (package + (inherit rust-rusttype-0.8) + (name "rust-rusttype") + (version "0.7.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusttype" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m9ms4p94cgif74y1rzkj04rx8i1la193c0jgvnip61rd904429i")))) + (arguments + `(#:tests? #f ; Artifacts for tests not included. + #:cargo-inputs + (("rust-rusttype" ,rust-rusttype-0.8)) + #:cargo-development-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-blake2" ,rust-blake2-0.8) + ("rust-glium" ,rust-glium-0.25) + ("rust-image" ,rust-image-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))))) + (define-public rust-rustversion-1.0 (package (name "rust-rustversion") -- cgit v1.2.3 From fbbd94bec9a8819c5dfcbe2c84e34d0b7e49182b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:12:14 +0300 Subject: gnu: Add rust-andrew-0.2. * gnu/packages/crates-io.scm (rust-andrew-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d008cb78b..488257f5b4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30,6 +30,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -216,6 +217,39 @@ (define-public rust-aho-corasick-0.5 ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-andrew-0.2 + (package + (name "rust-andrew") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "andrew" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pmklwcwy8g1jras46fz8xcny779zfqpg4riksrbdhkjk3w0jzwv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-line-drawing" ,rust-line-drawing-0.7) + ("rust-rusttype" ,rust-rusttype-0.7) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-xdg" ,rust-xdg-2.2) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:cargo-development-inputs + (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)))) + (inputs + `(("wayland" ,wayland))) + (home-page "https://github.com/trimental/andrew") + (synopsis "Provides convenient drawing of objects to buffers") + (description + "The @code{andrew} crate provides convenient drawing of objects such as +shapes, lines and text to buffers.") + (license license:expat))) + (define-public rust-android-glue-0.2 (package (name "rust-android-glue") -- cgit v1.2.3 From 337b4212e6172b00ea805c83a4067a8c6a2194fa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:42:39 +0300 Subject: gnu: Add rust-security-framework-0.3. * gnu/packages/crates-io.scm (rust-security-framework-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 488257f5b4..50f25fbeff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14770,6 +14770,37 @@ (define-public rust-seahash-3.0 proven statistical guarantees.") (license license:expat))) +(define-public rust-security-framework-0.3 + (package + (name "rust-security-framework") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files not included in release. + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.3)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.4) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://lib.rs/crates/security_framework") + (synopsis + "Security.framework bindings for macOS and iOS") + (description + "Security.framework bindings for macOS and iOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") -- cgit v1.2.3 From e4c27df85b5187236ac5c452020c1a5e495c69b3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:40:00 +0300 Subject: gnu: Add rust-simd-0.1. * gnu/packages/crates-io.scm (rust-simd-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 50f25fbeff..cc4fa442fb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15795,6 +15795,28 @@ (define-public rust-simd-0.2 ") (license (list license:expat license:asl2.0)))) +(define-public rust-simd-0.1 + (package + (inherit rust-simd-0.2) + (name "rust-simd") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08vhhz1w5m7amfp1d9lvfyyzl0jqjm82hrr7fb7afv3n5my89db3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-0.4) + ("rust-serde-macros" ,rust-serde-macros-0.4)) + #:cargo-development-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1)))))) + (define-public rust-siphasher-0.2 (package (name "rust-siphasher") -- cgit v1.2.3 From 46f89491634149488fd14034d7ef9df94ab4c9de Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:15:28 +0300 Subject: gnu: Add rust-instant-0.1. * gnu/packages/crates-io.scm (rust-instant-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc4fa442fb..e1bded118b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7751,6 +7751,36 @@ (define-public rust-insta-0.8 "This package provides a snapshot testing library for Rust.") (license license:asl2.0))) +(define-public rust-instant-0.1 + (package + (name "rust-instant") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "instant" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bwca9fr29a1pyimfl94q6m6k2l57ljw1hhhvjafzs1zkqlnqd3c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-stdweb" ,rust-stdweb-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://github.com/sebcrozet/instant") + (synopsis + "Partial replacement for std::time::Instant that works on WASM too") + (description + "This package provides a partial replacement for @code{std::time::Instant} +that works on WASM too.") + (license license:bsd-3))) + (define-public rust-intervaltree-0.2 (package (name "rust-intervaltree") -- cgit v1.2.3 From 293334468b693bc0d10c9a3de7b1b68721cfcb95 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:12:40 +0300 Subject: gnu: Add rust-smithay-clipboard-0.3. * gnu/packages/crates-io.scm (rust-smithay-clipboard-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1bded118b..883c64fd90 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16053,6 +16053,35 @@ (define-public rust-smithay-client-toolkit-0.4 ("rust-image" ,rust-image-0.20) ("rust-wayland-client" ,rust-wayland-client-0.21)))))) +(define-public rust-smithay-clipboard-0.3 + (package + (name "rust-smithay-clipboard") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-clipboard" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h7qhcx44cgwncgpn5llky0c56vgsg9mqrkybb2z37vsxxia4rwn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6)) + #:cargo-development-inputs + (("rust-andrew" ,rust-andrew-0.2)))) + (inputs + `(("wayland" ,wayland))) + (home-page "https://github.com/smithay/smithay-clipboard") + (synopsis + "Provides access to the wayland clipboard for client applications") + (description + "This package provides access to the wayland clipboard for client applications.") + (license license:expat))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From 7cb8191cce7b3b38fc75efa44c38417ab6853ea3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:43:52 +0300 Subject: gnu: Add rust-native-tls-0.2. * gnu/packages/crates-io.scm (rust-native-tls-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 883c64fd90..bcee89b2b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9684,6 +9684,52 @@ (define-public rust-named-pipe-0.4 IO of Windows's named pipes.") (license (list license:expat license:asl2.0)))) +(define-public rust-native-tls-0.2 + (package + (name "rust-native-tls") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "native-tls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ki7cj4wzyd2nach4qdjly69sp7rs0yz3n3z2ii4mm1gqajg2bab")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests require network access + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-openssl-probe" ,rust-openssl-probe-0.1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-schannel" ,rust-schannel-0.1) + ("rust-security-framework" ,rust-security-framework-0.3) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.3) + ("rust-tempfile" ,rust-tempfile-3.1)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))) + (native-inputs + `(("openssl" ,openssl) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/sfackler/rust-native-tls") + (synopsis + "Wrapper over a platform's native TLS implementation") + (description + "This package provides a wrapper over a platform's native TLS implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-natord-1.0 (package (name "rust-natord") -- cgit v1.2.3 From d082ffe2c312f511ab1f77ad68374b725c1b194a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:44:17 +0300 Subject: gnu: Add rust-http-req-0.5. * gnu/packages/crates-io.scm (rust-http-req-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bcee89b2b2..3352bfa4a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7320,6 +7320,33 @@ (define-public rust-http-0.1 requests and responses.") (license (list license:asl2.0 license:expat)))) +(define-public rust-http-req-0.5 + (package + (name "rust-http-req") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "http_req" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qaw43nwvvxbnqddxhb9fh9316dn64nmkzj08pq8n49qdy51xrys")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + ;; Haven't packaged rustls and webpki because of license + (("rust-native-tls" ,rust-native-tls-0.2) + ("rust-unicase" ,rust-unicase-2.4)))) + (home-page "https://github.com/jayjamesjay/http_req") + (synopsis + "HTTP client with built-in HTTPS support") + (description + "Simple and lightweight HTTP client with built-in HTTPS support.") + (license license:expat))) + (define-public rust-httparse-1.3 (package (name "rust-httparse") -- cgit v1.2.3 From 22e928003d417cb08f268d823007330ed2852a33 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 21:31:24 +0300 Subject: gnu: Add alacritty. * gnu/packages/terminals.scm (alacritty): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/terminals.scm | 182 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 885912be41..482e9e8d1b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Valentin Ignatev ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages terminals) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -47,7 +49,9 @@ (define-module (gnu packages terminals) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages crypto) #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) @@ -1141,3 +1145,181 @@ (define-public wterm an st fork using wld. st is a simple terminal emulator for X originally made by suckless.") (license license:x11))) + +(define-public alacritty + (package + (name "alacritty") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwilm/alacritty.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg")) + (modules '((guix build utils))) + (snippet + ;; Don't use a custom location for winit-0.20-alpha6. + '(begin (substitute* "Cargo.toml" + (("winit .*") "")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-log" ,rust-log-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-glutin" ,rust-glutin-0.22) ; adjust 'patch-glutin-libgl-path as needed + ("rust-notify" ,rust-notify-4) + ("rust-libc" ,rust-libc-0.2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-urlocator" ,rust-urlocator-0.1) + ("rust-xdg" ,rust-xdg-2.2) + ("rust-image" ,rust-image-0.22) + ("rust-dirs" ,rust-dirs-2.0) + ("rust-x11-dl" ,rust-x11-dl-2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-base64" ,rust-base64-0.11) + ("rust-bigflags" ,rust-bitflags-1) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-terminfo" ,rust-terminfo-0.6) + ("rust-url" ,rust-url-2.1) + ("rust-vte" ,rust-vte-0.3) + ("rust-nix" ,rust-nix-0.15) + ("rust-miow" ,rust-miow-0.3) + ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.1) + ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-clipboard-win" ,rust-clipboard-win-2.1) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-id" ,rust-objc-id-0.1) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-x11-clipboard" ,rust-x11-clipboard-0.4) + ("rust-smithay-clipboard" ,rust-smithay-clipboard-0.3) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-euclid" ,rust-euclid-0.20) + ("rust-foreign-types" ,rust-foreign-types-0.5) + ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.4) + ("rust-freetype-rs" ,rust-freetype-rs-0.23) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-core-text" ,rust-core-text-13) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-dwrote" ,rust-dwrote-0.9) + ("rust-winpty-sys" ,rust-winpty-sys-0.4)) + #:cargo-development-inputs + (("rust-rustc-tools-util" ,rust-rustc-tools-util-0.2) + ("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-andrew" ,rust-andrew-0.2) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) + ("rust-embed-resource" ,rust-embed-resource-1.3) + ("rust-http-req" ,rust-http-req-0.5) + ("rust-zip" ,rust-zip-0.5) + ("rust-tempfile" ,rust-tempfile-3.1) + ("rust-named-pipe" ,rust-named-pipe-0.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-glutin-libgl-path + (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys) + (let* ((glutin-name ,(package-name rust-glutin-0.22)) + (glutin-version ,(package-version rust-glutin-0.22)) + (src-api + (string-append + glutin-name "-" glutin-version ".tar.gz/src/api/")) + (mesa (assoc-ref inputs "mesa"))) + (substitute* (string-append vendor-dir "/" src-api "glx/mod.rs") + (("libGL.so") (string-append mesa "/lib/libGL.so"))) + (substitute* (string-append vendor-dir "/" src-api "egl/mod.rs") + (("libEGL.so") (string-append mesa "/lib/libEGL.so"))) + #t))) + (add-after 'configure 'remove-alacritty-vendor + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; We don't want Alacritty to be a dependency of itself + ;; If we don't delete it from guix-vendor then build will fail + ;; because Alacritty has a virtual workspace Cargo.toml. + (delete-file-recursively + (string-append vendor-dir "/alacritty-" ,version ".tar.xz")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (icons (string-append share "/icons/hicolor/scalable/apps")) + (tic (string-append (assoc-ref inputs "ncurses") "/bin/tic")) + (man (string-append share "/man/man1")) + (alacritty-bin "target/release/alacritty")) + + ;; Install binary + (install-file alacritty-bin (string-append out "/bin")) + + ;; Install man pages + (mkdir-p man) + (copy-file "extra/alacritty.man" + (string-append man "/alacritty.1")) + + ;; Install desktop file + (install-file "extra/linux/alacritty.desktop" + (string-append share "/applications")) + + ;; Install icon + (mkdir-p icons) + (copy-file "extra/logo/alacritty-term.svg" + (string-append icons "/Alacritty.svg")) + + ;; Install terminfo + (mkdir-p (string-append share "/terminfo")) + ;; We don't compile alacritty-common entry because + ;; it's being used only for inheritance. + (invoke tic "-x" "-e" "alacritty,alacritty-direct" + "-o" (string-append share "/terminfo/") + "extra/alacritty.info") + + ;; Install completions + (install-file + "extra/completions/alacritty.bash" + (string-append out "/etc/bash_completion.d")) + (install-file + "extra/completions/_alacritty" + (string-append share "/zsh/site-functions")) + (install-file + "extra/completions/alacritty.fish" + (string-append share "/fish/vendor_completions.d")) + #t)))))) + (inputs + `(("expat" ,expat) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxxf86vm" ,libxxf86vm) + ("wayland" ,wayland) + ("mesa" ,mesa))) + (native-inputs + `(("cmake" ,cmake) + ("ncurses" ,ncurses) + ("pkg-config" ,pkg-config) + ("python3" ,python))) + (home-page "https://github.com/alacritty/alacritty") + (synopsis "GPU-accelerated terminal emulator") + (description + "Alacritty is a GPU-accelerated terminal emulator with a strong focus on +simplicity and performance. With such a strong focus on performance, included +features are carefully considered and you can always expect Alacritty to be +blazingly fast. By making sane choices for defaults, Alacritty requires no +additional setup. However, it does allow configuration of many aspects of the +terminal. Note that you need support for OpenGL 3.2 or higher.") + (license license:asl2.0))) -- cgit v1.2.3 From ba8992d28b1616d05b7cb04ef032944c5d19cd5a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 21:29:32 +0200 Subject: gnu: emacs-edbi: Fix build. * gnu/packages/emacs-xyz.scm (emacs-edbi)[arguments]: Fix emacs install directory. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76b9746f69..ec43efe182 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich ;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber ;;; Copyright © 2016 Adriano Peluso -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016, 2017 Roel Janssen @@ -17407,8 +17407,7 @@ (define-public emacs-edbi (lambda* (#:key inputs outputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl")) (dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/guix.d/edbi-" - ,version))) + "/share/emacs/site-lisp"))) (substitute* (string-append dir "/edbi.el") (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) (chmod (string-append dir "/edbi-bridge.pl") #o555) -- cgit v1.2.3 From 579235562d6b6551f20a1a5c18e88d4ec0aee542 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 21:35:45 +0200 Subject: gnu: emacs-flycheck-grammalecte: Fix build. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[arguments]: Fix emacs install directory. --- gnu/packages/emacs-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec43efe182..db02fb0a72 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3435,9 +3435,7 @@ (define-public emacs-flycheck-grammalecte (out (assoc-ref outputs "out")) (version ,(version-major+minor (package-version python)))) (with-directory-excursion - (string-append out - "/share/emacs/site-lisp/guix.d/" - "flycheck-grammalecte-" ,version) + (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" "python" version "/site-packages/" "grammalecte") -- cgit v1.2.3 From 4714d0fc1a96eb6d421b64b0b585fe8043dcd07b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 Dec 2019 13:40:32 +0900 Subject: gnu: emacs: Byte compile the site-lisp directory. * gnu/packages/emacs.scm (emacs): Use the (gnu build emacs-utils) module. Byte compile the site-lisp directory as part of the 'install-site-start' phase. (emacs-minimal, emacs-xwidgets, emacs-no-x, emacs-no-x-toolkit): Reset modules to those of the gnu-build-system. --- gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b26c928e87..18c8549cb9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -129,6 +129,11 @@ (define-public emacs `(#:tests? #f ; no check target #:configure-flags (list "--with-modules" "--disable-build-details") + #:modules ((guix build emacs-utils) + (guix build glib-or-gtk-build-system) + (guix build utils)) + #:imported-modules ((guix build emacs-utils) + ,@%glib-or-gtk-build-system-modules) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd @@ -145,7 +150,8 @@ (define-public emacs ;; automatically found. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp-dir (string-append out "/share/emacs/site-lisp"))) + (lisp-dir (string-append out "/share/emacs/site-lisp")) + (emacs (string-append out "/bin/emacs"))) (copy-file (assoc-ref inputs "guix-emacs.el") (string-append lisp-dir "/guix-emacs.el")) (with-output-to-file (string-append lisp-dir "/site-start.el") @@ -158,6 +164,9 @@ (define-public emacs ;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; which leads to conflicts. (delete-file (string-append lisp-dir "/subdirs.el")) + ;; Byte compile the site-start files. + (parameterize ((%emacs emacs)) + (emacs-byte-compile-directory lisp-dir)) #t)))))) (inputs `(("gnutls" ,gnutls) @@ -326,6 +335,12 @@ (define-public emacs-minimal (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) ((#:phases phases) `(modify-phases ,phases (delete 'install-site-start))) @@ -345,6 +360,12 @@ (define-public emacs-xwidgets (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) ((#:configure-flags flags ''()) `(cons "--with-xwidgets" ,flags)))) (inputs @@ -358,6 +379,14 @@ (define-public emacs-no-x (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)))) (inputs (fold alist-delete (package-inputs emacs) '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" @@ -376,9 +405,15 @@ (define-public emacs-no-x-toolkit (inputs (append `(("inotify-tools" ,inotify-tools)) (alist-delete "gtk+" (package-inputs emacs)))) (arguments - `(,@(substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags cf) - `(cons "--with-x-toolkit=no" ,cf))))))) + (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:configure-flags cf) + `(cons "--with-x-toolkit=no" ,cf)))))) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") -- cgit v1.2.3 From 9659459f0640ebfd2f662c26e939f38b0a4abf2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 Dec 2019 15:12:32 +0900 Subject: emacs-build-system: Byte compile the autoload files. * guix/build/emacs-build-system.scm (enable-autoloads-compilation) (validate-compiled-autoloads): Add procedures. (%standard-phases): Register the new procedures. * gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-find-autoloads): Remove duplicates in the list of autoload files found. * guix/build/emacs-utils.scm (expr->string): Add procedure. (emacs-batch-eval, emacs-batch-edit-file): Use it. --- gnu/packages/aux-files/emacs/guix-emacs.el | 5 +++-- guix/build/emacs-build-system.scm | 22 ++++++++++++++++++++-- guix/build/emacs-utils.scm | 10 ++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 05fc9709b6..25a87ee52d 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -35,8 +35,9 @@ "Return a list of Emacs 'autoloads' files in DIRECTORY. The files in the list do not have extensions (.el, .elc)." ;; `directory-files' doesn't honor group in regexp. - (mapcar #'file-name-sans-extension - (directory-files directory 'full-name guix-emacs-autoloads-regexp))) + (delete-dups (mapcar #'file-name-sans-extension + (directory-files directory 'full-name + guix-emacs-autoloads-regexp)))) ;;;###autoload (defun guix-emacs-autoload-packages () diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 09de244993..219310cf08 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -225,6 +225,21 @@ (define* (make-autoloads #:key outputs inputs #:allow-other-keys) (parameterize ((%emacs emacs)) (emacs-generate-autoloads elpa-name site-lisp)))) +(define* (enable-autoloads-compilation #:key outputs #:allow-other-keys) + "Remove the NO-BYTE-COMPILATION local variable embedded in the generated +autoload files." + (let* ((out (assoc-ref outputs "out")) + (autoloads (find-files out "-autoloads.el$"))) + (substitute* autoloads + ((";; no-byte-compile.*") "")) + #t)) + +(define* (validate-compiled-autoloads #:key outputs #:allow-other-keys) + "Verify whether the byte compiled autoloads load fine." + (let* ((out (assoc-ref outputs "out")) + (autoloads (find-files out "-autoloads.elc$"))) + (emacs-batch-eval (format #f "(mapc #'load '~s)" autoloads)))) + (define (emacs-package? name) "Check if NAME correspond to the name of an Emacs package." (string-prefix? "emacs-" name)) @@ -253,10 +268,13 @@ (define %standard-phases (replace 'check check) (replace 'install install) (add-after 'install 'make-autoloads make-autoloads) - (add-after 'make-autoloads 'patch-el-files patch-el-files) + (add-after 'make-autoloads 'enable-autoloads-compilation + enable-autoloads-compilation) + (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-files) ;; The .el files are byte compiled directly in the store. (add-after 'patch-el-files 'build build) - (add-after 'build 'move-doc move-doc))) + (add-after 'build 'validate-compiled-autoloads validate-compiled-autoloads) + (add-after 'validate-compiled-autoloads 'move-doc move-doc))) (define* (emacs-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 885fd0a217..ab64e3714c 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -41,16 +41,22 @@ (define %emacs ;; The `emacs' command. (make-parameter "emacs")) +(define (expr->string expr) + "Converts EXPR, an expression, into a string." + (if (string? expr) + expr + (format #f "~s" expr))) + (define (emacs-batch-eval expr) "Run Emacs in batch mode, and execute the elisp code EXPR." (invoke (%emacs) "--quick" "--batch" - (format #f "--eval=~S" expr))) + (string-append "--eval=" (expr->string expr)))) (define (emacs-batch-edit-file file expr) "Load FILE in Emacs using batch mode, and execute the elisp code EXPR." (invoke (%emacs) "--quick" "--batch" (string-append "--visit=" file) - (format #f "--eval=~S" expr))) + (string-append "--eval=" (expr->string expr)))) (define (emacs-batch-disable-compilation file) (emacs-batch-edit-file file -- cgit v1.2.3 From c6a91adabfc223f09f4648b7c1f620acc73b8aa4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 14:20:58 -0500 Subject: gnu: emacs: Fix comment. * gnu/packages/emacs.scm (emacs): Fix comment. --- gnu/packages/emacs.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 18c8549cb9..fd9c7fa875 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -144,10 +144,8 @@ (define-public emacs "pwd")) #t)) (add-after 'install 'install-site-start - ;; Use 'guix-emacs' in "site-start.el". This way, Emacs packages - ;; provided by Guix and installed in - ;; ~/.guix-profile/share/emacs/site-lisp/guix.d/PACKAGE-VERSION are - ;; automatically found. + ;; Use 'guix-emacs' in "site-start.el", which is used autoload the + ;; Elisp packages found in EMACSLOADPATH. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lisp-dir (string-append out "/share/emacs/site-lisp")) -- cgit v1.2.3 From 67dc3cdf9b25f43052fbd3407685778262396f25 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 7 Dec 2019 02:47:25 +0900 Subject: gnu: emacs-cl-generic: Disable byte compilation of its autoload file. *gnu/packages/emacs-xyz.scm (emacs-cl-generic)[phases] {enable-autoloads-compilation}: Delete. --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index db02fb0a72..b99d371e97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12064,6 +12064,10 @@ (define-public emacs-cl-generic (base32 "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq")))) (build-system emacs-build-system) + ;; Byte compilation of the autoload file fails. + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'enable-autoloads-compilation)))) (home-page "https://elpa.gnu.org/packages/seq.html") (synopsis "Forward @code{cl-generic} compatibility for Emacs before version 25") -- cgit v1.2.3 From 70d86540edc9fd6c5a6e61b8f2e39ab22da73a6e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:00:58 -0500 Subject: gnu: emacs-sly-macrostep: Remove the enable-autoloads-compilation phase. * gnu/packages/emacs-xyz.scm (emacs-sly-macrostep)[phases] {enable-autoloads-compilation}: Remove. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b99d371e97..568fd0e315 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7565,7 +7565,8 @@ (define-public emacs-sly-macrostep #:phases ;; The package provides autoloads. (modify-phases %standard-phases - (delete 'make-autoloads)))) + (delete 'make-autoloads) + (delete 'enable-autoloads-compilation)))) (synopsis "Expand Common Lisp macros inside source files with SLY") (description "@command{sly-macrostep} is a SLY contrib for expanding CL macros right -- cgit v1.2.3 From cc09ad9115f0ac2cbd240f79b5e4d65ae5f91634 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:03:33 -0500 Subject: gnu: emacs-sly-quicklisp: Remove the enable-autoloads-compilation phase. * gnu/packages/emacs-xyz.scm (emacs-sly-quicklisp)[phases] {enable-autoloads-compilation}: Remove. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 568fd0e315..59d6cfe846 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7474,7 +7474,8 @@ (define-public emacs-sly-quicklisp #:phases ;; The package provides autoloads. (modify-phases %standard-phases - (delete 'make-autoloads)))) + (delete 'make-autoloads) + (delete 'enable-autoloads-compilation)))) (synopsis "Quicklisp support for SLY") (description "@command{sly-quicklisp} is an external contrib for SLY that provides a -- cgit v1.2.3 From 10a6b859695d88d799c3e448ddad954910156f6f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:07:06 -0500 Subject: gnu: emacs-sly-named-readtables: Disable byte compilation of its autoload file. *gnu/packages/emacs-xyz.scm (emacs-sly-named-readtables)[phases] {enable-autoloads-compilation}: Delete. --- gnu/packages/emacs-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59d6cfe846..a9b36dd882 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7532,7 +7532,10 @@ (define-public emacs-sly-named-readtables (propagated-inputs `(("emacs-sly" ,emacs-sly))) (arguments - '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include))) + '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) + #:phases (modify-phases %standard-phases + ;; Byte compilation of the autoload file fails. + (delete 'enable-autoloads-compilation)))) (synopsis "Named-readtables support for SLY") (description "@command{sly-named-readtables} is an external contrib for SLY that -- cgit v1.2.3 From 749b9582061f7d929be83a194040b63b41afec81 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Feb 2020 23:20:48 +0100 Subject: swh: Adjust 'origin' test. This is a followup to 3d2f29382de2d0ee852745cc002dfe2b5d22e1c2. * tests/swh.scm (%origin): Remove "id". ("lookup-origin"): Remove use of 'origin-id'. --- tests/swh.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/swh.scm b/tests/swh.scm index e36c54e5fb..aef68acbe7 100644 --- a/tests/swh.scm +++ b/tests/swh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,8 +25,7 @@ (define-module (test-swh) ;; Test the JSON mapping machinery used in (guix swh). (define %origin - "{ \"id\": 42, - \"visits_url\": \"/visits/42\", + "{ \"visits_url\": \"/visits/42\", \"type\": \"git\", \"url\": \"http://example.org/guix.git\" }") @@ -48,11 +47,10 @@ (define-syntax-rule (with-json-result str exp ...) (test-begin "swh") (test-equal "lookup-origin" - (list 42 "git" "http://example.org/guix.git") + (list "git" "http://example.org/guix.git") (with-json-result %origin (let ((origin (lookup-origin "http://example.org/guix.git"))) - (list (origin-id origin) - (origin-type origin) + (list (origin-type origin) (origin-url origin))))) (test-equal "lookup-origin, not found" -- cgit v1.2.3 From 6b0653e7ec8a9a842fb62e28fe83c9677f40d552 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Feb 2020 23:24:56 +0100 Subject: guix package: Don't error out when failing to create ~/.guix-profile. This is a followup to 7842ddcbc118cbc2799e22651732b7cdc06b93ee, which broke tests when 'HOME' is unset. * guix/scripts/package.scm (ensure-default-profile): Silently ignore 'symlink' exceptions. --- guix/scripts/package.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 1cb0d382bf..d2f4f1ccd3 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -81,12 +81,15 @@ (define (ensure-default-profile) "Ensure the default profile symlink and directory exist and are writable." (ensure-profile-directory) - ;; Create ~/.guix-profile if it doesn't exist yet. + ;; Try to create ~/.guix-profile if it doesn't exist yet. (when (and %user-profile-directory %current-profile (not (false-if-exception (lstat %user-profile-directory)))) - (symlink %current-profile %user-profile-directory))) + (catch 'system-error + (lambda () + (symlink %current-profile %user-profile-directory)) + (const #t)))) (define (delete-generations store profile generations) "Delete GENERATIONS from PROFILE. -- cgit v1.2.3 From 71c3c3df92375ca9b4bd28b2be90dda67288fa5c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Feb 2020 23:56:14 +0100 Subject: scripts: Adjust disk-space warning functionality. This is a followup to fb7eec3a84afd7464027d2492a8b551a61df2725. * guix/scripts.scm (warn-about-disk-space): Do not multiply ABSOLUTE-THRESHOLD-IN-BYTES by 2^30. Compare AVAILABLE to the max of RELATIVE-THRESHOLD-IN-BYTES and ABSOLUTE-THRESHOLD-IN-BYTES, not the min. Display AVAILABLE divided by 2^30. --- guix/scripts.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index 7ad1d5194c..e235c8d4c3 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Deck Pickard ;;; Copyright © 2015, 2016 Alex Kost ;;; @@ -228,17 +228,19 @@ (define* (warn-about-disk-space #:optional profile (thresholds (%disk-space-warning))) "Display a hint about 'guix gc' if less than THRESHOLD of /gnu/store is available. -THRESHOLD is a pair of (ABSOLUTE-THRESHOLD RELATIVE-THRESHOLD)." +THRESHOLDS is a pair (ABSOLUTE-THRESHOLD . RELATIVE-THRESHOLD)." + (define GiB (expt 2 30)) + (let* ((stats (statfs (%store-prefix))) (block-size (file-system-block-size stats)) (available (* block-size (file-system-blocks-available stats))) (total (* block-size (file-system-block-count stats))) (relative-threshold-in-bytes (* total (cadr thresholds))) - (absolute-threshold-in-bytes (* 1024 1024 1024 (car thresholds)))) - (when (< available (min relative-threshold-in-bytes + (absolute-threshold-in-bytes (car thresholds))) + (when (< available (max relative-threshold-in-bytes absolute-threshold-in-bytes)) (warning (G_ "only ~,1f GiB of free space available on ~a~%") - available (%store-prefix)) + (/ available 1. GiB) (%store-prefix)) (display-hint (format #f (G_ "Consider deleting old profile generations and collecting garbage, along these lines: -- cgit v1.2.3 From c2f9ea2b502a617bb69227d5f858eee9d4288a6a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 Feb 2020 00:03:34 +0100 Subject: Revert "ui: Only display link in capable terminals." This reverts commit d7545a6b538813e88195d084f75a3e87065c999e. The commit led to a test failure in 'tests/guix-package-net.sh'. It also led to disagreements discussed here: https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00353.html Reverting until these are addressed. --- guix/scripts/describe.scm | 15 ++++----------- guix/ui.scm | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index 5e00067ef8..f13f221da9 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -201,11 +201,7 @@ (define (display-profile-content profile number) (format #t (G_ " commit: ~a~%") (if (supports-hyperlinks?) (channel-commit-hyperlink channel commit) - commit)) - (when (not (supports-hyperlinks?)) - (format #t (G_ " URL: ~a~%") - (channel-commit-hyperlink channel commit - (lambda (url msg) url)))))) + commit)))) (_ #f))) ;; Show most recently installed packages last. @@ -237,12 +233,9 @@ (define %vcs-web-views (define* (channel-commit-hyperlink channel #:optional - (commit (channel-commit channel)) - (transformer hyperlink)) + (commit (channel-commit channel))) "Return a hyperlink for COMMIT in CHANNEL, using COMMIT as the hyperlink's -text. The hyperlink links to a web view of COMMIT, when available. -TRANSFORMER is a procedure of 2 arguments, a URI and text, and returns a -string for display." +text. The hyperlink links to a web view of COMMIT, when available." (let* ((url (channel-url channel)) (uri (string->uri url)) (host (and uri (uri-host uri)))) @@ -251,7 +244,7 @@ (define* (channel-commit-hyperlink channel (#f commit) ((_ template) - (transformer (template url commit) commit))) + (hyperlink (template url commit) commit))) commit))) diff --git a/guix/ui.scm b/guix/ui.scm index 22a6d6c8e3..fbe2b70485 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1638,7 +1638,7 @@ (define (display-generation profile number) (let* ((file (generation-file-name profile number)) (link (if (supports-hyperlinks?) (cut file-hyperlink file <>) - (cut format #f (G_ "~a~%file: ~a") <> file))) + identity)) (header (format #f (link (highlight (G_ "Generation ~a\t~a"))) number (date->string -- cgit v1.2.3 From a64cef121a9e3753f41c9541239c0ccfba57b3ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 00:47:15 +0100 Subject: gnu: nghttp2@1.40: Do not inherit the replacement field. * gnu/packages/web.scm (nghttp2-1.40): Use INHERIT instead of PACKAGE/INHERIT. --- 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 2be3dfefe4..1ada569834 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7027,8 +7027,8 @@ (define nghttp2-1.39.2 ;; 'Node' requires this newer version, to be removed on the next rebuild cycle. (define-public nghttp2-1.40 - (package/inherit - nghttp2 + (package + (inherit nghttp2) (version "1.40.0") (source (origin (method url-fetch) -- cgit v1.2.3 From 2e76ddd67ff2e10a151b5de3c67a480d94c01671 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 00:55:09 +0100 Subject: gnu: OpenSSL: Do not inherit grafts on replacement package. * gnu/packages/tls.scm (openssl-1.1.1d): Use INHERIT instead of PACKAGE/INHERIT. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 86910a63fd..8967bb127d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -403,8 +403,8 @@ (define-public openssl (home-page "https://www.openssl.org/"))) (define openssl-1.1.1d - (package/inherit - openssl + (package + (inherit openssl) (version "1.1.1d") (source (origin (method url-fetch) -- cgit v1.2.3 From a3b1f878dfeddfc8516fba8483e3191a3e4c887e Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 27 Feb 2020 14:49:11 +0100 Subject: build-system: copy-build-system: Keep symlinks symbolic. guix/build/copy-build-system.scm (install)[install-file]: Read symlinks as is done in install-simple through copy-recursively. Signed-off-by: Pierre Neidhardt --- guix/build/copy-build-system.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm index 6d9dc8f93b..a86f0cde29 100644 --- a/guix/build/copy-build-system.scm +++ b/guix/build/copy-build-system.scm @@ -91,7 +91,13 @@ (define (install-file file target) file)))) (format (current-output-port) "`~a' -> `~a'~%" file dest) (mkdir-p (dirname dest)) - (copy-file file dest))) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest)))))) (define* (make-file-predicate suffixes matches-regexp #:optional (default-value #t)) "Return a predicate that returns #t if its file argument matches the -- cgit v1.2.3 From 3282137d0e4a32cd1c6b049e6ce7c44ab65bfdff Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:17:56 +0100 Subject: gnu: delft-icon-theme: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (delft-icon-theme): Use the copy-build-system. Signed-off-by: Pierre Neidhardt --- gnu/packages/gnome-xyz.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index bedaacf092..b0bc35c4b1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -101,19 +101,17 @@ (define-public delft-icon-theme (base32 "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (copy-recursively (assoc-ref %build-inputs "source") "icons") - (substitute* "icons/Delft/index.theme" - (("gnome") "Adwaita")) - (delete-file "icons/README.md") - (delete-file "icons/LICENSE") - (delete-file "icons/logo.jpg") - (copy-recursively "icons" (string-append %output "/share/icons"))))) + `(#:install-plan + `(("." "share/icons" #:exclude ("README.md" "LICENSE" "logo.jpg"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-index.theme + (lambda _ + (substitute* "Delft/index.theme" + (("gnome") "Adwaita")) + #t))))) (home-page "https://www.gnome-look.org/p/1199881/") (synopsis "Continuation of Faenza icon theme with up to date app icons") (description "Delft is a fork of the popular icon theme Faenza with up to -- cgit v1.2.3 From 28c06217fb986219000cfb4c0c6ec602ad17b8d4 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 27 Feb 2020 15:47:39 +0100 Subject: gnu: delft-icon-theme: Update to 1.11. * gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.11. Signed-off-by: Pierre Neidhardt --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index b0bc35c4b1..b8cd32db08 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -90,7 +90,7 @@ (define-public matcha-theme (define-public delft-icon-theme (package (name "delft-icon-theme") - (version "1.10") + (version "1.11") (source (origin (method git-fetch) @@ -99,7 +99,7 @@ (define-public delft-icon-theme (commit (string-append "v" version)))) (sha256 (base32 - "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) + "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments -- cgit v1.2.3 From 5144f5425a4d81405e0db7c53c7c992ac9840af4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 10:06:21 +0100 Subject: gnu: guile-debbugs: Update to 0.0.3. * gnu/packages/guile-xyz.scm (guile-debbugs): Update to 0.0.3. [source]: Remove snippet. [propagated-inputs]: Add guile-email. --- gnu/packages/guile-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 37a5198e4e..b35ee7c07b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -970,20 +970,17 @@ (define-public guile-sparql (define-public guile-debbugs (package (name "guile-debbugs") - (version "0.0.2") + (version "0.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-" version ".tar.gz")) (sha256 (base32 - "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i")) - (modules '((guix build utils))) - (snippet - '(substitute* "Makefile.in" - (("^godir = (.*)/ccache" _ prefix) - (string-append "godir = " prefix "/site-ccache")))))) + "1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9")))) (build-system gnu-build-system) + (propagated-inputs + `(("guile-email" ,guile-email))) (native-inputs `(("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a954dc57f2b642b3873732128012b537cc22abb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 10:06:53 +0100 Subject: gnu: Remove guile-debbugs-next. * gnu/packages/guile-xyz.scm (guile-debbugs-next): Remove variable. * gnu/packages/mail.scm (mumi)[inputs]: Replace guile-debbugs-next with guile-debbugs. --- gnu/packages/guile-xyz.scm | 25 ------------------------- gnu/packages/mail.scm | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b35ee7c07b..08f909b132 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1020,31 +1020,6 @@ (define-public guile-email format.") (license license:agpl3+))) -(define-public guile-debbugs-next - (let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9") - (revision "2")) - (package (inherit guile-debbugs) - (name "guile-debbugs") - (version (git-version "0.0.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guile-debbugs.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) - (inputs - `(("guile" ,guile-2.2) - ("guile-email" ,guile-email)))))) - (define-public guile-newt (package (name "guile-newt") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a2e8503ccd..7052664aca 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3034,7 +3034,7 @@ (define-public mumi (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) #t)))))) (inputs - `(("guile-debbugs" ,guile-debbugs-next) + `(("guile-debbugs" ,guile-debbugs) ("guile-email" ,guile-email) ("guile-fibers" ,guile-fibers) ("guile-json" ,guile-json-1) -- cgit v1.2.3 From 6813cb3fb358829c03910345493587dc1eaee436 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 Feb 2020 11:22:45 +0100 Subject: gnu: guix: Update to c2f9ea2. * gnu/packages/package-management.scm (guix): Update to c2f9ea2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6c80806457..221cbd509f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "50299ade040e934fa5533768aacb081eb340af3f") - (revision 13)) + (commit "c2f9ea2b502a617bb69227d5f858eee9d4288a6a") + (revision 14)) (package (name "guix") @@ -127,7 +127,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0rbnyy0vqmsl7z350cdazm5xzx74cdia3nxp0msk8xalyb76hff4")) + "0hg6yrqlzqiv4gmk9liqar6m9qhhn66q75jsmh86awjwq4qmvyab")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9b17c4f7b8a7665e9c0ddce71dc5c35467c6eda1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 13:53:14 +0100 Subject: gnu: Add lighttpd. * gnu/packages/web.scm (lighttpd): New variable. --- gnu/packages/web.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1ada569834..c6e59cff44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013 Aljosha Papsch ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier @@ -114,12 +114,14 @@ (define-module (gnu packages web) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) + #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages base) #:use-module (gnu packages package-management) @@ -548,6 +550,67 @@ (define-public nginx-accept-language-module ;; binary: (package-license nginx))))))) +(define-public lighttpd + (package + (name "lighttpd") + (version "1.4.55") + (source (origin + (method url-fetch) + (uri (string-append "https://download.lighttpd.net/lighttpd/" + "releases-" (version-major+minor version) ".x/" + "lighttpd-" version ".tar.xz")) + (sha256 + (base32 + "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--with-krb5" + "--with-ldap" + "--with-libev" + "--with-libunwind" + "--with-openssl" + "--with-pam" + "--with-sasl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-/bin/sh-reference + (lambda _ + (substitute* "src/mod_ssi.c" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'fix-tests + (lambda _ + (setenv "SHELL" (which "sh")) + ;; gethostbyaddr fails + (substitute* "tests/LightyTest.pm" + (("\\{HOSTNAME\\} = \\$name;") + "{HOSTNAME} = \"127.0.0.1\";")) + #t))))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("libev" ,libev) + ("libunwind" ,libunwind) + ("linux-pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("pcre:bin" ,pcre "bin") + ("zlib" ,zlib))) + (native-inputs + `(("perl" ,perl) ; for tests + ("pkg-config" ,pkg-config) + ("which" ,which))) + (home-page "https://www.lighttpd.net/") + (synopsis "Lightweight HTTP and reverse proxy server") + (description + "Lighttpd is a secure, fast, compliant, and very flexible web-server that +has been optimized for high-performance environments. It has a very low +memory footprint compared to other webservers. Its features include FastCGI, +CGI, authentication, output compression, URL rewriting and many more.") + (license license:bsd-3))) + (define-public fcgi (package (name "fcgi") -- cgit v1.2.3 From 93f351c72fd7c4d69782de01a9666e8fda5201cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 28 Feb 2020 16:10:07 +0200 Subject: gnu: rust-yaml-rust-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-yaml-rust-0.4)[arguments]: Don't skip build. Replace rust-quickcheck-0.8 with 0.7 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3352bfa4a2..f50b6daf4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21112,11 +21112,10 @@ (define-public rust-yaml-rust-0.4 "0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (("rust-quickcheck" ,rust-quickcheck-0.7)))) (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "The missing YAML 1.2 parser for rust") (description -- cgit v1.2.3 From 9f7a441defcfe778b77416c39adf854fb5f587d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 28 Feb 2020 10:34:36 -0500 Subject: gnu: earlyoom: Update to 1.3.1. * gnu/packages/linux.scm (earlyoom): Update to 1.3.1. --- gnu/packages/linux.scm | 85 ++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 50fa7b31d0..9f2a818688 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2737,54 +2737,49 @@ (define-public kmod from the module-init-tools project.") (license license:gpl2+))) ; library under lgpl2.1+ -;;; Use a recent commit, because the latest 1.3 tag suffers from test failures -;;; (see: -;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405). (define-public earlyoom - (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea") - (revision "1")) - (package - (name "earlyoom") - (version (git-version "1.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rfjakob/earlyoom.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c")))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t)) - (add-after 'build 'install-contribs - ;; Install what seems useful from the contrib directory. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (contrib (string-append - out "/share/earlyoom/contrib"))) - (install-file "contrib/notify_all_users.py" contrib) - #t)))) - #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" - (string-append "VERSION=v" ,version) - (string-append "PREFIX=" prefix) - (string-append "SYSCONFDIR=" prefix "/etc"))) - #:test-target "test")) - (native-inputs `(("go" ,go) ;for the test suite - ("pandoc" ,ghc-pandoc))) ;to generate the manpage - (home-page "https://github.com/rfjakob/earlyoom") - (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") - (description "Early OOM is a minimalist out of memory (OOM) daemon that + (package + (name "earlyoom") + (version "1.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rfjakob/earlyoom.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06sd3jpkdrwqbphsf8jrgs5rxfi7j3xjmygjjvj4xjk4gncz7r2i")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-after 'build 'install-contribs + ;; Install what seems useful from the contrib directory. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (contrib (string-append + out "/share/earlyoom/contrib"))) + (install-file "contrib/notify_all_users.py" contrib) + #t)))) + #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) + (list "CC=gcc" + (string-append "VERSION=v" ,version) + (string-append "PREFIX=" prefix) + (string-append "SYSCONFDIR=" prefix "/etc"))) + #:test-target "test")) + (native-inputs `(("go" ,go) ;for the test suite + ("pandoc" ,ghc-pandoc))) ;to generate the manpage + (home-page "https://github.com/rfjakob/earlyoom") + (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") + (description "Early OOM is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.") - (license license:expat)))) + (license license:expat))) (define-public eudev ;; The post-systemd fork, maintained by Gentoo. -- cgit v1.2.3 From 20c87138a9ca1bbccef2ee91589f11ec70985555 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 18:54:49 +0100 Subject: gnu: elogind: Enable tests again. * gnu/packages/freedesktop.scm (elogind)[arguments]: Remove "-Dtests" from #:configure-flags. Add phase 'adjust-tests'. --- gnu/packages/freedesktop.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9d10f51257..90956968b2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017, 2018 Mark H Weaver -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice @@ -306,7 +306,6 @@ (define-public elogind "-Dcgroup-controller=elogind" "-Dman=true" ;; Disable some tests. - "-Dtests=false" "-Dslow-tests=false")) #:phases (modify-phases %standard-phases @@ -324,6 +323,46 @@ (define-public elogind (("=/run/dbus/system_bus_socket") "=/var/run/dbus/system_bus_socket")) #t)) + (add-after 'unpack 'adjust-tests + (lambda _ + ;; This test tries to copy some bytes from /usr/lib/os-release, + ;; which does not exist in the build container. Choose something + ;; more likely to be available. + (substitute* "src/test/test-copy.c" + (("/usr/lib/os-release") + "/etc/passwd")) + ;; Use a shebang that works in the build container. + (substitute* "src/test/test-exec-util.c" + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + ;; Do not look for files or directories that do not exist. + (substitute* "src/test/test-fs-util.c" + (("usr") "etc") + (("/etc/machine-id") "/etc/passwd")) + ;; FIXME: Why is sd_id128_get_machine_app_specific failing. + ;; Disable for now by hooking into the kernel support check. + (substitute* "src/test/test-id128.c" + (("if \\(r == -EOPNOTSUPP\\)") + "if (1)")) + ;; This test expects that /sys is available. + (substitute* "src/test/test-mountpoint-util.c" + (("assert_se\\(path_is_mount_point\\(\"/sys.*") + "")) + ;; /bin/sh does not exist in the build container. + (substitute* "src/test/test-path-util.c" + (("/bin/sh") (which "sh"))) + ;; This test uses sd_device_new_from_syspath to allocate a + ;; loopback device, but that fails because /sys is unavailable. + (substitute* "src/libelogind/sd-device/test-sd-device-thread.c" + ((".*sd_device_new_from_syspath.*/sys/class/net/lo.*") + "return 77;")) + ;; Most of these tests require cgroups or an actual live + ;; logind system so that it can flicker the monitor, etc. + ;; Just skip it until a more narrow selection can be made. + (substitute* "src/libelogind/sd-login/test-login.c" + (("r = sd_pid_get_slice.*") + "return 77;")) + #t)) (add-after 'unpack 'change-pid-file-path (lambda _ (substitute* "src/login/elogind.c" -- cgit v1.2.3 From 8ba4c3eab1a3e49cc0496f4a10e5d3676a9af969 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Feb 2020 13:08:45 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.215. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.215. (linux-libre-4.4-pristine-source): 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 9f2a818688..161fc7cbc4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,10 +392,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.214") +(define-public linux-libre-4.4-version "4.4.215") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0v575wl85fg9c3ksdj570hxjcl9p1dxwzag3fm0qcrq75kp6bamn"))) + (hash (base32 "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From f989f947508b1175219f0f1cfc36c08ccbdddf24 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Feb 2020 13:09:42 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.215. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.215. (linux-libre-4.9-pristine-source): 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 161fc7cbc4..b7054e722c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.214") +(define-public linux-libre-4.9-version "4.9.215") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "10z4n792g88p46csla2g9b0m7vz40ln0901ffb2cfd3hmhyhjzxl"))) + (hash (base32 "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f9059c7a0b79b8f40939dca691f346c748101c44 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Feb 2020 13:10:10 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.172. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.172. (linux-libre-4.14-pristine-source): 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 b7054e722c..86e635c9f9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.171") +(define-public linux-libre-4.14-version "4.14.172") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "181jadiwfix23xmqfvg7hpacjd0523v7vy0frzn8g8dlwj4j9q2g"))) + (hash (base32 "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 87b35007ce604efb3c8f16d08c4b92c646d7dac2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Feb 2020 13:10:48 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.107. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.107. (linux-libre-4.19-pristine-source): 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 86e635c9f9..498c6e7446 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.106") +(define-public linux-libre-4.19-version "4.19.107") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33"))) + (hash (base32 "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 512068a44f238843f3f5946f28c628906e2f2406 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Feb 2020 13:11:21 -0500 Subject: gnu: linux-libre: Update to 5.4.23. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.23. (linux-libre-5.4-pristine-source): 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 498c6e7446..0289047d27 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.22") +(define-public linux-libre-5.4-version "5.4.23") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6"))) + (hash (base32 "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 25cefc87bc76e61288bf4e1a8832210de329baf9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 12:00:33 +0100 Subject: gnu: Add cl-cffi-uffi-compat. * gnu/packages/lisp-xyz.scm (sbcl-cffi-uffi-compat, cl-cffi-uffi-compat): New variables. --- gnu/packages/lisp-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 292c9d7317..f791acc142 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2573,6 +2573,19 @@ (define-public sbcl-cffi (define-public cl-cffi (sbcl-package->cl-source-package sbcl-cffi)) +(define-public sbcl-cffi-uffi-compat + (package + (inherit sbcl-cffi-toolchain) + (name "sbcl-cffi-uffi-compat") + (native-inputs + `(,@(package-inputs sbcl-cffi-bootstrap))) ; For fix-paths phase + (inputs + `(("cffi" ,sbcl-cffi))) + (synopsis "UFFI Compatibility Layer for CFFI"))) + +(define-public cl-cffi-uffi-compat + (sbcl-package->cl-source-package sbcl-cffi-uffi-compat)) + (define-public sbcl-cl-sqlite (let ((commit "c738e66d4266ef63a1debc4ef4a1b871a068c112")) (package -- cgit v1.2.3 From 1aa7ad1ffba98708e577c9d86b1a4ad10b6d5429 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 14:15:48 +0100 Subject: gnu: Add cl-uffi. * gnu/packages/lisp-xyz.scm (sbcl-uffi, cl-uffi): New variables. --- gnu/packages/lisp-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f791acc142..ca62ca643c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10963,3 +10963,45 @@ (define-public sbcl-dbd-sqlite3 (define-public cl-dbd-sqlite3 (sbcl-package->cl-source-package sbcl-dbd-sqlite3)) + +(define-public sbcl-uffi + (package + (name "sbcl-uffi") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/uffi.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #f ; TODO: Fix use of deprecated ASDF functions + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t))))) + (synopsis "Universal foreign function library for Common Lisp") + (description + "UFFI provides a universal foreign function interface (FFI) + for Common Lisp.") + (home-page "http://quickdocs.org/uffi/") + (license license:llgpl))) + +(define-public cl-uffi + (package + (inherit (sbcl-package->cl-source-package sbcl-uffi)) + (arguments + `(#:phases + ;; asdf-build-system/source has its own phases and does not inherit + ;; from asdf-build-system/sbcl phases. + (modify-phases %standard-phases/source + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t))))))) -- cgit v1.2.3 From 5ae56f681bfbda09c2831e79280a1dee101aad0e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 14:29:40 +0100 Subject: gnu: Add cl-clsql. * gnu/packages/lisp-xyz.scm (sbcl-clsql, cl-clsql): New variables. --- gnu/packages/lisp-xyz.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ca62ca643c..4d656a3f60 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11005,3 +11005,74 @@ (define-public cl-uffi (lambda _ (make-file-writable "doc/html.tar.gz") #t))))))) + +(define-public sbcl-clsql + (package + (name "sbcl-clsql") + (version "6.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/clsql.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v1k3s5bsy3lgd9gk459bzpb1r0kdjda25s29samxw4gsgf1fqvp")) + (snippet + '(begin + ;; Remove precompiled libraries. + (delete-file "db-mysql/clsql_mysql.dll") + (delete-file "uffi/clsql_uffi.dll") + (delete-file "uffi/clsql_uffi.lib") + #t)))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("cffi-uffi-compat" ,sbcl-cffi-uffi-compat) + ("rt" ,sbcl-rt) + ("uffi" ,sbcl-uffi))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t)) + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "clsql.asd" + (("clsql-tests :force t") + "clsql-tests")) + #t))))) + (synopsis "Common Lisp SQL Interface library") + (description + "@code{clsql} is a Common Lisp interface to SQL RDBMS based on the +Xanalys CommonSQL interface for Lispworks. It provides low-level database +interfaces as well as a functional and an object oriented interface.") + (home-page "http://clsql.kpe.io/") + (license license:llgpl))) + +(define-public cl-clsql + (package + (inherit (sbcl-package->cl-source-package sbcl-clsql)) + (native-inputs + `(("rt" ,cl-rt))) + (inputs + `(("mysql" ,mysql) + ("postgresql" ,postgresql) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (propagated-inputs + `(("cl-postgres" ,cl-postgres) + ("cffi-uffi-compat" ,cl-cffi-uffi-compat) + ("md5" ,cl-md5) + ("uffi" ,cl-uffi))) + (arguments + `(#:phases + ;; asdf-build-system/source has its own phases and does not inherit + ;; from asdf-build-system/sbcl phases. + (modify-phases %standard-phases/source + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t))))))) -- cgit v1.2.3 From a5f4428770e32acf9dd70b95da6a0bc279fa0794 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 26 Feb 2020 14:46:21 +0100 Subject: gnu: Add sbcl-clsql-uffi. * gnu/packages/lisp-xyz.scm (sbcl-clsql-uffi): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4d656a3f60..c41a5b629b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11076,3 +11076,13 @@ (define-public cl-clsql (lambda _ (make-file-writable "doc/html.tar.gz") #t))))))) + +(define-public sbcl-clsql-uffi + (package + (inherit sbcl-clsql) + (name "sbcl-clsql-uffi") + (inputs + `(("cffi-uffi-compat" ,sbcl-cffi-uffi-compat) + ("clsql" ,sbcl-clsql) + ("uffi" ,sbcl-uffi))) + (synopsis "UFFI helper functions for Common Lisp SQL interface library"))) -- cgit v1.2.3 From 5ad8d7aa12afc5c76614a1bf2b03d33cc161cb2a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 28 Feb 2020 18:50:05 +0100 Subject: gnu: Add sbcl-clsql-sqlite3. * gnu/packages/lisp-xyz.scm (sbcl-clsql-sqlite3): New variable. --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c41a5b629b..2567beabb0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11086,3 +11086,24 @@ (define-public sbcl-clsql-uffi ("clsql" ,sbcl-clsql) ("uffi" ,sbcl-uffi))) (synopsis "UFFI helper functions for Common Lisp SQL interface library"))) + +(define-public sbcl-clsql-sqlite3 + (package + (inherit sbcl-clsql) + (name "sbcl-clsql-sqlite3") + (inputs + `(("clsql" ,sbcl-clsql) + ("clsql-uffi" ,sbcl-clsql-uffi) + ("sqlite" ,sqlite))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-clsql) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "db-sqlite3/sqlite3-loader.lisp" + (("libsqlite3") + (string-append (assoc-ref inputs "sqlite") + "/lib/libsqlite3"))) + #t)))))) + (synopsis "SQLite3 driver for Common Lisp SQL interface library"))) -- cgit v1.2.3 From cd53df62c9d0872331c6872727feeb5aca6cd3f6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 28 Feb 2020 19:15:36 +0100 Subject: gnu: Add sbcl-clsql-postgresql. * gnu/packages/lisp-xyz.scm (sbcl-clsql-postgresql): New variable. --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2567beabb0..300638ba03 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11107,3 +11107,24 @@ (define-public sbcl-clsql-sqlite3 "/lib/libsqlite3"))) #t)))))) (synopsis "SQLite3 driver for Common Lisp SQL interface library"))) + +(define-public sbcl-clsql-postgresql + (package + (inherit sbcl-clsql) + (name "sbcl-clsql-postgresql") + (inputs + `(("clsql" ,sbcl-clsql) + ("clsql-uffi" ,sbcl-clsql-uffi) + ("postgresql" ,postgresql))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-clsql) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "db-postgresql/postgresql-loader.lisp" + (("libpq") + (string-append (assoc-ref inputs "postgresql") + "/lib/libpq"))) + #t)))))) + (synopsis "PostgreSQL driver for Common Lisp SQL interface library"))) -- cgit v1.2.3 From f9680d523015dd514a189cb0f60438edd3d83adb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 28 Feb 2020 19:33:55 +0100 Subject: gnu: Add sbcl-clsql-postgresql-socket3. * gnu/packages/lisp-xyz.scm (sbcl-clsql-postgresql-socket3): New variable. --- gnu/packages/lisp-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 300638ba03..52e2d4a3f4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11128,3 +11128,26 @@ (define-public sbcl-clsql-postgresql "/lib/libpq"))) #t)))))) (synopsis "PostgreSQL driver for Common Lisp SQL interface library"))) + +(define-public sbcl-clsql-postgresql-socket3 + (package + (inherit sbcl-clsql) + (name "sbcl-clsql-postgresql-socket3") + (inputs + `(("cl-postgres" ,sbcl-cl-postgres) + ("clsql" ,sbcl-clsql) + ("md5" ,sbcl-md5))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-clsql) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'create-asd-file 'fix-asd-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/" (%lisp-type))) + (asd (string-append lib "/clsql-postgresql-socket3.asd"))) + (substitute* asd + (("CLSQL-POSTGRESQL-SOCKET-SYSTEM::") + ""))) + #t)))))) + (synopsis "PostgreSQL driver for Common Lisp SQL interface library"))) -- cgit v1.2.3 From 079ee3b5ea7e9e9bf34753df42957d280e8eabc5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 28 Feb 2020 23:07:17 +0100 Subject: gnu: Add sbcl-clsql-mysql. * gnu/packages/lisp-xyz.scm (sbcl-clsql-mysql): New variable. --- gnu/packages/lisp-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 52e2d4a3f4..0195698887 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11151,3 +11151,49 @@ (define-public sbcl-clsql-postgresql-socket3 ""))) #t)))))) (synopsis "PostgreSQL driver for Common Lisp SQL interface library"))) + +(define-public sbcl-clsql-mysql + (package + (inherit sbcl-clsql) + (name "sbcl-clsql-mysql") + (inputs + `(("mysql" ,mysql) + ("sbcl-clsql" ,sbcl-clsql) + ("sbcl-clsql-uffi" ,sbcl-clsql-uffi) + ("zlib" ,zlib))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-clsql) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((lib (string-append "#p\"" + (assoc-ref outputs "out") + "/lib/\""))) + (substitute* "clsql-mysql.asd" + (("#p\"/usr/lib/clsql/clsql_mysql\\.so\"") + lib)) + (substitute* "db-mysql/mysql-loader.lisp" + (("libmysqlclient" all) + (string-append (assoc-ref inputs "mysql") "/lib/" all)) + (("clsql-mysql-system::\\*library-file-dir\\*") + lib))) + #t)) + (add-before 'build 'build-helper-library + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((mysql (assoc-ref inputs "mysql")) + (inc-dir (string-append mysql "/include/mysql")) + (lib-dir (string-append mysql "/lib")) + (shared-lib-dir (string-append (assoc-ref outputs "out") + "/lib")) + (shared-lib (string-append shared-lib-dir + "/clsql_mysql.so"))) + (mkdir-p shared-lib-dir) + (invoke "gcc" "-fPIC" "-shared" + "-I" inc-dir + "db-mysql/clsql_mysql.c" + "-Wl,-soname=clsql_mysql" + "-L" lib-dir "-lmysqlclient" "-lz" + "-o" shared-lib) + #t))))))) + (synopsis "MySQL driver for Common Lisp SQL interface library"))) -- cgit v1.2.3 From 2fe3072ebf02c0abff1fc1b2eaad406cfe0fc4ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 29 Feb 2020 08:51:31 +0100 Subject: gnu: mumimu: Update to 1.2.0-2.6b42431. * gnu/packages/mail.scm (mumimu): Update to 1.2.0-2.6b42431. [arguments]: Do not patch Makefile.am or configure.ac. [version]: Inherit from mu. --- gnu/packages/mail.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7052664aca..fbe55c28c8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -793,14 +793,12 @@ (define-public mu (define mumimu ;; This is a fork of mu for use in Mumi that stores message bug IDs in its ;; database. It also renames the library to "mumimu" to avoid confusion. - (let ((commit "ad30b5e9c85f0465aeeeac461d8c32d95775d450") - (revision "1")) + (let ((commit "6b42431052c7cc9a2e147938e1b67f14a93e4ee5") + (revision "2")) (package (inherit mu) (name "mumimu") - ;; TODO The version here used to be (package-version guile-email), but - ;; that code caused problems - (version (git-version "0.2.2" revision commit)) + (version (git-version (package-version mu) revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -809,7 +807,7 @@ (define mumimu (file-name (git-file-name name version)) (sha256 (base32 - "1y8r8csvkyxncgpi469dir4n4sga4z9xdzc18qh5s8bk29qj689n")))) + "044scxmjrckidqx935yza3aqnjyzrmhyvgx2gs2jyf68hl2qzb89")))) (arguments (substitute-keyword-arguments (package-arguments mu) ((#:tests? anything '()) @@ -817,15 +815,7 @@ (define mumimu ((#:phases phases) `(modify-phases ,phases (replace 'patch-configure - (lambda _ - (delete-file "autogen.sh") - (substitute* "configure.ac" - ;; Use latest Guile - (("guile-2.0") "guile-2.2")) - (substitute* '("guile/Makefile.am" - "guile/mu/Makefile.am") - (("share/guile/site/2.0/") "share/guile/site/2.2/")) - #t)) + (lambda _ (delete-file "autogen.sh") #t)) (replace 'fix-ffi (lambda* (#:key outputs #:allow-other-keys) (substitute* "guile/mumimu.scm" -- cgit v1.2.3 From 170c6b03444b1bb059728efc85e14edd3688dfdb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 29 Feb 2020 08:52:51 +0100 Subject: gnu: mumi: Update to 0.0.0-6.a933a62. * gnu/packages/mail.scm (mumi): Update to 0.0.0-6.a933a62. [inputs]: Remove guile-fibers; replace guile-json-1 with guile-json-3. [source]: Remove snippet. --- gnu/packages/mail.scm | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fbe55c28c8..544bb9d8f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2960,8 +2960,8 @@ (define-public tnef (license gpl2+))) (define-public mumi - (let ((commit "8a57c87797ffb07baa88697130204184db643521") - (revision "5")) + (let ((commit "a933a62a4b8528b416319759b9985db80f3fce14") + (revision "6")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2973,29 +2973,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "1575gn5p086sjxz5hvg6iyskq6cxf6vf50s9nsc4xgrbcqa3pv2c")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile.am" - ;; Install .go files to $prefix/lib instead of - ;; $prefix/share. - (("^godir[[:space:]]*=.*") - "godir = \ -$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n") - - ;; Install assets. - (("^assetsdir.*" _) - "\ -assetsdir = $(pkgdatadir)/assets -assetscssdir = $(assetsdir)/css -assetsimgdir = $(assetsdir)/img -assetsjsdir = $(assetsdir)/js - -assetscss_DATA = $(wildcard assets/css/*) -assetsimg_DATA = $(wildcard assets/img/*) -assetsjs_DATA = $(wildcard assets/js/*)\n")) - #t)))) + "0vlda7vjzpd942iz5vb471hj7ypml5gwl9s1am92klv6nk2vnvcx")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3026,8 +3004,7 @@ (define-public mumi (inputs `(("guile-debbugs" ,guile-debbugs) ("guile-email" ,guile-email) - ("guile-fibers" ,guile-fibers) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-syntax-highlight" ,guile-syntax-highlight) ("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org ("guile" ,guile-2.2) -- cgit v1.2.3 From 14138912501152d0b81775c96852dbc782f0f864 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 28 Feb 2020 21:39:50 +0100 Subject: gnu: Add icoutils. * gnu/packages/image.scm (icoutils): New variable. --- gnu/packages/image.scm | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 106b733673..4c9a7f6409 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2017 ng0 -;;; Copyright © 2017,2019 Hartmut Goebel +;;; Copyright © 2017,2019,2020 Hartmut Goebel ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial @@ -69,10 +69,11 @@ (define-module (gnu packages image) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages web) #: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) @@ -1900,3 +1901,36 @@ (define-public lodepng no dependency or linkage required. It's made for C (ISO C90), and has a C++ wrapper with a more convenient interface on top.") (license license:zlib)))) + +(define-public icoutils + (package + (name "icoutils") + (version "0.32.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://savannah/icoutils/icoutils-" version ".tar.bz2")) + (sha256 + (base32 "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng) + ("perl" ,perl))) + (propagated-inputs + `(("perl-libwww" ,perl-libwww))) + (home-page "https://www.nongnu.org/icoutils/") + (synopsis "Extract and convert bitmaps from Windows icon and cursor files") + (description "Icoutils are a set of program for extracting and converting +bitmaps from Microsoft Windows icon and cursor files. These files usually +have the extension @code{.ico} or @code{.cur}, but they can also be embedded +in executables and libraries (@code{.dll}-files). (Such embedded files are +referred to as resources.) + +Conversion of these files to and from PNG images is done @command{icotool}. +@command{extresso} automates these tasks with the help of special resource +scripts. Resources such can be extracted from MS Windows executable and +library files with @command{wrestool}. + +This package can be used to create @code{favicon.ico} files for web sites.") + (license license:gpl3+))) -- cgit v1.2.3 From 7593e5d0f8e0d3cfbfcdcf5f747be309c7c9b737 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 21:07:10 +0100 Subject: gnu: abduco: Use HTTPS home page and source URI. * gnu/packages/abduco.scm (abduco)[home-page]: Use HTTPS URI. [source]: Likewise. --- gnu/packages/abduco.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/abduco.scm b/gnu/packages/abduco.scm index 3cb84f5fc8..37d2f37773 100644 --- a/gnu/packages/abduco.scm +++ b/gnu/packages/abduco.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Leo Famulari +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-public abduco (source (origin (method url-fetch) (uri (string-append - "http://www.brain-dump.org/projects/abduco/abduco-" + "https://www.brain-dump.org/projects/abduco/abduco-" version ".tar.gz")) (sha256 (base32 @@ -45,5 +46,5 @@ (define-public abduco (description "abduco provides session management i.e. it allows programs to be run independently from their controlling terminal. That is, programs can be detached---run in the background---and then later reattached.") - (home-page "http://www.brain-dump.org/projects/abduco/") + (home-page "https://www.brain-dump.org/projects/abduco/") (license isc))) -- cgit v1.2.3 From c8b10f9b3c9792e462c410e8650c70c0394cb3f4 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 21:20:38 +0100 Subject: gnu: acct: Update home page URI. * gnu/packages/acct.scm (acct)[home-page]: Update URI. --- gnu/packages/acct.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/acct.scm b/gnu/packages/acct.scm index a0aac153b0..585a3c2184 100644 --- a/gnu/packages/acct.scm +++ b/gnu/packages/acct.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,7 @@ (define-public acct (base32 "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac")))) (build-system gnu-build-system) - (home-page "https://gnu.org/software/acct/") + (home-page "https://www.gnu.org/software/acct/") (synopsis "Standard login and process accounting utilities") (description "GNU acct provides a means for system administrators to determine -- cgit v1.2.3 From a20ede329d724e9c7661c84bbc394af2512612e7 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 21:53:10 +0100 Subject: gnu: python-pyudev: Use HTTPS home page URI, update home page. * gnu/packages/admin.scm (python-pyudev)[home-page]: Use HTTPS URI, update URI. --- 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 edf8aad335..8dc874dbe8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Brett Gilio -;;; Copyright © 2019 Björn Höfling +;;; Copyright © 2019,2020 Björn Höfling ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin @@ -3391,7 +3391,7 @@ (define-public python-pyudev ("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-sphinx" ,python-sphinx))) - (home-page "http://pyudev.readthedocs.org/") + (home-page "https://pyudev.readthedocs.io/") (synopsis "Python udev binding") (description "This package provides @code{udev} bindings for Python.") (license license:lgpl2.1))) -- cgit v1.2.3 From 1977e857ae6e8a52085870f47427bebde26403e5 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 22:10:13 +0100 Subject: gnu: direvent: Update home page URI. * gnu/packages/admin.scm (direvent)[home-page]: Update URI. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8dc874dbe8..093b4cc002 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1780,7 +1780,7 @@ (define-public direvent (string-append "SHELL=" bash "/bin/sh"))) #t)))))) - (home-page "https://www.gnu.org/software/direvent/") + (home-page "https://www.gnu.org.ua/software/direvent/") (synopsis "Daemon to monitor directories for events such as file removal") (description "A daemon that monitors directories for events, such as creating, -- cgit v1.2.3 From a06faea965e3a37ff9b7d55fd0d2380f9ffc18a4 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 22:23:38 +0100 Subject: gnu: fabric: Use HTTPS home page URI. * gnu/packages/admin.scm (fabric)[home-page]: Use HTTPS URI. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 093b4cc002..4e3c1ad56e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2909,7 +2909,7 @@ (define-public fabric ("python2-bcrypt" ,python2-bcrypt))) (propagated-inputs `(("python2-paramiko" ,python2-paramiko))) - (home-page "http://fabfile.org") + (home-page "https://www.fabfile.org/") (synopsis "Simple Pythonic remote execution and deployment tool") (description "Fabric is designed to upload files and run shell commands on a number of -- cgit v1.2.3 From b8eeaaa263b1edce4cb26af6893f8a0b30c74324 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 22:44:08 +0100 Subject: gnu: fabric: Update to 1.14.1. * gnu/packages/admin.scm (fabric): Update to 1.14.1. --- 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 4e3c1ad56e..59b414b329 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2878,14 +2878,14 @@ (define-public intel-gpu-tools (define-public fabric (package (name "fabric") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (pypi-uri "Fabric" version)) (sha256 (base32 - "13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1")))) + "1a3ndlpdw6bhn8fcw1jgznl117a8pnr84az9rb5fwnrypf1ph2b6")))) (build-system python-build-system) (arguments `(#:python ,python-2 ; Python 2 only -- cgit v1.2.3 From 56cb6f1d56d43eba87015c015b72d41aee2a17d9 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 22:34:15 +0100 Subject: gnu: pies: Update home page URI. * gnu/packages/admin.scm (pies)[home-page]: Update URI. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 59b414b329..346bb14058 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -415,7 +415,7 @@ (define-public pies (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) #t)))))) - (home-page "https://www.gnu.org/software/pies/") + (home-page "https://www.gnu.org.ua/software/pies/") (synopsis "Program invocation and execution supervisor") (description "GNU pies is a program that supervises the invocation and execution of -- cgit v1.2.3 From f76c16d220e6c349441c08bf25a5197037490fa5 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 28 Feb 2020 22:52:44 +0100 Subject: gnu: di: Update home page URI. * gnu/packages/admin.scm (di)[home-page]: Update URI. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 346bb14058..5b5a7a56ef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2531,7 +2531,7 @@ (define-public di (setenv "prefix" (assoc-ref outputs "out")) #t))) #:make-flags (list "--environment-overrides"))) - (home-page "https://www.gentoo.com/di/") + (home-page "https://gentoo.com/di/") (synopsis "Advanced df like disk information utility") (description "@code{di} is a disk information utility, displaying everything that your -- cgit v1.2.3 From ec09abc6acdb5e1c9df357c71976bb61e9249264 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 11:16:32 +0100 Subject: gnu: acpica: Update to 20200214. * gnu/packages/admin.scm (acpica): Update to 20200214. Signed-off-by: Tobias Geerinckx-Rice --- 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 5b5a7a56ef..50bb8ab651 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1577,7 +1577,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20200110") + (version "20200214") (source (origin (method url-fetch) (uri (string-append @@ -1585,7 +1585,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "1hb4g6r7w8s4bhlkk36fmb4qxghnrwvad7f18cpn6zz0b4sjs7za")))) + "0jdasziq184l3iqyp5vhrsbi6g89n10wr0ssliiz0xi3dqwsxcqk")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 28191bdcdec8c58ca5999f519d8ae4372784bff2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:27:57 +0100 Subject: gnu: python2-numpy-documentation: Update home page. * gnu/packages/python-xyz.scm (python2-numpy-documentation)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4ea09b756e..c5791fd22a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3464,7 +3464,7 @@ (define-public python-numpy (with-directory-excursion "/tmp" (invoke "python" "-c" "import numpy; numpy.test(verbose=2)"))))))) - (home-page "http://www.numpy.org/") + (home-page "https://numpy.org") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing with Python. It contains among other things: a powerful N-dimensional array -- cgit v1.2.3 From 72314cc3f98e9bc987fda55e0b559259c0f477b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:28:38 +0100 Subject: gnu: higan: Update home page. * gnu/packages/emulators.scm (higan)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5e1ab6cb3f..fb7afd9111 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -405,7 +405,7 @@ (define-public higan (string-append "prefix=" (assoc-ref %outputs "out"))) ;; There is no test suite. #:tests? #f)) - (home-page "http://byuu.org/emulation/higan/") + (home-page "https://byuu.org/higan") (synopsis "Nintendo multi-system emulator") (description "higan (formerly bsnes) is an emulator for multiple Nintendo video game -- cgit v1.2.3 From ba11a8bdf466071967c6a472f8640c6d894b201b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:29:30 +0100 Subject: gnu: java-stringtemplate: Use HTTPS home page. * gnu/packages/java.scm (java-stringtemplate)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ec3369a6d..32ff4ab064 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6903,7 +6903,7 @@ (define-public java-stringtemplate-3 (native-inputs `(("antlr" ,antlr2) ("java-junit" ,java-junit))) - (home-page "http://www.stringtemplate.org") + (home-page "https://www.stringtemplate.org") (synopsis "Template engine to generate formatted text output") (description "StringTemplate is a java template engine (with ports for C#, Objective-C, JavaScript, Scala) for generating source code, web pages, emails, -- cgit v1.2.3 From 91c19e76a5c456c2861ca48754563e7cc86ff5f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:29:56 +0100 Subject: gnu: ocaml-mccs: Use HTTPS home page. * gnu/packages/ocaml.scm (ocaml-mccs)[home-page]: Use HTTPS. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2bf9672bf1..35701039ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -340,7 +340,7 @@ (define-public ocaml-mccs "1i0hhkrqi7rqlainlg5pc4hibbx6b5dp3x99gmav8c3sbfvlk9mc")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-cudf" ,ocaml-cudf))) - (home-page "http://www.i3s.unice.fr/~cpjm/misc/") + (home-page "https://www.i3s.unice.fr/~cpjm/misc/") (synopsis "Upgrade path problem solver") (description "Mccs (Multi Criteria CUDF Solver) is a CUDF problem solver. Mccs take as input a CUDF problem and computes the best solution according to -- cgit v1.2.3 From 0c0da96ab5308f6a88a1e3cc6408a2af71ca9838 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 29 Feb 2020 19:19:08 +0100 Subject: gnu: r-with-tests: Update to 3.6.3. * gnu/packages/statistics.scm (r-with-tests): Update to 3.6.3. --- 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 46cd691ed3..1f15a6a713 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -183,7 +183,7 @@ (define-public libxls (define r-with-tests (package (name "r-with-tests") - (version "3.6.2") + (version "3.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -191,7 +191,7 @@ (define r-with-tests version ".tar.gz")) (sha256 (base32 - "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx")))) + "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From 55cd9da6355a43e491e26a8c9d7a46aed0ab3478 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 18:03:18 +0100 Subject: gnu: ansible: Update to 2.9.5. * gnu/packages/admin.scm (ansible): Update to 2.9.5. Signed-off-by: Leo Famulari --- 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 50bb8ab651..fdbd971880 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1911,13 +1911,13 @@ (define-public graphios (define-public ansible (package (name "ansible") - (version "2.8.5") + (version "2.9.5") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "11k94ifp42psivzx147xwbmq1ak7qnjdgkb6c1xz53nfapkh754f")))) + (base32 "19fav6rs58zdc3gfhh1lxhki36jn4252183rrd769sv46b9m1bji")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From f37d089b3eea3e445b0f252f69859fc7ca7d8aac Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 16:54:38 +0100 Subject: gnu: zsh: Update to 5.8. * gnu/packages/shells.scm (zsh): Update to 5.8. Signed-off-by: Leo Famulari --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2aac6323a0..1300175dd4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -396,7 +396,7 @@ (define-public tcsh (define-public zsh (package (name "zsh") - (version "5.7.1") + (version "5.8") (source (origin (method url-fetch) (uri (list (string-append @@ -407,7 +407,7 @@ (define-public zsh ".tar.xz"))) (sha256 (base32 - "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j")))) + "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre" "--enable-maildir-support") -- cgit v1.2.3 From ce50480b5bfa42e2cc62563e8399b2b4631d771d Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 17:00:41 +0100 Subject: gnu: youtube-dl: Update to 2020.02.16. * gnu/packages/video.scm (youtube-dl): Update to 2020.02.16. Signed-off-by: Leo Famulari --- 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 59cff04a56..41e2d2eb88 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1552,7 +1552,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2020.01.24") + (version "2020.02.16") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1560,7 +1560,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b")))) + "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From b5aa17adea398a5d93ecdeb3b1478bfc610d59bf Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 17:26:38 +0100 Subject: gnu: vim: Update to 8.2.0332. * gnu/packages/vim.scm (vim): Update to 8.2.0332. Signed-off-by: Leo Famulari --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index a94a677b25..d9ee202fec 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -69,7 +69,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0303") + (version "8.2.0332") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k")))) + "0icgykml4wxq554h7r9rcxpxipg0yri651b9fijvv364ycywsq8c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 08cc13974fb70d797299996a18a8a4a2a02e1bd8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 15 Feb 2020 12:28:43 -0500 Subject: gnu: libaom: Add AVIF support. * gnu/packages/video.scm (libaom): Update to 1.0.0-errata1-avif. --- gnu/packages/video.scm | 66 ++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 41e2d2eb88..6719e1e047 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -272,41 +272,37 @@ (define-public liba52 (license license:gpl2+))) (define-public libaom - ;; The 1.0.0-errata1 release installs a broken pkg-config .pc file. This - ;; is fixed in libaom commit 0ddc150, but we use an even later commit. - (let ((commit "22b150bf040608028a56d8bf39e72f771383d836") - (revision "0")) - (package - (name "libaom") - (version (git-version "1.0.0-errata1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://aomedia.googlesource.com/aom/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pdd5h3n42607n6qmggz4yv8izhjr2kl6knb3kh7gh4v0vy47h1r")))) - (build-system cmake-build-system) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python))) ; to detect the version - (arguments - `(#:tests? #f ;no check target - #:configure-flags - ;; build dynamic library - (list "-DBUILD_SHARED_LIBS=YES" - "-DENABLE_PIC=TRUE" - "-DAOM_TARGET_CPU=generic" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out"))))) - (home-page "https://aomedia.googlesource.com/aom/") - (synopsis "AV1 video codec") - (description "Libaom is the reference implementation of AV1. It includes -a shared library and encoder and decoder command-line executables.") - (license license:bsd-2)))) + (package + (name "libaom") + (version "1.0.0-errata1-avif") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://aomedia.googlesource.com/aom/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "169yfgh7zigc21h71qclfyr7s4wwp2i9vbr4z6pkabypvass4v7m")))) + (build-system cmake-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) ; to detect the version + (arguments + `(#:tests? #f ;no check target + #:configure-flags + ;; build dynamic library + (list "-DBUILD_SHARED_LIBS=YES" + "-DENABLE_PIC=TRUE" + "-DAOM_TARGET_CPU=generic" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))))) + (home-page "https://aomedia.googlesource.com/aom/") + (synopsis "AV1 video codec") + (description "Libaom is the reference implementation of AV1. It includes a +shared library and encoder and decoder command-line executables.") + (license license:bsd-2))) (define-public libmpeg2 (package -- cgit v1.2.3 From fecd608f37a428e4efcf3acd47facc59dc3ec49a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Feb 2020 14:12:43 -0500 Subject: gnu: Add libavif. * gnu/packages/image.scm (libavif): New variable. --- gnu/packages/image.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4c9a7f6409..11a981a77f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Amirouche Boubekki ;;; Copyright © 2014, 2017 John Darrington -;;; Copyright © 2016, 2017, 2018 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier @@ -71,6 +71,7 @@ (define-module (gnu packages image) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -1934,3 +1935,46 @@ (define-public icoutils This package can be used to create @code{favicon.ico} files for web sites.") (license license:gpl3+))) + +(define-public libavif + (package + (name "libavif") + (version "0.5.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AOMediaCodec/libavif") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15g76j9vb88q1v3azscph8im8714zdl70bni0al4ww9v80vhqpkd")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON" + "-DAVIF_CODEC_RAV1E=OFF" ; not packaged yet + "-DAVIF_BUILD_TESTS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-readme + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/libavif-" + ,version))) + (install-file "../source/README.md" doc))))) +;; The test suite runs tests for all supported codecs and fails because we don't +;; have rav1e yet. +;; (replace 'check +;; (lambda _ +;; (invoke "./aviftest" "../source/tests/data")))) + #:tests? #f)) + (inputs + `(("libaom" ,libaom) + ("dav1d" ,dav1d))) + (synopsis "Encode and decode AVIF files") + (description "Libavif is a C implementation of the AV1 Image File Format +(AVIF). It can encode and decode all YUV formats and bit depths supported by +AOM, including with alpha.") + (home-page "https://github.com/AOMediaCodec/libavif") + (license (list license:bsd-2 ; libavif itself + license:expat)))) ; cJSON in the test suite -- cgit v1.2.3 From e9a589c8a7c467de1d0b649600e4d92ecc25d870 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:06:59 +0200 Subject: gnu: rust-winit-0.20: Don't skip build. * gnu/packages/crates-io.scm (rust-winit-0.20)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f50b6daf4d..215212d1e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20748,8 +20748,7 @@ (define-public rust-winit-0.20 "03q4bvdq86kii53d0vsywv08g8vqirf9h1lz2cl6rcc7gjfynpds"))))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-android-glue" ,rust-android-glue-0.2) ("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) -- cgit v1.2.3 From a396f9c68f48a9ece36d0d126c44556dd89a6edc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:07:49 +0200 Subject: gnu: rust-xdg-2.2: Don't skip build. * gnu/packages/crates-io.scm (rust-xdg-2.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 215212d1e1..b4354a0299 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21067,7 +21067,6 @@ (define-public rust-xdg-2.2 (base32 "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/whitequark/rust-xdg") (synopsis "Store and retrieve files according to XDG specification") (description -- cgit v1.2.3 From 37ec8b987ef74aa055ce6e3a485dd68926a413eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:08:48 +0200 Subject: gnu: rust-web-sys-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-web-sys-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b4354a0299..e98a676cda 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20456,8 +20456,7 @@ (define-public rust-web-sys-0.3 "0fzmxcyahy3ghl8lkjkchj9krmnr56shvbqgr7db3hm8dappryda")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-anyhow" ,rust-anyhow-1.0) -- cgit v1.2.3 From 04deb31d193a12a9b6739ecba51686b7d89419d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:09:34 +0200 Subject: gnu: rust-wincolor-1.0: Don't skip build. * gnu/packages/crates-io.scm (rust-wincolor-1.0)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e98a676cda..35dcbe16ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20711,8 +20711,7 @@ (define-public rust-wincolor-1.0 "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3) ("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor") -- cgit v1.2.3 From 14c6e181a0c8ff8fa9845b82409c2ff20d131339 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:10:46 +0200 Subject: gnu: rust-winapi-util-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-winapi-util-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 35dcbe16ba..8475e22315 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20666,8 +20666,7 @@ (define-public rust-winapi-util-0.1 "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/BurntSushi/winapi-util") (synopsis "Dumping ground for high level safe wrappers over winapi") (description -- cgit v1.2.3 From 1b21a1ed5572726173d59b63f141253aac90832e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:13:25 +0200 Subject: gnu: rust-winapi-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-winapi-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8475e22315..d0f9242e9f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20585,8 +20585,7 @@ (define-public rust-winapi-0.3 (build-system cargo-build-system) ;; This package depends unconditionally on these two crates. (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4)))) (home-page "https://github.com/retep998/winapi-rs") -- cgit v1.2.3 From 4d7acb4da030a055b5e09c315b3e7ab25078e9fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:17:29 +0200 Subject: gnu: rust-csv-core-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-csv-core-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d0f9242e9f..b0cbd3be09 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3443,8 +3443,7 @@ (define-public rust-csv-core-0.1 "0k5zs0x0qmmn27pa5kcg86lg84s29491fw5sh3zswxswnavasp4v")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.4)))) -- cgit v1.2.3 From 02940899ef14cdcc4362e4c67b8d4a2fafbc5ffc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:18:42 +0200 Subject: gnu: rust-docopt-1.1: Don't skip build. * gnu/packages/crates-io.scm (rust-docopt-1.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b0cbd3be09..5ae6cbf876 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3989,8 +3989,7 @@ (define-public rust-docopt-1.1 "0s9rcpmnnivs502q69lc1h1wrwapkq09ikgbfbgqf31idmc5llkz")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-serde" ,rust-serde-1.0) -- cgit v1.2.3 From 634bb722923e741150e0ddea3b9548e8f0427d98 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:19:56 +0200 Subject: gnu: rust-opaque-debug-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-opaque-debug-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5ae6cbf876..7c8a9f5d52 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10850,7 +10850,6 @@ (define-public rust-opaque-debug-0.2 (base32 "02942l2gc7w5r4js7i9063x99szic5mzzk1055j83v4diqpbpxck")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/RustCrypto/utils") (synopsis "Macro for opaque Debug trait implementation") (description -- cgit v1.2.3 From 4978fff1bea85be41a122a96c6e4ed1350bfe5f9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:20:33 +0200 Subject: gnu: rust-base64-0.10: Don't skip build. * gnu/packages/crates-io.scm (rust-base64-0.10)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c8a9f5d52..353fd9db21 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -839,8 +839,7 @@ (define-public rust-base64-0.10 (base32 "13k6bvd3n6dm7jqn9x918w65dd9xhx454bqphbnv0bkd6n9dj98b")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) -- cgit v1.2.3 From 396b6871e995355f0023ed82cf7e88eddf19346f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:51:28 +0200 Subject: gnu: rust-memchr-2.2: Don't skip build. * gnu/packages/crates-io.scm (rust-memchr-2.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 353fd9db21..4bed8f8001 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9117,8 +9117,7 @@ (define-public rust-memchr-2.2 "13j6ji9x9ydpi9grbss106gqqr3xn3bcfp28aydqfa4751qrfmw8")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.8)))) -- cgit v1.2.3 From 315b734090f26d2c7280b3d5ba5d89300eb00e45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:52:10 +0200 Subject: gnu: rust-rand-pcg-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-pcg-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4bed8f8001..d2fc8cf90e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13310,8 +13310,7 @@ (define-public rust-rand-pcg-0.2 "0ab4h6s6x3py833jk61lwadq83qd1c8bih2hgi6yps9rnv0x1aqn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs -- cgit v1.2.3 From f95b5871eddea1ebca15b0d8a4286b1650ffc5a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:53:49 +0200 Subject: gnu: rust-rand-pcg-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-pcg-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d2fc8cf90e..d2195ed2d8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13337,8 +13337,7 @@ (define-public rust-rand-pcg-0.1 (base32 "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-0.1) ("rust-rand-core" ,rust-rand-core-0.4) ("rust-serde" ,rust-serde-1.0) -- cgit v1.2.3 From 166fd432e8b6525d41fe838d0fd97d7be0680e93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:56:16 +0200 Subject: gnu: rust-rand-os-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-os-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d2195ed2d8..c250d4e322 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13284,8 +13284,7 @@ (define-public rust-rand-os-0.1 (base32 "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cloudabi" ,rust-cloudabi-0.0) ("rust-fuchsia-cprng" ,rust-fuchsia-cprng-0.1) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From e01b0e9609a18f82a8053b0574d266c03fa91f87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 19:59:59 +0200 Subject: gnu: rust-rand-os-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-os-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c250d4e322..ce37bfabc6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13260,13 +13260,12 @@ (define-public rust-rand-os-0.2 "06is69f8rfzs620g5b54k6cgy5yaycrsyqg55flyfrsf8g88733f")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) ("rust-rand-core" ,rust-rand-core-0.5)))) (home-page "https://crates.io/crates/rand-os") (synopsis "OS backed Random Number Generator") - (description "OS backed Random Number Generator") + (description "OS backed Random Number Generator.") (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From ace2340cf3774301dff5e2dbd9c833f9ecbb1e29 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:02:35 +0200 Subject: gnu: rust-rand-hc-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-hc-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce37bfabc6..dc2b4e33af 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13168,8 +13168,7 @@ (define-public rust-rand-hc-0.1 (base32 "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) + `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) (define-public rust-rand-isaac-0.2 (package -- cgit v1.2.3 From b4240b2d9e25722abc5a0659895641b90ef9f2a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:05:00 +0200 Subject: gnu: rust-rand-hc-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-hc-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc2b4e33af..45dd12bdff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13144,8 +13144,7 @@ (define-public rust-rand-hc-0.2 "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rand-hc" ,rust-rand-core-0.5)))) (home-page "https://crates.io/crates/rand_hc") (synopsis "HC128 random number generator") -- cgit v1.2.3 From 3a399a241a15335d21616000a2058e8001897f08 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:10:57 +0200 Subject: gnu: rust-rand-core-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-core-0.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45dd12bdff..5edcf49c88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13088,8 +13088,7 @@ (define-public rust-rand-core-0.4 (base32 "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))))) -- cgit v1.2.3 From e6daf515ed0db8f738aa039167865cc8c612b773 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:12:01 +0200 Subject: gnu: python-bleach: Update to 3.1.1 [fixes CVE-2020-6802]. * gnu/packages/python-xyz.scm (python-bleach): Update to 3.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c5791fd22a..cdd61d9c39 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7686,14 +7686,14 @@ (define-public python2-nbformat (define-public python-bleach (package (name "python-bleach") - (version "3.1.0") + (version "3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "bleach" version)) (sha256 (base32 - "1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz")))) + "0j4xlnw99m1xy0s7wxz9fk5f3c1n8r296fh75jn5p5j61w6qg2xa")))) (build-system python-build-system) (propagated-inputs `(("python-webencodings" ,python-webencodings) -- cgit v1.2.3 From 2d83102ca0faa2f6488d099d75f201a829623831 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:16:29 +0200 Subject: gnu: rust-rand-core-0.5: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-core-0.5)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5edcf49c88..9c374fbdb1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13063,8 +13063,7 @@ (define-public rust-rand-core-0.5 "06bdvx08v3rkz451cm7z59xwwqn1rkfh6v9ay77b14f8dwlybgch")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) ("rust-serde" ,rust-serde-1.0)))) (home-page "https://crates.io/crates/rand-core") -- cgit v1.2.3 From 31b99b51a29c5386efb6e9218d65ecbf1cad56dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:27:02 +0200 Subject: gnu: rust-rand-chacha-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-chacha-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c374fbdb1..04321d6a82 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13042,8 +13042,7 @@ (define-public rust-rand-chacha-0.1 (base32 "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)) #:cargo-development-inputs (("rust-autocfg" ,rust-autocfg-0.1)))))) -- cgit v1.2.3 From 2f9182b6b7243a05c6d570c2ae56c115bfd0a226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:28:52 +0200 Subject: gnu: rust-rand-chacha-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-chacha-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 04321d6a82..f29469e4af 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13019,8 +13019,7 @@ (define-public rust-rand-chacha-0.2 "0lv8imzzl4h2glm6sjj8mkvasgi8jym23ya48dakyln7m06sk8h3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-c2-chacha" ,rust-c2-chacha-0.2) ("rust-rand-core" ,rust-rand-core-0.5)))) (home-page "https://crates.io/crates/rand-chacha") -- cgit v1.2.3 From 55d0d24f2e12250d3e70629b6e5eaa0a476b2668 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:36:08 +0200 Subject: gnu: rust-bindgen-0.50: Don't skip build. * gnu/packages/crates-io.scm (rust-bindgen-0.50)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f29469e4af..c2e3250529 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -988,8 +988,7 @@ (define-public rust-bindgen-0.50 "1k4n1d002vrfn1mlpww3ib7f275yn4rpxfwkqpr9bym27zg17ab5")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cexpr" ,rust-cexpr-0.3) ("rust-cfg-if" ,rust-cfg-if-0.1) -- cgit v1.2.3 From 5666f1f7848fcafa08a03bc04259b59acca43213 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:38:52 +0200 Subject: gnu: rust-generator-0.6: Update to 0.6.20. * gnu/packages/crates-io.scm (rust-generator-0.6): Upgrade to 0.6.20. [arguments]: Don't skip build. Move rust-cc-1.0 and rust-rustc-version-0.2 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2e3250529..2df3c350e9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -948,7 +948,7 @@ (define-public rust-bresenham-0.1 (define-public rust-generator-0.6 (package (name "rust-generator") - (version "0.6.18") + (version "0.6.20") (source (origin (method url-fetch) @@ -957,16 +957,14 @@ (define-public rust-generator-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0p4iq1n53dy72dhma02wfjrazf2hq2745f9si9yi7jxviks7c8l7")))) + "0f07mwkarwrqrykhkzqpvfnd5crz20dd8l24psn01kiqzc71dana")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc-1.0) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-cc" ,rust-cc-1.0) ("rust-rustc-version" ,rust-rustc-version-0.2)))) (home-page "https://github.com/Xudong-Huang/generator-rs") (synopsis "Stackfull Generator Library in Rust") -- cgit v1.2.3 From 4b7e3ba020ee1ac5ed7e051c7841150afcc46830 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:47:39 +0200 Subject: gnu: rust-loom-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-loom-0.1)[arguments]: Don't skip build. Replace rust-scoped-tls-1.0 with 0.1 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2df3c350e9..d3c67e04f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8814,12 +8814,11 @@ (define-public rust-loom-0.1 "1jmp5mffwwyqgp914cwz92ij2s6vk1hsnkvgndvzw74xrcfraibj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-futures" ,rust-futures-0.1) ("rust-generator" ,rust-generator-0.6) - ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-scoped-tls" ,rust-scoped-tls-0.1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0)))) -- cgit v1.2.3 From 03b5f8b1241fb61f29fa852a2f5a340e2da1b1b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:51:32 +0200 Subject: gnu: rust-lock-api-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-lock-api-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d3c67e04f3..89ee86540a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8754,8 +8754,7 @@ (define-public rust-lock-api-0.1 (base32 "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-scopeguard" ,rust-scopeguard-0.3) ("rust-owning-ref" ,rust-owning-ref-0.4)))))) -- cgit v1.2.3 From 134aaeafd7bdd22c9f166b0f04e65b1b1817eec4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:53:38 +0200 Subject: gnu: rust-lock-api-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-lock-api-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 89ee86540a..c2c1e1a97a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8712,8 +8712,7 @@ (define-public rust-lock-api-0.3 "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-owning-ref" ,rust-owning-ref-0.4) ("rust-scopeguard" ,rust-scopeguard-1.0) ("rust-serde" ,rust-serde-1.0)))) -- cgit v1.2.3 From 25aaf93bf7ebcd64970a86d7ae6b3f5f2b77d68a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 20:59:47 +0200 Subject: gnu: rust-paste-0.1: Upgrade to 0.1.7. * gnu/packages/crates-io.scm (rust-paste-0.1): Upgrade to 0.1.7. [arguments]: Don't skip build. (rust-paste-impl-0.1): Upgrade to 0.1.7. [arguments]: Don't skip build. Replace rust-proc-macro2-0.4 with 1.0, rust-syn-0.15 with 1.0 in cargo-inputs. --- gnu/packages/crates-io.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2c1e1a97a..ccb071bb3f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11484,7 +11484,7 @@ (define-public rust-partial-io-0.2 (define-public rust-paste-0.1 (package (name "rust-paste") - (version "0.1.5") + (version "0.1.7") (source (origin (method url-fetch) @@ -11493,11 +11493,10 @@ (define-public rust-paste-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ygs077hlq8qlx5y46sfgrmhlqqgkmvvhn4x3y10arawalf4ljhz")))) + "0in0dqar8s16w6gbwyzwvckm80ala02pq87innx1w6yp73kszqb3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-paste-impl" ,rust-paste-impl-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) (home-page "https://github.com/dtolnay/paste") @@ -11509,7 +11508,7 @@ (define-public rust-paste-0.1 (define-public rust-paste-impl-0.1 (package (name "rust-paste-impl") - (version "0.1.5") + (version "0.1.7") (source (origin (method url-fetch) @@ -11518,15 +11517,14 @@ (define-public rust-paste-impl-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rkh8nixmb7r1y0mjnsz62p6r1bqah5ciri7bwhmgcmq4gk9drr6")))) + "1fwj11j5lhya5fjr4gfljxfm74ahlr09c8xbb8f22hzpyskw8kbd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15)))) + ("rust-syn" ,rust-syn-1.0)))) (home-page "https://github.com/dtolnay/paste") (synopsis "Implementation detail of the paste crate") (description -- cgit v1.2.3 From dd19668e31abea7164b2509796d81f8162b6a0df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:04:07 +0200 Subject: gnu: rust-hex-literal-0.2: Upgrade to 0.2.1. * gnu/packages/crates-io.scm (rust-hex-literal-0.2): Upgrade to 0.2.1. [arguments]: Don't skip build. (rust-hex-literal-impl-0.2): Upgrade to 0.2.1. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ccb071bb3f..f41c0aa3ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7161,7 +7161,7 @@ (define-public rust-hex-0.3 (define-public rust-hex-literal-0.2 (package (name "rust-hex-literal") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -7170,11 +7170,10 @@ (define-public rust-hex-literal-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ni2nv3di0jpih2xnmlnr6s96zypkdr8xrw2cvk4f8fx5wb6inn3")))) + "1q36f0qq31ggh4ipcwb7a5g6jmci2010vn2v3qpaz4csxhhf47cn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-hex-literal-impl" ,rust-hex-literal-impl-0.2) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) (home-page "https://github.com/RustCrypto/utils") @@ -7207,7 +7206,7 @@ (define-public rust-hex-literal-0.1 (define-public rust-hex-literal-impl-0.2 (package (name "rust-hex-literal-impl") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -7216,11 +7215,10 @@ (define-public rust-hex-literal-impl-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04m6d1k57a9h3hhdgn0vq1hkfwjv9hfkw6q73bqn0my0qw45s286")))) + "0bgldhp5gdwwnikfdxigmz9b64qpgwbjqk6mfgv0pvig9s25qk4x")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) (home-page "https://github.com/RustCrypto/utils") (synopsis "Internal implementation of the hex-literal crate") -- cgit v1.2.3 From ec395e70cb609bac07fb0eb274728e56bc87ad45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:15:17 +0200 Subject: gnu: rust-ref-cast-0.2: Upgrade to 0.2.7. * gnu/packages/crates-io.scm (rust-ref-cast-0.2): Upgrade to 0.2.7. [arguments]: Don't skip build. Add rust-rustversion-0.1, rust-trybuild-1.0 to cargo-development-inputs. (rust-ref-cast-impl-0.2): Upgrade to 0.2.7. [arguments]: Inherit from rust-ref-cat-impl-1.0. --- gnu/packages/crates-io.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f41c0aa3ee..cbd93a6763 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13771,7 +13771,7 @@ (define-public rust-ref-cast-1.0 (define-public rust-ref-cast-0.2 (package (name "rust-ref-cast") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) @@ -13780,12 +13780,14 @@ (define-public rust-ref-cast-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0jgj1zxaikqm030flpifbp517fy4z21lly6ysbwyciii39bkzcf1")))) + "1fcbpfb7xhr992qvyfg9hr5p63xqykjp48pm3f7a1q21vmhzksvv")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-ref-cast-impl" ,rust-ref-cast-impl-0.2)))) + `(#:cargo-inputs + (("rust-ref-cast-impl" ,rust-ref-cast-impl-0.2)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-0.1) + ("rust-trybuild" ,rust-trybuild-1.0)))) (home-page "https://github.com/dtolnay/ref-cast") (synopsis "Safely cast &T to &U") (description @@ -13821,7 +13823,7 @@ (define-public rust-ref-cast-impl-0.2 (package (inherit rust-ref-cast-impl-1.0) (name "rust-ref-cast-impl") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) @@ -13830,12 +13832,7 @@ (define-public rust-ref-cast-impl-0.2 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hw0frpzna5rf5szix56zyzd0vackcb3svj94ndj629xi75dkb32")))) - (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))))) + "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck")))))) (define-public rust-regex-1.3 (package -- cgit v1.2.3 From c9e8a73372732c27cd963d17855fdc97d216dd09 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:20:07 +0200 Subject: gnu: Add rust-dissimilar-1.0. * gnu/packages/crates-io.scm (rust-dissimilar-1.0): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cbd93a6763..d0bca8742e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3950,6 +3950,27 @@ (define-public rust-dispatch-0.1 Central Dispatch.") (license license:expat))) +(define-public rust-dissimilar-1.0 + (package + (name "rust-dissimilar") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "dissimilar" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "154ba92ifmh3js1k0hbmxz7pv95n8wmahlyvhdbnxggbs8f1dpir")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/dissimilar") + (synopsis "Diff library with semantic cleanup") + (description + "This package provides a diff library with semantic cleanup, based on +Google's diff-match-patch.") + (license (list license:expat license:asl2.0)))) + (define-public rust-doc-comment-0.3 (package (name "rust-doc-comment") -- cgit v1.2.3 From 014e85493d7692247d07ba85848e68e125385aff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:27:51 +0200 Subject: gnu: rust-trybuild-1.0: Upgrade to 1.0.23. * gnu/packages/crates-io.scm (rust-trybuild-1.0): Upgrade to 1.0.23. [arguments]: Don't skip build. Add rust-dissimilar-1.0 to cargo-inputs. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d0bca8742e..b5672e6b3b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18674,7 +18674,7 @@ (define-public rust-try-lock-0.2 (define-public rust-trybuild-1.0 (package (name "rust-trybuild") - (version "1.0.9") + (version "1.0.23") (source (origin (method url-fetch) @@ -18683,12 +18683,12 @@ (define-public rust-trybuild-1.0 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0df6ipayif05xn61iavdb0dcshm9y6wmcd140pp7dl91mirygs7j")))) + "080j808nv6nyr1mmw23vwdp4rkk7r38nmms850rih8lsclc1pzr6")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-glob" ,rust-glob-0.3) + `(#:cargo-inputs + (("rust-dissimilar" ,rust-dissimilar-1.0) + ("rust-glob" ,rust-glob-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-json" ,rust-serde-json-1.0) -- cgit v1.2.3 From 573f299a94af0c66b12e7367b7ec297ed3e72bab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:53:56 +0200 Subject: gnu: rust-demo-hack-impl-0.0: Don't skip build. * gnu/packages/crates-io.scm (rust-demo-hack-impl-0.0)[arguments]: Don't skip build. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b5672e6b3b..735e04cdcf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3743,10 +3743,9 @@ (define-public rust-demo-hack-impl-0.0 "1f1fdl60xjas9wlmcl9v6f56vgm3mzwr019kcifav5464rx3w3ld")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))) (home-page "https://github.com/dtolnay/proc-macro-hack") (synopsis "Demo of proc-macro-hack") -- cgit v1.2.3 From 107afd67a294be1b1d6238da506a1f5355ac44b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 21:57:52 +0200 Subject: gnu: rust-demo-hack-0.0: Don't skip build. * gnu/packages/crates-io.scm (rust-demo-hack-0.0)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 735e04cdcf..1a69bd059a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3719,8 +3719,7 @@ (define-public rust-demo-hack-0.0 "0m0114p1g0zzrdph5bg03i8m8p70vrwn3whs191jrbjcrmh5lmnp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-demo-hack-impl" ,rust-demo-hack-impl-0.0) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) (home-page "https://github.com/dtolnay/proc-macro-hack") -- cgit v1.2.3 From 7239682f5abfc616d75219f300feb40040e2454f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:05:02 +0200 Subject: gnu: rust-flame-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-flame-0.2)[arguments]: Don't skip build. Replace rust-lazy-static-1 with 0.2 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a69bd059a..f08795c3b4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4975,9 +4975,8 @@ (define-public rust-flame-0.2 "0c5bmhyimzxch3pmh0w3z9n57saasgix4bmbbksr9vp1c5j71hhz")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-0.2) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) -- cgit v1.2.3 From 0e327e339b7a6012faed8d590756884b1974abba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:12:20 +0200 Subject: gnu: rust-flamer-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-flamer-0.3)[arguments]: Don't skip build. Skip tests. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f08795c3b4..659bfdb69b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5001,10 +5001,10 @@ (define-public rust-flamer-0.3 "1b2d7jx80f3p7hqpgdi7wksaiq18k9w23p0cs2sxf7jbx2jx3bgj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Uses features not available in stable Rust release #:cargo-inputs (("rust-flame" ,rust-flame-0.2) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))) (home-page "https://github.com/llogiq/flamer") (synopsis "Macro to insert @code{flame::start_guard(_)}") -- cgit v1.2.3 From 7fd3484686d2d19da0a66692351414d76d9c71a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:16:40 +0200 Subject: gnu: rust-futures-select-macro-preview-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-futures-select-macro-preview-0.3) [arguments]: Don't skip build. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 659bfdb69b..b250fe9ae7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5787,11 +5787,10 @@ (define-public rust-futures-select-macro-preview-0.3 "1a90ivjzkgz7msiz5si05xzi8xwsk5gar1gkrbmrgqpgkliqd7a6")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))) (home-page "https://github.com/rust-lang/futures-rs") (synopsis -- cgit v1.2.3 From 8758953924161ab2e23e33291a2513ebd7bdb60c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:26:35 +0200 Subject: gnu: rust-markup5ever-0.8: Don't skip build. * gnu/packages/crates-io.scm (rust-markup5ever-0.8)[arguments]: Don't skip build. Move all crates in cargo-development-inputs to cargo-inputs where build dependencies are located. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b250fe9ae7..be83b8cfc5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8991,14 +8991,12 @@ (define-public rust-markup5ever-0.8 "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-phf" ,rust-phf-0.7) ("rust-string-cache" ,rust-string-cache-0.7) - ("rust-tendril" ,rust-tendril-0.4)) - #:cargo-development-inputs - (("rust-phf-codegen" ,rust-phf-codegen-0.7) + ("rust-tendril" ,rust-tendril-0.4) + ("rust-phf-codegen" ,rust-phf-codegen-0.7) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) -- cgit v1.2.3 From bc249a10eb3e4bb902c6f35c308e74e884e64ba8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:30:17 +0200 Subject: gnu: rust-html5ever-0.23: Don't skip build. * gnu/packages/crates-io.scm (rust-html5ever-0.23)[arguments]: Don't skip build. Replace rust-quote-1.0 with 0.6. Move rust-proc-macro2-0.4, rust-quote-0.6, rust-syn-0.15 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be83b8cfc5..bb7869792b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7276,18 +7276,17 @@ (define-public rust-html5ever-0.23 "1dx8k7synrmf3fl6gcfm5q1cybfglvhc9xnvly3s5xcc0b45mrjw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-mac" ,rust-mac-0.1) - ("rust-markup5ever" ,rust-markup5ever-0.8)) + ("rust-markup5ever" ,rust-markup5ever-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-rustc-test" ,rust-rustc-test-0.3) - ("rust-syn" ,rust-syn-0.15) ("rust-typed-arena" ,rust-typed-arena-1.4)))) (home-page "https://github.com/servo/html5ever") (synopsis "High-performance browser-grade HTML5 parser") -- cgit v1.2.3 From b24510dcaa695d503291b74a8dbf802f0fcc5777 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:42:12 +0200 Subject: gnu: rust-scroll-0.9: Fix inputs. * gnu/packages/crates-io.scm (rust-scroll-0.9)[arguments]: Move rust-rustc-version-0.2 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb7869792b..c9fe01daa1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14794,11 +14794,11 @@ (define-public rust-scroll-0.9 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-scroll-derive" ,rust-scroll-derive-0.9)) + (("rust-scroll-derive" ,rust-scroll-derive-0.9) + ("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1.3) - ("rust-rayon" ,rust-rayon-1.1) - ("rust-rustc-version" ,rust-rustc-version-0.2)))) + ("rust-rayon" ,rust-rayon-1.1)))) (home-page "https://github.com/m4b/scroll") (synopsis "Read/Write traits for byte buffers") (description -- cgit v1.2.3 From af4bf10c1a6a260a79fcea3edbede8ae3934c38d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:43:32 +0200 Subject: gnu: rust-scroll-derive-0.9: Don't skip build. * gnu/packages/crates-io.scm (rust-scroll-derive-0.9)[arguments]: Don't skip build. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c9fe01daa1..cfbfe251b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14821,10 +14821,9 @@ (define-public rust-scroll-derive-0.9 "1jqg5mm8nvii6avl1z1rc89agzh2kwkppgpsnwfakxg78mnaj6lg")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)) #:cargo-development-inputs (("rust-scroll" ,rust-scroll-0.9)))) -- cgit v1.2.3 From 3fd8d20e56e1199c124af6d1d6dc2bb2b56943ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Feb 2020 22:45:33 +0200 Subject: gnu: rust-seahash-3.0: Upgrade to 3.0.7. * gnu/packages/crates-io.scm (rust-seahash-3.0): Upgrade to 3.0.7. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfbfe251b5..f676684650 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14837,7 +14837,7 @@ (define-public rust-scroll-derive-0.9 (define-public rust-seahash-3.0 (package (name "rust-seahash") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) @@ -14846,9 +14846,8 @@ (define-public rust-seahash-3.0 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pr8ijnxnp68ki4m4740yc5mr01zijf86yx07wbsqzwiyhghdmhq")))) + "0iqg12lxkn0ivsfa1gkylcwj5wmi6zl87mbizlrkg918s6hprxaq")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://gitlab.redox-os.org/redox-os/seahash") (synopsis -- cgit v1.2.3 From eb5eb9bb8ddb10aaaf29d12f988284a57dc66280 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:07:04 +0200 Subject: gnu: crates-io.scm: Sort alphabetically. * gnu/packages/crates-io.scm: Sort packages alphabetically. --- gnu/packages/crates-io.scm | 1514 ++++++++++++++++++++++---------------------- 1 file changed, 757 insertions(+), 757 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f676684650..3886a37538 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46,32 +46,6 @@ (define-module (gnu packages crates-io) ;;; Please: Try to add new module packages in alphabetic order. ;;; -(define-public rust-adler32-1.0 - (package - (name "rust-adler32") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "adler32" version)) - (file-name - (string-append name "-" version ".crate")) - (sha256 - (base32 - "1hnan4fgmnidgn2k84hh2i67c3wp2c5iwd5hs61yi7gwwx1p6bjx")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) - (home-page "https://github.com/remram44/adler32-rs") - (synopsis "Implementation of the Adler32 rolling hash algorithm") - (description - "This library is an implementation of the Adler32 rolling hash algorithm in -the Rust programming language.") - (license (list license:bsd-3 - license:zlib)))) - (define-public rust-addr2line-0.9 (package (name "rust-addr2line") @@ -110,6 +84,32 @@ (define-public rust-addr2line-0.9 Rust, using gimli.") (license (list license:asl2.0 license:expat)))) +(define-public rust-adler32-1.0 + (package + (name "rust-adler32") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "adler32" version)) + (file-name + (string-append name "-" version ".crate")) + (sha256 + (base32 + "1hnan4fgmnidgn2k84hh2i67c3wp2c5iwd5hs61yi7gwwx1p6bjx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/remram44/adler32-rs") + (synopsis "Implementation of the Adler32 rolling hash algorithm") + (description + "This library is an implementation of the Adler32 rolling hash algorithm in +the Rust programming language.") + (license (list license:bsd-3 + license:zlib)))) + (define-public rust-afl-0.4 (package (name "rust-afl") @@ -923,54 +923,6 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) -(define-public rust-bresenham-0.1 - (package - (name "rust-bresenham") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "bresenham" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1mvg3zcyll0m3z79jwbg183ha4kb7bw06rd286ijwvgn4mi13hdz")))) - (build-system cargo-build-system) - (home-page "https://github.com/mbr/bresenham-rs") - (synopsis - "Iterator-based integer-only implementation of Bresenham's line algorithm") - (description - "This package provides a fast, iterator-based integer-only implementation of -Bresenham's line algorithm.") - (license license:expat))) - -(define-public rust-generator-0.6 - (package - (name "rust-generator") - (version "0.6.20") - (source - (origin - (method url-fetch) - (uri (crate-uri "generator" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0f07mwkarwrqrykhkzqpvfnd5crz20dd8l24psn01kiqzc71dana")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-log" ,rust-log-0.4) - ("rust-winapi" ,rust-winapi-0.3) - ("rust-cc" ,rust-cc-1.0) - ("rust-rustc-version" ,rust-rustc-version-0.2)))) - (home-page "https://github.com/Xudong-Huang/generator-rs") - (synopsis "Stackfull Generator Library in Rust") - (description "Stackfull Generator Library in Rust.") - (license (list license:asl2.0 license:expat)))) - (define-public rust-bindgen-0.50 (package (name "rust-bindgen") @@ -1361,50 +1313,27 @@ (define-public rust-block-padding-0.1 "Padding and unpadding of messages divided into blocks.") (license (list license:asl1.1 license:expat)))) -(define-public rust-bumpalo-3 +(define-public rust-bresenham-0.1 (package - (name "rust-bumpalo") - (version "3.2.0") + (name "rust-bresenham") + (version "0.1.1") (source (origin (method url-fetch) - (uri (crate-uri "bumpalo" version)) + (uri (crate-uri "bresenham" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hpp4wfcn04gnl1ji4a80b85xwknsci81xqyllq174gq9z0rsd8z")))) + "1mvg3zcyll0m3z79jwbg183ha4kb7bw06rd286ijwvgn4mi13hdz")))) (build-system cargo-build-system) - (arguments - `(#:tests? #f ; cargo_readme_up_to_date test fails - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/fitzgen/bumpalo") - (synopsis "Fast bump allocation arena for Rust") + (home-page "https://github.com/mbr/bresenham-rs") + (synopsis + "Iterator-based integer-only implementation of Bresenham's line algorithm") (description - "This package provides a fast bump allocation arena for Rust.") - (license (list license:asl2.0 license:expat)))) - -(define-public rust-bumpalo-2.5 - (package - (inherit rust-bumpalo-3) - (name "rust-bumpalo") - (version "2.5.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "bumpalo" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "018b5calz3895v04shk9bn7i73r4zf8yf7p1dqg92s3xya13vm1c")))) - (arguments - `(#:skip-build? #t - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.2) - ("rust-quickcheck" ,rust-quickcheck-0.8)))))) + "This package provides a fast, iterator-based integer-only implementation of +Bresenham's line algorithm.") + (license license:expat))) (define-public rust-bstr-0.2 (package @@ -1454,6 +1383,51 @@ (define-public rust-bstr-0.1 (base32 "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r")))))) +(define-public rust-bumpalo-3 + (package + (name "rust-bumpalo") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bumpalo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hpp4wfcn04gnl1ji4a80b85xwknsci81xqyllq174gq9z0rsd8z")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cargo_readme_up_to_date test fails + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/fitzgen/bumpalo") + (synopsis "Fast bump allocation arena for Rust") + (description + "This package provides a fast bump allocation arena for Rust.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-bumpalo-2.5 + (package + (inherit rust-bumpalo-3) + (name "rust-bumpalo") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bumpalo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "018b5calz3895v04shk9bn7i73r4zf8yf7p1dqg92s3xya13vm1c")))) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.8)))))) + (define-public rust-byte-tools-0.3 (package (name "rust-byte-tools") @@ -1916,41 +1890,6 @@ (define-public rust-cexpr-0.2 (inputs `(("libclang" ,clang))))) -(define-public rust-chrono-0.4 - (package - (name "rust-chrono") - (version "0.4.7") - (source - (origin - (method url-fetch) - (uri (crate-uri "chrono" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1glam3iqhshbamzgf0npn7hgghski92r31lm7gg8841hnxc1zn3p")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-num-integer" ,rust-num-integer-0.1) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) - ("rust-serde" ,rust-serde-1.0) - ("rust-time" ,rust-time-0.1)) - #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1.1) - ("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-num-iter" ,rust-num-iter-0.1) - ("rust-serde-derive" ,rust-serde-derive-1.0) - ("rust-serde-json" ,rust-serde-json-1.0)))) - (home-page - "https://github.com/chronotope/chrono") - (synopsis "Date and time library for Rust") - (description "Date and time library for Rust.") - (license (list license:expat license:asl2.0)))) - (define-public rust-cfg-if-0.1 (package (name "rust-cfg-if") @@ -2079,44 +2018,79 @@ (define-public rust-cgmath-0.16 (;("rust-glium" ,rust-glium-0.19) ("rust-serde-json" ,rust-serde-json-1.0)))))) -(define-public rust-ci-info-0.3 +(define-public rust-chrono-0.4 (package - (name "rust-ci-info") - (version "0.3.1") + (name "rust-chrono") + (version "0.4.7") (source (origin (method url-fetch) - (uri (crate-uri "ci-info" version)) + (uri (crate-uri "chrono" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75")))) + "1glam3iqhshbamzgf0npn7hgghski92r31lm7gg8841hnxc1zn3p")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-serde" ,rust-serde-1.0) - ("rust-serde-derive" ,rust-serde-derive-1.0)))) - (home-page "https://github.com/sagiegurari/ci_info") - (synopsis "Provides current CI environment information") - (description - "This package provides current CI environment information.") - (license license:asl2.0))) - -(define-public rust-clang-sys-0.28 - (package - (name "rust-clang-sys") - (version "0.28.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "clang-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) - (build-system cargo-build-system) + (("rust-libc" ,rust-libc-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-time" ,rust-time-0.1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page + "https://github.com/chronotope/chrono") + (synopsis "Date and time library for Rust") + (description "Date and time library for Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-ci-info-0.3 + (package + (name "rust-ci-info") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ci-info" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00pr17g6q6i752acrkycg0hkq3lm0p634anm41g3m6lqg8q83s75")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page "https://github.com/sagiegurari/ci_info") + (synopsis "Provides current CI environment information") + (description + "This package provides current CI environment information.") + (license license:asl2.0))) + +(define-public rust-clang-sys-0.28 + (package + (name "rust-clang-sys") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "clang-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) + (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-glob" ,rust-glob-0.3) @@ -2858,6 +2832,35 @@ (define-public rust-core-video-sys-0.1 "Bindings to CoreVideo.framework for macOS and iOS.") (license license:expat))) +(define-public rust-cpp-demangle-0.2 + (package + (name "rust-cpp-demangle") + (version "0.2.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpp_demangle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a4hqsfc0sfdwy7pcr0rc1fjp2j47fxbkqfc2lfrbi4zlm5hq36k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-afl" ,rust-afl-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-glob" ,rust-glob-0.3)))) + (home-page "https://github.com/gimli-rs/cpp_demangle") + (synopsis "Demangle C++ symbols") + (description + "This package provides a crate for demangling C++ symbols.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") @@ -3651,59 +3654,6 @@ (define-public rust-defmac-0.1 (base32 "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) -(define-public rust-dlib-0.4 - (package - (name "rust-dlib") - (version "0.4.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "dlib" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0smp2cdvy12xfw26qyqms273w5anszfadv73g75s88yqm54i5rbp")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libloading" ,rust-libloading-0.5)))) - (home-page "https://github.com/vberger/dlib") - (synopsis "Helper macros for manually loading optional system libraries") - (description - "This package provides helper macros for handling manually loading optional -system libraries.") - (license license:expat))) - -(define-public rust-cpp-demangle-0.2 - (package - (name "rust-cpp-demangle") - (version "0.2.12") - (source - (origin - (method url-fetch) - (uri (crate-uri "cpp_demangle" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0a4hqsfc0sfdwy7pcr0rc1fjp2j47fxbkqfc2lfrbi4zlm5hq36k")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-afl" ,rust-afl-0.4) - ("rust-cfg-if" ,rust-cfg-if-0.1)) - #:cargo-development-inputs - (("rust-clap" ,rust-clap-2) - ("rust-diff" ,rust-diff-0.1) - ("rust-glob" ,rust-glob-0.3)))) - (home-page "https://github.com/gimli-rs/cpp_demangle") - (synopsis "Demangle C++ symbols") - (description - "This package provides a crate for demangling C++ symbols.") - (license (list license:expat license:asl2.0)))) - (define-public rust-demo-hack-0.0 (package (name "rust-demo-hack") @@ -3969,6 +3919,30 @@ (define-public rust-dissimilar-1.0 Google's diff-match-patch.") (license (list license:expat license:asl2.0)))) +(define-public rust-dlib-0.4 + (package + (name "rust-dlib") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "dlib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0smp2cdvy12xfw26qyqms273w5anszfadv73g75s88yqm54i5rbp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libloading" ,rust-libloading-0.5)))) + (home-page "https://github.com/vberger/dlib") + (synopsis "Helper macros for manually loading optional system libraries") + (description + "This package provides helper macros for handling manually loading optional +system libraries.") + (license license:expat))) + (define-public rust-doc-comment-0.3 (package (name "rust-doc-comment") @@ -6016,6 +5990,32 @@ (define-public rust-gdi32-sys-0.2 API library @code{gdi32}.") (license license:expat))) +(define-public rust-generator-0.6 + (package + (name "rust-generator") + (version "0.6.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "generator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f07mwkarwrqrykhkzqpvfnd5crz20dd8l24psn01kiqzc71dana")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-cc" ,rust-cc-1.0) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/Xudong-Huang/generator-rs") + (synopsis "Stackfull Generator Library in Rust") + (description "Stackfull Generator Library in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-generic-array-0.13 (package (name "rust-generic-array") @@ -7261,6 +7261,30 @@ (define-public rust-hex-literal-impl-0.1 `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.4)))))) +(define-public rust-hostname-0.1 + (package + (name "rust-hostname") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "hostname" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winutil" ,rust-winutil-0.1)))) + (home-page "https://github.com/svartalf/hostname") + (synopsis "Get hostname for Rust") + (description + "Get hostname for Rust.") + (license license:expat))) + (define-public rust-html5ever-0.23 (package (name "rust-html5ever") @@ -7424,30 +7448,6 @@ (define-public rust-humantime-1.2 (base32 "057ilhy6vc9iqhhby5ymh45m051pgxwq2z437gwkbnqhw7rfb9rw")))))) -(define-public rust-hostname-0.1 - (package - (name "rust-hostname") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (crate-uri "hostname" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-winutil" ,rust-winutil-0.1)))) - (home-page "https://github.com/svartalf/hostname") - (synopsis "Get hostname for Rust") - (description - "Get hostname for Rust.") - (license license:expat))) - (define-public rust-idna-0.2 (package (name "rust-idna") @@ -8016,96 +8016,10 @@ (define-public rust-itoa-0.1 (base32 "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) -(define-public rust-jobserver-0.1 +(define-public rust-jemalloc-sys-0.3 (package - (name "rust-jobserver") - (version "0.1.19") - (source - (origin - (method url-fetch) - (uri (crate-uri "jobserver" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1q2w80v8p2pbfm8ayhjs6zi11a1hp4535z4ck8kg872z8ldnrc37")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2)) - #:cargo-development-inputs - (("rust-futures" ,rust-futures-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.10) - ("rust-tempdir" ,rust-tempdir-0.3) - ("rust-tokio-core" ,rust-tokio-core-0.1) - ("rust-tokio-process" ,rust-tokio-process-0.2)))) - (home-page "https://github.com/alexcrichton/jobserver-rs") - (synopsis "GNU make jobserver for Rust") - (description - "An implementation of the GNU make jobserver for Rust.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-jpeg-decoder-0.1 - (package - (name "rust-jpeg-decoder") - (version "0.1.18") - (source - (origin - (method url-fetch) - (uri (crate-uri "jpeg-decoder" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0lc428qgffh2a1agkq0p26mvf9rjaiswpywy5883j99mqypg0mh2")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f ; Some test files missing. - #:cargo-inputs - (("rust-byteorder" ,rust-byteorder-1.3) - ("rust-rayon" ,rust-rayon-1.1)) - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-png" ,rust-png-0.14) - ("rust-walkdir" ,rust-walkdir-2.2)))) - (home-page "https://github.com/image-rs/jpeg-decoder") - (synopsis "JPEG decoder") - (description "JPEG decoder written in Rust.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-js-sys-0.3 - (package - (name "rust-js-sys") - (version "0.3.35") - (source - (origin - (method url-fetch) - (uri (crate-uri "js-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1ybwazllkbif71i195dadgrsw64k6l04ggk5yimiy5c2cb1wg2bq")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) - #:cargo-development-inputs - (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) - ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) - (home-page "https://rustwasm.github.io/wasm-bindgen/") - (synopsis "Bindings for all JS global objects and functions in WASM") - (description - "Bindings for all JS global objects and functions in all JS environments -like Node.js and browsers, built on @code{#[wasm_bindgen]} using the -wasm-bindgen crate.") - (license (list license:asl2.0 license:expat)))) - -(define-public rust-jemalloc-sys-0.3 - (package - (name "rust-jemalloc-sys") - (version "0.3.2") + (name "rust-jemalloc-sys") + (version "0.3.2") (source (origin (method url-fetch) @@ -8215,6 +8129,92 @@ (define-public rust-jemallocator-0.1 (native-inputs `(("jemalloc" ,jemalloc))))) +(define-public rust-jobserver-0.1 + (package + (name "rust-jobserver") + (version "0.1.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "jobserver" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q2w80v8p2pbfm8ayhjs6zi11a1hp4535z4ck8kg872z8ldnrc37")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-tokio-core" ,rust-tokio-core-0.1) + ("rust-tokio-process" ,rust-tokio-process-0.2)))) + (home-page "https://github.com/alexcrichton/jobserver-rs") + (synopsis "GNU make jobserver for Rust") + (description + "An implementation of the GNU make jobserver for Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-jpeg-decoder-0.1 + (package + (name "rust-jpeg-decoder") + (version "0.1.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "jpeg-decoder" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lc428qgffh2a1agkq0p26mvf9rjaiswpywy5883j99mqypg0mh2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files missing. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-rayon" ,rust-rayon-1.1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-png" ,rust-png-0.14) + ("rust-walkdir" ,rust-walkdir-2.2)))) + (home-page "https://github.com/image-rs/jpeg-decoder") + (synopsis "JPEG decoder") + (description "JPEG decoder written in Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-js-sys-0.3 + (package + (name "rust-js-sys") + (version "0.3.35") + (source + (origin + (method url-fetch) + (uri (crate-uri "js-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ybwazllkbif71i195dadgrsw64k6l04ggk5yimiy5c2cb1wg2bq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Bindings for all JS global objects and functions in WASM") + (description + "Bindings for all JS global objects and functions in all JS environments +like Node.js and browsers, built on @code{#[wasm_bindgen]} using the +wasm-bindgen crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-json-0.11 (package (name "rust-json") @@ -8645,96 +8645,254 @@ (define-public rust-libm-0.1 (base32 "16pc0gx4gkg0q2s1ssq8268brn14j8344623vwhadmivc4lsmivz")))))) -(define-public rust-libssh2-sys-0.2 +(define-public rust-libnghttp2-sys-0.1 (package - (name "rust-libssh2-sys") - (version "0.2.14") + (name "rust-libnghttp2-sys") + (version "0.1.2") (source (origin (method url-fetch) - (uri (crate-uri "libssh2-sys" version)) + (uri (crate-uri "libnghttp2-sys" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982")))) + (build-system cargo-build-system) + ;(inputs + ; `(("nghttp2" ,nghttp2))) + (home-page "https://github.com/alexcrichton/nghttp2-rs") + (synopsis "FFI bindings for libnghttp2 (nghttp2)") + (description + "This package provides FFI bindings for libnghttp2 (nghttp2).") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-libz-sys-1.0 + (package + (name "rust-libz-sys") + (version "1.0.25") + (source + (origin + (method url-fetch) + (uri (crate-uri "libz-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain")) + "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f")) (modules '((guix build utils))) (snippet - '(begin (delete-file-recursively "libssh2") #t)))) + '(begin (delete-file-recursively "src/zlib") #t)))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-libz-sys" ,rust-libz-sys-1.0) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) ;; Build dependencies: ("rust-cc" ,rust-cc-1.0) ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-vcpkg" ,rust-vcpkg-0.2)) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'dont-vendor-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl"))) - (setenv "OPENSSL_DIR" openssl)) - #t))))) + ("rust-vcpkg" ,rust-vcpkg-0.2)))) (native-inputs - `(("libssh2" ,libssh2) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("zlib" ,zlib))) - (home-page "https://github.com/alexcrichton/ssh2-rs") - (synopsis "Native bindings to the libssh2 library") + (home-page "https://github.com/rust-lang/libz-sys") + (synopsis "Bindings to the system libz library") (description - "This package provides native rust bindings to the @code{libssh2} library.") + "This package provides bindings to the system @code{libz} library (also +known as zlib).") (license (list license:asl2.0 license:expat)))) -(define-public rust-locale-0.2 - (package - (name "rust-locale") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "locale" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1z87wc7z6889x1pqlrwjw8f1crshzi15q5m102lqs8y0m69f9nsz")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/rust-locale/rust-locale") - (synopsis "Library for basic localisation") - (description - "This package provides a library for basic localisation.") - (license license:expat))) - -(define-public rust-lock-api-0.3 +(define-public rust-line-drawing-0.7 (package - (name "rust-lock-api") - (version "0.3.3") + (name "rust-line-drawing") + (version "0.7.0") (source (origin (method url-fetch) - (uri (crate-uri "lock_api" version)) + (uri (crate-uri "line_drawing" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr")))) + "1fcna7hq1g1kkkqy07hydscx5d2zgb6gskz3vnsvsif8h8ysvisw")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-owning-ref" ,rust-owning-ref-0.4) - ("rust-scopeguard" ,rust-scopeguard-1.0) - ("rust-serde" ,rust-serde-1.0)))) - (home-page "https://github.com/Amanieu/parking_lot") - (synopsis - "Wrappers to create fully-featured Mutex and RwLock types") - (description - "This package provides wrappers to create fully-featured @code{Mutex} and + ;; This version does not specify any versions on dependants. + `(#:tests? #f ; Cannot compile line_drawing for the test suite. + #:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-bresenham" ,rust-bresenham-0.1) + ("rust-image" ,rust-image-0.22) ; 0.17? + ("rust-rand" ,rust-rand-0.6)))) + (home-page "https://github.com/expenses/line_drawing") + (synopsis "Collection of line-drawing algorithms") + (description + "This package provides a collection of line-drawing algorithms for use in +graphics and video games.") + (license license:expat))) + +(define-public rust-linked-hash-map-0.5 + (package + (name "rust-linked-hash-map") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10qgbvh00q36ql0jh00rxh2jlq6qvl11n6mig0cvkpf4xf5bd4df")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-heapsize" ,rust-heapsize-0.4) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-test" ,rust-serde-test-1.0)))) + (home-page + "https://github.com/contain-rs/linked-hash-map") + (synopsis + "HashMap wrapper that holds key-value pairs in insertion order") + (description + "This package provides a HashMap wrapper that holds key-value +pairs in insertion order.") + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-linked-hash-map-0.4 + (package + (inherit rust-linked-hash-map-0.5) + (name "rust-linked-hash-map") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fd958y02ggwpa2246kmjky9xmnww7vxg0ik3rxgy23hgwlyqq3q")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-heapsize" ,rust-heapsize-0.3) + ("rust-serde" ,rust-serde-0.9) + ("rust-serde-test" ,rust-serde-test-0.9)))))) + +(define-public rust-linked-hash-map-0.3 + (package + (inherit rust-linked-hash-map-0.5) + (name "rust-linked-hash-map") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-serde" ,rust-serde-0.8) + ("rust-serde-test" ,rust-serde-test-0.8)))))) + +(define-public rust-libssh2-sys-0.2 + (package + (name "rust-libssh2-sys") + (version "0.2.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "libssh2-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "libssh2") #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'dont-vendor-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))) + (native-inputs + `(("libssh2" ,libssh2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) + (home-page "https://github.com/alexcrichton/ssh2-rs") + (synopsis "Native bindings to the libssh2 library") + (description + "This package provides native rust bindings to the @code{libssh2} library.") + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-locale-0.2 + (package + (name "rust-locale") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "locale" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z87wc7z6889x1pqlrwjw8f1crshzi15q5m102lqs8y0m69f9nsz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/rust-locale/rust-locale") + (synopsis "Library for basic localisation") + (description + "This package provides a library for basic localisation.") + (license license:expat))) + +(define-public rust-lock-api-0.3 + (package + (name "rust-lock-api") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "lock_api" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-scopeguard" ,rust-scopeguard-1.0) + ("rust-serde" ,rust-serde-1.0)))) + (home-page "https://github.com/Amanieu/parking_lot") + (synopsis + "Wrappers to create fully-featured Mutex and RwLock types") + (description + "This package provides wrappers to create fully-featured @code{Mutex} and @code{RwLock} types. It is compatible with @code{no_std}.") (license (list license:expat license:asl2.0)))) @@ -8839,6 +8997,31 @@ (define-public rust-loom-0.1 (description "Model checker for concurrent code.") (license license:expat))) +(define-public rust-lscolors-0.6 + (package + (name "rust-lscolors") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lscolors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jxsgkn378kxkiqdshdjdclw5wwp2xaz45cqd3yw85fhn8a38fza")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/sharkdp/lscolors") + (synopsis "Colorize paths using the LS_COLORS environment variable") + (description + "Colorize paths using the LS_COLORS environment variable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-lzma-sys-0.1 (package (name "rust-lzma-sys") @@ -9830,189 +10013,6 @@ (define-public rust-netlib-src-0.7 (license (list license:asl2.0 license:expat)))) -(define-public rust-libnghttp2-sys-0.1 - (package - (name "rust-libnghttp2-sys") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "libnghttp2-sys" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982")))) - (build-system cargo-build-system) - ;(inputs - ; `(("nghttp2" ,nghttp2))) - (home-page "https://github.com/alexcrichton/nghttp2-rs") - (synopsis "FFI bindings for libnghttp2 (nghttp2)") - (description - "This package provides FFI bindings for libnghttp2 (nghttp2).") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define-public rust-libz-sys-1.0 - (package - (name "rust-libz-sys") - (version "1.0.25") - (source - (origin - (method url-fetch) - (uri (crate-uri "libz-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "src/zlib") #t)))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ;; Build dependencies: - ("rust-cc" ,rust-cc-1.0) - ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-vcpkg" ,rust-vcpkg-0.2)))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("zlib" ,zlib))) - (home-page "https://github.com/rust-lang/libz-sys") - (synopsis "Bindings to the system libz library") - (description - "This package provides bindings to the system @code{libz} library (also -known as zlib).") - (license (list license:asl2.0 - license:expat)))) - -(define-public rust-line-drawing-0.7 - (package - (name "rust-line-drawing") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "line_drawing" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1fcna7hq1g1kkkqy07hydscx5d2zgb6gskz3vnsvsif8h8ysvisw")))) - (build-system cargo-build-system) - (arguments - ;; This version does not specify any versions on dependants. - `(#:tests? #f ; Cannot compile line_drawing for the test suite. - #:cargo-inputs - (("rust-num-traits" ,rust-num-traits-0.2)) - #:cargo-development-inputs - (("rust-bresenham" ,rust-bresenham-0.1) - ("rust-image" ,rust-image-0.22) ; 0.17? - ("rust-rand" ,rust-rand-0.6)))) - (home-page "https://github.com/expenses/line_drawing") - (synopsis "Collection of line-drawing algorithms") - (description - "This package provides a collection of line-drawing algorithms for use in -graphics and video games.") - (license license:expat))) - -(define-public rust-linked-hash-map-0.5 - (package - (name "rust-linked-hash-map") - (version "0.5.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "linked-hash-map" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "10qgbvh00q36ql0jh00rxh2jlq6qvl11n6mig0cvkpf4xf5bd4df")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-clippy" ,rust-clippy-0.0) - ("rust-heapsize" ,rust-heapsize-0.4) - ("rust-serde" ,rust-serde-1.0) - ("rust-serde-test" ,rust-serde-test-1.0)))) - (home-page - "https://github.com/contain-rs/linked-hash-map") - (synopsis - "HashMap wrapper that holds key-value pairs in insertion order") - (description - "This package provides a HashMap wrapper that holds key-value -pairs in insertion order.") - (license (list license:asl2.0 - license:expat)))) - -(define-public rust-linked-hash-map-0.4 - (package - (inherit rust-linked-hash-map-0.5) - (name "rust-linked-hash-map") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "linked-hash-map" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0fd958y02ggwpa2246kmjky9xmnww7vxg0ik3rxgy23hgwlyqq3q")))) - (arguments - `(#:cargo-inputs - (("rust-clippy" ,rust-clippy-0.0) - ("rust-heapsize" ,rust-heapsize-0.3) - ("rust-serde" ,rust-serde-0.9) - ("rust-serde-test" ,rust-serde-test-0.9)))))) - -(define-public rust-linked-hash-map-0.3 - (package - (inherit rust-linked-hash-map-0.5) - (name "rust-linked-hash-map") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "linked-hash-map" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd")))) - (arguments - `(#:cargo-inputs - (("rust-clippy" ,rust-clippy-0.0) - ("rust-serde" ,rust-serde-0.8) - ("rust-serde-test" ,rust-serde-test-0.8)))))) - -(define-public rust-lscolors-0.6 - (package - (name "rust-lscolors") - (version "0.6.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "lscolors" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0jxsgkn378kxkiqdshdjdclw5wwp2xaz45cqd3yw85fhn8a38fza")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3.1)))) - (home-page "https://github.com/sharkdp/lscolors") - (synopsis "Colorize paths using the LS_COLORS environment variable") - (description - "Colorize paths using the LS_COLORS environment variable.") - (license (list license:expat license:asl2.0)))) - (define-public rust-new-debug-unreachable-1.0 (package (name "rust-new-debug-unreachable") @@ -10072,69 +10072,6 @@ (define-public rust-nix-0.15 "Rust friendly bindings to *nix APIs.") (license license:expat))) -(define-public rust-no-panic-0.1 - (package - (name "rust-no-panic") - (version "0.1.12") - (source - (origin - (method url-fetch) - (uri (crate-uri "no-panic" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0xan5v9ac1aklinc8aw16raq36pb4idjrl502np8gy32gfs6s751")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1.0) - ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-1.0)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3.1)))) - (home-page "https://github.com/dtolnay/no-panic") - (synopsis "Prove a function can't ever panic") - (description - "This package provides a rust attribute macro to require that the compiler -prove a function can't ever panic.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-notify-4 - (package - (name "rust-notify") - (version "4.0.14") - (source - (origin - (method url-fetch) - (uri (crate-uri "notify" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12vpbg8j49196rxkm01hw2xfr0mk005ljmx0p9kwf6xj6gy2i5hr")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-filetime" ,rust-filetime-0.2) - ("rust-fsevent" ,rust-fsevent-0.4) - ("rust-fsevent-sys" ,rust-fsevent-sys-2) - ("rust-inotify" ,rust-inotify-0.6) - ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) - ("rust-libc" ,rust-libc-0.2) - ("rust-mio" ,rust-mio-0.6) - ("rust-mio-extras" ,rust-mio-extras-2) - ("rust-walkdir" ,rust-walkdir-2.2) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://github.com/passcod/notify") - (synopsis "Cross-platform filesystem notification library") - (description - "Cross-platform filesystem notification library.") - (license license:cc0))) - (define-public rust-nix-0.14 (package (inherit rust-nix-0.15) @@ -10165,6 +10102,34 @@ (define-public rust-nix-0.14 ("rust-sysctl" ,rust-sysctl-0.1) ("rust-tempfile" ,rust-tempfile-3.0)))))) +(define-public rust-no-panic-0.1 + (package + (name "rust-no-panic") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "no-panic" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xan5v9ac1aklinc8aw16raq36pb4idjrl502np8gy32gfs6s751")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/dtolnay/no-panic") + (synopsis "Prove a function can't ever panic") + (description + "This package provides a rust attribute macro to require that the compiler +prove a function can't ever panic.") + (license (list license:expat license:asl2.0)))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") @@ -10283,6 +10248,41 @@ (define-public rust-nom-1.2 ;; This is an ancient version and all inputs are optional. `(#:skip-build? #t)))) +(define-public rust-notify-4 + (package + (name "rust-notify") + (version "4.0.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "notify" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12vpbg8j49196rxkm01hw2xfr0mk005ljmx0p9kwf6xj6gy2i5hr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-fsevent" ,rust-fsevent-0.4) + ("rust-fsevent-sys" ,rust-fsevent-sys-2) + ("rust-inotify" ,rust-inotify-0.6) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://github.com/passcod/notify") + (synopsis "Cross-platform filesystem notification library") + (description + "Cross-platform filesystem notification library.") + (license license:cc0))) + (define-public rust-num-0.2 (package (name "rust-num") @@ -11243,6 +11243,31 @@ (define-public rust-pad-0.1 "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-parity-wasm-0.40 + (package + (name "rust-parity-wasm") + (version "0.40.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "parity-wasm" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "03qycy21avz4970zc7aj8rj5h4wvi4qsrc90a6hpws1a56mglf8y")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-development-inputs + (("rust-time" ,rust-time-0.1)))) + (home-page "https://github.com/paritytech/parity-wasm") + (synopsis "Low-level WebAssembly format library") + (description + "This package provides a WebAssembly binary format serialization, +deserialization, and interpreter in Rust.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-parking-lot-0.10 (package (name "rust-parking-lot") @@ -11438,31 +11463,6 @@ (define-public rust-parking-lot-core-0.4 (base32 "1jcq8aq4wv9y5fip7jg12jdwjd5g5r3x857xdma8vcin769cgj4l")))))) -(define-public rust-parity-wasm-0.40 - (package - (name "rust-parity-wasm") - (version "0.40.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "parity-wasm" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "03qycy21avz4970zc7aj8rj5h4wvi4qsrc90a6hpws1a56mglf8y")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f - #:cargo-development-inputs - (("rust-time" ,rust-time-0.1)))) - (home-page "https://github.com/paritytech/parity-wasm") - (synopsis "Low-level WebAssembly format library") - (description - "This package provides a WebAssembly binary format serialization, -deserialization, and interpreter in Rust.") - (license (list license:asl2.0 - license:expat)))) - (define-public rust-partial-io-0.2 (package (name "rust-partial-io") @@ -15501,37 +15501,6 @@ (define-public rust-serde-yaml-0.8 (description "YAML support for Serde.") (license (list license:asl2.0 license:expat)))) -(define-public rust-servo-freetype-sys-4 - (package - (name "rust-servo-freetype-sys") - (version "4.0.5") - (source - (origin - (method url-fetch) - (uri (crate-uri "servo-freetype-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1z0dvnakans4vn4vlpx4nxg984427lh8dskxxz9pglij1mnwnk1c")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "freetype2") #t)))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cmake" ,rust-cmake-0.1) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("freetype" ,freetype))) - (home-page "http://www.freetype.org/") - (synopsis "Rust wrapper around freetype") - (description - "This package provides a Rust wrapper around the FreeType library.") - (license license:mpl2.0))) ; build.rs is mpl2.0 - (define-public rust-servo-fontconfig-0.4 (package (name "rust-servo-fontconfig") @@ -15594,6 +15563,37 @@ (define-public rust-servo-fontconfig-sys-4 "This package provides a Rust wrapper around Fontxonfig.") (license license:mpl2.0))) ; build.rs is mpl2.0 +(define-public rust-servo-freetype-sys-4 + (package + (name "rust-servo-freetype-sys") + (version "4.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-freetype-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z0dvnakans4vn4vlpx4nxg984427lh8dskxxz9pglij1mnwnk1c")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "freetype2") #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("freetype" ,freetype))) + (home-page "http://www.freetype.org/") + (synopsis "Rust wrapper around freetype") + (description + "This package provides a Rust wrapper around the FreeType library.") + (license license:mpl2.0))) ; build.rs is mpl2.0 + (define-public rust-sha-1-0.8 (package (name "rust-sha-1") @@ -17131,6 +17131,26 @@ (define-public rust-sysctl-0.1 ("rust-errno" ,rust-errno-0.2) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-takeable-option-0.4 + (package + (name "rust-takeable-option") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "takeable-option" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hvd6vk4ksgg2y99498jw52ric4lxm0i6ygpzqm95gdrhvsxyynp")))) + (build-system cargo-build-system) + (home-page "https://docs.rs/takeable-option/") + (synopsis "A small wrapper around option.") + (description + "This package provides a small wrapper around option.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-tar-0.4 (package (name "rust-tar") @@ -17164,26 +17184,6 @@ (define-public rust-tar-0.4 (license (list license:asl2.0 license:expat)))) -(define-public rust-takeable-option-0.4 - (package - (name "rust-takeable-option") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "takeable-option" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0hvd6vk4ksgg2y99498jw52ric4lxm0i6ygpzqm95gdrhvsxyynp")))) - (build-system cargo-build-system) - (home-page "https://docs.rs/takeable-option/") - (synopsis "A small wrapper around option.") - (description - "This package provides a small wrapper around option.") - (license (list license:asl2.0 license:expat)))) - (define-public rust-target-build-utils-0.3 (package (name "rust-target-build-utils") @@ -20120,48 +20120,6 @@ (define-public rust-wasm-bindgen-webidl-0.2 "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) -(define-public rust-wayland-sys-0.23 - (package - (name "rust-wayland-sys") - (version "0.23.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "wayland-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-dlib" ,rust-dlib-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis "FFI bindings to the various libwayland-*.so libraries") - (description - "FFI bindings to the various libwayland-*.so libraries. -You should only need this crate if you are working on custom wayland -protocol extensions. Look at the crate wayland-client for usable bindings.") - (license license:expat))) - -(define-public rust-wayland-sys-0.21 - (package - (inherit rust-wayland-sys-0.23) - (name "rust-wayland-sys") - (version "0.21.13") - (source - (origin - (method url-fetch) - (uri (crate-uri "wayland-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) - (define-public rust-wayland-client-0.23 (package (name "rust-wayland-client") @@ -20425,6 +20383,48 @@ (define-public rust-wayland-server-0.21 ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) +(define-public rust-wayland-sys-0.23 + (package + (name "rust-wayland-sys") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "FFI bindings to the various libwayland-*.so libraries") + (description + "FFI bindings to the various libwayland-*.so libraries. +You should only need this crate if you are working on custom wayland +protocol extensions. Look at the crate wayland-client for usable bindings.") + (license license:expat))) + +(define-public rust-wayland-sys-0.21 + (package + (inherit rust-wayland-sys-0.23) + (name "rust-wayland-sys") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From ddba2afe53883171f656dbb84e009c0227eadcac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:11:42 +0200 Subject: gnu: rust-synstructure-0.10: Don't skip build. * gnu/packages/crates-io.scm (rust-synstructure-0.10)[arguments]: Don't skip build. Replace rust-quote-1.0 with 0.6 in cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3886a37538..aef1c78198 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16946,10 +16946,9 @@ (define-public rust-synstructure-0.10 "0grirdkgh2wl4hf9a3nbiazpgccxgq54kn52ms0xrr6njvgkwd82")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) + ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15) ("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs -- cgit v1.2.3 From bb5bc8270ebdf1a3b1f4b34e1be9b989355b8c20 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:18:40 +0200 Subject: gnu: rust-string-cache-codegen-0.4: Upgrade to 0.4.4. * gnu/packages/crates-io.scm (rust-string-cache-codegen-0.4): Upgrade to 0.4.4. [arguments]: Don't skip build. Replace rust-proc-macro2-0.4 with 1.0 in cargo-inputs. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aef1c78198..3dd732c0da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16634,7 +16634,7 @@ (define-public rust-string-cache-0.7 (define-public rust-string-cache-codegen-0.4 (package (name "rust-string-cache-codegen") - (version "0.4.2") + (version "0.4.4") (source (origin (method url-fetch) @@ -16643,14 +16643,13 @@ (define-public rust-string-cache-codegen-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1npl9zq9cd16d7irksblgk7l7g6qknnzsmr12hrhky2fcpp1xshy")))) + "1ik78h9gs874i24rkyh0myg6x4ni2a9cazbv5yzs9yavnv8mxx7h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.7) ("rust-phf-shared" ,rust-phf-shared-0.7) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) ("rust-string-cache-shared" ,rust-string-cache-shared-0.3)))) -- cgit v1.2.3 From c9f97083f082ecd83276a7f4f0de44da5ac76236 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:24:11 +0200 Subject: gnu: rust-string-cache-shared-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-string-cache-shared-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3dd732c0da..a696400198 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16674,7 +16674,6 @@ (define-public rust-string-cache-shared-0.3 (base32 "1z7dpdix1m42x6ddshdcpjf91ml9mhvnskmiv5kd8hcpq0dlv25i")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/servo/string-cache") (synopsis "Code share between string_cache and string_cache_codegen") (description -- cgit v1.2.3 From 3201503d3cc551d7d239de049e399d7e04db24b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:29:41 +0200 Subject: gnu: rust-string-cache-0.7: Upgrade to 0.7.5. * gnu/packages/crates-io.scm (rust-string-cache-0.7): Upgrade to 0.7.5. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a696400198..47dbfd8361 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16600,7 +16600,7 @@ (define-public rust-streaming-stats-0.2 (define-public rust-string-cache-0.7 (package (name "rust-string-cache") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) @@ -16609,11 +16609,10 @@ (define-public rust-string-cache-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08sly9s92l0g0ai1iyj9pawl05xbwm4m8kl3zqkv2wkijw4h3mr5")))) + "0rrdb822gc1fs3qq4camgj3kh4182bs79hpqxhdrpmlz5yl5ih49")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1.0) -- cgit v1.2.3 From 0b3848f00ede3824d2e88d4ca01ff80ad93e55ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:34:43 +0200 Subject: gnu: rust-winapi-build-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-winapi-build-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 47dbfd8361..7257e85a70 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20603,7 +20603,6 @@ (define-public rust-winapi-build-0.1 (base32 "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Common code for build.rs in WinAPI -sys crates") (description -- cgit v1.2.3 From 23e71f5d34ca2f0c801447fa6d49829842109dde Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:35:40 +0200 Subject: gnu: rust-antidote-1.0: Don't skip build. * gnu/packages/crates-io.scm (rust-antidote-1.0)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7257e85a70..ded39ea35c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -328,7 +328,6 @@ (define-public rust-antidote-1.0 (base32 "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/sfackler/rust-antidote") (synopsis "Poison-free Mutex and RwLock types") (description -- cgit v1.2.3 From c9f32328d4dfe3b3f00567d390ab92227bbe9160 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:37:35 +0200 Subject: gnu: rust-bencher-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-bencher-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ded39ea35c..e4fe80f715 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -881,7 +881,6 @@ (define-public rust-bencher-0.1 (base32 "1x8p2xblgqssay8cdykp5pkfc0np0jk5bs5cx4f5av097aav9zbx")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/bencher/") (synopsis "Port of the libtest benchmark runner to Rust stable") (description "This package provides a port of the libtest (unstable Rust) -- cgit v1.2.3 From 1d9b4664e30ce3f79606bf1167a2fca9bf4abba2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Mar 2020 10:40:05 +0200 Subject: gnu: rust-bitflags-1: Don't skip build. * gnu/packages/crates-io.scm (rust-bitflags-1)[arguments]: Don't skip build. (rust-bitflags-0.8, rust-bitflags-0.7)[arguments]: Same. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4fe80f715..3f07cdeea7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1063,7 +1063,6 @@ (define-public rust-bitflags-1 (base32 "14qnd5nq8p2almk79m4m8ydqhd413yaxsyjp5xd19g3mikzf47fg")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/bitflags/bitflags") (synopsis "Macro to generate structures which behave like bitflags") (description "This package provides a macro to generate structures which -- cgit v1.2.3 From bc490e070aaa4ab7511019b2ec2f56b6b05786e8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 09:51:40 +0100 Subject: gnu: mame: Update to 0.219. * gnu/packages/emulators.scm (mame): Update to 0.219. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index fb7afd9111..7b82c91a58 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1280,7 +1280,7 @@ (define-public scummvm (define-public mame (package (name "mame") - (version "0.218") + (version "0.219") (source (origin (method git-fetch) @@ -1289,7 +1289,7 @@ (define-public mame (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "1c43hqfabc7spkyk5ma4bjdb0yqm93sdg5g13ka8mvi462snrfd7")) + (base32 "0s3nhkfa5c17ar1lzgvm20ndqain9llgqkab0ji5ycv2c85f06fl")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From a733253b5cf81808afda589c50782129472f11d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 10:47:39 +0100 Subject: gnu: giac: Update to 1.5.0-87. * gnu/packages/algebra.scm (giac): Update to 1.5.0-87. --- gnu/packages/algebra.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index bebf5c99ed..f503721a7d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Efraim Flashner @@ -345,19 +345,19 @@ (define-public cmh (define-public giac (package (name "giac") - (version "1.5.0-85") - (source (origin - (method url-fetch) - ;; "~parisse/giac" is not used because the maintainer regularly - ;; overwrites the release tarball there, introducing a checksum - ;; mismatch every time. See - ;; - (uri (string-append "https://www-fourier.ujf-grenoble.fr/" - "~parisse/debian/dists/stable/main/" - "source/giac_" version ".tar.gz")) - (sha256 - (base32 - "03icgrfhb1xiy95cqmfgmcb1lw3775mr2ybnzandmyn44iycs6rh")))) + (version "1.5.0-87") + (source + (origin + (method url-fetch) + ;; "~parisse/giac" is not used because the maintainer regularly + ;; overwrites the release tarball there, introducing a checksum + ;; mismatch every time. See + ;; + (uri (string-append "https://www-fourier.ujf-grenoble.fr/" + "~parisse/debian/dists/stable/main/source/" + "giac_" version ".tar.gz")) + (sha256 + (base32 "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From 4a5e7edce25e8c7f98995cf393560f08661e001a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 11:11:47 +0100 Subject: gnu: fet: Update to 5.43.2. * gnu/packages/education.scm (fet): Update to 5.43.2. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 20fc9a3706..b2501f2c7b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -602,14 +602,14 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "5.42.3") + (version "5.43.2") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "0z31i8kwd59c3hlq35qll61qhc3x63w330ss92glhp12iy0aja1y")))) + (base32 "111ijwdpdnavi2jjp8jqnwkgi1b9n79svkfw68fmga0z7d3nd62g")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From dad3645b67c74b44d7b2e5736fb412eb33f519d4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 11:18:36 +0100 Subject: gnu: wireshark: Update to 3.2.2. * gnu/packages/networking.scm (wireshark): Update to 3.2.2. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fa755fb7eb..eddfffd662 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -604,14 +604,14 @@ (define-public whois (define-public wireshark (package (name "wireshark") - (version "3.2.1") + (version "3.2.2") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "0nz84zyhs4177ljxmv34vgc9kgg7ssxhxa4mssxqwh6nb00697sq")))) + (base32 "0ygdxpz0i4jxp55fg9x4xcan093wycjb66yas073gviz9kpj6naz")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2f3515f7369d91d8922620044f9348cc727b6c10 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 1 Mar 2020 12:52:43 +0100 Subject: gnu: avr-gcc: Fix compiler lookup paths. * gnu/packages/avr.scm (avr-gcc-4.9): Use CROSS_C*_INCLUDE_PATH (like cross-base does). (avr-gcc-5)[source]: Apply patch "gcc-cross-environment-variables.patch". --- gnu/packages/avr.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 1f99f636e0..608e487b93 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -63,7 +63,16 @@ (define-public avr-gcc-4.9 `(delete "--disable-multilib" ,flags)))) (native-search-paths (list (search-path-specification - (variable "CROSS_CPATH") + (variable "CROSS_C_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJC_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJCPLUS_INCLUDE_PATH") (files '("avr/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") @@ -76,7 +85,10 @@ (define-public avr-gcc-5 (package (inherit avr-gcc-4.9) (version (package-version gcc-5)) - (source (package-source gcc-5)))) + (source (origin + (inherit (package-source gcc-5)) + (patches (append (origin-patches (package-source gcc-5)) + (search-patches "gcc-cross-environment-variables.patch"))))))) (define (avr-libc avr-gcc) (package -- cgit v1.2.3 From 9b9ab657cc9df579cdb2ff9282a7117a86212d31 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 1 Mar 2020 14:09:42 +0100 Subject: gnu: python-binwalk: Switch to a release. When the package was last modified, the version wasn't released; an unreleased commit was used. This is no longer necessary. The tag only differs in the version number from the commit that was being used before. * gnu/packages/python-xyz.scm (python-binwalk): Use a released tag (v2.2.0). Co-authored-by: Vincent Legoll --- gnu/packages/python-xyz.scm | 67 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cdd61d9c39..c921d241ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11191,40 +11191,39 @@ (define-public python2-binaryornot ,@(package-propagated-inputs base)))))) (define-public python-binwalk - (let ((commit "64201acfb5b0a9cdd9faa58c40a36dcff8612e29") - (revision "0")) - (package - (name "python-binwalk") - (version (git-version "2.1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ReFirmLabs/binwalk") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1z7ca6rfp887hw5jc3sb45mm4fa0xid4lsp2z8g4r590dr7k7w15")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-pythonpath - (lambda _ - (setenv "PYTHONPATH" - (string-append - (getcwd) "/src/" - ":" (getenv "PYTHONPATH"))) - (setenv "HOME" "") - #t))))) - (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose))) - (home-page "https://github.com/ReFirmLabs/binwalk") - (synopsis "Firmware analysis tool") - (description "Binwalk is a tool for analyzing, reverse engineering, and extracting firmware images") - (license license:expat)))) + (package + (name "python-binwalk") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ReFirmLabs/binwalk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-pythonpath + (lambda _ + (setenv "PYTHONPATH" + (string-append + (getcwd) "/src/" + ":" (getenv "PYTHONPATH"))) + (setenv "HOME" "") + #t))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) + (home-page "https://github.com/ReFirmLabs/binwalk") + (synopsis "Firmware analysis tool") + (description "Binwalk is a tool for analyzing, reverse engineering, and +extracting firmware images") + (license license:expat))) (define-public python-nltk (package -- cgit v1.2.3 From 50be0da7bfd5c108697679effeb2a893d2f37598 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 16 Feb 2020 12:58:33 +0100 Subject: services: set-xorg-configuration: handle slim and sddm * gnu/services/xorg.scm (handle-xorg-configuration): New syntax. (gdm-service-type, slim-service-type): Use handle-xorg-configuration. * gnu/services/sddm.scm (sddm-service-type): Likewise. --- gnu/services/sddm.scm | 34 ++++++++-------- gnu/services/xorg.scm | 108 +++++++++++++++++++++++++++----------------------- 2 files changed, 77 insertions(+), 65 deletions(-) diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 473b4876a1..1921afce95 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2019 Jesse Gildersleve +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -306,22 +307,23 @@ (define sddm-profile-service (compose list sddm-configuration-sddm)) (define sddm-service-type - (service-type (name 'sddm) - (extensions - (list (service-extension shepherd-root-service-type - sddm-shepherd-service) - (service-extension etc-service-type - sddm-etc-service) - (service-extension pam-root-service-type - sddm-pam-services) - (service-extension account-service-type - (const %sddm-accounts)) - (service-extension profile-service-type - sddm-profile-service))) - (default-value (sddm-configuration)) - (description - "Run SDDM, a display and log-in manager for X11 and -Wayland."))) + (handle-xorg-configuration sddm-configuration + (service-type (name 'sddm) + (extensions + (list (service-extension shepherd-root-service-type + sddm-shepherd-service) + (service-extension etc-service-type + sddm-etc-service) + (service-extension pam-root-service-type + sddm-pam-services) + (service-extension account-service-type + (const %sddm-accounts)) + (service-extension profile-service-type + sddm-profile-service))) + (default-value (sddm-configuration)) + (description + "Run SDDM, a display and log-in manager for X11 and +Wayland.")))) (define-deprecated (sddm-service #:optional (config (sddm-configuration))) sddm-service-type diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index df5c350a37..09379d40c3 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Tim Gesthuizen ;;; Copyright © 2020 shtwzrd +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,8 @@ (define-module (gnu services xorg) gdm-configuration gdm-service-type gdm-service + + handle-xorg-configuration set-xorg-configuration)) ;;; Commentary: @@ -459,6 +462,25 @@ (define (find-session profile) (program-file "xinitrc" builder)) +(define-syntax handle-xorg-configuration + (syntax-rules () + "Generate the `compose' and `extend' entries of a login manager +`service-type' to handle specifying the `xorg-configuration' through +a `service-extension', as used by `set-xorg-configuration'." + ((_ configuration-record service-type-definition) + (service-type + (inherit service-type-definition) + (compose (lambda (extensions) + (match extensions + (() #f) + ((config . _) config)))) + (extend (lambda (config xorg-configuration) + (if xorg-configuration + (configuration-record + (inherit config) + (xorg-configuration xorg-configuration)) + config))))))) + ;;; ;;; SLiM log-in manager. @@ -584,18 +606,20 @@ (define theme (respawn? #t))))) (define slim-service-type - (service-type (name 'slim) - (extensions - (list (service-extension shepherd-root-service-type - slim-shepherd-service) - (service-extension pam-root-service-type - slim-pam-service) + (handle-xorg-configuration slim-configuration + (service-type (name 'slim) + (extensions + (list (service-extension shepherd-root-service-type + slim-shepherd-service) + (service-extension pam-root-service-type + slim-pam-service) - ;; Unconditionally add xterm to the system profile, to - ;; avoid bad surprises. - (service-extension profile-service-type - (const (list xterm))))) - (default-value (slim-configuration)))) + ;; Unconditionally add xterm to the system profile, to + ;; avoid bad surprises. + (service-extension profile-service-type + (const (list xterm))))) + + (default-value (slim-configuration))))) (define-deprecated (slim-service #:key (slim slim) (allow-empty-passwords? #t) auto-login? @@ -946,44 +970,30 @@ (define (gdm-shepherd-service config) (respawn? #t)))) (define gdm-service-type - (service-type (name 'gdm) - (extensions - (list (service-extension shepherd-root-service-type - gdm-shepherd-service) - (service-extension activation-service-type - (const %gdm-activation)) - (service-extension account-service-type - (const %gdm-accounts)) - (service-extension pam-root-service-type - gdm-pam-service) - (service-extension profile-service-type - gdm-configuration-gnome-shell-assets) - (service-extension dbus-root-service-type - (compose list - gdm-configuration-gdm)) - (service-extension localed-service-type - (compose - xorg-configuration-keyboard-layout - gdm-configuration-xorg)))) - - ;; For convenience, this service can be extended with an - ;; record. Take the first one that - ;; comes. - (compose (lambda (extensions) - (match extensions - (() #f) - ((config . _) config)))) - (extend (lambda (config xorg-configuration) - (if xorg-configuration - (gdm-configuration - (inherit config) - (xorg-configuration xorg-configuration)) - config))) - - (default-value (gdm-configuration)) - (description - "Run the GNOME Desktop Manager (GDM), a program that allows -you to log in in a graphical session, whether or not you use GNOME."))) + (handle-xorg-configuration gdm-configuration + (service-type (name 'gdm) + (extensions + (list (service-extension shepherd-root-service-type + gdm-shepherd-service) + (service-extension activation-service-type + (const %gdm-activation)) + (service-extension account-service-type + (const %gdm-accounts)) + (service-extension pam-root-service-type + gdm-pam-service) + (service-extension profile-service-type + gdm-configuration-gnome-shell-assets) + (service-extension dbus-root-service-type + (compose list + gdm-configuration-gdm)) + (service-extension localed-service-type + (compose + xorg-configuration-keyboard-layout + gdm-configuration-xorg)))) + (default-value (gdm-configuration)) + (description + "Run the GNOME Desktop Manager (GDM), a program that allows +you to log in in a graphical session, whether or not you use GNOME.")))) (define-deprecated (gdm-service #:key (gdm gdm) (allow-empty-passwords? #t) -- cgit v1.2.3 From 77cf666b00cedaa41de7aa016d0cee9be436feca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 14:21:21 +0100 Subject: gnu: cogserver: Update to 0-2.ec5f3b9. * gnu/packages/opencog.scm (cogserver): Update to 0-2.ec5f3b9. [arguments]: Enable tests. --- gnu/packages/opencog.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index c6828d6603..ea6858507e 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -114,8 +114,8 @@ (define-public atomspace (define-public cogserver ;; There are no releases. - (let ((commit "c8ad85fef446819e6bd711f0791887a5aa6a41f9") - (revision "1")) + (let ((commit "ec5f3b9590db0f6a085b5d0320f5d3710e0f1635") + (revision "2")) (package (name "cogserver") (version (git-version "0" revision commit)) @@ -127,11 +127,10 @@ (define-public cogserver (file-name (git-file-name name version)) (sha256 (base32 - "0flwl2cbmnj7kjcx8vwk7rbhsp2si0a51ci0hx88a3xx1f76cp3f")))) + "1h0vcxb6n5dc654xqinqcxc7dxwcs6bsywgir8rhrqiykk760mzl")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; See https://github.com/opencog/cogserver/issues/24 - #:test-target "tests" + `(#:test-target "tests" #:configure-flags (list (string-append "-DGUILE_INCLUDE_DIR=" (assoc-ref %build-inputs "guile") -- cgit v1.2.3 From bb5ab9bfabe6f6e363a284f2af596998cd2f0200 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Mar 2020 02:15:44 +0100 Subject: gnu: dehydrated: Update source URI. * gnu/packages/tls.scm (dehydrated)[source]: Update URI. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8967bb127d..89d3e46aa8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -911,7 +911,7 @@ (define-public dehydrated (source (origin (method url-fetch) (uri (string-append - "https://github.com/lukas2511/dehydrated/releases/download/" + "https://github.com/dehydrated-io/dehydrated/releases/download/" "v" version "/dehydrated-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 87eeeeb04ab46969b0a7ab21dc9e48526f4469c4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 1 Mar 2020 09:13:15 +0100 Subject: gnu: mozjs@17, mozjs@24: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (mozjs): Add ‘-fpermissive’ to CXXFLAGS. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnuzilla.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bb2a4d60dc..fea50625b6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -116,6 +116,7 @@ (define-public mozjs `(;; XXX: parallel build fails, lacking: ;; mkdir -p "system_wrapper_js/" #:parallel-build? #f + #:make-flags '("CXXFLAGS=-fpermissive") #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-timedout-test -- cgit v1.2.3 From 21e207d2859035cf9c4ddc134f43f175a0358e59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:31:26 +0100 Subject: gnu: java-commons-collections4: Use HTTPS home page. * gnu/packages/java.scm (java-commons-collections4)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 32ff4ab064..011ff6e550 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4757,7 +4757,7 @@ (define-public java-commons-collections4 `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core) ("java-easymock" ,java-easymock))) - (home-page "http://commons.apache.org/collections/") + (home-page "https://commons.apache.org/collections/") (synopsis "Collections framework") (description "The Java Collections Framework is the recognised standard for collection handling in Java. Commons-Collections seek to build upon the -- cgit v1.2.3 From 1e30dff38bda59d2ce6fe92368589d64ad6499b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:33:14 +0100 Subject: gnu: lrcalc: Use HTTPS home page. * gnu/packages/algebra.scm (lrcalc)[home-page]: Use HTTPS. --- gnu/packages/algebra.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index f503721a7d..c0eaa72996 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1498,7 +1498,7 @@ (define-public lrcalc a program that performs fast computation of the more general multiplicative structure constants of Schubert polynomials.") (license license:gpl2+) - (home-page "http://sites.math.rutgers.edu/~asbuch/lrcalc/"))) + (home-page "https://sites.math.rutgers.edu/~asbuch/lrcalc/"))) (define-public iml (package -- cgit v1.2.3 From 1b3a60383788aa37f11aa7bfb7667327f6c96a46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:33:26 +0100 Subject: gnu: java-commons-cli: Use HTTPS home page. * gnu/packages/java.scm (java-commons-cli)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 011ff6e550..babab2a740 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6584,7 +6584,7 @@ (define-public java-commons-cli (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://commons.apache.org/cli/") + (home-page "https://commons.apache.org/cli/") (synopsis "Command line arguments and options parsing library") (description "The Apache Commons CLI library provides an API for parsing command line options passed to programs. It is also able to print help -- cgit v1.2.3 From 203475e430126031667fd4b3e4c7bf1386fd52df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:36:55 +0100 Subject: gnu: anthy: Use HTTPS home page. * gnu/packages/anthy.scm (anthy)[home-page]: Use HTTPS. --- gnu/packages/anthy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/anthy.scm b/gnu/packages/anthy.scm index d543cd85fd..0d86347e88 100644 --- a/gnu/packages/anthy.scm +++ b/gnu/packages/anthy.scm @@ -49,7 +49,7 @@ (define-public anthy (lambda _ (with-directory-excursion "test" (invoke "./anthy" "--all"))))))) - (home-page "http://anthy.osdn.jp/") + (home-page "https://anthy.osdn.jp/") (synopsis "Japanese input method") (description "Anthy is a Japanese input method for converting hiragana text to mixed kana and kanji. It is written in the C -- cgit v1.2.3 From 3dd74c8dc5192c3ffae5c991aa63aa6154a1bc7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:37:54 +0100 Subject: gnu: python-graphene: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-graphene)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c921d241ee..a6873bccdc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11551,7 +11551,7 @@ (define-public python-graphene ("python-six" ,python-six))) (arguments `(#:tests? #f)) ; no tests/ in the PyPI tarball - (home-page "http://graphene-python.org/") + (home-page "https://graphene-python.org/") (synopsis "GraphQL Framework for Python") (description "Graphene is a Python library for building GraphQL schemas/types. -- cgit v1.2.3 From c4f197d5e4a475597e0521f9bda8d0269a37363e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 16:26:21 +0100 Subject: gnu: ode: Update to 0.16.1. * gnu/packages/game-development.scm (ode): Update to 0.16.1. --- gnu/packages/game-development.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 05e026a846..262633760b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2046,14 +2046,14 @@ (define-public libccd (define-public ode (package (name "ode") - (version "0.16") + (version "0.16.1") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/odedevs/ode/downloads/" "ode-" version ".tar.gz")) (sha256 - (base32 "09xzrarxwxcf6rdv5jsjfjh454jnn29dpcw3wh6ic50kkipvg8sb")) + (base32 "1flfdqgdbcn1bx8nrrd4qnp6cvsxrhvk8cdg7vaq2dzkh6nsqa5j")) (modules '((guix build utils))) (snippet '(begin @@ -2061,7 +2061,8 @@ (define-public ode #t)))) (build-system cmake-build-system) (arguments - ;; Tests fail on all systems but x86_64. + ;; Tests fail on all systems but x86_64. This is fixed upstream and can + ;; be removed in 0.16.2+. `(#:tests? ,(string-prefix? "x86_64-" (or (%current-target-system) (%current-system))) -- cgit v1.2.3 From bcfacecd3baab3066f89c686a01d4d066f9a4241 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 1 Mar 2020 12:11:29 -0600 Subject: doc: Fix some typos. * doc/guix.texi: Various typo fixes. --- doc/guix.texi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a66bb3d646..fab9159530 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4236,7 +4236,7 @@ guix time-machine -- build hello @end example will thus build the package @code{hello} as defined in the master branch, -which is in general a newer revison of Guix than you have installed. +which is in general a newer revision of Guix than you have installed. Time travel works in both directions! Note that @command{guix time-machine} can trigger builds of channels and @@ -14098,7 +14098,7 @@ Each string gets on its own line. See the @code{AcceptEnv} option in 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 +your shell's resource file to enable colors for the prompt and commands if this variable is set. @lisp @@ -15621,7 +15621,7 @@ adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile. ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other -functionality to work as expetected. +functionality to work as expected. The desktop environments in Guix use the Xorg display server by default. If you'd like to use the newer display server protocol @@ -20048,7 +20048,7 @@ The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself. -This doesn't need to be set in the server config, and can be specifyed +This doesn't need to be set in the server config, and can be specified in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}. @@ -21204,7 +21204,7 @@ false, listed actions are allowed. @end deftp @deftp {Data Type} zone-entry -Data type represnting a record entry in a zone file. +Data type representing a record entry in a zone file. This type has the following parameters: @table @asis @@ -21327,7 +21327,7 @@ The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}. @item @code{config} (default: @code{"/var/lib/knot/keys/keys"}) The configuration string of the backend. An example for the PKCS#11 is: @code{"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so"}. -For the pem backend, the string reprensents a path in the file system. +For the pem backend, the string represents a path in the file system. @end table @end deftp @@ -24582,7 +24582,7 @@ Defaults to @samp{"a fast webinterface for the git dscm"}. @deftypevr {@code{cgit-configuration} parameter} string root-readme The content of the file specified with this option will be included -verbatim below thef "about" link on the repository index page. +verbatim below the "about" link on the repository index page. Defaults to @samp{""}. @@ -25465,7 +25465,7 @@ of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}). The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{} object, by -default it serves the GNU Collaborative International Dictonary of English. +default it serves the GNU Collaborative International Dictionary of English. You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} client @@ -26447,7 +26447,7 @@ Switch to an existing system generation. This action atomically switches the system profile to the specified system generation. It also rearranges the system's existing bootloader menu entries. It makes the menu entry for the specified system generation the default, -and it moves the entries for the other generatiors to a submenu, if +and it moves the entries for the other generations to a submenu, if supported by the bootloader being used. The next time the system boots, it will use the specified system generation. -- cgit v1.2.3 From c150d6378d82742ada68fd5655a010488d2d3778 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Mar 2020 15:17:40 +0100 Subject: gnu: dehydrated: Install documentation. * gnu/packages/tls.scm (dehydrated)[arguments]: Install compressed man page and other basic documentation. --- gnu/packages/tls.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 89d3e46aa8..2e927635cc 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -918,28 +918,39 @@ (define-public dehydrated "0dgskgbdd95p13jx6s13p77y15wngb5cm6p4305cf2s54w0bvahh")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) + `(#:modules ((guix build utils) + (srfi srfi-26)) #:builder (begin - (use-modules (guix build utils)) + (use-modules (guix build utils) + (srfi srfi-26)) (let* ((source (assoc-ref %build-inputs "source")) (tar (assoc-ref %build-inputs "tar")) (gz (assoc-ref %build-inputs "gzip")) (out (assoc-ref %outputs "out")) (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man (string-append out "/share/man")) (bash (in-vicinity (assoc-ref %build-inputs "bash") "bin"))) (setenv "PATH" (string-append gz "/bin")) (invoke (string-append tar "/bin/tar") "xvf" source) (chdir (string-append ,name "-" ,version)) + (copy-recursively "docs" doc) + (install-file "LICENSE" doc) + + (mkdir-p man) + (rename-file (string-append doc "/man") + (string-append man "/man1")) + (for-each (cut invoke "gzip" "-9" <>) + (find-files man ".*")) + (install-file "dehydrated" bin) - (install-file "LICENSE" (string-append doc ,name "-" ,version)) (with-directory-excursion bin (patch-shebang "dehydrated" (list bash)) - ;; Do not try to write in the store. + ;; Do not try to write to the store. (substitute* "dehydrated" (("SCRIPTDIR=\"\\$.*\"") "SCRIPTDIR=~/.dehydrated")) -- cgit v1.2.3 From 3a066fbe23b329e203f7f6d4f0a1a87f333d237c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:38:35 +0100 Subject: gnu: wordnet: Use HTTPS home page. * gnu/packages/wordnet.scm (wordnet)[home-page]: Use HTTPS. --- gnu/packages/wordnet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm index abec2f0e50..03dadd431e 100644 --- a/gnu/packages/wordnet.scm +++ b/gnu/packages/wordnet.scm @@ -88,7 +88,7 @@ (define-public wordnet (inputs `(("tk" ,tk) ("tcl" ,tcl))) - (home-page "http://wordnet.princeton.edu/") + (home-page "https://wordnet.princeton.edu/") (synopsis "Lexical database for the English language") (description "WordNet is a large lexical database of English. Nouns, verbs, -- cgit v1.2.3 From efc0a5878a34ffc0cffda6838c1ac8e44f327586 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:38:40 +0100 Subject: gnu: python-h5py: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-h5py)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a6873bccdc..55c0e1a568 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -508,7 +508,7 @@ (define-public python-h5py (native-inputs `(("python-cython" ,python-cython) ("python-pkgconfig" ,python-pkgconfig))) - (home-page "http://www.h5py.org/") + (home-page "https://www.h5py.org/") (synopsis "Read and write HDF5 files from Python") (description "The h5py package provides both a high- and low-level interface to the -- cgit v1.2.3 From 41181b76960c359ad3aea9ff2f2c98e9940b54fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:41:09 +0100 Subject: gnu: ruby-markaby: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-markaby)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 56885fcde3..7028a1b69f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2482,7 +2482,7 @@ (define-public ruby-markaby "Markaby allows writing HTML packages in pure Ruby. This is similar to the functionality provided by @acronym{ERB, Embedded Ruby}, but without the mixture of HTML and additional ERB syntax.") - (home-page "http://markaby.github.io/") + (home-page "https://markaby.github.io/") (license license:expat))) (define-public ruby-maruku -- cgit v1.2.3 From 5adaeb3618d86ed8098bac95b3b3f7e0705b4ad2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:42:00 +0100 Subject: gnu: python-pyalsaaudio: Use HTTPS home page. * gnu/packages/audio.scm (python-pyalsaaudio)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ac486aabfb..3d6ad82e99 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3398,7 +3398,7 @@ (define-public python-pyalsaaudio `(#:tests? #f)) ; tests require access to ALSA devices. (inputs `(("alsa-lib" ,alsa-lib))) - (home-page "http://larsimmisch.github.io/pyalsaaudio/") + (home-page "https://larsimmisch.github.io/pyalsaaudio/") (synopsis "ALSA wrappers for Python") (description "This package contains wrappers for accessing the ALSA API from Python. -- cgit v1.2.3 From f4eee79db28109e751fbcf8c32b7228cbf666a43 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:44:14 +0100 Subject: gnu: libgc: Use HTTPS home page. * gnu/packages/bdw-gc.scm (libgc)[home-page]: Use HTTPS. --- gnu/packages/bdw-gc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index cc492105d1..f0cff707f3 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -87,7 +87,7 @@ (define-public libgc Alternatively, the garbage collector may be used as a leak detector for C or C++ programs, though that is not its primary goal.") - (home-page "http://www.hboehm.info/gc/") + (home-page "https://www.hboehm.info/gc/") (license (x11-style (string-append home-page "license.txt"))))) -- cgit v1.2.3 From 555f3d15b1dec5785110189802430b7c6149f8a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:44:28 +0100 Subject: gnu: python-sphinx: Use HTTPS home page. * gnu/packages/sphinx.scm (python-sphinx)[home-page]: Use HTTPS. --- gnu/packages/sphinx.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 4e4abccb04..1940b36a33 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -93,7 +93,7 @@ (define-public python-sphinx ("python-mock" ,python-mock) ("python-nose" ,python-nose) ("python-pytest" ,python-pytest))) - (home-page "http://www.sphinx-doc.org") + (home-page "https://www.sphinx-doc.org") (synopsis "Python documentation generator") (description "Sphinx is a tool that makes it easy to create documentation for Python projects or other documents consisting of multiple reStructuredText -- cgit v1.2.3 From d3eae3f1ec757cfd1d9a18b3e8785946c7cd1468 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:45:35 +0100 Subject: gnu: warzone2100: Use HTTPS home page. * gnu/packages/games.scm (warzone2100)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d46253cda1..e66a1a817e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3606,7 +3606,7 @@ (define-public warzone2100 ("qtscript" ,qtscript) ("openssl" ,openssl) ("sdl2" ,sdl2))) - (home-page "http://wz2100.net") + (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description "Warzone 2100 offers campaign, multi-player, and single-player skirmish -- cgit v1.2.3 From aabc895402626898cfc08e7d6d8775893e92e708 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:45:55 +0100 Subject: gnu: python-construct: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-construct)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55c0e1a568..446eccd10f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16381,7 +16381,7 @@ (define-public python-construct ("python-arrow" ,python-arrow) ("python-numpy" ,python-numpy) ("python-ruamel.yaml" ,python-ruamel.yaml))) - (home-page "http://construct.readthedocs.io") + (home-page "https://construct.readthedocs.io") (synopsis "Declarative and symmetrical parser and builder for binary data") (description "This package provides both simple, atomic constructs (such as -- cgit v1.2.3 From 945a73d82d952c15c0c048d6815384a2b7f4f9d5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 1 Mar 2020 20:00:14 +0000 Subject: gnu: guile-squee: Add "guile3.0-squee" variant. * gnu/packages/guile-xyz.scm (guile3.0-squee): New variable. --- gnu/packages/guile-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 08f909b132..b152e99504 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -667,6 +667,13 @@ (define-public guile-squee using Guile's foreign function interface.") (license license:lgpl3+)))) +(define-public guile3.0-squee + (package + (inherit guile-squee) + (name "guile3.0-squee") + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs guile-squee)))))) + (define-public guile-colorized (package (name "guile-colorized") -- cgit v1.2.3 From 63a847cb1165e5e0dd5d4f11f2df4d2cbc8385f8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 1 Mar 2020 20:06:55 +0000 Subject: gnu: guile-email: Add "guile3.0-email" variant. * gnu/packages/guile-xyz.scm (guile3.0-email): New variable. --- gnu/packages/guile-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b152e99504..09334e39d3 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1027,6 +1027,13 @@ (define-public guile-email format.") (license license:agpl3+))) +(define-public guile3.0-email + (package + (inherit guile-email) + (name "guile3.0-email") + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs guile-email)))))) + (define-public guile-newt (package (name "guile-newt") -- cgit v1.2.3 From cfe3581426fbd1526543e9d628ee359b6c2f6a04 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 1 Mar 2020 20:48:40 +0000 Subject: gnu: guile-squee: Fix the "guile3.0-squee" variant. * gnu/packages/guile-xyz.scm (guile3.0-squee): Switch inputs to native-inputs. --- gnu/packages/guile-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 09334e39d3..1062456885 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -671,8 +671,9 @@ (define-public guile3.0-squee (package (inherit guile-squee) (name "guile3.0-squee") - (inputs `(("guile" ,guile-next) - ,@(alist-delete "guile" (package-inputs guile-squee)))))) + (native-inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" + (package-native-inputs guile-squee)))))) (define-public guile-colorized (package -- cgit v1.2.3 From 2d79250d1aa32fbff5aae0b1d00fcb44cab453e1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 22 Feb 2020 15:35:25 +0100 Subject: gnu: qemu-minimal-2.10: Use minimal dependencies from qemu-minimal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this patch qemu-minimal-2.10 is not really minimal; it depends on cups, ffmpeg, ghostscript, gstreamer, gtk, spice, ... * gnu/packages/virtualization.scm (qemu-minimal-2.10) [native-inputs]: Inherit from QEMU-MINIMAL instead of QEMU. [inputs]: Likewise. Signed-off-by: Jakub Kądziołka --- 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 d3f474d17a..b8d85e03a4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -303,10 +303,10 @@ (define-public qemu-minimal-2.10 (search-patches "qemu-glibc-2.27.patch")))) ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) - ,@(fold alist-delete (package-native-inputs qemu) + ,@(fold alist-delete (package-native-inputs qemu-minimal) '("python-wrapper" "python-sphinx")))) (inputs - (fold alist-delete (package-inputs qemu) + (fold alist-delete (package-inputs qemu-minimal) ;; Disable seccomp support, because it's not required for the GRUB ;; test suite, and because it fails with libseccomp 2.4.2 and later. '("libseccomp")))))) -- cgit v1.2.3 From 55db5a50e29c5acf3be2cc4a15791cda81b05111 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 22:54:46 +0100 Subject: gnu: emacs-xr: Update to 1.16. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.16. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a9b36dd882..c1ef552dd1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -970,13 +970,13 @@ (define-public emacs-anaphora (define-public emacs-xr (package (name "emacs-xr") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 "0pxzr6n0qa29ly8j3cl46rv9a65ajfcgahrhdylg4yfb9gh1x4ly")))) + (base32 "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") -- cgit v1.2.3 From d4388c0bf69bd05953ff1f3b5579ced937857d03 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 1 Mar 2020 22:55:41 +0100 Subject: gnu: emacs-relint: Update to 1.14. * gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.14. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c1ef552dd1..99f8835924 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1074,14 +1074,14 @@ (define-public emacs-reformatter (define-public emacs-relint (package (name "emacs-relint") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/relint-" version ".tar")) (sha256 - (base32 "1kzzlixhd6kp0mkmgn02b7pqv6m55g708xsys7vjskdxbfb6jjib")))) + (base32 "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xr" ,emacs-xr))) (home-page "https://github.com/mattiase/relint") -- cgit v1.2.3 From 975cfe26e185d3edff24fb1cd99733a845885d00 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 19:14:07 +0100 Subject: gnu: r-gkmsvm: Update to 0.80.0. * gnu/packages/bioconductor.scm (r-gkmsvm): Update to 0.80.0. [propagated-inputs]: Remove r-biocgenerics, r-biostrings, r-genomeinfodb, r-iranges, r-rtracklayer, and r-s4vectors. --- gnu/packages/bioconductor.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e14f7bc93e..9697e9846a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3221,27 +3221,20 @@ (define-public r-ioniser (define-public r-gkmsvm (package (name "r-gkmsvm") - (version "0.79.0") + (version "0.80.0") (source (origin (method url-fetch) (uri (cran-uri "gkmSVM" version)) (sha256 (base32 - "04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3")))) + "0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p")))) (properties `((upstream-name . "gkmSVM"))) (build-system r-build-system) (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-biostrings" ,r-biostrings) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-kernlab" ,r-kernlab) + `(("r-kernlab" ,r-kernlab) ("r-rcpp" ,r-rcpp) ("r-rocr" ,r-rocr) - ("r-rtracklayer" ,r-rtracklayer) - ("r-s4vectors" ,r-s4vectors) ("r-seqinr" ,r-seqinr))) (home-page "https://cran.r-project.org/web/packages/gkmSVM") (synopsis "Gapped-kmer support vector machine") -- cgit v1.2.3 From ade9158b62d2b41de355635a68ecf8ffa7c8424c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 19:16:42 +0100 Subject: gnu: r-matrix-utils: Update to 0.9.8. * gnu/packages/cran.scm (r-matrix-utils): Update to 0.9.8. --- 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 7ff282bde1..e576ea7e8f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -195,14 +195,14 @@ (define-public r-grr (define-public r-matrix-utils (package (name "r-matrix-utils") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (cran-uri "Matrix.utils" version)) (sha256 (base32 - "1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va")))) + "0a5fq1scykqk0kc9j051j6fix6j2dqwz5wbgb0amaxsiywz9vigb")))) (properties `((upstream-name . "Matrix.utils"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From dfa052726a21f9ae89e25b2f312579541a620aba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 19:17:26 +0100 Subject: gnu: r-modelr: Update to 0.1.6. * gnu/packages/cran.scm (r-modelr): Update to 0.1.6. [propagated-inputs]: Add r-tidyselect. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e576ea7e8f..a662686cc3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -473,14 +473,14 @@ (define-public r-readxl (define-public r-modelr (package (name "r-modelr") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "modelr" version)) (sha256 (base32 - "0nnfhlzz75ihs8azy963cc4cwg1kx81rybk4z3wm98bbghwfxfs5")))) + "1x2m34m4qirb401krmgc5wg3g7ndbcglfab2l0655rmky3fz7rfp")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -489,7 +489,8 @@ (define-public r-modelr ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) - ("r-tidyr" ,r-tidyr))) + ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect))) (home-page "https://github.com/tidyverse/modelr") (synopsis "Helper functions for modelling in pipelines") (description -- cgit v1.2.3 From 9e3a089b44e886d167b1b45c64e4a089cd56916a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 19:18:48 +0100 Subject: gnu: r-dendextend: Update to 1.13.4. * gnu/packages/cran.scm (r-dendextend): Update to 1.13.4. --- 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 a662686cc3..46b3575526 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1917,14 +1917,14 @@ (define-public r-compare (define-public r-dendextend (package (name "r-dendextend") - (version "1.13.3") + (version "1.13.4") (source (origin (method url-fetch) (uri (cran-uri "dendextend" version)) (sha256 (base32 - "1gx6blw644sx2c4s90672scrwl4bv5xlgnfwbcalkh6nff2sai0h")))) + "1pjbz6sb4pgh3d5pm53vmf3q8y6lq3hrgjd6547xxs3m63sb8mn4")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 8a9d551c8def9c51103f893ef0872edcaa09a973 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:47:53 +0100 Subject: gnu: r-sp: Update to 1.4-1. * gnu/packages/cran.scm (r-sp): Update to 1.4-1. --- 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 46b3575526..e9337bbd23 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2158,13 +2158,13 @@ (define-public r-proxy (define-public r-sp (package (name "r-sp") - (version "1.4-0") + (version "1.4-1") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "0mgjrlviv6qapgpiqdjcbsygzfs8bf5c64krh2rk555vf5njmnh7")))) + (base32 "0fbh865r4py89g6ln8bslig2vbxxwa642p5k5g02rskyhajg35lg")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 353b3515a6a377d2c8c9226e7cdb3c759d9bea66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:48:19 +0100 Subject: gnu: r-cli: Update to 2.0.2. * gnu/packages/cran.scm (r-cli): Update to 2.0.2. --- 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 e9337bbd23..777970c95c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3792,14 +3792,14 @@ (define-public r-ggjoy (define-public r-cli (package (name "r-cli") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "0x28i7kj4qndk6mnn99qn9w2nfldv8csjnsn0n8phfnxq5hnmp5y")))) + "1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From d67f83072c59ad86de085ea6261d33939b9c4129 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:48:59 +0100 Subject: gnu: r-broom: Update to 0.5.5. * gnu/packages/cran.scm (r-broom): Update to 0.5.5. --- 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 777970c95c..ac1b356e10 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3067,14 +3067,14 @@ (define-public r-generics (define-public r-broom (package (name "r-broom") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1w35v1qrg8d0bm7a4gsdqkmrl9nmymsvmamy48vc046a1axzgzq1")))) + "0n7zd64263kfavdi28rl2bxrsa00c3m4vjhhjdrfwvvmrcxj39fx")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From f7dc4f7bfd36acd094d49a68d93b5c0db490add2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:49:11 +0100 Subject: gnu: r-uuid: Update to 0.1-4. * gnu/packages/cran.scm (r-uuid): Update to 0.1-4. --- 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 ac1b356e10..9eb420daa7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4128,14 +4128,14 @@ (define-public r-pillar (define-public r-uuid (package (name "r-uuid") - (version "0.1-2") + (version "0.1-4") (source (origin (method url-fetch) (uri (cran-uri "uuid" version)) (sha256 (base32 - "1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx")))) + "0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q")))) (build-system r-build-system) (home-page "http://www.rforge.net/uuid") (synopsis "Tools for generating and handling of UUIDs") -- cgit v1.2.3 From a670564929a14d7a1dad02ab0b745ba866608c6c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:49:20 +0100 Subject: gnu: r-tinytex: Update to 0.20. * gnu/packages/cran.scm (r-tinytex): Update to 0.20. --- 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 9eb420daa7..c0704711db 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4147,14 +4147,14 @@ (define-public r-uuid (define-public r-tinytex (package (name "r-tinytex") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0jlcrvcqcbkimg7w40z5vhlnakb829vfgqpspm3pfl8karwzgqp6")))) + "0n8v8inpsc99r0snvqbjhqlc6nm9hxjsw120hrxc2mw03pa5fvkg")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 1bd856332274ef45cbaea79fd2a4d8658ea753c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:49:33 +0100 Subject: gnu: r-factominer: Update to 2.3. * gnu/packages/cran.scm (r-factominer): Update to 2.3. --- 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 c0704711db..8e575db006 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5936,14 +5936,14 @@ (define-public r-flashclust (define-public r-factominer (package (name "r-factominer") - (version "2.2") + (version "2.3") (source (origin (method url-fetch) (uri (cran-uri "FactoMineR" version)) (sha256 (base32 - "1hcas9iby95y6xcrf231yrd44s799aaaggb9jd1dcb5nd5vfpzw0")))) + "0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6")))) (properties `((upstream-name . "FactoMineR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0fab5a4769043c1d2c0b554dd33c3b7ab1a20e2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:49:47 +0100 Subject: gnu: r-effectsize: Update to 0.2.0. * gnu/packages/cran.scm (r-effectsize): Update to 0.2.0. --- 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 8e575db006..734b0592d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8555,14 +8555,14 @@ (define-public r-ggeffects (define-public r-effectsize (package (name "r-effectsize") - (version "0.1.1") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "0dd7nbkg8kmash9zh2gg08m7hbpsqwpkvkdhinfqkbg5d0jinhq8")))) + "1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a0077446a1bf06edf3b29219b7c2d3c61eb1959c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:49:56 +0100 Subject: gnu: r-manipulatewidget: Update to 0.10.1. * gnu/packages/cran.scm (r-manipulatewidget): Update to 0.10.1. --- 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 734b0592d9..45e28e3272 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6960,13 +6960,13 @@ (define-public r-slam (define-public r-manipulatewidget (package (name "r-manipulatewidget") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (cran-uri "manipulateWidget" version)) (sha256 - (base32 "1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x")))) + (base32 "1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx")))) (properties `((upstream-name . "manipulateWidget"))) (build-system r-build-system) -- cgit v1.2.3 From 19b0b54ed182746b997c77fd8642cc2f72b9f3ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:50:06 +0100 Subject: gnu: r-mvabund: Update to 4.1.3. * gnu/packages/cran.scm (r-mvabund): Update to 4.1.3. --- 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 45e28e3272..7a94fcc746 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9048,14 +9048,14 @@ (define-public r-rcppgsl (define-public r-mvabund (package (name "r-mvabund") - (version "4.0.1") + (version "4.1.3") (source (origin (method url-fetch) (uri (cran-uri "mvabund" version)) (sha256 (base32 - "0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k")))) + "1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From d41528b09333285c87450a51895d12de45f2617c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:50:17 +0100 Subject: gnu: r-rcppannoy: Update to 0.0.15. * gnu/packages/cran.scm (r-rcppannoy): Update to 0.0.15. --- 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 7a94fcc746..ce00ff05c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9188,14 +9188,14 @@ (define-public r-weights (define-public r-rcppannoy (package (name "r-rcppannoy") - (version "0.0.14") + (version "0.0.15") (source (origin (method url-fetch) (uri (cran-uri "RcppAnnoy" version)) (sha256 (base32 - "1wiigx5g5788j6lyc3f6bs1rsvc4alyc3052g35hxl1giinxmhn4")))) + "1rlw6npwwcp066midvkhnzf0xmmfkkdf6f581j3j1s2naqss3fvl")))) (properties `((upstream-name . "RcppAnnoy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5144de4b1d56c26d2ec398b764a143f090f9c5d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:50:28 +0100 Subject: gnu: r-rvcheck: Update to 0.1.8. * gnu/packages/cran.scm (r-rvcheck): Update to 0.1.8. --- 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 ce00ff05c3..108180a6a9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9847,13 +9847,13 @@ (define-public r-tidytree (define-public r-rvcheck (package (name "r-rvcheck") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "rvcheck" version)) (sha256 - (base32 "1a3xlzi4n1rqiapfa180aif7n7nws8pbg8k3nk7ccaczvmni38aw")))) + (base32 "0627bc8qmhxmd63yh6f90qni3qw1zwdpxjln2qbychzmzd4am9ac")))) (build-system r-build-system) (propagated-inputs `(("r-biocmanager" ,r-biocmanager) -- cgit v1.2.3 From 851e57621324857b3f8d39b077aaeef9badeb813 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:50:40 +0100 Subject: gnu: r-protviz: Update to 0.6.3. * gnu/packages/cran.scm (r-protviz): Update to 0.6.3. --- 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 108180a6a9..b9e8922e8c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11387,14 +11387,14 @@ (define-public r-rbamtools (define-public r-protviz (package (name "r-protviz") - (version "0.6.0") + (version "0.6.3") (source (origin (method url-fetch) (uri (cran-uri "protViz" version)) (sha256 (base32 - "165bh2m6rrcmr0pc2drj6hdg6xfx8k02lznxzj1fmsswsrlfhn3v")))) + "1ldciqh3f43xr9663yyhd9r6qwrg4c4vmkprlcancbnd460wakg7")))) (properties `((upstream-name . "protViz"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From cd4a4eafcc1d15e3b5b9192083c427b1d1685a35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:50:51 +0100 Subject: gnu: r-gridgraphics: Update to 0.5-0. * gnu/packages/cran.scm (r-gridgraphics): Update to 0.5-0. --- 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 b9e8922e8c..3f53a81585 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14028,14 +14028,14 @@ (define-public r-msigdbr (define-public r-gridgraphics (package (name "r-gridgraphics") - (version "0.4-1") + (version "0.5-0") (source (origin (method url-fetch) (uri (cran-uri "gridGraphics" version)) (sha256 (base32 - "1kr3p54bkv2q7agxrva30y9bkwkiq1k2cfl5z1kvyjv6f5xi4w5p")))) + "0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r")))) (properties `((upstream-name . "gridGraphics"))) (build-system r-build-system) (home-page "https://github.com/pmur002/gridgraphics") -- cgit v1.2.3 From 79f7e127ea4eecfa22942fd3e14eca88d6b7bc6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:51:24 +0100 Subject: gnu: r-styler: Update to 1.3.2. * gnu/packages/cran.scm (r-styler): Update to 1.3.2. --- 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 3f53a81585..c886a126ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14932,14 +14932,14 @@ (define-public r-sctransform (define-public r-styler (package (name "r-styler") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "styler" version)) (sha256 (base32 - "14vfw1w22b9kbbgz72dcg814ycjvrd91ziva42jmmzqbspfxjvmw")))) + "1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 2a216f5a5f4da92564fb8a0688cb5e42cfbbbc27 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:51:49 +0100 Subject: gnu: r-dalex: Update to 1.0.1. * gnu/packages/cran.scm (r-dalex): Update to 1.0.1. --- 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 c886a126ca..15dc821097 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15138,14 +15138,14 @@ (define-public r-dqrng (define-public r-dalex (package (name "r-dalex") - (version "1.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "0fcyk1zhpw5yyppyw45rplx8603mrbp4vxq8398h2lswgy1nmls4")))) + "1jbyn57vn6d281a5y15h5d8ljin8cdb9lr7lbgggc950blyfv4g0")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) -- cgit v1.2.3 From ecbae383d8b110f87b879c5f27ff8fbb5b06de51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:52:22 +0100 Subject: gnu: r-rpf: Update to 1.0.3. * gnu/packages/cran.scm (r-rpf): Update to 1.0.3. --- 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 15dc821097..f8d26fa490 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19804,14 +19804,14 @@ (define-public r-stanheaders (define-public r-rpf (package (name "r-rpf") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "rpf" version)) (sha256 (base32 - "0j1229qc1mg0vy3msk3yzrpk2r64b8zvnk4rj8q27s38pgz9mix3")))) + "1i2kqd7nx55nn35qnw89xmnqk23x9c8xhkh736c2xg7k2ai84ybl")))) (properties `((upstream-name . "rpf"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0c51197b3ccbe91ddb8b9346a653212f3cfb6dac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:52:37 +0100 Subject: gnu: r-subplex: Update to 1.6. * gnu/packages/cran.scm (r-subplex): Update to 1.6. --- 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 f8d26fa490..0949969338 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16069,14 +16069,14 @@ (define-public r-pracma (define-public r-subplex (package (name "r-subplex") - (version "1.5-4") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "subplex" version)) (sha256 (base32 - "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) + "1yfbfjvpbhgky7vihw3f4jl41pxpqb39z4nc045d5z7z48bdl18d")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 2fc3575608f7ba010fcdc71fc72a48a1bd7ed269 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:52:59 +0100 Subject: gnu: r-gdina: Update to 2.7.9. * gnu/packages/cran.scm (r-gdina): Update to 2.7.9. --- 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 0949969338..143028ab37 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17867,14 +17867,14 @@ (define-public r-alabama (define-public r-gdina (package (name "r-gdina") - (version "2.7.8") + (version "2.7.9") (source (origin (method url-fetch) (uri (cran-uri "GDINA" version)) (sha256 (base32 - "1aj2ssd7vpszl7p22srkkkpx4a7gkc38vrv3bq7j1zr32096y4zj")))) + "13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx")))) (properties `((upstream-name . "GDINA"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 78acab48180624c8ece4e2012a8b643289105f87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:53:33 +0100 Subject: gnu: r-quanteda: Update to 2.0.0. * gnu/packages/cran.scm (r-quanteda): Update to 2.0.0. [propagated-inputs]: Remove r-lubridate, r-rspectra, and r-spacyr; add r-jsonlite. --- gnu/packages/cran.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 143028ab37..ab08e91241 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19454,14 +19454,14 @@ (define-public r-snowballc (define-public r-quanteda (package (name "r-quanteda") - (version "1.5.2") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "0iv25rpx5cl9ansazjs0qb97pniajrxf4mqsnb5q98y2hil9ipd3")))) + "0snr610vahbdqkmma0zy5mg5qbb6n1b8sgsclqb2sccn1gg38vyy")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs @@ -19470,7 +19470,7 @@ (define-public r-quanteda ("r-fastmatch" ,r-fastmatch) ("r-ggplot2" ,r-ggplot2) ("r-ggrepel" ,r-ggrepel) - ("r-lubridate" ,r-lubridate) + ("r-jsonlite" ,r-jsonlite) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) ("r-network" ,r-network) @@ -19478,10 +19478,8 @@ (define-public r-quanteda ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rcppparallel" ,r-rcppparallel) - ("r-rspectra" ,r-rspectra) ("r-sna" ,r-sna) ("r-snowballc" ,r-snowballc) - ("r-spacyr" ,r-spacyr) ("r-stopwords" ,r-stopwords) ("r-stringi" ,r-stringi) ("r-xml2" ,r-xml2) -- cgit v1.2.3 From 339fa00a98b12177085ce4299d5f391dda038870 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:54:28 +0100 Subject: gnu: r-wgcna: Update to 1.69. * gnu/packages/cran.scm (r-wgcna): Update to 1.69. [propagated-inputs]: Remove r-robust. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab08e91241..3554c14b11 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13650,14 +13650,14 @@ (define-public r-optparse (define-public r-wgcna (package (name "r-wgcna") - (version "1.68") + (version "1.69") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "1s7gy5vd7x67hpgli8r7ba2z99w3psiyv5hqmrh94zw141dg210a")))) + "022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs @@ -13670,7 +13670,6 @@ (define-public r-wgcna ("r-hmisc" ,r-hmisc) ("r-impute" ,r-impute) ("r-rcpp" ,r-rcpp) - ("r-robust" ,r-robust) ("r-survival" ,r-survival) ("r-matrixstats" ,r-matrixstats) ("r-preprocesscore" ,r-preprocesscore))) -- cgit v1.2.3 From e3eb7ee4744512e3b16093f6525c424d7b106741 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:54:50 +0100 Subject: gnu: r-seurat: Update to 3.1.4. * gnu/packages/bioinformatics.scm (r-seurat): Update to 3.1.4. [propagated-inputs]: Add r-patchwork. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3df146c40d..ac45b88dd3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9521,13 +9521,13 @@ (define-public r-msnid (define-public r-seurat (package (name "r-seurat") - (version "3.1.3") + (version "3.1.4") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "0962mfgqk1di3wy1j0xdkvnw0q5m3q4xzd67d1l6dijlqiz8nfal")))) + "0lhjbjhv1hnx5i3gkx41k68i8ykay3f24708h30wx9xywww9lsvi")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs @@ -9550,6 +9550,7 @@ (define-public r-seurat ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) ("r-metap" ,r-metap) + ("r-patchwork" ,r-patchwork) ("r-pbapply" ,r-pbapply) ("r-plotly" ,r-plotly) ("r-png" ,r-png) -- cgit v1.2.3 From 51d36a12b708e8175f9272441aacf46399685b1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:55:14 +0100 Subject: gnu: r-nnet: Update to 7.3-13. * gnu/packages/statistics.scm (r-nnet): Update to 7.3-13. --- 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 1f15a6a713..d4769bc251 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -635,14 +635,14 @@ (define-public r-mgcv (define-public r-nnet (package (name "r-nnet") - (version "7.3-12") + (version "7.3-13") (source (origin (method url-fetch) (uri (cran-uri "nnet" version)) (sha256 (base32 - "17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7")))) + "1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f")))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Feed-forward neural networks and multinomial log-linear models") -- cgit v1.2.3 From fb93e2f539237e126d282d165c1ba122b0af9963 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:55:47 +0100 Subject: gnu: r-digest: Update to 0.6.25. * gnu/packages/statistics.scm (r-digest): Update to 0.6.25. --- 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 d4769bc251..34fb36a1fa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -804,13 +804,13 @@ (define-public r-dichromat (define-public r-digest (package (name "r-digest") - (version "0.6.24") + (version "0.6.25") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "01xsmcgqva9bza30zh7kj4lzapxgg4yiljfk99g4v6xng50mp604")))) + (base32 "1r9dkq0kxkps54gkmgcdngsd068p054va2vhnqhs5jmwp2vsvk0m")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. -- cgit v1.2.3 From 2589dc4b5010032ecae568ccfbdcadd1efc9358e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:56:12 +0100 Subject: gnu: r-rlang: Update to 0.4.5. * gnu/packages/statistics.scm (r-rlang): Update to 0.4.5. --- 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 34fb36a1fa..7cd0e06026 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1607,13 +1607,13 @@ (define-public r-r6 (define-public r-rlang (package (name "r-rlang") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "1kqmrk00lnkbclnvj1dizjbdav0g1w44yd6ja4yy3bivwan9jf23")))) + "1a0h3dr519p3jj6aygbhwi9f2zwlan6d07f1gkh2db56y5vaq7yd")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From 8bcbb67c1792d5912b35c033983693cadcc291ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:56:20 +0100 Subject: gnu: r-mvtnorm: Update to 1.1-0. * gnu/packages/statistics.scm (r-mvtnorm): Update to 1.1-0. --- 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 7cd0e06026..87eb89d6db 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3553,13 +3553,13 @@ (define-public r-r-rsp (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.0-12") + (version "1.1-0") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "03rfmii9j8x8fjv7hp8qd28z0svl4w0x54k2f4jpwv4qa7079i24")))) + "0pfb6qk4yb6xaya8i1wvx6dnc3jj4s2g94sq2kzv4p8zn4pf24l1")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From b3be560e23e91d4b8c97652f1cfbeae31232dfbb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:56:27 +0100 Subject: gnu: r-gplots: Update to 3.0.3. * gnu/packages/statistics.scm (r-gplots): Update to 3.0.3. --- 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 87eb89d6db..6437ee98a6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4179,14 +4179,14 @@ (define-public r-gdata (define-public r-gplots (package (name "r-gplots") - (version "3.0.1.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (cran-uri "gplots" version)) (sha256 (base32 - "0vrm7wqrmqsmfrc070r9chpzb0vv60pay2lyar9qxfry6bsrvx86")))) + "0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp")))) (build-system r-build-system) (propagated-inputs `(("r-catools" ,r-catools) -- cgit v1.2.3 From 42c7f6e7487a93251e549932d72fc57efa196a5e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:56:35 +0100 Subject: gnu: r-nloptr: Update to 1.2.2. * gnu/packages/statistics.scm (r-nloptr): Update to 1.2.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 6437ee98a6..1cb83023b8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5098,14 +5098,14 @@ (define-public r-quantreg (define-public r-nloptr (package (name "r-nloptr") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz")))) + "19k7nd3a7cg35k5i1cwj1lhgfs02jb7bc2gwlammpq6j41rh4vr7")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr) ; for building vignettes -- cgit v1.2.3 From efb98dd09d4294a49c1a25042ef0267c2e6ab0e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 22:56:45 +0100 Subject: gnu: gwl: Update to 0.2.1. * gnu/packages/package-management.scm (gwl): Update to 0.2.1. [arguments]: Add phase "fix-tests". --- gnu/packages/package-management.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 221cbd509f..fd0d350e45 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -788,14 +788,24 @@ (define-public conda (define-public gwl (package (name "gwl") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz")) (sha256 (base32 - "0db1nvy6qzhj9kv834vrlxw7gqv3lih1n4hv5zac1zjmb61ll915")))) + "1ji5jvzni8aml9fmimlr11g3k8isrnlvnbzhmwgdjh72hils0alc")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-tests + (lambda _ + ;; Avoid cross-device link. + (substitute* "tests/cache.scm" + (("/tmp/gwl-test-input-XXXXXX") + (string-append (getcwd) "/gwl-test-input-XXXXXX"))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 9bbf3f9de2468524bd8ecce194ba0ef569d7415a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:37:40 +0100 Subject: gnu: r-edger: Update to 3.28.1. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.28.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ac45b88dd3..1a1eecba69 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7482,13 +7482,13 @@ (define-public r-genomeinfodb (define-public r-edger (package (name "r-edger") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "1m7l6fbyik1b79v0h9qkmpa39svij1yiw24gxahbdqjg7fzsavh3")))) + "07dv99kl7jfa62nzcq705r56gcpb1hq7p4px48j71y2ddi1rqmr6")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6c1f5a1b7ee3f377668a42041401881017df3dbb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:37:52 +0100 Subject: gnu: r-rsamtools: Update to 2.2.3. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 2.2.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1a1eecba69..4be682dd5b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7768,13 +7768,13 @@ (define-public r-biostrings (define-public r-rsamtools (package (name "r-rsamtools") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "1larx1a9cngmcsm2n7yyxrlnk69zi8m9dp3b90jva0ynspyi76v7")))) + "1vj43acawqqkf9yval9fzxarpsf04fmn78m2hq4f083w1k0myhyr")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From f73b75e00c7037edfe0f06dca0489c107584b424 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:37:58 +0100 Subject: gnu: r-hdf5array: Update to 1.14.3. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.14.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4be682dd5b..434e1d7ed3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10495,14 +10495,14 @@ (define-public r-hitc (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "0mbx9rsr2571k4k4hmx3dr49rhqb31dhwy2r2bkrd4dbhvriqgld")))) + "1z153a7nxmlml72pl1saasj2il9g5ahpynkpv3mkhhsvl5kbwbh6")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 8351faae8a4252cf1848bb845e8fcbd284ede156 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:38:06 +0100 Subject: gnu: r-chippeakanno: Update to 3.20.1. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.20.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9697e9846a..63e2d8bbe0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1648,14 +1648,14 @@ (define-public r-codedepends (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.20.0") + (version "3.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "0hp3s3shnrb55cxvx9wrdl67wqw9f55gdgx7262s4mahpxjswfsa")))) + "0kmfha4vprbi0z6n7v9w28xfrqcx5qad7yfr0b316j5aj8v9f4hc")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From aece78fe2fa2add8e0589e0529cc8ff5a213e30b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:38:12 +0100 Subject: gnu: r-biocneighbors: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-biocneighbors): Update to 1.4.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 63e2d8bbe0..5add7db8a1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2216,14 +2216,14 @@ (define-public r-ruvseq (define-public r-biocneighbors (package (name "r-biocneighbors") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocNeighbors" version)) (sha256 (base32 - "05vi1cij37s8wgj92k3l6a3f3dwldj8jvijdp4695zczka6kypdf")))) + "1bx7i5pifj8w89fnhfgcfgcar2ik2ad8wqs2rix7yks90vz185i6")))) (properties `((upstream-name . "BiocNeighbors"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0a30342defe32d27049064491dc795570fd0f9fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:38:19 +0100 Subject: gnu: r-mlinterfaces: Update to 1.66.4. * gnu/packages/bioconductor.scm (r-mlinterfaces): Update to 1.66.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5add7db8a1..590ab80592 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3605,14 +3605,14 @@ (define-public r-clusterprofiler (define-public r-mlinterfaces (package (name "r-mlinterfaces") - (version "1.66.2") + (version "1.66.4") (source (origin (method url-fetch) (uri (bioconductor-uri "MLInterfaces" version)) (sha256 (base32 - "1wc280iw9vllg6f58vsdj895yaqs8w42kl7jk8sgii009gwlaj8d")))) + "19hlicdndy2p45y7w91gnwi3wgq5s465a646z3qqk8gmn5sn614q")))) (properties `((upstream-name . "MLInterfaces"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e766ba9a52ba3551339e97700ee6b96fc8193a2d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:38:26 +0100 Subject: gnu: r-cicero: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-cicero): Update to 1.4.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 590ab80592..47a94fce93 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6021,14 +6021,14 @@ (define-public r-rcistarget (define-public r-cicero (package (name "r-cicero") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "cicero" version)) (sha256 (base32 - "07g6r335zqqy3r5v4x4glxdrcsq9bjhs9jmgvppiggv1h630a22w")))) + "154djqd32w87814ycfmfz27ikp17bnampvmvw5hzi5p2x9l3h82r")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 5f5e0830f6f74b8806dfd3d3f85dde50f44b3c15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Mar 2020 23:38:33 +0100 Subject: gnu: r-multiassayexperiment: Update to 1.12.3. * gnu/packages/bioconductor.scm (r-multiassayexperiment): Update to 1.12.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 47a94fce93..06027285a1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7290,14 +7290,14 @@ (define-public r-experimenthub (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.12.2") + (version "1.12.3") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "0722f3jl1xq8k8w7vrv986jd16bgysqp3n07pgmdn0hh1zh2mcqc")))) + "1vf6l88j3n6109j6sd08wfqxqpj2k20dvr8ll9zl1szsn18b4gny")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From c1febbbf94ee794d7a97dbde12102634f2b13529 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 10:39:51 +0200 Subject: gnu: vim: Update to 8.2.0343. * gnu/packages/vim.scm (vim): Update to 8.2.0343. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d9ee202fec..d130072272 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -69,7 +69,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0332") + (version "8.2.0343") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0icgykml4wxq554h7r9rcxpxipg0yri651b9fijvv364ycywsq8c")))) + "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From bdcec7028c6d7ddd18e4a169b514bd2d1f8b9e2e Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 1 Mar 2020 18:01:04 +0100 Subject: gnu: debootstrap: Update to 1.0.119. * gnu/packages/debian.scm (debootstrap): Update to 1.0.119. Signed-off-by: Efraim Flashner --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index bd80fb297f..db8c9695f4 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -117,7 +117,7 @@ (define-public ubuntu-keyring (define-public debootstrap (package (name "debootstrap") - (version "1.0.118") + (version "1.0.119") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ (define-public debootstrap (file-name (git-file-name name version)) (sha256 (base32 - "07x1x67dli6qwrlaribi07wgjp7fs1gzwkqgq1xy6lq1xz1xfdl2")))) + "0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 49877d9fd627aca8d1d4ad985dadee0319e09cc1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 21:48:02 +0200 Subject: gnu: rust-constant-time-eq-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-constant-time-eq-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3f07cdeea7..45927332a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2629,7 +2629,6 @@ (define-public rust-constant-time-eq-0.1 (base32 "1g3vp04qzmk6cpzrd19yci6a95m7ap6wy7wkwgiy2pjklklrfl14")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/cesarb/constant_time_eq") (synopsis "Compares two equal-sized byte strings in constant time") -- cgit v1.2.3 From 64a28fd6e1c2e1969fb366943496c25cdd897a70 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 21:56:54 +0200 Subject: gnu: rust-datetime-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-datetime-0.4)[arguments]: Don't skip build. Add rust-regex-0.1 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45927332a9..1dfc868654 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3571,8 +3571,7 @@ (define-public rust-datetime-0.4 "1fd74bq48xg8ki5yw1mr1pa5hd3j5lbk4iqc5r0kh3l62b0vci2w")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-iso8601" ,rust-iso8601-0.1) ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-libc" ,rust-libc-0.2) @@ -3582,7 +3581,7 @@ (define-public rust-datetime-0.4 ("rust-redox-syscall" ,rust-redox-syscall-0.1) ("rust-winapi" ,rust-winapi-0.2)) #:cargo-development-inputs - (;("rust-regex" ,rust-regex-0.1) + (("rust-regex" ,rust-regex-0.1) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) (home-page "https://github.com/rust-datetime/datetime") (synopsis "Library for date and time formatting and arithmetic") -- cgit v1.2.3 From 4b309aad044d53043ddec21aecefa645fb98da7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 21:58:22 +0200 Subject: gnu: rust-defmac-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-defmac-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1dfc868654..c47375ad0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3628,7 +3628,6 @@ (define-public rust-defmac-0.2 (base32 "14cqfvc0f1pkd6gdhjxa2wv3iibqprc0n203ims8lvg96752ynfm")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/defmac") (synopsis "Macro to define lambda-like macros inline") (description "A macro to define lambda-like macros inline.") -- cgit v1.2.3 From 597f41ca49a21e66ae3812da85b85918f128c622 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 22:09:04 +0200 Subject: gnu: rust-diff-0.1: Update to 0.1.12. * gnu/packages/crates-io.scm (rust-diff-0.1): Update to 0.1.12. [arguments]: Replace rust-quickcheck-0.8 with 0.9 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c47375ad0b..1d4bc8ffcd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3698,7 +3698,7 @@ (define-public rust-demo-hack-impl-0.0 (define-public rust-diff-0.1 (package (name "rust-diff") - (version "0.1.11") + (version "0.1.12") (source (origin (method url-fetch) @@ -3707,12 +3707,12 @@ (define-public rust-diff-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fhavni46a2rib93ig5fgbqmm48ysms5sxzb3h9bp7vp2bwnjarw")))) + "16b40bhsa2qgvgvxs983l625pkxyp6m0mzmpwg2605cvj53yl98f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8) + (("rust-quickcheck" ,rust-quickcheck-0.9) ("rust-speculate" ,rust-speculate-0.1)))) (home-page "https://github.com/utkarshkukreti/diff.rs") (synopsis -- cgit v1.2.3 From 7b1ba1e4fc36fd2b6454ed9d8b2d8d8d50ce0154 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 22:11:16 +0200 Subject: gnu: librsvg-next: Fix cargo dependency. * gnu/packages/gnome.scm (librsvg-next-source): Don't hardcode patch version of cargo inputs. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af45ceb505..1c4bf7558a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2180,6 +2180,8 @@ (define librsvg-next-source (with-directory-excursion (string-append "librsvg-" #$version) ;; The following crate(s) are needed in addition to the ones replaced: (begin + (substitute* "rsvg_internals/Cargo.toml" + (("\"=") "\"")) (invoke "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor") (invoke -- cgit v1.2.3 From 8e1f5aaba2a0c9eff520f4915d764cf83824929a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 15:27:34 -0500 Subject: gnu: Syncthing: Fix installation of the 'util' package output. * gnu/packages/syncthing.scm (syncthing)[arguments]: Adjust the 'install' phase. --- gnu/packages/syncthing.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 2357b08f87..afa32e99b4 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -136,7 +136,7 @@ (define-public syncthing (utils (assoc-ref outputs "utils"))) (with-directory-excursion "src/github.com/syncthing/syncthing" (install-file "syncthing" (string-append out "/bin")) - (for-each (cut install-file <> utils) + (for-each (cut install-file <> (string-append utils "/bin/")) '("stcli" "stcompdirs" "stcrashreceiver" "stdisco" "stdiscosrv" "stevents" "stfileinfo" "stfinddevice" "stfindignored" "stgenfiles" -- cgit v1.2.3 From 45a2636a0bfc1e21e9283921b96c8f1b08b00419 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Mar 2020 21:37:15 +0100 Subject: gnu: emacs-modus-themes: Update to 0.6.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 0.6.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 99f8835924..0528b0d722 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20352,7 +20352,7 @@ (define-public emacs-doom-themes (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "0.4.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -20361,7 +20361,7 @@ (define-public emacs-modus-themes (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r")))) + (base32 "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Emacs themes designed for colour-contrast accessibility") -- cgit v1.2.3 From b69c770305edee747ade8c8d6940115d80d33e79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Mar 2020 21:30:33 +0100 Subject: gnu: r-txdb-mmusculus-ucsc-mm10-knowngene: Update to 3.10.0. * gnu/packages/bioconductor.scm (r-txdb-mmusculus-ucsc-mm10-knowngene): Update to 3.10.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 06027285a1..63687036fc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -618,14 +618,14 @@ (define-public r-txdb-mmusculus-ucsc-mm9-knowngene (define-public r-txdb-mmusculus-ucsc-mm10-knowngene (package (name "r-txdb-mmusculus-ucsc-mm10-knowngene") - (version "3.4.7") + (version "3.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TxDb.Mmusculus.UCSC.mm10.knownGene" version 'annotation)) (sha256 (base32 - "04impkl8zh1gpwwrpbf19jqznsjrq2306yyhm6cmx6hr1401bd6b")))) + "0xs9npnhbwll7p62hibs02y4ac23jchdcr25i6a7qwq1kms82qk9")))) (properties `((upstream-name . "TxDb.Mmusculus.UCSC.mm10.knownGene"))) (build-system r-build-system) -- cgit v1.2.3 From 0250672b97ec6c48227fded313067e8370d33853 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Mar 2020 21:37:30 +0100 Subject: gnu: libressl: Update to 3.0.2. * gnu/packages/tls.scm (libressl): Update to 3.0.2. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2e927635cc..d6e4f52229 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -511,14 +511,14 @@ (define-public openssl-1.0 (define-public libressl (package (name "libressl") - (version "2.7.4") + (version "3.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/LibreSSL/" "libressl-" version ".tar.gz")) (sha256 (base32 - "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy")))) + "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz")))) (build-system gnu-build-system) (arguments ;; Do as if 'getentropy' was missing since older Linux kernels lack it -- cgit v1.2.3 From ba6b48b84f83368065a3d5b1a0e61ab8ff1116e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Mar 2020 21:38:29 +0100 Subject: gnu: opensmtpd: Support ECDSA certificates. The required libressl version is now stable and more featureful than openssl. * gnu/packages/mail.scm (opensmtpd)[inputs]: Replace openssl with libressl. --- gnu/packages/mail.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 544bb9d8f2..271fe85b3a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2309,9 +2309,7 @@ (define-public opensmtpd `(("bdb" ,bdb) ("libasr" ,libasr) ("libevent" ,libevent) - ;; XXX Upstream recommends LibreSSL, which doesn't support TLS 1.3 yet, - ;; and requires a development release (3.0.2). Use OpenSSL instead. - ("openssl" ,openssl) + ("libressl" ,libressl) ; recommended, and supports e.g. ECDSA ("linux-pam" ,linux-pam) ("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From 9bbb492042640dfe9ae205a077302ed95a7feddd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:46:54 +0100 Subject: gnu: muse-sequencer: Update home page. * gnu/packages/music.scm (muse-sequencer)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index eecc4f1626..924b802c27 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3991,7 +3991,7 @@ (define-public muse-sequencer (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) - (home-page "http://muse-sequencer.org") + (home-page "https://muse-sequencer.github.io/") (synopsis "MIDI/Audio sequencer") (description "MusE is a MIDI/Audio sequencer with recording and editing capabilities. Its audio sequencer supports the LADSPA, DSSI, and LV2 audio -- cgit v1.2.3 From a3696828269e9bc6719db51a930ae37b720dc23f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:48:59 +0100 Subject: gnu: pootle: Use HTTPS home page. * gnu/packages/django.scm (pootle)[home-page]: Use HTTPS. --- gnu/packages/django.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index f0551d8269..1c4f00ac77 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -930,7 +930,7 @@ (define-public pootle ("python2-pytest-catchlog" ,python2-pytest-catchlog) ("python2-pytest-cov" ,python2-pytest-cov) ("python2-factory-boy" ,python2-factory-boy))) - (home-page "http://pootle.translatehouse.org/") + (home-page "https://pootle.translatehouse.org/") (synopsis "Community localization server") (description "Pootle is an online translation and localization tool. It works to -- cgit v1.2.3 From c99f0e5780f810c78890424ff668becc44cb1776 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:50:29 +0100 Subject: gnu: amsynth: Use HTTPS home page. * gnu/packages/music.scm (amsynth)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 924b802c27..536831c804 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1563,7 +1563,7 @@ (define-public amsynth (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) - (home-page "http://amsynth.github.io") + (home-page "https://amsynth.github.io") (synopsis "Analog modeling synthesizer") (description "amsynth is an easy-to-use software synthesizer with a classic -- cgit v1.2.3 From 35e74723b50da3e1e8ceb02ef5de445a40b44cba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:51:34 +0100 Subject: gnu: java-plexus-interpolation: Use HTTPS home page. * gnu/packages/java.scm (java-plexus-interpolation)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index babab2a740..57f1ebc6be 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3604,7 +3604,7 @@ (define-public java-plexus-interpolation (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://codehaus-plexus.github.io/plexus-interpolation/") + (home-page "https://codehaus-plexus.github.io/plexus-interpolation/") (synopsis "Java components for interpolating ${} strings and the like") (description "Plexus interpolator is a modular, flexible interpolation framework for the expression language style commonly seen in Maven, Plexus, -- cgit v1.2.3 From 4e5ad79e4d2e7535accf909229640cc9adfb4777 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:51:57 +0100 Subject: gnu: python-rq: Use HTTPS home page. * gnu/packages/databases.scm (python-rq)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c21ca5a490..d55bc7dcd8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2942,7 +2942,7 @@ (define-public python-rq (propagated-inputs `(("python-click" ,python-click) ("python-redis" ,python-redis))) - (home-page "http://python-rq.org/") + (home-page "https://python-rq.org/") (synopsis "Simple job queues for Python") (description "RQ (Redis Queue) is a simple Python library for queueing jobs and -- cgit v1.2.3 From 711ebe771e052bf6b7ea984cd9bb614f537a0e4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:52:08 +0100 Subject: gnu: mapnik: Use HTTPS home page. * gnu/packages/geo.scm (mapnik)[home-page]: Use HTTPS. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b0fdd06d08..7f60f9b7ea 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -443,7 +443,7 @@ (define-public mapnik (list "CC=gcc" (string-append "PREFIX=" %output) (string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib")))) - (home-page "http://mapnik.org/") + (home-page "https://mapnik.org/") (synopsis "Toolkit for developing mapping applications") (description "Mapnik is a toolkit for developing mapping applications. It is basically a collection of geographic objects like maps, layers, -- cgit v1.2.3 From b4034d1bc4d8134d08bb7b33949c1a39698f1890 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:53:50 +0100 Subject: gnu: ecl-clunit: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (ecl-clunit)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0195698887..d45f0ede90 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4897,7 +4897,7 @@ (define-public sbcl-clunit to be easy to use so that you can quickly start testing. CLUnit provides a rich set of features aimed at improving your unit testing experience.") - (home-page "http://tgutu.github.io/clunit/") + (home-page "https://tgutu.github.io/clunit/") ;; MIT License (license license:expat)))) -- cgit v1.2.3 From 1284df4ef61959fa9519c6f84bcfaefb5e319160 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:49:15 +0100 Subject: gnu: r-seqminer: Update to 8.0. * gnu/packages/bioinformatics.scm (r-seqminer): Update to 8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 434e1d7ed3..74646cc4a8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9139,14 +9139,14 @@ (define-public r-sva (define-public r-seqminer (package (name "r-seqminer") - (version "7.1") + (version "8.0") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy")))) + "00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From bbba65e269ca90b435d3d8c1caee19cff8741540 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:49:25 +0100 Subject: gnu: r-officer: Update to 0.3.7. * gnu/packages/cran.scm (r-officer): Update to 0.3.7. [propagated-inputs]: Remove r-base64enc, r-htmltools, r-rcpp, and r-rlang. --- gnu/packages/cran.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3554c14b11..0bfa848905 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6192,23 +6192,19 @@ (define-public r-rdpack (define-public r-officer (package (name "r-officer") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1i6jmnbkx7gd0qyf6akhizmxp7y1dh3h7a886mcbmrzka9d60zh4")))) + "1zyrcf0xxm67bskynjac8dhil2as7rb0mmqaq30zp9lrgfwiycpz")))) (build-system r-build-system) (propagated-inputs - `(("r-base64enc" ,r-base64enc) - ("r-digest" ,r-digest) - ("r-htmltools" ,r-htmltools) + `(("r-digest" ,r-digest) ("r-magrittr" ,r-magrittr) ("r-r6" ,r-r6) - ("r-rcpp" ,r-rcpp) - ("r-rlang" ,r-rlang) ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2) ("r-zip" ,r-zip))) -- cgit v1.2.3 From 2d063d4535e5187b5c2c847e6316fdbe9d1721d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:49:54 +0100 Subject: gnu: r-summarytools: Update to 0.9.6. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.6. --- 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 0bfa848905..6c841404b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8892,14 +8892,14 @@ (define-public r-pander (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "0iv5237478y2ggbqln3cppm0crnqk3myrkf6ydkhwsd1z5q538pd")))) + "03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From d82a17ebaabe759b63305bd165891ab8330f746d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:50:01 +0100 Subject: gnu: r-openmx: Update to 2.17.3. * gnu/packages/cran.scm (r-openmx): Update to 2.17.3. --- 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 6c841404b1..ca34ee8088 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19825,14 +19825,14 @@ (define-public r-rpf (define-public r-openmx (package (name "r-openmx") - (version "2.17.2") + (version "2.17.3") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "092xbwgi72ihxv45qmzm6lv0470rsrqsn7l2jh61jnkx95n72zbb")))) + "1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3f809fe875e24ea073ee3777d0732ae67a1c3036 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:50:07 +0100 Subject: gnu: r-testthat: Update to 2.3.2. * gnu/packages/statistics.scm (r-testthat): Update to 2.3.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 1cb83023b8..9768025056 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1555,13 +1555,13 @@ (define-public r-praise (define-public r-testthat (package (name "r-testthat") - (version "2.3.1") + (version "2.3.2") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "0m8xchdpgn9iwj6gb2qw46zr85v9zf1gkbr9nnahmy5sp1s9bbky")))) + "0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From 7a4b2da48f9d21d00b46b48f9d86e53c83ce7aa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 21:50:12 +0100 Subject: gnu: r-forcats: Update to 0.5.0. * gnu/packages/statistics.scm (r-forcats): Update to 0.5.0. --- 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 9768025056..b083ed02bd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5480,14 +5480,14 @@ (define-public r-fdrtool (define-public r-forcats (package (name "r-forcats") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "forcats" version)) (sha256 (base32 - "1cnjh23z59fhbjmy7y95425hcq3m5wrwqvahsxwi7zm6d9bwp0vw")))) + "1i4hblsjgwkrcwgvgsb5yj33pw1hwdj3lr9dvxymkv1kjdw0x5lg")))) (build-system r-build-system) (propagated-inputs `(("r-ellipsis" ,r-ellipsis) -- cgit v1.2.3 From 1eee899617cfd2216baba5be42e2c2d77f58715a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Mar 2020 22:59:57 +0100 Subject: gnu: emacs-windower: Fix description. * gnu/packages/emacs-xyz.scm (emacs-windower): Fix Texinfo code for lists in description. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0528b0d722..1fae2423f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20559,12 +20559,12 @@ (define-public emacs-windower such as: @itemize -- switch to last buffer, -- toggle single window display, -- toggle between horizontal and vertical splits, -- move borders more naturally, -- swap windows à-la @code{windmove}. -@end itemize\n") +@item switch to last buffer, +@item toggle single window display, +@item toggle between horizontal and vertical splits, +@item move borders more naturally, +@item swap windows à-la @code{windmove}. +@end itemize") (license license:gpl3+))) (define-public emacs-flycheck-cpplint -- cgit v1.2.3 From 9c9704a9d73ef2002d792b1dd463e65dc68823ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 10:52:42 -0500 Subject: gnu: Add python-wget. * gnu/packages/python-xyz.scm (python-wget): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 446eccd10f..8484600b6b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17475,6 +17475,25 @@ (define-public python-watchdog but portable.") (license license:asl2.0))) +(define-public python-wget + (package + (name "python-wget") + (version "3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wget" version ".zip")) + (sha256 + (base32 + "0qb0y7ipby42m4m7h0ipazpdyc3bn9xi46lvifcwwl5albn31rim")))) + (build-system python-build-system) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://bitbucket.org/techtonik/python-wget/") + (synopsis "Pure Python download utility") + (description "The python-wget library provides an API to download files +with features similar to the @command{wget} utility.") + (license license:unlicense))) + (define-public offlate (package (name "offlate") -- cgit v1.2.3 From bd137055400d34eb5184990b278c4f50cc6f665d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 13:45:05 -0500 Subject: gnu: python-colorama: Update to 0.4.3. * gnu/packages/python-xyz.scm (python-colorama): Update to 0.4.3. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8484600b6b..6a58a04740 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Clément Lassieur -;;; Copyright © 2018, 2019 Maxim Cournoyer +;;; Copyright © 2018, 2019, 2020 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019, 2020 Brett Gilio @@ -8768,14 +8768,14 @@ (define-public python-progressbar33 (define-public python-colorama (package (name "python-colorama") - (version "0.3.9") + (version "0.4.3") (source (origin (method url-fetch) (uri (pypi-uri "colorama" version)) (sha256 (base32 - "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8")))) + "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9")))) (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 f675ab4faf22d0f7ba8dec131b2e58ed3c1f34e0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 13:45:25 -0500 Subject: gnu: python-radon: Update to 4.1.0. * gnu/packages/python-xyz.scm (python-radon): Update to 4.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6a58a04740..2192d7802b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13204,14 +13204,14 @@ (define-public python2-relatorio (define-public python-radon (package (name "python-radon") - (version "2.2.0") + (version "4.1.0") (source (origin (method url-fetch) (uri (pypi-uri "radon" version)) (sha256 (base32 - "07gq5hq4nrffxnlnksws9hrx7fd001gam63j62i82gyfr23gvdym")))) + "0vfxxzbnz5lxfvp0yxp35g6c8qqnnbhi4dm7shkm1d3d4192q22n")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8c06d6d8cedcab1c239c5cf24b4cf600e20e35b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 14:13:17 -0500 Subject: gnu: python-xenon: Update to 0.7.0. * gnu/packages/python-xyz.scm (python-xenon): Update to 0.7.0. [arguments]: Set #:tests? to #f to disable test suite. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2192d7802b..d6cebca99f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13866,14 +13866,14 @@ (define-public python2-rencode (define-public python-xenon (package (name "python-xenon") - (version "0.5.4") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "xenon" version)) (sha256 (base32 - "029cbhysg2vr5n4jz8gpg2793f8wkwnqpr1qgv6c1dn685vy31mc")))) + "0nv207ql2wmh9q62503np056c4vf1c1hlsi5cvv5p5kx574k6r2y")))) (build-system python-build-system) (native-inputs `(("python-pyyaml" ,python-pyyaml) @@ -13882,7 +13882,8 @@ (define-public python-xenon ("python-flake8" ,python-flake8) ("python-tox" ,python-tox))) (arguments - `(#:phases + `(#:tests? #f ;test suite not shipped with the PyPI archive + #:phases (modify-phases %standard-phases (add-before 'build 'patch-test-requirements (lambda _ -- cgit v1.2.3 From 357af7f28372f680ef4e2e040eef98a4cad3ea8d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 14:19:27 -0500 Subject: gnu: python-pyyaml: Update to 5.3. * gnu/packages/python-xyz.scm (python-pyyaml): Update to 5.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d6cebca99f..1bd1ef9e44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2326,14 +2326,14 @@ (define-public python2-itsdangerous (define-public python-pyyaml (package (name "python-pyyaml") - (version "3.13") + (version "5.3") (source (origin (method url-fetch) (uri (pypi-uri "PyYAML" version)) (sha256 (base32 - "1gx603g484z46cb74j9rzr6sjlh2vndxayicvlyhxdz98lhhkwry")))) + "058nd4p8f25wwzy2aiwh18wcrdm6663cqbfdkgjp8y9cp7ampx79")))) (build-system python-build-system) (inputs `(("libyaml" ,libyaml))) -- cgit v1.2.3 From cbe4272e6fc10787bf826434adc2a9abfe845b78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:20:30 -0500 Subject: gnu: python-gitdb: Update to 4.0.2. * gnu/packages/version-control.scm (python-gitdb): Update to 4.0.2. [source]: Correct the PyPI URL to refer to the actual gitdb package, not a mirror. This mirror had a problematic setup.py install requirement that required gitdb>=4.0.1, which would cause run time errors when using snakemake. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index df160bcc53..35792a0184 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -880,13 +880,13 @@ (define-public python2-ghp-import (define-public python-gitdb (package (name "python-gitdb") - (version "2.0.4") + (version "4.0.2") (source (origin (method url-fetch) - (uri (pypi-uri "gitdb2" version)) + (uri (pypi-uri "gitdb" version)) (sha256 (base32 - "0i608q9c47rdsmyac1cn6s0hzwwj7cb957y8fc9wacc5lnw8ak5v")))) + "0l113fphn6msjl3cl3kyf332b6lal7daxdd0nfma0x9ipfb013jr")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 166dbbb012e6de591c0c3f7a2ab1b74f14209f36 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:24:39 -0500 Subject: gnu: python-gitpython: Update to 3.1.0. * gnu/packages/version-control.scm (python-gitpython): Update to 3.1.0. --- 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 35792a0184..cc866ec888 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -937,13 +937,13 @@ (define-public python2-gitdb (define-public python-gitpython (package (name "python-gitpython") - (version "2.1.11") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "GitPython" version)) (sha256 (base32 - "1a357c28dnhgvq3saia7v29r71ynp48l2qp5xsmnc4vgzmdxqdw2")))) + "1jzllsy9lwc9yibccgv7h9naxisazx2n3zmpy21c8n5xhysw69p4")))) (build-system python-build-system) (arguments `(#:tests? #f ;XXX: Tests can only be run within the GitPython repository. -- cgit v1.2.3 From 1639e0b7b60389cf74548544a5e28f9a0b6757c7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:33:35 -0500 Subject: gnu: python-smmap: Update to version 3.0.1, deprecate python-smmap2. * gnu/packages/python-xyz.scm (python-smmap): Rename from python-smmap2, and update to version 3.0.1. (python-smmap2, python2-smmap2): Preserve original bindings, marked as deprecated. * gnu/packages/version-control.scm (python-gitdb)[propagated-inputs]: Depend on the new python-smmap package. --- gnu/packages/python-xyz.scm | 20 +++++++++++++------- gnu/packages/version-control.scm | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1bd1ef9e44..27af30c488 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13743,27 +13743,33 @@ (define-public python-apache-libcloud (define-public python2-apache-libcloud (package-with-python2 python-apache-libcloud)) -(define-public python-smmap2 +(define-public python-smmap (package - (name "python-smmap2") - (version "2.0.5") + (name "python-smmap") + (version "3.0.1") (source (origin (method url-fetch) - (uri (pypi-uri "smmap2" version)) + (uri (pypi-uri "smmap" version)) (sha256 - (base32 "16k03pcnxd3lgzwgbd7nl4jwzm1wmahirvd09kljnzvy96hgza99")))) + (base32 "0ijlnv60y8f41py1wnn5n1a1i81cxd9dfpdhr0k3cgkrcbz8850p")))) (build-system python-build-system) (native-inputs `(("python-nosexcover" ,python-nosexcover))) (home-page "https://github.com/Byron/smmap") (synopsis "Python sliding window memory map manager") - (description "@code{smmap2} is a pure Python implementation of a sliding + (description "@code{smmap} is a pure Python implementation of a sliding window memory map manager.") (license license:bsd-3))) +(define-public python-smmap2 + (deprecated-package "python-smmap2" python-smmap)) + +(define-public python2-smmap + (package-with-python2 python-smmap)) + (define-public python2-smmap2 - (package-with-python2 python-smmap2)) + (deprecated-package "python2-smmap2" python2-smmap)) (define-public python-regex (package diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cc866ec888..6597844a9b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -918,7 +918,7 @@ (define-public python-gitdb (setenv "TRAVIS" "1") (invoke "nosetests" "-v")))))) (propagated-inputs - `(("python-smmap2" ,python-smmap2))) + `(("python-smmap" ,python-smmap))) (native-inputs `(("git" ,git) ("python-nose" ,python-nose))) -- cgit v1.2.3 From 7316f137dc1679baaf3dcaa180ce15966a2e3bd7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 23:02:36 +0100 Subject: gnu: Add r-kendall. * gnu/packages/cran.scm (r-kendall): 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 ca34ee8088..8b0dec9f24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20555,3 +20555,27 @@ (define-public r-rstanarm for Bayesian estimation. Users specify models via the customary R syntax with a formula and @code{data.frame} plus some additional arguments for priors.") (license license:gpl3+))) + +(define-public r-kendall + (package + (name "r-kendall") + (version "2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "Kendall" version)) + (sha256 + (base32 + "0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn")))) + (properties `((upstream-name . "Kendall"))) + (build-system r-build-system) + (propagated-inputs + `(("r-boot" ,r-boot))) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/Kendall/") + (synopsis "Kendall rank correlation and Mann-Kendall trend test") + (description + "This package computes the Kendall rank correlation and Mann-Kendall +trend test.") + (license license:gpl2+))) -- cgit v1.2.3 From 505d6716d0df1dc5e8ef3438f0d7ec68c695d874 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 23:02:46 +0100 Subject: gnu: Add r-zyp. * gnu/packages/cran.scm (r-zyp): 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 8b0dec9f24..7bc85106b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20579,3 +20579,27 @@ (define-public r-kendall "This package computes the Kendall rank correlation and Mann-Kendall trend test.") (license license:gpl2+))) + +(define-public r-zyp + (package + (name "r-zyp") + (version "0.10-1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "zyp" version)) + (sha256 + (base32 + "03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9")))) + (properties `((upstream-name . "zyp"))) + (build-system r-build-system) + (propagated-inputs + `(("r-kendall" ,r-kendall))) + (home-page "https://cran.r-project.org/web/packages/zyp/") + (synopsis "Zhang + Yue-Pilon Trends Package") + (description + "This package contains an efficient implementation of Sen's slope +method (Sen, 1968) plus implementation of Xuebin Zhang's (Zhang, 1999) and +Yue-Pilon's (Yue, 2002) pre-whitening approaches to determining trends in +climate data.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 11ab52888d416d9fcf33349b1f376f7e47f4cdff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 23:02:54 +0100 Subject: gnu: Add r-zvcv. * gnu/packages/cran.scm (r-zvcv): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7bc85106b3..87d0eb81e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20603,3 +20603,37 @@ (define-public r-zyp Yue-Pilon's (Yue, 2002) pre-whitening approaches to determining trends in climate data.") (license license:lgpl2.1))) + +(define-public r-zvcv + (package + (name "r-zvcv") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ZVCV" version)) + (sha256 + (base32 + "1npw836q2skx54843lgxvb0rfwafckjc8k8dljykm60ad3z7zak8")))) + (properties `((upstream-name . "ZVCV"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-glmnet" ,r-glmnet) + ("r-mvtnorm" ,r-mvtnorm) + ("r-partitions" ,r-partitions) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "https://cran.r-project.org/web/packages/ZVCV/") + (synopsis "Zero-Variance Control Variates") + (description + "@dfn{Zero-variance control variates} (ZV-CV) is a post-processing method +to reduce the variance of Monte Carlo estimators of expectations using the +derivatives of the log target. Once the derivatives are available, the only +additional computational effort is in solving a linear regression problem. +This method has been extended to higher dimensions using regularisation. This +package can be used to easily perform ZV-CV or regularised ZV-CV when a set of +samples, derivatives and function evaluations are available. Additional +functions for applying ZV-CV to two estimators for the normalising constant of +the posterior distribution in Bayesian statistics are also supplied.") + (license license:gpl2+))) -- cgit v1.2.3 From 02366a12d0a544028055cf8a4f4dfddff2e811e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 23:04:30 +0100 Subject: gnu: Add r-ztype. * gnu/packages/cran.scm (r-ztype): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 87d0eb81e0..3ae53a61a1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20637,3 +20637,32 @@ (define-public r-zvcv functions for applying ZV-CV to two estimators for the normalising constant of the posterior distribution in Bayesian statistics are also supplied.") (license license:gpl2+))) + +(define-public r-ztype + (package + (name "r-ztype") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ztype" version)) + (sha256 + (base32 + "0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx")))) + (properties `((upstream-name . "ztype"))) + (build-system r-build-system) + (propagated-inputs + `(("r-assertthat" ,r-assertthat) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-lubridate" ,r-lubridate) + ("r-magrittr" ,r-magrittr) + ("r-rvest" ,r-rvest) + ("r-stringr" ,r-stringr))) + (home-page "https://cran.r-project.org/web/packages/ztype/") + (synopsis "Run a Ztype game loaded with R functions") + (description + "How fast can you type R functions on your keyboard? Find out by running +a @code{zty.pe} game: export R functions as instructions to type to destroy +opponents' vessels.") + (license license:gpl3))) -- cgit v1.2.3 From 1e07875b577a197730b363bdbf0d9d4da8011571 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Mar 2020 23:04:35 +0100 Subject: gnu: Add r-zseq. * gnu/packages/cran.scm (r-zseq): 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 3ae53a61a1..9d154c030a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20666,3 +20666,27 @@ (define-public r-ztype a @code{zty.pe} game: export R functions as instructions to type to destroy opponents' vessels.") (license license:gpl3))) + +(define-public r-zseq + (package + (name "r-zseq") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "Zseq" version)) + (sha256 + (base32 + "06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi")))) + (properties `((upstream-name . "Zseq"))) + (build-system r-build-system) + (propagated-inputs + `(("r-gmp" ,r-gmp))) + (home-page "https://cran.r-project.org/web/packages/Zseq/") + (synopsis "Integer sequence generator") + (description + "This package generates well-known integer sequences. The @code{gmp} +package is adopted for computing with arbitrarily large numbers. Every +function has a hyperlink to its corresponding item in the @dfn{On-Line +Encyclopedia of Integer Sequences} (OEIS) in the function help page.") + (license license:gpl3+))) -- cgit v1.2.3 From 1f8838d1f6295e10851b2915dc3b0a97b3bbc236 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Mar 2020 23:08:13 +0100 Subject: gnu: libgc: Fix replacement inheritance. * gnu/packages/bdw-gc.scm (libgc-8.0): Do not use PACKAGE/INHERIT, because it does not make sense to inherit any replacements of LIBGC. (libgc/back-pointers): Use PACKAGE/INHERIT. --- gnu/packages/bdw-gc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index f0cff707f3..73b0c073d9 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -92,8 +92,8 @@ (define-public libgc (license (x11-style (string-append home-page "license.txt"))))) (define-public libgc-8.0 - (package/inherit - libgc + (package + (inherit libgc) (version "8.0.4") (source (origin (method url-fetch) @@ -104,8 +104,8 @@ (define-public libgc-8.0 "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3")))))) (define-public libgc/back-pointers - (package - (inherit libgc) + (package/inherit + libgc (name "libgc-back-pointers") (arguments `(#:make-flags -- cgit v1.2.3 From 15a6805751309452616999933492f1fb9da8bcec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Mar 2020 23:38:04 +0100 Subject: gnu: Add system test for CUPS. * gnu/tests/cups.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/local.mk | 1 + gnu/tests/cups.scm | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 gnu/tests/cups.scm diff --git a/gnu/local.mk b/gnu/local.mk index 857345cfad..359ed4bbbc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -622,6 +622,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests.scm \ %D%/tests/audio.scm \ %D%/tests/base.scm \ + %D%/tests/cups.scm \ %D%/tests/databases.scm \ %D%/tests/desktop.scm \ %D%/tests/dict.scm \ diff --git a/gnu/tests/cups.scm b/gnu/tests/cups.scm new file mode 100644 index 0000000000..4e922e5023 --- /dev/null +++ b/gnu/tests/cups.scm @@ -0,0 +1,119 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Marius Bakke +;;; +;;; 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 tests cups) + #:use-module (gnu tests) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services cups) + #:use-module (gnu services networking) + #:use-module (guix gexp) + #:use-module (guix store) + #:use-module (guix monads) + #:export (%test-cups)) + +;;; +;;; Test the Common Unix Printing System. +;;; + +(define* (run-cups-test os-configuration #:optional (cups-port 631)) + (define os + (marionette-operating-system os-configuration + #:imported-modules '((gnu services herd)))) + + (define forwarded-port 8080) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((,forwarded-port . ,cups-port))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-11) (srfi srfi-64) + (web client) (web response)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "cups") + + ;; Wait for the web interface to become ready. + (wait-for-tcp-port #$cups-port marionette) + + (test-equal "http-get default page" + 200 + (let-values + (((response text) + (http-get #$(simple-format + #f "http://localhost:~A/" forwarded-port) + #:decode-body? #t))) + (response-code response))) + + (test-equal "http-get admin page" + 200 + (let-values + (((response text) + (http-get #$(simple-format + #f "http://localhost:~A/admin" forwarded-port) + #:decode-body? #t))) + (response-code response))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "cups-test" test)) + +(define %cups-os + (simple-operating-system + (service dhcp-client-service-type) + (service cups-service-type + (cups-configuration + (web-interface? #t) + ;; Listen on all interfaces instead of just localhost so we + ;; can access the web interface "remotely". + (listen '("*:631" "/var/run/cups/cups.sock")) + ;; Add access controls for the Qemu-managed network. + (location-access-controls + (list (location-access-control + (path "/") + (access-controls '("Order allow,deny" + "Allow from 10.0.0.0/8"))) + (location-access-control + (path "/admin") + (access-controls '("Order allow,deny" + "Allow from 10.0.0.0/8"))) + (location-access-control + (path "/admin/conf") + (access-controls '("Order allow,deny" + "AuthType Basic" + "Require user @SYSTEM" + "Allow localhost"))))))))) + +(define %test-cups + (system-test + (name "cups") + (description "Test the CUPS print server") + (value (run-cups-test %cups-os)))) + -- cgit v1.2.3 From 6ce0865500ad30269dbd180d0555ce0d6a0a8edb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 14:48:04 -0500 Subject: gnu: Go: Update to 1.13.8. * gnu/packages/golang.scm (go-1.13): Update to 1.13.8. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d165ccf065..630984d3c1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -221,7 +221,7 @@ (define-public go-1.13 (package (inherit go-1.4) (name "go") - (version "1.13.7") + (version "1.13.8") (source (origin (method url-fetch) @@ -229,7 +229,7 @@ (define-public go-1.13 name version ".src.tar.gz")) (sha256 (base32 - "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4")))) + "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) -- cgit v1.2.3 From 78fca231633b5148aaa0fa68fee00b8fff8d9ac6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 02:19:13 +0100 Subject: gnu: python-pyudev: Update to 0.22.0. * gnu/packages/admin.scm (python-pyudev): Update to 0.22.0. --- 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 fdbd971880..3079114492 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3358,14 +3358,14 @@ (define-public pscircle (define-public python-pyudev (package (name "python-pyudev") - (version "0.21.0") + (version "0.22.0") (source (origin (method url-fetch) (uri (pypi-uri "pyudev" version)) (sha256 (base32 - "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9")))) + "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9")))) (build-system python-build-system) (arguments `(#:tests? #f ; Tests require /sys -- cgit v1.2.3 From efebdf3a66490b59dbafe9904701eb9b27bdaac4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 03:23:38 +0100 Subject: gnu: serd: Update to 0.30.2. * gnu/packages/rdf.scm (serd): Update to 0.30.2. --- gnu/packages/rdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index b086d2f00f..b9abd37e40 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Julien Lepiller ;;; ;;; This file is part of GNU Guix. @@ -265,14 +265,14 @@ (define-public redland (define-public serd (package (name "serd") - (version "0.30.0") + (version "0.30.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/serd-" version ".tar.bz2")) (sha256 (base32 - "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf")))) + "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 58155312028c36daa25e60b610eae9529562eabd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:04:07 +0100 Subject: gnu: oil-shell: Update to 0.7.0. * gnu/packages/shells.scm (oil-shell): Update to 0.7.0. --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1300175dd4..d28f834bdb 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015 David Thompson ;;; Copyright © 2014 Kevin Lemonnier ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 ng0 @@ -751,14 +751,14 @@ (define-public mksh (define-public oil-shell (package (name "oil-shell") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.xz")) (sha256 (base32 - "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl")))) + "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; the tests are not distributed in the tarballs -- cgit v1.2.3 From e82cf6c68750fee79f2971954318f4647e80d41c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:58:27 +0100 Subject: gnu: notmuch: Extend test time-out. * gnu/packages/mail.scm (notmuch)[arguments]: Add NOTMUCH_TEST_TIMEOUT=1h make flag. --- gnu/packages/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 271fe85b3a..daea5bb734 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -941,7 +941,9 @@ (define-public notmuch #:imported-modules (,@%gnu-build-system-modules (guix build emacs-build-system) (guix build emacs-utils)) - #:make-flags (list "V=1") ; verbose test output + #:make-flags + (list "V=1" ; verbose test output + "NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-notmuch-lib.el (lambda _ -- cgit v1.2.3 From 0e08ca14544f9a550fa94c2db9f6ed9f0220ef2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:26:24 +0100 Subject: gnu: amtk: Update to 5.0.2. * gnu/packages/gnome.scm (amtk): Update to 5.0.2. --- 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 1c4bf7558a..efdbd22e08 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4412,7 +4412,7 @@ (define-public aisleriot (define-public amtk (package (name "amtk") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/amtk/" @@ -4420,7 +4420,7 @@ (define-public amtk "amtk-" version ".tar.xz")) (sha256 (base32 - "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d")))) + "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-gtk-doc"))) -- cgit v1.2.3 From 848be51c887de9faf5b3bce81ba3a522d73e5f3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:03:47 +0100 Subject: gnu: gptfdisk: Update to 1.0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/disk.scm (gptfdisk): Update to 1.0.5. [source]: Hard-code NAME. [arguments]: Add ‘fix-include-directory’ phase. --- gnu/packages/disk.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 7684e57a7b..0628017b9a 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -161,29 +161,32 @@ (define-public fdisk (define-public gptfdisk (package (name "gptfdisk") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" - version "/" name "-" version ".tar.gz")) + version "/gptfdisk-" version ".tar.gz")) (sha256 - (base32 - "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn")))) + (base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) ("ncurses" ,ncurses) ("popt" ,popt) - ("util-linux" ,util-linux))) ; libuuid + ("util-linux" ,util-linux))) ; libuuid (arguments `(#:test-target "test" #:phases (modify-phases %standard-phases - ;; no configure script - (delete 'configure) - ;; no install target + (add-after 'unpack 'fix-include-directory + (lambda _ + (substitute* "gptcurses.cc" + (("ncursesw/ncurses.h") "ncurses.h")) + #t)) + (delete 'configure) ; no configure script (replace 'install + ;; There's no ‘make install’ target. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) -- cgit v1.2.3 From 46b39ce8351608c97e07328424f453dd22a87c4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 03:18:32 +0100 Subject: gnu: fish: Don't use NAME in source URI. * gnu/packages/shells.scm (fish)[source]: Hard-code NAME. --- gnu/packages/shells.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index d28f834bdb..8fb941bdcd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -101,7 +101,7 @@ (define-public fish (method url-fetch) (uri (string-append "https://github.com/fish-shell/fish-shell/" "releases/download/" version "/" - name "-" version ".tar.gz")) + "fish-" version ".tar.gz")) (sha256 (base32 "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl")))) (build-system gnu-build-system) -- cgit v1.2.3 From 363fe78af1196d7d527d98b1e00ea4eebf652444 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 03:28:17 +0100 Subject: gnu: liblo: Update to 0.31. * gnu/packages/audio.scm (liblo): Update to 0.31. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3d6ad82e99..cbddb8c407 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1812,14 +1812,14 @@ (define-public libbs2b (define-public liblo (package (name "liblo") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/liblo/liblo/" version "/liblo-" version ".tar.gz")) (sha256 (base32 - "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh")))) + "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb")))) (build-system gnu-build-system) (arguments `(;; liblo test FAILED -- cgit v1.2.3 From 5decb160158159f0eb0660a6476c7f257ef2a802 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:13:59 +0100 Subject: gnu: gmime: Update to 3.2.6. * gnu/packages/mail.scm (gmime): Update to 3.2.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index daea5bb734..d100e99cfb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -521,7 +521,7 @@ (define-public neomutt (define-public gmime (package (name "gmime") - (version "3.2.5") + (version "3.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gmime/" @@ -529,7 +529,7 @@ (define-public gmime "/gmime-" version ".tar.xz")) (sha256 (base32 - "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv")))) + "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From bcea20cc908201f60e62d5c77922343c70eb5f99 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:33:21 +0100 Subject: gnu: shotwell: Update to 0.30.8. * gnu/packages/gnome.scm (shotwell): Update to 0.30.8. --- 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 efdbd22e08..7e14d9d46a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5742,7 +5742,7 @@ (define-public gexiv2 (define-public shotwell (package (name "shotwell") - (version "0.30.7") + (version "0.30.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/shotwell/" @@ -5750,7 +5750,7 @@ (define-public shotwell "shotwell-" version ".tar.xz")) (sha256 (base32 - "1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l")))) + "1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From f894ffd8672f0999c580f02d4a0e6db660a8adca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 04:46:19 +0100 Subject: gnu: tome4: Update to 1.6.7. * gnu/packages/games.scm (tome4): Update to 1.6.7. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e66a1a817e..d6f8abebdd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5278,7 +5278,7 @@ (define-public open-adventure (define-public tome4 (package (name "tome4") - (version "1.6.6") + (version "1.6.7") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -5286,8 +5286,7 @@ (define-public tome4 (uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-" version ".tar.bz2")) (sha256 - (base32 - "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m")) + (base32 "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 26827dfe36a495d1e55a07f23689df14296218bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:13:45 +0100 Subject: gnu: python-activepapers: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-activepapers)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 27af30c488..09940c16fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14378,7 +14378,7 @@ (define-public python-activepapers ("python-nose" ,python-nose))) (propagated-inputs `(("python-h5py" ,python-h5py))) - (home-page "http://www.activepapers.org/") + (home-page "https://www.activepapers.org/") (synopsis "Executable papers for scientific computing") (description "ActivePapers is a tool for working with executable papers, which -- cgit v1.2.3 From 5d6e7106e169c58f90d54cf9afdcff6ab6111a71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:08:27 +0100 Subject: gnu: python-vobject: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-vobject)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 09940c16fa..be45990249 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9418,7 +9418,7 @@ (define-public python-vobject are supported and well tested. vCard 3.0 files are supported, and all data should be imported, but only a few components are understood in a sophisticated way.") - (home-page "http://eventable.github.io/vobject/") + (home-page "https://eventable.github.io/vobject/") (license license:asl2.0))) (define-public python2-vobject -- cgit v1.2.3 From d3d73bd6500c54c5480b0bbd10e9ad3268920457 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:54:27 +0100 Subject: gnu: python-seaborn: Update & use HTTPS home page. * gnu/packages/python-xyz.scm (python-seaborn)[home-page]: Follow redirection, but use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index be45990249..ec893d4264 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6128,7 +6128,7 @@ (define-public python-seaborn (native-inputs `(("python-pytest" ,python-pytest) ("xorg-server" ,xorg-server-for-tests))) - (home-page "http://stanford.edu/~mwaskom/software/seaborn/") + (home-page "https://seaborn.pydata.org/") (synopsis "Statistical data visualization") (description "Seaborn is a library for making attractive and informative statistical -- cgit v1.2.3 From fd3ae040cfeb72f96a13f5168d33279d2e6aeea5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:25:23 +0100 Subject: gnu: python-gipc: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-gipc)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec893d4264..0ae8a918aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15331,7 +15331,7 @@ (define-public python-gipc `(("unzip" ,unzip))) (propagated-inputs `(("python-gevent" ,python-gevent))) - (home-page "http://gehrcke.de/gipc") + (home-page "https://gehrcke.de/gipc/") (synopsis "Child process management in the context of gevent") (description "Usage of Python's multiprocessing package in a gevent-powered application may raise problems. With @code{gipc}, -- cgit v1.2.3 From 02510c6c9a6104665854f445e1e3ed5e2f228881 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:29:43 +0100 Subject: gnu: python-flask-principal: Update home page. * gnu/packages/python-web.scm (python-flask-principal)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 310fec4edf..ac75616657 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2672,7 +2672,7 @@ (define-public python-flask-principal (native-inputs `(("python-flask" ,python-flask) ("python-nose" ,python-nose))) - (home-page "http://packages.python.org/Flask-Principal/") + (home-page "https://pythonhosted.org/Flask-Principal/") (synopsis "Identity management for Flask") (description "@code{flask_principal} is a identity management library for Flask. It supports managing both authentication and authorization data in a -- cgit v1.2.3 From a0fdade220e320e9274832ee3ee4beda72f011cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:34:35 +0100 Subject: gnu: python-contextlib2: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-contextlib2)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ae8a918aa..f3519b75f6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8312,7 +8312,7 @@ (define-public python-contextlib2 (base32 "0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh")))) (build-system python-build-system) - (home-page "http://contextlib2.readthedocs.org/") + (home-page "https://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") (description "This module is primarily a backport of the Python 3.2 contextlib to earlier Python versions. Like contextlib, it -- cgit v1.2.3 From 1084e86b590d39d3ea8ee2388fd13b6c3bc1301a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:38:56 +0100 Subject: gnu: python2-py2neo: Use HTTPS home page. * gnu/packages/databases.scm (python2-py2neo)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d55bc7dcd8..d4891841e4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2752,7 +2752,7 @@ (define-public python2-py2neo (build-system python-build-system) (arguments `(#:python ,python-2)) - (home-page "http://py2neo.org") + (home-page "https://py2neo.org") (synopsis "Library and toolkit for working with Neo4j in Python") (description "This package provides a client library and toolkit for working with Neo4j from within Python applications and from the command -- cgit v1.2.3 From 9f733172cb3d87bf2a137314dff0b4732dbec208 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:18:16 +0100 Subject: gnu: yadifa: Use HTTPS home page. * gnu/packages/dns.scm (yadifa)[home-page]: Use HTTPS. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 192761b42e..987275edf2 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -578,7 +578,7 @@ (define-public yadifa "--enable-nsec" "--enable-nsec3" "--enable-tsig"))) - (home-page "http://www.yadifa.eu/") + (home-page "https://www.yadifa.eu/") (synopsis "Authoritative DNS name server") (description "YADIFA is an authoritative name server for the @dfn{Domain Name System} (DNS). It aims for both higher performance and a smaller memory -- cgit v1.2.3 From 754c12041deec4f797504854b565add029ed3ca5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:25:10 +0100 Subject: gnu: mu: Use HTTPS home page. * gnu/packages/mail.scm (mu)[home-page]: Use HTTPS. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d100e99cfb..600c921d48 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -781,7 +781,7 @@ (define-public mu (string-append (assoc-ref outputs "out") "/share/emacs/site-lisp")) #t))))) - (home-page "http://www.djcbsoftware.nl/code/mu/") + (home-page "https://www.djcbsoftware.nl/code/mu/") (synopsis "Quickly find emails") (description "Mu is a tool for dealing with e-mail messages stored in the -- cgit v1.2.3 From cc9b889e8f285719645b5a86f2583d7f1b2aef01 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Feb 2020 12:57:29 -0500 Subject: linux-boot: Ensure volatile root is mounted read-only. * gnu/build/linux-boot.scm (mount-root-file-system): Ensure MS_RDONLY is present among the root file system flags when VOLATILE-ROOT? is #t. --- gnu/build/linux-boot.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 3d40a7d05d..4fb711b8f2 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -362,12 +362,12 @@ (define* (mount-root-file-system root type "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is true, mount ROOT read-only and make it an overlay with a writable tmpfs using the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use -to mount ROOT." +to mount ROOT, and behave the same as for the `mount' procedure." (if volatile-root? (begin (mkdir-p "/real-root") - (mount root "/real-root" type MS_RDONLY options) + (mount root "/real-root" type (logior MS_RDONLY flags) options) (mkdir-p "/rw-root") (mount "none" "/rw-root" "tmpfs") -- cgit v1.2.3 From 99e676db43389af3a9e4c21734987c086fcaa8ed Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Feb 2020 23:56:45 -0500 Subject: file-systems: Add a 'file-system-device->string' procedure. * gnu/system/file-systems.scm (file-system-device->string): New procedure. * gnu/system.scm (bootable-kernel-arguments): Use it. * gnu/system/vm.scm (operating-system-uuid): Likewise. * guix/scripts/system.scm (display-system-generation): Likewise. --- gnu/system.scm | 15 +++++---------- gnu/system/file-systems.scm | 15 +++++++++++++++ gnu/system/vm.scm | 8 +------- guix/scripts/system.scm | 7 +------ 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 01baa248a2..2e6d03272d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -142,16 +142,11 @@ (define-module (gnu system) (define (bootable-kernel-arguments system root-device) "Return a list of kernel arguments (gexps) to boot SYSTEM from ROOT-DEVICE." (list (string-append "--root=" - (cond ((uuid? root-device) - - ;; Note: Always use the DCE format because that's - ;; what (gnu build linux-boot) expects for the - ;; '--root' kernel command-line option. - (uuid->string (uuid-bytevector root-device) - 'dce)) - ((file-system-label? root-device) - (file-system-label->string root-device)) - (else root-device))) + ;; Note: Always use the DCE format because that's what + ;; (gnu build linux-boot) expects for the '--root' + ;; kernel command-line option. + (file-system-device->string root-device + #:uuid-type 'dce)) #~(string-append "--system=" #$system) #~(string-append "--load=" #$system "/boot"))) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index d47a514b66..3b599efa8e 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -30,6 +30,7 @@ (define-module (gnu system file-systems) #:export (file-system file-system? file-system-device + file-system-device->string file-system-title ;deprecated file-system-mount-point file-system-type @@ -235,6 +236,20 @@ (define (file-prefix? file1 file2) (() #f))))))) +(define* (file-system-device->string device #:key uuid-type) + "Return the string representations of the DEVICE field of a +record. When the device is a UUID, its representation is chosen depending on +UUID-TYPE, a symbol such as 'dce or 'iso9660." + (match device + ((? file-system-label?) + (file-system-label->string device)) + ((? uuid?) + (if uuid-type + (uuid->string (uuid-bytevector device) uuid-type) + (uuid->string device))) + ((? string?) + device))) + (define (file-system-needed-for-boot? fs) "Return true if FS has the 'needed-for-boot?' flag set, or if it holds the store--e.g., if FS is the root file system." diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 81b2e06ba2..03a511cdde 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -609,13 +609,7 @@ (define (file-system-digest fs) (let ((device (file-system-device fs))) (list (file-system-mount-point fs) (file-system-type fs) - (cond ((file-system-label? device) - (file-system-label->string device)) - ((uuid? device) - (uuid->string device)) - ((string? device) - device) - (else #f)) + (file-system-device->string device) (file-system-options fs)))) (if (eq? type 'iso9660) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index b5e3a5630e..ac2475c551 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -517,12 +517,7 @@ (define (display-channel channel) (cond ((uuid? root-device) 0) ((file-system-label? root-device) 1) (else 2)) - (cond ((uuid? root-device) - (uuid->string root-device)) - ((file-system-label? root-device) - (file-system-label->string root-device)) - (else - root-device))) + (file-system-device->string root-device)) (format #t (G_ " kernel: ~a~%") kernel) -- cgit v1.2.3 From 85a7466e22d345444f952b57346f4c09de020c1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 24 Feb 2020 11:08:42 -0500 Subject: build: file-systems: Do not warn about file system check for NFS. * gnu/build/file-systems.scm (check-file-system): Define a dummy checker procedure for NFS that always passes to prevent a warning from being emitted. --- gnu/build/file-systems.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index ee6375515f..902563b219 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 David C. Trudgian +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -581,6 +582,7 @@ (define check-procedure ((string-prefix? "btrfs" type) check-btrfs-file-system) ((string-suffix? "fat" type) check-fat-file-system) ((string-prefix? "jfs" type) check-jfs-file-system) + ((string-prefix? "nfs" type) (const 'pass)) (else #f))) (if check-procedure -- cgit v1.2.3 From c1005113a3e8e2d59f63d9e6a0a6176c7f67421f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 23:42:56 -0500 Subject: gnu: WireGuard: Simplify package definitions. * gnu/packages/vpn.scm (wireguard-tools, wireguard)[arguments]: Set --directory in #:make-flags and remove the 'chdir', 'enter-source-directory' and 'reset-cwd' phases. --- gnu/packages/vpn.scm | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 78a2c322af..a6bba28db1 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Meiyo Peng -;;; Copyright © 2019 Leo Famulari +;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus ;;; @@ -471,6 +471,7 @@ (define-public wireguard `(#:tests? #f ; No tests available. #:make-flags (list "CC=gcc" + "--directory=src/tools" "WITH_BASHCOMPLETION=yes" ;; Build and install the helper script wg-quick(8). "WITH_WGQUICK=yes" @@ -498,17 +499,7 @@ (define-public wireguard (call-with-output-file output (lambda (port) (format port "~a" str)))) - #t)) - (add-after 'make-patch 'chdir - (lambda _ - (chdir "src/tools") - #t)) - ;; Otherwise the 'install-license-file' phase installs nothing. - ;; - (add-after 'install 'reset-cwd - (lambda _ - (chdir "../..") - #t))))) + #t))))) (inputs `(("libmnl" ,libmnl))) (home-page "https://www.wireguard.com/") @@ -537,6 +528,7 @@ (define-public wireguard-tools `(#:tests? #f ; no test suite #:make-flags (list "CC=gcc" + "--directory=src" "WITH_BASHCOMPLETION=yes" ;; Install the ‘simple and dirty’ helper script wg-quick(8). "WITH_WGQUICK=yes" @@ -545,17 +537,8 @@ (define-public wireguard-tools (string-append "SYSCONFDIR=no-thanks")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'enter-source-directory - (lambda _ - (chdir "src") - #t)) - (delete 'configure) ; no configure script - (add-after 'install 'reset-cwd - ;; Otherwise the 'install-license-file' phase installs nothing. - ;; - (lambda _ - (chdir "..") - #t))))) + ;; No configure script + (delete 'configure)))) (home-page "https://www.wireguard.com/") (synopsis "Tools for configuring WireGuard tunnels") (description -- cgit v1.2.3 From 19781930b781813e61be1b77e8b6cd34c2868d62 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Mar 2020 00:12:19 -0500 Subject: gnu: wireguard-tools: Explain why we skip the test suite. * gnu/packages/vpn.scm (wireguard-tools): Add comment. --- gnu/packages/vpn.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a6bba28db1..becc505b34 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -525,8 +525,7 @@ (define-public wireguard-tools (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite - #:make-flags + `(#:make-flags (list "CC=gcc" "--directory=src" "WITH_BASHCOMPLETION=yes" @@ -535,6 +534,10 @@ (define-public wireguard-tools (string-append "PREFIX=" (assoc-ref %outputs "out")) ;; Currently used only to create an empty /etc/wireguard directory. (string-append "SYSCONFDIR=no-thanks")) + ;; The test suite is meant to be run interactively. It runs Clang's + ;; scan-build static analyzer and then starts a web server to display the + ;; results. + #:tests? #f #:phases (modify-phases %standard-phases ;; No configure script -- cgit v1.2.3 From 659ece59fff81ffaac83121dc2fc7bc6a5e9b622 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 22:33:08 +0200 Subject: gnu: Add rust-shell-words-0.1. * gnu/packages/crates-io.scm (rust-shell-words-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d4bc8ffcd..67b87bf1d5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15747,6 +15747,27 @@ (define-public rust-shared-library-0.1 "This package allows easy binding to, and loading of, shared libraries.") (license (list license:asl2.0 license:expat)))) +(define-public rust-shell-words-0.1 + (package + (name "rust-shell-words") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "shell-words" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jnrw3f174974fsi2hg48l0klpy24767ib28w0xcvi2ll5axxb1r")))) + (build-system cargo-build-system) + (home-page "https://github.com/tmiasko/shell-words") + (synopsis + "Process command line according to parsing rules of UNIX shell") + (description + "Process command line according to parsing rules of UNIX shell.") + (license (list license:expat license:asl2.0)))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") -- cgit v1.2.3 From 92c6315afbba416dae93153255dd0172e30d9d38 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 22:48:06 +0200 Subject: gnu: Add rust-glib-sys-0.9. * gnu/packages/crates-io.scm (rust-glib-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 67b87bf1d5..b6499a4cf2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31,6 +31,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -6354,6 +6355,35 @@ (define-public rust-gleam-0.6 "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glib-sys-0.9 + (package + (name "rust-glib-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qhnwfqqcp63mx4q9744rfkq78g6ky2j8ppsxxgw0ipl08w6z1cm")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test libraries not included in release. + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("glib" ,glib))) + (home-page "http://gtk-rs.org/") + (synopsis "FFI bindings to libglib-2.0") + (description "This package provides FFI bindings to libglib-2.0.") + (license license:expat))) + (define-public rust-glium-0.25 (package (name "rust-glium") -- cgit v1.2.3 From e87b3bdaa790569be7697db12b5aa60d99ae2986 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 23:03:09 +0200 Subject: gnu: Add rust-gobject-sys-0.9. * gnu/packages/crates-io.scm (rust-gobject-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6499a4cf2..c3cd72c0f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6682,6 +6682,36 @@ (define-public rust-glutin-wgl-sys-0.1 (description "The wgl bindings for glutin.") (license license:asl2.0))) +(define-public rust-gobject-sys-0.9 + (package + (name "rust-gobject-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gobject-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nakflbp3gjaas4fw7sn3p1p32khyfpcq1h06z7yqd10yq2ail9i")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test libraries not included in release. + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("glib" ,glib))) + (home-page "http://gtk-rs.org/") + (synopsis "FFI bindings to libgobject-2.0") + (description "This package provides FFI bindings to libgobject-2.0.") + (license license:expat))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From 4b47476b91b3742ca653ce188ec84e00736e97ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 23:09:46 +0200 Subject: gnu: Add rust-gio-sys-0.9. * gnu/packages/crates-io.scm (rust-gio-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3cd72c0f3..a3f7585bd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6202,6 +6202,37 @@ (define-public rust-gimli-0.18 DWARF debugging format.") (license (list license:asl2.0 license:expat)))) +(define-public rust-gio-sys-0.9 + (package + (name "rust-gio-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "049rafihxp3maxg3fwj6062ni9dcfilvhfq6ibnfgsmr89925bag")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test libraries not included in release. + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("glib" ,glib))) + (home-page "http://gtk-rs.org/") + (synopsis "FFI bindings to libgio-2.0") + (description "This package provides FFI bindings to libgio-2.0.") + (license license:expat))) + (define-public rust-git2-0.11 (package (name "rust-git2") -- cgit v1.2.3 From 3181eb4491503cf94a9a6a354eaf8936e6ae562c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 23:16:48 +0200 Subject: gnu: Add rust-locale-config-0.3. * gnu/packages/crates-io.scm (rust-locale-config-0.3): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a3f7585bd5..a5272156ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8954,6 +8954,34 @@ (define-public rust-locale-0.2 "This package provides a library for basic localisation.") (license license:expat))) +(define-public rust-locale-config-0.3 + (package + (name "rust-locale-config") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "locale_config" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d399alr1i7h7yji4vydbdbzd8hp0xaykr7h4rn3yj7l2rdw7lh8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-regex" ,rust-regex-1.3) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/rust-locale/locale_config/") + (synopsis "Maintains locale preferences for processes and threads") + (description + "Maintains locale preferences for process and thread and initialises them +by inspecting the system for user preference.") + (license license:expat))) + (define-public rust-lock-api-0.3 (package (name "rust-lock-api") -- cgit v1.2.3 From 8d6f9168cccdc72707bfb836fb8835d6eee05e03 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Mar 2020 08:48:30 +0200 Subject: gnu: librsvg-2.46: Update to 2.46.4. * gnu/packages/gnome.scm (librsvg-2.46): Update to 2.46.4. [source]: Replace more crates. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7e14d9d46a..b725d0d167 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2152,7 +2152,7 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:guile-for-build guile))) (define librsvg-next-source - (let* ((version "2.46.3") + (let* ((version "2.46.4") (upstream-source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -2160,7 +2160,7 @@ (define librsvg-next-source "librsvg-" version ".tar.xz")) (sha256 (base32 - "1s3a96i7f4pynjwxxvhysp4b6r7kyi8nasdxfyi62hc7gm34d3kn"))))) + "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"))))) (origin (method computed-origin-method) (file-name (string-append "librsvg-" version ".tar.xz")) @@ -2180,8 +2180,6 @@ (define librsvg-next-source (with-directory-excursion (string-append "librsvg-" #$version) ;; The following crate(s) are needed in addition to the ones replaced: (begin - (substitute* "rsvg_internals/Cargo.toml" - (("\"=") "\"")) (invoke "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor") (invoke @@ -2242,10 +2240,10 @@ (define librsvg-next-source ;; gdk-pixbuf-sys 0.9 ("generic-array" . #+(package-source rust-generic-array-0.12)) ;; gio 0.7 -;; gio-sys 0.9 + ("gio-sys" . #+(package-source rust-gio-sys-0.9)) ;; glib 0.8 -;; glib-sys 0.9 -;; gobject-sys 0.9 + ("glib-sys" . #+(package-source rust-glib-sys-0.9)) + ("gobject-sys" . #+(package-source rust-gobject-sys-0.9)) ("idna" . #+(package-source rust-idna-0.2)) ("itertools" . #+(package-source rust-itertools-0.8)) ("itoa" . #+(package-source rust-itoa-0.4)) @@ -2253,7 +2251,7 @@ (define librsvg-next-source ("lazy_static" . #+(package-source rust-lazy-static-1)) ("libc" . #+(package-source rust-libc-0.2)) ("libm" . #+(package-source rust-libm-0.1)) -;; locale_config 0.3 + ("locale_config" . #+(package-source rust-locale-config-0.3)) ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) @@ -2372,6 +2370,8 @@ (define-public librsvg-next (use-modules (guix build cargo-utils)) (substitute* "librsvg/Cargo.toml" (("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored + (substitute* "rsvg_internals/Cargo.toml" + (("\"=") "\"")) (generate-all-checksums "vendor") (delete-file "Cargo.lock") (invoke "cargo" "generate-lockfile"))) -- cgit v1.2.3 From 3276e123920c2547d537efdcd080b813ba72ce0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Mar 2020 09:06:43 +0200 Subject: gnu: librsvg-next: Fix version string. This is a follow-up to 8d6f9168cccdc72707bfb836fb8835d6eee05e03. * gnu/packages/gnome.scm (librsvg-next)[version]: Update to 2.46.4. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b725d0d167..ff262d1fa8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2354,7 +2354,7 @@ (define librsvg-next-source (define-public librsvg-next (package (name "librsvg") - (version "2.46.3") + (version "2.46.4") (source librsvg-next-source) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 23f33de151368f52832fd96048b342bd1a6e8c74 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Mar 2020 09:21:17 +0200 Subject: gnu: librsvg: Fix CVE-2019-20446. * gnu/packages/gnome.scm (librsvg)[replacement]: New field. (librsvg/fixed): New private variable. --- gnu/packages/gnome.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ff262d1fa8..7cfe35d3f0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2074,6 +2074,7 @@ (define-public libgsf (define-public librsvg (package + (replacement "librsvg/fixed") (name "librsvg") (version "2.40.20") (source (origin @@ -2138,6 +2139,20 @@ (define-public librsvg library.") (license license:lgpl2.0+))) +(define librsvg/fixed + (package + (inherit librsvg) + (name "librsvg") + (version "2.40.21") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))))) + (define* (computed-origin-method gexp-promise hash-algo hash #:optional (name "source") #:key (system (%current-system)) -- cgit v1.2.3 From 35b256f55f45833aacfac3238bedf017cfab3650 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Mar 2020 09:27:08 +0200 Subject: gnu: librsvg: Fix typo. This is a follow-up to 23f33de151368f52832fd96048b342bd1a6e8c74. * gnu/packages/gnome.scm (librsvg)[replacement]: Refer to package, not to a string. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7cfe35d3f0..0cd39f9104 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2074,7 +2074,7 @@ (define-public libgsf (define-public librsvg (package - (replacement "librsvg/fixed") + (replacement librsvg/fixed) (name "librsvg") (version "2.40.20") (source (origin -- cgit v1.2.3 From 2197c08428bb31e3869b63db88cc886d098b1620 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 3 Mar 2020 08:11:35 +0000 Subject: gnu: python-django: Update to 1.11.28. * gnu/packages/django.scm (python-django): Update to 1.11.28. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 1c4f00ac77..3e63847a87 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -42,13 +42,13 @@ (define-module (gnu packages django) (define-public python-django (package (name "python-django") - (version "1.11.25") + (version "1.11.28") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0rpgx212n8gh61nwizkyldvskna808xpcvawmavk5mc5c9cfh52k")))) + "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k")))) (build-system python-build-system) (arguments '(#:modules ((srfi srfi-1) -- cgit v1.2.3 From 72fdf85fadbed18bd4a64d3b735dfb4ad9f7201c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 09:57:36 +0100 Subject: gnu: Add emacs-spacemacs-theme. * gnu/packages/emacs-xyz.scm (emacs-spacemacs-theme): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1fae2423f9..eb1e68deae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20399,6 +20399,31 @@ (define-public emacs-punpun-theme color. Designed for 256-color terminals. Comes in light and dark!") (license license:gpl3+)))) +(define-public emacs-spacemacs-theme + (let ((commit "e088bff4f190495615c29de93079aaa823e2300c") + (revision "0")) + (package + (name "emacs-spacemacs-theme") + (version (git-version "0" revision commit)) ;no release yet + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nashamri/spacemacs-theme.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc")))) + (build-system emacs-build-system) + (home-page "https://github.com/nashamri/spacemacs-theme") + (synopsis + "Light and dark theme for spacemacs that supports GUI and terminal") + (description + "Spacemacs theme is an Emacs color theme that started as +a theme for Spacemacs. The theme comes with dark and light variants +and it should work well with 256 color terminals.") + (license license:gpl3+)))) + (define-public emacs-elixir-mode (package (name "emacs-elixir-mode") -- cgit v1.2.3 From 3842baa07795ccc9d92ccda631998ffe5d15a6b0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 29 Feb 2020 17:10:46 +0100 Subject: gnu: dxvk: Return #t in install-32 phase. * gnu/packages/wine.scm (dxvk)[arguments]: Return #t in install-32 phase. --- gnu/packages/wine.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 35defc326b..a96191422b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -607,7 +607,8 @@ (define-public dxvk (dxvk32 (assoc-ref inputs "dxvk32"))) (mkdir-p (string-append out "/lib32")) (copy-recursively (string-append dxvk32 "/lib") - (string-append out "/lib32")))))) + (string-append out "/lib32")) + #t)))) '()) (add-after 'install 'install-setup (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From adb1e3b6cfdd342d1ca95a7901a94543b2585f81 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 3 Mar 2020 10:26:11 +0100 Subject: gnu: dxvk: Update to 1.5.5. * gnu/packages/wine.scm (dxvk): Update to 1.5.5. --- 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 a96191422b..5eb813350b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -554,7 +554,7 @@ (define dxvk32 ;; This package provides 32-bit dxvk libraries on 64-bit systems. (package (name "dxvk32") - (version "1.5.4") + (version "1.5.5") (home-page "https://github.com/doitsujin/dxvk/") (source (origin (method git-fetch) @@ -564,7 +564,7 @@ (define dxvk32 (file-name (git-file-name name version)) (sha256 (base32 - "0yhxd5rnn5mcvcb2n062z9wqqwxjq5c0rzfbjz1z9ppznj8gn37i")))) + "1inl0qswgvbp0fs76md86ilqf9mbshkpjm8ga81khn9zd6v3fvan")))) (build-system meson-build-system) (arguments `(#:system "i686-linux" -- cgit v1.2.3 From cfe1000bc6959768c6cd6768be1612225d688447 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 3 Mar 2020 10:35:58 +0100 Subject: gnu: Add emacs-csv. * gnu/packages/emacs-xyz.scm (emacs-csv): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eb1e68deae..60cca75ca1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21692,3 +21692,25 @@ (define-public emacs-password-generator generate random passwords and insert them into the current buffer. It also supports generation of phonetic and numeric passwords.") (license license:artistic2.0))) + +(define-public emacs-csv + (package + (name "emacs-csv") + (version "2.1") + (home-page "https://gitlab.com/u11/csv.el") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa")))) + (build-system emacs-build-system) + (synopsis "Elisp functions for reading and parsing CSV files") + (description "@code{csv.el} provides functions for reading and parsing CSV (Comma +Separated Value) files. It follows the format as defined in RFC 4180 \"Common +Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).") + (license license:gpl3+))) -- cgit v1.2.3 From be0c3ac7720ac85667a244bee425a9c6d611de5e Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Tue, 3 Mar 2020 13:10:57 +1300 Subject: gnu: chicken: Update to 5.2.0. * gnu/packages/chicken.scm (chicken): Update to 5.2.0. [home-page]: Use https. Signed-off-by: Efraim Flashner --- gnu/packages/chicken.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index 2034ca942a..7b86a58012 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020 Evan Hanson ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +29,14 @@ (define-module (gnu packages chicken) (define-public chicken (package (name "chicken") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append "https://code.call-cc.org/releases/" version "/chicken-" version ".tar.gz")) (sha256 (base32 - "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw")))) + "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -59,7 +60,7 @@ (define-public chicken ;; Parallel builds are not supported, as noted in README. #:parallel-build? #f)) (propagated-inputs `(("gcc-toolchain", gcc-toolchain))) - (home-page "http://www.call-cc.org/") + (home-page "https://www.call-cc.org/") (synopsis "R5RS Scheme implementation that compiles native code via C") (description "CHICKEN is a compiler for the Scheme programming language. CHICKEN -- cgit v1.2.3 From 197582da6ad776477f13bb096dedd8864c0eab4e Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Sun, 1 Mar 2020 20:44:43 +0200 Subject: gnu: elixir: Update to 1.10.2. * gnu/packages/elixir.scm (elixir): Update to 1.10.2. Signed-off-by: Efraim Flashner --- gnu/packages/elixir.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 9aa693ff3a..a52b31f22d 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-module (gnu packages elixir) (define-public elixir (package (name "elixir") - (version "1.10.0") + (version "1.10.2") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (define-public elixir (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv")) + (base32 "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9309fe355e62bb938eaa48ae23d4ffcc566da67d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 11:32:12 +0100 Subject: gnu: gess: Override PYTHONPATH. * gnu/packages/bioinformatics.scm (gess)[arguments]: Override PYTHONPATH instead of augmenting it. --- 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 74646cc4a8..b1913dcaa3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11090,7 +11090,7 @@ (define-public gess " line))) ;; Make sure GESS has all modules in its path (wrap-program (string-append target "GESS.py") - `("PYTHONPATH" ":" prefix (,target ,(getenv "PYTHONPATH")))) + `("PYTHONPATH" ":" = (,target ,(getenv "PYTHONPATH")))) (mkdir-p bin) (symlink (string-append target "GESS.py") (string-append bin "GESS.py")) -- cgit v1.2.3 From 4d5d07f75cc4ff1b1eb27837671d5c2553e8a3d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 11:32:47 +0100 Subject: gnu: gess: Use WRAP-SCRIPT. * gnu/packages/bioinformatics.scm (gess)[arguments]: Use WRAP-SCRIPT. [inputs]: Add guile-3.0 for wrapper. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b1913dcaa3..0c12e7c874 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11089,7 +11089,7 @@ (define-public gess matplotlib.use('Agg') " line))) ;; Make sure GESS has all modules in its path - (wrap-program (string-append target "GESS.py") + (wrap-script (string-append target "GESS.py") `("PYTHONPATH" ":" = (,target ,(getenv "PYTHONPATH")))) (mkdir-p bin) (symlink (string-append target "GESS.py") @@ -11101,7 +11101,8 @@ (define-public gess ("python2-scipy" ,python2-scipy) ("python2-numpy" ,python2-numpy) ("python2-networkx" ,python2-networkx) - ("python2-biopython" ,python2-biopython))) + ("python2-biopython" ,python2-biopython) + ("guile" ,guile-3.0))) ; for the script wrapper (home-page "https://compbio.uthscsa.edu/GESS_Web/") (synopsis "Detect exon-skipping events from raw RNA-seq data") (description -- cgit v1.2.3 From f27de2f90957159407facc8d5da5f8421c165580 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 12:15:21 +0100 Subject: gnu: r-servr: Update to 0.16. * gnu/packages/cran.scm (r-servr): Update to 0.16. --- 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 9d154c030a..9e834415da 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -554,13 +554,13 @@ (define-public r-jsonlite (define-public r-servr (package (name "r-servr") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi")))) + "106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From 013a0bc05f2230b998f3a34f7776efbe014b5fa0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 12:52:46 +0100 Subject: gnu: Add asciidoc-py3. * gnu/packages/documentation.scm (asciidoc-py3): New variable. --- gnu/packages/documentation.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 19c42b00eb..50e0f25cfb 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages documentation) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) @@ -120,6 +122,29 @@ (define-public asciidoc markup) can be customized and extended by the user.") (license gpl2+))) +(define-public asciidoc-py3 + (package (inherit asciidoc) + (name "asciidoc-py3") + (version "9.0.0rc1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/asciidoc/asciidoc-py3/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v815dgab62970m9cr2crwbh4kvlzk6pv3hk4bzv6gfa4lbwfkfl")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf))) + (inputs + `(("python" ,python) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt))))) + (define-public doxygen (package (name "doxygen") -- cgit v1.2.3 From 8c8eb0798523221c060f6c398b769c1c65061245 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 3 Mar 2020 09:41:08 +0100 Subject: gnu: erlang: Update to 21.3.8.13 * gnu/packages/erlang.scm (erlang): Update to 21.3.8.13 Signed-off-by: Efraim Flashner --- gnu/packages/erlang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 4e12bb4813..865895da78 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -40,7 +40,7 @@ (define-module (gnu packages erlang) (define-public erlang (package (name "erlang") - (version "21.0.5") + (version "21.3.8.13") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -52,7 +52,7 @@ (define-public erlang (file-name (git-file-name name version)) (sha256 (base32 - "0gv83i5ybj1z3ykbbldjzf7dbfjszp84c0yzrpshj611b9wp0176")) + "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -68,7 +68,7 @@ (define-public erlang (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0cgv23q0215f6lvmhj4w9skx5m29khjs9mb890635s3yp520xgqh")))))) + "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) -- cgit v1.2.3 From dadd5cba2e46067329770e915a02d390a4937dc8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 3 Mar 2020 13:31:18 +0100 Subject: gnu: sbcl: Update to 2.0.2. * gnu/packages/lisp.scm (sbcl): Update to 2.0.2. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 369d4fc4ec..b5d8fd30f3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -365,14 +365,14 @@ (define-public clisp (define-public sbcl (package (name "sbcl") - (version "2.0.0") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh")))) + (base32 "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From dedbdacf275cb7871c7336bd7a27ceb609b15113 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 3 Mar 2020 03:35:06 -0800 Subject: gnu: Add kexec-tools. * gnu/packages/linux.scm (kexec-tools): New variable. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/linux.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0289047d27..5f2d37deda 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2020 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -6408,3 +6409,26 @@ (define-public lttng-ust enable and disable specific instrumentation points, and writes event records to ring buffers shared with a consumer daemon.") (license license:lgpl2.1+))) + +(define-public kexec-tools + (package + (name "kexec-tools") + (version "2.0.20") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/linux/utils/kernel" + "/kexec/kexec-tools-" version ".tar.xz")) + (sha256 + (base32 + "1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s")))) + (build-system gnu-build-system) + (arguments + ;; There are no automated tests. + '(#:tests? #f)) + (home-page "https://projects.horms.net/projects/kexec/") + (synopsis "Tools for booting directly into different kernels") + (description "This package provides the @code{kexec} program and ancillary +utilities. Using @code{kexec}, it is possible to boot directly into a new +kernel from the context of an already-running kernel, bypassing the normal +system boot process.") + (license license:gpl2))) -- cgit v1.2.3 From 1e8fef19b6320d3382a4a69273e5aae8d49e9c41 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 3 Mar 2020 13:23:11 +0000 Subject: gnu: emacs-auctex: Compile Reference Card. * gnu/packages/emacs-xyz.scm (emacs-auctex)[arguments]: Add 'install-doc' phase. [inputs]: New field. --- gnu/packages/emacs-xyz.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60cca75ca1..80692615ce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1663,9 +1663,24 @@ (define-public emacs-auctex (arguments `(#:emacs ,emacs #:include '("\\.el$" "^images/" "^latex/" "\\.info$") - #:exclude '("^tests/" "^latex/README"))) + #:exclude '("^tests/" "^latex/README") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc-dir (string-append out "/share/" ,name "/" + ,version "/etc"))) + (with-directory-excursion "doc" + (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm + (invoke "pdftex" "tex-ref") + (install-file "tex-ref.pdf" (string-append etc-dir + "/refcards"))) + #t)))))) (native-inputs `(("perl" ,perl))) + (inputs + `(("texlive" ,(texlive-union (list texlive-amsfonts))))) (home-page "https://www.gnu.org/software/auctex/") (synopsis "Integrated environment for TeX") (description -- cgit v1.2.3 From 8f5a0a97b1d04e8ade8c16694dcb72aed176c595 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Feb 2020 16:42:36 +0100 Subject: services: herd: Add restart-service. * gnu/services/herd.scm (restart-service): New exported procedure. --- gnu/services/herd.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 112a7dc104..35d69376d0 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +55,8 @@ (define-module (gnu services herd) load-services load-services/safe start-service - stop-service)) + stop-service + restart-service)) ;;; Commentary: ;;; @@ -272,6 +273,10 @@ (define (stop-service name) (with-shepherd-action name ('stop) result result)) +(define (restart-service name) + (with-shepherd-action name ('restart) result + result)) + ;; Local Variables: ;; eval: (put 'alist-let* 'scheme-indent-function 2) ;; eval: (put 'with-shepherd 'scheme-indent-function 1) -- cgit v1.2.3 From 7138257892f1189b84e06a47c7ba8540337bd7a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 15:16:28 +0100 Subject: gnu: git: Build with Python 3. * gnu/packages/version-control.scm (git)[inputs]: Replace python-2 with python. [arguments]: Replace /usr/bin/python with python3. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6597844a9b..d88d5b4036 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer -;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -179,7 +179,7 @@ (define-public git ("expat" ,expat) ("openssl" ,openssl) ("perl" ,perl) - ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL + ("python" ,python) ; for git-p4 ("zlib" ,zlib) ;; Note: we keep this in inputs rather than native-inputs to work around @@ -262,7 +262,7 @@ (define-public git (lambda _ (substitute* "Makefile" (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python"))) + (("/usr/bin/python") (which "python3"))) #t)) (add-after 'configure 'add-PM.stamp (lambda _ -- cgit v1.2.3 From 7dffb5bacea543e983de16b6d746159602acd6d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 15:17:45 +0100 Subject: gnu: git: Remove Python 2 from the package closure. * gnu/packages/version-control.scm (git)[native-inputs]: Replace asciidoc with asciidoc-py3. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d88d5b4036..a8cb4cc347 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -171,7 +171,7 @@ (define-public git (base32 "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h")))) ;; For subtree documentation. - ("asciidoc" ,asciidoc) + ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) ("xmlto" ,xmlto))) (inputs -- cgit v1.2.3 From c06c7a3aec38471dae3fb88f64558921003b2590 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 00:19:01 +0100 Subject: gnu: linux: Add lsscsi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (lsscsi): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/linux.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f2d37deda..64ea566dbd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -1842,6 +1843,27 @@ (define-public iptables Both commands are targeted at system administrators.") (license license:gpl2+))) +(define-public lsscsi + (package + (name "lsscsi") + (version "0.31") + (source (origin + (method url-fetch) + (uri (string-append + "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz")) + (sha256 + (base32 + "1ry2y34xmpgxdbfbyvs8cjmbx0fn222yjdab87wj21q60nab5p75")))) + (build-system gnu-build-system) + (synopsis "Lists information about SCSI or NVMe devices in Linux") + (home-page "http://sg.danny.cz/scsi/lsscsi.html") + (description + "@command{lsscsi} lists SCSI logical units or SCSI targets. It can +also list NVMe namespaces or controllers and show the relationship between a +device's primary node name, its SCSI generic (sg) node name and its kernel +name.") + (license license:gpl2))) + (define-public ebtables (package (name "ebtables") -- cgit v1.2.3 From d8104034bce470c5bbf929f53844124b09e9ea73 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 17:26:37 +0100 Subject: gnu: wine: Update to 5.3. * gnu/packages/wine.scm (wine): Update to 5.3. [native-inputs]: Re-order inputs alphabetically. --- gnu/packages/wine.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5eb813350b..27de43aa25 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -76,21 +76,26 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "5.0") + (version "5.3") (source (origin (method url-fetch) - (uri (string-append "https://dl.winehq.org/wine/source/" - (version-major+minor version) - "/wine-" version ".tar.xz")) + (uri (let ((dir (string-append + (version-major version) + (if (string-suffix? ".0" (version-major+minor version)) + ".0/" + ".x/"))))) + (string-append "https://dl.winehq.org/wine/source/" dir + "wine-" version ".tar.xz")) (sha256 - (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) + (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("flex" ,flex) - ("bison" ,bison) - ("perl" ,perl))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("dbus" ,dbus) -- cgit v1.2.3 From 53b48447a71f3ffd36b3d973562a1a771691c396 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 17:33:28 +0100 Subject: gnu: wine: Fix typo. * gnu/packages/wine.scm (wine): Fix typo. This is a followup to d8104034bce470c5bbf929f53844124b09e9ea73. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 27de43aa25..e16a4bbcaa 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -84,9 +84,9 @@ (define-public wine (version-major version) (if (string-suffix? ".0" (version-major+minor version)) ".0/" - ".x/"))))) - (string-append "https://dl.winehq.org/wine/source/" dir - "wine-" version ".tar.xz")) + ".x/")))) + (string-append "https://dl.winehq.org/wine/source/" dir + "wine-" version ".tar.xz"))) (sha256 (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (build-system gnu-build-system) -- cgit v1.2.3 From 3b11122f39e07ff485e827b8009cb86df777698d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 19:20:17 +0100 Subject: gnu: emacs-solarized-theme: Update to 1.3.1. * gnu/packages/emacs-xyz.scm (emacs-solarized-theme): Update to 1.3.1. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 80692615ce..6f31a30747 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4997,16 +4997,16 @@ (define-public emacs-moe-theme-el (define-public emacs-solarized-theme (package (name "emacs-solarized-theme") - (version "1.2.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bbatsov/solarized-emacs/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3")))) + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/solarized-emacs/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From be54abc61d4193fe3bee4bd62cc33412a9314975 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 19:23:17 +0100 Subject: gnu: wine-staging: Update to 5.3. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.3. (wine-staging): Update hash. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index e16a4bbcaa..541ef3cd7a 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -328,7 +328,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.0") + (version "5.3") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f")))) + (base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -387,7 +387,7 @@ (define-public wine-staging "/wine-" version ".tar.xz"))) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) + (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 83c4c5027b2172c9e9a8e58b5b4ea94efe6c7cef Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Mar 2020 01:58:09 +0100 Subject: gnu: java-jsonp-api: Update to 1.1.6. * gnu/packages/java.scm (java-jsonp-api, java-jsonp-impl): Update to 1.1.6. --- gnu/packages/java.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 57f1ebc6be..a0b5776807 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11549,16 +11549,16 @@ (define-public abcl (define-public java-jsonp-api (package (name "java-jsonp-api") - (version "1.1.5") + (version "1.1.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/eclipse-ee4j/jsonp") - (commit (string-append version "-RELEASE")))) + (commit (string-append "1.1-" version "-RELEASE")))) (file-name (git-file-name name version)) (sha256 (base32 - "0nxq16lrx7i87hgyj5rzcwilvr67h0i299gygfn8f5vs4n7n59vy")))) + "0zrj03hkr3jdmqlb4ipjr37cqpp2q2814qpmxi7srlwpdqs0ibgc")))) (build-system ant-build-system) (arguments `(#:jar-name "jsonp-api.jar" @@ -11584,7 +11584,15 @@ (define-public java-jsonp-impl `(#:jar-name "jsonp-impl.jar" #:tests? #f #:source-dir "impl/src/main/java" - #:test-dir "impl/src/test")) + #:test-dir "impl/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively + "impl/src/main/resources/" + "build/classes") + #t))))) (propagated-inputs `(("java-jsonp-api" ,java-jsonp-api))) (description "JSON Processing (JSON-P) is a Java API to process (e.g. -- cgit v1.2.3 From 8c8c0c63ecc2be9dac6b3776e039058413bc063b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Mar 2020 01:59:38 +0100 Subject: gnu: java-jmapviewer: Update ot 2.13. * gnu/packages/geo.scm (java-jmapviewer): Update to 2.13. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 7f60f9b7ea..8e0538b26a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1092,7 +1092,7 @@ (define-public libspatialindex (define-public java-jmapviewer (package (name "java-jmapviewer") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) (uri (string-append "https://svn.openstreetmap.org/applications/" @@ -1100,7 +1100,7 @@ (define-public java-jmapviewer "/JMapViewer-" version "-Source.zip")) (sha256 (base32 - "08hbqsbs859v4m5d90560fdifavd1apnpz9v9iry1v31dsvy5707")))) + "0sy6r5fkbb9bclw0is6gwnbzz627m7pjfnsqydxz58pbndakkhrv")))) (build-system ant-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 4b759d3c548270eba348521669bae15c9e5b72bc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Mar 2020 02:00:10 +0100 Subject: gnu: josm: Update to 15937. * gnu/packages/geo.scm (josm): Update to 15937. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8e0538b26a..d458c7bc92 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1127,7 +1127,7 @@ (define-public java-jmapviewer (define-public josm (package (name "josm") - (version "15553") + (version "15937") (source (origin (method svn-fetch) (uri (svn-reference @@ -1136,7 +1136,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "091pbcn4fnmk42fmxplhis3nw5dbljf6ws8acyhx5dflyn49xzmx")) + "00b8sw0wgkcf7xknmdpn5s521ax8x2660figidcrry37sgq3x946")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 5e860b606265ba5bafae695d07410354680b080c Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 3 Feb 2020 12:28:18 +0100 Subject: gnu: Add perl-pdf-api2. * gnu/packages/perl.scm (perl-pdf-api2): New variable. --- gnu/packages/perl.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f513a78f76..1797766db5 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7247,6 +7247,30 @@ (define-public perl-path-tiny with file paths.") (license asl2.0))) +(define-public perl-pdf-api2 + (package + (name "perl-pdf-api2") + (version "2.036") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-" + version ".tar.gz")) + (sha256 + (base32 + "0x0pa75wpb87pcshl92y5nh8pzikjp46ljlr2pqvdgpqzvll8107")))) + (build-system perl-build-system) + (native-inputs + `(("perl-test-exception" ,perl-test-exception) + ("perl-test-memory-cycle" ,perl-test-memory-cycle))) + (propagated-inputs + `(("perl-font-ttf" ,perl-font-ttf))) + (home-page "https://metacpan.org/release/PDF-API2") + (synopsis "Facilitates the creation and modification of PDF files") + (description "This Perl module facilitates the creation and modification +of PDF files.") + (license lgpl2.1))) + (define-public perl-perlio-utf8_strict (package (name "perl-perlio-utf8-strict") -- cgit v1.2.3 From cc51c03ff867d4633505354819c6d88af88bf919 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 3 Feb 2020 12:29:33 +0100 Subject: gnu: Add fntsample. * gnu/packages/fontutils.scm (fntsample): New variable. --- gnu/packages/fontutils.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 42d12fb143..8d39730a7b 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -774,3 +775,64 @@ (define-public fontmanager While designed primarily with the GNOME Desktop Environment in mind, it should work well with other GTK+ desktop environments.") (license license:gpl3+))) + +(define-public fntsample + (package + (name "fntsample") + (version "5.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/eugmes/fntsample/archive/release/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0awp4dh1g40ivzvm5xqlvcpcdw1vplrx3drjmbylr62y185vbs74")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; There are no tests. + #:configure-flags + (list (string-append + "-DUNICODE_BLOCKS=" (assoc-ref %build-inputs "unicode-blocks"))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'set-library-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pdf-api2 (assoc-ref inputs "perl-pdf-api2")) + (intl (assoc-ref inputs "perl-libintl-perl")) + (perllib (string-append pdf-api2 + "/lib/perl5/site_perl/" + ,(package-version perl) + ":" intl + "/lib/perl5/site_perl/" + ,(package-version perl)))) + (wrap-program (string-append out "/bin/pdfoutline") + `("PERL5LIB" ":" prefix (,perllib))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal))) + (inputs + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("pango" ,pango) + ("perl-pdf-api2" ,perl-pdf-api2) + ("perl-libintl-perl" ,perl-libintl-perl) + ("unicode-blocks" + ,(origin + (method url-fetch) + (uri "https://unicode.org/Public/UNIDATA/Blocks.txt") + (file-name "unicode-blocks.txt") + (sha256 + (base32 + "1xs8fnhh48gs41wg004r7m4r2azh9khmyjjlnvyzy9c6zrd212x2")))))) + (home-page "https://github.com/eugmes/fntsample") + (synopsis "PDF and PostScript font samples generator") + (description "This package provides a tool that can be used to make font +samples that show coverage of the font and are similar in appearance to +Unicode Charts. It was developed for use with DejaVu Fonts project.") + (license license:gpl3+))) -- cgit v1.2.3 From 790b66e34fd81cdda246361303072065e6339c97 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 10:15:06 +0200 Subject: gnu: zziplib: Fix CVE-2018-16548. * gnu/packages/compression.scm (zziplib)[replacement]: New field. (zziplib/fixed): New private variable. * gnu/packages/patches/zziplib-CVE-2018-16548.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 3 +- gnu/packages/compression.scm | 8 ++++ gnu/packages/patches/zziplib-CVE-2018-16548.patch | 49 +++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/zziplib-CVE-2018-16548.patch diff --git a/gnu/local.mk b/gnu/local.mk index 359ed4bbbc..cbb7d2b2f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1513,7 +1513,8 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-support-ipv6.patch \ - %D%/packages/patches/xsane-tighten-default-umask.patch + %D%/packages/patches/xsane-tighten-default-umask.patch \ + %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ee10bd03ce..6463b50735 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1584,6 +1584,7 @@ (define-public zziplib (package (name "zziplib") (version "0.13.69") + (replacement zziplib/fixed) (home-page "https://github.com/gdraheim/zziplib") (source (origin (method git-fetch) @@ -1621,6 +1622,13 @@ (define-public zziplib ;; files carry the Zlib license; see "docs/copying.html" for details. (license (list license:lgpl2.0+ license:mpl1.1)))) +(define zziplib/fixed + (package + (inherit zziplib) + (source (origin + (inherit (package-source zziplib)) + (patches (search-patches "zziplib-CVE-2018-16548.patch")))))) + (define-public libzip (package (name "libzip") diff --git a/gnu/packages/patches/zziplib-CVE-2018-16548.patch b/gnu/packages/patches/zziplib-CVE-2018-16548.patch new file mode 100644 index 0000000000..a17c6a9768 --- /dev/null +++ b/gnu/packages/patches/zziplib-CVE-2018-16548.patch @@ -0,0 +1,49 @@ +The following 3 patches applied to 0.13.69 in this order, combined: +https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch +https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch +https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch + +diff --git a/test/test.zip b/test/test.zip +index 2c992ea..952d475 100644 +Binary files a/test/test.zip and b/test/test.zip differ +diff --git a/zzip/zip.c b/zzip/zip.c +index 14e2e06..f97a40a 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -472,9 +472,15 @@ __zzip_parse_root_directory(int fd, + } else + { + if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) ++ { ++ free(hdr0); + return ZZIP_DIR_SEEK; ++ } + if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) ++ { ++ free(hdr0); + return ZZIP_DIR_READ; ++ } + d = &dirent; + } + +@@ -574,11 +580,18 @@ __zzip_parse_root_directory(int fd, + + if (hdr_return) + *hdr_return = hdr0; ++ else ++ { ++ /* If it is not assigned to *hdr_return, it will never be free()'d */ ++ free(hdr0); ++ } + } /* else zero (sane) entries */ ++ else ++ free(hdr0); + # ifndef ZZIP_ALLOW_MODULO_ENTRIES +- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); ++ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; + # else +- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); ++ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0; + # endif + } + -- cgit v1.2.3 From a18ed1711f4762649fbaa5e8d69e536b4ba22fae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 10:44:28 +0200 Subject: gnu: ucd: Use copy-build-system. * gnu/packages/unicode.scm (ucd)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/unicode.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 3b34096fe5..44ef279144 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu packages unicode) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system trivial)) (define-public ucd @@ -35,15 +37,10 @@ (define-public ucd (sha256 (base32 "1ighy39cjkmqnv1797wrxjz76mv1fdw7zp5j04q55bkwxsdkvrmh")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (let ((out (string-append %output "/share/ucd"))) - (use-modules (guix build utils)) - (mkdir-p out) - (copy-recursively (assoc-ref %build-inputs "source") out) - #t))) + '(#:install-plan + '(("." "share/ucd/")))) (home-page "https://www.unicode.org") (synopsis "Unicode Character Database") (description -- cgit v1.2.3 From 4beac3a8983906b83c45e18fa05f418822643909 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 10:48:59 +0200 Subject: gnu: unicode-cldr-common: Use copy-build-system. * gnu/packages/unicode.scm (unicode-cldr-common)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/unicode.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 44ef279144..d6fe93c2e0 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -120,17 +120,10 @@ (define-public unicode-cldr-common (sha256 (base32 "0hxsc3j5zb32hmiaj0r3ajchmklx6zng6zlh1ca6s9plq5b9w9q7")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (let ((out (string-append %output "/share/unicode/cldr/common"))) - (use-modules (guix build utils)) - (mkdir-p out) - (copy-recursively (string-append (assoc-ref %build-inputs "source") - "/common") - out) - #t))) + '(#:install-plan + '(("common" "share/unicode/cldr/")))) (home-page "https://www.unicode.org") (synopsis "Locale data repository") (description -- cgit v1.2.3 From 72194753d9fcaed2ccaaf78d3982cb0eac6ef343 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 10:56:47 +0200 Subject: gnu: vim-neocomplete: Use copy-build-system. * gnu/packages/vim.scm (vim-neocomplete)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d130072272..37af7c6193 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -32,6 +32,7 @@ (define-module (gnu packages vim) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -287,24 +288,12 @@ (define-public vim-neocomplete (sha256 (base32 "1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "plugin" plugin) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (synopsis "Next generation completion framework for Vim") (description "@code{neocomplete}, an abbreviation of 'neo-completion with cache', -- cgit v1.2.3 From 90d64d9ca9b6940dc8ab0ea811d091e27f57552e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:00:13 +0200 Subject: gnu: vim-neosnippet-snippets: Use copy-build-system. * gnu/packages/vim.scm (vim-neosnippet-snippets)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 37af7c6193..54c9c5eaca 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -321,20 +321,10 @@ (define-public vim-neosnippet-snippets (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles"))) - (copy-recursively "neosnippets" - (string-append vimfiles "/neosnippets")) - #t)))))) + '(#:install-plan + '(("neosnippets" "share/vim/vimfiles/")))) (synopsis "Snippets for neosnippet") (description "@code{neosnippet-snippets} provides standard snippets for the Vim plugin -- cgit v1.2.3 From f19e539c3e7f9df06f413eeb9439925dedf03715 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:10:11 +0200 Subject: gnu: vim-neosnippet: Use copy-build-system. * gnu/packages/vim.scm (vim-neosnippet)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 54c9c5eaca..7588d9cbbd 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -350,34 +350,17 @@ (define-public vim-neosnippet (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (ftdetect (string-append vimfiles "/ftdetect")) - (ftplugin (string-append vimfiles "/ftplugin")) - (indent (string-append vimfiles "/indent")) - (plugin (string-append vimfiles "/plugin")) - (rplugin (string-append vimfiles "/rplugin")) - (syntax (string-append vimfiles "/syntax"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "ftdetect" ftdetect) - (copy-recursively "ftplugin" ftplugin) - (copy-recursively "indent" indent) - (copy-recursively "plugin" plugin) - (copy-recursively "rplugin" rplugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("indent" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("rplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (synopsis "Snippet support for Vim") (description "@code{neosnippet}, is a plugin for Vim which adds snippet support to Vim. -- cgit v1.2.3 From 0db06e7da943189550c77209f7ebc376df9b0daa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:36:24 +0200 Subject: gnu: vim-scheme: Use copy-build-system. * gnu/packages/vim.scm (vim-scheme)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7588d9cbbd..f6c6d036f5 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -389,24 +389,12 @@ (define-public vim-scheme (sha256 (base32 "1ynjr1109dxgj0lz261gmzz3wf5ap1m6j6hnvl3lcyv66a4y8pjv")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (after (string-append vimfiles "/after")) - (syntax (string-append vimfiles "/syntax")) - (ftplugin (string-append vimfiles "/ftplugin"))) - (copy-recursively "after" after) - (copy-recursively "ftplugin" ftplugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("after" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (synopsis "Scheme syntax for Vim") (description "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") -- cgit v1.2.3 From 84ec7b70090c7bf886cd9d023396d6d2e6e663fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:39:05 +0200 Subject: gnu: vim-luna: Use copy-build-system. * gnu/packages/vim.scm (vim-luna)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f6c6d036f5..ca39effd14 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -417,20 +417,10 @@ (define-public vim-luna (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (colors (string-append vimfiles "/colors"))) - (copy-recursively "colors" colors) - #t)))))) + '(#:install-plan + '(("colors" "share/vim/vimfiles/")))) (synopsis "Dark color theme for Vim") (description "@code{vim-luna} is a dark color theme for Vim.") -- cgit v1.2.3 From 0b350f73fe649575cfbc2215cc7bab8859184bc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:41:11 +0200 Subject: gnu: vim-context-filetype: Use copy-build-system. * gnu/packages/vim.scm (vim-context-filetype)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ca39effd14..aa082d7652 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -444,22 +444,11 @@ (define-public vim-context-filetype (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - #t)))))) + '(#:install-plan + '(("doc" "share/vim/vimfiles/") + ("autoload" "share/vim/vimfiles/")))) (synopsis "Context filetype library for Vim") (description "@code{vim-context-filetype} is context filetype library for Vim script.") -- cgit v1.2.3 From b274d2a6cb6fddedbc75e09fd55b76cec371d4ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:43:38 +0200 Subject: gnu: vim-fugitive: Use copy-build-system. * gnu/packages/vim.scm (vim-fugitive)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index aa082d7652..4920834898 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -469,28 +469,14 @@ (define-public vim-fugitive (sha256 (base32 "1jbn5jxadccmcz01j94d0i1bp74cixr0fpxxf1h0aqdf1ljk3d7n")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (ftdetect (string-append vimfiles "/ftdetect")) - (plugin (string-append vimfiles "/plugin")) - (syntax (string-append vimfiles "/syntax"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "ftdetect" ftdetect) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (home-page "https://github.com/tpope/vim-fugitive") (synopsis "Vim plugin to work with Git") (description "Vim-fugitive is a wrapper for Vim that complements the -- cgit v1.2.3 From 8423c6f3b2606d0f9f0d190dc39b50c1ec197844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:48:07 +0200 Subject: gnu: vim-airline: Use copy-build-system. * gnu/packages/vim.scm (vim-airline)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 4920834898..116bc68dfd 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -498,26 +498,13 @@ (define-public vim-airline (sha256 (base32 "1aksmr73648pvyc75pfdz28k2d4ky52rn7xiwcv7lz87q3vqld7k")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (t (string-append vimfiles "/t")) - (plugin (string-append vimfiles "/plugin"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "plugin" plugin) - (copy-recursively "t" t) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("t" "share/vim/vimfiles/")))) (synopsis "Statusline for Vim") (description "@code{vim-airline} is an extensible statusline for Vim. -- cgit v1.2.3 From e114aa2060a8b43ceee2f38b34a49f888c5b47bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:50:33 +0200 Subject: gnu: vim-airline-themes: Use copy-build-system. * gnu/packages/vim.scm (vim-airline-themes)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 116bc68dfd..e199be4e52 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -530,24 +530,12 @@ (define-public vim-airline-themes (sha256 (base32 "1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (synopsis "Collection of themes for Vim-airline") (description "@code{vim-airline-themes} is a collection of themes for @code{vim-airline}.") -- cgit v1.2.3 From 8e38ed1f044a5b42676a35543e452995ac84bc22 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:52:59 +0200 Subject: gnu: vim-syntastic: Use copy-build-system. * gnu/packages/vim.scm (vim-syntastic)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. (neovim-syntastic): Same. --- gnu/packages/vim.scm | 48 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e199be4e52..f78d1d0a16 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -555,26 +555,13 @@ (define-public vim-syntastic (file-name (git-file-name name version)) (sha256 (base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload")) - (syntax-checkers (string-append vimfiles "/syntax_checkers"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax_checkers" syntax-checkers) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("syntax_checkers" "share/vim/vimfiles/")))) (synopsis "Syntax checking plugin for Vim") (description "Vim-syntastic is a syntax checking plugin for Vim. It runs files through @@ -642,24 +629,11 @@ (define-public neovim-syntastic (inherit vim-syntastic) (name "neovim-syntastic") (arguments - `(#: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")) - (vimfiles (string-append out "/share/nvim/site")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload")) - (syntax-checkers (string-append vimfiles "/syntax_checkers"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax_checkers" syntax-checkers) - #t)))))) + '(#:install-plan + '(("autoload" "share/nvim/site/") + ("doc" "share/nvim/site/") + ("plugin" "share/nvim/site/") + ("syntax_checkers" "share/nvim/site/")))) (synopsis "Syntax checking plugin for Neovim") (description "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through -- cgit v1.2.3 From 94d53fbb07074132c0052e998bb287a7f464b9be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 12:00:09 +0200 Subject: gnu: editorconfig-vim: Use copy-build-system. * gnu/packages/vim.scm (editorconfig-vim)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f78d1d0a16..bed9783281 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -589,30 +589,20 @@ (define-public editorconfig-vim (snippet '(begin (delete-file-recursively "plugin/editorconfig-core-py") #t)))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#:tests? #f ; tests require ruby and plugin-test repository - #:phases + '(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) (add-after 'unpack 'patch-editorconfig-path (lambda* (#:key inputs #:allow-other-keys) (let ((editorconfig (assoc-ref inputs "editorconfig-core"))) (substitute* "plugin/editorconfig.vim" (("/opt") editorconfig)) - #t))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - #t)))))) + #t)))) + #:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (inputs `(("editorconfig-core" ,editorconfig-core-c))) (home-page "https://editorconfig.org/") -- cgit v1.2.3 From 12fe38a1d651c9ea48c0de27ef103c676f699396 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 12:04:52 +0200 Subject: gnu: vim-guix-vim: Use copy-build-system. * gnu/packages/vim.scm (vim-guix-vim)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index bed9783281..b468347380 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -834,22 +834,15 @@ (define-public vim-guix-vim (sha256 (base32 "1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#: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")) - (vimfiles (string-append out "/share/vim/vimfiles"))) - (for-each - (lambda (dir) - (copy-recursively dir (string-append vimfiles "/" dir))) - '("compiler" "doc" "indent" "ftdetect" "ftplugin" "syntax")) - #t)))))) + '(#:install-plan + '(("compiler" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("indent" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (home-page "https://gitlab.com/Efraim/guix.vim") (synopsis "Guix integration in Vim") (description "This package provides support for GNU Guix in Vim.") -- cgit v1.2.3 From d46f9f833b190aac04f7f4683b84a06a291a3f8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 00:03:57 +0100 Subject: gnu: ungoogled-chromium: Update to 80.0.3987.132-0.7e68f18 [fixes CVE-2020-6420]. * gnu/packages/chromium.scm (%chromium-version): Set to 80.0.3987.132. (%ungoogled-revision): Set to 7e68f18f1d16a132fe7d913a176daf79897eaa58. (%chromium-origin): Update hash. (%ungoogled-origin): Change back to canonical upstream. Update hash. --- gnu/packages/chromium.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index be33e5b363..0b3d19a428 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -247,8 +247,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "80.0.3987.122") -(define %ungoogled-revision "6056988937ebc32f14293809487dbaaa65939834") +(define %chromium-version "80.0.3987.132") +(define %ungoogled-revision "7e68f18f1d16a132fe7d913a176daf79897eaa58") (define %debian-revision "debian/80.0.3987.116-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -263,21 +263,18 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8")))) + "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c")))) (define %ungoogled-origin (origin (method git-fetch) - ;; XXX: Temporarily download from a third party because the main - ;; ungoogled-chromium repo is stale. Code taken from this pull - ;; request: https://github.com/Eloston/ungoogled-chromium/pull/942 - (uri (git-reference (url "https://github.com/Zoraver/ungoogled-chromium") + (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") (commit %ungoogled-revision))) (file-name (git-file-name "ungoogled-chromium" (string-take %ungoogled-revision 7))) (sha256 (base32 - "0s4bfj5lr49hknb6d7vp3zah70w9sq5cdhhlyihnl7f9jlrrnwsi")))) + "196rr3nly42pzl2bap22vzw4d8x87yl3zy1wq2fla5z8iy4x8ym1")))) (define %debian-origin (origin -- cgit v1.2.3 From f19d0b1b3f2cf1ce53b519cae4921b1e8cabd05e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 4 Mar 2020 14:37:03 +0100 Subject: gnu: emacs-amx: Update to 3.3. * gnu/packages/emacs-xyz.scm (emacs-amx): Update to 3.3. [synopsis]: Improve wording. --- gnu/packages/emacs-xyz.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6f31a30747..5eb73c8b65 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17844,25 +17844,26 @@ (define-public emacs-orgit (define-public emacs-amx (package (name "emacs-amx") - (version "3.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DarwinAwardWinner/amx") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0bb8y1dmzyqkrb4mg6zndcsxppby3glridv2aap2pv05gv8kx7mj")))) + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DarwinAwardWinner/amx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw")))) (build-system emacs-build-system) - (propagated-inputs `(("emacs-s" ,emacs-s))) + (propagated-inputs + `(("emacs-s" ,emacs-s))) (home-page "https://github.com/DarwinAwardWinner/amx") - (synopsis "Alternative interface for M-x") + (synopsis "Alternative M-x interface for Emacs") (description "Amx is an alternative interface for M-x in Emacs. It provides several enhancements over the ordinary @code{execute-extended-command}, such as prioritizing your most-used commands in the completion list and showing keyboard shortcuts, and it supports several -completion systems for selecting commands, such as ido and ivy.") +completion systems for selecting commands, such as Ido and Ivy.") (license license:gpl3+))) (define-public emacs-lorem-ipsum -- cgit v1.2.3 From 33aa372eecaf274e5542228623194d27744d3cd3 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 4 Mar 2020 15:03:29 +0100 Subject: gnu: Add abseil-cpp. * gnu/packages/cpp.scm (abseil-cpp): New variable. Signed-off-by: Pierre Neidhardt --- gnu/packages/cpp.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8b32c3f0a9..dba9ec75f6 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -439,3 +440,47 @@ (define-public tweeny other values of screen objects, by setting their values as the tween starting point and then, after each tween step, plugging back the result.") (license license:expat))) + +(define-public abseil-cpp + (package + (name "abseil-cpp") + (version "20200225") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abseil/abseil-cpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wb04pszzrl39ny1pz9jvvq8lbbm355dd60jspcyqfwxnk6njgd1")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" + "-DABSL_RUN_TESTS=ON" + ;; Needed, else we get errors like: + ;; + ;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o: + ;; undefined reference to symbol '_ZN7testing4Mock16UnregisterLockedEPNS_8internal25UntypedFunctionMockerBaseE' + ;; ld: /gnu/store/bxapb1f1l8frjpbjckk3zdxhmcig3xzk-googletest-1.10.0/lib/libgmock.so: + ;; error adding symbols: DSO missing from command line + ;; collect2: error: ld returned 1 exit status + "-DCMAKE_EXE_LINKER_FLAGS=-lgtest -lpthread -lgmock") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'remove-gtest-check + ;; The CMakeLists fails to find our googletest for some reason, but + ;; it works nonetheless. + (lambda _ + (substitute* "CMakeLists.txt" + (("check_target\\(gtest\\)") "") + (("check_target\\(gtest_main\\)") "") + (("check_target\\(gmock\\)") ""))))))) + (native-inputs + `(("googletest" ,googletest))) + (home-page "https://abseil.io") + (synopsis "Augmented C++ standard library") + (description "Abseil is a collection of C++ library code designed to +augment the C++ standard library. The Abseil library code is collected from +Google's C++ code base.") + (license license:asl2.0))) -- cgit v1.2.3 From 74c65c9d68617429a11030e71153e175c9b3d05d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 4 Mar 2020 18:27:22 +0100 Subject: gnu: Add gpsd. * gnu/packages/gps.scm (gpsd): New variable. --- gnu/packages/gps.scm | 96 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 8f23be05e6..ac8deddad5 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2020 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,17 +25,23 @@ (define-module (gnu packages gps) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system scons) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages base) - #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) - #:use-module (gnu packages image) - #:use-module (gnu packages xml) + #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages qt) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages xml)) (define-public gpsbabel (package @@ -204,3 +211,84 @@ (define-public gpxsee "GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.") (license license:gpl3))) + +(define-public gpsd + (package + (name "gpsd") + (version "3.19") + (source + (origin + (method url-fetch) + (uri (string-append "https://download-mirror.savannah.gnu.org" + "/releases/gpsd/gpsd-" version ".tar.gz")) + (sha256 + (base32 "0faz2mvk82hi7ispxxih07lhpyz5dazs4gcknym9piiabga29p97")))) + (build-system scons-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + `(("bluez" ,bluez) + ("dbus" ,dbus) + ("libcap" ,libcap) + ("libusb" ,libusb) + ("ncurses" ,ncurses))) + (arguments + `(#:scons-flags (list (string-append "prefix=" %output) + ;; TODO: Install python bindings. + "python=no") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((python3 (string-append (assoc-ref inputs "python") + "/bin/python3"))) + (substitute* '("contrib/gpsData.py" + "contrib/ntpshmviz" + "contrib/skyview2svg" + "contrib/webgps.py" + "devtools/ais.py" + "devtools/aivdmtable" + "devtools/cycle_analyzer" + "devtools/flocktest" + "devtools/identify_failing_build_options.py" + "devtools/regress-builder" + "devtools/regressdiff" + "devtools/sizes" + "devtools/striplog" + "devtools/tablegen.py" + "devtools/test_json_validity.py" + "devtools/uninstall_cleanup.py" + "gegps" + "gps/gps.py" + "gpscat" + "gpsfake" + "gpsprof" + "jsongen.py" + "leapsecond.py" + "maskaudit.py" + "test_maidenhead.py" + "test_misc.py" + "test_xgps_deps.py" + "ubxtool" + "valgrind-audit.py" + "xgps" + "xgpsspeed" + "zerk") + (("/usr/bin/python") python3) + (("/usr/bin/env python") python3))) + #t)) + (add-after 'fix-paths 'fix-build + (lambda _ + (substitute* "SConstruct" + (("'PATH'") + "'PATH','CPATH','LIBRARY_PATH'")) + #t))))) + (synopsis "GPS service daemon") + (description + "@code{gpsd} is a service daemon that monitors one or more GPSes or AIS +receivers attached to a host computer through serial or USB ports, making all +data on the location/course/velocity of the sensors available to be queried on +TCP port 2947 of the host computer.") + (home-page "https://gpsd.gitlab.io/gpsd/") + (license license:bsd-2))) -- cgit v1.2.3 From 6f501b7e84e1e7f3efcaba29e9bf121bbb93725e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:06:30 +0100 Subject: gnu: r-ggformula: Update to 0.9.4. * gnu/packages/cran.scm (r-ggformula): Update to 0.9.4. [propagated-inputs]: Remove r-tidyr. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9e834415da..47bf2e27fb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7180,13 +7180,13 @@ (define-public r-mosaiccore (define-public r-ggformula (package (name "r-ggformula") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (cran-uri "ggformula" version)) (sha256 - (base32 "1bpsfp9hx001r91pxfiwgxcn5vw5bl1gclb865wz6g9l0jqjfk2p")))) + (base32 "04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f")))) (build-system r-build-system) (propagated-inputs `(("r-ggforce" ,r-ggforce) @@ -7196,8 +7196,7 @@ (define-public r-ggformula ("r-mosaiccore" ,r-mosaiccore) ("r-rlang" ,r-rlang) ("r-stringr" ,r-stringr) - ("r-tibble" ,r-tibble) - ("r-tidyr" ,r-tidyr))) + ("r-tibble" ,r-tibble))) (home-page "https://github.com/ProjectMOSAIC/ggformula/") (synopsis "Formula interface for the @code{r-ggplot2}") (description -- cgit v1.2.3 From 8e19a9a0319761cbd82e77791900f7d911de87d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:07:04 +0100 Subject: gnu: r-emmeans: Update to 1.4.5. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.5. --- 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 47bf2e27fb..b7dd124ac0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8237,14 +8237,14 @@ (define-public r-multcomp (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "0l1qj6x834fmcvqbj807p7yz7462df925vw91xvg50faqm19d41x")))) + "10fmvmd6q4zjr6b18hhc85mwrzv778qzj6lwl9kbs2fsfvsgw7mm")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From f4c105d44e30af7cc045378e7a243adf8e933468 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:12:41 +0100 Subject: gnu: r-compositions: Update to 1.40-4. * gnu/packages/cran.scm (r-compositions): Update to 1.40-4. --- 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 b7dd124ac0..33437dcf17 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11985,14 +11985,14 @@ (define-public r-rarpack (define-public r-compositions (package (name "r-compositions") - (version "1.40-3") + (version "1.40-4") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "103hbmibrf1n333pn4xpll1gqqsv4szms0n5gdq7zak31aar0bg4")))) + "0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a")))) (build-system r-build-system) (propagated-inputs `(("r-bayesm" ,r-bayesm) -- cgit v1.2.3 From 3afdf6e440098199932efc8b4125dd3508402744 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:13:32 +0100 Subject: gnu: r-spacyr: Update to 1.2.1. * gnu/packages/cran.scm (r-spacyr): Update to 1.2.1. --- 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 33437dcf17..6c559995fc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19402,14 +19402,14 @@ (define-public r-stopwords (define-public r-spacyr (package (name "r-spacyr") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "spacyr" version)) (sha256 (base32 - "1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks")))) + "1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw")))) (properties `((upstream-name . "spacyr"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d7d8af8bdc2f13998a151ea853496a0347f1c253 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:13:40 +0100 Subject: gnu: r-erm: Update to 1.0-1. * gnu/packages/cran.scm (r-erm): Update to 1.0-1. [propagated-inputs]: Add r-colorspace and r-psych. --- gnu/packages/cran.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6c559995fc..6c7c95dc68 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20135,20 +20135,22 @@ (define-public r-tam (define-public r-erm (package (name "r-erm") - (version "1.0-0") + (version "1.0-1") (source (origin (method url-fetch) (uri (cran-uri "eRm" version)) (sha256 (base32 - "11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly")))) + "0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9")))) (properties `((upstream-name . "eRm"))) (build-system r-build-system) (propagated-inputs - `(("r-lattice" ,r-lattice) + `(("r-colorspace" ,r-colorspace) + ("r-lattice" ,r-lattice) ("r-mass" ,r-mass) - ("r-matrix" ,r-matrix))) + ("r-matrix" ,r-matrix) + ("r-psych" ,r-psych))) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/package=eRm") (synopsis "Extended Rasch modeling") -- cgit v1.2.3 From d797d24fe23209e8c3874ae95e9b6c23e5d72854 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:18:30 +0100 Subject: gnu: r-foreign: Update to 0.8-76. * gnu/packages/statistics.scm (r-foreign): Update to 0.8-76. --- 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 b083ed02bd..2d4c110f18 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -504,14 +504,14 @@ (define-public r-codetools (define-public r-foreign (package (name "r-foreign") - (version "0.8-75") + (version "0.8-76") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "0g4mi101srjbl17ydb2hl3854m3xj0llj6861lfr30sp08nkqavl")))) + "1z6x2x1z12wnv0z4p74d91r5wfaq30sdz4ynwx0lncz1q45mhbh5")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") -- cgit v1.2.3 From 555f227398336103d1c42b49bafd3f52be6a4413 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:18:38 +0100 Subject: gnu: r-nlme: Update to 3.1-145. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-145. --- 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 2d4c110f18..0ba51b0306 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -590,13 +590,13 @@ (define-public r-matrix (define-public r-nlme (package (name "r-nlme") - (version "3.1-144") + (version "3.1-145") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1gqyq53fdq23wsi3f4n9vg4mn5i0v18zam5lnzlpg581xifx2779")))) + (base32 "1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 6f6c73773d9fca5b264efe6260bf36901104f2d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2020 20:18:45 +0100 Subject: gnu: r-plyr: Update to 1.8.6. * gnu/packages/statistics.scm (r-plyr): Update to 1.8.6. --- 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 0ba51b0306..81956c85e2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -933,13 +933,13 @@ (define-public r-permute (define-public r-plyr (package (name "r-plyr") - (version "1.8.5") + (version "1.8.6") (source (origin (method url-fetch) (uri (cran-uri "plyr" version)) (sha256 - (base32 "0x4mbb3rgv1ayxqidw0p9i10khbg51fz5r62vw4il8d7licqq07a")))) + (base32 "11sjjdn146w95s1vsfmmgdls082cbnm1slv98xvyjhsl2mpx4mga")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "http://had.co.nz/plyr") -- cgit v1.2.3 From 39d93ce2be59ff18495e6e8c4ca8cfb711191bbb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 21:48:30 +0200 Subject: gnu: ddrescue: Update to 1.25. * gnu/packages/disk.scm (ddrescue): Update to 1.25. --- gnu/packages/disk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0628017b9a..534b64ef95 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke @@ -210,14 +210,14 @@ (define-public gptfdisk (define-public ddrescue (package (name "ddrescue") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ddrescue/ddrescue-" version ".tar.lz")) (sha256 - (base32 "11qh0bbzf00mfb4yq35gnv5m260k4d7q9ixklry6bqvhvvp3ypab")))) + (base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/ddrescue/ddrescue.html") (synopsis "Data recovery utility") -- cgit v1.2.3 From c8abbe1468bc69b5f2b481aa11da62bc59168b26 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 4 Mar 2020 09:42:17 +0100 Subject: import: pypi: Add more licenses * guix/import/pypi.scm (string->license): Add the BSD 2-clause and MPL 2.0 licenses, and add more strings for BSD 3-clause and Expat license. Signed-off-by: Leo Famulari --- guix/import/pypi.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6897f42be3..10450155a0 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -439,10 +440,12 @@ (define (string->license str) (match str ("GNU LGPL" license:lgpl2.0) ("GPL" license:gpl3) - ((or "BSD" "BSD License") license:bsd-3) - ((or "MIT" "MIT license" "Expat license") license:expat) + ((or "BSD" "BSD-3" "BSD License") license:bsd-3) + ("BSD-2-Clause" license:bsd-2) + ((or "MIT" "MIT license" "MIT License" "Expat license") license:expat) ("Public domain" license:public-domain) ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0) + ("MPL 2.0" license:mpl2.0) (_ #f))) (define (pypi-package? package) -- cgit v1.2.3 From 16c896e8887250230a33b9685b63952ebad9cdf6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:46:05 +0100 Subject: gnu: python-pytest-django: Use HTTPS home page. * gnu/packages/django.scm (python-pytest-django)[home-page]: Use HTTPS. --- gnu/packages/django.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 3e63847a87..0652ea15e6 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -248,7 +248,7 @@ (define-public python-pytest-django ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://pytest-django.readthedocs.org/") + (home-page "https://pytest-django.readthedocs.org/") (synopsis "Django plugin for py.test") (description "Pytest-django is a plugin for py.test that provides a set of useful tools for testing Django applications and projects.") -- cgit v1.2.3 From 7509f34fab174e704b4d4d1e465249076502f27e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:28:26 +0100 Subject: gnu: python-pyyaml: Update home page. * gnu/packages/python-xyz.scm (python-pyyaml)[home-page]: Link to the (HTTPS) front page. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f3519b75f6..46b99a4ea5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2337,7 +2337,7 @@ (define-public python-pyyaml (build-system python-build-system) (inputs `(("libyaml" ,libyaml))) - (home-page "http://pyyaml.org/wiki/PyYAML") + (home-page "https://pyyaml.org") (synopsis "YAML parser and emitter for Python") (description "PyYAML is a YAML parser and emitter for Python. PyYAML features a -- cgit v1.2.3 From 58d4e9498f83e89eefb866abc2e7d60cfb7618c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:23:35 +0100 Subject: gnu: python-pbr: Update home page. * gnu/packages/python-xyz.scm (python-pbr)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46b99a4ea5..1ea7e3e5e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1757,7 +1757,7 @@ (define-public python-pbr-minimal (build-system python-build-system) (arguments `(#:tests? #f)) - (home-page "http://docs.openstack.org/developer/pbr/") + (home-page "https://docs.openstack.org/pbr/latest/") (synopsis "Minimal build of python-pbr used for bootstrapping") (description "Used only for bootstrapping python2-pbr, you should not need this.") -- cgit v1.2.3 From b07e73a2bca4a4d19f77f7c4db9582eb4a338bcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:11:23 +0100 Subject: gnu: python-zope-exceptions: Update home page. * gnu/packages/python-web.scm (python-zope-exceptions)[home-page]: Follow (HTTPS) redirection. --- 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 ac75616657..44f2976ec2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1021,10 +1021,10 @@ (define-public python-zope-exceptions "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; circular dependency with zope.testrunner + '(#:tests? #f)) ; circular dependency with zope.testrunner (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "http://cheeseshop.python.org/pypi/zope.exceptions") + (home-page "https://pypi.org/project/zope.exceptions/") (synopsis "Zope exceptions") (description "Zope.exceptions provides general-purpose exception types that have uses outside of the Zope framework.") -- cgit v1.2.3 From b5544cb4d41922c846d3c09bf632f8bdadd3db08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:57:54 +0100 Subject: gnu: python-invoke: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-invoke)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1ea7e3e5e2..4473a0df2c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12326,7 +12326,7 @@ (define-public python2-incremental (define-public python-invoke (package (name "python-invoke") - (home-page "http://www.pyinvoke.org/") + (home-page "https://www.pyinvoke.org/") (version "1.3.0") (source (origin (method url-fetch) -- cgit v1.2.3 From 8f55136a6ab20c0eab93f4abb3b64d655397b375 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 20:01:37 +0100 Subject: gnu: meld: Update to 3.20.2. * gnu/packages/patchutils.scm (meld): Update to 3.20.2. --- gnu/packages/patchutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index e32e6c7b12..e01ebe72ec 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2015, 2018 Leo Famulari -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; ;;; This file is part of GNU Guix. @@ -247,7 +247,7 @@ (define-public vbindiff (define-public meld (package (name "meld") - (version "3.20.1") + (version "3.20.2") (source (origin (method url-fetch) @@ -255,7 +255,7 @@ (define-public meld (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55")))) + (base32 "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 8b5185c6a6d09da5f16d02790b45f884e4a68f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Mar 2020 23:41:32 +0100 Subject: gnu: zathura-djvu: Update to 0.2.9. * gnu/packages/pdf.scm (zathura-djvu): Update to 0.2.9. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 34a3fba042..c61567a894 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -392,7 +392,7 @@ (define-public zathura-ps (define-public zathura-djvu (package (name "zathura-djvu") - (version "0.2.8") + (version "0.2.9") (source (origin (method url-fetch) (uri @@ -400,7 +400,7 @@ (define-public zathura-djvu version ".tar.xz")) (sha256 (base32 - "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh")))) + "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("djvulibre" ,djvulibre) -- cgit v1.2.3 From c0ba02379e5d7d5ded0bc3e56fc733fa7179c6ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 10:51:28 +0100 Subject: gnu: weasyprint: Update to 51. * gnu/packages/pdf.scm (weasyprint): Update to 51. --- gnu/packages/pdf.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c61567a894..d183d20d42 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1282,13 +1282,13 @@ (define-public stapler (define-public weasyprint (package (name "weasyprint") - (version "50") + (version "51") (source (origin (method url-fetch) (uri (pypi-uri "WeasyPrint" version)) (sha256 - (base32 "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw")) + (base32 "0skdzwq7cd715dnnds6abx0k0xmmnmsqp0vb1r1w20sg7abp3sdk")) (patches (search-patches "weasyprint-library-paths.patch")))) (build-system python-build-system) (arguments @@ -1316,11 +1316,11 @@ (define-public weasyprint (lambda _ (substitute* "setup.cfg" ;; flake8 and isort syntax checks fail, which is not our - ;; business + ;; business. (("addopts = --flake8 --isort") "")))) (replace 'check (lambda _ - ;; run pytest, excluding one failing test + ;; Run pytest, excluding one failing test. (invoke "pytest" "-k" "not test_flex_column_wrap_reverse")))))) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From 01ebd8617faf815f729ee1d8a43f3951743e9cfd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 10:59:24 +0100 Subject: gnu: zathura: Update to 0.4.5. * gnu/packages/pdf.scm (zathura): Update to 0.4.5. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index d183d20d42..7890e3640c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -508,7 +508,7 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.4.3") + (version "0.4.5") (source (origin (method url-fetch) (uri @@ -516,7 +516,7 @@ (define-public zathura version ".tar.xz")) (sha256 (base32 - "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky")))) + "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") -- cgit v1.2.3 From 13d872234b7e25cbc31ba497d0b4bafd280bd9be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 10:59:43 +0100 Subject: gnu: zathura-pdf-poppler: Update to 0.3.0. * gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.3.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7890e3640c..1ad37706d0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -472,7 +472,7 @@ (define-public zathura-pdf-mupdf (define-public zathura-pdf-poppler (package (name "zathura-pdf-poppler") - (version "0.2.9") + (version "0.3.0") (source (origin (method url-fetch) (uri @@ -480,7 +480,7 @@ (define-public zathura-pdf-poppler version ".tar.xz")) (sha256 (base32 - "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y")))) + "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("poppler" ,poppler) -- cgit v1.2.3 From 886347724529dc706177b821b0de165cfbab0f8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 15:55:02 +0100 Subject: gnu: girara: Update to 0.3.4. * gnu/packages/gtk.scm (girara): Update to 0.3.4. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 16852650ea..f28a3b04ba 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Patrick Hetu ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Arun Isaac @@ -1446,7 +1446,7 @@ (define-public perl-pango (define-public girara (package (name "girara") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) @@ -1455,7 +1455,7 @@ (define-public girara (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0q0yfv2777s72p473lw0ll435n7vz4v204cmp9naq8am7a6i6avn")))) + (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k")))) (native-inputs `(("pkg-config" ,pkg-config) ("check" ,check) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 95858abb6219dac0722ce05f2df62f20e471a192 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 17:41:31 +0100 Subject: gnu: sg3-utils: Update to 1.45. * gnu/packages/scsi.scm (sg3-utils): Update to 1.45. --- gnu/packages/scsi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index f8c5d5ef60..803f49931e 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +27,14 @@ (define-module (gnu packages scsi) (define-public sg3-utils (package (name "sg3-utils") - (version "1.44") + (version "1.45") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "01avlgrbxlij8spish4i69ji1m49biz4mbayzzc2qx0hcl8ar56a")))) + "1vmjb17y33a73sv7jg8fzs6bhr7yh2k9sba81sjiyf1pvi3vbnn7")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") -- cgit v1.2.3 From e884c20533878037d048adf516fbc37ea17377d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 19:08:57 +0100 Subject: gnu: crispy-doom: Update to 5.7.1. * gnu/packages/games.scm (crispy-doom): Update to 5.7.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d6f8abebdd..322e309591 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5941,7 +5941,7 @@ (define-public crispy-doom (package (inherit chocolate-doom) (name "crispy-doom") - (version "5.6.4") + (version "5.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -5949,7 +5949,7 @@ (define-public crispy-doom (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2")))) + (base32 "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj")))) (native-inputs (append (package-native-inputs chocolate-doom) -- cgit v1.2.3 From dbc8a6e7500c50a3014e4de52f31ec16c2d4f1b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Mar 2020 20:46:50 +0100 Subject: gnu: python-pyodbc: Update to 4.0.30. * gnu/packages/databases.scm (python-pyodbc): Update to 4.0.30. --- 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 d4891841e4..a8ce065a70 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2279,13 +2279,13 @@ (define-public python2-pyodbc-c (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.27") + (version "4.0.30") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 - (base32 "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib")) + (base32 "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (inputs -- cgit v1.2.3 From e85af137244924a383f203914467ca6f4b4ebf15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:00:24 +0100 Subject: gnu: Update pypi.python.org home pages & use HTTPS. * gnu/packages/check.scm (python-unittest2, python-pytest-localserver) (python-discover)[home-page]: Follow (HTTPS) redirections. * gnu/packages/fontutils.scm (python2-defcon)[home-page]: Likewise. * gnu/packages/glib.scm (python2-pygobject-2)[home-page]: Likewise. * gnu/packages/graph.scm (python-igraph)[home-page]: Likewise. * gnu/packages/graphviz.scm (xdot)[home-page]: Likewise. * gnu/packages/pdf.scm (python-poppler-qt5)[home-page]: Likewise. * gnu/packages/python-web.scm (python-zope-event, python-zope-testing) (python-zope-testrunner, python-zope-i18nmessageid, python-zope-schema) (python-zope-configuration, python-zope-proxy, python-zope-location) (python-zope-security))[home-page]: Likewise. * gnu/packages/python-xyz.scm (python-setuptools,python-six) (python2-dogtail, python2-enum, python-enum34, python-unidecode) (python-numpydoc, python-decorator, python-drmaa, python-pathlib2) (python-ly, python-msgpack, python-termcolor, python-colorama) (python-pluggy, python2-pathlib2, python-rfc3987)[home-page]: Likewise. --- gnu/packages/check.scm | 6 +++--- gnu/packages/fontutils.scm | 2 +- gnu/packages/glib.scm | 2 +- gnu/packages/graph.scm | 2 +- gnu/packages/graphviz.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/python-web.scm | 18 +++++++++--------- gnu/packages/python-xyz.scm | 34 +++++++++++++++++----------------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fa6575173f..d5a9a9b92a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -756,7 +756,7 @@ (define-public python-unittest2 (propagated-inputs `(("python-six" ,python-six) ("python-traceback2" ,python-traceback2))) - (home-page "http://pypi.python.org/pypi/unittest2") + (home-page "https://pypi.org/project/unittest2/") (synopsis "Python unit testing library") (description "Unittest2 is a replacement for the unittest module in the Python @@ -1540,7 +1540,7 @@ (define-public python-pytest-localserver (synopsis "Py.test plugin to test server connections locally") (description "Pytest-localserver is a plugin for the pytest testing framework which enables you to test server connections locally.") - (home-page "https://pypi.python.org/pypi/pytest-localserver") + (home-page "https://pypi.org/project/pytest-localserver/") (license license:expat))) (define-public python-pytest-xprocess @@ -1994,7 +1994,7 @@ (define-public python-discover (base32 "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5")))) (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/discover/") + (home-page "https://pypi.org/project/discover/") (synopsis "Python test discovery for unittest") (description diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8d39730a7b..a8c9e3ddc0 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -678,7 +678,7 @@ (define-public python2-defcon (propagated-inputs `(("python2-fonttools" ,python2-fonttools) ("python2-ufolib" ,python2-ufolib))) - (home-page "https://pypi.python.org/pypi/defcon") + (home-page "https://pypi.org/project/defcon/") (synopsis "Flexible objects for representing @acronym{UFO, unified font object} data") (description "Defcon is a set of @acronym{UFO, unified font object} based objects diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 72d5ea0bdd..03d6be596b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -670,7 +670,7 @@ (define-public python2-pygobject-2 (arguments `(#:tests? #f ;segfaults during tests #:configure-flags '("LIBS=-lcairo-gobject"))) - (home-page "https://pypi.python.org/pypi/PyGObject") + (home-page "https://pypi.org/project/PyGObject/") (synopsis "Python bindings for GObject") (description "Python bindings for GLib, GObject, and GIO.") diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 63eb36fd7d..ab2bf1daf0 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -119,7 +119,7 @@ (define-public python-igraph (native-inputs `(("pkg-config" ,pkg-config) ("python-pytest" ,python-pytest))) - (home-page "http://pypi.python.org/pypi/python-igraph") + (home-page "https://pypi.org/project/python-igraph/") (synopsis "Python bindings for the igraph network analysis library"))) (define-public r-igraph diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 365fe1a113..c4f88caa88 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -308,7 +308,7 @@ (define-public xdot ("gtk+" ,gtk+) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject))) - (home-page "https://pypi.python.org/pypi/xdot") + (home-page "https://pypi.org/project/xdot/") (synopsis "Interactive viewer for graphviz dot files") (description "Xdot is an interactive viewer for graphs written in @code{graphviz}’s dot language. Internally, it uses the xdot output format as diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1ad37706d0..b40940ecab 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -226,7 +226,7 @@ (define-public python-poppler-qt5 ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase))) - (home-page "https://pypi.python.org/pypi/python-poppler-qt5") + (home-page "https://pypi.org/project/python-poppler-qt5/") (synopsis "Python bindings for Poppler-Qt5") (description "This package provides Python bindings for the Qt5 interface of the diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 44f2976ec2..08d75525be 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -972,7 +972,7 @@ (define-public python-zope-event (base32 "1ksbc726av9xacml6jhcfyn828hlhb9xlddpx6fcvnlvmpmpvhk9")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/zope.event") + (home-page "https://pypi.org/project/zope.event/") (synopsis "Event publishing system for Python") (description "Zope.event provides an event publishing API, intended for use by applications which are unaware of any subscribers to their events. It @@ -1051,7 +1051,7 @@ (define-public python-zope-testing (for-each delete-file (find-files "." "(\\.pyc|~)$")) #t)))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/zope.testing") + (home-page "https://pypi.org/project/zope.testing/") (synopsis "Zope testing helpers") (description "Zope.testing provides a number of testing utilities for HTML forms, HTTP servers, regular expressions, and more.") @@ -1082,7 +1082,7 @@ (define-public python-zope-testrunner ("unzip" ,unzip))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "https://pypi.python.org/pypi/zope.testrunner") + (home-page "https://pypi.org/project/zope.testrunner/") (synopsis "Zope testrunner script") (description "Zope.testrunner provides a script for running Python tests.") @@ -1109,7 +1109,7 @@ (define-public python-zope-i18nmessageid (base32 "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/zope.i18nmessageid") + (home-page "https://pypi.org/project/zope.i18nmessageid/") (synopsis "Message identifiers for internationalization") (description "Zope.i18nmessageid provides facilities for declaring internationalized messages within program source text.") @@ -1140,7 +1140,7 @@ (define-public python-zope-schema `(("python-zope-testing" ,python-zope-testing) ("python-coverage" ,python-coverage) ("python-nose" ,python-nose))) - (home-page "https://pypi.python.org/pypi/zope.schema") + (home-page "https://pypi.org/project/zope.schema/") (synopsis "Zope data schemas") (description "Zope.scheme provides extensions to zope.interface for defining data schemas.") @@ -1165,7 +1165,7 @@ (define-public python-zope-configuration (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) ("python-zope-schema" ,python-zope-schema))) - (home-page "https://pypi.python.org/pypi/zope.configuration") + (home-page "https://pypi.org/project/zope.configuration/") (synopsis "Zope Configuration Markup Language") (description "Zope.configuration implements ZCML, the Zope Configuration Markup Language.") @@ -1190,7 +1190,7 @@ (define-public python-zope-proxy '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "https://pypi.python.org/pypi/zope.proxy") + (home-page "https://pypi.org/project/zope.proxy/") (synopsis "Generic, transparent proxies") (description "Zope.proxy provides generic, transparent proxies for Python. Proxies are special objects which serve as mostly-transparent wrappers around @@ -1219,7 +1219,7 @@ (define-public python-zope-location (propagated-inputs `(("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) - (home-page "https://pypi.python.org/pypi/zope.location/") + (home-page "https://pypi.org/project/zope.location/") (synopsis "Zope location library") (description "Zope.location implements the concept of \"locations\" in Zope3, which are are special objects that have a structural location.") @@ -1253,7 +1253,7 @@ (define-public python-zope-security ("python-zope-location" ,python-zope-location) ("python-zope-testrunner" ,python-zope-testrunner) ("python-zope-testing" ,python-zope-testing))) - (home-page "https://pypi.python.org/pypi/zope.security") + (home-page "https://pypi.org/project/zope.security/") (synopsis "Zope security framework") (description "Zope.security provides a generic mechanism to implement security policies on Python objects.") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4473a0df2c..3cd1686d28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -748,7 +748,7 @@ (define-public python-setuptools ;; One could bootstrap with an internal untested setuptools. (arguments `(#:tests? #f)) - (home-page "https://pypi.python.org/pypi/setuptools") + (home-page "https://pypi.org/project/setuptools/") (synopsis "Library designed to facilitate packaging Python projects") (description @@ -1111,7 +1111,7 @@ (define-public python-six (native-inputs `(("python-py" ,python-py) ("python-pytest" ,python-pytest-bootstrap))) - (home-page "https://pypi.python.org/pypi/six/") + (home-page "https://pypi.org/project/six/") (synopsis "Python 2 and 3 compatibility utilities") (description "Six is a Python 2 and 3 compatibility library. It provides utility @@ -1282,7 +1282,7 @@ (define-public python2-dogtail (arguments `(#:python ,python-2 #:tests? #f)) ; invalid command "test" ;; Currently no offical homepage. - (home-page "https://pypi.python.org/pypi/dogtail/") + (home-page "https://pypi.org/project/dogtail/") (synopsis "GUI test tool and automation framework written in Python") (description "Dogtail is a GUI test tool and automation framework written in Python. @@ -1393,7 +1393,7 @@ (define-public python2-enum (build-system python-build-system) (arguments `(#:python ,python-2)) - (home-page "https://pypi.python.org/pypi/enum/") + (home-page "https://pypi.org/project/enum/") (synopsis "Robust enumerated type support in Python") (description "This provides a module for robust enumerations in Python. It has @@ -1414,7 +1414,7 @@ (define-public python-enum34 (base32 "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/enum34") + (home-page "https://pypi.org/project/enum34/") (synopsis "Backported Python 3.4 Enum") (description "Enum34 is the new Python stdlib enum module available in Python 3.4 @@ -2158,7 +2158,7 @@ (define-public python-unidecode (base32 "1s6cp2lv4m0f00hjckjz8p6m7d3n3v16jvg353llf5ia1iqsnsib")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/Unidecode") + (home-page "https://pypi.org/project/Unidecode/") (synopsis "ASCII transliterations of Unicode text") (description "Unidecode provides ASCII transliterations of Unicode text. Unidecode is @@ -3827,7 +3827,7 @@ (define-public python-numpydoc `(("python-sphinx" ,python-sphinx))) (native-inputs `(("python-nose" ,python-nose))) - (home-page "https://pypi.python.org/pypi/numpydoc") + (home-page "https://pypi.org/project/numpydoc/") (synopsis "Numpy's Sphinx extensions") (description @@ -4777,7 +4777,7 @@ (define-public python-decorator (sha256 (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/decorator/") + (home-page "https://pypi.org/project/decorator/") (synopsis "Python module to simplify usage of decorators") (description "The aim of the decorator module is to simplify the usage of decorators @@ -4806,7 +4806,7 @@ (define-public python-drmaa (arguments '(#:tests? #f)) (native-inputs `(("python-nose" ,python-nose))) - (home-page "https://pypi.python.org/pypi/drmaa") + (home-page "https://pypi.org/project/drmaa/") (synopsis "Python bindings for the DRMAA library") (description "A Python package for Distributed Resource Management (DRM) job @@ -5021,7 +5021,7 @@ (define-public python-pathlib2 (propagated-inputs `(("python-scandir" ,python-scandir) ("python-six" ,python-six))) - (home-page "https://pypi.python.org/pypi/pathlib2/") + (home-page "https://pypi.org/project/pathlib2/") (synopsis "Object-oriented file system paths") (description "The goal of pathlib2 is to provide a backport of the standard @code{pathlib} module which tracks the standard library module, so @@ -6928,7 +6928,7 @@ (define-public python-ly (description "This package provides a Python library to parse, manipulate or create documents in LilyPond format. A command line program ly is also provided that can be used to do various manipulations with LilyPond files.") - (home-page "https://pypi.python.org/pypi/python-ly") + (home-page "https://pypi.org/project/python-ly/") (license license:gpl2+))) (define-public python-appdirs @@ -7033,7 +7033,7 @@ (define-public python-msgpack (description "MessagePack is a fast, compact binary serialization format, suitable for similar data to JSON. This package provides CPython bindings for reading and writing MessagePack data.") - (home-page "https://pypi.python.org/pypi/msgpack/") + (home-page "https://pypi.org/project/msgpack/") (license license:asl2.0))) ;; This msgpack library's name changed from "python-msgpack" to "msgpack" with @@ -7526,7 +7526,7 @@ (define-public python-termcolor (arguments ;; There are no tests. `(#:tests? #f)) - (home-page "https://pypi.python.org/pypi/termcolor") + (home-page "https://pypi.org/project/termcolor/") (synopsis "ANSII Color formatting for terminal output") (description "This package provides ANSII Color formatting for output in terminals.") @@ -8780,7 +8780,7 @@ (define-public python-colorama (synopsis "Colored terminal text rendering for Python") (description "Colorama is a Python library for rendering colored terminal text.") - (home-page "https://pypi.python.org/pypi/colorama") + (home-page "https://pypi.org/project/colorama/") (license license:bsd-3))) (define-public python2-colorama @@ -8828,7 +8828,7 @@ (define-public python-pluggy (synopsis "Plugin and hook calling mechanism for Python") (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") - (home-page "https://pypi.python.org/pypi/pluggy") + (home-page "https://pypi.org/project/pluggy/") (license license:expat))) (define-public python2-pluggy @@ -9533,7 +9533,7 @@ (define-public python2-pathlib2 (propagated-inputs `(("python2-scandir" ,python2-scandir) ("python2-six" ,python2-six))) - (home-page "https://pypi.python.org/pypi/pathlib2/") + (home-page "https://pypi.org/project/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard pathlib module") (description "The goal of pathlib2 is to provide a backport of standard @@ -13484,7 +13484,7 @@ (define-public python-rfc3987 (base32 "192pclzs2y0yaywqkrlvd0x73740q310kvqvm6jldhi619mq59wi")))) (build-system python-build-system) - (home-page "https://pypi.python.org/pypi/rfc3987") + (home-page "https://pypi.org/project/rfc3987/") (synopsis "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)") (description "@code{rfc3987} provides routines for parsing and validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") -- cgit v1.2.3 From 5ba94aa702f6dab31cc58e7f7919c978a088a0c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:55:59 +0100 Subject: gnu: ardour: Use HTTPS home page. * gnu/packages/audio.scm (ardour)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cbddb8c407..2406aa16b2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -322,7 +322,7 @@ (define-public ardour ("itstool" ,itstool) ("perl" ,perl) ("pkg-config" ,pkg-config))) - (home-page "http://ardour.org") + (home-page "https://ardour.org") (synopsis "Digital audio workstation") (description "Ardour is a multi-channel digital audio workstation, allowing users to -- cgit v1.2.3 From 9cedae2aafa4df6b6a2ce25a285ef941badaf99a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 21:58:44 +0200 Subject: gnu: libgee: Update to 0.20.3. * gnu/packages/gnome.scm (libgee): Update to 0.20.3. --- 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 0cd39f9104..1724294a4b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5688,7 +5688,7 @@ (define-public yelp-tools/fixed (define-public libgee (package (name "libgee") - (version "0.20.2") + (version "0.20.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgee/" @@ -5696,7 +5696,7 @@ (define-public libgee "libgee-" version ".tar.xz")) (sha256 (base32 - "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy")))) + "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 60ce496ad8230eeeb8e8073eec3c5c2257673925 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 22:22:58 +0200 Subject: gnu: gcc-8: Update to 8.4.0. * gnu/packages/gcc.scm (gcc-8): Update to 8.4.0. --- gnu/packages/gcc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 29b9d34569..ead50bb1dc 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke @@ -509,14 +509,14 @@ (define-public gcc-7 (define-public gcc-8 (package (inherit gcc-7) - (version "8.3.0") + (version "8.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4")) + "1m1d3gfix56w4aq8myazzfffkl8bqcrx4jhhapnjf7qfs596w2p3")) (patches (search-patches "gcc-8-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))))) -- cgit v1.2.3 From c1a86b666f1a5ece3251bab0be4929167e84b410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:34:34 +0100 Subject: gnu: appstream-glib: Update to 0.7.17. * gnu/packages/patches/appstream-glib-2020.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.17. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 5 ++--- gnu/packages/patches/appstream-glib-2020.patch | 31 -------------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/appstream-glib-2020.patch diff --git a/gnu/local.mk b/gnu/local.mk index cbb7d2b2f0..b62468c923 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -720,7 +720,6 @@ dist_patch_DATA = \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ - %D%/packages/patches/appstream-glib-2020.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 03d6be596b..c98d8c18f5 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -898,16 +898,15 @@ (define-public dbus-c++ (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.16") + (version "0.7.17") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" "appstream-glib/releases/" "appstream-glib-" version ".tar.xz")) - (patches (search-patches "appstream-glib-2020.patch")) (sha256 (base32 - "14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4")))) + "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/appstream-glib-2020.patch b/gnu/packages/patches/appstream-glib-2020.patch deleted file mode 100644 index ab8a4bbdee..0000000000 --- a/gnu/packages/patches/appstream-glib-2020.patch +++ /dev/null @@ -1,31 +0,0 @@ -2020 is no longer the future. - -Taken from upstream: -https://github.com/hughsie/appstream-glib/commit/953c8e529d7291e60a95e580967ed79ce2c9ccf0 - -diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml -index f7a5386e..cf80f5b4 100644 ---- a/data/tests/broken.appdata.xml -+++ b/data/tests/broken.appdata.xml -@@ -40,7 +40,7 @@ -

This is a duplicate release on the same day!

- - -- -+ - -

This is a release in the future!

- -diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c -index c1103ace..f50e4e41 100644 ---- a/libappstream-glib/as-app-validate.c -+++ b/libappstream-glib/as-app-validate.c -@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app, - AS_PROBLEM_KIND_ATTRIBUTE_MISSING, - " has no timestamp"); - } -- if (timestamp > 20120101 && timestamp < 20251231) { -+ if (timestamp > 20120101 && timestamp < 20351231) { - ai_app_validate_add (helper, - AS_PROBLEM_KIND_ATTRIBUTE_INVALID, - " timestamp should be a UNIX time"); -- cgit v1.2.3 From 16af0dd9073da9330ae6013fa119139dd9817af0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:35:11 +0100 Subject: gnu: libsoup: Update to 2.68.4. * gnu/packages/gnome.scm (libsoup): Update to 2.68.4. --- 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 1724294a4b..c802164188 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3671,7 +3671,7 @@ (define-public rest (define-public libsoup (package (name "libsoup") - (version "2.68.3") + (version "2.68.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -3679,7 +3679,7 @@ (define-public libsoup "libsoup-" version ".tar.xz")) (sha256 (base32 - "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk")))) + "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From bd65a4cf01785a78546f2ab0e9e00a25a189bf6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:35:33 +0100 Subject: gnu: ibus: Update to 1.5.22. * gnu/packages/ibus.scm (ibus): Update to 1.5.22. --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index c0766c06bd..12a8d6758f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -59,7 +59,7 @@ (define-module (gnu packages ibus) (define-public ibus (package (name "ibus") - (version "1.5.21") + (version "1.5.22") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -67,7 +67,7 @@ (define-public ibus version "/ibus-" version ".tar.gz")) (sha256 (base32 - "1fd2d1jqpp1nn74x04zcilhhab0zar82n0kg614rma6n43kfbhdd")))) + "0jmy2w01phpmqnjnfnak7nvfna57mpgfnl87jwc4iai8ijjynw41")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus -- cgit v1.2.3 From e26c4a7e4e5e8862250a89c0d17d74530db8bd00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:35:53 +0100 Subject: gnu: re2: Update to 2020-03-03. * gnu/packages/regex.scm (re2): Update to 2020-03-03. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index ef0d5d854b..5654104bcf 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -30,7 +30,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2020-01-01") + (version "2020-03-03") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (define-public re2 (file-name (git-file-name name version)) (sha256 (base32 - "0gcli7y2ax3karx7m1q1r9qm49danaxbgxslywjwmya5nmr7x3p4")))) + "0f1fncvg41dg9k06jiqbd7k51ljihk7rjb0kvxkbrlvgbzlpb860")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 3f03643219b1e02669b22e3efb17298c6ef0dfca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:36:14 +0100 Subject: gnu: wpebackend-fdo: Update to 1.4.2. * gnu/packages/webkit.scm (wpebackend-fdo): Update to 1.4.2. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f9ef1cb44b..1474b6623d 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ (define-public libwpe (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "1799vf6wc78z15l39sfh39l5rrvlqpi29ynjm0324rpsrfvs0jb2")))) + "07wd736d4nhd2vpxnjzv9pb8firvbn11jmdbnhpkhjxbxa1k86pw")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From 2f894cbc6a99ed30ffd77fbcbb1ed145bc366f6f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:36:35 +0100 Subject: gnu: enchant: Update to 2.2.8. * gnu/packages/enchant.scm (enchant): Update to 2.2.8. --- gnu/packages/enchant.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 25825997bb..ff4fc03363 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -36,7 +36,7 @@ (define-module (gnu packages enchant) (define-public enchant (package (name "enchant") - (version "2.2.7") + (version "2.2.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/AbiWord/enchant/releases" @@ -44,7 +44,7 @@ (define-public enchant version ".tar.gz")) (sha256 (base32 - "029smcna98hllgkm2gy94qa7qphxs4xaa8cdbg5kaaw16mhrf8hv")))) + "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 0a7aa6922b8ad121bfcf023346f9f9bb97099504 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:36:51 +0100 Subject: gnu: libgit2: Update to 0.99.0. * gnu/packages/patches/libgit2-avoid-python.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/version-control.scm (libgit2): Update to 0.99.0. [source](patches): Remove 'libgit2-avoid-python.patch'. [source](snippet): Preserve bundled copy of http-parser. [arguments]: Remove "-DUSE_SHA1DC" from #:configure-flags, which is no longer optional and enabled by default. Add "-DUSE_NTLMCLIENT=OFF" and "-DREGEX_BACKEND=pcre2". Add phase 'fix-pcre2-reference'. [inputs]: Remove HTTP-PARSER. [propagated-inputs]: Add PCRE2. [native-inputs]: Remove GUILE-2.2. Add PYTHON. --- gnu/local.mk | 1 - gnu/packages/patches/libgit2-avoid-python.patch | 322 ------------------------ gnu/packages/version-control.scm | 44 ++-- 3 files changed, 30 insertions(+), 337 deletions(-) delete mode 100644 gnu/packages/patches/libgit2-avoid-python.patch diff --git a/gnu/local.mk b/gnu/local.mk index b62468c923..71a39b73a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1096,7 +1096,6 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2018-20030.patch \ %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ - %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ diff --git a/gnu/packages/patches/libgit2-avoid-python.patch b/gnu/packages/patches/libgit2-avoid-python.patch deleted file mode 100644 index b2e5141563..0000000000 --- a/gnu/packages/patches/libgit2-avoid-python.patch +++ /dev/null @@ -1,322 +0,0 @@ -This provides a Guile reimplementation of clar's "generate.py". -It makes it possible for us to remove Python from libgit2's build-time -dependencies. -libgit2 is used in order to fetch a lot of sources for guix packages. -Both Python2 and Python3 builds acted up in the past. -Hence this patch which makes the number of libgit2 dependencies very -small. -The reimplementation tries to keep as close as possible to the original -in both structure and runtime effect. Some things are thus overly -convoluted just to make them the same as in the original. - -Both implementations basically do: - -grep -r 'test_.*__.*' . > clar.suite - -It is important that the directory traversal order of the original and -the reimplementation stay the same. - -diff -ruN orig/libgit2-0.27.7/tests/CMakeLists.txt libgit2-0.27.7/tests/CMakeLists.txt ---- orig/libgit2-0.27.7/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ libgit2-0.27.7/tests/CMakeLists.txt 2019-03-04 11:13:06.640118979 +0100 -@@ -1,10 +1,3 @@ --FIND_PACKAGE(PythonInterp) -- --IF(NOT PYTHONINTERP_FOUND) -- MESSAGE(FATAL_ERROR "Could not find a python interpeter, which is needed to build the tests. " -- "Make sure python is available, or pass -DBUILD_CLAR=OFF to skip building the tests") --ENDIF() -- - SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/resources/") - SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}") - ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\") -@@ -21,7 +14,7 @@ - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/clar.suite -- COMMAND ${PYTHON_EXECUTABLE} generate.py -o "${CMAKE_CURRENT_BINARY_DIR}" -f -xonline -xstress -xperf . -+ COMMAND guile generate.scm -o "${CMAKE_CURRENT_BINARY_DIR}" -f -x online -x stress -x perf . - DEPENDS ${SRC_TEST} - WORKING_DIRECTORY ${CLAR_PATH} - ) -diff -ruN orig/libgit2-0.27.7/tests/generate.scm libgit2-0.27.7/tests/generate.scm ---- orig/libgit2-0.27.7/tests/generate.scm 1970-01-01 01:00:00.000000000 +0100 -+++ libgit2-0.27.7/tests/generate.scm 2019-03-04 12:18:00.688040975 +0100 -@@ -0,0 +1,277 @@ -+;; -*- geiser-scheme-implementation: guile -*- -+ -+;;; Implementation: Danny Milosavljevic -+;;; Based on: Implementation in Python by Vicent Marti. -+;;; License: ISC, like the original generate.py in clar. -+ -+(use-modules (ice-9 ftw)) -+(use-modules (ice-9 regex)) -+(use-modules (ice-9 getopt-long)) -+(use-modules (ice-9 rdelim)) -+(use-modules (ice-9 match)) -+(use-modules (ice-9 textual-ports)) -+(use-modules (srfi srfi-1)) -+ -+(define (render-callback cb) -+ (if cb -+ (string-append " { \"" (assoc-ref cb "short-name") "\", &" -+ (assoc-ref cb "symbol") " }") -+ " { NULL, NULL }")) -+ -+(define (replace needle replacement haystack) -+ "Replace all occurences of NEEDLE in HAYSTACK by REPLACEMENT. -+NEEDLE is a regular expression." -+ (regexp-substitute/global #f needle haystack 'pre replacement 'post)) -+ -+(define (skip-comments* text) -+ (call-with-input-string -+ text -+ (lambda (port) -+ (let loop ((result '()) -+ (section #f)) -+ (define (consume-char) -+ (cons (read-char port) result)) -+ (define (skip-char) -+ (read-char port) -+ result) -+ (match section -+ (#f -+ (match (peek-char port) -+ (#\/ (loop (consume-char) 'almost-in-block-comment)) -+ (#\" (loop (consume-char) 'in-string-literal)) -+ (#\' (loop (consume-char) 'in-character-literal)) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) section)))) -+ ('almost-in-block-comment -+ (match (peek-char port) -+ (#\* (loop (consume-char) 'in-block-comment)) -+ (#\/ (loop (consume-char) 'in-line-comment)) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) #f)))) -+ ('in-line-comment -+ (match (peek-char port) -+ (#\newline (loop (consume-char) #f)) -+ ((? eof-object?) result) -+ (_ (loop (skip-char) section)))) -+ ('in-block-comment -+ (match (peek-char port) -+ (#\* (loop (skip-char) 'almost-out-of-block-comment)) -+ ((? eof-object?) result) -+ (_ (loop (skip-char) section)))) -+ ('almost-out-of-block-comment -+ (match (peek-char port) -+ (#\/ (loop (cons (read-char port) (cons #\* result)) #f)) -+ (#\* (loop (skip-char) 'almost-out-of-block-comment)) -+ ((? eof-object?) result) -+ (_ (loop (skip-char) 'in-block-comment)))) -+ ('in-string-literal -+ (match (peek-char port) -+ (#\\ (loop (consume-char) 'in-string-literal-escape)) -+ (#\" (loop (consume-char) #f)) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) section)))) -+ ('in-string-literal-escape -+ (match (peek-char port) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) 'in-string-literal)))) -+ ('in-character-literal -+ (match (peek-char port) -+ (#\\ (loop (consume-char) 'in-character-literal-escape)) -+ (#\' (loop (consume-char) #f)) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) section)))) -+ ('in-character-literal-escape -+ (match (peek-char port) -+ ((? eof-object?) result) -+ (_ (loop (consume-char) 'in-character-literal))))))))) -+ -+(define (skip-comments text) -+ (list->string (reverse (skip-comments* text)))) -+ -+(define (maybe-only items) -+ (match items -+ ((a) a) -+ (_ #f))) -+ -+(define (Module name path excludes) -+ (let* ((clean-name (replace "_" "::" name)) -+ (enabled (not (any (lambda (exclude) -+ (string-prefix? exclude clean-name)) -+ excludes)))) -+ (define (parse contents) -+ (define (cons-match match prev) -+ (cons -+ `(("declaration" . ,(match:substring match 1)) -+ ("symbol" . ,(match:substring match 2)) -+ ("short-name" . ,(match:substring match 3))) -+ prev)) -+ (let* ((contents (skip-comments contents)) -+ (entries (fold-matches (make-regexp -+ (string-append "^(void\\s+(test_" -+ name -+ "__(\\w+))\\s*\\(\\s*void\\s*\\))\\s*\\{") -+ regexp/newline) -+ contents -+ '() -+ cons-match)) -+ (entries (reverse entries)) -+ (callbacks (filter (lambda (entry) -+ (match (assoc-ref entry "short-name") -+ ("initialize" #f) -+ ("cleanup" #f) -+ (_ #t))) -+ entries))) -+ (if (> (length callbacks) 0) -+ `(("name" . ,name) -+ ("enabled" . ,(if enabled "1" "0")) -+ ("clean-name" . ,clean-name) -+ ("initialize" . ,(maybe-only (filter-map (lambda (entry) -+ (match (assoc-ref entry "short-name") -+ ("initialize" entry) -+ (_ #f))) -+ entries))) -+ ("cleanup" . ,(maybe-only (filter-map (lambda (entry) -+ (match (assoc-ref entry "short-name") -+ ("cleanup" entry) -+ (_ #f))) -+ entries))) -+ ("callbacks" . ,callbacks)) -+ #f))) -+ -+ (define (refresh path) -+ (and (file-exists? path) -+ (parse (call-with-input-file path get-string-all)))) -+ (refresh path))) -+ -+(define (generate-TestSuite path output excludes) -+ (define (load) -+ (define enter? (const #t)) -+ (define (leaf file stat result) -+ (let* ((module-root (string-drop (dirname file) -+ (string-length path))) -+ (module-root (filter-map (match-lambda -+ ("" #f) -+ (a a)) -+ (string-split module-root #\/)))) -+ (define (make-module path) -+ (let* ((name (string-join (append module-root (list (string-drop-right (basename path) (string-length ".c")))) "_")) -+ (name (replace "-" "_" name))) -+ (Module name path excludes))) -+ (if (string-suffix? ".c" file) -+ (let ((module (make-module file))) -+ (if module -+ (cons module result) -+ result)) -+ result))) -+ (define (down dir stat result) -+ result) -+ (define (up file state result) -+ result) -+ (define skip (const #f)) -+ (file-system-fold enter? leaf down up skip error '() path)) -+ -+ (define (CallbacksTemplate module) -+ (string-append "static const struct clar_func _clar_cb_" -+ (assoc-ref module "name") "[] = {\n" -+ (string-join (map render-callback -+ (assoc-ref module "callbacks")) -+ ",\n") -+ "\n};\n")) -+ -+ (define (DeclarationTemplate module) -+ (string-append (string-join (map (lambda (cb) -+ (string-append "extern " -+ (assoc-ref cb "declaration") -+ ";")) -+ (assoc-ref module "callbacks")) -+ "\n") -+ "\n" -+ (if (assoc-ref module "initialize") -+ (string-append "extern " (assoc-ref (assoc-ref module "initialize") "declaration") ";\n") -+ "") -+ (if (assoc-ref module "cleanup") -+ (string-append "extern " (assoc-ref (assoc-ref module "cleanup") "declaration") ";\n") -+ ""))) -+ -+ (define (InfoTemplate module) -+ (string-append " -+ { -+ \"" (assoc-ref module "clean-name") "\", -+ " (render-callback (assoc-ref module "initialize")) ", -+ " (render-callback (assoc-ref module "cleanup")) ", -+ _clar_cb_" (assoc-ref module "name") ", " -+ (number->string (length (assoc-ref module "callbacks"))) -+ ", " (assoc-ref module "enabled") " -+ }")) -+ -+ (define (Write data) -+ (define (name< module-a module-b) -+ (stringstring (suite-count))) -+ (callback-count-str (number->string (callback-count)))) -+ (display-x "static const size_t _clar_suite_count = ") -+ (display-x suite-count-str) -+ (display-x ";\n") -+ -+ (display-x "static const size_t _clar_callback_count = ") -+ (display-x callback-count-str) -+ (display-x ";\n") -+ -+ (display (string-append "Written `clar.suite` (" -+ callback-count-str -+ " tests in " -+ suite-count-str -+ " suites)")) -+ (newline)) -+ #t) -+ -+ (call-with-output-file (string-append output "/clar.suite") Write)) -+ -+;;; main -+ -+(define (main) -+ (define option-spec -+ '((force (single-char #\f) (value #f)) -+ (exclude (single-char #\x) (value #t)) -+ (output (single-char #\o) (value #t)) -+ (help (single-char #\h) (value #f)))) -+ -+ (define options (getopt-long (command-line) option-spec #:stop-at-first-non-option #t)) -+ (define args (reverse (option-ref options '() '()))) -+ (when (> (length args) 1) -+ (display "More than one path given\n") -+ (exit 1)) -+ -+ (if (< (length args) 1) -+ (set! args '("."))) -+ -+ (let* ((path (car args)) -+ (output (option-ref options 'output path)) -+ (excluded (filter-map (match-lambda -+ (('exclude . value) value) -+ (_ #f)) -+ options))) -+ (generate-TestSuite path output excluded))) -+ -+(main) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8cb4cc347..514dfe7ab7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 André -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Sou Bunnbu @@ -534,7 +534,7 @@ (define-public git-minimal (define-public libgit2 (package (name "libgit2") - (version "0.28.4") + (version "0.99.0") (source (origin (method git-fetch) (uri (git-reference @@ -543,21 +543,37 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1")) - (patches (search-patches "libgit2-avoid-python.patch" - "libgit2-mtime-0.patch")) + "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg")) + (patches (search-patches "libgit2-mtime-0.patch")) - ;; Remove bundled software. + ;; Remove bundled software. Keep "http-parser" because it + ;; contains patches that are not available in the system version. (snippet '(begin - (delete-file-recursively "deps") + (with-directory-excursion "deps" + (for-each (lambda (dir) + (delete-file-recursively dir)) + (lset-difference equal? + (scandir ".") + '("." ".." "http-parser")))) #t)) - (modules '((guix build utils))))) + (modules '((guix build utils) + (srfi srfi-1) + (ice-9 ftw))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this + "-DREGEX_BACKEND=pcre2") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-pcre2-reference + (lambda _ + ;; Use PCRE2 with 8-bit character support, as there is no "libpcre2.pc". + ;; See . + (substitute* "src/CMakeLists.txt" + (("\"libpcre2\"") + "\"libpcre2-8\"")) + #t)) (add-after 'unpack 'fix-hardcoded-paths (lambda _ (substitute* "tests/repo/init.c" @@ -574,14 +590,14 @@ (define-public libgit2 (replace 'check (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) (inputs - `(("libssh2" ,libssh2) - ("http-parser" ,http-parser))) + `(("libssh2" ,libssh2))) (native-inputs - `(("guile" ,guile-2.2) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python" ,python))) (propagated-inputs - ;; These two libraries are in 'Requires.private' in libgit2.pc. + ;; These libraries are in 'Requires.private' in libgit2.pc. `(("openssl" ,openssl) + ("pcre2" ,pcre2) ("zlib" ,zlib))) (home-page "https://libgit2.github.com/") (synopsis "Library providing Git core methods") -- cgit v1.2.3 From 75545401cd4d60c63a4d88c1a3c17a84332523d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 13:06:37 +0100 Subject: gnu: kodi: Update to 18.6. * gnu/packages/kodi.scm (kodi): Update to 18.6. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 23afd138a3..2831d3d842 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -269,7 +269,7 @@ (define-public fstrcmp (define-public kodi (package (name "kodi") - (version "18.4") + (version "18.6") (source (origin (method git-fetch) (uri (git-reference @@ -278,7 +278,7 @@ (define-public kodi (file-name (git-file-name name version)) (sha256 (base32 - "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7")) + "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk")) (patches (search-patches "kodi-skip-test-449.patch" "kodi-increase-test-timeout.patch" "kodi-set-libcurl-ssl-parameters.patch")) -- cgit v1.2.3 From d3c1e9272d3004b8f737104c292f7b31393a091d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 13:06:57 +0100 Subject: gnu: i3-wm: Update to 4.18. * gnu/packages/wm.scm (i3-wm): Update to 4.18. --- 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 d79af78db2..8193975555 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -267,14 +267,14 @@ (define-public i3status (define-public i3-wm (package (name "i3-wm") - (version "4.17.1") + (version "4.18") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.bz2")) (sha256 (base32 - "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy")))) + "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c2d7e800e6788277bc56f31d5836f9d507dc1506 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 13:07:14 +0100 Subject: gnu: ceph: Update to 14.2.8. * gnu/packages/patches/ceph-boost-compat.patch, gnu/packages/patches/ceph-volume-respect-PATH.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/storage.scm (ceph): Update to 14.2.8. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - gnu/packages/patches/ceph-boost-compat.patch | 81 ---------------------- .../patches/ceph-volume-respect-PATH.patch | 22 ------ gnu/packages/storage.scm | 8 +-- 4 files changed, 3 insertions(+), 110 deletions(-) delete mode 100644 gnu/packages/patches/ceph-boost-compat.patch delete mode 100644 gnu/packages/patches/ceph-volume-respect-PATH.patch diff --git a/gnu/local.mk b/gnu/local.mk index 71a39b73a1..5ea93238ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -770,9 +770,7 @@ dist_patch_DATA = \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ - %D%/packages/patches/ceph-boost-compat.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ diff --git a/gnu/packages/patches/ceph-boost-compat.patch b/gnu/packages/patches/ceph-boost-compat.patch deleted file mode 100644 index b3df659d6b..0000000000 --- a/gnu/packages/patches/ceph-boost-compat.patch +++ /dev/null @@ -1,81 +0,0 @@ -Fix compatibility with Boost 1.70. - -Adapted for 14.2.5 from these upstream commits: -https://github.com/ceph/ceph/commit/064f142746ae97f54865069cdacf5aae2b1b14f6 -https://github.com/ceph/ceph/commit/f1651b8c509d60787d10c4115e29fecfd2da237c - -diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc ---- a/src/rgw/rgw_asio_frontend.cc -+++ b/src/rgw/rgw_asio_frontend.cc -@@ -83,7 +83,8 @@ - using SharedMutex = ceph::async::SharedMutex; - - template --void handle_connection(RGWProcessEnv& env, Stream& stream, -+void handle_connection(boost::asio::io_context& context, -+ RGWProcessEnv& env, Stream& stream, - parse_buffer& buffer, bool is_ssl, - SharedMutex& pause_mutex, - rgw::dmclock::Scheduler *scheduler, -@@ -160,7 +161,7 @@ - rgw::io::add_conlen_controlling( - &real_client)))); - RGWRestfulIO client(cct, &real_client_io); -- auto y = optional_yield{socket.get_io_context(), yield}; -+ auto y = optional_yield{context, yield}; - process_request(env.store, env.rest, &req, env.uri_prefix, - *env.auth_registry, &client, env.olog, y, scheduler); - } -@@ -604,7 +605,7 @@ - return; - } - buffer->consume(bytes); -- handle_connection(env, stream, *buffer, true, pause_mutex, -+ handle_connection(context, env, stream, *buffer, true, pause_mutex, - scheduler.get(), ec, yield); - if (!ec) { - // ssl shutdown (ignoring errors) -@@ -622,7 +623,7 @@ - auto c = connections.add(conn); - auto buffer = std::make_unique(); - boost::system::error_code ec; -- handle_connection(env, s, *buffer, false, pause_mutex, -+ handle_connection(context, env, s, *buffer, false, pause_mutex, - scheduler.get(), ec, yield); - s.shutdown(tcp::socket::shutdown_both, ec); - }); -diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h ---- a/src/rgw/rgw_dmclock_async_scheduler.h -+++ b/src/rgw/rgw_dmclock_async_scheduler.h -@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { - using Completion = async::Completion>; - - using Clock = ceph::coarse_real_clock; -+#if BOOST_VERSION < 107000 - using Timer = boost::asio::basic_waitable_timer; -+#else -+ using Timer = boost::asio::basic_waitable_timer, executor_type>; -+#endif - Timer timer; //< timer for the next scheduled request - - CephContext *const cct; -diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h ---- a/src/rgw/rgw_reshard.h -+++ b/src/rgw/rgw_reshard.h -@@ -183,7 +183,14 @@ class RGWReshardWait { - ceph::condition_variable cond; - - struct Waiter : boost::intrusive::list_base_hook<> { -- boost::asio::basic_waitable_timer timer; -+#if BOOST_VERSION < 107000 -+ using Timer = boost::asio::basic_waitable_timer; -+#else -+ using Executor = boost::asio::io_context::executor_type; -+ using Timer = boost::asio::basic_waitable_timer, Executor>; -+#endif -+ Timer timer; - explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} - }; - boost::intrusive::list waiters; diff --git a/gnu/packages/patches/ceph-volume-respect-PATH.patch b/gnu/packages/patches/ceph-volume-respect-PATH.patch deleted file mode 100644 index 08a9a15ddd..0000000000 --- a/gnu/packages/patches/ceph-volume-respect-PATH.patch +++ /dev/null @@ -1,22 +0,0 @@ -Look for required tools in $PATH instead of just a handful locations. - -diff --git a/src/ceph-volume/ceph_volume/util/system.py b/src/ceph-volume/ceph_volume/util/system.py -index b637f023a4..14516e1c65 100644 ---- a/src/ceph-volume/ceph_volume/util/system.py -+++ b/src/ceph-volume/ceph_volume/util/system.py -@@ -33,14 +33,7 @@ def generate_uuid(): - - def which(executable): - """find the location of an executable""" -- locations = ( -- '/usr/local/bin', -- '/bin', -- '/usr/bin', -- '/usr/local/sbin', -- '/usr/sbin', -- '/sbin', -- ) -+ locations = os.getenv('PATH').split(':') - - for location in locations: - executable_path = os.path.join(location, executable) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 1691939d7f..376a801fe2 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -53,18 +53,16 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "14.2.7") + (version "14.2.8") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln")) + "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki")) (patches - (search-patches "ceph-boost-compat.patch" - "ceph-volume-respect-PATH.patch" - "ceph-disable-cpu-optimizations.patch")) + (search-patches "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3