me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	gnu/packages/ruby.scm
This commit is contained in:
Jakub Kądziołka 2020-07-23 21:43:06 +02:00
commit d726b954ba
No known key found for this signature in database
GPG key ID: E315A75846131564
445 changed files with 34995 additions and 11457 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dir-locals.el
View file

@ -37,6 +37,7 @@
(eval . (put 'with-file-lock 'scheme-indent-function 1)) (eval . (put 'with-file-lock 'scheme-indent-function 1))
(eval . (put 'with-file-lock/no-wait 'scheme-indent-function 1)) (eval . (put 'with-file-lock/no-wait 'scheme-indent-function 1))
(eval . (put 'with-profile-lock 'scheme-indent-function 1)) (eval . (put 'with-profile-lock 'scheme-indent-function 1))
(eval . (put 'with-writable-file 'scheme-indent-function 1))
(eval . (put 'package 'scheme-indent-function 0)) (eval . (put 'package 'scheme-indent-function 0))
(eval . (put 'origin 'scheme-indent-function 0)) (eval . (put 'origin 'scheme-indent-function 0))

10
.gitignore vendored
View file

@ -66,6 +66,7 @@
/doc/stamp-vti /doc/stamp-vti
/doc/version.texi /doc/version.texi
/doc/version-*.texi /doc/version-*.texi
/etc/committer.scm
/etc/gnu-store.mount /etc/gnu-store.mount
/etc/guix-daemon.cil /etc/guix-daemon.cil
/etc/guix-daemon.conf /etc/guix-daemon.conf
@ -88,17 +89,8 @@
/m4/nls.m4 /m4/nls.m4
/m4/po.m4 /m4/po.m4
/m4/progtest.m4 /m4/progtest.m4
/nix-setuid-helper
/nix/AUTHORS
/nix/COPYING
/nix/config.h /nix/config.h
/nix/config.h.in /nix/config.h.in
/nix/nix-daemon/nix-daemon.cc
/nix/nix-setuid-helper/nix-setuid-helper.cc
/nix/scripts/authenticate
/nix/scripts/list-runtime-roots
/nix/scripts/offload
/nix/scripts/substitute
/po/doc/*.mo /po/doc/*.mo
/po/guix/*.gmo /po/guix/*.gmo
/po/guix/*.insert-header /po/guix/*.insert-header

15
.guix-authorizations
View file

@ -27,15 +27,13 @@
(;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" (;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
"A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566" "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566"
(name "bavier")) (name "bavier"))
("3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C"
(name "beffa"))
("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6" ("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6"
(name "benwoodcroft")) (name "benwoodcroft"))
("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912" ("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912"
(name "biscuolo")) (name "biscuolo"))
("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21" ("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21"
(name "boskovits")) (name "boskovits"))
("DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE" ("E82A C026 95D6 FF02 43CA 1E5C F6C5 2DD1 BA27 CB87"
(name "brettgilio")) (name "brettgilio"))
(;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99" (;; primary: "8929 BBC5 73CD 9206 3DDD 979D 3D36 CAA0 116F 0F99"
"1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE" "1C9B F005 1A1A 6A44 5257 599A A949 03A1 66A1 8FAE"
@ -58,14 +56,8 @@
(name "davexunit (2nd)")) (name "davexunit (2nd)"))
("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14" ("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14"
(name "daviwil")) (name "daviwil"))
("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB"
(name "dvc"))
("5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23"
(name "dvc (old)"))
("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351" ("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351"
(name "efraim")) (name "efraim"))
("9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93"
(name "efraim (old)"))
(;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" (;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A"
"CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F" "CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F"
(name "glv")) (name "glv"))
@ -78,13 +70,8 @@
(;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37" (;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37"
"0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976" "0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976"
(name "iyzsong")) (name "iyzsong"))
;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html
("DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99"
(name "janneke (old)"))
("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273" ("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273"
(name "janneke")) (name "janneke"))
(;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" (;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0"
"E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025" "E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025"
(name "jlicht")) (name "jlicht"))

23
Makefile.am
View file

@ -132,6 +132,7 @@ MODULES = \
guix/build-system/haskell.scm \ guix/build-system/haskell.scm \
guix/build-system/julia.scm \ guix/build-system/julia.scm \
guix/build-system/linux-module.scm \ guix/build-system/linux-module.scm \
guix/build-system/maven.scm \
guix/build-system/node.scm \ guix/build-system/node.scm \
guix/build-system/perl.scm \ guix/build-system/perl.scm \
guix/build-system/python.scm \ guix/build-system/python.scm \
@ -181,6 +182,7 @@ MODULES = \
guix/build/gnu-build-system.scm \ guix/build/gnu-build-system.scm \
guix/build/gnu-dist.scm \ guix/build/gnu-dist.scm \
guix/build/guile-build-system.scm \ guix/build/guile-build-system.scm \
guix/build/maven-build-system.scm \
guix/build/node-build-system.scm \ guix/build/node-build-system.scm \
guix/build/perl-build-system.scm \ guix/build/perl-build-system.scm \
guix/build/python-build-system.scm \ guix/build/python-build-system.scm \
@ -212,6 +214,9 @@ MODULES = \
guix/build/emacs-utils.scm \ guix/build/emacs-utils.scm \
guix/build/java-utils.scm \ guix/build/java-utils.scm \
guix/build/lisp-utils.scm \ guix/build/lisp-utils.scm \
guix/build/maven/java.scm \
guix/build/maven/plugin.scm \
guix/build/maven/pom.scm \
guix/build/graft.scm \ guix/build/graft.scm \
guix/build/bournish.scm \ guix/build/bournish.scm \
guix/build/qt-utils.scm \ guix/build/qt-utils.scm \
@ -281,6 +286,8 @@ MODULES = \
guix/scripts/publish.scm \ guix/scripts/publish.scm \
guix/scripts/edit.scm \ guix/scripts/edit.scm \
guix/scripts/size.scm \ guix/scripts/size.scm \
guix/scripts/git.scm \
guix/scripts/git/authenticate.scm \
guix/scripts/graph.scm \ guix/scripts/graph.scm \
guix/scripts/weather.scm \ guix/scripts/weather.scm \
guix/scripts/container.scm \ guix/scripts/container.scm \
@ -463,6 +470,7 @@ SH_TESTS = \
tests/guix-build-branch.sh \ tests/guix-build-branch.sh \
tests/guix-download.sh \ tests/guix-download.sh \
tests/guix-gc.sh \ tests/guix-gc.sh \
tests/guix-git-authenticate.sh \
tests/guix-hash.sh \ tests/guix-hash.sh \
tests/guix-pack.sh \ tests/guix-pack.sh \
tests/guix-pack-localstatedir.sh \ tests/guix-pack-localstatedir.sh \
@ -523,7 +531,7 @@ check-system: $(GOBJECTS)
# Public keys used to sign substitutes. # Public keys used to sign substitutes.
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
etc/substitutes/berlin.guixsd.org.pub \ etc/substitutes/berlin.guix.gnu.org.pub \
etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.gnu.org.pub \
etc/substitutes/ci.guix.info.pub etc/substitutes/ci.guix.info.pub
@ -552,6 +560,7 @@ EXTRA_DIST += \
etc/news.scm \ etc/news.scm \
etc/release-manifest.scm \ etc/release-manifest.scm \
etc/system-tests.scm \ etc/system-tests.scm \
etc/historical-authorizations \
build-aux/build-self.scm \ build-aux/build-self.scm \
build-aux/compile-all.scm \ build-aux/compile-all.scm \
build-aux/hydra/evaluate.scm \ build-aux/hydra/evaluate.scm \
@ -565,7 +574,6 @@ EXTRA_DIST += \
build-aux/check-channel-news.scm \ build-aux/check-channel-news.scm \
build-aux/compile-as-derivation.scm \ build-aux/compile-as-derivation.scm \
build-aux/generate-authors.scm \ build-aux/generate-authors.scm \
build-aux/git-authenticate.scm \
build-aux/test-driver.scm \ build-aux/test-driver.scm \
build-aux/update-guix-package.scm \ build-aux/update-guix-package.scm \
build-aux/update-NEWS.scm \ build-aux/update-NEWS.scm \
@ -637,14 +645,17 @@ install-data-hook:
# Commit corresponding to the 'v1.0.0' tag. # Commit corresponding to the 'v1.0.0' tag.
commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c
# Introduction of the 'guix' channel. Keep in sync with (guix channels)!
channel_intro_commit = 9edb3f66fd807b096b48283debdcddccfea34bad
channel_intro_signer = BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA
# Authenticate the current Git checkout by checking signatures on every commit # Authenticate the current Git checkout by checking signatures on every commit
# starting from $(commit_v1_0_0). # starting from $(commit_v1_0_0).
authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go
$(AM_V_at)echo "Authenticating Git checkout..." ; \ $(AM_V_at)echo "Authenticating Git checkout..." ; \
"$(top_builddir)/pre-inst-env" $(GUILE) \ "$(top_builddir)/pre-inst-env" guix git authenticate \
--no-auto-compile -e git-authenticate \ --cache-key=channels/guix --stats \
"$(top_srcdir)/build-aux/git-authenticate.scm" \ "$(channel_intro_commit)" "$(channel_intro_signer)"
"$(commit_v1_0_0)"
# Assuming Guix is already installed and the daemon is up and running, this # Assuming Guix is already installed and the daemon is up and running, this
# rule builds from $(srcdir), creating and building derivations. # rule builds from $(srcdir), creating and building derivations.

322
build-aux/git-authenticate.scm
View file

@ -1,322 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;;;
;;; Authenticate a range of commits.
;;;
(use-modules (git)
(guix base16)
(guix git)
(guix git-authenticate)
(guix i18n)
((guix openpgp)
#:select (openpgp-public-key-fingerprint
openpgp-format-fingerprint))
(guix progress)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 match)
(ice-9 format)
(ice-9 pretty-print))
(define %historical-committers
;; List of "historical" committers---people once authorized committers
;; before the '.guix-authorizations' file was created.
;;
;; These are the user names found on
;; <https://savannah.gnu.org/project/memberlist.php?group=guix> along with
;; the fingerprint of the signing (sub)key.
'(("andreas"
"AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3")
("ajgrf"
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")
("alexvong1995"
"306F CB8F 2C01 C25D 29D3 0556 61EF 502E F602 52F2")
("alezost"
"4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F")
("ambrevar"
"50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F")
("apteryx"
"27D5 86A4 F890 0854 329F F09F 1260 E464 82E6 3562")
("arunisaac"
"7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3")
("atheia"
;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948"
"9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00")
("bandali"
;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"
"39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2")
("bavier"
;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
"A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566")
("beffa"
"3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C")
("benwoodcroft"
"BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6")
("biscuolo"
"45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912")
("boskovits"
"7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21")
("brettgilio"
"DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE")
("carl"
;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999"
"09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5")
("cbaines"
"3E89 EEE7 458E 720D 9754 E0B2 5E28 A33B 0B84 F577")
("civodul"
"3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5")
("cwebber"
"510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3")
("dannym"
;; primary: "295A F991 6F46 F8A1 34B0 29DA 8086 3842 F0FE D83B"
"76CE C6B1 7274 B465 C02D B3D9 E71A 3554 2C30 BAA5")
("davexunit"
"B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3")
("davexunit (2nd)" ;FIXME: to be confirmed!
"8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807")
("daviwil"
"53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14")
("dvc"
"6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB")
("dvc (old)"
"5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23")
("efraim"
"A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351")
("efraim (old)"
"9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93")
("glv"
;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A"
"CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F")
("hoebjo"
"2219 43F4 9E9F 276F 9499 3382 BF28 6CB6 593E 5FFD")
("htgoebel"
"B943 509D 633E 80DD 27FC 4EED 634A 8DFF D3F6 31DF")
("ipetkov"
"7440 26BA 7CA3 C668 E940 1D53 0B43 1E98 3705 6942")
("iyzsong"
;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37"
"0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976")
;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html
("janneke (old)"
"DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99")
("janneke"
"1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273")
("jlicht"
;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0"
"E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025")
("jmd"
"8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3")
("kkebreau"
"83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D")
("leungbk"
"45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9")
("lfam"
;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0"
"B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08")
("lsl88"
"2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC")
("marusich"
"CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D")
("mbakke"
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")
("mhw"
"D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516")
("mothacehe"
"4008 6A7E 0252 9B60 31FB 8607 8354 7635 3176 9CA6")
("mthl"
"F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37")
("nckx"
;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
"F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79")
("nckx (revoked; not compromised)"
;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
"7E8F AED0 0944 78EF 72E6 4D16 D889 B0F0 18C5 493C")
("niedzejkob"
"E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564")
("ngz"
"ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D")
("pelzflorian"
"CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817")
("pgarlick"
;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600"
"C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A")
("phant0mas"
"3A86 380E 58A8 B942 8D39 60E1 327C 1EF3 8DF5 4C32")
("reepca"
"74D6 A930 F44B 9B84 9EA5 5606 C166 AA49 5F7F 189C")
("rekado"
"BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC")
("rhelling"
"0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36")
("roelj (old)"
"17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1")
("roelj"
;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020).
;; See <https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00070.html>.
"F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC")
("roptat (old)"
"B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C")
("roptat"
;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020). See
;; <https://lists.gnu.org/archive/html/guix-devel/2020-01/msg00499.html>.
"1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82")
("samplet"
;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004"
"A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59")
("sleep_walker"
"77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423")
("snape"
"F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7")
("steap"
"4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336")
("taylanub"
"9ADE 9ECF 2B19 C180 9C99 5CEA A1F4 CFCC 5283 6BAC")
;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html
("thomasd"
;; 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")
("toothbrush"
"D712 1D73 A40A 7264 9E43 ED7D F284 6B1A 0D32 C442")
("vagrantc"
"6580 7361 3BFC C5C7 E2E4 5D45 DC51 8FC8 7F97 16AA")
("wigust"
;; primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB"
"7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C")
("wingo"
"FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2")))
(define %historical-authorized-signing-keys
;; Fingerprint of historically authorized signing keys.
(map (match-lambda
((name fingerprint)
(base16-string->bytevector
(string-downcase (string-filter char-set:graphic fingerprint)))))
%historical-committers))
(define %use-historical-authorizations?
;; Whether to allow authentication of past commits using
;; %HISTORICAL-AUTHORIZED-SIGNING-KEYS for when '.guix-authorizations' was
;; missing.
(getenv "GUIX_USE_HISTORICAL_AUTHORIZATIONS"))
(define %introductory-commit
;; This is the commit that appears in the official 'guix' channel
;; introduction. XXX: Keep in sync with (guix channels)!
"9edb3f66fd807b096b48283debdcddccfea34bad")
(define %commits-with-bad-signature
;; Commits with a known-bad signature.
'("6a34f4ccc8a5d4a48e25ad3c9c512f8634928b91")) ;2016-12-29
(define %unsigned-commits
;; Commits lacking a signature.
'())
(define commit-short-id
(compose (cut string-take <> 7) oid->string commit-id))
;;;
;;; Entry point.
;;;
(define (git-authenticate args)
(define repository
(repository-open "."))
(let loop ((args args))
(match args
((_ start end)
(define start-commit
(commit-lookup repository
(string->oid (if %use-historical-authorizations?
start
%introductory-commit))))
(define end-commit
(commit-lookup repository (string->oid end)))
(define authenticated-commits
;; Previously-authenticated commits that don't need to be checked
;; again.
(filter-map (lambda (id)
(false-if-exception
(commit-lookup repository (string->oid id))))
(previously-authenticated-commits "channels/guix")))
(define commits
;; Commits to authenticate, excluding the closure of
;; AUTHENTICATED-COMMITS.
(commit-difference end-commit start-commit
authenticated-commits))
(define reporter
(progress-reporter/bar (length commits)))
(define historical-authorizations
;; List of authorizations in effect before '.guix-authorizations' was
;; introduced. By default, assume there were no authorizations; this
;; is what 'guix pull' does.
(if %use-historical-authorizations?
%historical-authorized-signing-keys
'()))
(format #t (G_ "Authenticating ~a to ~a (~a commits)...~%")
(commit-short-id start-commit)
(commit-short-id end-commit)
(length commits))
(let ((stats (call-with-progress-reporter reporter
(lambda (report)
(authenticate-commits repository commits
#:default-authorizations
historical-authorizations
#:report-progress report)))))
(cache-authenticated-commit "channels/guix"
(oid->string (commit-id end-commit)))
(unless (null? stats)
(format #t (G_ "Signing statistics:~%"))
(for-each (match-lambda
((signer . count)
(format #t " ~a ~10d~%"
(openpgp-format-fingerprint
(openpgp-public-key-fingerprint signer))
count)))
(sort stats
(match-lambda*
(((_ . count1) (_ . count2))
(> count1 count2))))))))
((command start)
(let* ((head (repository-head repository))
(end (reference-target head)))
(loop (list command start (oid->string end)))))
(_
(format (current-error-port)
(G_ "Usage: git-authenticate START [END]
Authenticate commits START to END or the current head.\n"))))))

37
doc/contributing.texi
View file

@ -42,30 +42,27 @@ git clone https://git.savannah.gnu.org/git/guix.git
@cindex authentication, of a Guix checkout @cindex authentication, of a Guix checkout
How do you ensure that you obtained a genuine copy of the repository? How do you ensure that you obtained a genuine copy of the repository?
Guix itself provides a tool to @dfn{authenticate} your checkout, but you To do that, run @command{guix git authenticate}, passing if the commit
must first make sure this tool is genuine in order to ``bootstrap'' the and OpenPGP fingerprint of the @dfn{channel introduction}
trust chain. To do that, run: (@pxref{Invoking guix git authenticate}):
@c XXX: Adjust instructions when there's a known tag to start from. @c The commit and fingerprint below must match those of the channel
@c introduction in '%default-channels'.
@example @example
git verify-commit `git log --format=%H build-aux/git-authenticate.scm` guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \
@end example "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"
The output must look something like:
@example
gpg: Signature made Fri 27 Dec 2019 01:27:41 PM CET
gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
@dots{}
gpg: Signature made Fri 27 Dec 2019 01:25:22 PM CET
gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
@dots{}
@end example @end example
@noindent @noindent
... meaning that changes to this file are all signed with key This command completes with exit code zero on success; it prints an
@code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (you may need to fetch error message and exits with a non-zero code otherwise.
this key from a key server, if you have not done it yet).
As you can see, there is a chicken-and-egg problem: you first need to
have Guix installed. Typically you would install Guix System
(@pxref{System Installation}) or Guix on top of another distro
(@pxref{Binary Installation}); in either case, you would verify the
OpenPGP signature on the installation medium. This ``bootstraps'' the
trust chain.
The easiest way to set up a development environment for Guix is, of The easiest way to set up a development environment for Guix is, of
course, by using Guix! The following command starts a new shell where course, by using Guix! The following command starts a new shell where
@ -277,7 +274,7 @@ trigger string @code{origin...}, which can be expanded further. The
@cindex insert or update copyright @cindex insert or update copyright
@cindex @code{M-x guix-copyright} @cindex @code{M-x guix-copyright}
@cindex @code{M-x copyright-update} @cindex @code{M-x copyright-update}
Additionaly we provide insertion and automatic update of a copyright in We additionally provide insertion and automatic update of a copyright in
@file{etc/copyright.el}. You may want to set your full name, mail, and @file{etc/copyright.el}. You may want to set your full name, mail, and
load a file. load a file.

53
doc/guix-cookbook.texi
View file

@ -15,6 +15,7 @@ Copyright @copyright{} 2020 Oleg Pykhalov@*
Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Matthew Brooks@*
Copyright @copyright{} 2020 Marcin Karpezo@* Copyright @copyright{} 2020 Marcin Karpezo@*
Copyright @copyright{} 2020 Brice Waegeneire@* Copyright @copyright{} 2020 Brice Waegeneire@*
Copyright @copyright{} 2020 André Batista@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -109,8 +110,8 @@ Let's get started!
Guix uses the Guile implementation of Scheme. To start playing with the Guix uses the Guile implementation of Scheme. To start playing with the
language, install it with @code{guix install guile} and start a 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, @dfn{REPL}---short for @uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop,
REPL} by running @code{guile} from the command line. @dfn{read-eval-print loop}}---by running @code{guile} from the command line.
Alternatively you can also run @code{guix environment --ad-hoc guile -- guile} Alternatively you can also run @code{guix environment --ad-hoc guile -- guile}
if you'd rather not have Guile installed in your user profile. if you'd rather not have Guile installed in your user profile.
@ -118,7 +119,7 @@ if you'd rather not have Guile installed in your user profile.
In the following examples, lines show what you would type at the REPL; In the following examples, lines show what you would type at the REPL;
lines starting with ``@result{}'' show evaluation results, while lines lines starting with ``@result{}'' show evaluation results, while lines
starting with ``@print{}'' show things that get printed. @xref{Using Guile starting with ``@print{}'' show things that get printed. @xref{Using Guile
Interactively,,, guile, GNU Guile Reference Manual}), for more details on the Interactively,,, guile, GNU Guile Reference Manual}, for more details on the
REPL. REPL.
@itemize @itemize
@ -843,12 +844,32 @@ tags, so if the @code{version} is tagged, then it can be used directly. Sometim
the tag is prefixed with a @code{v}, in which case you'd use @code{(commit (string-append the tag is prefixed with a @code{v}, in which case you'd use @code{(commit (string-append
"v" version))}. "v" version))}.
To ensure that the source code from the Git repository is stored in a unique To ensure that the source code from the Git repository is stored in a
directory with a readable name we use @code{(file-name (git-file-name name directory with a descriptive name, we use @code{(file-name (git-file-name name
version))}. version))}.
Note that there is also a @code{git-version} procedure that can be used to derive the The @code{git-version} procedure can be used to derive the
version when packaging programs for a specific commit. version when packaging programs for a specific commit, following the
Guix contributor guidelines (@pxref{Version Numbers,,, guix, GNU Guix
Reference Manual}).
How does one obtain the @code{sha256} hash that's in there, you ask? By
invoking @command{guix hash} on a checkout of the desired commit, along
these lines:
@example
git clone https://github.com/libgit2/libgit2/
cd libgit2
git checkout v0.26.6
guix hash -rx .
@end example
@command{guix hash -rx} computes a SHA256 hash over the whole directory,
excluding the @file{.git} sub-directory (@pxref{Invoking guix hash,,,
guix, GNU Guix Reference Manual}).
In the future, @command{guix download} will hopefully be able to do
these steps for you, just like it does for regular downloads.
@subsubsection Snippets @subsubsection Snippets
@ -1267,7 +1288,7 @@ version or compilation options.
@subsection Getting help @subsection Getting help
Sadly, some applications can be tough to package. Sometimes they need a patch to 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. work with the non-standard file system hierarchy enforced by the store.
Sometimes the tests won't run properly. (They can be skipped but this is not 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. recommended.) Other times the resulting package won't be reproducible.
@ -1480,7 +1501,7 @@ custom kernel:
@lisp @lisp
(define %macbook41-full-config (define %macbook41-full-config
(append %macbook41-config-options (append %macbook41-config-options
%filesystems %file-systems
%efi-support %efi-support
%emulation %emulation
(@@@@ (gnu packages linux) %default-extra-linux-options))) (@@@@ (gnu packages linux) %default-extra-linux-options)))
@ -1496,8 +1517,8 @@ custom kernel:
#:extra-options %macbook41-config-options)) #:extra-options %macbook41-config-options))
@end lisp @end lisp
In the above example @code{%filesystems} is a collection of flags enabling In the above example @code{%file-systems} is a collection of flags enabling
different filesystem support, @code{%efi-support} enables EFI support and different file system support, @code{%efi-support} enables EFI support and
@code{%emulation} enables a x86_64-linux machine to act in 32-bit mode also. @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 @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. added in since they were replaced in the @code{extra-options} keyword.
@ -1561,7 +1582,7 @@ The second way to setup the kernel configuration makes more use of Guix's
features and allows you to share configuration segments between different features and allows you to share configuration segments between different
kernels. For example, all machines using EFI to boot have a number of EFI 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 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 share a list of file systems 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 see at a glance what features are enabled and to make sure you don't have
features in one kernel but missing in another. features in one kernel but missing in another.
@ -1799,10 +1820,16 @@ HTTP/HTTPS will get proxied; FTP, Git protocol, SSH, etc connections
will still go through the clearnet. Again, this configuration isn't will still go through the clearnet. Again, this configuration isn't
foolproof some of your traffic won't get routed by Tor at all. Use it foolproof some of your traffic won't get routed by Tor at all. Use it
at your own risk. at your own risk.
Also note that the procedure described here applies only to package
substitution. When you update your guix distribution with
@command{guix pull}, you still need to use @command{torsocks} if
you want to route the connection to guix's git repository servers
through Tor.
@end quotation @end quotation
Guix's substitute server is available as a Onion service, if you want Guix's substitute server is available as a Onion service, if you want
to use it to get your substitutes from Tor configure your system as to use it to get your substitutes through Tor configure your system as
follow: follow:
@lisp @lisp

1072
doc/guix.texi
View file

File diff suppressed because it is too large Load diff

8
etc/completion/bash/guix
View file

@ -222,6 +222,14 @@ _guix_complete ()
else else
_guix_complete_available_package "$word_at_point" _guix_complete_available_package "$word_at_point"
fi fi
elif _guix_is_command "environment"
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
then
_guix_complete_file
else
_guix_complete_available_package "$word_at_point"
fi
elif _guix_is_command "download" elif _guix_is_command "download"
then then
_guix_complete_file _guix_complete_file

12
etc/guix-install.sh
View file

@ -111,7 +111,7 @@ chk_gpg_keyring()
# systems where gpg has never been used, causing errors and confusion. # systems where gpg has never been used, causing errors and confusion.
gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || (
_err "${ERR}Missing OpenPGP public key. Fetch it with this command:" _err "${ERR}Missing OpenPGP public key. Fetch it with this command:"
echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | sudo -i gpg --import -"
exit 1 exit 1
) )
} }
@ -350,6 +350,8 @@ sys_enable_guix_daemon()
cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \
/etc/systemd/system/; /etc/systemd/system/;
chmod 664 /etc/systemd/system/gnu-store.mount; chmod 664 /etc/systemd/system/gnu-store.mount;
systemctl daemon-reload &&
systemctl enable gnu-store.mount;
fi fi
cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \
@ -367,8 +369,8 @@ sys_enable_guix_daemon()
fi; fi;
systemctl daemon-reload && systemctl daemon-reload &&
systemctl start gnu-store.mount guix-daemon && systemctl enable guix-daemon &&
systemctl enable gnu-store.mount guix-daemon; } && systemctl start guix-daemon; } &&
_msg "${PAS}enabled Guix daemon via systemd" _msg "${PAS}enabled Guix daemon via systemd"
;; ;;
sysv-init) sysv-init)
@ -416,6 +418,7 @@ sys_authorize_build_farms()
sys_create_init_profile() sys_create_init_profile()
{ # Create /etc/profile.d/guix.sh for better desktop integration { # Create /etc/profile.d/guix.sh for better desktop integration
# This will not take effect until the next shell or desktop session!
[ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case
cat <<"EOF" > /etc/profile.d/guix.sh cat <<"EOF" > /etc/profile.d/guix.sh
# _GUIX_PROFILE: `guix pull` profile # _GUIX_PROFILE: `guix pull` profile
@ -505,6 +508,9 @@ main()
_msg "${PAS}Guix has successfully been installed!" _msg "${PAS}Guix has successfully been installed!"
_msg "${INF}Run 'info guix' to read the manual." _msg "${INF}Run 'info guix' to read the manual."
# Required to source /etc/profile in desktop environments.
_msg "${INF}Please log out and back in to complete the installation."
} }
main "$@" main "$@"

179
etc/historical-authorizations Normal file
View file

@ -0,0 +1,179 @@
;; List of "historical" committers---people once authorized committers before
;; the '.guix-authorizations' file was created.
;;
;; This file is provided for historical and auditing purposes. It is known
;; good starting at least at 'v1.0.0'.
;;
;; The format is the same as for '.guix-authorizations'. User names are those
;; found on <https://savannah.gnu.org/project/memberlist.php?group=guix> along
;; with the fingerprint of the signing (sub)key.
(authorizations
(version 0)
(("AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3"
(name "andreas"))
("2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"
(name "ajgrf"))
("306F CB8F 2C01 C25D 29D3 0556 61EF 502E F602 52F2"
(name "alexvong1995"))
("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F"
(name "alezost"))
("50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F"
(name "ambrevar"))
("27D5 86A4 F890 0854 329F F09F 1260 E464 82E6 3562"
(name "apteryx"))
("7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3"
(name "arunisaac"))
(;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948"
"9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00"
(name "atheia"))
(;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"
"39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2"
(name "bandali"))
(;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
"A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566"
(name "bavier"))
("3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C"
(name "beffa"))
("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6"
(name "benwoodcroft"))
("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912"
(name "biscuolo"))
("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21"
(name "boskovits"))
("DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE"
(name "brettgilio"))
(;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999"
"09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5"
(name "carl"))
("3E89 EEE7 458E 720D 9754 E0B2 5E28 A33B 0B84 F577"
(name "cbaines"))
("3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5"
(name "civodul"))
("510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3"
(name "cwebber"))
(;; primary: "295A F991 6F46 F8A1 34B0 29DA 8086 3842 F0FE D83B"
"76CE C6B1 7274 B465 C02D B3D9 E71A 3554 2C30 BAA5"
(name "dannym"))
("B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3"
(name "davexunit"))
( ;FIXME: to be confirmed!
"8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807"
(name "davexunit (2nd)"))
("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14"
(name "daviwil"))
("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB"
(name "dvc"))
("5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23"
(name "dvc (old)"))
("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351"
(name "efraim"))
("9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93"
(name "efraim (old)"))
(;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A"
"CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F"
(name "glv"))
("2219 43F4 9E9F 276F 9499 3382 BF28 6CB6 593E 5FFD"
(name "hoebjo"))
("B943 509D 633E 80DD 27FC 4EED 634A 8DFF D3F6 31DF"
(name "htgoebel"))
("7440 26BA 7CA3 C668 E940 1D53 0B43 1E98 3705 6942"
(name "ipetkov"))
(;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37"
"0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976"
(name "iyzsong"))
;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html
("DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99"
(name "janneke (old)"))
("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273"
(name "janneke"))
(;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0"
"E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025"
(name "jlicht"))
("8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3"
(name "jmd"))
("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D"
(name "kkebreau"))
("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9"
(name "leungbk"))
(;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0"
"B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08"
(name "lfam"))
("2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC"
(name "lsl88"))
("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D"
(name "marusich"))
("BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"
(name "mbakke"))
("D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516"
(name "mhw"))
("4008 6A7E 0252 9B60 31FB 8607 8354 7635 3176 9CA6"
(name "mothacehe"))
("F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37"
(name "mthl"))
(;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
"F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79"
(name "nckx"))
(;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
"7E8F AED0 0944 78EF 72E6 4D16 D889 B0F0 18C5 493C"
(name "nckx (revoked; not compromised)"))
("E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"
(name "niedzejkob"))
("ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D"
(name "ngz"))
("CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817"
(name "pelzflorian"))
(;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600"
"C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A"
(name "pgarlick"))
("3A86 380E 58A8 B942 8D39 60E1 327C 1EF3 8DF5 4C32"
(name "phant0mas"))
("74D6 A930 F44B 9B84 9EA5 5606 C166 AA49 5F7F 189C"
(name "reepca"))
("BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC"
(name "rekado"))
("0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36"
(name "rhelling"))
("17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1"
(name "roelj (old)"))
(;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020).
;; See <https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00070.html>.
"F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC"
(name "roelj"))
("B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C"
(name "roptat (old)"))
(;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020). See
;; <https://lists.gnu.org/archive/html/guix-devel/2020-01/msg00499.html>.
"1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82"
(name "roptat"))
(;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004"
"A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59"
(name "samplet"))
("77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423"
(name "sleep_walker"))
("F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7"
(name "snape"))
("4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336"
(name "steap"))
("9ADE 9ECF 2B19 C180 9C99 5CEA A1F4 CFCC 5283 6BAC"
(name "taylanub"))
;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html
(;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD"
"3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726"
(name "thomasd"))
("A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08"
(name "thomasd (old)"))
("D712 1D73 A40A 7264 9E43 ED7D F284 6B1A 0D32 C442"
(name "toothbrush"))
("6580 7361 3BFC C5C7 E2E4 5D45 DC51 8FC8 7F97 16AA"
(name "vagrantc"))
(;; primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB"
"7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"
(name "wigust"))
("FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2"
(name "wingo"))))

47
etc/news.scm
View file

@ -13,6 +13,53 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f")
(title (en "New @command{guix git authenticate} command")
(de "Neuer Befehl @command{guix git authenticate}")
(fr "Nouvelle commande @command{guix git authenticate}"))
(body
(en "The new @command{guix git authenticate} command authenticates a
Git repository by verifying commit signatures and ensuring they all come from
authorized parties, exactly like @command{guix pull} now does.
This command is primarily useful to developers of channels. It allows them to
ensure, before pushing, that the channel only contains commits signed with
authorized keys. But this command is also useful anytime you use Git and want
to allow people to authenticate code fetched from your repository.
Run @command{info \"(guix) Invoking guix git authenticate\"} for more info,
and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on
these mechanisms.")
(de "Mit dem neuen Befehl @command{guix git authenticate} können Sie
ein Git-Repository authentifizieren. Dazu werden alle Commit-Signaturen
verifiziert und geprüft, dass jede von einer autorisierten Quelle kommt, genau
wie es @command{guix pull} nun tut.
Dieser Befehl hilft in erster Linie den Entwicklern von Kanälen. Mit ihm kann
vor einem Push sichergestellt werden, dass der Kanal nur Commits enthält, die
mit autorisierten Schlüsseln signiert worden sind. Aber der Befehl kann auch
helfen, wann immer Sie Git verwenden und ermöglichen wollen, dass Nutzer von
Ihrem Repository geladenen Code authentifizieren können.
Führen Sie @command{info \"(guix) Invoking guix git authenticate\"} aus, um
mehr Informationen zu erhalten, und lesen Sie
@uref{https://guix.gnu.org/blog/2020/securing-updates/} für die Details dieser
Mechanismen.")
(fr "La nouvelle commande @command{guix git authenticate} authentifie
un dépôt Git en vérifiant les signatures sur les changements (@i{commits}) et
en s'assurant qu'elles sont autorisées, exactement comme @command{guix pull}
le fait désormais.
Cette commande est avant tout utile aux personnes développant un canal. Elle
leur permet de s'assurer, avant de pousser des changements, que le canal ne
contient que des changements signés par des clefs autorisées. Mais cette
commande peut aussi s'avérer utile dès que tu veux utiliser Git et permettre
aux autres d'authentifier le code récupéré depuis ton dépôt.
Lance @command{info \"(guix.fr) Invoking guix git authenticate\"} pour plus
d'informations. Voir @uref{https://guix.gnu.org/blog/2020/securing-updates/}
pour en savoir plus sur ces mécanismes.")))
(entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835")
(title (en "@command{guix pull} authenticates channels") (title (en "@command{guix pull} authenticates channels")
(de "@command{guix pull} authentifiziert Kanäle") (de "@command{guix pull} authentifiziert Kanäle")

0
etc/substitutes/berlin.guixsd.org.pub → etc/substitutes/berlin.guix.gnu.org.pub
View file

2
etc/substitutes/ci.guix.gnu.org.pub
View file

@ -1 +1 @@
berlin.guixsd.org.pub berlin.guix.gnu.org.pub

2
etc/substitutes/ci.guix.info.pub
View file

@ -1 +1 @@
berlin.guixsd.org.pub berlin.guix.gnu.org.pub

20
gnu/build/hurd-boot.scm
View file

@ -191,7 +191,8 @@ set."
"10.0.2.15" ;the default QEMU guest IP "10.0.2.15" ;the default QEMU guest IP
"--netmask" "255.255.255.0" "--netmask" "255.255.255.0"
"--gateway" "10.0.2.2" "--gateway" "10.0.2.2"
"--ipv6" "/servers/socket/16")))) "--ipv6" "/servers/socket/16"))
("proc" ("/hurd/procfs" "--stat-mode=444"))))
(define devices (define devices
'(("dev/full" ("/hurd/null" "--full") #o666) '(("dev/full" ("/hurd/null" "--full") #o666)
@ -232,17 +233,22 @@ set."
#o666))) #o666)))
(for-each scope-set-translator servers) (for-each scope-set-translator servers)
(mkdir* (scope "dev/vcs/1")) (mkdir* "dev/vcs/1")
(mkdir* (scope "dev/vcs/2")) (mkdir* "dev/vcs/2")
(mkdir* (scope "dev/vcs/2")) (mkdir* "dev/vcs/2")
(rename-file (scope "/dev/console") (scope "/dev/console-")) (rename-file (scope "dev/console") (scope "dev/console-"))
(for-each scope-set-translator devices) (for-each scope-set-translator devices)
(false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom"))) (false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom")))
(mkdir* (scope "dev/fd")) (mkdir* "dev/fd")
(false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin")))
(false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout")))
(false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
;; Make sure /etc/mtab is a symlink to /proc/mounts.
(false-if-exception (delete-file (scope "etc/mtab")))
(mkdir* (scope "etc"))
(symlink "/proc/mounts" (scope "etc/mtab")))
(define* (boot-hurd-system #:key (on-error 'debug)) (define* (boot-hurd-system #:key (on-error 'debug))

19
gnu/build/image.scm
View file

@ -77,7 +77,7 @@ take the partition metadata size into account, take a 25% margin."
(uuid (partition-uuid partition)) (uuid (partition-uuid partition))
(journal-options "lazy_itable_init=1,lazy_journal_init=1")) (journal-options "lazy_itable_init=1,lazy_journal_init=1"))
(apply invoke (apply invoke
`("mke2fs" "-t" ,fs "-d" ,root `("fakeroot" "mke2fs" "-t" ,fs "-d" ,root
"-L" ,label "-U" ,(uuid->string uuid) "-L" ,label "-U" ,(uuid->string uuid)
"-E" ,(format #f "root_owner=~a:~a,~a" "-E" ,(format #f "root_owner=~a:~a,~a"
owner-uid owner-gid journal-options) owner-uid owner-gid journal-options)
@ -93,7 +93,8 @@ take the partition metadata size into account, take a 25% margin."
"Handle the creation of VFAT partition images. See 'make-partition-image'." "Handle the creation of VFAT partition images. See 'make-partition-image'."
(let ((size (partition-size partition)) (let ((size (partition-size partition))
(label (partition-label partition))) (label (partition-label partition)))
(invoke "mkdosfs" "-n" label "-C" target "-F" "16" "-S" "1024" (invoke "fakeroot" "mkdosfs" "-n" label "-C" target
"-F" "16" "-S" "1024"
(size-in-kib (size-in-kib
(if (eq? size 'guess) (if (eq? size 'guess)
(estimate-partition-size root) (estimate-partition-size root)
@ -130,15 +131,18 @@ given CONFIG file."
(define* (register-closure prefix closure (define* (register-closure prefix closure
#:key #:key
(deduplicate? #t) (reset-timestamps? #t) (deduplicate? #t) (reset-timestamps? #t)
(schema (sql-schema))) (schema (sql-schema))
(wal-mode? #t))
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the "Register CLOSURE in PREFIX, where PREFIX is the directory name of the
target store and CLOSURE is the name of a file containing a reference graph as target store and CLOSURE is the name of a file containing a reference graph as
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is
true, reset timestamps on store files and, if DEDUPLICATE? is true, true, reset timestamps on store files and, if DEDUPLICATE? is true,
deduplicates files common to CLOSURE and the rest of PREFIX." deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE?
to call-with-database."
(let ((items (call-with-input-file closure read-reference-graph))) (let ((items (call-with-input-file closure read-reference-graph)))
(parameterize ((sql-schema schema)) (parameterize ((sql-schema schema))
(with-database (store-database-file #:prefix prefix) db (with-database (store-database-file #:prefix prefix) db
#:wal-mode? wal-mode?
(register-items db items (register-items db items
#:prefix prefix #:prefix prefix
#:deduplicate? deduplicate? #:deduplicate? deduplicate?
@ -163,6 +167,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX."
(register-closures? #t) (register-closures? #t)
system-directory system-directory
make-device-nodes make-device-nodes
(wal-mode? #t)
#:allow-other-keys) #:allow-other-keys)
"Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to
install the bootloader configuration. install the bootloader configuration.
@ -170,7 +175,8 @@ install the bootloader configuration.
If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store. If If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store. If
DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the
rest of the store when registering the closures. SYSTEM-DIRECTORY is the name rest of the store when registering the closures. SYSTEM-DIRECTORY is the name
of the directory of the 'system' derivation." of the directory of the 'system' derivation. Pass WAL-MODE? to
register-closure."
(populate-root-file-system system-directory root) (populate-root-file-system system-directory root)
(populate-store references-graphs root) (populate-store references-graphs root)
@ -183,7 +189,8 @@ of the directory of the 'system' derivation."
(register-closure root (register-closure root
closure closure
#:reset-timestamps? #t #:reset-timestamps? #t
#:deduplicate? deduplicate?)) #:deduplicate? deduplicate?
#:wal-mode? wal-mode?))
references-graphs)) references-graphs))
(when bootloader-installer (when bootloader-installer

63
gnu/ci.scm
View file

@ -53,6 +53,7 @@
#:use-module (gnu system image) #:use-module (gnu system image)
#:use-module (gnu system vm) #:use-module (gnu system vm)
#:use-module (gnu system install) #:use-module (gnu system install)
#:use-module (gnu system images hurd)
#:use-module (gnu tests) #:use-module (gnu tests)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -185,18 +186,21 @@ SYSTEM."
(remove (either from-32-to-64? same? pointless?) (remove (either from-32-to-64? same? pointless?)
%cross-targets))) %cross-targets)))
(define %guixsd-supported-systems ;; Architectures that are able to build or cross-build Guix System images.
'("x86_64-linux" "i686-linux" "armhf-linux")) ;; This does not mean that other architectures are not supported, only that
;; they are often not fast enough to support Guix System images building.
(define %guix-system-supported-systems
'("x86_64-linux" "i686-linux"))
(define %u-boot-systems (define %guix-system-images
'("armhf-linux")) (list hurd-barebones-disk-image))
(define (qemu-jobs store system) (define (image-jobs store system)
"Return a list of jobs that build QEMU images for SYSTEM." "Return a list of jobs that build images for SYSTEM."
(define (->alist drv) (define (->alist drv)
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(description . "Stand-alone QEMU image of the GNU system") (description . "Stand-alone image of the GNU system")
(long-description . "This is a demo stand-alone QEMU image of the GNU (long-description . "This is a demo stand-alone image of the GNU
system.") system.")
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
(max-silent-time . 600) (max-silent-time . 600)
@ -211,29 +215,32 @@ system.")
(parameterize ((%graft? #f)) (parameterize ((%graft? #f))
(->alist drv)))))) (->alist drv))))))
(define (build-image image)
(run-with-store store
(mbegin %store-monad
(set-guile-for-build (default-guile))
(lower-object (system-image image)))))
(define MiB (define MiB
(expt 2 20)) (expt 2 20))
(if (member system %guixsd-supported-systems) (if (member system %guix-system-supported-systems)
(list (->job 'usb-image `(,(->job 'usb-image
(run-with-store store (build-image
(mbegin %store-monad
(set-guile-for-build (default-guile))
(lower-object
(system-image
(image (image
(inherit efi-disk-image) (inherit efi-disk-image)
(size (* 1500 MiB)) (operating-system installation-os))))
(operating-system installation-os))))))) ,(->job 'iso9660-image
(->job 'iso9660-image (build-image
(run-with-store store
(mbegin %store-monad
(set-guile-for-build (default-guile))
(lower-object
(system-image
(image (image
(inherit iso9660-image) (inherit iso9660-image)
(operating-system installation-os)))))))) (operating-system installation-os))))
;; Only cross-compile Guix System images from x86_64-linux for now.
,@(if (string=? system "x86_64-linux")
(map (lambda (image)
(->job (image-name image) (build-image image)))
%guix-system-images)
'()))
'())) '()))
(define channel-build-system (define channel-build-system
@ -305,11 +312,7 @@ system.")
"." system)))) "." system))))
(cons name (test->thunk test)))) (cons name (test->thunk test))))
(if (and (member system %guixsd-supported-systems) (if (member system %guix-system-supported-systems)
;; XXX: Our build farm has too few ARMv7 machines and they are very
;; slow, so skip system tests there.
(not (string=? system "armhf-linux")))
;; Override the value of 'current-guix' used by system tests. Using a ;; Override the value of 'current-guix' used by system tests. Using a
;; channel instance makes tests that rely on 'current-guix' less ;; channel instance makes tests that rely on 'current-guix' less
;; expensive. It also makes sure we get a valid Guix package when this ;; expensive. It also makes sure we get a valid Guix package when this
@ -486,7 +489,7 @@ Return #f if no such checkout is found."
(package->job store package (package->job store package
system)))) system))))
(append (filter-map job all) (append (filter-map job all)
(qemu-jobs store system) (image-jobs store system)
(system-test-jobs store system (system-test-jobs store system
#:source source #:source source
#:commit commit) #:commit commit)

2
gnu/image.scm
View file

@ -67,6 +67,8 @@
(define-record-type* <image> (define-record-type* <image>
image make-image image make-image
image? image?
(name image-name ;symbol
(default #f))
(format image-format) ;symbol (format image-format) ;symbol
(target image-target (target image-target
(default #f)) (default #f))

3
gnu/installer.scm
View file

@ -440,5 +440,6 @@ selected keymap."
;; some reason, unicode support is not correctly installed ;; some reason, unicode support is not correctly installed
;; when calling this in 'installer-builder'. ;; when calling this in 'installer-builder'.
(setenv "LANG" "en_US.UTF-8") (setenv "LANG" "en_US.UTF-8")
(execl #$(program-file "installer-real" installer-builder) (execl #$(program-file "installer-real" installer-builder
#:guile guile-3.0-latest)
"installer-real")))) "installer-real"))))

74
gnu/local.mk
View file

@ -1,6 +1,6 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Andreas Enge <andreas@enge.fr>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
@ -24,7 +24,7 @@
# Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
# Copyright © 2019 Evan Straw <evan.straw99@gmail.com> # Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
# Copyright © 2019 Brett Gilio <brettg@gnu.org> # Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
# Copyright © 2019 Amin Bandali <bandali@gnu.org> # Copyright © 2019 Amin Bandali <bandali@gnu.org>
# Copyright © 2020 Brendan Tildesley <mail@brendan.scot> # Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
# Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> # Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@ -359,9 +359,11 @@ GNU_SYSTEM_MODULES = \
%D%/packages/maths.scm \ %D%/packages/maths.scm \
%D%/packages/matrix.scm \ %D%/packages/matrix.scm \
%D%/packages/maven.scm \ %D%/packages/maven.scm \
%D%/packages/maven-parent-pom.scm \
%D%/packages/mc.scm \ %D%/packages/mc.scm \
%D%/packages/mcrypt.scm \ %D%/packages/mcrypt.scm \
%D%/packages/medical.scm \ %D%/packages/medical.scm \
%D%/packages/mercury.scm \
%D%/packages/mes.scm \ %D%/packages/mes.scm \
%D%/packages/messaging.scm \ %D%/packages/messaging.scm \
%D%/packages/mingw.scm \ %D%/packages/mingw.scm \
@ -435,6 +437,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/pth.scm \ %D%/packages/pth.scm \
%D%/packages/pulseaudio.scm \ %D%/packages/pulseaudio.scm \
%D%/packages/pumpio.scm \ %D%/packages/pumpio.scm \
%D%/packages/presentation.scm \
%D%/packages/pretty-print.scm \ %D%/packages/pretty-print.scm \
%D%/packages/protobuf.scm \ %D%/packages/protobuf.scm \
%D%/packages/pure.scm \ %D%/packages/pure.scm \
@ -504,6 +507,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/stalonetray.scm \ %D%/packages/stalonetray.scm \
%D%/packages/statistics.scm \ %D%/packages/statistics.scm \
%D%/packages/stb.scm \ %D%/packages/stb.scm \
%D%/packages/stenography.scm \
%D%/packages/storage.scm \ %D%/packages/storage.scm \
%D%/packages/suckless.scm \ %D%/packages/suckless.scm \
%D%/packages/swig.scm \ %D%/packages/swig.scm \
@ -538,6 +542,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/vim.scm \ %D%/packages/vim.scm \
%D%/packages/virtualization.scm \ %D%/packages/virtualization.scm \
%D%/packages/visidata.scm \ %D%/packages/visidata.scm \
%D%/packages/vlang.scm \
%D%/packages/vnc.scm \ %D%/packages/vnc.scm \
%D%/packages/vpn.scm \ %D%/packages/vpn.scm \
%D%/packages/vulkan.scm \ %D%/packages/vulkan.scm \
@ -583,6 +588,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/docker.scm \ %D%/services/docker.scm \
%D%/services/authentication.scm \ %D%/services/authentication.scm \
%D%/services/games.scm \ %D%/services/games.scm \
%D%/services/ganeti.scm \
%D%/services/getmail.scm \ %D%/services/getmail.scm \
%D%/services/guix.scm \ %D%/services/guix.scm \
%D%/services/hurd.scm \ %D%/services/hurd.scm \
@ -598,6 +604,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/nix.scm \ %D%/services/nix.scm \
%D%/services/nfs.scm \ %D%/services/nfs.scm \
%D%/services/pam-mount.scm \ %D%/services/pam-mount.scm \
%D%/services/science.scm \
%D%/services/security-token.scm \ %D%/services/security-token.scm \
%D%/services/shepherd.scm \ %D%/services/shepherd.scm \
%D%/services/sound.scm \ %D%/services/sound.scm \
@ -631,9 +638,9 @@ GNU_SYSTEM_MODULES = \
%D%/system/uuid.scm \ %D%/system/uuid.scm \
%D%/system/vm.scm \ %D%/system/vm.scm \
\ \
%D%/system/images/hurd.scm \
\
%D%/machine.scm \ %D%/machine.scm \
%D%/machine/digital-ocean.scm \
%D%/machine/ssh.scm \
\ \
%D%/build/accounts.scm \ %D%/build/accounts.scm \
%D%/build/activation.scm \ %D%/build/activation.scm \
@ -658,6 +665,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/desktop.scm \ %D%/tests/desktop.scm \
%D%/tests/dict.scm \ %D%/tests/dict.scm \
%D%/tests/docker.scm \ %D%/tests/docker.scm \
%D%/tests/ganeti.scm \
%D%/tests/guix.scm \ %D%/tests/guix.scm \
%D%/tests/monitoring.scm \ %D%/tests/monitoring.scm \
%D%/tests/nfs.scm \ %D%/tests/nfs.scm \
@ -667,6 +675,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/mail.scm \ %D%/tests/mail.scm \
%D%/tests/messaging.scm \ %D%/tests/messaging.scm \
%D%/tests/networking.scm \ %D%/tests/networking.scm \
%D%/tests/package-management.scm \
%D%/tests/reconfigure.scm \ %D%/tests/reconfigure.scm \
%D%/tests/rsync.scm \ %D%/tests/rsync.scm \
%D%/tests/security-token.scm \ %D%/tests/security-token.scm \
@ -711,6 +720,14 @@ INSTALLER_MODULES = \
%D%/installer/newt/welcome.scm \ %D%/installer/newt/welcome.scm \
%D%/installer/newt/wifi.scm %D%/installer/newt/wifi.scm
if HAVE_GUILE_SSH
GNU_SYSTEM_MODULES += \
%D%/machine/digital-ocean.scm \
%D%/machine/ssh.scm
endif HAVE_GUILE_SSH
# Always ship the installer modules but compile them only when # Always ship the installer modules but compile them only when
# ENABLE_INSTALLER is true. # ENABLE_INSTALLER is true.
if ENABLE_INSTALLER if ENABLE_INSTALLER
@ -882,6 +899,9 @@ dist_patch_DATA = \
%D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \
%D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/ecl-16-format-directive-limit.patch \
%D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \
%D%/packages/patches/ecl-16-libffi.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
@ -890,6 +910,7 @@ dist_patch_DATA = \
%D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \
%D%/packages/patches/emacs27-exec-path.patch \ %D%/packages/patches/emacs27-exec-path.patch \
%D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
@ -897,6 +918,7 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-patch-server-functions.patch \
%D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
@ -926,13 +948,21 @@ dist_patch_DATA = \
%D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \
%D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
%D%/packages/patches/fontconfig-hurd-path-max.patch \ %D%/packages/patches/fontconfig-hurd-path-max.patch \
%D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/ganeti-deterministic-manual.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
%D%/packages/patches/ganeti-drbd-compat.patch \
%D%/packages/patches/ganeti-haskell-pythondir.patch \
%D%/packages/patches/ganeti-os-disk-size.patch \
%D%/packages/patches/ganeti-preserve-PYTHONPATH.patch \
%D%/packages/patches/ganeti-shepherd-master-failover.patch \
%D%/packages/patches/ganeti-shepherd-support.patch \
%D%/packages/patches/gash-utils-ls-test.patch \
%D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \
@ -970,6 +1000,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gd-brect-bounds.patch \
%D%/packages/patches/gdb-hurd.patch \
%D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
@ -1046,6 +1077,7 @@ dist_patch_DATA = \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \ %D%/packages/patches/grocsvs-dont-use-admiral.patch \
%D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/gromacs-tinyxml2.patch \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-cross-system-i686.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
@ -1101,14 +1133,15 @@ dist_patch_DATA = \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/ilmbase-fix-test-arm.patch \
%D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \
%D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \
%D%/packages/patches/jamvm-arm.patch \ %D%/packages/patches/jamvm-arm.patch \
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \
%D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \
@ -1193,7 +1226,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libreoffice-poppler-compat.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \
@ -1211,8 +1243,6 @@ dist_patch_DATA = \
%D%/packages/patches/libutils-add-includes.patch \ %D%/packages/patches/libutils-add-includes.patch \
%D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libutils-remove-damaging-includes.patch \
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \
%D%/packages/patches/libvnc-CVE-2018-20750.patch \
%D%/packages/patches/libvnc-CVE-2019-15681.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \
@ -1221,6 +1251,7 @@ dist_patch_DATA = \
%D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-newer-libconfig.patch \
%D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \
%D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \
%D%/packages/patches/linphoneqt-tabbutton.patch \ %D%/packages/patches/linphoneqt-tabbutton.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
@ -1228,6 +1259,9 @@ dist_patch_DATA = \
%D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/lirc-reproducible-build.patch \ %D%/packages/patches/lirc-reproducible-build.patch \
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
%D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \
%D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \
%D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lrcalc-includes.patch \
%D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lrzip-CVE-2017-8842.patch \
@ -1245,6 +1279,7 @@ dist_patch_DATA = \
%D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/mars-sfml-2.3.patch \
%D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \
%D%/packages/patches/maven-enforcer-api-fix-old-dependencies.patch \
%D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-component-xml.patch \
%D%/packages/patches/maven-generate-javax-inject-named.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \
@ -1321,6 +1356,7 @@ dist_patch_DATA = \
%D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \
%D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \
%D%/packages/patches/opendht-fix-jami.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \
@ -1344,12 +1380,14 @@ dist_patch_DATA = \
%D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \
%D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \
%D%/packages/patches/sdl-pango-fillrect_crash.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \
%D%/packages/patches/sdl-pango-header-guard.patch \ %D%/packages/patches/sdl-pango-header-guard.patch \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patchutils-test-perms.patch \
%D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \
@ -1412,6 +1450,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \
%D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-alembic-exceptions-cause.patch \ %D%/packages/patches/python-alembic-exceptions-cause.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \
@ -1441,6 +1480,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \
%D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python-slugify-depend-on-unidecode.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-tinycss2-flake8-compat.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \
%D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \
@ -1448,6 +1488,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-absolute-runpath.patch \
%D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/qtscript-disable-tests.patch \
@ -1473,11 +1514,13 @@ dist_patch_DATA = \
%D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/racket-store-checksum-override.patch \
%D%/packages/patches/retroarch-disable-online-updater.patch \ %D%/packages/patches/retroarch-disable-online-updater.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \
%D%/packages/patches/ruby-rubocop-break-dependency-cycle.patch\
%D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
%D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/runc-CVE-2019-5736.patch \
%D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \ %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-1.45-linker-locale.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \
@ -1505,6 +1548,7 @@ dist_patch_DATA = \
%D%/packages/patches/slim-display.patch \ %D%/packages/patches/slim-display.patch \
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/sssd-fix-samba.patch \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \
%D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \
@ -1520,6 +1564,8 @@ dist_patch_DATA = \
%D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \
%D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \
%D%/packages/patches/t4k-common-libpng16.patch \ %D%/packages/patches/t4k-common-libpng16.patch \
%D%/packages/patches/tao-add-missing-headers.patch \
%D%/packages/patches/tao-fix-parser-types.patch \
%D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \
%D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \
%D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tcc-boot-0.9.27.patch \
@ -1540,7 +1586,6 @@ dist_patch_DATA = \
%D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \
%D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \
%D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/transmission-CVE-2018-10756.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \
%D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \
@ -1548,14 +1593,9 @@ dist_patch_DATA = \
%D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/twinkle-bcg729.patch \
%D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
%D%/packages/patches/u-boot-DT-for-Pinebook-Pro.patch \
%D%/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch \
%D%/packages/patches/u-boot-gpio-keys-binding-cons.patch \
%D%/packages/patches/u-boot-leds-common-binding-con.patch \
%D%/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch \
%D%/packages/patches/u-boot-video-rockchip-fix-build.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \
%D%/packages/patches/ungoogled-chromium-system-nspr.patch \
%D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \
%D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \
%D%/packages/patches/unzip-CVE-2014-8141.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \
@ -1594,6 +1634,7 @@ dist_patch_DATA = \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \
%D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \
%D%/packages/patches/wicd-wpa2-ttls.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \
%D%/packages/patches/widelands-system-wide_minizip.patch \
%D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmctrl-64-fix.patch \
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
%D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \
@ -1614,6 +1655,7 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xpra-4.0.1-systemd-run.patch \
%D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \

1
gnu/machine/ssh.scm
View file

@ -37,6 +37,7 @@
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gcrypt pk-crypto) #:use-module (gcrypt pk-crypto)
#:use-module (ice-9 format)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 textual-ports) #:use-module (ice-9 textual-ports)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)

4
gnu/packages/ada.scm
View file

@ -38,7 +38,7 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/AdaCore/langkit.git") (url "https://github.com/AdaCore/langkit")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
@ -70,7 +70,7 @@ Ada library with bindings for the C and Python programming languages.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/AdaCore/libadalang.git") (url "https://github.com/AdaCore/libadalang")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32

272
gnu/packages/admin.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com> ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@ -85,6 +85,7 @@
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -124,6 +125,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
@ -145,7 +147,7 @@
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/nomius/ktsuss.git") (url "https://github.com/nomius/ktsuss")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0q9931f9hp47v1n8scli4bdg2rkjpf5jf8v7jj2gdn83aia1r2hz")) (base32 "0q9931f9hp47v1n8scli4bdg2rkjpf5jf8v7jj2gdn83aia1r2hz"))
@ -218,7 +220,7 @@ usual file attributes can be checked for inconsistencies.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Xfennec/progress.git") (url "https://github.com/Xfennec/progress")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"))
@ -1364,7 +1366,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.9.1") (version "1.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1374,7 +1376,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1zxd6hxwhxqrm876wsn9bfajbfc4hc6l9ivzj5rjg80hzv71ch99")) "05432672iilb7s52j9l9xzrlambb1wg3k7qvf5973i41y40x563w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1486,7 +1488,7 @@ commands and their arguments.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Duncaen/OpenDoas.git") (url "https://github.com/Duncaen/OpenDoas")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1863,13 +1865,13 @@ development, not the kernel implementation of ACPI.")
(define-public s-tui (define-public s-tui
(package (package
(name "s-tui") (name "s-tui")
(version "1.0.0") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "s-tui" version)) (uri (pypi-uri "s-tui" version))
(sha256 (sha256
(base32 "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n")))) (base32 "0xkfdaz5np21311ffdvhks58155qby8j8scbcixhvjd913pj66qx"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("python-psutil" ,python-psutil) `(("python-psutil" ,python-psutil)
@ -1914,7 +1916,7 @@ system is under heavy load.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dharple/detox.git") (url "https://github.com/dharple/detox")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2104,7 +2106,7 @@ degradation and failure.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/adrianlopezroche/fdupes.git") (url "https://github.com/adrianlopezroche/fdupes")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2163,13 +2165,13 @@ of supported upstream metrics systems simultaneously.")
(define-public ansible (define-public ansible
(package (package
(name "ansible") (name "ansible")
(version "2.9.9") (version "2.9.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ansible" version)) (uri (pypi-uri "ansible" version))
(sha256 (sha256
(base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8")))) (base32 "1c9ayh61qwasgncmlw7rjx5r4g5n2cpg1d5blgn53zg7xhrx1yc8"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-bcrypt" ,python-bcrypt) `(("python-bcrypt" ,python-bcrypt)
@ -2356,7 +2358,7 @@ lookup to YAML Mode. You could enable the mode with @code{(add-hook
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/opsengine/cpulimit.git") (url "https://github.com/opsengine/cpulimit")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2395,7 +2397,7 @@ limits.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/wting/autojump.git") (url "https://github.com/wting/autojump")
(commit (string-append "release-v" version)))) (commit (string-append "release-v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2441,7 +2443,7 @@ frequently used directories by typing only a small pattern.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/clvv/fasd.git") (url "https://github.com/clvv/fasd")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2673,7 +2675,7 @@ results (ndiff), and a packet generation and response analysis tool (nping).")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dagwieers/dstat.git") (url "https://github.com/dagwieers/dstat")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name "dstat" version)) (file-name (git-file-name "dstat" version))
(sha256 (sha256
@ -2725,7 +2727,7 @@ throughput (in the same interval).")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/nvbn/thefuck.git") (url "https://github.com/nvbn/thefuck")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2801,7 +2803,7 @@ produce uniform output across heterogeneous networks.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/valr/cbatticon.git") (url "https://github.com/valr/cbatticon")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr")) (base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"))
@ -2837,7 +2839,7 @@ the status of your battery in the system tray.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/TrilbyWhite/interrobang.git") (url "https://github.com/TrilbyWhite/interrobang")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2913,7 +2915,7 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/linux-sunxi/sunxi-tools.git") (url "https://github.com/linux-sunxi/sunxi-tools")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd"))
@ -3018,7 +3020,7 @@ in order to be able to find it.
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/aureliojargas/sedsed.git") (url "https://github.com/aureliojargas/sedsed")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3251,17 +3253,105 @@ generate those nifty terminal theme information and ASCII distribution logos in
everyone's screenshots nowadays.") everyone's screenshots nowadays.")
(license license:gpl3))) (license license:gpl3)))
(define-public ufetch
(let ((commit "98b622023e03fe24dbc137e9a68104dfe1fbd04a")
(revision "1"))
(package
(name "ufetch")
(version (git-version "0.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/jschx/ufetch.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"09c4zmikza16xpydinnqbi3hmcibfrrn10wij7j0j1wv1pj2sl2l"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash)
("tput" ,ncurses)))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(output (assoc-ref %outputs "out"))
(bindir (string-append output "/bin"))
(docdir (string-append output "/share/doc/ufetch-" ,version))
(tput (string-append (assoc-ref %build-inputs "tput") "/bin/tput")))
(install-file (string-append source "/LICENSE") docdir)
(setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin"))
(mkdir-p bindir)
(for-each (lambda (src)
(let ((dst (string-append bindir "/" (basename src))))
(copy-file src dst)
(patch-shebang dst)
(substitute* dst (("tput") tput))))
(find-files source "ufetch-[[:alpha:]]*$"))
;; Note: the `ufetch` we create below will only work if run under
;; the Guix System. I.e. a user trying to run `ufetch` on a
;; foreign distro will not get great results. The `screenfetch`
;; program does actual runtime detection of the operating system,
;; and would be a better choice in such a situation.
(symlink "ufetch-guix" (string-append bindir "/ufetch"))))))
(home-page "https://gitlab.com/jschx/ufetch")
(synopsis "Tiny system info")
(description "This package provides a tiny system info utility.")
(license license:isc))))
(define-public pfetch
(let ((commit "e18a0959ab98b963744755ec4687e59dc11db3c5")
(revision "0"))
(package
(name "pfetch")
(version (git-version "0.7.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dylanaraps/pfetch")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1md40av6i3xvvwig5jzhy4kf3s5sgxxk35r0vcyrjd8qyndk927l"))))
(build-system trivial-build-system)
(inputs `(("bash" ,bash)))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (lambda (f)
(string-append (assoc-ref %build-inputs "source") "/" f)))
(output (assoc-ref %outputs "out"))
(docdir (string-append output "/share/doc/pfetch-" ,version)))
(install-file (source "LICENSE.md") docdir)
(install-file (source "README.md") docdir)
(install-file (source "pfetch") (string-append output "/bin"))
(patch-shebang
(string-append output "/bin/pfetch")
(list (string-append (assoc-ref %build-inputs "bash") "/bin")))
#t))))
(home-page "https://github.com/dylanaraps/pfetch")
(synopsis "System information tool")
(description "This package provides a simple, configurable system
information tool.")
(license license:expat))))
(define-public nnn (define-public nnn
(package (package
(name "nnn") (name "nnn")
(version "3.2") (version "3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/jarun/nnn/releases/download/v" (uri (string-append "https://github.com/jarun/nnn/releases/download/v"
version "/nnn-v" version ".tar.gz")) version "/nnn-v" version ".tar.gz"))
(sha256 (sha256
(base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf")))) (base32 "1jiaygylwrlz6rlls1q69xw10j6ypr96yshsbzisg0adk37lbchn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
@ -3333,7 +3423,7 @@ on systems running the Linux kernel.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/robertdavidgraham/masscan.git") (url "https://github.com/robertdavidgraham/masscan")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3444,7 +3534,7 @@ launch daemons into the relevant nodes.")
;; We use git checkout to avoid github auto-generated tarballs ;; We use git checkout to avoid github auto-generated tarballs
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/hpc/Spindle.git") (url "https://github.com/hpc/Spindle")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3472,7 +3562,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.1.03-1") (version "3.1.04-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3481,7 +3571,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6")))) (base32 "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)
@ -3655,7 +3745,7 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pwr/Solaar.git") (url "https://github.com/pwr/Solaar")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3671,10 +3761,7 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
(("'--prefix' in sys\\.argv") (("'--prefix' in sys\\.argv")
"len([x.startswith('--prefix=') for x in sys.argv]) > 0")) "len([x.startswith('--prefix=') for x in sys.argv]) > 0"))
#t)) #t))
(replace 'build (add-before 'build 'setenv-PATH
(lambda _
(invoke "python" "setup.py" "build")))
(add-before 'check 'setenv-PATH
(lambda _ (lambda _
(setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH"))) (setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH")))
#t))))) #t)))))
@ -3863,3 +3950,124 @@ It supports mounting local filesystems of any kind the normal mount utility
supports. It can also mount encrypted LUKS volumes using the password supports. It can also mount encrypted LUKS volumes using the password
supplied by the user when logging in.") supplied by the user when logging in.")
(license (list license:gpl2+ license:lgpl2.1+)))) (license (list license:gpl2+ license:lgpl2.1+))))
(define-public jc
(package
(name "jc")
(version "1.11.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kellyjonbrazil/jc")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa"))))
(build-system python-build-system)
(propagated-inputs
`(("python-ruamel.yaml" ,python-ruamel.yaml)
("python-xmltodict" ,python-xmltodict)
("python-pygments" ,python-pygments)))
(home-page "https://github.com/kellyjonbrazil/jc")
(synopsis "Convert the output of command-line tools to JSON")
(description "@code{jc} JSONifies the output of many CLI tools and
file-types for easier parsing in scripts.")
(license license:expat)))
(define-public jtbl
(package
(name "jtbl")
(version "1.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kellyjonbrazil/jtbl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1zzd7rd63xva50f22d1rfja4r302aizrafarhwm67vv181swvdya"))))
(build-system python-build-system)
(inputs
`(("python-tabulate" ,python-tabulate)))
(home-page "https://github.com/kellyjonbrazil/jtbl")
(synopsis "Command-line tool to print JSON data as a table in the terminal")
(description "@code{jtbl} accepts piped JSON data from stdin and outputs a
text table representation to stdout.")
(license license:expat)))
(define-public hosts
(package
(name "hosts")
(version "3.6.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xwmx/hosts")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn"))))
(build-system trivial-build-system)
(inputs
`(("bats" ,bats) ;for test
("awk" ,gawk)
("bash" ,bash)
("coreutils" ,coreutils)
("diffutils" ,diffutils)
("grep" ,grep)
("ncurses" ,ncurses) ;tput
("sed" ,sed)))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
;; copy source
(copy-recursively (assoc-ref %build-inputs "source") ".")
;; patch-shebang phase
(setenv "PATH"
(string-append (assoc-ref %build-inputs "bash") "/bin"
":" (assoc-ref %build-inputs "awk") "/bin"
":" (assoc-ref %build-inputs "coreutils") "/bin"
":" (assoc-ref %build-inputs "diffutils") "/bin"
":" (assoc-ref %build-inputs "grep") "/bin"
":" (assoc-ref %build-inputs "ncurses") "/bin"
":" (assoc-ref %build-inputs "sed") "/bin"
":" "/run/setuid-programs"
":" (getenv "PATH")))
(substitute* "hosts"
(("#!/usr/bin/env bash")
(string-append "#!" (which "bash")
"\nPATH=" (getenv "PATH"))))
;; check phase
(setenv "TERM" "linux") ;set to tty for test
(invoke (string-append (assoc-ref %build-inputs "bats") "/bin/bats")
"test")
;; install phase
(install-file "hosts" (string-append %output "/bin"))
(let ((bash-completion
(string-append %output "/etc/bash_completion.d")))
(mkdir-p bash-completion)
(copy-file "etc/hosts-completion.bash"
(string-append bash-completion "/hosts")))
(let ((zsh-completion
(string-append %output "/share/zsh/site-functions")))
(mkdir-p zsh-completion)
(copy-file "etc/hosts-completion.zsh"
(string-append zsh-completion "/_hosts")))
(let ((doc (string-append %output "/share/doc/" ,name "-" ,version)))
(mkdir-p doc)
(install-file "LICENSE" doc)
(install-file "README.md" doc))
#t)))
(home-page "https://github.com/xwmx/hosts/")
(synopsis "Script for editing a foreign distro's @file{/etc/hosts} file")
(description "Hosts is a command line program for managing
@file{/etc/hosts} entries. On Guix System, @file{/etc/hosts} is managed from
the system configuration; hosts only works when using the Guix package manager
on a foreign distro. @command{hosts} works with existing hosts files and
entries, providing commands to add, remove, comment, and search.")
(license license:expat)))

4
gnu/packages/aidc.scm
View file

@ -91,7 +91,7 @@ characters, and is highly robust.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dmtx/libdmtx.git") (url "https://github.com/dmtx/libdmtx")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -163,7 +163,7 @@ Python as well as GUI widgets for GTK and Qt.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/nayuki/QR-Code-generator.git") (url "https://github.com/nayuki/QR-Code-generator")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "qrcodegen-cpp-make-install.patch")) (patches (search-patches "qrcodegen-cpp-make-install.patch"))

93
gnu/packages/algebra.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,6 +44,7 @@
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
@ -153,7 +155,7 @@ line applications.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fplll/fplll.git") (url "https://github.com/fplll/fplll")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -203,7 +205,7 @@ the real span of the lattice.")
;; Github instead. ;; Github instead.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fplll/fpylll.git") (url "https://github.com/fplll/fpylll")
(commit (string-append version "dev")))) (commit (string-append version "dev"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -271,7 +273,7 @@ PARI is also available as a C library to allow for faster computations.")
(define-public gp2c (define-public gp2c
(package (package
(name "gp2c") (name "gp2c")
(version "0.0.11pl3") (version "0.0.11pl4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -279,7 +281,7 @@ PARI is also available as a C library to allow for faster computations.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm")))) "1cnnh7diqc97q76q5pyhpbljbhc0sz8mlrbqgiwi0sjkgh8iqsj0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(inputs `(("pari-gp" ,pari-gp))) (inputs `(("pari-gp" ,pari-gp)))
@ -349,7 +351,7 @@ precision.")
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.5.0-87") (version "1.6.0-7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -361,7 +363,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/" "~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz")) "giac_" version ".tar.gz"))
(sha256 (sha256
(base32 "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv")))) (base32 "1pvgp137zcl0rbhdn1j41xxfml7fp771a7x4ph8qrhhlx0hxzn3p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -401,7 +403,7 @@ precision.")
(delete-file (string-append out "/bin/xcasnew")) (delete-file (string-append out "/bin/xcasnew"))
#t)))))) #t))))))
(inputs (inputs
;;; TODO: Add libnauty. ;;; TODO: Add libnauty.
`(("fltk" ,fltk) `(("fltk" ,fltk)
("glpk" ,glpk) ("glpk" ,glpk)
("gmp" ,gmp) ("gmp" ,gmp)
@ -438,16 +440,17 @@ or text interfaces) or as a C++ library.")
(define-public flint (define-public flint
(package (package
(name "flint") (name "flint")
(version "2.5.2") (version "2.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://flintlib.org/flint-" "http://flintlib.org/flint-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (base32 (sha256 (base32
"11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb")) "0h08a71kn8347zsqjamqnmrxjpsnnzpmhvxb6d2xmfrcs6nyv2ch"))))
(patches (search-patches "flint-ldconfig.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs
`(("ntl" ,ntl)))
(propagated-inputs (propagated-inputs
`(("gmp" ,gmp) `(("gmp" ,gmp)
("mpfr" ,mpfr))) ; header files from both are included by flint/arith.h ("mpfr" ,mpfr))) ; header files from both are included by flint/arith.h
@ -455,17 +458,24 @@ or text interfaces) or as a C++ library.")
`(#:parallel-tests? #f ; seems to be necessary on arm `(#:parallel-tests? #f ; seems to be necessary on arm
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'newer-c++
(lambda _
(substitute* "configure"
(("-ansi") ""))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gmp (assoc-ref inputs "gmp")) (gmp (assoc-ref inputs "gmp"))
(mpfr (assoc-ref inputs "mpfr"))) (mpfr (assoc-ref inputs "mpfr"))
(ntl (assoc-ref inputs "ntl")))
;; do not pass "--enable-fast-install", which makes the ;; do not pass "--enable-fast-install", which makes the
;; homebrew configure process fail ;; homebrew configure process fail
(invoke "./configure" (invoke "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--with-gmp=" gmp) (string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr)) (string-append "--with-mpfr=" mpfr)
(string-append "--with-ntl=" ntl))
#t)))))) #t))))))
(synopsis "Fast library for number theory") (synopsis "Fast library for number theory")
(description (description
@ -485,16 +495,16 @@ fast arithmetic.")
(define-public arb (define-public arb
(package (package
(name "arb") (name "arb")
(version "2.17.0") (version "2.18.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fredrik-johansson/arb.git") (url "https://github.com/fredrik-johansson/arb")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")))) "15fx3dcbzgwddw9p1nysmx0dbh058afv5m8cj5pdjkcmcl7kw7z9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("flint" ,flint))) ; flint.h is included by arf.h `(("flint" ,flint))) ; flint.h is included by arf.h
@ -533,7 +543,7 @@ real and complex numbers, with automatic, rigorous error control.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fredrik-johansson/python-flint.git") (url "https://github.com/fredrik-johansson/python-flint")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -726,7 +736,7 @@ syntax is similar to that of C, so basic usage is familiar. It also includes
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/extemporelang/kiss_fft.git") (url "https://github.com/extemporelang/kiss_fft")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -832,7 +842,7 @@ cosine/ sine transforms or DCT/DST).")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/vkostyukov/la4j.git") (url "https://github.com/vkostyukov/la4j")
(commit version))) (commit version)))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
@ -946,6 +956,46 @@ minimization and curve fitting. It is mature code, based on decades-old
algorithms from the FORTRAN library MINPACK.") algorithms from the FORTRAN library MINPACK.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public symengine
(package
(name "symengine")
(version "0.6.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/symengine/symengine")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
;; These are the suggested build options in the README.
'("-DCMAKE_BUILD_TYPE=Release"
"-DWITH_GMP=on"
"-DWITH_MPFR=on"
"-DWITH_MPC=on"
"-DINTEGER_CLASS=flint"
"-DWITH_LLVM=on"
"-DWITH_SYMENGINE_THREAD_SAFE=on"
"-DBUILD_SHARED_LIBS=on"))) ;also build libsymengine
(native-inputs
`(("llvm" ,llvm)))
(inputs
`(("flint" ,flint)
("gmp" ,gmp)
("mpc" ,mpc)
("mpfr" ,mpfr)))
(home-page "https://github.com/symengine/symengine")
(synopsis "Fast symbolic manipulation library")
(description
"SymEngine is a standalone fast C++ symbolic manipulation library.
Optional thin wrappers allow usage of the library from other languages.")
(license (list license:expat ;SymEngine
license:bsd-3)))) ;3rd party code
(define-public eigen (define-public eigen
(package (package
(name "eigen") (name "eigen")
@ -1033,7 +1083,7 @@ features, and more.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QuantStack/xtensor.git") (url "https://github.com/QuantStack/xtensor")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
@ -1314,14 +1364,15 @@ algebra, such as the row echelon form.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571")))) "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"))
(patches (search-patches "linbox-fix-pkgconfig.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (propagated-inputs
`(("fflas-ffpack" ,fflas-ffpack))) `(("fflas-ffpack" ,fflas-ffpack)))
(synopsis "C++ library for linear algebra over exact rings") (synopsis "C++ library for linear algebra over exact rings")
(description (description

4
gnu/packages/android.scm
View file

@ -65,7 +65,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/daym/android-make-stub.git") (url "https://github.com/daym/android-make-stub")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append "android-make-stub-" (file-name (string-append "android-make-stub-"
version "-checkout")) version "-checkout"))
@ -99,7 +99,7 @@ use their packages mostly unmodified in our Android NDK build system.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/googletest.git") (url "https://github.com/google/googletest")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

2
gnu/packages/animation.scm
View file

@ -201,7 +201,7 @@ contains the graphical user interface for synfig.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/LostMoho/Papagayo.git") (url "https://github.com/LostMoho/Papagayo")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

4
gnu/packages/antivirus.scm
View file

@ -44,14 +44,14 @@
(define-public clamav (define-public clamav
(package (package
(name "clamav") (name "clamav")
(version "0.102.3") (version "0.102.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/" (uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz")) "clamav-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d")) "06rrzyrhnr0rswryijpbbzywr6387rv8qjq8sb8cl3h2d1m45ggf"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

6
gnu/packages/arcan.scm
View file

@ -59,7 +59,7 @@
(method git-fetch) (method git-fetch)
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(uri (git-reference (uri (git-reference
(url "https://github.com/letoram/arcan.git") (url "https://github.com/letoram/arcan")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw"))))
@ -145,7 +145,7 @@
(method git-fetch) (method git-fetch)
(file-name "arcan-openal-0.5.4") (file-name "arcan-openal-0.5.4")
(uri (git-reference (uri (git-reference
(url "https://github.com/letoram/openal.git") (url "https://github.com/letoram/openal")
(commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef")))
(sha256 (sha256
(base32 (base32
@ -195,7 +195,7 @@ engine programmable using Lua.")
(method git-fetch) (method git-fetch)
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(uri (git-reference (uri (git-reference
(url "https://github.com/letoram/xarcan.git") (url "https://github.com/letoram/xarcan")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym"))))

140
gnu/packages/assembly.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2019 Andy Tai <atai@atai.org> ;;; Copyright © 2019 Andy Tai <atai@atai.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,6 +48,7 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages shells)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module ((guix utils) #:use-module ((guix utils)
#:select (%current-system))) #:select (%current-system)))
@ -259,16 +261,16 @@ runtime")
(define-public rgbds (define-public rgbds
(package (package
(name "rgbds") (name "rgbds")
(version "0.4.0") (version "0.4.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rednex/rgbds.git") (url "https://github.com/rednex/rgbds")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7")))) "05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -306,16 +308,16 @@ package for the Game Boy and Game Boy Color. It consists of:
(define-public wla-dx (define-public wla-dx
(package (package
(name "wla-dx") (name "wla-dx")
(version "9.10") (version "9.11")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/vhelin/wla-dx.git") (url "https://github.com/vhelin/wla-dx")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"022isf7s9q5i0j4xj69zpp0lgw8p9n37sn7ii25v68r15zaahk2w")))) "0i8pxvyaih79pqnyvqyqd9rwdid91pna76cap0k1n5zhg8xswf2f"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("sphinx" ,python-sphinx))) ; to generate man pages `(("sphinx" ,python-sphinx))) ; to generate man pages
@ -371,3 +373,129 @@ It understands mnemonics and generates code for NMOS 6502s (such
as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...),
CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.")
(license license:gpl2))) (license license:gpl2)))
(define-public armips
(package
(name "armips")
(version "0.11.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kingcom/armips")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
(invoke "./armipstests" "../source/Tests")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "armips" (string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(home-page "https://github.com/Kingcom/armips")
(synopsis "Assembler for various ARM and MIPS platforms")
(description
"armips is an assembler with full support for the MIPS R3000, MIPS R4000,
Allegrex and RSP instruction sets, partial support for the EmotionEngine
instruction set, as well as complete support for the ARM7 and ARM9 instruction
sets, both THUMB and ARM mode.")
(license license:expat)))
(define-public intel-xed
(package
(name "intel-xed")
(version "11.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/intelxed/xed")
(commit version)))
(sha256 (base32 "1jffayski2gpd54vaska7fmiwnnia8v3cka4nfyzjgl8xsky9v2s"))
(file-name (git-file-name name version))
(patches (search-patches "intel-xed-fix-nondeterminism.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("python-wrapper" ,python-wrapper)
("tcsh" ,tcsh)
;; As of the time of writing this comment, mbuild does not exist in the
;; Python Package Index and seems to only be used by intel-xed, so we
;; opt to include it here instead of packaging separately. Note also
;; that the git repository contains no version tags, so we directly
;; reference the "version" variable from setup.py instead.
("mbuild"
,(let ((name "mbuild")
(version "0.2496"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/intelxed/mbuild.git")
(commit "5304b94361fccd830c0e2417535a866b79c1c297")))
(sha256
(base32
"0r3avc3035aklqxcnc14rlmmwpj3jp09vbcbwynhvvmcp8srl7dl"))
(file-name (git-file-name name version)))))))
(outputs '("out" "lib"))
(arguments
`(#:phases
;; Upstream uses the custom Python build tool `mbuild', so we munge
;; gnu-build-system to fit. The build process for this package is
;; documented at https://intelxed.github.io/build-manual/.
(let* ((build-dir "build")
(kit-dir "kit"))
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(let ((mbuild (assoc-ref inputs "mbuild")))
(setenv "PYTHONPATH" (string-append
(getenv "PYTHONPATH") ":" mbuild))
(invoke "./mfile.py"
(string-append "--build-dir=" build-dir)
(string-append "--install-dir=" kit-dir)
"examples"
"doc"
"install"))))
(replace 'check
(lambda _
;; Skip broken test group `tests/tests-avx512pf'.
(invoke "tests/run-cmd.py"
(string-append "--build-dir=" kit-dir "/bin")
"--tests" "tests/tests-base"
"--tests" "tests/tests-avx512"
"--tests" "tests/tests-cet"
"--tests" "tests/tests-via"
"--tests" "tests/tests-syntax"
"--tests" "tests/tests-xop")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (assoc-ref outputs "lib")))
(copy-recursively (string-append kit-dir "/bin")
(string-append out "/bin"))
(copy-recursively (string-append kit-dir "/include")
(string-append lib "/include"))
(copy-recursively (string-append kit-dir "/lib")
(string-append lib "/lib"))
#t)))))))
(home-page "https://intelxed.github.io/")
(synopsis "Encoder and decoder for x86 (IA32 and Intel64) instructions")
(description "The Intel X86 Encoder Decoder (XED) is a software library and
for encoding and decoding X86 (IA32 and Intel64) instructions. The decoder
takes sequences of 1-15 bytes along with machine mode information and produces
a data structure describing the opcode, operands, and flags. The encoder takes
a similar data structure and produces a sequence of 1 to 15 bytes. Disassembly
is essentially a printing pass on the data structure.
The library and development files are under the @code{lib} output, with a
family of command line utility wrappers in the default output. Each of the cli
tools is named like @code{xed*}. Documentation for the cli tools is sparse, so
this is a case where ``the code is the documentation.''")
(license license:asl2.0)))

8
gnu/packages/astronomy.scm
View file

@ -159,7 +159,7 @@ programs for the manipulation and analysis of astronomical data.")
(define-public stellarium (define-public stellarium
(package (package
(name "stellarium") (name "stellarium")
(version "0.20.1") (version "0.20.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -167,7 +167,7 @@ programs for the manipulation and analysis of astronomical data.")
"/releases/download/v" version "/releases/download/v" version
"/stellarium-" version ".tar.gz")) "/stellarium-" version ".tar.gz"))
(sha256 (sha256
(base32 "034jkrdaaamvbrkfwi3qcl6h8hwfnw2nvf7a82faj55rskcpnkhm")))) (base32 "16symz212vjvhfabh39a68qf7d0rm574c6djlibj2qd1q9jgj3j0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -178,7 +178,7 @@ programs for the manipulation and analysis of astronomical data.")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) ; xgettext is used at compile time `(("gettext" ,gettext-minimal) ; xgettext is used at compile time
("perl" ,perl) ; For pod2man ("perl" ,perl) ; for pod2man
("qtbase" ,qtbase) ; Qt MOC is needed at compile time ("qtbase" ,qtbase) ; Qt MOC is needed at compile time
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
@ -191,7 +191,7 @@ programs for the manipulation and analysis of astronomical data.")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'check 'set-offscreen-display (add-before 'check 'set-offscreen-display
(lambda _ (lambda _
;; make Qt render "offscreen", required for tests ;; Make Qt render "offscreen", required for tests.
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
#t))))) #t)))))

222
gnu/packages/audio.scm
View file

@ -70,6 +70,7 @@
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnunet) ; libmicrohttpd #:use-module (gnu packages gnunet) ; libmicrohttpd
@ -395,17 +396,17 @@ engineers, musicians, soundtrack editors and composers.")
(define-public audacity (define-public audacity
(package (package
(name "audacity") (name "audacity")
(version "2.3.3") (version "2.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/audacity/audacity.git") (url "https://github.com/audacity/audacity")
(commit (string-append "Audacity-" version)))) (commit (string-append "Audacity-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0707fsnrl4vjalsi21w4blwgz024qhd0w8rdd5j5vpxf5lyk2rbk")) "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"))
(patches (search-patches "audacity-build-with-system-portaudio.patch")) (patches (search-patches "audacity-build-with-system-portaudio.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -718,7 +719,7 @@ tools (analyzer, mono/stereo tools, crossovers).")
;; Actually https://github.com/moddevices/caps-lv2.git, but it's ;; Actually https://github.com/moddevices/caps-lv2.git, but it's
;; missing fixes for newer glibc, so using the origin of a pull ;; missing fixes for newer glibc, so using the origin of a pull
;; request regarding this issue: ;; request regarding this issue:
(url "https://github.com/jujudusud/caps-lv2.git") (url "https://github.com/jujudusud/caps-lv2")
(commit "9c9478b7fbd8f9714f552ebe2a6866398b0babfb"))) (commit "9c9478b7fbd8f9714f552ebe2a6866398b0babfb")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -754,7 +755,7 @@ generators of mostly elementary and occasionally exotic nature.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ssj71/infamousPlugins.git") (url "https://github.com/ssj71/infamousPlugins")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -793,7 +794,7 @@ envelope follower, distortion effects, tape effects and more.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/swh/ladspa.git") (url "https://github.com/swh/ladspa")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -823,7 +824,7 @@ envelope follower, distortion effects, tape effects and more.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/swh/lv2.git") (url "https://github.com/swh/lv2")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -861,6 +862,76 @@ flanger), ringmodulator, distortion, filters, pitchshift, oscillators,
emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public tao
(package
(name "tao")
(version "1.0-beta-10May2006")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/taopm/Tao/"
"tao-" version "/"
"tao-" version ".tar.gz"))
(sha256
(base32
"156py3g6mmglldfd0j76bn7n242hdwf49diaprjpj7crp8vgf2pz"))
(patches
(search-patches "tao-add-missing-headers.patch"
"tao-fix-parser-types.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "configure"
(("SHELL=/bin/sh") ""))
#t))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("TAO_RELEASE=-beta")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-references
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "user-scripts/tao.in"
(("taoparse")
(string-append (assoc-ref outputs "out") "/bin/taoparse"))
(("grep") (which "grep"))
(("sed -f \\$distdir/user-scripts/")
(string-append (which "sed") " -f $distdir/"))
(("distdir=.*")
(string-append "distdir="
(assoc-ref outputs "out") "/share/tao")))
#t))
(add-after 'install 'install-extra-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/tao/"))
(inc (string-append out "/include/tao/")))
(mkdir-p share)
(mkdir-p inc)
(install-file "user-scripts/error.parse" share)
(copy-recursively "examples" (string-append share "examples"))
(for-each (lambda (file) (install-file file inc))
(find-files "include" "\\.h"))
#t))))))
(inputs
`(("audiofile" ,audiofile)
("libxi" ,libxi)
("libxmu" ,libxmu)
("mesa" ,mesa)
("glut" ,freeglut)
("flex" ,flex)
("bison" ,bison)
("sed" ,sed)
("grep" ,grep)))
(home-page "http://taopm.sourceforge.net/")
(synopsis "Sound Synthesis with Physical Models")
(description "Tao is a software package for sound synthesis using physical
models. It provides a virtual acoustic material constructed from masses and
springs which can be used as the basis for building quite complex virtual
musical instruments. Tao comes with a synthesis language for creating and
playing instruments and a C++ API for those who would like to use it as an
object library.")
(license license:gpl2+)))
(define-public csound (define-public csound
(package (package
(name "csound") (name "csound")
@ -869,7 +940,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/csound/csound.git") (url "https://github.com/csound/csound")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1259,7 +1330,7 @@ follower.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/FluidSynth/fluidsynth.git") (url "https://github.com/FluidSynth/fluidsynth")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1339,7 +1410,7 @@ PS, and DAB+.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/grame-cncm/faust.git") (url "https://github.com/grame-cncm/faust")
(commit (string-append "v" (commit (string-append "v"
(string-map (lambda (c) (string-map (lambda (c)
(if (char=? c #\.) #\- c)) (if (char=? c #\.) #\- c))
@ -1619,15 +1690,16 @@ especially for creating reverb effects. It supports impulse responses with 1,
(package (package
(name "jack") (name "jack")
(version "0.125.0") (version "0.125.0")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append ;; jackaudio.org/downloads/jack-audio-connection-kit-0.125.0.tar.gz
"http://jackaudio.org/downloads/jack-audio-connection-kit-" ;; no longer exists (404). Use an unofficial mirror.
version (uri (string-append "https://crux.ster.zone/downloads/"
".tar.gz")) "jack-audio-connection-kit/"
"jack-audio-connection-kit-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"))))
"0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -1647,7 +1719,7 @@ especially for creating reverb effects. It supports impulse responses with 1,
("bdb" ,bdb))) ("bdb" ,bdb)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://jackaudio.org/") (home-page "https://jackaudio.org/")
(synopsis "JACK audio connection kit") (synopsis "JACK audio connection kit")
(description (description
"JACK is a low-latency audio server. It can connect a number of "JACK is a low-latency audio server. It can connect a number of
@ -2023,7 +2095,7 @@ significantly faster and have minimal dependencies.")
(version "1.18.0") (version "1.18.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://lv2plug.in/spec/lv2-" (uri (string-append "https://lv2plug.in/spec/lv2-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -2037,7 +2109,7 @@ significantly faster and have minimal dependencies.")
`(("libsndfile" ,libsndfile))) `(("libsndfile" ,libsndfile)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://lv2plug.in/") (home-page "https://lv2plug.in/")
(synopsis "LV2 audio plugin specification") (synopsis "LV2 audio plugin specification")
(description (description
"LV2 is an open specification for audio plugins and host applications. "LV2 is an open specification for audio plugins and host applications.
@ -2100,7 +2172,7 @@ software.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lvtk/lvtk.git") (url "https://github.com/lvtk/lvtk")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2302,7 +2374,7 @@ into various outputs and to start, stop and configure jackd")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/orouits/qjackrcd.git") (url "https://github.com/orouits/qjackrcd")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2337,7 +2409,7 @@ background file post-processing.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/supercollider/supercollider.git") (url "https://github.com/supercollider/supercollider")
(commit (string-append "Version-" version)) (commit (string-append "Version-" version))
;; for nova-simd, nova-tt, hidapi, TLSF, oscpack ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack
(recursive? #t))) (recursive? #t)))
@ -3084,7 +3156,7 @@ synthesizer written in C++.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Themaister/RSound.git") (url "https://github.com/Themaister/RSound")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3123,7 +3195,7 @@ with a much different focus than most other audio daemons.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/johnhldavis/xjackfreak.git") (url "https://github.com/johnhldavis/xjackfreak")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3203,7 +3275,7 @@ engine.")
(define-public zita-resampler (define-public zita-resampler
(package (package
(name "zita-resampler") (name "zita-resampler")
(version "1.3.0") (version "1.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3213,26 +3285,28 @@ engine.")
(snippet (snippet
;; Don't optimize for a specific processor architecture. ;; Don't optimize for a specific processor architecture.
'(begin '(begin
(substitute* '("apps/Makefile" "libs/Makefile") (substitute* '("apps/Makefile" "source/Makefile")
(("^CXXFLAGS \\+= -march=native") "")) (("^CXXFLAGS \\+= -march=native") ""))
#t)) #t))
(modules '((guix build utils))) (modules '((guix build utils)))
(sha256 (sha256
(base32 (base32
"0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq")))) "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "SUFFIX="))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after
'unpack 'patch-makefile-and-enter-directory 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "source/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "source")
#t)) #t))
(add-after (add-after
'install 'install-symlink 'install 'install-symlink
@ -3254,7 +3328,7 @@ provide high-quality sample rate conversion.")
(define-public zita-alsa-pcmi (define-public zita-alsa-pcmi
(package (package
(name "zita-alsa-pcmi") (name "zita-alsa-pcmi")
(version "0.2.0") (version "0.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3263,19 +3337,21 @@ provide high-quality sample rate conversion.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9")))) "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "SUFFIX="))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "source/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "source")
#t)) #t))
(add-after 'install 'install-symlink (add-after 'install 'install-symlink
(lambda _ (lambda _
@ -3304,7 +3380,7 @@ point audio data.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/svend/cuetools.git") (url "https://github.com/svend/cuetools")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3354,7 +3430,7 @@ use them split WAVE data into multiple files.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/foo86/dcadec.git") (url "https://github.com/foo86/dcadec")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3432,7 +3508,7 @@ loudness of audio and video files to the same level.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/irungentoo/filter_audio.git") (url "https://github.com/irungentoo/filter_audio")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
@ -3541,7 +3617,7 @@ mixers.")
;; bootstrapped build system. ;; bootstrapped build system.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Arkq/bluez-alsa.git") (url "https://github.com/Arkq/bluez-alsa")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3586,14 +3662,14 @@ on the ALSA software PCM plugin.")
(define-public snd (define-public snd
(package (package
(name "snd") (name "snd")
(version "20.4") (version "20.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
"snd-" version ".tar.gz")) "snd-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0irdizlng2s3akmxdbfxcbd93bbjz9543nh7fisszim6v0ks59d9")))) "1frg64q2d8cia6v7jia7kahzx0apwdl0z252mzlbwqdz5960nv90"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -3650,7 +3726,7 @@ the Snd sources), Ruby, or Forth.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lucianodato/noise-repellent.git") (url "https://github.com/lucianodato/noise-repellent")
(commit version))) (commit version)))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
@ -3695,7 +3771,7 @@ the following features:
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dpayne/cli-visualizer.git") (url "https://github.com/dpayne/cli-visualizer")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3740,7 +3816,7 @@ representations.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/karlstav/cava.git") (url "https://github.com/karlstav/cava")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3893,7 +3969,7 @@ library.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/FNA-XNA/FAudio.git") (url "https://github.com/FNA-XNA/FAudio")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -3998,6 +4074,45 @@ stream to one or more IceCast and/or ShoutCast servers.")
(home-page "https://x42.github.io/libltc/") (home-page "https://x42.github.io/libltc/")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public ttaenc
(package
(name "ttaenc")
(version "3.4.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tta/"
"tta/ttaenc-src"
"/ttaenc-" version "-src.tgz"))
(sha256
(base32
"1iixpr4b89g9g1hwn8ak8k8iflcww3r5f09a117qdidc2nqcijdj"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no tests
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "INSDIR=" (assoc-ref %outputs "out") "/bin"))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure
(add-before 'install 'make-bindir
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin"))
#t))))))
(synopsis "TTA lossless audio encoder")
(description
"TTA performs lossless compression on multichannel 8,16 and 24 bits
data of the Wav audio files. Being lossless means that no data-
quality is lost in the compression - when uncompressed, the data will
be identical to the original. The compression ratios of TTA depend on
the type of music file being compressed, but the compression size
will generally range between 30% - 70% of the original. TTA format
supports both of ID3v1/v2 and APEv2 tags.")
(home-page "http://tausoft.org/")
(license license:gpl2+)))
(define-public redkite (define-public redkite
(package (package
(name "redkite") (name "redkite")
@ -4030,18 +4145,18 @@ as is the case with audio plugins.")
(define-public carla (define-public carla
(package (package
(name "carla") (name "carla")
(version "2.0.0") (version "2.1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/falkTX/Carla.git") (url "https://github.com/falkTX/Carla")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k")))) "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -4072,6 +4187,7 @@ as is the case with audio plugins.")
("file" ,file) ("file" ,file)
("liblo" ,liblo) ("liblo" ,liblo)
("libsndfile" ,libsndfile) ("libsndfile" ,libsndfile)
("gtk2" ,gtk+-2) ;needed for bridging GTK2 plugins in GTK3 hosts
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("python-pyliblo" ,python-pyliblo) ("python-pyliblo" ,python-pyliblo)
("python-pyqt" ,python-pyqt) ("python-pyqt" ,python-pyqt)
@ -4143,7 +4259,7 @@ in the package.")
(define-public libaudec (define-public libaudec
(package (package
(name "libaudec") (name "libaudec")
(version "0.2") (version "0.2.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4153,7 +4269,7 @@ in the package.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lfydvs92b0hr72z71ci3yi356rjzi162pgms8dphgg18bz8dazv")))) "04mpmfmqc43asw0m3zxhb6jj4qms7x4jw7mx4xb1d3lh16xllniz"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true"))) `(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true")))
@ -4287,7 +4403,7 @@ minimum.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/drowe67/codec2.git") (url "https://github.com/drowe67/codec2")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -4320,7 +4436,7 @@ digital radio.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Ableton/link.git") (url "https://github.com/Ableton/link")
(commit (string-append "Link-" version)))) (commit (string-append "Link-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

2
gnu/packages/authentication.scm
View file

@ -101,7 +101,7 @@ and the time-based @dfn{TOTP} algorithm (RFC6238).")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Yubico/yubico-pam.git") (url "https://github.com/Yubico/yubico-pam")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

2
gnu/packages/avr.scm
View file

@ -176,7 +176,7 @@ C++.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ryansuchocki/microscheme.git") (url "https://github.com/ryansuchocki/microscheme")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976")) (base32 "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"))

6
gnu/packages/axoloti.scm
View file

@ -71,7 +71,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/axoloti/axoloti.git") (url "https://github.com/axoloti/axoloti")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -367,7 +367,7 @@ patcher application.")))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/axoloti/axoloti.git") (url "https://github.com/axoloti/axoloti")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -607,7 +607,7 @@ patcher application.")))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/JohannesTaelman/elfloader.git") (url "https://github.com/JohannesTaelman/elfloader")
(commit commit))) (commit commit)))
(file-name (git-file-name "elfloader" commit)) (file-name (git-file-name "elfloader" commit))
(sha256 (sha256

33
gnu/packages/backup.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -146,7 +146,7 @@ spying and/or modification by the server.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Parchive/par2cmdline.git") (url "https://github.com/Parchive/par2cmdline")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -310,7 +310,7 @@ random access nor for in-place modification.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/miekg/rdup.git") (url "https://github.com/miekg/rdup")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -404,23 +404,24 @@ errors.")
(define-public rdiff-backup (define-public rdiff-backup
(package (package
(name "rdiff-backup") (name "rdiff-backup")
(version "1.2.8") (version "2.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/rdiff-backup/rdiff-backup-" (uri (string-append "https://github.com/rdiff-backup/rdiff-backup/releases/"
version ".tar.gz")) "download/v" version "/rdiff-backup-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d")))) "1qfmvwwb942srhg6gw77ncy4z5z54b4wfz8bpd5bpml8hp1d5qh4"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
(inputs (inputs
`(("python" ,python-2) `(("python" ,python)
("librsync" ,librsync-0.9))) ("librsync" ,librsync)))
(arguments (arguments
`(#:python ,python-2 `(#:tests? #f)) ; Tests require root/sudo
#:tests? #f)) (home-page "https://rdiff-backup.net/")
(home-page "https://www.nongnu.org/rdiff-backup/")
(synopsis "Local/remote mirroring+incremental backup") (synopsis "Local/remote mirroring+incremental backup")
(description (description
"Rdiff-backup backs up one directory to another, possibly over a network. "Rdiff-backup backs up one directory to another, possibly over a network.
@ -999,7 +1000,7 @@ precious backup space.
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/zbackup/zbackup.git") (url "https://github.com/zbackup/zbackup")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1053,12 +1054,12 @@ is format-agnostic, so you can feed virtually any files to it.")
("util-linux" ,util-linux "lib") ("util-linux" ,util-linux "lib")
("e2fsprogs" ,e2fsprogs))) ("e2fsprogs" ,e2fsprogs)))
(home-page "https://dump.sourceforge.io/") (home-page "https://dump.sourceforge.io/")
(synopsis "Ext2/3/4 filesystem dump/restore utilities") (synopsis "Ext2/3/4 file system dump/restore utilities")
(description "Dump examines files in a filesystem, determines which ones (description "Dump examines files in a file system, determines which ones
need to be backed up, and copies those files to a specified disk, tape or need to be backed up, and copies those files to a specified disk, tape or
other storage medium. Subsequent incremental backups can then be layered on other storage medium. Subsequent incremental backups can then be layered on
top of the full backup. The restore command performs the inverse function of top of the full backup. The restore command performs the inverse function of
dump; it can restore a full backup of a filesystem. Single files and dump; it can restore a full backup of a file system. Single files and
directory subtrees may also be restored from full or partial backups in directory subtrees may also be restored from full or partial backups in
interractive mode.") interractive mode.")
(license license:bsd-3))) (license license:bsd-3)))

8
gnu/packages/base.scm
View file

@ -357,6 +357,7 @@ used to apply commands with arbitrarily long arguments.")
(list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
" tests/misc/kill.sh" " tests/misc/kill.sh"
" tests/misc/nice.sh" " tests/misc/nice.sh"
" tests/misc/pwd-long.sh"
" tests/split/fail.sh" " tests/split/fail.sh"
" test-fdutimensat" " test-fdutimensat"
" test-futimens" " test-futimens"
@ -574,8 +575,8 @@ included.")
;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream). ;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream).
;; Keep this version around until the patch is updated. ;; Keep this version around until the patch is updated.
(define-public binutils-2.33 (define-public binutils-2.33
(package/inherit (package
binutils (inherit binutils)
(version "2.33.1") (version "2.33.1")
(source (origin (source (origin
(inherit (package-source binutils)) (inherit (package-source binutils))
@ -590,8 +591,7 @@ included.")
(properties '()))) (properties '())))
(define-public binutils-gold (define-public binutils-gold
(package (package/inherit binutils+documentation
(inherit binutils)
(name "binutils-gold") (name "binutils-gold")
(arguments (arguments
`(#:phases `(#:phases

57
gnu/packages/bash.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -24,11 +24,13 @@
(define-module (gnu packages bash) (define-module (gnu packages bash)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap) #:use-module (gnu packages bootstrap)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages guile)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -37,6 +39,7 @@
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:autoload (guix gnupg) (gnupg-verify*) #:autoload (guix gnupg) (gnupg-verify*)
#:autoload (guix base32) (bytevector->nix-base32-string) #:autoload (guix base32) (bytevector->nix-base32-string)
@ -327,7 +330,7 @@ completion for many common commands.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/illusori/bash-tap.git") (url "https://github.com/illusori/bash-tap")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -362,3 +365,53 @@ for Bash shell scripts and functions. Along with the Test::More-style testing
helpers it provides helper functions for mocking commands and in-process output helpers it provides helper functions for mocking commands and in-process output
capturing.") capturing.")
(license expat))) (license expat)))
(define-public bats
(package
(name "bats")
(version "1.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bats-core/bats-core")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"))))
(inputs
`(("bash" ,bash)
("coreutils" ,coreutils)
("guile" ,guile-3.0) ;for wrap-script
("grep" ,grep)))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(copy-recursively (assoc-ref %build-inputs "source") ".")
(setenv "PATH"
(string-append (assoc-ref %build-inputs "bash") "/bin"
":" (assoc-ref %build-inputs "coreutils") "/bin"
":" (assoc-ref %build-inputs "grep") "/bin"
":" (assoc-ref %build-inputs "guile") "/bin"
":" (getenv "PATH")))
(for-each (lambda (file) (patch-shebang file)) (find-files "."))
(substitute* "bin/bats"
(("export BATS_ROOT" line)
(string-append "BATS_ROOT=\"${BATS_ROOT:-" %output "/libexec/bats-core}\"\n"
line)))
;; Install phase
(invoke "./install.sh" %output)
(wrap-script (string-append %output "/bin/bats")
(list "PATH" 'prefix (string-split (getenv "PATH")
#\:))))))
(build-system trivial-build-system)
(home-page "https://github.com/bats-core/bats-core/")
(synopsis "Bash Automated Testing System")
(description
"Bats is a @acronym{TAP, Test Anything Protocol}-compliant testing
framework for Bash. It provides a simple way to verify that the UNIX programs
you write behave as expected. Bats is most useful when testing software written
in Bash, but you can use it to test any UNIX program.")
(license expat)))

8
gnu/packages/benchmark.scm
View file

@ -46,14 +46,14 @@
(define-public fio (define-public fio
(package (package
(name "fio") (name "fio")
(version "3.20") (version "3.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/" (uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2")) "fio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1mwqafn81a9pxy2kw9rl4p3r2brhg2ckwrcwzy0q4gffxgn3k9c7")))) "0np1scxqfpd6fcnnnfyn8xdsh6lc5pyq3vk1jm1zk7sa58fvccd4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"
@ -131,7 +131,7 @@ is to write a job file matching the I/O load one wants to simulate.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/intel/mpi-benchmarks.git") (url "https://github.com/intel/mpi-benchmarks")
(commit (string-append "IMB-v" version)))) (commit (string-append "IMB-v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -217,7 +217,7 @@ This can give a much better understanding of the command's performance.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/benchmark.git") (url "https://github.com/google/benchmark")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

77
gnu/packages/bioconductor.scm
View file

@ -1396,14 +1396,14 @@ the Human Protein Atlas project.")
(define-public r-regioner (define-public r-regioner
(package (package
(name "r-regioner") (name "r-regioner")
(version "1.20.0") (version "1.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "regioneR" version)) (uri (bioconductor-uri "regioneR" version))
(sha256 (sha256
(base32 (base32
"10i21gxv0n7lrflhj5ja672xjizy1i4y4iq3pmjgbf0dpy1lxsih")))) "0bzjwzj5mvb49wgvs3gd3jfpm7s0zfkca763i65i7m994lgvz33c"))))
(properties `((upstream-name . "regioneR"))) (properties `((upstream-name . "regioneR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -1587,7 +1587,7 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
("r-reshape2" ,r-reshape2))) ("r-reshape2" ,r-reshape2)))
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr))) `(("r-knitr" ,r-knitr)))
(home-page "http://github.com/jdstorey/qvalue") (home-page "https://github.com/StoreyLab/qvalue")
(synopsis "Q-value estimation for false discovery rate control") (synopsis "Q-value estimation for false discovery rate control")
(description (description
"This package takes a list of p-values resulting from the simultaneous "This package takes a list of p-values resulting from the simultaneous
@ -2934,7 +2934,7 @@ qPCR data, but could be used with other types as well.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cole-trapnell-lab/monocle3.git") (url "https://github.com/cole-trapnell-lab/monocle3")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -5119,14 +5119,14 @@ that arising from 16s metagenomic surveys.")
(define-public r-wiggleplotr (define-public r-wiggleplotr
(package (package
(name "r-wiggleplotr") (name "r-wiggleplotr")
(version "1.12.0") (version "1.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "wiggleplotr" version)) (uri (bioconductor-uri "wiggleplotr" version))
(sha256 (sha256
(base32 (base32
"15l8f7ls2mwhsw68sr1k4r19hmdzjriibr5hpnfbanzj5x6yhdjq")))) "1wknigh1md3w4h68caqlpq945maipdkpmw10hc2rlx4nbbpcnawp"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-assertthat" ,r-assertthat) `(("r-assertthat" ,r-assertthat)
@ -5781,14 +5781,14 @@ annotations.")
(define-public r-rsubread (define-public r-rsubread
(package (package
(name "r-rsubread") (name "r-rsubread")
(version "2.2.2") (version "2.2.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rsubread" version)) (uri (bioconductor-uri "Rsubread" version))
(sha256 (sha256
(base32 (base32
"1wgilpaw70dwg0zilx5i1pmi4j8wri6wi2ha1d3bapfhlwc6igml")))) "0yznfqgp5cbz68n3rrfvm752267da16kl538zdrb1g1aw9zdfqc6"))))
(properties `((upstream-name . "Rsubread"))) (properties `((upstream-name . "Rsubread")))
(build-system r-build-system) (build-system r-build-system)
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
@ -6248,14 +6248,14 @@ sequential way to mimic the manual gating strategy.")
(define-public r-cytoml (define-public r-cytoml
(package (package
(name "r-cytoml") (name "r-cytoml")
(version "2.0.0") (version "2.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "CytoML" version)) (uri (bioconductor-uri "CytoML" version))
(sha256 (sha256
(base32 (base32
"0zpq2j4y9i5lls1kj2w4spl8qjp3076idsr2a2rjvy1fykzlp01q")))) "174brv027mm90lydfg6hnhazwh8jy4vf6ial4hpsfalwa5jrz55n"))))
(properties `((upstream-name . "CytoML"))) (properties `((upstream-name . "CytoML")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -6286,6 +6286,7 @@ sequential way to mimic the manual gating strategy.")
("r-runit" ,r-runit) ("r-runit" ,r-runit)
("r-tibble" ,r-tibble) ("r-tibble" ,r-tibble)
("r-xml" ,r-xml) ("r-xml" ,r-xml)
("r-xml2" ,r-xml2)
("r-yaml" ,r-yaml))) ("r-yaml" ,r-yaml)))
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr))) `(("r-knitr" ,r-knitr)))
@ -6373,14 +6374,14 @@ delete entire rows with missing data.")
(define-public r-depecher (define-public r-depecher
(package (package
(name "r-depecher") (name "r-depecher")
(version "1.4.0") (version "1.4.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DepecheR" version)) (uri (bioconductor-uri "DepecheR" version))
(sha256 (sha256
(base32 (base32
"0nmx04qybzf6nhfngmdxwpbbz9x32v34mbnpg8jq7a2cgchzsj9s")))) "0dscfl6wxpl5538jzkrwisdwbr873d38rzd19vl6z5br71jvpv3v"))))
(properties `((upstream-name . "DepecheR"))) (properties `((upstream-name . "DepecheR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -6455,14 +6456,14 @@ genes in the gene-set that are ranked above the leading edge).")
(define-public r-cicero (define-public r-cicero
(package (package
(name "r-cicero") (name "r-cicero")
(version "1.6.0") (version "1.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "cicero" version)) (uri (bioconductor-uri "cicero" version))
(sha256 (sha256
(base32 (base32
"0n78lf5hz6zzl550dbf4imis43pv91zicfff8y4lspckljhz9z75")))) "0nf9yqg5krj26n4n82iyx3rsr84d46b17i9zfk35sh12l4xssbii"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-assertthat" ,r-assertthat) `(("r-assertthat" ,r-assertthat)
@ -6482,6 +6483,7 @@ genes in the gene-set that are ranked above the leading edge).")
("r-plyr" ,r-plyr) ("r-plyr" ,r-plyr)
("r-reshape2" ,r-reshape2) ("r-reshape2" ,r-reshape2)
("r-s4vectors" ,r-s4vectors) ("r-s4vectors" ,r-s4vectors)
("r-stringi" ,r-stringi)
("r-stringr" ,r-stringr) ("r-stringr" ,r-stringr)
("r-tibble" ,r-tibble) ("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr) ("r-tidyr" ,r-tidyr)
@ -6507,7 +6509,7 @@ accessibility data.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cole-trapnell-lab/cicero-release.git") (url "https://github.com/cole-trapnell-lab/cicero-release")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -6528,7 +6530,7 @@ accessibility data.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/aertslab/cisTopic.git") (url "https://github.com/aertslab/cisTopic")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -6673,14 +6675,14 @@ metrics, with methods for objects produced by the @code{methylumi} and
(define-public r-gdsfmt (define-public r-gdsfmt
(package (package
(name "r-gdsfmt") (name "r-gdsfmt")
(version "1.24.0") (version "1.24.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "gdsfmt" version)) (uri (bioconductor-uri "gdsfmt" version))
(sha256 (sha256
(base32 (base32
"00hggma0i15w03xi9jr02v2593jbqkcxyfcvpp7mdzrshn99m9p6")) "0ipf60wylbhvwk9q3mbnak0f1n6k7spfh90s1c1c0b47ryxsri67"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build ;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build
;; them and link with system libraries instead. ;; them and link with system libraries instead.
@ -7046,14 +7048,14 @@ arrays based on fast wavelet-based functional models.")
(define-public r-variancepartition (define-public r-variancepartition
(package (package
(name "r-variancepartition") (name "r-variancepartition")
(version "1.18.0") (version "1.18.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "variancePartition" version)) (uri (bioconductor-uri "variancePartition" version))
(sha256 (sha256
(base32 (base32
"1rn655qq7dshbk1dd41n7y2hfz8498jxd2j4rk7p8hrikd3s32dm")))) "19bhkb8vd44m3nkznw075fx3y2p3a1bsazbhcfiqw9n4190k9bgv"))))
(properties (properties
`((upstream-name . "variancePartition"))) `((upstream-name . "variancePartition")))
(build-system r-build-system) (build-system r-build-system)
@ -7185,21 +7187,20 @@ using whole genome sequencing data.")
(define-public r-activepathways (define-public r-activepathways
(package (package
(name "r-activepathways") (name "r-activepathways")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ActivePathways" version)) (uri (cran-uri "ActivePathways" version))
(sha256 (sha256
(base32 (base32
"1xb0d1svmzw404pv8ja6wr4773k7x2lxkrzrayilvzqbfzj1wx20")))) "1hxy760x141ykrpqdbfldq4ggj1svj3lsrpwi4rb2x7r4lna937l"))))
(properties (properties
`((upstream-name . "ActivePathways"))) `((upstream-name . "ActivePathways")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-data-table" ,r-data-table) `(("r-data-table" ,r-data-table)
("r-ggplot2" ,r-ggplot2) ("r-ggplot2" ,r-ggplot2)))
("r-metap" ,r-metap)))
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr))) `(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/ActivePathways/") (home-page "https://cran.r-project.org/web/packages/ActivePathways/")
@ -8087,3 +8088,31 @@ metrics, such as the elbow method and Horn's parallel analysis, which has
relevance for data reduction in single-cell RNA-seq (scRNA-seq) and high relevance for data reduction in single-cell RNA-seq (scRNA-seq) and high
dimensional mass cytometry data.") dimensional mass cytometry data.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-rgreat
(package
(name "r-rgreat")
(version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "rGREAT" version))
(sha256
(base32
"0n8dw9ibb2klsczcxvvinpi9l53w8cs436i0c8w2jmramayl593v"))))
(properties `((upstream-name . "rGREAT")))
(build-system r-build-system)
(propagated-inputs
`(("r-genomicranges" ,r-genomicranges)
("r-getoptlong" ,r-getoptlong)
("r-iranges" ,r-iranges)
("r-rcurl" ,r-rcurl)
("r-rjson" ,r-rjson)))
(native-inputs `(("r-knitr" ,r-knitr)))
(home-page "https://github.com/jokergoo/rGREAT")
(synopsis "Client for GREAT analysis")
(description
"This package makes GREAT (Genomic Regions Enrichment of Annotations
Tool) analysis automatic by constructing a HTTP POST request according to
user's input and automatically retrieving results from GREAT web server.")
(license license:expat)))

438
gnu/packages/bioinformatics.scm
View file

File diff suppressed because it is too large Load diff

46
gnu/packages/bittorrent.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -9,7 +9,7 @@
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu> ;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -65,16 +65,15 @@
(define-public transmission (define-public transmission
(package (package
(name "transmission") (name "transmission")
(version "2.94") (version "3.00")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/transmission/transmission"
"https://github.com/transmission/transmission-releases/raw/" "/releases/download/" version "/transmission-"
"master/transmission-" version ".tar.xz")) version ".tar.xz"))
(patches (search-patches "transmission-CVE-2018-10756.patch"))
(sha256 (sha256
(base32 (base32
"0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m")))) "1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(outputs '("out" ; library and command-line interface (outputs '("out" ; library and command-line interface
"gui")) ; graphical user interface "gui")) ; graphical user interface
@ -90,8 +89,7 @@
(gui (assoc-ref outputs "gui"))) (gui (assoc-ref outputs "gui")))
(mkdir-p (string-append gui "/bin")) (mkdir-p (string-append gui "/bin"))
(rename-file (string-append out "/bin/transmission-gtk") (rename-file (string-append out "/bin/transmission-gtk")
(string-append gui (string-append gui "/bin/transmission-gtk"))
"/bin/transmission-gtk"))
;; Move the '.desktop' and icon files as well. ;; Move the '.desktop' and icon files as well.
(mkdir (string-append gui "/share")) (mkdir (string-append gui "/share"))
@ -183,21 +181,19 @@ XML-RPC over SCGI.")
(license l:gpl2+))) (license l:gpl2+)))
(define-public tremc (define-public tremc
(let ((commit "4d50dab7376601daca13f7be6eabc0eaa057c1b0")
(revision "0"))
(package (package
(name "tremc") (name "tremc")
(version (git-version "0.9.1" revision commit)) (version "0.9.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/tremc/tremc.git") (url "https://github.com/tremc/tremc")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qpi65n8rv7l9mg8qyqx70z83inkl8v5r5nks65c99lhscdki0w7")))) "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite `(#:tests? #f ; no test suite
@ -214,7 +210,7 @@ XML-RPC over SCGI.")
(description "Tremc is a console client, with a curses interface, for the (description "Tremc is a console client, with a curses interface, for the
Transmission BitTorrent daemon.") Transmission BitTorrent daemon.")
(home-page "https://github.com/tremc/tremc") (home-page "https://github.com/tremc/tremc")
(license l:gpl3+)))) (license l:gpl3+)))
(define-public transmission-remote-cli (define-public transmission-remote-cli
(package (package
@ -223,7 +219,7 @@ Transmission BitTorrent daemon.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fagga/transmission-remote-cli.git") (url "https://github.com/fagga/transmission-remote-cli")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -347,7 +343,7 @@ downloads, download scheduling, download rate limiting.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Rudde/mktorrent.git") (url "https://github.com/Rudde/mktorrent")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -379,17 +375,17 @@ and will take advantage of multiple processor cores where possible.")
(define-public libtorrent-rasterbar (define-public libtorrent-rasterbar
(package (package
(name "libtorrent-rasterbar") (name "libtorrent-rasterbar")
(version "1.1.14") (version "1.2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"https://github.com/arvidn/libtorrent/releases/download/libtorrent-" "https://github.com/arvidn/libtorrent/releases/download/libtorrent_"
(string-join (string-split version #\.) "_") (string-join (string-split version #\.) "_")
"/libtorrent-rasterbar-" version ".tar.gz")) "/libtorrent-rasterbar-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sn3ingmk1lk9p56f9ifgdwhjg0qizcfgv15wyc9s71nm5fya7sc")))) "001g35janbxi20c7jzsf3ii9mkagz4kdsp7f3sz5r0n0cng0c05w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -416,16 +412,16 @@ desktops.")
(define-public qbittorrent (define-public qbittorrent
(package (package
(name "qbittorrent") (name "qbittorrent")
(version "4.2.1") (version "4.2.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/qbittorrent/qBittorrent.git") (url "https://github.com/qbittorrent/qBittorrent")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil")))) (base32 "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

4
gnu/packages/boost.scm
View file

@ -288,7 +288,7 @@ across a broad spectrum of applications.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/boostorg/sync.git") (url "https://github.com/boostorg/sync")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -317,7 +317,7 @@ Boost.Thread.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/boostorg/signals2.git") (url "https://github.com/boostorg/signals2")
(commit (string-append "boost-" version)))) (commit (string-append "boost-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

19
gnu/packages/bootloaders.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
@ -11,7 +11,6 @@
;;; Copyright © 2019 nee <nee@cock.li> ;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; ;;;
@ -97,7 +96,8 @@
(patches (search-patches (patches (search-patches
"grub-efi-fat-serial-number.patch" "grub-efi-fat-serial-number.patch"
"grub-setup-root.patch" "grub-setup-root.patch"
"grub-verifiers-Blocklist-fallout-cleanup.patch")))) "grub-verifiers-Blocklist-fallout-cleanup.patch"
"grub-cross-system-i686.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -446,7 +446,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot (define u-boot
(package (package
(name "u-boot") (name "u-boot")
(version "2020.04") (version "2020.07")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -454,7 +454,7 @@ tree binary files. These are board description files used by Linux and BSD.")
"u-boot-" version ".tar.bz2")) "u-boot-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy")))) "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"))))
(native-inputs (native-inputs
`(("bc" ,bc) `(("bc" ,bc)
("bison" ,bison) ("bison" ,bison)
@ -885,15 +885,6 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))
(package (package
(inherit base) (inherit base)
(source (origin
(inherit (package-source u-boot))
(patches
(search-patches "u-boot-add-boe-nv140fhmn49-display.patch"
"u-boot-gpio-keys-binding-cons.patch"
"u-boot-leds-common-binding-con.patch"
"u-boot-DT-for-Pinebook-Pro.patch"
"u-boot-support-Pinebook-Pro-laptop.patch"
"u-boot-video-rockchip-fix-build.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:phases phases) ((#:phases phases)

14
gnu/packages/build-tools.scm
View file

@ -59,7 +59,7 @@
;; do not use auto-generated tarballs ;; do not use auto-generated tarballs
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/matricks/bam.git") (url "https://github.com/matricks/bam")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -111,8 +111,8 @@ generate such a compilation database.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gn (define-public gn
(let ((commit "ec938ddaa276646eb8f1ab33e160c156011d8217") (let ((commit "eb997b5ab9c3f1ba6a2c52072785884864a84eae")
(revision "1736")) ;as returned by `git describe`, used below (revision "1794")) ;as returned by `git describe`, used below
(package (package
(name "gn") (name "gn")
(version (git-version "0.0" revision commit)) (version (git-version "0.0" revision commit))
@ -122,7 +122,7 @@ generate such a compilation database.")
(uri (git-reference (url home-page) (commit commit))) (uri (git-reference (url home-page) (commit commit)))
(sha256 (sha256
(base32 (base32
"0j1qjwp2biw12s6npzpx4z8nvih7pyn68q6cz2k4700bk9y0d574")) "1vfkcy34wqhg7wsk7jdzhgnnzwim10wgbxv5bnavxzjcs871i2xa"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -259,7 +259,7 @@ other lower-level build files.")
(define-public premake5 (define-public premake5
(package (package
(inherit premake4) (inherit premake4)
(version "5.0.0-alpha14") (version "5.0.0-alpha15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/premake/premake-core/" (uri (string-append "https://github.com/premake/premake-core/"
@ -267,11 +267,13 @@ other lower-level build files.")
"/premake-" version "-src.zip")) "/premake-" version "-src.zip"))
(sha256 (sha256
(base32 (base32
"0236s7bjvxf7x1l5faywmfzjywflpx42ngyhkn0mqqjnh54a97vw")))) "0lyxfyqxyhjqsb3kmx1fyrxinb26i68hb7w7rg8lajczrgkmc3w8"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments premake4) (substitute-keyword-arguments (package-arguments premake4)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(replace 'enter-source
(lambda _ (chdir "build/gmake2.unix") #t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(install-file "../../bin/release/premake5" (install-file "../../bin/release/premake5"

15
gnu/packages/busybox.scm
View file

@ -60,7 +60,8 @@
(("default y") "default n")) (("default y") "default n"))
#t)) #t))
(replace 'configure (replace 'configure
(lambda _ (invoke "make" "defconfig"))) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "defconfig" make-flags)))
(add-after 'configure 'dont-install-to-usr (add-after 'configure 'dont-install-to-usr
(lambda _ (lambda _
(substitute* ".config" (substitute* ".config"
@ -68,7 +69,7 @@
"CONFIG_INSTALL_NO_USR=y")) "CONFIG_INSTALL_NO_USR=y"))
#t)) #t))
(replace 'check (replace 'check
(lambda _ (lambda* (#:key make-flags #:allow-other-keys)
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
"testsuite/du/du-works") "testsuite/du/du-works")
(("/bin") "/etc")) ; there is no /bin but there is a /etc (("/bin") "/etc")) ; there is no /bin but there is a /etc
@ -96,17 +97,17 @@
(delete-file "testsuite/which/which-uses-default-path") (delete-file "testsuite/which/which-uses-default-path")
(rmdir "testsuite/which") (rmdir "testsuite/which")
(invoke "make" (apply invoke "make"
;; "V=1" ;; "V=1"
"SKIP_KNOWN_BUGS=1" "SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1" "SKIP_INTERNET_TESTS=1"
"check"))) "check" make-flags)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(invoke "make" (apply invoke "make"
(string-append "CONFIG_PREFIX=" out) (string-append "CONFIG_PREFIX=" out)
"install"))))))) "install" make-flags)))))))
(native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
;; The following are needed by the tests. ;; The following are needed by the tests.
("inetutils" ,inetutils) ("inetutils" ,inetutils)

47
gnu/packages/c.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright @ 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright @ 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -310,7 +311,7 @@ any other grammar rules.")
(define-public sparse (define-public sparse
(package (package
(name "sparse") (name "sparse")
(version "0.6.1") (version "0.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -318,7 +319,7 @@ any other grammar rules.")
"sparse-" version ".tar.xz")) "sparse-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0qavyryxmhd1rf11akgn1nq3r15k11bqa3qajaq36a56r225rc7x")))) "1z11chawwcmf5xxx5v52cj7wrr3warz6q5wlcjvxpif1jbga172i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(arguments (arguments
@ -350,7 +351,7 @@ releases.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rsyslog/libestr.git") (url "https://github.com/rsyslog/libestr")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -383,7 +384,7 @@ more, like escaping special characters.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rsyslog/libfastjson.git") (url "https://github.com/rsyslog/libfastjson")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -410,7 +411,7 @@ with essential JSON handling functions, sufficiently good JSON support (not
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rsyslog/liblogging.git") (url "https://github.com/rsyslog/liblogging")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -436,3 +437,39 @@ with essential JSON handling functions, sufficiently good JSON support (not
"Liblogging is an easy to use library for logging. It offers an enhanced "Liblogging is an easy to use library for logging. It offers an enhanced
replacement for the syslog() call, but retains its ease of use.") replacement for the syslog() call, but retains its ease of use.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public unifdef
(package
(name "unifdef")
(version "2.12")
(source (origin
(method url-fetch)
;; https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz
(uri (string-append "https://dotat.at/prog/" name "/"
name "-" version ".tar.xz"))
(sha256
(base32
"00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "FreeBSD")
(delete-file-recursively "win32")
#t))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure))
#:make-flags (list "CC=gcc" (string-append "prefix=" %output))
#:tests? #f)) ;no test suite
(native-inputs
`(("perl" ,perl)))
(home-page "https://dotat.at/prog/unifdef/")
(synopsis "Utility to selectively processes conditional C preprocessor")
(description "The @command{unifdef} utility selectively processes
conditional C preprocessor @code{#if} and @code{#ifdef} directives. It
removes from a file both the directives and the additional text that they
delimit, while otherwise leaving the file alone. It can be useful for
avoiding distractions when studying code that uses @code{#ifdef} heavily for
portability.")
(license (list license:bsd-2 ;all files except...
license:bsd-3)))) ;...the unidef.1 manual page

9
gnu/packages/calendar.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -63,7 +64,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/HowardHinnant/date.git") (url "https://github.com/HowardHinnant/date")
(commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -195,6 +196,12 @@ data units.")
"doc/build/man/khal.1" "doc/build/man/khal.1"
(string-append (assoc-ref outputs "out") "/share/man/man1")) (string-append (assoc-ref outputs "out") "/share/man/man1"))
#t)) #t))
(add-before 'check 'fix-tests
(lambda _
;; Reported upstream: <https://github.com/pimutils/khal/issues/947>.
(substitute* "tests/cli_test.py"
(("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'"))
#t))
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The tests require us to choose a timezone. ;; The tests require us to choose a timezone.

4
gnu/packages/ccache.scm
View file

@ -30,14 +30,14 @@
(define-public ccache (define-public ccache
(package (package
(name "ccache") (name "ccache")
(version "3.7.9") (version "3.7.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ccache/ccache/releases/download/v" (uri (string-append "https://github.com/ccache/ccache/releases/download/v"
version "/ccache-" version ".tar.xz")) version "/ccache-" version ".tar.xz"))
(sha256 (sha256
(base32 "0jzl9idnjd9jq64qd8kny7gfd0ydvz5kyq2yslmigfdz8dsxm4zq")))) (base32 "0s1g0ylrayzax68xlqnxx46f5bhvr2pcm1yzswmj0kcs14404icd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl) ; for test/run (native-inputs `(("perl" ,perl) ; for test/run
("which" ,(@ (gnu packages base) which)))) ("which" ,(@ (gnu packages base) which))))

4
gnu/packages/cdrom.scm
View file

@ -253,7 +253,7 @@ reconstruction capability.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cdrdao/cdrdao.git") (url "https://github.com/cdrdao/cdrdao")
(commit (commit
(string-append "rel_" (string-replace-substring version "." "_"))))) (string-append "rel_" (string-replace-substring version "." "_")))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
@ -555,7 +555,7 @@ graphical interface.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lipnitsk/libcue.git") (url "https://github.com/lipnitsk/libcue")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

100
gnu/packages/check.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
@ -33,6 +33,7 @@
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com> ;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -116,6 +117,54 @@ source code editors and IDEs.")
(base32 (base32
"0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6")))))) "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6"))))))
(define-public clitest
(package
(name "clitest")
(version "0.3.0")
(home-page "https://github.com/aureliojargas/clitest")
(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
"0zw5wra9hc717srmcar1wm4i34kyj8c49ny4bb7y3nrvkjp2pdb5"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; This package is distributed as a single shell script and comes
;; without a proper build system.
(delete 'configure)
(delete 'build)
(replace 'check
(lambda _
(substitute* "test.md"
;; One test looks for an error from grep in the form "grep: foo",
;; but our grep returns the absolute file name on errors. Adjust
;; the test to cope with that.
(("sed 's/\\^e\\*grep: \\.\\*/")
"sed 's/.*e*grep: .*/"))
(setenv "HOME" "/tmp")
(invoke "./clitest" "test.md")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "clitest" (string-append out "/bin"))
(install-file "README.md"
(string-append out "/share/doc/clitest-" ,version))
#t))))))
(native-inputs
`(("perl" ,perl))) ;for tests
(synopsis "Command line test tool")
(description
"@command{clitest} is a portable shell script that performs automatic
testing of Unix command lines.")
(license license:expat)))
(define-public cunit (define-public cunit
(package (package
(name "cunit") (name "cunit")
@ -396,7 +445,7 @@ and it supports a very flexible form of test discovery.")
(define-public doctest (define-public doctest
(package (package
(name "doctest") (name "doctest")
(version "2.3.8") (version "2.4.0")
(home-page "https://github.com/onqtam/doctest") (home-page "https://github.com/onqtam/doctest")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -404,7 +453,7 @@ and it supports a very flexible form of test discovery.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65")))) "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "C++ test framework") (synopsis "C++ test framework")
(description (description
@ -421,7 +470,7 @@ has been designed to be fast, light and unintrusive.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/go-check/check.git") (url "https://github.com/go-check/check")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -527,7 +576,7 @@ test coverage and has a web user interface that will refresh automatically.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/googletest.git") (url "https://github.com/google/googletest")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -551,7 +600,7 @@ generation.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/googletest.git") (url "https://github.com/google/googletest")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name "googletest" version)) (file-name (git-file-name "googletest" version))
(sha256 (sha256
@ -970,6 +1019,33 @@ supports coverage of subprocesses.")
(define-public python2-pytest-runner-2 (define-public python2-pytest-runner-2
(package-with-python2 python-pytest-runner-2)) (package-with-python2 python-pytest-runner-2))
(define-public python-pytest-lazy-fixture
(package
(name "python-pytest-lazy-fixture")
(version "0.6.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-lazy-fixture" version))
(sha256
(base32 "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make the installed plugin discoverable by Pytest.
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(propagated-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/tvorog/pytest-lazy-fixture")
(synopsis "Use fixtures in @code{pytest.mark.parametrize}")
(description "This plugin helps to use fixtures in
@code{pytest.mark.parametrize}.")
(license license:expat)))
(define-public python-pytest-mock (define-public python-pytest-mock
(package (package
(name "python-pytest-mock") (name "python-pytest-mock")
@ -1446,7 +1522,7 @@ have failed since the last commit or what tests are currently failing.")))
(arguments (arguments
;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors.
'(#:tests? #f)) '(#:tests? #f))
(home-page "http://nedbatchelder.com/code/coverage") (home-page "https://coverage.readthedocs.io")
(synopsis "Code coverage measurement for Python") (synopsis "Code coverage measurement for Python")
(description (description
"Coverage measures code coverage, typically during test execution. It "Coverage measures code coverage, typically during test execution. It
@ -1524,7 +1600,7 @@ testing frameworks.")
(propagated-inputs (propagated-inputs
`(("python-coverage" ,python-coverage) `(("python-coverage" ,python-coverage)
("python-requests" ,python-requests))) ("python-requests" ,python-requests)))
(home-page "http://github.com/codecov/codecov-python") (home-page "https://github.com/codecov/codecov-python")
(synopsis "Upload code coverage reports to @code{codecov.io}") (synopsis "Upload code coverage reports to @code{codecov.io}")
(description (description
"Codecov collects code coverage reports from code written in Python, Java, "Codecov collects code coverage reports from code written in Python, Java,
@ -1822,13 +1898,13 @@ failures.")
(define-public python-pytest-flakes (define-public python-pytest-flakes
(package (package
(name "python-pytest-flakes") (name "python-pytest-flakes")
(version "1.0.1") (version "4.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-flakes" version)) (uri (pypi-uri "pytest-flakes" version))
(sha256 (sha256
(base32 (base32
"0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw")))) "0hyind0gb950v9kfy0v97x66fb33slbqmxhrjvgbvsv0ayzn869l"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1839,7 +1915,7 @@ failures.")
;; It's easier to run tests after install. ;; It's easier to run tests after install.
;; Make installed package available for running the tests ;; Make installed package available for running the tests
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(invoke "py.test" "-vv")))))) (invoke "py.test" "-vv" "-k" "not test_syntax_error"))))))
(native-inputs (native-inputs
`(("python-coverage" ,python-coverage) `(("python-coverage" ,python-coverage)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
@ -2087,7 +2163,7 @@ a fork of pytest-capturelog.")
(propagated-inputs (propagated-inputs
`(("python-coverage" ,python-coverage) `(("python-coverage" ,python-coverage)
("python-nose" ,python-nose))) ("python-nose" ,python-nose)))
(home-page "http://github.com/cmheisel/nose-xcover") (home-page "https://github.com/cmheisel/nose-xcover")
(synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports") (synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports")
(description "Nose-xcover is a companion to the built-in (description "Nose-xcover is a companion to the built-in
@code{nose.plugins.cover}. This plugin will write out an XML coverage report @code{nose.plugins.cover}. This plugin will write out an XML coverage report

4
gnu/packages/chemistry.scm
View file

@ -57,7 +57,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cryos/avogadro.git") (url "https://github.com/cryos/avogadro")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2"))
@ -313,7 +313,7 @@ NumPy < 1.9.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/gromacs/tng.git") (url "https://github.com/gromacs/tng")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

14
gnu/packages/chez.scm
View file

@ -46,7 +46,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/nanopass/nanopass-framework-scheme.git") (url "https://github.com/nanopass/nanopass-framework-scheme")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri")) (sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
(file-name (git-file-name "nanopass" version))))) (file-name (git-file-name "nanopass" version)))))
@ -56,7 +56,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dybvig/stex.git") (url "https://github.com/dybvig/stex")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n")) (sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
(file-name (git-file-name "stex" version))))) (file-name (git-file-name "stex" version)))))
@ -69,7 +69,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cisco/ChezScheme.git") (url "https://github.com/cisco/ChezScheme")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5")) (base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5"))
@ -230,7 +230,7 @@ and 32-bit PowerPC architectures.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fedeinthemix/chez-srfi.git") (url "https://github.com/fedeinthemix/chez-srfi")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf")) (base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf"))
@ -261,7 +261,7 @@ and 32-bit PowerPC architectures.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/arcfide/ChezWEB.git") (url "https://github.com/arcfide/ChezWEB")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -326,7 +326,7 @@ programming in Scheme.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/arcfide/chez-sockets.git") (url "https://github.com/arcfide/chez-sockets")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -456,7 +456,7 @@ Chez Scheme.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fedeinthemix/chez-irregex.git") (url "https://github.com/fedeinthemix/chez-irregex")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q")) (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q"))

377
gnu/packages/chromium.scm
View file

@ -55,6 +55,7 @@
#:use-module (gnu packages nss) #:use-module (gnu packages nss)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -98,6 +99,7 @@
"third_party/angle/src/third_party/compiler" ;BSD-2 "third_party/angle/src/third_party/compiler" ;BSD-2
"third_party/angle/src/third_party/libXNVCtrl" ;Expat "third_party/angle/src/third_party/libXNVCtrl" ;Expat
"third_party/angle/src/third_party/trace_event" ;BSD-3 "third_party/angle/src/third_party/trace_event" ;BSD-3
"third_party/angle/src/third_party/volk" ;Expat
"third_party/angle/third_party/vulkan-headers" ;ASL2.0 "third_party/angle/third_party/vulkan-headers" ;ASL2.0
"third_party/angle/third_party/vulkan-loader" ;ASL2.0 "third_party/angle/third_party/vulkan-loader" ;ASL2.0
"third_party/angle/third_party/vulkan-tools" ;ASL2.0 "third_party/angle/third_party/vulkan-tools" ;ASL2.0
@ -117,6 +119,7 @@
;; XXX: This is a minified version of <https://d3js.org/>. ;; XXX: This is a minified version of <https://d3js.org/>.
"third_party/catapult/tracing/third_party/d3" ;BSD-3 "third_party/catapult/tracing/third_party/d3" ;BSD-3
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
"third_party/catapult/tracing/third_party/jpeg-js" ;ASL2.0
;; XXX: Minified version of <https://github.com/Stuk/jszip>. ;; XXX: Minified version of <https://github.com/Stuk/jszip>.
"third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3 "third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3
"third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat "third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat
@ -135,7 +138,10 @@
"third_party/dawn" ;ASL2.0 "third_party/dawn" ;ASL2.0
"third_party/depot_tools/owners.py" ;BSD-3 "third_party/depot_tools/owners.py" ;BSD-3
"third_party/devtools-frontend" ;BSD-3 "third_party/devtools-frontend" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat "third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
"third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0 "third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
@ -148,6 +154,7 @@
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat "third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat
"third_party/googletest" ;BSD-3 "third_party/googletest" ;BSD-3
"third_party/harfbuzz-ng" ;Expat
"third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+ "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
"third_party/iccjpeg" ;IJG "third_party/iccjpeg" ;IJG
"third_party/inspector_protocol" ;BSD-3 "third_party/inspector_protocol" ;BSD-3
@ -155,6 +162,7 @@
"third_party/jstemplate" ;ASL2.0 "third_party/jstemplate" ;ASL2.0
"third_party/khronos" ;Expat, SGI "third_party/khronos" ;Expat, SGI
"third_party/leveldatabase" ;BSD-3 "third_party/leveldatabase" ;BSD-3
"third_party/libavif" ;BSD-2
"third_party/libXNVCtrl" ;Expat "third_party/libXNVCtrl" ;Expat
"third_party/libaddressinput" ;ASL2.0 "third_party/libaddressinput" ;ASL2.0
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
@ -170,7 +178,9 @@
"third_party/libwebm" ;BSD-3 "third_party/libwebm" ;BSD-3
"third_party/libxml/chromium" ;BSD-3 "third_party/libxml/chromium" ;BSD-3
"third_party/libyuv" ;BSD-3 "third_party/libyuv" ;BSD-3
"third_party/lottie" ;Expat
"third_party/lss" ;BSD-3 "third_party/lss" ;BSD-3
"third_party/mako" ;Expat
"third_party/markupsafe" ;BSD-3 "third_party/markupsafe" ;BSD-3
"third_party/mesa_headers" ;Expat, SGI "third_party/mesa_headers" ;Expat, SGI
"third_party/metrics_proto" ;BSD-3 "third_party/metrics_proto" ;BSD-3
@ -181,6 +191,7 @@
"third_party/one_euro_filter" ;BSD-3 "third_party/one_euro_filter" ;BSD-3
"third_party/openscreen" ;BSD-3 "third_party/openscreen" ;BSD-3
"third_party/openscreen/src/third_party/tinycbor" ;Expat "third_party/openscreen/src/third_party/tinycbor" ;Expat
"third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
"third_party/ots" ;BSD-3 "third_party/ots" ;BSD-3
"third_party/pdfium" ;BSD-3 "third_party/pdfium" ;BSD-3
"third_party/pdfium/third_party/agg23" ;Expat "third_party/pdfium/third_party/agg23" ;Expat
@ -199,6 +210,7 @@
"third_party/qcms" ;Expat "third_party/qcms" ;Expat
"third_party/rnnoise" ;BSD-3 "third_party/rnnoise" ;BSD-3
"third_party/s2cellid" ;ASL2.0 "third_party/s2cellid" ;ASL2.0
"third_party/schema_org" ;CC-BY-SA3.0
"third_party/skia" ;BSD-3 "third_party/skia" ;BSD-3
"third_party/skia/include/third_party/skcms" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3
"third_party/skia/third_party/skcms" ;BSD-3 "third_party/skia/third_party/skcms" ;BSD-3
@ -208,14 +220,22 @@
"third_party/spirv-headers" ;ASL2.0 "third_party/spirv-headers" ;ASL2.0
"third_party/SPIRV-Tools" ;ASL2.0 "third_party/SPIRV-Tools" ;ASL2.0
"third_party/sqlite" ;Public domain "third_party/sqlite" ;Public domain
"third_party/swiftshader" ;ASL2.0
"third_party/swiftshader/third_party/astc-encoder" ;ASL2.0
"third_party/swiftshader/third_party/llvm-7.0" ;NCSA
"third_party/swiftshader/third_party/llvm-subzero" ;NCSA
"third_party/swiftshader/third_party/marl" ;ASL2.0
"third_party/swiftshader/third_party/subzero" ;NCSA
"third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style
"third_party/usb_ids" ;BSD-3 "third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2 "third_party/usrsctp" ;BSD-2
"third_party/vulkan_memory_allocator" ;Expat
"third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3 "third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
"third_party/wayland-protocols" ;Expat "third_party/wayland-protocols" ;Expat
"third_party/web-animations-js" ;ASL2.0 "third_party/web-animations-js" ;ASL2.0
"third_party/webdriver" ;ASL2.0 "third_party/webdriver" ;ASL2.0
"third_party/webrtc" ;BSD-3 "third_party/webrtc" ;BSD-3
"third_party/webrtc/common_audio/third_party/fft4g" ;Non-copyleft "third_party/webrtc/common_audio/third_party/ooura" ;Non-copyleft
"third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain
"third_party/webrtc/modules/third_party/fft" ;Non-copyleft "third_party/webrtc/modules/third_party/fft" ;Non-copyleft
"third_party/webrtc/modules/third_party/g711" ;Public domain "third_party/webrtc/modules/third_party/g711" ;Public domain
@ -226,7 +246,6 @@
"third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3 "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
"third_party/woff2" ;ASL2.0 "third_party/woff2" ;ASL2.0
"third_party/xdg-utils" ;Expat "third_party/xdg-utils" ;Expat
"third_party/yasm/run_yasm.py" ;BSD-2 or BSD-3
"third_party/zlib/google" ;BSD-3 "third_party/zlib/google" ;BSD-3
"url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
"v8/src/third_party/siphash" ;Public domain "v8/src/third_party/siphash" ;Public domain
@ -235,36 +254,72 @@
"v8/third_party/inspector_protocol" ;BSD-3 "v8/third_party/inspector_protocol" ;BSD-3
"v8/third_party/v8/builtins")) ;PSFL "v8/third_party/v8/builtins")) ;PSFL
(define* (computed-origin-method gexp-promise hash-algo hash (define %blacklisted-files
#:optional (name "source") ;; 'third_party/blink/perf_tests/resources/svg/HarveyRayner.svg' carries a
#:key (system (%current-system)) ;; nonfree license according to LICENSES in the same directory. As we don't
(guile (default-guile))) ;; run the Blink performance tests, just remove everything to save ~24MiB.
"Return a derivation that executes the G-expression that results '("third_party/blink/perf_tests"))
from forcing GEXP-PROMISE."
(mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "computed-origin")
(force gexp-promise)
#:graft? #f ;nothing to graft
#:system system
#:guile-for-build guile)))
(define %chromium-version "81.0.4044.138") (define (gentoo-patch name revision hash)
(define %ungoogled-revision "c2a89fb6b5b559c826796c811741fa8ed3e11de8")
(define %debian-revision "debian/81.0.4044.92-1")
(define package-revision "0")
(define %package-version (string-append %chromium-version "-"
package-revision "."
(string-take %ungoogled-revision 7)))
(define %chromium-origin
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://commondatastorage.googleapis.com" (uri (string-append "https://gitweb.gentoo.org/repo/gentoo.git/plain"
"/chromium-browser-official/chromium-" "/www-client/chromium/files/" name "?id=" revision))
%chromium-version ".tar.xz")) (file-name (string-append "ungoogled-" name))
(sha256 (base32 hash))))
;; This repository contains libstdc++ compatibility patches for Chromium.
(define (chromium-gcc-patchset commit hash)
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stha09/chromium-patches")
(commit commit)))
(file-name (git-file-name "chromium-gcc-patches" commit))
(sha256 (base32 hash))))
(define (debian-patch name revision hash)
(origin
(method url-fetch)
(uri (string-append "https://salsa.debian.org/chromium-team/chromium/-/raw/"
revision "/debian/patches/" name))
(file-name (match (string-split name #\/)
((category name)
(string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash))))
(define %ungoogled-revision "df199c04ff367da59ce52a23a3f3b305dd3b00c3")
(define %debian-revision "debian/83.0.4103.116-3")
(define %gentoo-revision "f3f649046d31ebdbc8c4a302b2384504eff78027")
(define %gentoo-patches
;; This patch is necessary for compatibility with FFmpeg 4.3.
(list (gentoo-patch "chromium-84-mediaalloc.patch" %gentoo-revision
"0snxdc4nb8ykzncz62vpsl8hgxpy24m17mycx67i2gckmrpslzzv")))
(define %chromium-gcc-patches
(chromium-gcc-patchset
"chromium-84-patchset-3"
"0l05gx3pn703n47anjwsl5sjcqw8kaxmivf7llax97kj3k6d127v"))
(define %debian-patches
(list (debian-patch "system/zlib.patch" %debian-revision
"0bp2vh1cgmwjrn1zkpphkd3bs662s23xwdhy3abm9cfjvwrj117n")
(debian-patch "system/jsoncpp.patch" %debian-revision
"0d95brl4a5y5w142yd0rvf59z513h7chsz0vnm034d6lqf22ahwf")
(debian-patch "system/openjpeg.patch" %debian-revision
"0zd6v5njx1pc7i0y6mslxvpx5j4cq01mmyx55qcqx8qzkm0gm48j")))
(define %arch-patches
(list (origin
(method url-fetch)
(uri "https://git.archlinux.org/svntogit/packages.git/plain/trunk/\
chromium-fix-vaapi-on-intel.patch?h=packages/chromium\
&id=93b5b90621b4827084288197c6e0e09b987b372a")
(file-name "ungoogled-chromium-fix-vaapi-on-intel.patch")
(sha256 (sha256
(base32 (base32
"19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l")))) "16jbjjf4d9jp52rdrrxx5vm69nx3w0qrijgjpwapnmcif13z55g4")))))
(define %ungoogled-origin (define %ungoogled-origin
(origin (origin
@ -275,67 +330,37 @@ from forcing GEXP-PROMISE."
(string-take %ungoogled-revision 7))) (string-take %ungoogled-revision 7)))
(sha256 (sha256
(base32 (base32
"0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q")))) "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0"))))
(define %debian-origin ;; This is a source 'snippet' that does the following:
(origin ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility.
(method git-fetch) ;; *) Runs the ungoogled patch-, domain substitution-, and scrubbing scripts.
(uri (git-reference
(url "https://salsa.debian.org/chromium-team/chromium.git")
(commit %debian-revision)))
(file-name (git-file-name "debian-chromium-packaging"
(match (string-split %debian-revision #\/)
((_ revision) revision)
(_ (string-take %debian-revision 7)))))
(sha256
(base32
"0srgbcqga3l75bfkv3bnmjk416189nazsximvzdx2k5n8v5k4p3m"))))
;; This is a "computed" origin that does the following:
;; *) Runs the Ungoogled scripts on a pristine Chromium tarball.
;; *) Applies Debians Chromium patches, for their unbundling and GCC work.
;; *) Prunes all third_party directories that are not explicitly preserved. ;; *) Prunes all third_party directories that are not explicitly preserved.
;; *) Adjusts "GN" build files such that system libraries are preferred. ;; *) Adjusts "GN" build files such that system libraries are preferred.
(define ungoogled-chromium-source (define ungoogled-chromium-snippet
(let ((chromium-source %chromium-origin) ;; Note: delay to cope with cyclic module imports at the top level.
(ungoogled-source %ungoogled-origin)
(debian-source %debian-origin))
(origin
(method computed-origin-method)
(file-name (string-append "ungoogled-chromium-" %package-version ".tar.xz"))
(sha256 #f)
(uri
(delay (delay
(with-imported-modules '((guix build utils))
#~(begin #~(begin
(use-modules (guix build utils) (let ((chromium-dir (getcwd)))
(ice-9 rdelim)
(srfi srfi-1)
(srfi srfi-26))
(let ((chromium-dir (string-append "chromium-" #$%chromium-version))
(preserved-files (list #$@%preserved-third-party-files)))
(set-path-environment-variable (set-path-environment-variable
"PATH" '("bin") "PATH" '("bin")
(list #+(canonical-package patch) (list #+patch #+python-wrapper #+xz))
#+(canonical-package xz)
#+(canonical-package tar)
#+python-wrapper))
(copy-recursively #+ungoogled-source "/tmp/ungoogled") ;; Apply patches before running the ungoogled scripts because
;; domain substitution may break some of the patches.
(with-directory-excursion "/tmp/ungoogled" (format #t "Applying assorted build fixes...~%")
(format #t "Unpacking chromium tarball...~%")
(force-output) (force-output)
(invoke "tar" "xf" #+chromium-source) (for-each (lambda (patch)
(invoke "patch" "-p1" "--force" "--input"
;; Ungoogled-Chromium contains a forked subset of the Debian patch "--no-backup-if-mismatch"))
;; patches. Disable those, as we apply newer versions later. (append
(substitute* "patches/series" '#+%gentoo-patches '#+%debian-patches '#+%arch-patches
((".*/debian/.*") (find-files #$%chromium-gcc-patches "\\.patch$")
"")) '#+(list (local-file
(search-patch
"ungoogled-chromium-system-nspr.patch")))))
(with-directory-excursion #+%ungoogled-origin
(format #t "Ungooglifying...~%") (format #t "Ungooglifying...~%")
(force-output) (force-output)
(invoke "python" "utils/prune_binaries.py" chromium-dir (invoke "python" "utils/prune_binaries.py" chromium-dir
@ -344,76 +369,35 @@ from forcing GEXP-PROMISE."
chromium-dir "patches") chromium-dir "patches")
(invoke "python" "utils/domain_substitution.py" "apply" "-r" (invoke "python" "utils/domain_substitution.py" "apply" "-r"
"domain_regex.list" "-f" "domain_substitution.list" "domain_regex.list" "-f" "domain_substitution.list"
"-c" "/tmp/domainscache.tar.gz" chromium-dir) "-c" "/tmp/domainscache.tar.gz" chromium-dir))
(with-directory-excursion chromium-dir ;; Run after the ungoogled scripts to avoid interfering with
;; patches or file lists.
(format #t "Applying Debian patches...~%") (format #t "Removing blacklisted files...~%")
(force-output) (force-output)
(let* ((debian #+debian-source) (for-each delete-file-recursively '#$%blacklisted-files)
(patches (string-append debian "/debian/patches"))
(series (string-append patches "/series")))
(with-input-from-file series
(lambda ()
(let loop ((line (read-line)))
(unless (eof-object? line)
(when (and (> (string-length line) 1)
(not (string-prefix? "#" line))
;; Skip the Debian-specific ones.
(not (string-prefix? "debianization/" line))
(not (string-prefix? "buster/" line))
(not (any (cute string-suffix? <> line)
;; These conflict with Ungoogled.
'("widevine-buildflag.patch"
"signin.patch"
"third-party-cookies.patch"
;; Disable workarounds for the
;; Chromium "-lite" tarball. We
;; use the "full" version and don't
;; need these patches.
"closure.patch"
"owners.patch"
;; XXX: 'fixes/inspector.patch'
;; makes v8 reuse the top-level
;; third_party/inspector_protocol
;; instead of its own bundled copy,
;; but that does not work here for
;; some reason. Ignore that patch
;; and those that depend on it.
"inspector.patch"))))
(invoke "patch" "--force" "-p1" "--input"
(string-append patches "/" line)
"--no-backup-if-mismatch"))
(loop (read-line)))))))
(format #t "Pruning third party files...~%") (format #t "Pruning third party files...~%")
(force-output) (force-output)
(apply invoke (string-append #+python-2 "/bin/python") (apply invoke (string-append #+python-2 "/bin/python")
"build/linux/unbundle/remove_bundled_libraries.py" "build/linux/unbundle/remove_bundled_libraries.py"
"--do-remove" preserved-files) "--do-remove" '#$%preserved-third-party-files)
(format #t "Replacing GN files...~%") (format #t "Replacing GN files...~%")
(force-output) (force-output)
(substitute* "tools/generate_shim_headers/generate_shim_headers.py"
;; The "is_official_build" configure option enables certain
;; release optimizations like those used in the commercial
;; Chrome browser. Unfortunately it also requires using the
;; bundled libraries: lose that restriction.
(("#if defined\\(OFFICIAL_BUILD\\)")
"#if 0"))
(invoke "python" "build/linux/unbundle/replace_gn_files.py" (invoke "python" "build/linux/unbundle/replace_gn_files.py"
"--system-libraries" "ffmpeg" "flac" "fontconfig" "--system-libraries" "ffmpeg" "flac" "fontconfig"
"freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
"libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libjpeg" "libpng" "libvpx" "libwebp" "libxml"
"libxslt" "openh264" "opus" "re2" "snappy" "yasm" "libxslt" "openh264" "opus" "re2" "snappy" "zlib")
"zlib")) #t))))
(format #t (string-append "Packing new ungoogled tarball ...~%"))
(force-output)
(invoke "tar" "cvfa" #$output
;; Avoid non-determinism in the archive.
"--mtime=@0"
"--owner=root:0"
"--group=root:0"
"--sort=name"
chromium-dir)
#t)))))))))
(define opus+custom (define opus+custom
(package/inherit opus (package/inherit opus
@ -427,12 +411,57 @@ from forcing GEXP-PROMISE."
`(cons "--enable-custom-modes" `(cons "--enable-custom-modes"
,flags)))))) ,flags))))))
;; Chromium still has Python2-only code, so we need this special Python 2
;; variant of xcb-proto.
(define xcb-proto/python2
(package/inherit
xcb-proto
(name "python2-xcb-proto")
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-2)))))
;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
;; this trick to make it wrap 'lld'.
(define (make-lld-wrapper lld)
(define lld-as-ld
(computed-file "lld-ld"
#~(begin
(mkdir #$output)
(mkdir (string-append #$output "/bin"))
(symlink #$(file-append lld "/bin/lld")
(string-append #$output "/bin/ld")))))
;; Create a wrapper for LLD that inserts appropriate -rpath entries.
(define lld-wrapper
(make-ld-wrapper "lld-wrapper"
#:binutils lld-as-ld))
;; Clang looks for an 'ld.lld' executable, so we need to symlink it back.
(computed-file "lld-wrapped"
#~(begin
(mkdir #$output)
(mkdir (string-append #$output "/bin"))
(symlink #$(file-append lld-wrapper "/bin/ld")
(string-append #$output "/bin/lld"))
(symlink "lld" (string-append #$output "/bin/ld.lld")))))
(define-public ungoogled-chromium (define-public ungoogled-chromium
(package (package
(name "ungoogled-chromium") (name "ungoogled-chromium")
(version %package-version) (version (string-append "84.0.4147.89-0."
(string-take %ungoogled-revision 7)))
(synopsis "Graphical web browser") (synopsis "Graphical web browser")
(source ungoogled-chromium-source) (source (origin
(method url-fetch)
(uri (string-append "https://commondatastorage.googleapis.com"
"/chromium-browser-official/chromium-"
(car (string-split version #\-)) ".tar.xz"))
(sha256
(base32
"0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -450,13 +479,14 @@ from forcing GEXP-PROMISE."
;; directory for an exhaustive list of supported flags. ;; directory for an exhaustive list of supported flags.
;; (Note: The 'configure' phase will do that for you.) ;; (Note: The 'configure' phase will do that for you.)
(list "is_debug=false" (list "is_debug=false"
"use_gold=false" ;; Use the "official" release optimizations, as opposed to
"use_lld=false" ;; a developer build.
"is_official_build=true"
(string-append "max_jobs_per_link="
(number->string (parallel-job-count)))
"clang_use_chrome_plugins=false" "clang_use_chrome_plugins=false"
"linux_use_bundled_binutils=false"
"use_custom_libcxx=false" "use_custom_libcxx=false"
"use_sysroot=false" "use_sysroot=false"
"enable_precompiled_headers=false"
"goma_dir=\"\"" "goma_dir=\"\""
"enable_nacl=false" "enable_nacl=false"
"enable_nacl_nonsfi=false" "enable_nacl_nonsfi=false"
@ -472,7 +502,6 @@ from forcing GEXP-PROMISE."
"enable_remoting=false" "enable_remoting=false"
"enable_reporting=false" "enable_reporting=false"
"enable_service_discovery=false" "enable_service_discovery=false"
"enable_swiftshader=false"
"enable_vr=false" "enable_vr=false"
"enable_widevine=false" "enable_widevine=false"
;; Disable type-checking for the Web UI to avoid a Java dependency. ;; Disable type-checking for the Web UI to avoid a Java dependency.
@ -483,6 +512,9 @@ from forcing GEXP-PROMISE."
"custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
"host_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\""
(string-append "xcbproto_path=\""
(assoc-ref %build-inputs "xcb-proto") "/share/xcb\"")
;; Prefer system libraries. ;; Prefer system libraries.
"use_system_freetype=true" "use_system_freetype=true"
"use_system_harfbuzz=true" "use_system_harfbuzz=true"
@ -496,6 +528,11 @@ from forcing GEXP-PROMISE."
"use_openh264=true" "use_openh264=true"
"use_pulseaudio=true" "use_pulseaudio=true"
"link_pulseaudio=true" "link_pulseaudio=true"
"icu_use_data_file=false"
;; FIXME: Using system protobuf with "is_official_build" causes an
;; invalid opcode and "protoc-gen-plugin: Plugin killed by signal 4".
;;"perfetto_use_system_protobuf=true"
;; VA-API acceleration is currently only supported on x86_64-linux. ;; VA-API acceleration is currently only supported on x86_64-linux.
,@(if (string-prefix? "x86_64" (or (%current-target-system) ,@(if (string-prefix? "x86_64" (or (%current-target-system)
@ -583,13 +620,10 @@ from forcing GEXP-PROMISE."
(substitute* "third_party/webrtc/rtc_base/strings/json.h" (substitute* "third_party/webrtc/rtc_base/strings/json.h"
(("#include \"third_party/jsoncpp/") "#include \"json/")) (("#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" (substitute* '("components/viz/common/gpu/vulkan_context_provider.h"
"components/viz/common/resources/resource_format_utils.h") "components/viz/common/resources/resource_format_utils.h"
(("third_party/vulkan/include/") "")) "gpu/config/gpu_util.cc")
(("third_party/vulkan_headers/include/") ""))
(substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h" (substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h"
(("include/third_party/vulkan/") "")) (("include/third_party/vulkan/") ""))
@ -622,23 +656,12 @@ from forcing GEXP-PROMISE."
(substitute* "device/udev_linux/udev1_loader.cc" (substitute* "device/udev_linux/udev1_loader.cc"
(("libudev\\.so\\.1") (("libudev\\.so\\.1")
(string-append udev "/lib/libudev.so.1"))) (string-append udev "/lib/libudev.so.1")))
(substitute*
'("ui/ozone/platform/x11/gl_ozone_glx.cc"
"ui/ozone/common/egl_util.cc"
"ui/gl/init/gl_initializer_x11.cc"
"third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp")
(("libGL\\.so\\.1")
(string-append mesa "/lib/libGL.so.1"))
(("libEGL\\.so\\.1")
(string-append mesa "/lib/libEGL.so.1"))
(("libGLESv2\\.so\\.2")
(string-append mesa "/lib/libGLESv2.so.2")))
#t))) #t)))
(add-before 'configure 'prepare-build-environment (add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Make sure the right build tools are used. ;; Make sure the right build tools are used.
(setenv "AR" "ar") (setenv "NM" "nm") (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm")
(setenv "CC" "clang") (setenv "CXX" "clang++") (setenv "CC" "clang") (setenv "CXX" "clang++")
(setenv "CXXFLAGS" (setenv "CXXFLAGS"
@ -649,14 +672,11 @@ from forcing GEXP-PROMISE."
;; Clang plugins or newer versions. ;; Clang plugins or newer versions.
"-Wno-unknown-warning-option"))) "-Wno-unknown-warning-option")))
(setenv "CFLAGS" "-Wno-unknown-warning-option")
;; TODO: pre-compile instead. Avoids a race condition. ;; TODO: pre-compile instead. Avoids a race condition.
(setenv "PYTHONDONTWRITEBYTECODE" "1") (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. ;; XXX: How portable is this.
(mkdir-p "third_party/node/linux/node-linux-x64") (mkdir-p "third_party/node/linux/node-linux-x64")
(symlink (string-append (assoc-ref inputs "node") "/bin") (symlink (string-append (assoc-ref inputs "node") "/bin")
@ -708,7 +728,7 @@ from forcing GEXP-PROMISE."
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(man (string-append out "/share/man/man1")) (man (string-append out "/share/man/man1"))
(applications (string-append out "/share/applications")) (applications (string-append out "/share/applications"))
(install-regexp (make-regexp "\\.(bin|pak)$")) (install-regexp (make-regexp "\\.(bin|pak|so)$"))
(locales (string-append lib "/locales")) (locales (string-append lib "/locales"))
(resources (string-append lib "/resources")) (resources (string-append lib "/resources"))
(preferences (assoc-ref inputs "master-preferences")) (preferences (assoc-ref inputs "master-preferences"))
@ -745,6 +765,10 @@ from forcing GEXP-PROMISE."
(symlink "../lib/chromium" exe) (symlink "../lib/chromium" exe)
(install-file "chromedriver" bin) (install-file "chromedriver" bin)
(for-each (lambda (so)
(install-file so (string-append lib "/swiftshader")))
(find-files "swiftshader" "\\.so$"))
(wrap-program exe (wrap-program exe
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>. ;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))) `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))))
@ -761,14 +785,14 @@ from forcing GEXP-PROMISE."
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("clang" ,clang-9) ("clang" ,clang-10)
("gn" ,gn) ("gn" ,gn)
("gperf" ,gperf) ("gperf" ,gperf)
("ld-wrapper" ,(make-lld-wrapper lld))
("ninja" ,ninja) ("ninja" ,ninja)
("node" ,node) ("node" ,node)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which) ("which" ,which)
("yasm" ,yasm)
;; This file contains defaults for new user profiles. ;; This file contains defaults for new user profiles.
("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json")) ("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json"))
@ -792,7 +816,7 @@ from forcing GEXP-PROMISE."
("glib" ,glib) ("glib" ,glib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c) ("icu4c" ,icu4c-67)
("jsoncpp" ,jsoncpp) ("jsoncpp" ,jsoncpp)
("lcms" ,lcms) ("lcms" ,lcms)
("libevent" ,libevent) ("libevent" ,libevent)
@ -832,13 +856,15 @@ from forcing GEXP-PROMISE."
("speech-dispatcher" ,speech-dispatcher) ("speech-dispatcher" ,speech-dispatcher)
("udev" ,eudev) ("udev" ,eudev)
("valgrind" ,valgrind) ("valgrind" ,valgrind)
("vulkan-headers" ,vulkan-headers))) ("vulkan-headers" ,vulkan-headers)
("xcb-proto" ,xcb-proto/python2)))
;; Building Chromium takes ... a very long time. On a single core, a busy ;; Building Chromium takes ... a very long time. On a single core, a busy
;; mid-end x86 system may need more than 24 hours to complete the build. ;; mid-end x86 system may need more than 24 hours to complete the build.
(properties '((timeout . 144000) ;40 hours (properties '((timeout . 144000) ;40 hours
;; The linking step may take more than an hour on some hardware. ;; The linking step may take more than an hour on some hardware.
(max-silent-time . 7200))) (max-silent-time . 7200)
(cpe-name . "chrome")))
(home-page "https://github.com/Eloston/ungoogled-chromium") (home-page "https://github.com/Eloston/ungoogled-chromium")
(description (description
@ -867,19 +893,10 @@ disabled in order to protect the users privacy.")
,@(package-inputs ungoogled-chromium))) ,@(package-inputs ungoogled-chromium)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ungoogled-chromium) (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 <algorithm>\n" all)))
#t))))
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list "use_ozone=true" `(append (list "use_ozone=true"
"ozone_platform_wayland=true" "ozone_platform_wayland=true"
"ozone_platform_x11=true"
"ozone_auto_platforms=false" "ozone_auto_platforms=false"
"ozone_platform=\"wayland\"" "ozone_platform=\"wayland\""
"use_xkbcommon=true" "use_xkbcommon=true"

8
gnu/packages/ci.scm
View file

@ -47,8 +47,8 @@
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
(define-public cuirass (define-public cuirass
(let ((commit "3db603c1913fe14d260a44b05575a2ead3866b47") (let ((commit "136a8295e4e09724eccc230c127fb880aa84b57d")
(revision "32")) (revision "38"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -60,7 +60,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1q69lgngsvpvcy6ww2a75wndjzymay5xaqmbj78znqmn7ck3fv44")))) "04fzc2q8cd02dnlrarzlxq0yfi90735s5f6dw7g2k63rbxlhcq8j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -120,7 +120,7 @@
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-3.0) `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4) ("guile-json" ,guile-json-4)

10
gnu/packages/clojure.scm
View file

@ -151,7 +151,7 @@ designs.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/clojure/algo.generic.git") (url "https://github.com/clojure/algo.generic")
(commit (string-append "algo.generic-" version)))) (commit (string-append "algo.generic-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -176,7 +176,7 @@ that can be implemented for any data type.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/clojure/algo.monads.git") (url "https://github.com/clojure/algo.monads")
(commit (string-append "algo.monads-" version)))) (commit (string-append "algo.monads-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -205,7 +205,7 @@ defining and using monads and useful monadic functions.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/clojure/core.match.git") (url "https://github.com/clojure/core.match")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -232,7 +232,7 @@ It supports Clojure 1.5.1 and later as well as ClojureScript.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Engelberg/instaparse.git") (url "https://github.com/Engelberg/instaparse")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -283,7 +283,7 @@ tree.
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/clojure/tools.macro.git") (url "https://github.com/clojure/tools.macro")
(commit (string-append "tools.macro-" version)))) (commit (string-append "tools.macro-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

98
gnu/packages/cluster.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw> ;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,6 +26,8 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -33,6 +36,101 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)) #:use-module (gnu packages tls))
(define-public drbd-utils
(package
(name "drbd-utils")
(version "9.13.1")
(source (origin
(method url-fetch)
;; Older releases are moved to /archive. List it first because in
;; practice this URL will be the most current (e.g. time-machine).
(uri (list (string-append "https://www.linbit.com/downloads/drbd"
"/utils/archive/drbd-utils-" version
".tar.gz")
(string-append "https://www.linbit.com/downloads/drbd"
"/utils/drbd-utils-" version ".tar.gz")))
(sha256
(base32
"0di55y0vzaw8jhcgz0fakww03h1gpg4a5q1zklxhjw3dwzjvysnk"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "scripts/global_common.conf"
;; Do not participate in usage count survey by default.
(("usage-count: yes")
"usage-count: no"))
(substitute* "scripts/Makefile.in"
;; Install the Pacemaker resource agents to the libdir,
;; regardless of what the OCF specification says...
(("\\$\\(DESTDIR\\)/usr/lib")
"$(DESTDIR)$(LIBDIR)"))
(substitute* "configure"
;; Use a sensible default udev rules directory.
(("default_udevdir=/lib/udev")
"default_udevdir='${prefix}/lib/udev'"))
#t))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '(;; Do not install sysv or systemd init scripts.
"--with-initscripttype=none"
;; Use the pre-built manual pages present in release
;; tarballs instead of generating them from scratch.
"--with-prebuiltman"
;; Disable support for DRBD 8.3 as it is only for
;; Linux-Libre versions < 3.8. 8.4 is the latest
;; kernel driver as of Linux 5.7.
"--without-83support"
"--sysconfdir=/etc"
"--localstatedir=/var")
#:test-target "test"
#:phases
(modify-phases %standard-phases
(add-after 'patch-generated-file-shebangs 'patch-documentation
(lambda _
;; The preceding phase misses some Makefiles with unusual file
;; names, so we handle those here.
(for-each patch-makefile-SHELL (find-files "documentation/common"
"^Makefile"))
#t))
(add-before 'configure 'use-absolute-/lib/drbd
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Look for auxiliary executables below exec_prefix instead
;; of assuming /lib/drbd (see TODO comment in the file).
(substitute* "user/v9/drbdtool_common.c"
(("\"/lib/drbd\"")
(string-append "\"" out "/lib/drbd\"")))
#t)))
(add-after 'configure 'adjust-installation-directories
(lambda _
;; Do not attempt to create /etc or /var.
(substitute* "scripts/Makefile"
(("\\$\\(DESTDIR\\)\\$\\(sysconfdir\\)")
"$(DESTDIR)$(prefix)$(sysconfdir)"))
(substitute* "user/v84/Makefile"
(("\\$\\(DESTDIR\\)\\$\\(localstatedir\\)")
"$(DESTDIR)$(prefix)$(localstatedir)")
(("\\$\\(DESTDIR\\)/lib/drbd")
"$(DESTDIR)$(prefix)/lib/drbd"))
(substitute* "user/v9/Makefile"
(("\\$\\(DESTDIR\\)\\$\\(localstatedir\\)")
"$(DESTDIR)$(prefix)$(localstatedir)")
(("\\$\\(DESTDIR\\)\\$\\(DRBD_LIB_DIR\\)")
"$(DESTDIR)$(prefix)$(DRBD_LIB_DIR)"))
#t)))))
(native-inputs
`(("clitest" ,clitest)
("flex" ,flex)
("udev" ,eudev))) ;just to satisfy a configure check
(home-page "https://www.linbit.com/drbd/")
(synopsis "Replicate block devices between machines")
(description
"@acronym{DRBD, Distributed Replicated Block Device} is a software-based,
shared-nothing, replicated storage solution mirroring the content of block
devices (hard disks, partitions, logical volumes etc.) over any network
connection. This package contains the userland utilities.")
(license license:gpl2+)))
(define-public keepalived (define-public keepalived
(package (package
(name "keepalived") (name "keepalived")

56
gnu/packages/code.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,6 +48,8 @@
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
#:use-module (gnu packages elf)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
@ -235,7 +238,7 @@ COCOMO model or user-provided parameters.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/AlDanial/cloc.git") (url "https://github.com/AlDanial/cloc")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -419,7 +422,7 @@ expressions, and its ability to generate emacs-style TAGS files.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cameronwhite/withershins.git") (url "https://github.com/cameronwhite/withershins")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -479,7 +482,7 @@ stack traces.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/linux-test-project/lcov.git") (url "https://github.com/linux-test-project/lcov")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -522,6 +525,47 @@ textual @command{gcov} output to implement the following enhanced
functionality such as HTML output.") functionality such as HTML output.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public kcov
(package
(name "kcov")
(version "38")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SimonKagstrom/kcov")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0zqg21xwivi16csl6a5wby6679ny01bjaw4am3y4qcgjdyihifp8"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no test target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-/bin/bash-references
(lambda _
(substitute* (find-files "src" ".*\\.cc?$")
(("/bin/bash") (which "bash"))
(("/bin/sh") (which "sh")))
#t)))))
(inputs
`(("curl" ,curl)
("elfutils" ,elfutils)
("libelf" ,libelf)
("zlib" ,zlib)))
(native-inputs
`(("python" ,python)))
(home-page "https://github.com/SimonKagstrom/kcov")
(synopsis "Code coverage tester for compiled languages, Python and Bash")
(description "Kcov is a FreeBSD/Linux/OSX code coverage tester for compiled
languages, Python and Bash. Kcov was originally a fork of Bcov, but has since
evolved to support a large feature set in addition to that of Bcov.
Kcov uses DWARF debugging information for compiled programs to make it
possible to collect coverage information without special compiler switches.")
(license license:gpl2+)))
(define-public rtags (define-public rtags
(package (package
(name "rtags") (name "rtags")
@ -530,7 +574,7 @@ functionality such as HTML output.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Andersbakken/rtags.git") (url "https://github.com/Andersbakken/rtags")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "rtags-separate-rct.patch")) (patches (search-patches "rtags-separate-rct.patch"))
@ -582,7 +626,7 @@ importantly we give you proper follow-symbol and find-references support.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pagekite/Colormake.git") (url "https://github.com/pagekite/Colormake")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -632,7 +676,7 @@ produce colored output.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lindenb/makefile2graph.git") (url "https://github.com/lindenb/makefile2graph")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

26
gnu/packages/commencement.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -140,7 +141,7 @@ pure Scheme to Tar and decompression in one easy step.")
(name "gash-boot") (name "gash-boot")
(source (origin (source (origin
(inherit (package-source gash)) (inherit (package-source gash))
(modules '()))) (snippet #f))) ;discard snippet for Guile 3.0 support
(arguments (arguments
`(#:implicit-inputs? #f `(#:implicit-inputs? #f
#:tests? #f #:tests? #f
@ -170,6 +171,10 @@ pure Scheme to Tar and decompression in one easy step.")
(package (package
(inherit gash-utils) (inherit gash-utils)
(name "gash-utils-boot") (name "gash-utils-boot")
(source (origin
(inherit (package-source gash-utils))
(patches '())
(snippet #f))) ;discard snippet for Guile 3.0 support
(arguments (arguments
`(#:implicit-inputs? #f `(#:implicit-inputs? #f
#:tests? #f #:tests? #f
@ -3818,14 +3823,17 @@ COREUTILS-FINAL vs. COREUTILS, etc."
'(#:modules ((guix build union)) '(#:modules ((guix build union))
#:builder (begin #:builder (begin
(use-modules (ice-9 match) (use-modules (ice-9 match)
(srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
(guix build union)) (guix build union))
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(union-build out
(match %build-inputs (filter-map (match-lambda
(((names . directories) ...) (("libc-debug" . _) #f)
(union-build out directories))) (("libc-static" . _) #f)
((_ . directory) directory))
%build-inputs))
(union-build (assoc-ref %outputs "debug") (union-build (assoc-ref %outputs "debug")
(list (assoc-ref %build-inputs (list (assoc-ref %build-inputs
@ -3884,6 +3892,14 @@ binaries, plus debugging symbols in the @code{debug} output), and Binutils.")
(define-public gcc-toolchain-10 (define-public gcc-toolchain-10
(make-gcc-toolchain gcc-10)) (make-gcc-toolchain gcc-10))
(define-public gdc-toolchain-10
(package (inherit (make-gcc-toolchain gdc-10))
(synopsis "Complete GCC tool chain for D lang development")
(description "This package provides a complete GCC tool chain for
D lang development to be installed in user profiles. This includes
gdc, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils.")))
;; Provide the Fortran toolchain package only for the version of gfortran that ;; Provide the Fortran toolchain package only for the version of gfortran that
;; is used by Guix internally to build Fortran libraries, because combining ;; is used by Guix internally to build Fortran libraries, because combining
;; code compiled with different versions can cause problems. ;; code compiled with different versions can cause problems.

102
gnu/packages/compression.scm
View file

@ -380,30 +380,51 @@ decompression.")
(home-page "https://web.archive.org/web/20180801004107/http://www.bzip.org/"))) (home-page "https://web.archive.org/web/20180801004107/http://www.bzip.org/")))
(define-public lbzip2 (define-public lbzip2
;; The last 2.5 release is 4 years behind the newest commit (from 2018) and
;; may create files that can't even be decompressed by newer bzip2 versions.
(let ((commit "b6dc48a7b9bfe6b340ed1f6d72133608ad57144b")
(revision "0"))
(package (package
(name "lbzip2") (name "lbzip2")
(version "2.5") (version (git-version "2.5" revision commit))
(source (origin (source
(method url-fetch) (origin
(uri (string-append "http://archive.lbzip2.org/lbzip2-" (method git-fetch)
version ".tar.gz")) (uri (git-reference
(url "https://github.com/kjn/lbzip2")
(commit commit)))
(sha256 (sha256
(base32 (base32 "140xp00dmjsr6c3dwb4dwf0pzlgf159igri321inbinsjiclkngy"))
"1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6")) (file-name (git-file-name name version))))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* (find-files "lib" "\\.c$")
(("#if defined _IO_ftrylockfile")
"#if defined _IO_EOF_SEEN"))
(substitute* "lib/stdio-impl.h"
(("^/\\* BSD stdio derived implementations")
(string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
"# define _IO_IN_BACKUP 0x100\n"
"#endif\n\n"
"/* BSD stdio derived implementations")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-gnulib
(lambda* (#:key inputs #:allow-other-keys)
(let ((gnulib (assoc-ref inputs "gnulib")))
(copy-recursively gnulib "lib")
(setenv "PATH" (string-append "lib:" (getenv "PATH")))
#t)))
(delete 'bootstrap) ; gnulib still has unpatched shebangs
(add-after 'patch-source-shebangs 'bootstrap
(lambda _
(invoke "sh" "build-aux/autogen.sh")
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gnulib"
,(let ((commit "2d431ac35c4943a3655c07ba91870d2323321b43"))
(origin
(method git-fetch)
(uri (git-reference
(url "git://git.savannah.gnu.org/gnulib.git")
(commit commit)))
(sha256
(base32 "1f0xr4w89bqvhzsfcflcagdixidrk41k00k7kpr91w9lazfis4kf"))
(file-name (git-file-name "gnulib" commit)))))
("perl" ,perl)))
(synopsis "Parallel bzip2 compression utility") (synopsis "Parallel bzip2 compression utility")
(description (description
"lbzip2 is a multi-threaded compression utility with support for the "lbzip2 is a multi-threaded compression utility with support for the
@ -412,8 +433,10 @@ parallel. It uses POSIX threading model (pthreads), which allows it to take
full advantage of symmetric multiprocessing (SMP) systems. It has been proven full advantage of symmetric multiprocessing (SMP) systems. It has been proven
to scale linearly, even to over one hundred processor cores. lbzip2 is fully to scale linearly, even to over one hundred processor cores. lbzip2 is fully
compatible with bzip2 – both at file format and command line level.") compatible with bzip2 – both at file format and command line level.")
(home-page "http://www.lbzip2.org/") ;; lbzip2.org now looks fishy. There is no source code to be found.
(license license:gpl3+))) ;; Reported upstream: <https://github.com/kjn/lbzip2/issues/26>.
(home-page "https://github.com/kjn/lbzip2")
(license license:gpl3+))))
(define-public pbzip2 (define-public pbzip2
(package (package
@ -679,7 +702,7 @@ This package is mostly for compatibility and historical interest.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/raboof/sfArkLib.git") (url "https://github.com/raboof/sfArkLib")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -715,7 +738,7 @@ with the sfArk algorithm.")
;; commit at this time. ;; commit at this time.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/raboof/sfarkxtc.git") (url "https://github.com/raboof/sfarkxtc")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1004,7 +1027,7 @@ smaller than those produced by @code{Xdelta}.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/jmacd/xdelta.git") (url "https://github.com/jmacd/xdelta")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1078,7 +1101,7 @@ well as bzip2.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/snappy.git") (url "https://github.com/google/snappy")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1619,14 +1642,14 @@ recreates the stored directory structure by default.")
(define-public libzip (define-public libzip
(package (package
(name "libzip") (name "libzip")
(version "1.6.1") (version "1.7.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://libzip.org/download/libzip-" version ".tar.xz")) "https://libzip.org/download/libzip-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0h9nsgkw0dk4srsvmz6xy6f9l4h815xn07j8h40l8gqvcxxaqpbh")))) "0ck1dk7zn5qzpgxklg0r26nfsf04xb6c46gsig060hkvvgzp6156"))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(inputs (inputs
@ -1823,7 +1846,7 @@ non-Windows systems without running the actual installer using wine.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/brotli.git") (url "https://github.com/google/brotli")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1954,7 +1977,7 @@ download times, and other distribution and storage costs.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/stachenov/quazip.git") (url "https://github.com/stachenov/quazip")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1987,20 +2010,26 @@ reading from and writing to ZIP archives. ")
(define-public zutils (define-public zutils
(package (package
(name "zutils") (name "zutils")
;; Check and remove the lint-hidden-cve property when updating. (version "1.9")
(version "1.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
(sha256 (sha256
(base32 "0dx35mv78fgqgz6sszs05ng8ipz2xy09ry9vpmka2rmy08b7x907")))) (base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--sysconfdir=/etc") (list "--sysconfdir=/etc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'disable-failing-tests
;; XXX https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00005.html
(lambda _
(substitute* "testsuite/check.sh"
(("\"\\$\\{ZGREP\\}\" -N -L \"GNU\"") "true")
(("\"\\$\\{ZGREP\\}\" -N -L \"nx_pattern\"") "false"))
#t))
(replace 'install (replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys) (lambda* (#:key make-flags outputs #:allow-other-keys)
(apply invoke "make" "install" (apply invoke "make" "install"
@ -2010,7 +2039,6 @@ reading from and writing to ZIP archives. ")
(native-inputs (native-inputs
;; Needed to extract the source tarball and run the test suite. ;; Needed to extract the source tarball and run the test suite.
`(("lzip" ,lzip))) `(("lzip" ,lzip)))
(properties `((lint-hidden-cve . ("CVE-2018-1000637"))))
(home-page "https://www.nongnu.org/zutils/zutils.html") (home-page "https://www.nongnu.org/zutils/zutils.html")
(synopsis "Utilities that transparently operate on compressed files") (synopsis "Utilities that transparently operate on compressed files")
(description (description
@ -2114,7 +2142,7 @@ file compression algorithm.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ib/xarchiver.git") (url "https://github.com/ib/xarchiver")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2144,7 +2172,7 @@ archiver is not installed.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/AQUAOSOTech/tarsplitter.git") (url "https://github.com/AQUAOSOTech/tarsplitter")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2178,7 +2206,7 @@ chunks.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Blosc/c-blosc.git") (url "https://github.com/Blosc/c-blosc")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

4
gnu/packages/compton.scm
View file

@ -50,7 +50,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/chjj/compton.git") (url "https://github.com/chjj/compton")
(commit (string-append "v" upstream-version)))) (commit (string-append "v" upstream-version))))
(sha256 (sha256
(base32 (base32
@ -119,7 +119,7 @@ performance).
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/yshui/picom.git") (url "https://github.com/yshui/picom")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32

8
gnu/packages/coq.scm
View file

@ -51,7 +51,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/coq/coq.git") (url "https://github.com/coq/coq")
(commit (string-append "V" version)))) (commit (string-append "V" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -329,7 +329,7 @@ assistant.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/math-comp/math-comp.git") (url "https://github.com/math-comp/math-comp")
(commit (string-append "mathcomp-" version)))) (commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -423,7 +423,7 @@ theorems between the two libraries.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/coq/bignums.git") (url "https://github.com/coq/bignums")
(commit (string-append "V" version)))) (commit (string-append "V" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -552,7 +552,7 @@ uses Ltac to synthesize the substitution operation.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mattam82/Coq-Equations.git") (url "https://github.com/mattam82/Coq-Equations")
(commit (string-append "v" version "-8.10")))) (commit (string-append "v" version "-8.10"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

52
gnu/packages/cpp.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -122,7 +123,7 @@ operating system functions.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/aseba-community/dashel.git") (url "https://github.com/aseba-community/dashel")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0anks2l2i2qp0wlzqck1qgpq15a3l6dg8lw2h8s4nsj7f61lffwy")) (base32 "0anks2l2i2qp0wlzqck1qgpq15a3l6dg8lw2h8s4nsj7f61lffwy"))
@ -147,7 +148,7 @@ combination of these streams.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QuantStack/xsimd.git") (url "https://github.com/QuantStack/xsimd")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "1ny2qin1j4h35mljivh8z52kwdyjxf4yxlzb8j52ji91v2ccc88j")) (base32 "1ny2qin1j4h35mljivh8z52kwdyjxf4yxlzb8j52ji91v2ccc88j"))
@ -167,6 +168,37 @@ accelerated implementation of common mathematical functions operating on
batches.") batches.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public chaiscript
(package
(name "chaiscript")
(version "6.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ChaiScript/ChaiScript")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
(build-system cmake-build-system)
(home-page "https://chaiscript.com/")
(synopsis "Embedded scripting language designed for C++")
(description
"ChaiScript is one of the only embedded scripting language designed from
the ground up to directly target C++ and take advantage of modern C++
development techniques. Being a native C++ application, it has some advantages
over existing embedded scripting languages:
@enumerate
@item Uses a header-only approach, which makes it easy to integrate with
existing projects.
@item Maintains type safety between your C++ application and the user scripts.
@item Supports a variety of C++ techniques including callbacks, overloaded
functions, class methods, and stl containers.
@end enumerate\n")
(license license:bsd-3)))
(define-public fifo-map (define-public fifo-map
(let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9") (let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9")
(revision "0") (revision "0")
@ -268,7 +300,7 @@ intuitive syntax and trivial integration.")
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/QuantStack/xtl.git") (url "https://github.com/QuantStack/xtl")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
@ -328,7 +360,7 @@ maintained anymore.")
(define-public gperftools (define-public gperftools
(package (package
(name "gperftools") (name "gperftools")
(version "2.7") (version "2.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -336,14 +368,14 @@ maintained anymore.")
(url "https://github.com/gperftools/gperftools") (url "https://github.com/gperftools/gperftools")
(commit (string-append "gperftools-" version)))) (commit (string-append "gperftools-" version))))
(sha256 (sha256
(base32 "0amvwrzn5qc0b0jpxpy5g6zkmj97zjh4hhjrd130hsg2lwwcwhy1")) (base32 "1rnc53kaxlljgbpsff906vdsry9jl9gcvcnmxgkprwzxq1wipyd0"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
;; For tests: ;; For tests.
("perl" ,perl))) ("perl" ,perl)))
(home-page "https://github.com/gperftools/gperftools") (home-page "https://github.com/gperftools/gperftools")
(synopsis "Multi-threaded malloc() and performance analysis tools for C++") (synopsis "Multi-threaded malloc() and performance analysis tools for C++")
@ -404,7 +436,7 @@ and make @code{cpplint} usable in wider contexts.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Stiffstream/sobjectizer.git") (url "https://github.com/Stiffstream/sobjectizer")
(commit (string-append "v." version)))) (commit (string-append "v." version))))
(sha256 (sha256
(base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5")) (base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5"))
@ -435,7 +467,7 @@ development of concurrent and multithreaded applications in C++.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mobius3/tweeny.git") (url "https://github.com/mobius3/tweeny")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -462,7 +494,7 @@ point and then, after each tween step, plugging back the result.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/abseil/abseil-cpp.git") (url "https://github.com/abseil/abseil-cpp")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -506,7 +538,7 @@ Google's C++ code base.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/taocpp/PEGTL.git") (url "https://github.com/taocpp/PEGTL")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

756
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

5058
gnu/packages/crates-io.scm
View file

File diff suppressed because it is too large Load diff

2
gnu/packages/cross-base.scm
View file

@ -373,7 +373,7 @@ target that libc."
',%gcc-cross-include-paths) ',%gcc-cross-include-paths)
#t)))) #t))))
#:configure-flags (list ,(string-append "--target=" target)) #:configure-flags (list ,(string-append "--target=" target))
,@(package-arguments mig))) #:tests? #f))
(propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers))) (propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)))
(native-inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)

65
gnu/packages/crypto.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2018, 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
@ -16,6 +16,7 @@
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,9 +42,11 @@
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages libbsd) #:use-module (gnu packages libbsd)
@ -69,8 +72,10 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -170,6 +175,58 @@ OpenBSD tool of the same name.")
"See base64.c in the distribution for "See base64.c in the distribution for
the license from IBM."))))) the license from IBM.")))))
(define-public rust-minisign
(package
(name "rust-minisign")
(version "0.5.20")
(source
(origin
(method url-fetch)
(uri (crate-uri "minisign" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0xmcvh2snravghaar8igc6b9r3s1snnmf9qam9l3zyhm4987767y"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-getrandom" ,rust-getrandom-0.1)
("rust-rpassword" ,rust-rpassword-4)
("rust-scrypt" ,rust-scrypt-0.3))))
(home-page "https://github.com/jedisct1/rust-minisign")
(synopsis "Crate to sign files and verify signatures")
(description
"This package provides a crate to sign files and verify signatures.")
(license license:expat)))
(define-public go-minisign
(package
(name "go-minisign")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jedisct1/go-minisign")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0wc0rk5m60yz52f0cncmbgq67yvb1rcx91gvzjg6jpc4mpw2db27"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "vendor") #t))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jedisct1/go-minisign"))
(propagated-inputs
`(("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
(home-page "https://github.com/jedisct1/go-minisign")
(synopsis "Minisign verification library for Golang")
(description "A Golang library to verify Minisign signatures.")
(license license:expat)))
(define-public encfs (define-public encfs
(package (package
(name "encfs") (name "encfs")
@ -389,7 +446,7 @@ no man page, refer to the home page for usage details.")
(error "program not found:" program))) (error "program not found:" program)))
'("seq" "mkfs.ext4" "pinentry" '("seq" "mkfs.ext4" "pinentry"
"gpg" "cryptsetup" "gettext" "lsof" "gpg" "cryptsetup" "gettext" "lsof"
"qrencode" "steghide" "findmnt"))))) "qrencode" "steghide" "findmnt" "getent")))))
#t))) #t)))
(delete 'check) (delete 'check)
(add-after 'wrap 'check (add-after 'wrap 'check
@ -456,7 +513,7 @@ attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt}.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/technion/libscrypt.git") (url "https://github.com/technion/libscrypt")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -850,7 +907,7 @@ security.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/vstakhov/asignify.git") (url "https://github.com/vstakhov/asignify")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

6
gnu/packages/cryptsetup.scm
View file

@ -35,7 +35,7 @@
(define-public cryptsetup (define-public cryptsetup
(package (package
(name "cryptsetup") (name "cryptsetup")
(version "2.2.2") (version "2.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
@ -43,7 +43,7 @@
"/cryptsetup-" version ".tar.xz")) "/cryptsetup-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ija889kfhg4n2fshpq9yh2b1jl2ipvd7sfafh08g75ba6ayrw1a")))) "1pw2bq4nv2z3xyycckxkbp7dp9kkp2n6bspna3plryg277z4zjiv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -58,7 +58,7 @@
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("argon2" ,argon2) `(("argon2" ,argon2)
("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 ("json-c" ,json-c)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2) ; device-mapper ("lvm2" ,lvm2) ; device-mapper
("popt" ,popt) ("popt" ,popt)

2
gnu/packages/cups.scm
View file

@ -422,7 +422,7 @@ should only be used as part of the Guix cups-pk-helper service.")
"/hplip-" version ".tar.gz")) "/hplip-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0rmk7i28mb0q66i5l9d0fq2j23dkhz5gx5g2xvi16ga0dnprcilp")) "083w58wpvvm6sir6rf5dwx3r0rman9sv1zpl26chl0a88crjsjy6"))
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch")) (patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet (snippet

59
gnu/packages/curl.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,6 +33,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -52,6 +54,7 @@
(package (package
(name "curl") (name "curl")
(version "7.69.1") (version "7.69.1")
(replacement curl-7.71.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
@ -168,6 +171,31 @@ tunneling, and so on.")
(name "curl-minimal") (name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl)))))) (inputs (alist-delete "openldap" (package-inputs curl))))))
;; Replacement package to fix CVE-2020-8169 and CVE-2020-8177.
(define curl-7.71.0
(package
(inherit curl)
(version "7.71.0")
(source (origin
(inherit (package-source curl))
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"0wlppmx9iry8slh4pqcxj7lwc6fqwnlhh9ri2pcym2rx76a8gwfd"))))
(arguments
(substitute-keyword-arguments (package-arguments curl)
((#:phases phases)
`(modify-phases ,phases
(replace 'check
(lambda _
;; Test 1510 is now disabled upstream, and the test runner
;; complains that it can not disable a non-existing test.
;; Thus, override the phase to not delete the test.
(substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh")))
(invoke "make" "-C" "tests" "test")))))))))
(define-public kurly (define-public kurly
(package (package
(name "kurly") (name "kurly")
@ -258,3 +286,34 @@ not offer a replacement for libcurl.")
Guile to do client-side URL transfers, like requesting documents from HTTP or Guile to do client-side URL transfers, like requesting documents from HTTP or
FTP servers. It is based on the curl library.") FTP servers. It is based on the curl library.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public curlpp
(package
(name "curlpp")
(version "0.8.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jpbarrette/curlpp")
(commit (string-append "v" version))))
(sha256
(base32 "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
;; There are no build tests to be had.
(arguments
'(#:tests? #f))
;; The installed version needs the header files from the C library.
(propagated-inputs
`(("curl" ,curl)))
(synopsis "C++ wrapper around libcURL")
(description
"This package provides a free and easy-to-use client-side C++ URL
transfer library, supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT,
FILE and LDAP; in particular it supports HTTPS certificates, HTTP POST, HTTP
PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies,
user+password authentication, file transfer resume, http proxy tunneling and
more!")
(home-page "http://www.curlpp.org")
(license license:expat)))

99
gnu/packages/databases.scm
View file

@ -42,6 +42,7 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -147,7 +148,7 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/4store/4store.git") (url "https://github.com/4store/4store")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -609,6 +610,37 @@ RDBMS systems (which are deep in functionality).")
;; Some parts are licensed under the Apache License ;; Some parts are licensed under the Apache License
license:asl2.0)))) license:asl2.0))))
(define-public mycli
(package
(name "mycli")
(version "1.21.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mycli" version))
(sha256
(base32
"1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; tests expect a running MySQL
(propagated-inputs
`(("python-cli-helpers" ,python-cli-helpers)
("python-click" ,python-click)
("python-configobj" ,python-configobj)
("python-cryptography" ,python-cryptography)
("python-prompt-toolkit" ,python-prompt-toolkit)
("python-pygments" ,python-pygments)
("python-pymysql" ,python-pymysql)
("python-sqlparse" ,python-sqlparse)))
(home-page "http://mycli.net")
(synopsis
"Terminal Client for MySQL with AutoCompletion and Syntax Highlighting")
(description
"MyCLI is a command line interface for MySQL, MariaDB, and Percona with
auto-completion and syntax highlighting.")
(license license:bsd-3)))
;; XXX When updating, check whether boost-for-mysql is still needed. ;; XXX When updating, check whether boost-for-mysql is still needed.
;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past. ;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
(define-public mysql (define-public mysql
@ -938,7 +970,7 @@ as a drop-in replacement of MySQL.")
(define-public mariadb-connector-c (define-public mariadb-connector-c
(package (package
(name "mariadb-connector-c") (name "mariadb-connector-c")
(version "3.1.8") (version "3.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -947,7 +979,7 @@ as a drop-in replacement of MySQL.")
version "-src.tar.gz")) version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523")))) "1izjzf7yzjqzlk8dkp327fa9lawsv2hnnlnr7g5lshyx5azrk38h"))))
(inputs (inputs
`(("openssl" ,openssl))) `(("openssl" ,openssl)))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -1401,7 +1433,7 @@ which uses SQL to describe changes.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/coffeeandscripts/sqlcrush.git") (url "https://github.com/coffeeandscripts/sqlcrush")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1481,15 +1513,14 @@ extremely small.")
(define-public perl-dbix-class (define-public perl-dbix-class
(package (package
(name "perl-dbix-class") (name "perl-dbix-class")
(version "0.082841") (version "0.082842")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/" (uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/"
"DBIx-Class-" version ".tar.gz")) "DBIx-Class-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh"))))
"1gf3hgv8f9rnr8bl4ljgsqk4aliphmvljhsk4282kvdc4mcgh1fp"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-dbd-sqlite" ,perl-dbd-sqlite) `(("perl-dbd-sqlite" ,perl-dbd-sqlite)
@ -1517,7 +1548,7 @@ extremely small.")
("perl-path-class" ,perl-path-class) ("perl-path-class" ,perl-path-class)
("perl-scalar-list-utils" ,perl-scalar-list-utils) ("perl-scalar-list-utils" ,perl-scalar-list-utils)
("perl-scope-guard" ,perl-scope-guard) ("perl-scope-guard" ,perl-scope-guard)
("perl-sql-abstract" ,perl-sql-abstract) ("perl-sql-abstract-classic" ,perl-sql-abstract-classic)
("perl-sub-name" ,perl-sub-name) ("perl-sub-name" ,perl-sub-name)
("perl-text-balanced" ,perl-text-balanced) ("perl-text-balanced" ,perl-text-balanced)
("perl-try-tiny" ,perl-try-tiny))) ("perl-try-tiny" ,perl-try-tiny)))
@ -1782,6 +1813,42 @@ structures you provide it, so that you don't have to modify your code every
time your data changes.") time your data changes.")
(license license:perl-license))) (license license:perl-license)))
(define-public perl-sql-abstract-classic
(package
(name "perl-sql-abstract-classic")
(version "1.91")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RI/RIBASUSHI/"
"SQL-Abstract-Classic-" version ".tar.gz"))
(sha256
(base32 "0a7g13hs3kdxrjn43sfli09mgsi9d6w0dfw6hlk268av17yisgaf"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-deep" ,perl-test-deep)
("perl-test-exception" ,perl-test-exception)
("perl-test-warn" ,perl-test-warn)))
(propagated-inputs
`(("perl-mro-compat" ,perl-mro-compat)
("perl-sql-abstract" ,perl-sql-abstract)))
(home-page "https://metacpan.org/release/SQL-Abstract-Classic")
(synopsis "Generate SQL from Perl data structures")
(description
"This module is nearly identical to @code{SQL::Abstract} 1.81, and exists
to preserve the ability of users to opt into the new way of doing things in
later versions according to their own schedules.
It is an abstract SQL generation module based on the concepts used by
@code{DBIx::Abstract}, with several important differences, especially when it
comes to @code{WHERE} clauses. These concepts were modified to make the SQL
easier to generate from Perl data structures.
The underlying idea is for this module to do what you mean, based on the data
structures you provide it. You shouldn't have to modify your code every time
your data changes, as this module figures it out.")
(license license:perl-license)))
(define-public perl-sql-splitstatement (define-public perl-sql-splitstatement
(package (package
(name "perl-sql-splitstatement") (name "perl-sql-splitstatement")
@ -1909,8 +1976,8 @@ sets, bitmaps and hyperloglogs.")
(version "1.2.77") (version "1.2.77")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://fallabs.com/kyotocabinet/pkg/" (uri (string-append "https://fallabs.com/kyotocabinet/pkg/"
name "-" version ".tar.gz")) "kyotocabinet-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an")))) "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an"))))
@ -1922,7 +1989,7 @@ sets, bitmaps and hyperloglogs.")
(string-append "LDFLAGS=-Wl,-rpath=" (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")))) (assoc-ref %outputs "out") "/lib"))))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(home-page "http://fallabs.com/kyotocabinet/") (home-page "https://fallabs.com/kyotocabinet/")
(synopsis (synopsis
"Kyoto Cabinet is a modern implementation of the DBM database") "Kyoto Cabinet is a modern implementation of the DBM database")
(description (description
@ -2125,7 +2192,7 @@ virtual address space — not physical RAM.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/drycpp/lmdbxx.git") (url "https://github.com/drycpp/lmdbxx")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2354,7 +2421,7 @@ for ODBC.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/brianb/mdbtools.git") (url "https://github.com/brianb/mdbtools")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2553,13 +2620,13 @@ Database API 2.0T.")
(define-public python-sqlalchemy (define-public python-sqlalchemy
(package (package
(name "python-sqlalchemy") (name "python-sqlalchemy")
(version "1.3.15") (version "1.3.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "SQLAlchemy" version)) (uri (pypi-uri "SQLAlchemy" version))
(sha256 (sha256
(base32 "0iglkvymfp35zm5pxy5kzqvcv96kkas0chqdx7xpla86sspa9k64")))) (base32 "1rwc6ss1cnz3kxx0p9p6xw0w79r8qw03lcc29k31yb3rcigvfbys"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-cython" ,python-cython) ; for C extensions `(("python-cython" ,python-cython) ; for C extensions
@ -3090,7 +3157,7 @@ transforms idiomatic python function calls to well-formed SQL queries.")
(source (source
(origin (method git-fetch) (origin (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/kayak/pypika.git") (url "https://github.com/kayak/pypika")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

24
gnu/packages/datastructures.scm
View file

@ -21,6 +21,7 @@
(define-module (gnu packages datastructures) (define-module (gnu packages datastructures)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -55,20 +56,23 @@ and heaps.")
(define-public marisa (define-public marisa
(package (package
(name "marisa") (name "marisa")
(version "0.2.5") (version "0.2.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/s-yata/marisa-trie" (uri (string-append "https://github.com/s-yata/marisa-trie/files/"
"/releases/download/v" version "/" name "-" "4832504/marisa-" version ".tar.gz"))
version ".tar.gz"))
(sha256 (sha256
(base32 "19ifrcmnbr9whaaf4ly3s9ndyiq9sjqhnfkrxbz9zsb44w2n36hf")))) (base32 "1pk6wmi28pa8srb4szybrwfn71jldb61c5vgxsiayxcyg1ya4qqh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(home-page "https://github.com/s-yata/marisa-trie") (home-page "https://github.com/s-yata/marisa-trie")
(synopsis "Trie data structure C++ library") (synopsis "Trie data structure C++ library")
(description "Matching Algorithm with Recursively Implemented (description "@acronym{MARISA, Matching Algorithm with Recursively
StorAge (MARISA) is a static and space-efficient trie data structure C++ Implemented StorAge} is a static and space-efficient trie data structure C++
library.") library.")
;; Dual-licensed, according to docs/readme.en.html (source files lack ;; Dual-licensed, according to docs/readme.en.html (source files lack
@ -82,7 +86,7 @@ library.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/sparsehash/sparsehash.git") (url "https://github.com/sparsehash/sparsehash")
(commit (string-append name "-" version)))) (commit (string-append name "-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -157,7 +161,7 @@ queues, stacks, and doubly-linked lists.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/troydhanson/uthash.git") (url "https://github.com/troydhanson/uthash")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -259,7 +263,7 @@ equivalent succinct data structure are (most of the time) identical.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/y-256/libdivsufsort.git") (url "https://github.com/y-256/libdivsufsort")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

10
gnu/packages/dav.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -60,13 +61,14 @@ clients.")
(define-public vdirsyncer (define-public vdirsyncer
(package (package
(name "vdirsyncer") (name "vdirsyncer")
(version "0.16.7") ;; When updating, check whether python-click-5 can be removed entirely.
(version "0.16.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"1vqjhn2bffy2bx45a1r14crsyn2cylf5by567g44c4mhpjwwz6vc")))) "1i8kp9j99rs8xdhrc1vx749zd9wznlzj0pb3s05xdm71a8pl5nxz"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; The test suite is very flakey. `(#:tests? #f ; The test suite is very flakey.
@ -105,9 +107,11 @@ clients.")
("python-urllib3" ,python-urllib3) ("python-urllib3" ,python-urllib3)
("python-wsgi-intercept" ,python-wsgi-intercept) ("python-wsgi-intercept" ,python-wsgi-intercept)
("radicale" ,radicale))) ("radicale" ,radicale)))
(inputs
`(;; XXX https://github.com/mitsuhiko/click/issues/200
("python-click" ,python-click-5)))
(propagated-inputs (propagated-inputs
`(("python-atomicwrites" ,python-atomicwrites) `(("python-atomicwrites" ,python-atomicwrites)
("python-click" ,python-click)
("python-click-log" ,python-click-log) ("python-click-log" ,python-click-log)
("python-click-threading" ,python-click-threading) ("python-click-threading" ,python-click-threading)
("python-requests-toolbelt" ,python-requests-toolbelt))) ("python-requests-toolbelt" ,python-requests-toolbelt)))

49
gnu/packages/debian.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,8 +25,10 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages wget) #:use-module (gnu packages wget)
#:use-module (gnu packages perl)) #:use-module (gnu packages perl))
@ -181,7 +184,11 @@ contains the archive keys used for that.")
(inputs (inputs
`(("debian-keyring" ,debian-archive-keyring) `(("debian-keyring" ,debian-archive-keyring)
("ubuntu-keyring" ,ubuntu-keyring) ("ubuntu-keyring" ,ubuntu-keyring)
("tzdata" ,tzdata))) ("tzdata" ,tzdata)
;; Called at run-time from various places, needs to be in PATH.
("gnupg" ,gnupg)
("wget" ,wget)))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "https://tracker.debian.org/pkg/debootstrap") (home-page "https://tracker.debian.org/pkg/debootstrap")
@ -192,6 +199,46 @@ It does this by downloading .deb files from a mirror site, and carefully
unpacking them into a directory which can eventually be chrooted into.") unpacking them into a directory which can eventually be chrooted into.")
(license license:gpl2))) (license license:gpl2)))
(define-public debianutils
(package
(name "debianutils")
(version "4.11")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/debian/debianutils.git")
(commit (string-append "debian/" version))))
(file-name (git-file-name "debianutils" version))
(sha256
(base32
"1fmhzvymajack7kh8g4qjbwd9mq85z6rxl1psd1sm67s5695i9rc"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'bootstrap 'create-translations
(lambda _
(with-directory-excursion "po4a"
(invoke "po4a" "--no-backups" "po4a.conf"))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("po4a" ,po4a)))
(home-page "https://packages.debian.org/unstable/debianutils")
(synopsis "Miscellaneous shell utilities")
(description
"This package provides a number of utilities which are mostly for use
in installation scripts of Debian packages. The programs included are
@command{add-shell}, @command{installkernel}, @command{ischroot},
@command{remove-shell}, @command{run-parts}, @command{savelog},
@command{tempfile}, and @command{which}.")
(license (list license:gpl2+
;; The 'savelog' program is distributed under a
;; GPL-compatible copyleft license.
(license:fsf-free "file://debian/copyright"
"The SMAIL General Public License, see
debian/copyright for more information.")))))
(define-public apt-mirror (define-public apt-mirror
(let ((commit "e664486a5d8947c2579e16dd793d762ea3de4202") (let ((commit "e664486a5d8947c2579e16dd793d762ea3de4202")

14
gnu/packages/debug.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
@ -393,8 +393,8 @@ server and embedded PowerPC, and S390 guests.")
(supported-systems (delete "mips64el-linux" %supported-systems)))))) (supported-systems (delete "mips64el-linux" %supported-systems))))))
(define-public stress-make (define-public stress-make
(let ((commit "9e92dff8f0157f012aaf31de5b8b8112ad720100") (let ((commit "97815bed8060de33952475b3498767c91f59ffd9")
(revision "1")) ;No official source distribution (revision "2")) ;No official source distribution
(package (package
(name "stress-make") (name "stress-make")
(version (git-version "1.0" revision commit)) (version (git-version "1.0" revision commit))
@ -402,12 +402,12 @@ server and embedded PowerPC, and S390 guests.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lanl/stress-make.git") (url "https://github.com/lanl/stress-make")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1z1yiwnqyzv3v6152fnjbfh2lr8q8fi5xxfdclnr8l8sd4c1rasp")))) "0k55cy7x0hlc6rgpascl6ibhcfxaash3p9r9r8kwvbm3zag1rmac"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -431,7 +431,7 @@ server and embedded PowerPC, and S390 guests.")
(add-after 'unpack-make 'set-default-shell (add-after 'unpack-make 'set-default-shell
(lambda _ (lambda _
;; Taken mostly directly from (@ (gnu packages base) gnu-make) ;; Taken mostly directly from (@ (gnu packages base) gnu-make)
(substitute* (string-append ,make-dir "/job.c") (substitute* (string-append ,make-dir "/src/job.c")
(("default_shell = .*$") (("default_shell = .*$")
(format #f "default_shell = \"~a\";\n" (format #f "default_shell = \"~a\";\n"
(which "sh")))))) (which "sh"))))))
@ -606,7 +606,7 @@ fun.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dlbeer/mspdebug.git") (url "https://github.com/dlbeer/mspdebug")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

28
gnu/packages/diffoscope.scm
View file

@ -72,7 +72,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "148") (version "151")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv")))) "1lv44ngqij9dp3xk9jj95w7an7h03iac6b2ifpq33j5fffswa1sm"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -132,17 +132,25 @@
(("\\['getfacl',") (("\\['getfacl',")
(string-append "['" (which "getfacl") "',"))) (string-append "['" (which "getfacl") "',")))
#t)) #t))
(add-after 'build 'build-man-page
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "-C" "doc" make-flags)))
(add-before 'check 'writable-test-data (add-before 'check 'writable-test-data
(lambda _ (lambda _
;; tests may need needs write access to tests ;; Tests may need write access to tests directory.
;; directory
(for-each make-file-writable (find-files "tests")) (for-each make-file-writable (find-files "tests"))
#t)) #t))
(add-before 'check 'delete-failing-test (add-before 'check 'delete-failing-test
(lambda _ (lambda _
;; this requires /sbin to be on the path ;; This requires /sbin to be in $PATH.
(delete-file "tests/test_tools.py") (delete-file "tests/test_tools.py")
#t))))) #t))
(add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1")))
(install-file "doc/diffoscope.1" man)
#t))))))
(inputs `(("rpm" ,rpm) ;for rpm-python (inputs `(("rpm" ,rpm) ;for rpm-python
("python-file" ,python-file) ("python-file" ,python-file)
("python-debian" ,python-debian) ("python-debian" ,python-debian)
@ -151,14 +159,15 @@
("acl" ,acl) ;for getfacl ("acl" ,acl) ;for getfacl
("colordiff" ,colordiff) ("colordiff" ,colordiff)
("xxd" ,xxd))) ("xxd" ,xxd)))
(native-inputs `(("help2man" ,help2man)
;; Below are modules used for tests. ;; Below are modules used for tests.
(native-inputs `(("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-chardet" ,python-chardet) ("python-chardet" ,python-chardet)
("python-binwalk" ,python-binwalk) ("python-binwalk" ,python-binwalk)
("python-h5py" ,python-h5py) ("python-h5py" ,python-h5py)
("python-pypdf2" ,python-pypdf2) ("python-pypdf2" ,python-pypdf2)
("python-progressbar33" ,python-progressbar33) ("python-progressbar33" ,python-progressbar33)
;; test suite skips tests when tool is missing ;; The test suite skips tests when these are missing.
,@(match (%current-system) ,@(match (%current-system)
;; ghc is only available on x86 currently. ;; ghc is only available on x86 currently.
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
@ -171,8 +180,7 @@
((or "x86_64-linux") ((or "x86_64-linux")
`(("enjarify" ,enjarify) `(("enjarify" ,enjarify)
;; no unversioned openjdk available ;; no unversioned openjdk available
("openjdk:jdk" ,openjdk12 "jdk") ("openjdk:jdk" ,openjdk12 "jdk")))
))
(_ (_
`())) `()))
("abootimg" ,abootimg) ("abootimg" ,abootimg)

17
gnu/packages/digest.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,12 +20,14 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module (guix utils)
#:use-module (ice-9 match))
(define-public xxhash (define-public xxhash
(package (package
(name "xxhash") (name "xxhash")
(version "0.7.3") (version "0.7.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -34,11 +36,16 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a")))) (base32 "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list "CC=gcc" (list ,(string-append "CC=" (cc-for-target))
,(match (or (%current-target-system)
(%current-system))
;; Detect vector instruction set at run time.
((or "i686-linux" "x86_64-linux") "DISPATCH=1")
(_ "DISPATCH=0"))
"XXH_FORCE_MEMORY_ACCESS=1" ; improved performance with GCC "XXH_FORCE_MEMORY_ACCESS=1" ; improved performance with GCC
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases #:phases

19
gnu/packages/disk.scm
View file

@ -78,6 +78,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
@ -96,7 +97,7 @@
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/IgnorantGuru/udevil.git") (url "https://github.com/IgnorantGuru/udevil")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -432,7 +433,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
version "/gparted-" version ".tar.gz")) version "/gparted-" version ".tar.gz"))
(sha256 (sha256
(base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2")))) (base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2"))))
(build-system gnu-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; Tests require access to paths outside the build container, such ;; Tests require access to paths outside the build container, such
;; as '/dev/disk/by-id' ;; as '/dev/disk/by-id'
@ -486,7 +487,7 @@ systems. Output format is completely customizable.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/AltraMayor/f3.git") (url "https://github.com/AltraMayor/f3")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -524,7 +525,7 @@ a card with a smaller capacity than stated.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dcantrell/pyparted.git") (url "https://github.com/dcantrell/pyparted")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -565,7 +566,7 @@ a card with a smaller capacity than stated.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/markfasheh/duperemove.git") (url "https://github.com/markfasheh/duperemove")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z")) (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z"))
@ -695,7 +696,7 @@ passphrases.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pmem/ndctl.git") (url "https://github.com/pmem/ndctl")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -846,7 +847,7 @@ LVM D-Bus API).")
(define-public rmlint (define-public rmlint
(package (package
(name "rmlint") (name "rmlint")
(version "2.9.0") (version "2.10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -855,7 +856,7 @@ LVM D-Bus API).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i")))) "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"))))
(build-system scons-build-system) (build-system scons-build-system)
(arguments (arguments
`(#:scons ,scons-python2 `(#:scons ,scons-python2
@ -918,7 +919,7 @@ on your file system and offers to remove it. @command{rmlint} can find:
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/gokcehan/lf.git") (url "https://github.com/gokcehan/lf")
(commit (string-append "r" version)))) (commit (string-append "r" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

34
gnu/packages/display-managers.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 L p R n d n <guix@lprndn.info> ;;; Copyright © 2020 L p R n d n <guix@lprndn.info>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,9 +28,11 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -123,6 +126,37 @@ create smooth, animated user interfaces.")
;; QML files are MIT licensed and images are CC BY 3.0. ;; QML files are MIT licensed and images are CC BY 3.0.
(license (list license:gpl2+ license:expat license:cc-by3.0)))) (license (list license:gpl2+ license:expat license:cc-by3.0))))
(define-public guix-simplyblack-sddm-theme
(package
(name "guix-simplyblack-sddm-theme")
(version "0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/plattfot/guix-simplyblack-sddm")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1fwny6b0xpjs8ad2b16pyxd27gf0sr0nillmhc2h5k0q7dva21vi"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(sddm-themes (string-append out "/share/sddm/themes")))
(mkdir-p sddm-themes)
(copy-recursively (assoc-ref %build-inputs "source")
(string-append sddm-themes "/guix-simplyblack-sddm"))))))
(home-page "https://github.com/plattfot/guix-simplyblack-sddm")
(synopsis "Guix based theme for SDDM")
(description
"This package provides a simple theme for SDDM, black background with
Guix's logo. Based on Arch linux's archlinux-simplyblack theme.")
;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0
(license (list license:cc-by-sa3.0 license:cc-by-sa4.0))))
(define-public lightdm (define-public lightdm
(package (package
(name "lightdm") (name "lightdm")

2
gnu/packages/distributed.scm
View file

@ -48,7 +48,7 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/boinc/boinc.git") (url "https://github.com/boinc/boinc")
(commit (string-append "client_release/" (commit (string-append "client_release/"
(version-major+minor version) (version-major+minor version)
"/" version)))) "/" version))))

289
gnu/packages/django.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -32,7 +32,10 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages geo)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
@ -42,13 +45,13 @@
(define-public python-django (define-public python-django
(package (package
(name "python-django") (name "python-django")
(version "1.11.28") (version "1.11.29")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k")))) "171jsi54fbnxzi2n3l4hkdmmwfnfrwacs180rw59l0bqcvxsw022"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:modules ((srfi srfi-1) '(#:modules ((srfi srfi-1)
@ -82,9 +85,6 @@
;; TODO: Install extras/django_bash_completion. ;; TODO: Install extras/django_bash_completion.
(native-inputs (native-inputs
`(("tzdata" ,tzdata-for-tests) `(("tzdata" ,tzdata-for-tests)
;; bcrypt and argon2-cffi are extra requirements not yet in guix
;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0
;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt!
;; Remaining packages are test requirements taken from ;; Remaining packages are test requirements taken from
;; tests/requirements/py3.txt ;; tests/requirements/py3.txt
("python-docutils" ,python-docutils) ("python-docutils" ,python-docutils)
@ -98,7 +98,9 @@
("python-sqlparse" ,python-sqlparse) ("python-sqlparse" ,python-sqlparse)
("python-tblib" ,python-tblib))) ("python-tblib" ,python-tblib)))
(propagated-inputs (propagated-inputs
`(("python-pytz" ,python-pytz))) `(("python-argon2-cffi" ,python-argon2-cffi)
("python-bcrypt" ,python-bcrypt)
("python-pytz" ,python-pytz)))
(home-page "https://www.djangoproject.com/") (home-page "https://www.djangoproject.com/")
(synopsis "High-level Python Web framework") (synopsis "High-level Python Web framework")
(description (description
@ -132,7 +134,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(method git-fetch) (method git-fetch)
;; Fetch from the git repository, so that the tests can be run. ;; Fetch from the git repository, so that the tests can be run.
(uri (git-reference (uri (git-reference
(url "https://github.com/django-extensions/django-extensions.git") (url "https://github.com/django-extensions/django-extensions")
(commit version))) (commit version)))
(file-name (string-append name "-" version)) (file-name (string-append name "-" version))
(sha256 (sha256
@ -191,6 +193,31 @@ with arguments to the field constructor.")
(define-public python2-django-simple-math-captcha (define-public python2-django-simple-math-captcha
(package-with-python2 python-django-simple-math-captcha)) (package-with-python2 python-django-simple-math-captcha))
(define-public python-django-classy-tags
(package
(name "python-django-classy-tags")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-classy-tags" version))
(sha256
(base32
"1cayqddvxd5prhybqi77lif2z4j7mmfmxgc61pq9i82q5gy2asmd"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; Test script not distributed with release.
(propagated-inputs
`(("python-django" ,python-django)
("python-six" ,python-six)))
(home-page "https://github.com/divio/django-classy-tags")
(synopsis "Class based template tags for Django")
(description
"@code{django-classy-tags} is an approach at making writing template tags
in Django easier, shorter and more fun. It provides an extensible argument
parser which reduces most of the boiler plate code you usually have to write
when coding custom template tags.")
(license license:bsd-3)))
(define-public python-django-taggit (define-public python-django-taggit
(package (package
(name "python-django-taggit") (name "python-django-taggit")
@ -281,6 +308,54 @@ useful tools for testing Django applications and projects.")
(define-public python2-pytest-django (define-public python2-pytest-django
(package-with-python2 python-pytest-django)) (package-with-python2 python-pytest-django))
(define-public python-django-haystack
(package
(name "python-django-haystack")
(version "2.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-haystack" version))
(sha256
(base32
"1302fqsrx8w474xk5cmnmg3hjqfprlxnjg9qlg86arsr4v4vqm4b"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'loosen-verion-restrictions
(lambda _
(substitute* "setup.py"
(("geopy.*") "geopy',\n"))
#t))
(add-before 'check 'set-gdal-lib-path
(lambda* (#:key inputs #:allow-other-keys)
(setenv "GDAL_LIBRARY_PATH"
(string-append (assoc-ref inputs "gdal")
"/lib"))
#t)))
#:tests? #f)) ; OSError: libgdal.so.27: cannot open shared object file
(propagated-inputs
`(("python-django" ,python-django)))
(native-inputs
`(("gdal" ,gdal)
("python-coverage" ,python-coverage)
("python-dateutil" ,python-dateutil)
("python-geopy" ,python-geopy)
("python-mock" ,python-mock)
("python-nose" ,python-nose)
("python-requests" ,python-requests)
("python-setuptools-scm" ,python-setuptools-scm)
("python-pysolr" ,python-pysolr)
("python-whoosh" ,python-whoosh)))
(home-page "http://haystacksearch.org/")
(synopsis "Pluggable search for Django")
(description "Haystack provides modular search for Django. It features a
unified, familiar API that allows you to plug in different search backends
(such as Solr, Elasticsearch, Whoosh, Xapian, etc.) without having to modify
your code.")
(license license:bsd-3)))
(define-public python-django-filter (define-public python-django-filter
(package (package
(name "python-django-filter") (name "python-django-filter")
@ -318,36 +393,23 @@ them do this.")
(define-public python-django-allauth (define-public python-django-allauth
(package (package
(name "python-django-allauth") (name "python-django-allauth")
(version "0.39.1") (version "0.40.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "django-allauth" version)) (uri (pypi-uri "django-allauth" version))
(sha256 (sha256
(base32 (base32
"17l0acpr3cihdndzccjhgv58f9z170v2qwx7w0b8w6235x646i24")))) "12f5gjidcpb7a0d1f601k0c5dcdmb6fg9sfn7xn5j8zfsg29y63a"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; TODO: Tagging the tests requiring the web could be done upstream.
(add-before 'check 'skip-test-requiring-network-access
(lambda _
(substitute* "allauth/socialaccount/providers/openid/tests.py"
(("import override_settings") "import tag, override_settings")
(("def test_login")
"@tag('requires-web')
def test_login"))))
(replace 'check (replace 'check
(lambda _ (lambda _
;; TODO: investigate why this test fails
(delete-file "allauth/socialaccount/providers/cern/tests.py")
(setenv "DJANGO_SETTINGS_MODULE" "test_settings") (setenv "DJANGO_SETTINGS_MODULE" "test_settings")
(invoke "django-admin" (invoke "django-admin" "test" "allauth.tests"
"test" "--pythonpath=."))))))
"allauth"
"--verbosity=2"
"--exclude-tag=requires-web"))))))
(propagated-inputs (propagated-inputs
`(("python-openid" ,python-openid) `(("python-openid" ,python-openid)
("python-requests" ,python-requests) ("python-requests" ,python-requests)
@ -375,7 +437,7 @@ account authentication.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/jazzband/django-debug-toolbar.git") (url "https://github.com/jazzband/django-debug-toolbar")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -483,7 +545,7 @@ merging, minifying and compiling CSS and Javascript files.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/niwinz/django-jinja.git") (url "https://github.com/niwinz/django-jinja")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -572,6 +634,25 @@ conn_max_age argument to easily enable Django’s connection pool.")
(define-public python2-dj-database-url (define-public python2-dj-database-url
(package-with-python2 python-dj-database-url)) (package-with-python2 python-dj-database-url))
(define-public python-django-picklefield
(package
(name "python-django-picklefield")
(version "2.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-picklefield" version))
(sha256
(base32
"0imncys5s3vsy2q79nn7k5d670da1xgmcr9gmhn06fry6ibf39b7"))))
(build-system python-build-system)
(propagated-inputs `(("python-django" ,python-django)))
(native-inputs `(("python-tox" ,python-tox)))
(home-page "https://github.com/gintas/django-picklefield")
(synopsis "Pickled object field for Django")
(description "Pickled object field for Django")
(license license:expat)))
(define-public python-django-bulk-update (define-public python-django-bulk-update
(package (package
(name "python-django-bulk-update") (name "python-django-bulk-update")
@ -794,7 +875,7 @@ support, and optional data-URI image and font embedding.")
(invoke "redis-server" "--daemonize" "yes") (invoke "redis-server" "--daemonize" "yes")
(invoke "django-admin.py" "test" "django_rq" (invoke "django-admin.py" "test" "django_rq"
"--settings=django_rq.tests.settings" "--settings=django_rq.tests.settings"
"--pythonpath=")))))) "--pythonpath=."))))))
(native-inputs (native-inputs
`(("python-mock" ,python-mock) `(("python-mock" ,python-mock)
("redis" ,redis))) ("redis" ,redis)))
@ -812,6 +893,41 @@ settings.py and easily use them in your project.")
(define-public python2-django-rq (define-public python2-django-rq
(package-with-python2 python-django-rq)) (package-with-python2 python-django-rq))
(define-public python-django-q
(package
(name "python-django-q")
(version "1.3.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-q" version))
(sha256
(base32
"0ac3rjxv37bn97a62ly8b7qvbv765z6paiinzpwxx83nal2icc42"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(setenv "DJANGO_SETTINGS_MODULE" "django_q.tests.settings")
(invoke "django-admin" "test" "django_q.tests"
"--pythonpath=."))))))
(propagated-inputs
`(("python-arrow" ,python-arrow)
("python-blessed" ,python-blessed)
("python-django" ,python-django)
("python-django-picklefield" ,python-django-picklefield)))
(native-inputs
`(("python-django-redis" ,python-django-redis)
("python-pytest-django" ,python-pytest-django)))
(home-page "https://django-q.readthedocs.io/")
(synopsis "Multiprocessing distributed task queue for Django")
(description
"Django Q is a native Django task queue, scheduler and worker application
using Python multiprocessing.")
(license license:expat)))
(define-public python-django-sortedm2m (define-public python-django-sortedm2m
(package (package
(name "python-django-sortedm2m") (name "python-django-sortedm2m")
@ -965,6 +1081,37 @@ higher quality while welcoming newcomers.")
(define-public python-django-tagging (define-public python-django-tagging
(package (package
(name "python-django-tagging") (name "python-django-tagging")
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-tagging" version))
(sha256
(base32
"13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(setenv "DJANGO_SETTINGS_MODULE" "tagging.tests.settings")
(invoke "django-admin" "test" "--pythonpath=."))))))
(inputs
`(("python-django" ,python-django)))
(home-page "https://github.com/Fantomas42/django-tagging")
(synopsis "Generic tagging application for Django")
(description "This package provides a generic tagging application for
Django projects, which allows association of a number of tags with any
@code{Model} instance and makes retrieval of tags simple.")
(properties `((python2-variant . ,(delay python2-django-tagging))))
(license license:bsd-3)))
(define-public python2-django-tagging
(let ((base (package-with-python2
(strip-python2-variant python-django-tagging))))
(package
(inherit base)
(version "0.4.6") (version "0.4.6")
(source (source
(origin (origin
@ -972,17 +1119,7 @@ higher quality while welcoming newcomers.")
(uri (pypi-uri "django-tagging" version)) (uri (pypi-uri "django-tagging" version))
(sha256 (sha256
(base32 (base32
"0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1")))) "0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1")))))))
(build-system python-build-system)
(home-page "https://github.com/Fantomas42/django-tagging")
(synopsis "Generic tagging application for Django")
(description "This package provides a generic tagging application for
Django projects, which allows association of a number of tags with any
@code{Model} instance and makes retrieval of tags simple.")
(license license:bsd-3)))
(define-public python2-django-tagging
(package-with-python2 python-django-tagging))
(define-public python-djangorestframework (define-public python-djangorestframework
(package (package
@ -1008,6 +1145,35 @@ Django projects, which allows association of a number of tags with any
provides features like a web browseable API and authentication policies.") provides features like a web browseable API and authentication policies.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python-django-sekizai
(package
(name "python-django-sekizai")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-sekizai" version))
(sha256
(base32
"1nc4sv109valdn6azmgm2j01k7khxy2wnji84z63x7fxsikfdxp2"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; Tests not included with release.
(propagated-inputs
`(("python-django" ,python-django)
("python-django-classy-tags" ,python-django-classy-tags)
("python-six" ,python-six)))
(home-page "https://github.com/divio/django-sekizai")
(synopsis "Template blocks for Django projects")
(description "Sekizai means blocks in Japanese, and thats what this app
provides. A fresh look at blocks. With @code{django-sekizai} you can define
placeholders where your blocks get rendered and at different places in your
templates append to those blocks. This is especially useful for css and
javascript. Your subtemplates can now define css and javscript files to be
included, and the css will be nicely put at the top and the javascript to the
bottom, just like you should. Also sekizai will ignore any duplicate content in
a single block.")
(license license:bsd-3)))
(define-public python-django-crispy-forms (define-public python-django-crispy-forms
(package (package
(name "python-django-crispy-forms") (name "python-django-crispy-forms")
@ -1033,6 +1199,51 @@ provides features like a web browseable API and authentication policies.")
forms using your favorite CSS framework, without writing template code.") forms using your favorite CSS framework, without writing template code.")
(license license:expat))) (license license:expat)))
(define-public python-django-compressor
(package
(name "python-django-compressor")
(version "2.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django_compressor" version))
(sha256
(base32
"0kx7bclfa0sxlsz6ka70zr9ra00lks0hmv1kc99wbanx6xhirvfj"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(begin
(setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings")
(invoke "django-admin" "test"
"--pythonpath=."))
#t))))
;; Tests fail with beautifulsoup 4.9+
;; https://github.com/django-compressor/django-compressor/issues/998
#:tests? #f))
(propagated-inputs
`(("python-django-appconf" ,python-django-appconf)
("python-rcssmin" ,python-rcssmin)
("python-rjsmin" ,python-rjsmin)))
(native-inputs
`(("python-beautifulsoup4" ,python-beautifulsoup4)
("python-brotli" ,python-brotli)
("python-csscompressor" ,python-csscompressor)
("python-django-sekizai" ,python-django-sekizai)
("python-mock" ,python-mock)))
(home-page "https://django-compressor.readthedocs.io/en/latest/")
(synopsis
"Compress linked and inline JavaScript or CSS into single cached files")
(description
"Django Compressor combines and compresses linked and inline Javascript or
CSS in a Django templates into cacheable static files by using the compress
template tag.")
(license license:expat)))
(define-public python-django-override-storage (define-public python-django-override-storage
(package (package
(name "python-django-override-storage") (name "python-django-override-storage")

18
gnu/packages/dlang.scm
View file

@ -88,7 +88,7 @@ and freshness without requiring additional information from the user.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/ldc.git") (url "https://github.com/ldc-developers/ldc")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -156,7 +156,7 @@ and freshness without requiring additional information from the user.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/phobos.git") (url "https://github.com/ldc-developers/phobos")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "phobos" version)) (file-name (git-file-name "phobos" version))
(sha256 (sha256
@ -166,7 +166,7 @@ and freshness without requiring additional information from the user.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/druntime.git") (url "https://github.com/ldc-developers/druntime")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "druntime" version)) (file-name (git-file-name "druntime" version))
(sha256 (sha256
@ -175,7 +175,7 @@ and freshness without requiring additional information from the user.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/dmd-testsuite.git") (url "https://github.com/ldc-developers/dmd-testsuite")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "dmd-testsuite" version)) (file-name (git-file-name "dmd-testsuite" version))
(sha256 (sha256
@ -206,7 +206,7 @@ bootstrapping more recent compilers written in D.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/ldc.git") (url "https://github.com/ldc-developers/ldc")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -273,7 +273,7 @@ bootstrapping more recent compilers written in D.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/phobos.git") (url "https://github.com/ldc-developers/phobos")
(commit (string-append "ldc-v" older-version)))) (commit (string-append "ldc-v" older-version))))
(file-name (git-file-name "phobos" older-version)) (file-name (git-file-name "phobos" older-version))
(sha256 (sha256
@ -292,7 +292,7 @@ bootstrapping more recent compilers written in D.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/druntime.git") (url "https://github.com/ldc-developers/druntime")
(commit (string-append "ldc-v" older-version)))) (commit (string-append "ldc-v" older-version))))
(file-name (git-file-name "druntime" older-version)) (file-name (git-file-name "druntime" older-version))
(sha256 (sha256
@ -301,7 +301,7 @@ bootstrapping more recent compilers written in D.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/dmd-testsuite.git") (url "https://github.com/ldc-developers/dmd-testsuite")
(commit (string-append "ldc-v" older-version)))) (commit (string-append "ldc-v" older-version))))
(file-name (git-file-name "dmd-testsuite" older-version)) (file-name (git-file-name "dmd-testsuite" older-version))
(sha256 (sha256
@ -315,7 +315,7 @@ bootstrapping more recent compilers written in D.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dlang/dub.git") (url "https://github.com/dlang/dub")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

48
gnu/packages/dns.scm
View file

@ -119,7 +119,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
(define-public isc-bind (define-public isc-bind
(package (package
(name "bind") (name "bind")
(version "9.16.4") (version "9.16.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -127,7 +127,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02ip1xvmnqla3p5k2rmfrksrw4q9iqbrhyg3mamvrj5a7n6hh8km")))) "0xf07mmd0vi91jd15z8d3hhjva8v27l4ip4l8yzah4gg3zjv6y33"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs
@ -177,14 +177,28 @@ and BOOTP/TFTP for network booting of diskless machines.")
(with-directory-excursion "fuzz" (with-directory-excursion "fuzz"
(invoke "make" "check")) (invoke "make" "check"))
#t))))) #t)))))
(synopsis "An implementation of the Domain Name System") (synopsis "Domain Name System (DNS) implementation")
(description "BIND is an implementation of the @dfn{Domain Name System} (description "BIND is an implementation of the @dfn{Domain Name System}
(DNS) protocols for the Internet. It is a reference implementation of those (DNS) protocols for the Internet. It is a reference implementation of those
protocols, but it is also production-grade software, suitable for use in protocols, but it is also production-grade software, suitable for use in
high-volume and high-reliability applications. The name BIND stands for high-volume and high-reliability applications. The name BIND stands for
\"Berkeley Internet Name Domain\", because the software originated in the early \"Berkeley Internet Name Domain\", because the software originated in the
1980s at the University of California at Berkeley.") early 1980s at the University of California at Berkeley. The @code{utils}
(home-page "https://www.isc.org/downloads/bind") output of this package contains the following DNS name servers related command
line utilities:
@table @code
@item delv
DNS lookup and validation utility
@item dig
DNS lookup utility
@item host
DNS lookup utility
@item nslookup
Internet name servers interactive query utility
@item nsupdate
Dynamic DNS update utility
@end table")
(home-page "https://www.isc.org/bind/")
(license (list license:mpl2.0)))) (license (list license:mpl2.0))))
(define-public dnscrypt-proxy (define-public dnscrypt-proxy
@ -321,14 +335,14 @@ asynchronous fashion.")
(define-public nsd (define-public nsd
(package (package
(name "nsd") (name "nsd")
(version "4.2.4") (version "4.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0z7j3vwqqj0hh8n5irb2yqwzl45k4sn2wczbq1b1lqv5cxv6vgcy")))) (base32 "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -723,8 +737,9 @@ synthesis, and on-the-fly re-configuration.")
("libuv" ,libuv) ("libuv" ,libuv)
("lmdb" ,lmdb) ("lmdb" ,lmdb)
("luajit" ,luajit) ("luajit" ,luajit)
;; TODO: Add optional lua modules: basexx, cqueues and psl. ;; TODO: Add optional lua modules: basexx and psl.
("lua-bitop" ,lua5.1-bitop) ("lua-bitop" ,lua5.1-bitop)
("lua-cqueues" ,lua5.1-cqueues)
("lua-filesystem" ,lua5.1-filesystem) ("lua-filesystem" ,lua5.1-filesystem)
("lua-sec" ,lua5.1-sec) ("lua-sec" ,lua5.1-sec)
("lua-socket" ,lua5.1-socket))) ("lua-socket" ,lua5.1-socket)))
@ -747,7 +762,7 @@ LuaJIT, both a resolver library and a daemon.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ddclient/ddclient.git") (url "https://github.com/ddclient/ddclient")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -914,7 +929,7 @@ local networks.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/publicsuffix/list.git") (url "https://github.com/publicsuffix/list")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -951,7 +966,7 @@ known public suffixes.")
(define-public maradns (define-public maradns
(package (package
(name "maradns") (name "maradns")
(version "3.5.0004") (version "3.5.0007")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -959,18 +974,13 @@ known public suffixes.")
(version-major+minor version) "/" (version-major+minor version) "/"
version "/maradns-" version ".tar.xz")) version "/maradns-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "0bc19xylg4whww9qaj5i4izwxcrh0c0ja7l1pfcn2la02hlvg1a6"))))
"1zv0i6m4m05ay5zlhwq1h88hgjq2d81cjanpnb3gyhr0xhmjwk6a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; need to be root to run tests `(#:tests? #f ; need to be root to run tests
#:make-flags #:make-flags
(list (list
(string-append "CC=" ,(string-append "CC=" (cc-for-target))
(if ,(%current-target-system)
(string-append (assoc-ref %build-inputs "cross-gcc")
"/bin/" ,(%current-target-system) "-gcc")
"gcc"))
(string-append "PREFIX=" %output) (string-append "PREFIX=" %output)
(string-append "RPM_BUILD_ROOT=" %output)) (string-append "RPM_BUILD_ROOT=" %output))
#:phases #:phases

32
gnu/packages/docker.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,7 +48,7 @@
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
(define %docker-version "19.03.11") (define %docker-version "19.03.12")
(define-public python-docker-py (define-public python-docker-py
(package (package
@ -65,7 +66,6 @@
(arguments '(#:tests? #f)) (arguments '(#:tests? #f))
(inputs (inputs
`(("python-requests" ,python-requests-2.20) `(("python-requests" ,python-requests-2.20)
("python-ipaddress" ,python-ipaddress)
("python-six" ,python-six) ("python-six" ,python-six)
("python-urllib3" ,python-urllib3-1.24) ("python-urllib3" ,python-urllib3-1.24)
("python-websocket-client" ,python-websocket-client))) ("python-websocket-client" ,python-websocket-client)))
@ -178,7 +178,7 @@ Python without keeping their credentials in a Docker configuration file.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/containerd/containerd.git") (url "https://github.com/containerd/containerd")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -256,7 +256,7 @@ network attachments.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/libnetwork.git") (url "https://github.com/docker/libnetwork")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -310,11 +310,11 @@ built-in registry server of Docker.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/engine.git") (url "https://github.com/docker/engine")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1pmbggxbazipl24hxiaccbj32379zv79xba76l78v5131ihx922h")) (base32 "1dj6llfcgcbpq9q9j6b4wb0anbn1g5wzm8ikq2lyhg54i3154m93"))
(patches (patches
(search-patches "docker-fix-tests.patch")))) (search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -390,6 +390,17 @@ built-in registry server of Docker.")
(substitute* "pkg/archive/archive.go" (substitute* "pkg/archive/archive.go"
(("string\\{\"xz") (("string\\{\"xz")
(string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz")))
;; TODO: Remove when Docker proper uses v1.14.x to build
(substitute* "registry/resumable/resumablerequestreader_test.go"
(("I%27m%20not%20an%20url" all)
(string-append "\"" all "\"")))
;; TODO: Remove when Docker proper uses v1.14.x to build
(substitute* "vendor/gotest.tools/x/subtest/context.go"
(("func \\(tc \\*testcase\\) Cleanup\\(" all)
(string-append all "func()"))
(("tc\\.Cleanup\\(" all)
(string-append all "nil")))
(let ((source-files (filter (lambda (name) (let ((source-files (filter (lambda (name)
(not (string-contains name "test"))) (not (string-contains name "test")))
(find-files "." "\\.go$")))) (find-files "." "\\.go$"))))
@ -488,6 +499,7 @@ built-in registry server of Docker.")
;; Timeouts after 5 min. ;; Timeouts after 5 min.
(delete-file "plugin/manager_linux_test.go") (delete-file "plugin/manager_linux_test.go")
;; Operation not permitted. ;; Operation not permitted.
(delete-file "daemon/graphdriver/aufs/aufs_test.go")
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go")
@ -588,11 +600,11 @@ provisioning etc.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/cli.git") (url "https://github.com/docker/cli")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1y9ymv70r1hndblr64h19q34arxl2f3dqqi2qcrai5zfimcml6lr")))) (base32 "1bynmnaykhh1m42v6bxparlpm9kajpqsvlrlwgz1b9ivcklf5ik6"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/docker/cli" `(#:import-path "github.com/docker/cli"
@ -658,7 +670,7 @@ provisioning etc.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/savoirfairelinux/cqfd.git") (url "https://github.com/savoirfairelinux/cqfd")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -696,7 +708,7 @@ defined in a per-project configuration file.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/krallin/tini.git") (url "https://github.com/krallin/tini")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

4
gnu/packages/documentation.scm
View file

@ -127,7 +127,7 @@ markup) can be customized and extended by the user.")
(define-public asciidoc-py3 (define-public asciidoc-py3
(package (inherit asciidoc) (package (inherit asciidoc)
(name "asciidoc-py3") (name "asciidoc-py3")
(version "9.0.0rc1") (version "9.0.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -136,7 +136,7 @@ markup) can be customized and extended by the user.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1v815dgab62970m9cr2crwbh4kvlzk6pv3hk4bzv6gfa4lbwfkfl")))) "1xpws5lgzaqwgbc7sq6bp8adjxy8qb4qb9nj4vvpxamjgx3pny54"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf))) `(("autoconf" ,autoconf)))

13
gnu/packages/education.scm
View file

@ -274,16 +274,16 @@ easy.")
(define-public snap (define-public snap
(package (package
(name "snap") (name "snap")
(version "5.4.5") (version "6.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/jmoenig/Snap.git") (url "https://github.com/jmoenig/Snap")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1z6dbcsgvxxs40p23qysfsk4vzpg8jlrr5pqfnjf8q3kpz1xvzxf")))) (base32 "1j5hcnms12hpnl2ba7haf00l08rkpb5wpfsgax07p838q5dc7cam"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))
@ -612,14 +612,14 @@ Portuguese, Spanish and Italian.")
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "5.45.0") (version "5.45.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/" (uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
"fet-" version ".tar.bz2")) "fet-" version ".tar.bz2"))
(sha256 (sha256
(base32 "04jns6wc20rz6cp410znsllknhp4zlf4rn8wgv712855nffs42c6")))) (base32 "1pg47jk6fw46fr7m32l1ypm1zyjfz1ik5f333ynqqr705f1c0ij5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1000,7 +1000,8 @@ machine, and more.")
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/exercism/cli/exercism" `(#:import-path "github.com/exercism/cli/exercism"
#:unpack-path "github.com/exercism/cli")) #:unpack-path "github.com/exercism/cli"
#:install-source? #f))
(inputs (inputs
`(("github.com/blang/semver" ,go-github-com-blang-semver) `(("github.com/blang/semver" ,go-github-com-blang-semver)
("github.com/spf13/cobra" ,go-github-com-spf13-cobra) ("github.com/spf13/cobra" ,go-github-com-spf13-cobra)

2
gnu/packages/efi.scm
View file

@ -187,7 +187,7 @@ and EFI variable management.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mfleming/efilinux.git") (url "https://github.com/mfleming/efilinux")
(commit (string-append "efilinux-" version)))) (commit (string-append "efilinux-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

6
gnu/packages/elixir.scm
View file

@ -33,16 +33,16 @@
(define-public elixir (define-public elixir
(package (package
(name "elixir") (name "elixir")
(version "1.10.3") (version "1.10.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/elixir-lang/elixir.git") (url "https://github.com/elixir-lang/elixir")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a")) (base32 "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv"))
(patches (search-patches "elixir-path-length.patch")))) (patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

1777
gnu/packages/emacs-xyz.scm
View file

File diff suppressed because it is too large Load diff

20
gnu/packages/embedded.scm
View file

@ -596,7 +596,7 @@ with a layered architecture of JTAG interface and TAP support.")
(source (origin (inherit (package-source xbinutils)) (source (origin (inherit (package-source xbinutils))
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/parallaxinc/propgcc.git") (url "https://github.com/parallaxinc/propgcc")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -632,7 +632,7 @@ with a layered architecture of JTAG interface and TAP support.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/totalspectrum/gcc-propeller.git") (url "https://github.com/totalspectrum/gcc-propeller")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -667,7 +667,7 @@ with a layered architecture of JTAG interface and TAP support.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/parallaxinc/propgcc.git") (url "https://github.com/parallaxinc/propgcc")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -709,7 +709,7 @@ with a layered architecture of JTAG interface and TAP support.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/parallaxinc/propgcc.git") (url "https://github.com/parallaxinc/propgcc")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -828,7 +828,7 @@ code.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/parallaxinc/propgcc.git") (url "https://github.com/parallaxinc/propgcc")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -913,7 +913,7 @@ larger).")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/parallaxinc/spinsim.git") (url "https://github.com/parallaxinc/spinsim")
(commit commit))) (commit commit)))
(file-name (string-append name "-" commit "-checkout")) (file-name (string-append name "-" commit "-checkout"))
(sha256 (sha256
@ -969,7 +969,7 @@ simulator.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/puppeh/binutils-vc4.git") (url "https://github.com/puppeh/binutils-vc4")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
@ -997,7 +997,7 @@ simulator.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/puppeh/cgen.git") (url "https://github.com/puppeh/cgen")
(commit "d8e2a9eb70425f180fdd5bfd032884b0855f2032"))) (commit "d8e2a9eb70425f180fdd5bfd032884b0855f2032")))
(sha256 (sha256
(base32 (base32
@ -1021,7 +1021,7 @@ the Raspberry Pi chip.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/puppeh/gcc-vc4.git") (url "https://github.com/puppeh/gcc-vc4")
(commit commit))) (commit commit)))
(file-name (string-append name (file-name (string-append name
"-" "-"
@ -1045,7 +1045,7 @@ the Raspberry Pi chip."))))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/daym/libmpsse.git") (url "https://github.com/daym/libmpsse")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name "libmpsse-checkout") (file-name "libmpsse-checkout")
(sha256 (sha256

291
gnu/packages/emulators.scm
View file

@ -48,6 +48,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages digest)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
@ -139,7 +140,7 @@
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dolphin-emu/dolphin.git") (url "https://github.com/dolphin-emu/dolphin")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
@ -288,7 +289,7 @@ older games.")
(source (origin (source (origin
(method git-fetch) ; no tarball available (method git-fetch) ; no tarball available
(uri (git-reference (uri (git-reference
(url "https://github.com/Aloshi/EmulationStation.git") (url "https://github.com/Aloshi/EmulationStation")
(commit commit))) ; no version tag (commit commit))) ; no version tag
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -322,7 +323,7 @@ and a game metadata scraper.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/higan-emu/higan.git") (url "https://github.com/higan-emu/higan")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -414,6 +415,67 @@ Pocket Color, WonderSwan, WonderSwan Color, SwanCrystal, Pocket Challenge
V2.") V2.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public mednafen
(package
(name "mednafen")
(version "1.24.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://mednafen.github.io/releases/files/"
"mednafen-" version ".tar.xz"))
(sha256
(base32 "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list
;; "--with-external-mpcdec"
"--with-external-lzo")))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa" ,alsa-lib)
;; ("libmpcdec" ,libmpcdec) FIXME: not recognized.
("libsndfile" ,libsndfile)
("lzo" ,lzo)
("sdl2" ,sdl2)
("zlib" ,zlib)))
(home-page "https://mednafen.github.io/")
(synopsis "Multi-system emulator utilizing OpenGL and SDL")
(description
"Mednafen is a portable, utilizing OpenGL and SDL, argument-driven
multi-system emulator. Mednafen has the ability to remap hotkey functions and
virtual system inputs to a keyboard, a joystick, or both simultaneously. Save
states are supported, as is real-time game rewinding. Screen snapshots may be
taken, in the PNG file format, at the press of a button. Mednafen can record
audiovisual movies in the QuickTime file format, with several different
lossless codecs supported.
The following systems are supported:
@itemize
@item Apple II/II+
@item Atari Lynx
@item Neo Geo Pocket (Color)
@item WonderSwan
@item GameBoy (Color)
@item GameBoy Advance
@item Nintendo Entertainment System
@item Super Nintendo Entertainment System/Super Famicom
@item Virtual Boy
@item PC Engine/TurboGrafx 16 (CD)
@item SuperGrafx
@item PC-FX
@item Sega Game Gear
@item Sega Genesis/Megadrive
@item Sega Master System
@item Sega Saturn (experimental, x86_64 only)
@item Sony PlayStation
@end itemize")
;; Main license is GPL2+. Some parts are BSD-3.
(license (list license:gpl2+ license:bsd-3))))
(define-public mgba (define-public mgba
(package (package
(name "mgba") (name "mgba")
@ -422,7 +484,7 @@ V2.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mgba-emu/mgba.git") (url "https://github.com/mgba-emu/mgba")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -473,16 +535,16 @@ and Game Boy Color games.")
(define-public sameboy (define-public sameboy
(package (package
(name "sameboy") (name "sameboy")
(version "0.13.2") (version "0.13.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/LIJI32/SameBoy.git") (url "https://github.com/LIJI32/SameBoy")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "19qb1ib9sk5bjdv4arbwkv8l2afpll5axrif3wi7p2yhvpba10c0")))) (base32 "1mv5a7p6plz0359l3z9g232rgaq2h3yby5949ps0s88cxj94w9qm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("rgbds" ,rgbds) `(("rgbds" ,rgbds)
@ -525,7 +587,7 @@ from an emulator---from save states to scaling filters.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-core.git") (url "https://github.com/mupen64plus/mupen64plus-core")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -574,7 +636,7 @@ core library.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-audio-sdl.git") (url "https://github.com/mupen64plus/mupen64plus-audio-sdl")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -620,7 +682,7 @@ SDL audio plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-input-sdl.git") (url "https://github.com/mupen64plus/mupen64plus-input-sdl")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -665,7 +727,7 @@ SDL input plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-rsp-hle.git") (url "https://github.com/mupen64plus/mupen64plus-rsp-hle")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -707,7 +769,7 @@ high-level emulation (HLE) RSP processor plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-rsp-z64.git") (url "https://github.com/mupen64plus/mupen64plus-rsp-z64")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -749,7 +811,7 @@ Z64 RSP processor plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-video-arachnoid.git") (url "https://github.com/mupen64plus/mupen64plus-video-arachnoid")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -795,7 +857,7 @@ Arachnoid video plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-video-glide64.git") (url "https://github.com/mupen64plus/mupen64plus-video-glide64")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -849,7 +911,7 @@ Glide64 video plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2.git") (url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -899,7 +961,7 @@ Glide64MK2 video plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-video-rice.git") (url "https://github.com/mupen64plus/mupen64plus-video-rice")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -947,7 +1009,7 @@ Rice Video plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-video-z64.git") (url "https://github.com/mupen64plus/mupen64plus-video-z64")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1002,7 +1064,7 @@ Z64 video plugin.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mupen64plus/mupen64plus-ui-console.git") (url "https://github.com/mupen64plus/mupen64plus-ui-console")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1067,7 +1129,7 @@ towards a working Mupen64Plus for casual users.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rdanbrook/nestopia.git") (url "https://github.com/rdanbrook/nestopia")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1118,7 +1180,7 @@ emulation community. It provides highly accurate emulation.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/libretro/RetroArch.git") (url "https://github.com/libretro/RetroArch")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1277,16 +1339,16 @@ play them on systems for which they were never designed!")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.221") (version "0.222")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mamedev/mame.git") (url "https://github.com/mamedev/mame")
(commit (apply string-append "mame" (string-split version #\.))))) (commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07fl7alj9zlyb93i8lnn4706ndy3qiv0pjvwnwysk5rqa0r3463y")) (base32 "1bfnwfxsnmza4s77ca0cyx4b290dwadkbbc2lyd7xa0yqrh7vvlx"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
@ -1767,3 +1829,186 @@ performance, features, and ease of use.")
"Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator
framework based on QEMU.") framework based on QEMU.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public ppsspp
(package
(name "ppsspp")
(version "1.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/ppsspp")
(commit (string-append "v" version))))
(sha256
(base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl"))
(file-name (git-file-name name version))
(patches
(search-patches "ppsspp-disable-upgrade-and-gold.patch"))
(modules '((guix build utils)))
(snippet
`(begin
;; The following is quite a heavy-handed way of unbundling PPSSPP.
;; There are still a number of external sources, that we don't
;; remove here. Some may be packaged, others are not.
;; First, we patch existing sources to include the right headers.
(substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp"
"ext/native/thin3d/thin3d_vulkan.cpp")
(find-files "Common" ".*\\.(h|cpp)")
(find-files "Core" ".*\\.(h|cpp)")
(find-files "GPU" ".*\\.(h|cpp)")
(find-files "SDL" ".*\\.(h|cpp)")
(find-files "UI" ".*\\.(h|cpp)"))
;; These headers are all hard-coded in the original source.
(("ext/cityhash/") "")
(("ext/glslang/") "")
(("ext/SPIRV-Cross/") "spirv_cross/")
(("ext/vulkan/") "vulkan/")
(("ext/xxhash.h") "xxhash.h")
;; These definitions do not actually exist in the Vulkan headers,
;; but PPSSPP defines them in ext/vulkan.
(("VK_FORMAT_BEGIN_RANGE") "VK_FORMAT_UNDEFINED")
(("VK_FORMAT_END_RANGE") "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"))
;; Next, we patch CMakeLists.
(substitute* "CMakeLists.txt"
;; Drop unnecessary includes and targets.
(("include_directories\\(ext/glslang\\)") "")
(("include_directories\\(ext/xxhash\\)") "")
(("include_directories\\(ext/cityhash\\)") "")
(("set_target_properties\\(cityhash .*\\)") "")
;; Fix linking to GLEW.
(("TARGET Ext::GLEW") "true")
(("target_link_libraries\\(native Ext::GLEW\\)")
"find_package(GLEW)\ntarget_link_libraries(native GLEW::GLEW)")
(("Ext::Snappy") "snappy")
;; Don't search for cityhash/xxhash, we already have them.
(("add_library\\((city|xx)hash STATIC") "if()\nendif(")
(("ext/xxhash\\.[ch]") "")
(("ext/native/ext/cityhash/.*\\.(cpp|h)") "")
;; Link all of spirv-cross.
(("spirv-cross-glsl" all)
(string-append all
" spirv-cross-core spirv-cross-cpp"
" spirv-cross-reflect spirv-cross-util")))
(substitute* "ext/CMakeLists.txt"
(("add_subdirectory\\(glew\\)") "")
(("add_subdirectory\\(glslang\\)") "")
(("add_subdirectory\\(snappy\\)") "")
(("add_subdirectory\\(SPIRV-Cross-build\\)") ""))
;; Finally, we can delete the bundled sources.
(for-each delete-file-recursively
'("ext/cmake"
"ext/glew"
"ext/glslang" "ext/glslang-build"
"ext/native/ext/cityhash"
"ext/native/ext/libpng17"
"ext/native/ext/libzip"
"ext/snappy"
"ext/SPIRV-Cross" "ext/SPIRV-Cross-build"
"ext/vulkan"
"ext/xxhash.c"
"ext/xxhash.h"
"ext/zlib"))
;; Since we are not including git as an input, PPSSPP is confused
;; about its version. Let's fix that here.
(substitute* "git-version.cmake"
(("unknown") ,version))))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)))
(inputs
`(("cityhash" ,cityhash)
("ffmpeg" ,ffmpeg)
("glew" ,glew)
("glslang" ,glslang)
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
("sdl2" ,sdl2)
("snappy" ,snappy)
("spirv-cross" ,spirv-cross)
("vulkan-headers" ,vulkan-headers)
("vulkan-loader" ,vulkan-loader)
("xxhash" ,xxhash)
("zlib" ,zlib)
;; TODO: unbundle armips.
("armips-source" ,(package-source armips))
("lang"
,(let ((commit "d184ba2b607a03435be579406b816c90add334e6"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/ppsspp-lang")
(commit commit)))
(sha256
(base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9"))
(file-name (git-file-name "ppsspp-lang" commit)))))
("tests"
,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/pspautotests")
(commit commit)))
(sha256
(base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm"))
(file-name (git-file-name "pspautotests" commit)))))))
(arguments
`(#:out-of-source? #f
#:configure-flags (list "-DUSE_DISCORD=OFF"
"-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_SYSTEM_LIBZIP=ON"
;; for testing
"-DUNITTEST=ON" "-DHEADLESS=ON")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-external-sources
(lambda* (#:key inputs #:allow-other-keys)
;; TODO: unbundle armips.
(copy-recursively (assoc-ref inputs "armips-source")
"ext/armips")
;; Some tests are externalised, so we add them here.
(copy-recursively (assoc-ref inputs "tests")
"pspautotests")
;; i18n is externalised, so we add it here.
(copy-recursively (assoc-ref inputs "lang")
"assets/lang")
#t))
(replace 'check
(lambda _
(for-each
(lambda (t) (invoke "./unitTest" t))
'("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin"
"SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit"
"MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap"))
(invoke "python3" "test.py" "-g")
#t))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin/ppsspp (string-append out "/bin/ppsspp"))
(share (string-append out "/share/ppsspp")))
(copy-recursively "icons/hicolor"
(string-append out "/share/icons/hicolor"))
(install-file "PPSSPPSDL" share)
(copy-recursively "assets" (string-append share "/assets"))
(make-desktop-entry-file
(string-append out "/share/applications/ppsspp.desktop")
#:name "PPSSPP"
#:exec (string-append share "/PPSSPPSDL")
#:icon "ppsspp")
(mkdir-p (string-append out "/bin"))
(with-output-to-file bin/ppsspp
(lambda ()
(format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\""
(which "sh") share)))
(chmod bin/ppsspp #o755)
#t))))))
(home-page "https://www.ppsspp.org/")
(synopsis "PSP emulator")
(description
"PPSSPP is a ``high-level'' emulator simulating the PSP operating
system.")
(license license:gpl2+)))

24
gnu/packages/engineering.scm
View file

@ -606,7 +606,7 @@ multipole-accelerated algorithm.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fritzing/fritzing-app.git") (url "https://github.com/fritzing/fritzing-app")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -655,7 +655,7 @@ multipole-accelerated algorithm.")
,(origin ,(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/fritzing/fritzing-parts.git") (url "https://github.com/fritzing/fritzing-parts")
(commit version))) (commit version)))
(file-name (git-file-name "fritzing-parts" version)) (file-name (git-file-name "fritzing-parts" version))
(sha256 (sha256
@ -713,7 +713,7 @@ as well as pick-place files.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/erichVK5/translate2geda.git") (url "https://github.com/erichVK5/translate2geda")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -933,7 +933,7 @@ translations for KiCad.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KiCad/kicad-symbols.git") (url "https://github.com/KiCad/kicad-symbols")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -962,7 +962,7 @@ libraries.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KiCad/kicad-footprints.git") (url "https://github.com/KiCad/kicad-footprints")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -979,7 +979,7 @@ libraries.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KiCad/kicad-packages3d.git") (url "https://github.com/KiCad/kicad-packages3d")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -996,7 +996,7 @@ libraries.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KiCad/kicad-templates.git") (url "https://github.com/KiCad/kicad-templates")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2109,7 +2109,7 @@ editors.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/markwal/GPX.git") (url "https://github.com/markwal/GPX")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2230,7 +2230,7 @@ engineers for reverse engineers.")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git") (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2335,7 +2335,7 @@ full programmatic control over your models.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/FreeCAD/FreeCAD.git") (url "https://github.com/FreeCAD/FreeCAD")
(commit version))) (commit version)))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -2478,7 +2478,7 @@ interpolation toolkit.")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url "https://github.com/Heeks/libarea.git") (uri (git-reference (url "https://github.com/Heeks/libarea")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -2519,7 +2519,7 @@ operations.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/FreeSpacenav/libspnav.git") (url "https://github.com/FreeSpacenav/libspnav")
(commit (string-append "libspnav-" version)))) (commit (string-append "libspnav-" version))))
(sha256 (sha256
(base32 (base32

2
gnu/packages/erlang.scm
View file

@ -47,7 +47,7 @@
;; pre-compiled files, so we use this snapshot of the source ;; pre-compiled files, so we use this snapshot of the source
;; repository. ;; repository.
(uri (git-reference (uri (git-reference
(url "https://github.com/erlang/otp.git") (url "https://github.com/erlang/otp")
(commit (string-append "OTP-" version)))) (commit (string-append "OTP-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

2
gnu/packages/fabric-management.scm
View file

@ -185,7 +185,7 @@ testing InfiniBand networks.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/openucx/ucx.git") (url "https://github.com/openucx/ucx")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

97
gnu/packages/file-systems.scm
View file

@ -41,27 +41,103 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages nfs) #:use-module (gnu packages nfs)
#:use-module (gnu packages onc-rpc) #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages openldap)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages rsync) #:use-module (gnu packages rsync)
#:use-module (gnu packages sssd)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public autofs
(package
(name "autofs")
(version "5.1.6")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/daemons/autofs/"
"v" (version-major version) "/"
"autofs-" version ".tar.xz"))
(sha256
(base32 "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-ignore-busy" ; during shutdown
"--enable-sloppy-mount" ; support mount(8) -s
"--with-libtirpc"
(string-append "--with-openldap="
(assoc-ref %build-inputs "openldap"))
(string-append "--with-sasl="
(assoc-ref %build-inputs "cyrus-sasl"))
"HAVE_SSS_AUTOFS=1" ; required to make sssldir click
(string-append "sssldir="
(assoc-ref %build-inputs "sssd")
"/lib/sssd/modules"))
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-hard-coded-search-path
(lambda _
(substitute* "configure"
(("^searchpath=\".*\"")
"searchpath=\"$PATH\""))
#t))
(add-before 'install 'omit-obsolete-lookup_nis.so-link
;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't,
;; leading to a make error. Since it's broken, comment it out.
(lambda _
(substitute* "modules/Makefile"
(("ln -fs lookup_yp.so" match)
(string-append "# " match)))
#t)))))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("pkg-config" ,pkg-config)
("rpcsvc-proto" ,rpcsvc-proto)))
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
("e2fsprogs" ,e2fsprogs) ; for e[234]fsck
("libtirpc" ,libtirpc)
("libxml2" ,libxml2) ; needed for LDAP, SASL
("mit-krb5" ,mit-krb5) ; needed for LDAP, SASL
("nfs-utils" ,nfs-utils) ; for mount.nfs
("openldap" ,openldap)
("openssl" ,openssl) ; needed for SASL
("sssd" ,sssd)
("util-linux" ,util-linux))) ; for mount, umount
;; XXX A directory index is the closest thing this has to a home page.
(home-page "https://www.kernel.org/pub/linux/daemons/autofs/")
(synopsis "Kernel-based automounter for Linux")
(description
"Autofs is a kernel-based automounter for use with the Linux autofs4
module. It automatically mounts selected file systems when they are used and
unmounts them after a set period of inactivity. This provides
centrally-managed, consistent file names for users and applications, even in a
large and/or frequently changing (network) environment.")
;; fedfs/ is GPL-2-only but not built.
(license (list license:bsd-3 ; modules/cyrus-sasl.c
license:gpl2+)))) ; the rest
(define-public fsarchiver (define-public fsarchiver
(package (package
(name "fsarchiver") (name "fsarchiver")
@ -71,7 +147,7 @@
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/fdupoux/fsarchiver.git") (url "https://github.com/fdupoux/fsarchiver")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -126,10 +202,10 @@ is corrupted you'll lose the affected file(s) but not the whole back-up.")
`(("fuse" ,fuse) `(("fuse" ,fuse)
("glib" ,glib) ("glib" ,glib)
("libgphoto2" ,libgphoto2))) ("libgphoto2" ,libgphoto2)))
(synopsis "Virtual filesystem for libgphoto2 using FUSE") (synopsis "Virtual file system for libgphoto2 using FUSE")
(description "GPhotoFS is a FUSE filesystem module to mount your camera as (description "GPhotoFS is a FUSE file system module to mount your camera as
a filesystem on Linux. This allow using your camera with any tool able to read a file system on Linux. This allow using your camera with any tool able to read
from a mounted filesystem.") from a mounted file system.")
(home-page "http://www.gphoto.org/proj/gphotofs/") (home-page "http://www.gphoto.org/proj/gphotofs/")
(license license:gpl2+))) (license license:gpl2+)))
@ -151,7 +227,8 @@ from a mounted filesystem.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list ,(string-append "VERSION=" version) ; bogus vX.Y-nogit otherwise
(string-append "PREFIX=" (assoc-ref %outputs "out"))
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
"CC=gcc" "CC=gcc"
"PYTEST=pytest") "PYTEST=pytest")
@ -497,7 +574,7 @@ All of this is accomplished without a centralized metadata server.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/sahlberg/libnfs.git") (url "https://github.com/sahlberg/libnfs")
(commit (string-append "libnfs-" version)))) (commit (string-append "libnfs-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -724,8 +801,8 @@ community.")
;; mergerfs bundles a heavily modified copy of libfuse. ;; mergerfs bundles a heavily modified copy of libfuse.
(inputs `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux)))
(home-page "https://github.com/trapexit/mergerfs") (home-page "https://github.com/trapexit/mergerfs")
(synopsis "Featureful union filesystem") (synopsis "Featureful union file system")
(description "mergerfs is a union filesystem geared towards simplifying (description "mergerfs is a union file system geared towards simplifying
storage and management of files across numerous commodity storage devices. It storage and management of files across numerous commodity storage devices. It
is similar to mhddfs, unionfs, and aufs.") is similar to mhddfs, unionfs, and aufs.")
(license (list (license (list
@ -744,7 +821,7 @@ is similar to mhddfs, unionfs, and aufs.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/trapexit/mergerfs-tools.git") (url "https://github.com/trapexit/mergerfs-tools")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

43
gnu/packages/finance.scm
View file

@ -72,6 +72,7 @@
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
@ -200,16 +201,16 @@ and dynamically with report tools based on filtering and graphical charts.")
(define-public ledger (define-public ledger
(package (package
(name "ledger") (name "ledger")
(version "3.2.0") (version "3.2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ledger/ledger.git") (url "https://github.com/ledger/ledger")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1l5c9jf2wnly6ncm9civ8i7v47xld15g1y7wpl0hqwgbfyffwjci")))) (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:modules (,@%cmake-build-system-modules `(#:modules (,@%cmake-build-system-modules
@ -303,7 +304,7 @@ in ability, and easy to use.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ledger/ledger-mode.git") (url "https://github.com/ledger/ledger-mode")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -377,7 +378,7 @@ This package provides the Emacs mode.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/stesie/geierlein.git") (url "https://github.com/stesie/geierlein")
(commit (string-append "V" version)))) (commit (string-append "V" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -480,7 +481,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Electron-Cash/Electron-Cash.git") (url "https://github.com/Electron-Cash/Electron-Cash")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -547,12 +548,12 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
;; the system's dynamically linked library. ;; the system's dynamically linked library.
(package (package
(name "monero") (name "monero")
(version "0.16.0.0") (version "0.16.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/monero-project/monero.git") (url "https://github.com/monero-project/monero")
(commit (string-append "v" version)) (commit (string-append "v" version))
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
@ -568,7 +569,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
#t)) #t))
(sha256 (sha256
(base32 (base32
"0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh")))) "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -666,17 +667,17 @@ the Monero command line client and daemon.")
(define-public monero-gui (define-public monero-gui
(package (package
(name "monero-gui") (name "monero-gui")
(version "0.16.0.0") (version "0.16.0.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/monero-project/monero-gui.git") (url "https://github.com/monero-project/monero-gui")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld")))) "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
`(("monero-source" ,(package-source monero)) `(("monero-source" ,(package-source monero))
@ -786,7 +787,7 @@ the Monero GUI client.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/romanz/trezor-agent.git") (url "https://github.com/romanz/trezor-agent")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -964,7 +965,7 @@ the KeepKey Hardware Wallet.")
(inputs (inputs
`(("python-ledgerblue" ,python-ledgerblue) `(("python-ledgerblue" ,python-ledgerblue)
("python-trezor-agent" ,python-trezor-agent))) ("python-trezor-agent" ,python-trezor-agent)))
(home-page "http://github.com/romanz/trezor-agent") (home-page "https://github.com/romanz/trezor-agent")
(synopsis "Ledger as hardware SSH/GPG agent") (synopsis "Ledger as hardware SSH/GPG agent")
(description "This package allows using Ledger as hardware SSH/GPG agent. (description "This package allows using Ledger as hardware SSH/GPG agent.
@ -1023,7 +1024,7 @@ agent.")
(inputs (inputs
`(("python-keepkey" ,python-keepkey) `(("python-keepkey" ,python-keepkey)
("python-trezor-agent" ,python-trezor-agent))) ("python-trezor-agent" ,python-trezor-agent)))
(home-page "http://github.com/romanz/trezor-agent") (home-page "https://github.com/romanz/trezor-agent")
(synopsis "KeepKey as hardware SSH/GPG agent") (synopsis "KeepKey as hardware SSH/GPG agent")
(description "This package allows using KeepKey as a hardware SSH/GPG (description "This package allows using KeepKey as a hardware SSH/GPG
agent.") agent.")
@ -1130,7 +1131,6 @@ main features are:
(inputs (inputs
`(("click" ,python-click) `(("click" ,python-click)
("duniterpy" ,python-duniterpy) ("duniterpy" ,python-duniterpy)
("ipaddress" ,python-ipaddress)
("pynacl" ,python-pynacl) ("pynacl" ,python-pynacl)
("tabulate" ,python-tabulate) ("tabulate" ,python-tabulate)
("texttable" ,python-texttable))) ("texttable" ,python-texttable)))
@ -1196,7 +1196,7 @@ information.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/trezor/trezor-common.git") (url "https://github.com/trezor/trezor-common")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
@ -1221,7 +1221,7 @@ trezord as a regular user instead of needing to it run as root.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/trezor/trezord-go.git") (url "https://github.com/trezor/trezord-go")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
@ -1239,7 +1239,7 @@ Trezor wallet.")
(define-public bitcoin-abc (define-public bitcoin-abc
(package (package
(name "bitcoin-abc") (name "bitcoin-abc")
(version "0.21.6") (version "0.21.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.bitcoinabc.org/" (uri (string-append "https://download.bitcoinabc.org/"
@ -1247,7 +1247,7 @@ Trezor wallet.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1w3c397h2mxsi9471fwyc3yjxw7s4jgvr4q3w2qfh49bhr4wygqj")))) "0cgr416cp7p14mlnfryxfjfcxys5hksfjhi0i4amxl4fbnpgjwk0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -1257,6 +1257,7 @@ Trezor wallet.")
(inputs (inputs
`(("bdb" ,bdb-5.3) `(("bdb" ,bdb-5.3)
("boost" ,boost) ("boost" ,boost)
("jemalloc" ,jemalloc)
("libevent" ,libevent) ("libevent" ,libevent)
("miniupnpc" ,miniupnpc) ("miniupnpc" ,miniupnpc)
("openssl" ,openssl) ("openssl" ,openssl)
@ -1403,7 +1404,7 @@ entity management.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited")
(commit (string-append "BCHunlimited" version)))) (commit (string-append "BCHunlimited" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256

23
gnu/packages/firmware.scm
View file

@ -50,7 +50,7 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/qca/open-ath9k-htc-firmware.git") (url "https://github.com/qca/open-ath9k-htc-firmware")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
@ -189,21 +189,19 @@ Broadcom/AirForce chipset BCM43xx with Wireless-Core Revision 5. It is used
by the b43-open driver of Linux-libre.") by the b43-open driver of Linux-libre.")
(license license:gpl2))) (license license:gpl2)))
(define* (make-opensbi-package platform variant #:optional (arch "riscv64")) (define* (make-opensbi-package platform name #:optional (arch "riscv64"))
(package (package
(name (string-replace-substring (name name)
(string-append "opensbi-" platform "-" variant) (version "0.8")
"_" "-"))
(version "0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/riscv/opensbi.git") (url "https://github.com/riscv/opensbi")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) (base32 "1y9z0b6q6wpw7mgy31wml4djc6m8ydm71a9f1asnks4ragc7m98b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(,@(if (and (not (string-prefix? "riscv64" (%current-system))) `(,@(if (and (not (string-prefix? "riscv64" (%current-system)))
@ -213,7 +211,7 @@ by the b43-open driver of Linux-libre.")
'()))) '())))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags (list (string-append "PLATFORM=" ,platform "/" ,variant) #:make-flags (list (string-append "PLATFORM=" ,platform)
,@(if (and (not (string-prefix? "riscv64" ,@(if (and (not (string-prefix? "riscv64"
(%current-system))) (%current-system)))
(string-prefix? "riscv64" arch)) (string-prefix? "riscv64" arch))
@ -243,11 +241,14 @@ for platform-specific firmwares executing in M-mode.")
;; platform/ariane-fpga/* is gpl2. ;; platform/ariane-fpga/* is gpl2.
license:gpl2)))) license:gpl2))))
(define-public opensbi-qemu-generic
(make-opensbi-package "generic" "opensbi-qemu-generic"))
(define-public opensbi-qemu-virt (define-public opensbi-qemu-virt
(make-opensbi-package "qemu" "virt")) (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic))
(define-public opensbi-sifive-fu540 (define-public opensbi-sifive-fu540
(make-opensbi-package "sifive" "fu540")) (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540"))
(define-public opensbi-qemu-sifive-u (define-public opensbi-qemu-sifive-u
;; Dropped upstream, as all functionality is present in the sifive-fu540 ;; Dropped upstream, as all functionality is present in the sifive-fu540

12
gnu/packages/flashing-tools.scm
View file

@ -98,7 +98,7 @@ programmer devices.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pali/0xffff.git") (url "https://github.com/pali/0xffff")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -216,7 +216,7 @@ firmware from it.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/PaulStoffregen/teensy_loader_cli.git") (url "https://github.com/PaulStoffregen/teensy_loader_cli")
(commit commit))) (commit commit)))
(sha256 (base32 "0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx")) (sha256 (base32 "0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
@ -266,7 +266,7 @@ non-root users.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/linux-rockchip/rkflashtool.git") (url "https://github.com/linux-rockchip/rkflashtool")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -345,7 +345,7 @@ referred to as the \"Odin 3 protocol\".")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/coreboot/coreboot.git") (url "https://github.com/coreboot/coreboot")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -419,7 +419,7 @@ Management Engine (ME). You need to @code{sudo rmmod mei_me} and
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/corna/me_cleaner.git") (url "https://github.com/corna/me_cleaner")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
@ -451,7 +451,7 @@ ME as far as possible (it only edits ME firmware image files).")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/LongSoft/UEFITool.git") (url "https://github.com/LongSoft/UEFITool")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32

107
gnu/packages/fonts.scm
View file

@ -36,6 +36,7 @@
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -384,6 +385,35 @@ Biolinum is available in both Regular and Bold weights.")
;; The fonts are released under either of these licenses. ;; The fonts are released under either of these licenses.
(license (list license:gpl2+ license:silofl1.1)))) (license (list license:gpl2+ license:silofl1.1))))
(define-public font-libertinus
(package
(name "font-libertinus")
(version "6.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/alerque/libertinus/releases"
"/download/v" version "/libertinus-" version
".zip"))
(sha256
(base32 "06pcsd5pijjid7xjxak35jla089krm5hqnbglv8ldncq475q7kb2"))))
(build-system font-build-system)
(home-page "https://github.com/alerque/libertinus")
(synopsis "Font family based on Linux Libertine")
(description
"The Libertinus font family is a fork of Linux Libertine that addresses
many bugs in the unmaintained original and adds a new mathematical companion
font for use with OpenType math-capable applications like LuaTex or XeTeX.
The unified Libertinus family consists of:
@enumerate
@item Libertinus Serif, forked from Linux Libertine;
@item Libertinus Sans Serif, forked from Linux Biolinum;
@item Libertinus Mono, forked from Linux Libertine Mono; and
@item Libertinus Math, an original matching OpenType math font.
@end enumerate\n")
(license license:silofl1.1)))
(define-public font-terminus (define-public font-terminus
(package (package
(name "font-terminus") (name "font-terminus")
@ -431,7 +461,7 @@ for long periods of working with computers (8 or more hours per day).")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/adobe-fonts/source-han-sans.git") (url "https://github.com/adobe-fonts/source-han-sans")
(commit (string-append version "R")))) (commit (string-append version "R"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -680,7 +710,7 @@ for use at smaller text sizes")))
(define-public font-gnu-unifont (define-public font-gnu-unifont
(package (package
(name "font-gnu-unifont") (name "font-gnu-unifont")
(version "13.0.02") (version "13.0.03")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -690,7 +720,7 @@ for use at smaller text sizes")))
(string-append "mirror://gnu/unifont/unifont-" (string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz"))) version "/unifont-" version ".tar.gz")))
(sha256 (sha256
(base32 "1fg908qadh14kfbpzqfj3vgzlxgx68sdlwhl2prz7arq5r45dami")))) (base32 "04l2sbg6il78qsj3jxqfbz5k1xzihvw8vdlckgkp4zfr0nh2q7h7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; TrueType version (outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version "pcf" ; PCF (bitmap) version
@ -817,7 +847,7 @@ It contains the following fonts and styles:
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/belluzj/fantasque-sans.git") (url "https://github.com/belluzj/fantasque-sans")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -900,7 +930,7 @@ Powerline support.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/adobe-fonts/source-code-pro.git") (url "https://github.com/adobe-fonts/source-code-pro")
(commit (regexp-substitute/global (commit (regexp-substitute/global
;; The upstream tag uses "/" between the roman and italic ;; The upstream tag uses "/" between the roman and italic
;; versions, so substitute our "-" separator here. ;; versions, so substitute our "-" separator here.
@ -925,7 +955,7 @@ designed to work well in user interface environments.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/adobe-fonts/source-sans-pro.git") (url "https://github.com/adobe-fonts/source-sans-pro")
(commit (regexp-substitute/global (commit (regexp-substitute/global
;; The upstream tag uses "/" between the roman and italic ;; The upstream tag uses "/" between the roman and italic
;; versions, so substitute our "-" separator here. ;; versions, so substitute our "-" separator here.
@ -950,7 +980,7 @@ work well in user interface (UI) environments.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/adobe-fonts/source-serif-pro.git") (url "https://github.com/adobe-fonts/source-serif-pro")
(commit (regexp-substitute/global (commit (regexp-substitute/global
;; The upstream tag uses "/" between the roman and italic ;; The upstream tag uses "/" between the roman and italic
;; versions, so substitute our "-" separator here. ;; versions, so substitute our "-" separator here.
@ -993,7 +1023,7 @@ Sans Pro family.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mozilla/Fira.git") (url "https://github.com/mozilla/Fira")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1038,7 +1068,7 @@ correct spacing.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/FortAwesome/Font-Awesome.git") (url "https://github.com/FortAwesome/Font-Awesome")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1075,7 +1105,7 @@ vector graphics.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/sunaku/tamzen-font.git") (url "https://github.com/sunaku/tamzen-font")
(commit (string-append "Tamzen-" version)))) (commit (string-append "Tamzen-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1172,7 +1202,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
(package (package
(name "font-iosevka") (name "font-iosevka")
;; When updating, also update the hash of the Iosevka variant(s) below. ;; When updating, also update the hash of the Iosevka variant(s) below.
(version "3.1.1") (version "3.2.2")
(source (source
(origin (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
@ -1180,7 +1210,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-" version ".zip")) "/ttc-iosevka-" version ".zip"))
(sha256 (sha256
(base32 "1xnkfr11rdjnin2fvgkp9vxxigfbfdncr0wy6n78mlm3p1pqwfrm")))) (base32 "16iqr4zjlshrgzcs3sjp3gz777gpi069r7p7scqi6vap9acqjvph"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "https://be5invis.github.io/Iosevka/") (home-page "https://be5invis.github.io/Iosevka/")
(synopsis "Coders' typeface, built from code") (synopsis "Coders' typeface, built from code")
@ -1203,7 +1233,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-slab-" version ".zip")) "/ttc-iosevka-slab-" version ".zip"))
(sha256 (sha256
(base32 "1n3lh015mvsdbyygpg3p3yqjpqdn1fdvjh1bhi2ggjanhifjsgzh")))))) (base32 "0knsb1b0wqv50r7f9128xvq344x7hnvgm7kh1dxaahlck910z62x"))))))
(define-public font-iosevka-term (define-public font-iosevka-term
(package (package
@ -1218,7 +1248,7 @@ programming. Iosevka is completely generated from its source code.")
"/ttf-iosevka-term-" version ".zip")) "/ttf-iosevka-term-" version ".zip"))
(sha256 (sha256
(base32 (base32
"1mwzwpdppmcf03fgb5q6ksj0kk93wwaz2isk24wj1cm66r8psxk0")))) "0nyq6iq9xjn9nqwh1fh4v0pvblycmm8ssw7y3vcjv1ymbkdqfqhr"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1240,7 +1270,7 @@ programming. Iosevka is completely generated from its source code.")
"/ttf-iosevka-term-slab-" version ".zip")) "/ttf-iosevka-term-slab-" version ".zip"))
(sha256 (sha256
(base32 (base32
"0fiwxkf2gv38ia695wh8cvnb58sqs3fixjd33q1pp9cps94wzjpg")))) "1blhhbnk2hyaxjrz88icd2gwyniq5idxd0h6rqx6vjcack6094z0"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1261,7 +1291,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-aile-" version ".zip")) "/ttc-iosevka-aile-" version ".zip"))
(sha256 (sha256
(base32 "15kz8ahlynnb79s2d367a1fallc4l3j3957yj43qrymayagkh8sv")))))) (base32 "1zg0gn4gcf3w8n8jzf93y9ninyn3bci31c5zss3mxzz1lzfm8zd5"))))))
(define-public font-iosevka-etoile (define-public font-iosevka-etoile
(package (package
@ -1275,7 +1305,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-etoile-" version ".zip")) "/ttc-iosevka-etoile-" version ".zip"))
(sha256 (sha256
(base32 "0q9299mc595m251v9zj9b0zparl2qq8dwx090l0jkfpr2az9xr8q")))))) (base32 "1061yaf35f19dcym4k552q1yzbsbc98r3glm9frslirra9f33sl2"))))))
(define-public font-iosevka-sparkle (define-public font-iosevka-sparkle
(package (package
@ -1289,7 +1319,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-sparkle-" version ".zip")) "/ttc-iosevka-sparkle-" version ".zip"))
(sha256 (sha256
(base32 "0nhvcnvl11iqmsxsyrxlbnwy9z1vdhqv6p3g7fig9ra6n5j9k5kn")))))) (base32 "1c1s9j6qgyhn4md0kql0x2201nbs5jx3612jf8q020gm484xqq03"))))))
(define-public font-sarasa-gothic (define-public font-sarasa-gothic
(package (package
@ -1358,7 +1388,7 @@ monospace, slab-serif fonts.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/google/material-design-icons.git") (url "https://github.com/google/material-design-icons")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1628,7 +1658,7 @@ formatting.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/uswds/public-sans.git") (url "https://github.com/uswds/public-sans")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -1711,7 +1741,7 @@ This package provides the TrueType fonts.")
(define-public font-jetbrains-mono (define-public font-jetbrains-mono
(package (package
(name "font-jetbrains-mono") (name "font-jetbrains-mono")
(version "1.0.3") (version "2.001")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1719,8 +1749,17 @@ This package provides the TrueType fonts.")
(string-append "https://download.jetbrains.com/fonts/" (string-append "https://download.jetbrains.com/fonts/"
"JetBrainsMono-" version ".zip")) "JetBrainsMono-" version ".zip"))
(sha256 (sha256
(base32 "0zvhwmpdwpm4vywmm6i9a4najz0c7vfi411yikgkd66l5hwd1p6f")))) (base32 "0r3dk3kn536rik4mvpcjin9mwmifl3v8mawvb4a5l59pww0vcxzq"))))
(build-system font-build-system) (build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'install-license-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(install-file "../LICENSE" doc)
#t))))))
(home-page "https://www.jetbrains.com/lp/mono/") (home-page "https://www.jetbrains.com/lp/mono/")
(synopsis "Mono typeface for developers") (synopsis "Mono typeface for developers")
(description (description
@ -1897,3 +1936,27 @@ languages, it contains Japanese characters, including Kana glyphs and more
than 5,300 Kanji glyphs, as well major international phonetic symbols, than 5,300 Kanji glyphs, as well major international phonetic symbols,
operators and special symbols.") operators and special symbols.")
(license (license:non-copyleft "file:///LICENSE_E")))) (license (license:non-copyleft "file:///LICENSE_E"))))
(define-public font-catamaran
(let ((commit "7559b4906f9c9148fb22c6f89508c3053a78a296")
(revision "1"))
(package
(name "font-catamaran")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/VanillaandCream/Catamaran-Tamil")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1wpp41l7j2kpgnyavhgxcc5wp852a4wqsnwravn39gp980s84yxw"))))
(build-system font-build-system)
(home-page "https://github.com/VanillaandCream/Catamaran-Tamil")
(synopsis "9 weight Tamil and Latin type")
(description "Catamaran is a 9 weight Tamil and Latin type. Catamaran
is a stylish type with a polished yet relaxed feel. Its versatility makes it
suitable for a wide range of uses.")
(license license:silofl1.1))))

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