03/03: gnu: Add carla.
mbakke pushed a commit to branch master
in repository guix.
commit caa1f6a8ae6d60e2a79cd151e86fb1270893e670
Author: Alexandros Theodotou
Date: Fri Nov 8 23:56:58 2019 +
gnu: Add carla.
* gnu/packages/audio.scm (carla): New variable.
Signed-off-by: Marius Bakke
---
gnu/packages/audio.scm | 56 ++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index d59b4eb..e10af39 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3811,3 +3811,59 @@ therefore satisfying any requirements they may have to
be self contained,
as is the case with audio plugins.")
(home-page "https://gitlab.com/geontime/redkite;)
(license license:gpl3+)))
+
+(define-public carla
+ (package
+(name "carla")
+(version "2.0.0")
+(source
+ (origin
+ (method git-fetch)
+ (uri
+(git-reference
+ (url "https://github.com/falkTX/Carla.git;)
+ (commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+(base32
+ "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; no "check" target
+ #:make-flags
+ (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'set-CC-variable-and-show-features
+ (lambda _
+ (setenv "CC" "gcc")
+ (invoke "make" "features")))
+ (delete 'configure
+(inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("ffmpeg" ,ffmpeg)
+ ("fluidsynth" ,fluidsynth)
+ ("file" ,file)
+ ("liblo" ,liblo)
+ ("libsndfile" ,libsndfile)
+ ("gtk+" ,gtk+)
+ ("python-pyliblo" ,python-pyliblo)
+ ("python-pyqt" ,python-pyqt)
+ ("python-rdflib" ,python-rdflib)
+ ;; python-pyqt shows the following error without python-wrapper:
+ ;; Error while finding module specification for 'PyQt5.uic.pyuic'
+ ;; (ModuleNotFoundError: No module named 'PyQt5')
+ ("python-wrapper" ,python-wrapper)
+ ("libx11" ,libx11)
+ ("qtbase" ,qtbase)
+ ("zlib" ,zlib)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "https://kx.studio/Applications:Carla;)
+(synopsis "Audio plugin host")
+(description "Carla is a modular audio plugin host, with features like
+transport control, automation of parameters via MIDI CC and remote control
+over OSC. Carla currently supports LADSPA (including LRDF), DSSI, LV2, VST2,
+and VST3 plugin formats, plus SF2 and SFZ file support. It uses JACK as the
+default and preferred audio driver but also supports native drivers like
ALSA.")
+(license license:gpl2+)))
02/03: gnu: brlaser: Update to 6.
mbakke pushed a commit to branch master
in repository guix.
commit 711e8bf75fdacc8218b3957bbd7cb367da6392b5
Author: nixo
Date: Tue Nov 19 10:44:15 2019 +0100
gnu: brlaser: Update to 6.
* gnu/packages/printers.scm (brlaser): Update to 6.
Signed-off-by: Marius Bakke
---
gnu/packages/printers.scm | 84 +++
1 file changed, 49 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 2d608bf..7b2c242 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -75,52 +75,66 @@ with Graphtec and Sihouette plotting cutters using an SVG
file as its input.")
(license license:gpl3+)))
(define-public brlaser
- (let ((commit "779f71e80fcc583f4537c844de141cf8e6a738fe")
-(revision "1"))
-(package
- (name "brlaser")
- (version (git-version "4" revision commit))
- (source (origin
-(method git-fetch)
-(uri (git-reference
- (url "https://github.com/pdewacht/brlaser.git;)
- (commit commit)))
-(file-name (git-file-name name version))
-(sha256
- (base32
- "0yrz9706660hdfi2y0ndp254r0vw9y665hwmxbbzfnz4ai13vj50"
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list (string-append "-DCUPS_DATA_DIR="
- (assoc-ref %outputs "out")
- "/share/cups")
- (string-append "-DCUPS_SERVER_BIN="
- (assoc-ref %outputs "out")
- "/lib/cups"
- (inputs
- `(("ghostscript" ,ghostscript)
- ("cups" ,cups)
- ("zlib" ,zlib)))
- (home-page "https://github.com/pdewacht/brlaser;)
- (synopsis "Brother laser printer driver")
- (description "Brlaser is a CUPS driver for Brother laser printers. This
+ (package
+(name "brlaser")
+(version "6")
+(source (origin
+ (method git-fetch)
+ (uri (git-reference
+(url "https://github.com/pdewacht/brlaser.git;)
+(commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+"1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"
+(build-system cmake-build-system)
+(arguments
+ `(#:configure-flags
+ (list (string-append "-DCUPS_DATA_DIR="
+(assoc-ref %outputs "out")
+"/share/cups")
+ (string-append "-DCUPS_SERVER_BIN="
+(assoc-ref %outputs "out")
+"/lib/cups"
+(inputs
+ `(("ghostscript" ,ghostscript)
+ ("cups" ,cups)
+ ("zlib" ,zlib)))
+(home-page "https://github.com/pdewacht/brlaser;)
+(synopsis "Brother laser printer driver")
+(description "Brlaser is a CUPS driver for Brother laser printers. This
driver is known to work with these printers:
@enumerate
-@item Brother DCP-1510
+@item Brother DCP-1510 series
+@item Brother DCP-1600 series
@item Brother DCP-7030
@item Brother DCP-7040
@item Brother DCP-7055
@item Brother DCP-7055W
+@item Brother DCP-7060D
@item Brother DCP-7065DN
@item Brother DCP-7080
+@item Brother DCP-L2500D series
+@item Brother DCP-L2520D series
+@item Brother DCP-L2540DW series
+@item Brother HL-1110 series
@item Brother HL-1200 series
+@item Brother HL-2030 series
+@item Brother HL-2140 series
+@item Brother HL-2220 series
+@item Brother HL-2270DW series
+@item Brother HL-5030 series
+@item Brother HL-L2300D series
@item Brother HL-L2320D series
+@item Brother HL-L2340D series
@item Brother HL-L2360D series
+@item Brother MFC-1910W
@item Brother MFC-7240
@item Brother MFC-7360N
-@end enumerate
-
-It partially works with printers from the Brother HL-L2300D series.")
- (license license:gpl2+
+@item Brother MFC-7365DN
+@item Brother MFC-7840W
+@item Brother MFC-L2710DW series
+@item Lenovo M7605D
+@end enumerate")
+(license license:gpl2+)))
branch master updated (3b7828c -> caa1f6a)
mbakke pushed a change to branch master in repository guix. from 3b7828c gnu: Add minisat. new af6a9fc gnu: Add python-3.8. new 711e8bf gnu: brlaser: Update to 6. new caa1f6a gnu: Add carla. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/audio.scm | 56 +++ gnu/packages/patches/python-3.8-fix-tests.patch| 42 +++ gnu/packages/patches/python-3.8-search-paths.patch | 17 + gnu/packages/printers.scm | 84 +- gnu/packages/python.scm| 26 +++ 5 files changed, 190 insertions(+), 35 deletions(-) create mode 100644 gnu/packages/patches/python-3.8-fix-tests.patch create mode 100644 gnu/packages/patches/python-3.8-search-paths.patch
branch master updated (5dea5cb -> 3b7828c)
mothacehe pushed a change to branch master in repository guix. from 5dea5cb gnu: llvm: Change copyright holder. new 3b7828c gnu: Add minisat. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 2 ++ gnu/packages/maths.scm | 40 ++ .../patches/minisat-friend-declaration.patch | 25 ++ gnu/packages/patches/minisat-install.patch | 19 ++ 4 files changed, 86 insertions(+) create mode 100644 gnu/packages/patches/minisat-friend-declaration.patch create mode 100644 gnu/packages/patches/minisat-install.patch
01/01: gnu: Add minisat.
mothacehe pushed a commit to branch master
in repository guix.
commit 3b7828cc7f938fcb369976cbe75d9c85f22583a1
Author: Robert Smith
Date: Sat Nov 16 16:18:43 2019 +0100
gnu: Add minisat.
* gnu/packages/patches/minisat-friend-declaration.patch: New file.
* gnu/packages/patches/minisat-install.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add both files above.
* gnu/packages/maths.scm (minisat): New exported variable.
Signed-off-by: Mathieu Othacehe
---
gnu/local.mk | 2 ++
gnu/packages/maths.scm | 40 ++
.../patches/minisat-friend-declaration.patch | 25 ++
gnu/packages/patches/minisat-install.patch | 19 ++
4 files changed, 86 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8a52e98..bb4dcbb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1131,6 +1131,8 @@ dist_patch_DATA =
\
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch\
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
+ %D%/packages/patches/minisat-friend-declaration.patch\
+ %D%/packages/patches/minisat-install.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \
%D%/packages/patches/monero-use-system-miniupnpc.patch
\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 16a9d97..32608ea 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -32,6 +32,7 @@
;;; Copyright © 2018 Amin Bandali
;;; Copyright © 2019 Nicolas Goaziou
;;; Copyright © 2019 Steve Sprang
+;;; Copyright © 2019 Robert Smith
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5242,3 +5243,42 @@ fields of knowledge.")
(home-page "http://speedcrunch.org/;)
(license license:gpl2+)))
+(define-public minisat
+ ;; This is the last commit which is available upstream, no
+ ;; release happened since 2010.
+ (let ((commit "37dc6c67e2af26379d88ce349eb9c4c6160e8543")
+(revision "1"))
+(package
+ (name "minisat")
+ (version (string-append "2.2.0-" revision "." (string-take commit 7)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/niklasso/minisat.git;)
+ (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq"))
+ (patches
+ (search-patches "minisat-friend-declaration.patch"
+ "minisat-install.patch"
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list (string-append "prefix=" %output))
+ #:tests? #f ;no check target
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure
+ (inputs
+ `(("zlib:static" ,zlib "static")
+ ("zlib" ,zlib)))
+ (synopsis
+ "Small, yet efficient, SAT solver")
+ (description
+ "MiniSat is a minimalistic, open-source SAT solver, developed to help
+researchers and developers alike to get started on SAT.")
+ (home-page
+ "http://minisat.se/MiniSat.html;)
+ (license license:expat
diff --git a/gnu/packages/patches/minisat-friend-declaration.patch
b/gnu/packages/patches/minisat-friend-declaration.patch
new file mode 100644
index 000..14a886a
--- /dev/null
+++ b/gnu/packages/patches/minisat-friend-declaration.patch
@@ -0,0 +1,25 @@
+See https://groups.google.com/forum/#!topic/minisat/FCocZsC8oMQ
+This seems to only be a problem with newer versions of g++, and
+upstream development seems to have stopped in 2013.
+
+diff -rupN minisat-2.2.0/core/SolverTypes.h
minisat-2.2.0.patched/core/SolverTypes.h
+--- a/minisat/core/SolverTypes.h 2010-07-10 17:07:36.0 +0100
b/minisat/core/SolverTypes.h 2014-03-29 11:57:49.0 +
+@@ -47,7 +47,7 @@ struct Lit {
+ int x;
+
+ // Use this as a constructor:
+-friend Lit mkLit(Var var, bool sign = false);
++//friend Lit mkLit(Var var, bool sign = false);
+
+ bool operator == (Lit p) const { return x == p.x; }
+ bool operator != (Lit p) const { return x != p.x; }
+@@ -55,7 +55,7 @@ struct Lit {
+ };
+
+
+-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var +
(int)sign; return p; }
++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var
+ (int)sign; return p; }
+ inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q;
}
+ inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned
int)b; return q; }
+ inline bool sign (Lit p) { return p.x
branch master updated (1f15cbc -> 5dea5cb)
mothacehe pushed a change to branch master in repository guix. from 1f15cbc gnu: Add python-mcuboot-imgtool. new 5dea5cb gnu: llvm: Change copyright holder. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: gnu: llvm: Change copyright holder.
mothacehe pushed a commit to branch master in repository guix. commit 5dea5cbc62547f50a793ce905cdd4d1a62be60e1 Author: Mathieu Othacehe Date: Tue Nov 19 16:20:40 2019 +0100 gnu: llvm: Change copyright holder. * gnu/packages/llvm.scm: Change David Truby to Arm Ltd as copyright holder as requested here: https://issues.guix.gnu.org/issue/32773#18. --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a5170a4..863d43d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Rutger Helling -;;; Copyright © 2019 David Truby +;;; Copyright © 2019 Arm Ltd ;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix.
01/02: gnu: Add python-intelhex.
snape pushed a commit to branch master in repository guix. commit 85cfb0e9e6ccd57715ca6e6bfadfd2b161c08e4d Author: Clément Lassieur Date: Tue Nov 19 16:09:00 2019 +0100 gnu: Add python-intelhex. * gnu/packages/python-xyz.scm (python-intelhex): New variable. --- gnu/packages/python-xyz.scm | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5b8b33b..c3999d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2016, 2018 Tomáš Čech ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian @@ -16887,3 +16887,27 @@ qvarious formats: PDF, PostScript, PNG and even SVG.") (description "Pyphen is a pure Python module to hyphenate text using existing Hunspell hyphenation dictionaries.") (license (list license:gpl2 license:lgpl2.1 license:mpl1.1 + +(define-public python-intelhex + (package +(name "python-intelhex") +(version "2.2.1") +(source + (origin + (method url-fetch) + (uri (pypi-uri "intelhex" version)) + (sha256 +(base32 + "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780" +(build-system python-build-system) +(arguments '(#:tests? #f)) ;issue with version +(home-page "https://pypi.org/project/IntelHex/;) +(synopsis "Python library for Intel HEX files manipulations") +(description "The Intel HEX file format is widely used in microprocessors +and microcontrollers area (embedded systems etc.) as the de facto standard for +representation of code to be programmed into microelectronic devices. This +package provides an intelhex Python library to read, write, create from +scratch and manipulate data from Intel HEX file format. It also includes +several convenience Python scripts, including \"classic\" hex2bin and bin2hex +converters and more, those based on the library itself.") +(license license:bsd-3)))
branch master updated (7b40d59 -> 1f15cbc)
snape pushed a change to branch master in repository guix. from 7b40d59 doc: Fix typo in example. new 85cfb0e gnu: Add python-intelhex. new 1f15cbc gnu: Add python-mcuboot-imgtool. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python-crypto.scm | 39 +++ gnu/packages/python-xyz.scm| 26 +- 2 files changed, 64 insertions(+), 1 deletion(-)
02/02: gnu: Add python-mcuboot-imgtool.
snape pushed a commit to branch master
in repository guix.
commit 1f15cbc80cfbea5561b79d251724f7c5b908cdd4
Author: Clément Lassieur
Date: Tue Nov 19 16:09:13 2019 +0100
gnu: Add python-mcuboot-imgtool.
* gnu/packages/python-crypto.scm (python-mcuboot-imgtool): New variable.
---
gnu/packages/python-crypto.scm | 39 +++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 11c23ae..2b1543b 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2018 Vagrant Cascadian
;;; Copyright © 2018 Nam Nguyen
;;; Copyright © 2019 Guillaume Le Vaillant
+;;; Copyright © 2019 Clément Lassieur
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1090,3 +1091,41 @@ with state-tracking and configuration abstractions.")
that leverages the infrastructure provided by the Linux kernel for safely
storing and retrieving sensitive information in your programs.")
(license license:asl2.0)))
+
+(define-public python-mcuboot-imgtool
+ (package
+(name "python-mcuboot-imgtool")
+(version "1.4.0")
+(source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JuulLabs-OSS/mcuboot;)
+ (commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+(base32
+ "1m1csyvzq4jx81zg635ssy1n7sc0z539z0myh872ll3nwqx7wa0q"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-broken-test
+ (lambda _
+ (substitute* "scripts/imgtool/keys/ed25519_test.py"
+ (("raw_sign") "sign_digest"))
+ #t))
+ (add-before 'build 'change-directory
+ (lambda _
+ (chdir "scripts")
+ #t)
+(propagated-inputs
+ `(("python-click" ,python-click)
+ ("python-intelhex" ,python-intelhex)
+ ("python-cryptography" ,python-cryptography)))
+(home-page "https://mcuboot.com;)
+(synopsis "Tool to securely sign firmware images for booting by MCUboot")
+(description "MCUboot is a secure bootloader for 32-bit MCUs. This
+package provides a tool to securely sign firmware images for booting by
+MCUboot.")
+(license license:expat)))
branch master updated (f2303c3 -> f7ecef6)
civodul pushed a change to branch master in repository maintenance. from f2303c3 berlin: build-machines: Enable 'qemu-binfmt' on the first 10 machines only. new f7ecef6 berlin: build-machines: Fix typo. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: hydra/modules/sysadmin/build-machines.scm | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
01/01: berlin: build-machines: Fix typo.
civodul pushed a commit to branch master in repository maintenance. commit f7ecef676efbaa88d7952f6933aae4dfbbe1ab66 Author: Ludovic Courtès Date: Tue Nov 19 12:30:57 2019 +0100 berlin: build-machines: Fix typo. * hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os): Unquote-splice 'modify-services' form. --- hydra/modules/sysadmin/build-machines.scm | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index a0fea34..3849ccf 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -166,12 +166,12 @@ Match Address 141.80.167.131 emulated-architectures)) (guix-support? #t) - (modify-services %base-services - (guix-service-type config => -(guix-configuration - (inherit config) - (use-substitutes? #f) - (authorized-keys - authorized-guix-keys) + ,@(modify-services %base-services + (guix-service-type config => + (guix-configuration + (inherit config) + (use-substitutes? #f) + (authorized-keys +authorized-guix-keys) ;;; build-machines.scm end here
02/04: berlin: build-machines: Have 90 GiB free instead of 60 GiB.
civodul pushed a commit to branch master in repository maintenance. commit 553d2fb008e5114896c1cf76ab35c467ab55a764 Author: Ludovic Courtès Date: Tue Nov 19 12:12:59 2019 +0100 berlin: build-machines: Have 90 GiB free instead of 60 GiB. * hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os)[gc-job]: Collect 90 GiB. --- hydra/modules/sysadmin/build-machines.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index 7dfe050..5f06aaf 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -82,7 +82,7 @@ AUTHORIZED-GUIX-KEYS." (define gc-job ;; Run 'guix gc' at 3AM and 3PM every day. #~(job '(next-hour '(3 15)) - "guix gc -F 60G")) + "guix gc -F 90G")) ;; TODO: this is ugly. (define hydra-dir "/root/maintenance/hydra/") @@ -96,7 +96,7 @@ AUTHORIZED-GUIX-KEYS." (sysadmin (name "rekado") (full-name "Ricardo Wurmus") (ssh-public-key (maintenance-file "keys/ssh/rekado.pub"))) - (sysadmin (name "hydra") ;fake sysadmin + (sysadmin (name "hydra");fake sysadmin (full-name "Hydra User") (restricted? #t) (ssh-public-key
03/04: berlin: build-machines: Refer to SSH keys with 'local-file'.
civodul pushed a commit to branch master in repository maintenance. commit a01f899735dab570fbe3d44a27bc10bfb762a49b Author: Ludovic Courtès Date: Tue Nov 19 12:17:29 2019 +0100 berlin: build-machines: Refer to SSH keys with 'local-file'. * hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os) [hydra-dir, maintenance-file]: Remove. [sysadmins]: Use 'local-file' instead. --- hydra/modules/sysadmin/build-machines.scm | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index 5f06aaf..088c1ae 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -84,23 +84,19 @@ AUTHORIZED-GUIX-KEYS." #~(job '(next-hour '(3 15)) "guix gc -F 90G")) - ;; TODO: this is ugly. - (define hydra-dir "/root/maintenance/hydra/") - (define (maintenance-file name) -(local-file (string-append hydra-dir name))) - (define sysadmins (list (sysadmin (name "ludo") (full-name "Ludovic Courtès") -(ssh-public-key (maintenance-file "keys/ssh/ludo.pub"))) +(ssh-public-key (local-file "../../keys/ssh/ludo.pub"))) (sysadmin (name "rekado") (full-name "Ricardo Wurmus") -(ssh-public-key (maintenance-file "keys/ssh/rekado.pub"))) +(ssh-public-key (local-file "../../keys/ssh/rekado.pub"))) (sysadmin (name "hydra");fake sysadmin (full-name "Hydra User") (restricted? #t) (ssh-public-key - (maintenance-file "keys/ssh/hydra.gnu.org.pub") + (local-file "../../keys/ssh/hydra.gnu.org.pub") + (operating-system (host-name (format #f "hydra-guix-~2,'0d" id))
01/04: berlin: Add "guix deploy" config file for build nodes.
civodul pushed a commit to branch master in repository maintenance. commit a2192286f5db69fb78b122629ee7002c7debd634 Author: Ludovic Courtès Date: Tue Nov 19 09:57:35 2019 +0100 berlin: Add "guix deploy" config file for build nodes. * hydra/berlin-nodes.scm: New file. --- hydra/berlin-nodes.scm | 29 + 1 file changed, 29 insertions(+) diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm new file mode 100644 index 000..aa75e70 --- /dev/null +++ b/hydra/berlin-nodes.scm @@ -0,0 +1,29 @@ +;; "guix deploy" configuration file for the build machines of the compile +;; farm hosted at the MDC, Berlin. + +(use-modules (sysadmin build-machines) + (sysadmin people)) + +(define %ids '(4 5 6 8 9 10 11 12 13 14 15 + ;;16 -> asks for root password + ;;17 -> no route + 18 + ;;19, 20, 21, 22, 23, 24 -> asks for root password + 25 + ;;26 -> asks for root password + )) + +(define (system-for id) + (berlin-build-machine-os id)) + +(define (id->ip id) + (format #f "141.80.167.~d" (+ 131 id))) + +(map (lambda (id) + (machine +(operating-system (system-for id)) +(environment managed-host-environment-type) +(configuration (machine-ssh-configuration +(system "x86_64-linux") +(host-name (id->ip id)) + %ids)
branch master updated (997653d -> f2303c3)
civodul pushed a change to branch master in repository maintenance. from 997653d guix-europe: minutes: Add minutes of the SAC. new a219228 berlin: Add "guix deploy" config file for build nodes. new 553d2fb berlin: build-machines: Have 90 GiB free instead of 60 GiB. new a01f899 berlin: build-machines: Refer to SSH keys with 'local-file'. new f2303c3 berlin: build-machines: Enable 'qemu-binfmt' on the first 10 machines only. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: hydra/berlin-nodes.scm| 34 + hydra/modules/sysadmin/build-machines.scm | 51 +-- 2 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 hydra/berlin-nodes.scm
04/04: berlin: build-machines: Enable 'qemu-binfmt' on the first 10 machines only.
civodul pushed a commit to branch master
in repository maintenance.
commit f2303c3a9aab11d70a45488bd51343aa2760ad16
Author: Ludovic Courtès
Date: Tue Nov 19 12:24:54 2019 +0100
berlin: build-machines: Enable 'qemu-binfmt' on the first 10 machines only.
This matches what 'machines-for-berlin.scm' says.
* hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os):
Add #:emulated-architectures. Add 'qemu-binfmt-service' only when
EMULATED-ARCHITECTURES is non-empty.
* hydra/berlin-nodes.scm (system-for): Pass #:emulated-architectures to
'berlin-build-machine-os'.
---
hydra/berlin-nodes.scm| 9 ++--
hydra/modules/sysadmin/build-machines.scm | 35 +++
2 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm
index aa75e70..a17902f 100644
--- a/hydra/berlin-nodes.scm
+++ b/hydra/berlin-nodes.scm
@@ -2,7 +2,8 @@
;; farm hosted at the MDC, Berlin.
(use-modules (sysadmin build-machines)
- (sysadmin people))
+ (sysadmin people)
+ (srfi srfi-1))
(define %ids '(4 5 6 8 9 10 11 12 13 14 15
;;16 -> asks for root password
@@ -14,7 +15,11 @@
))
(define (system-for id)
- (berlin-build-machine-os id))
+ (berlin-build-machine-os id
+ #:emulated-architectures
+ (if (memv id (take %ids 10))
+ `("arm" "aarch64")
+ '(
(define (id->ip id)
(format #f "141.80.167.~d" (+ 131 id)))
diff --git a/hydra/modules/sysadmin/build-machines.scm
b/hydra/modules/sysadmin/build-machines.scm
index 088c1ae..a0fea34 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -74,10 +74,13 @@ HOST-NAME and accessibly by SYSADMINS, with the given
AUTHORIZED-GUIX-KEYS."
authorized-guix-keys
(define* (berlin-build-machine-os id
- #:key (authorized-guix-keys '()))
+ #:key
+ (authorized-guix-keys '())
+ (emulated-architectures '()))
"Return the declaration for a build machine for
berlin.guixsd.org with integer ID, with the given
-AUTHORIZED-GUIX-KEYS."
+AUTHORIZED-GUIX-KEYS. Add a 'qemu-binfmt-service' for
+EMULATED-ARCHITECTURES, unless it's empty."
(define gc-job
;; Run 'guix gc' at 3AM and 3PM every day.
@@ -144,10 +147,6 @@ AUTHORIZED-GUIX-KEYS."
(service mcron-service-type
(mcron-configuration
(jobs (list gc-job
- (service qemu-binfmt-service-type
- (qemu-binfmt-configuration
- (platforms (lookup-qemu-platforms "arm"
"aarch64"))
- (guix-support? #t)))
(service ntp-service-type
(ntp-configuration
(allow-large-adjustment? #t)))
@@ -157,12 +156,22 @@ AUTHORIZED-GUIX-KEYS."
(extra-content "\
Match Address 141.80.167.131
PermitRootLogin yes")))
- (modify-services %base-services
- (guix-service-type config =>
- (guix-configuration
- (inherit config)
- (use-substitutes? #f)
- (authorized-keys
-authorized-guix-keys
+
+ `(,@(if (null? emulated-architectures)
+ '()
+ (list (service qemu-binfmt-service-type
+(qemu-binfmt-configuration
+ (platforms
+ (apply lookup-qemu-platforms
+ emulated-architectures))
+ (guix-support? #t)
+
+ (modify-services %base-services
+ (guix-service-type config =>
+(guix-configuration
+ (inherit config)
+ (use-substitutes? #f)
+ (authorized-keys
+ authorized-guix-keys)
;;; build-machines.scm end here
branch master updated (0d8a823 -> 7b40d59)
efraim pushed a change to branch master in repository guix. from 0d8a823 gnu: hwloc: Adjust references to 'hwloc'. new 7b40d59 doc: Fix typo in example. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: doc: Fix typo in example.
efraim pushed a commit to branch master
in repository guix.
commit 7b40d59114e1462d6d8140f325a66b12e91db667
Author: Efraim Flashner
Date: Tue Nov 19 12:21:08 2019 +0200
doc: Fix typo in example.
* doc/guix.texi (Web Services)[nginx-php-fpm-location]: Fix example to
actually use nginx-php-fpm-location.
---
doc/guix.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 5151a82..ea8a878 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20442,7 +20442,7 @@ A simple services setup for nginx with php can look
like this:
(server-name '("example.com"))
(root "/srv/http/")
(locations
-(list (nginx-php-location)))
+(list (nginx-php-fpm-location)))
(listen '("80"))
(ssl-certificate #f)
(ssl-certificate-key #f)))
branch master updated (535a13a -> 0d8a823)
civodul pushed a change to branch master in repository guix. from 535a13a doc: Fix typo. new 0d8a823 gnu: hwloc: Adjust references to 'hwloc'. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: hwloc: Adjust references to 'hwloc'.
civodul pushed a commit to branch master in repository guix. commit 0d8a8234b5adbed898b37ea7187ab6ab505f83ee Author: Ludovic Courtès Date: Tue Nov 19 11:31:41 2019 +0100 gnu: hwloc: Adjust references to 'hwloc'. This is a followup to 8ec7ca22d363b80b173ce87c5f39d5ca9686d248, which led to a stack overflow (cyclic graph) when attempting to build HWLOC-2. * gnu/packages/mpi.scm (hwloc-2): Refer to HWLOC-1 instead of HWLOC. --- gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 116fa1e..9f6597c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -146,9 +146,9 @@ bind processes, and much more.") "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr" ;; libnuma is no longer needed. -(inputs (alist-delete "numactl" (package-inputs hwloc))) +(inputs (alist-delete "numactl" (package-inputs hwloc-1))) (arguments - (substitute-keyword-arguments (package-arguments hwloc) + (substitute-keyword-arguments (package-arguments hwloc-1) ((#:phases phases) `(modify-phases ,phases (replace 'skip-linux-libnuma-test
01/01: doc: Fix typo.
efraim pushed a commit to branch master
in repository guix.
commit 535a13a2ab1c27955a5b03accab86fab2cf88180
Author: Efraim Flashner
Date: Tue Nov 19 11:24:35 2019 +0200
doc: Fix typo.
* doc/guix.texi (Web Services)[php-fpm-configuration]: Change language
to suggest there are more than two options.
---
doc/guix.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 61b639e..5151a82 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20364,7 +20364,7 @@ once the service has started.
Log for the php-fpm master process.
@item @code{process-manager} (default:
@code{(php-fpm-dynamic-process-manager-configuration)})
Detailed settings for the php-fpm process manager.
-Must be either:
+Must be one of:
@table @asis
@item @code{}
@item @code{}
branch master updated (600f680 -> 535a13a)
efraim pushed a change to branch master in repository guix. from 600f680 gnu: Add font-dseg. new 535a13a doc: Fix typo. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
04/06: gnu: hwloc: Default to 2.x.
civodul pushed a commit to branch master in repository guix. commit 8ec7ca22d363b80b173ce87c5f39d5ca9686d248 Author: Ludovic Courtès Date: Tue Nov 19 10:28:22 2019 +0100 gnu: hwloc: Default to 2.x. * gnu/packages/mpi.scm (hwloc): Rename to... (hwloc-1): ... this. (hwloc-2): Adjust 'inherit' clause accordingly. (hwloc): New variable. --- gnu/packages/mpi.scm | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f51e03a..116fa1e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -52,7 +52,7 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -(define-public hwloc +(define-public hwloc-1 ;; Note: For now we keep 1.x as the default because many packages have yet ;; to migrate to 2.0. (package @@ -134,7 +134,7 @@ bind processes, and much more.") (define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. (package -(inherit hwloc) +(inherit hwloc-1) (version "2.1.0") (source (origin (method url-fetch) @@ -163,6 +163,10 @@ bind processes, and much more.") (define-deprecated hwloc-2.0 'hwloc-2 hwloc-2) +(define-public hwloc + ;; The latest stable series of hwloc. + hwloc-2) + (define-public openmpi (package (name "openmpi")
06/06: gnu: Add font-dseg.
civodul pushed a commit to branch master in repository guix. commit 600f680dca7f1755d47df4394b794b4c7fee3aa5 Author: Alexandros Theodotou Date: Sun Nov 10 01:25:28 2019 + gnu: Add font-dseg. * gnu/packages/fonts.scm (font-dseg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 41 + 1 file changed, 41 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bb6dc45..83c9744 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Alva +;;; Copyright © 2019 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -1524,3 +1525,43 @@ Symbols stand out from common text. Dots and commas are easily seen, and operators are clear even when not surrounded by spaces. Similar characters have been designed to be very distinguishable from each other.") (license license:silofl1.1))) + +(define-public font-dseg + (package +(name "font-dseg") +(version "0.45") +(source + (origin +(method url-fetch/zipbomb) +(uri + (string-append "https://github.com/keshikan/DSEG/; + "releases/download/v" version + "/fonts-DSEG_v" + (string-concatenate (string-split version #\.)) + ".zip")) +(sha256 + (base32 +"0v8sghh4vl286faf8pvi74znz07pyf0qii8z4wjllisqwc35sx72" +(build-system font-build-system) +(arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) +(font-dir (string-append out "/share/fonts")) +(truetype-dir (string-append font-dir "/truetype"))) + (with-directory-excursion + (string-append "fonts-DSEG_v" +(apply string-append (string-split ,version + #\.))) + (for-each (lambda (f) (install-file f truetype-dir)) + (find-files "." "\\.ttf$")) + #t))) +(home-page "https://www.keshikan.net/fonts-e.html;) +(synopsis "DSEG: 7-segment and 14-segment fonts") +(description + "DSEG is a font family that imitates seven- and fourteen-segment LCD +displays (7SEG, 14SEG). DSEG includes the roman alphabet and symbol glyphs. +This package provides the TrueType fonts.") +(license license:silofl1.1)))
05/06: gnu: Add emacs-ample-theme.
civodul pushed a commit to branch master
in repository guix.
commit e30bb63c2905f5548a1c66d076ef7e18338d9bc8
Author: Pierre Langlois
Date: Tue Nov 19 08:42:48 2019 +
gnu: Add emacs-ample-theme.
* gnu/packages/emacs-xyz.scm (emacs-ample-theme): New variable.
Signed-off-by: Ludovic Courtès
---
gnu/packages/emacs-xyz.scm | 24
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e8f13a7..39c366f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1005,6 +1005,30 @@ skip set strings, which are arguments to
@code{skip-chars-forward} and
and reused.")
(license license:gpl3+
+(define-public emacs-ample-theme
+ (let ((commit "536966adf882446165a1f756830028faa792c7a9")
+(revision "1"))
+(package
+ (name "emacs-ample-theme")
+ (version (git-version "0.0.0" revision commit))
+ (source (origin
+(method git-fetch)
+(uri (git-reference
+ (url "https://github.com/jordonbiondo/ample-theme;)
+ (commit commit)))
+(file-name (git-file-name name version))
+(sha256
+ (base32
+ "07bpv8dag40qjnm5000pgzpazj4whfxf93x2vprz26sg3mjfx0nf"
+ (build-system emacs-build-system)
+ (home-page "https://github.com/jordonbiondo/ample-theme;)
+ (synopsis "Theme for Emacs providing dark, light, and flat versions")
+ (description "Ample themes is a collection of three themes sharing a
+similar pallet with a light, dark and flat versions with a focus on being easy
+on the eyes during night and day. They only support GUI and 256 colour
+terminals.")
+ (license license:gpl3+
+
(define-public emacs-reformatter
(package
(name "emacs-reformatter")
03/06: doc: Clarify the "system type" for 'machine-ssh-configuration'.
civodul pushed a commit to branch master
in repository guix.
commit 69f759912db9af8d3161b315d8806720e068679e
Author: Ludovic Courtès
Date: Tue Nov 19 10:16:58 2019 +0100
doc: Clarify the "system type" for 'machine-ssh-configuration'.
* doc/guix.texi (Invoking guix deploy): Replace "Nix system type" with
"system type" for consistency.
---
doc/guix.texi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 51147e3..61b639e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -26282,8 +26282,8 @@ with an @code{environment} of
@code{managed-host-environment-type}.
@item @code{build-locally?} (default: @code{#t})
If false, system derivations will be built on the machine being deployed to.
@item @code{system}
-The Nix system type describing the architecture of the machine being deployed
-to. This should look something like ``x86_64-linux''.
+The system type describing the architecture of the machine being deployed
+to---e.g., @code{"x86_64-linux"}.
@item @code{authorize?} (default: @code{#t})
If true, the coordinator's signing key will be added to the remote's ACL
keyring.
01/06: pull: Acquire a lock for the target profile.
civodul pushed a commit to branch master in repository guix. commit 6fbd8fde2fad113dbfc90c8b1b55f7ead919a90a Author: Ludovic Courtès Date: Mon Nov 18 22:22:59 2019 +0100 pull: Acquire a lock for the target profile. This is a followup to b1fb663404894268b5ee92c040f12c52c0bee425. * guix/scripts/pull.scm (guix-pull): Wrap 'run-with-store' call in 'with-file-lock/no-wait'. --- .dir-locals.el| 1 + guix/scripts/pull.scm | 19 +-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 22aac2c..e4947f5 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -35,6 +35,7 @@ (eval . (put 'modify-services 'scheme-indent-function 1)) (eval . (put 'with-directory-excursion '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 'package 'scheme-indent-function 0)) (eval . (put 'origin 'scheme-indent-function 0)) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 0ab688a..ef8d5c8 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -36,6 +36,8 @@ #:autoload (guix inferior) (open-inferior) #:use-module (guix scripts build) #:autoload (guix build utils) (which) + #:use-module ((guix build syscalls) +#:select (with-file-lock/no-wait)) #:use-module (guix git) #:use-module (git) #:use-module (gnu packages) @@ -815,11 +817,16 @@ Use '~/.config/guix/channels.scm' instead.")) (if (assoc-ref opts 'bootstrap?) %bootstrap-guile (canonical-package guile-2.2) -(run-with-store store - (build-and-install instances profile - #:dry-run? - (assoc-ref opts 'dry-run?) - #:use-substitutes? - (assoc-ref opts 'substitutes?)) +(with-file-lock/no-wait (string-append profile ".lock") + (lambda (key . args) +(leave (G_ "profile ~a is locked by another process~%") + profile)) + + (run-with-store store +(build-and-install instances profile + #:dry-run? + (assoc-ref opts 'dry-run?) + #:use-substitutes? + (assoc-ref opts 'substitutes?))) ;;; pull.scm ends here
02/06: deploy: Handle "--version".
civodul pushed a commit to branch master in repository guix. commit 1bdb63e73b73a6b581b65c4018aae587aebfcab4 Author: Ludovic Courtès Date: Mon Nov 18 22:59:21 2019 +0100 deploy: Handle "--version". * guix/scripts/deploy.scm (%options): Add "--version". --- guix/scripts/deploy.scm | 4 1 file changed, 4 insertions(+) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index f311587..27b7e4f 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -62,6 +62,10 @@ Perform the deployment specified by FILE.\n")) (lambda args (show-help) (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix deploy"))) + (option '(#\s "system") #t #f (lambda (opt name arg result) (alist-cons 'system arg
branch master updated (10e73bb -> 600f680)
civodul pushed a change to branch master in repository guix. from 10e73bb gnu: spice-gtk: Build with vala support. new 6fbd8fd pull: Acquire a lock for the target profile. new 1bdb63e deploy: Handle "--version". new 69f7599 doc: Clarify the "system type" for 'machine-ssh-configuration'. new 8ec7ca2 gnu: hwloc: Default to 2.x. new e30bb63 gnu: Add emacs-ample-theme. new 600f680 gnu: Add font-dseg. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .dir-locals.el | 1 + doc/guix.texi | 4 ++-- gnu/packages/emacs-xyz.scm | 24 gnu/packages/fonts.scm | 41 + gnu/packages/mpi.scm | 8 ++-- guix/scripts/deploy.scm| 4 guix/scripts/pull.scm | 19 +-- 7 files changed, 91 insertions(+), 10 deletions(-)
