From fc0680929ded80a5ccdc0131613cb0679b54145d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 May 2019 14:37:23 +0200 Subject: vm-image: Remove 'network-manager-applet' from system profile. This is a followup to 05d907ac6fc6e139389a91ab5540c0dc573a8ce7. * gnu/system/examples/vm-image.tmpl (services): Remove 'network-manager-applet'. --- gnu/system/examples/vm-image.tmpl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 0dbd31fe0a..1ba47a166a 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -96,10 +96,13 @@ root ALL=(ALL) ALL ;; sense in a VM. (remove (lambda (service) (let ((type (service-kind service))) - (memq type (list gdm-service-type - wpa-supplicant-service-type - cups-pk-helper-service-type - network-manager-service-type)))) + (or (memq type + (list gdm-service-type + wpa-supplicant-service-type + cups-pk-helper-service-type + network-manager-service-type)) + (eq? 'network-manager-applet + (service-type-name type))))) (modify-services %desktop-services (login-service-type config => (login-configuration -- cgit v1.2.3 From 9c64080dce9fa3e77c48ae962ff1edc5d0863c6a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 May 2019 14:42:40 +0200 Subject: vm-image: Remove ModemManager. This is a followup to 36f5d78d4af02ad23c33bfb46702d92086bf2796. * gnu/system/examples/vm-image.tmpl (services): Remove MODEM-MANAGER-SERVICE-TYPE. --- gnu/system/examples/vm-image.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 1ba47a166a..7d984155bc 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -92,15 +92,16 @@ root ALL=(ALL) ALL ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) - ;; Remove GDM, NetworkManager, and wpa-supplicant, which don't make - ;; sense in a VM. + ;; Remove GDM, ModemManager, NetworkManager, and wpa-supplicant, + ;; which don't make sense in a VM. (remove (lambda (service) (let ((type (service-kind service))) (or (memq type (list gdm-service-type wpa-supplicant-service-type cups-pk-helper-service-type - network-manager-service-type)) + network-manager-service-type + modem-manager-service-type)) (eq? 'network-manager-applet (service-type-name type))))) (modify-services %desktop-services -- cgit v1.2.3 From 9da2dd90e2e8db8cfb922eb0c064876c146070dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 May 2019 17:06:18 +0200 Subject: gnu: js-mathjax: Avoid "Too many open files" error while building. * gnu/packages/javascript.scm (js-mathjax)[arguments]: Add call to 'close-pipe'. Previously builds would sometimes fail with EMFILE (this was non-deterministic as it depends on GC activity.) --- gnu/packages/javascript.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 8731a44927..e7dcd7962d 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -117,7 +117,11 @@ (let ((minified (open-pipe* OPEN_READ "uglify-js" file))) (call-with-output-file installed (lambda (port) - (dump-port minified port))))) + (dump-port minified port))) + + (let ((exit (close-pipe minified))) + (unless (zero? exit) + (error "dear, uglify-js failed" exit))))) (else (install-file file (dirname installed)))))) (find-files ".")) -- cgit v1.2.3 From d68de958b60426798ed62797ff7c96c327a672ac Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 May 2019 11:58:36 +0200 Subject: installer: Fix Guile-Parted crash on i686. Fixes . This is a followup to 7d567af46b4e10ffafb1d0f76b524f5781460598. * gnu/installer/parted.scm (auto-partition!): Append ESP-PARTITION, when it is true, to the result of 'create-adjacent-partitions!'. * gnu/installer/newt/partition.scm (run-partioning-page): Remove 'initial-partitions' variable, and remove call to 'create-special-user-partitions'. Co-authored-by: Mathieu Othacehe --- gnu/installer/newt/partition.scm | 6 +----- gnu/installer/parted.scm | 16 +++++++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index abc8bdcc03..cd9d46316a 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -751,12 +751,8 @@ by pressing the Exit button.~%~%"))) (disk (mklabel device label))) (disk-commit disk) disk))) - (initial-partitions (disk-partitions disk)) (scheme (symbol-append method '- (run-scheme-page))) - (user-partitions (append - (auto-partition! disk #:scheme scheme) - (create-special-user-partitions - initial-partitions)))) + (user-partitions (auto-partition! disk #:scheme scheme))) (run-disk-page (list disk) user-partitions #:guided? #t))) ((eq? method 'manual) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 4ccc0b1f51..bd2640d1ad 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -895,7 +895,10 @@ partitions (except the ESP on a GPT disk, if present) are wiped. SCHEME is the desired partitioning scheme. It can be 'entire-root or 'entire-root-home. 'entire-root will create a swap partition and a root partition occupying all the remaining space. 'entire-root-home will create a -swap partition, a root partition and a home partition." +swap partition, a root partition and a home partition. + +Return the complete list of partitions on DISK, including the ESP when it +exists." (let* ((device (disk-device disk)) (disk-type (disk-disk-type disk)) (has-extended? (disk-type-check-feature @@ -1001,10 +1004,13 @@ swap partition, a root partition and a home partition." (mount-point "/home"))))))) (new-partitions* (force-user-partitions-formatting new-partitions))) - (create-adjacent-partitions! disk - new-partitions* - #:last-partition-end - (or end-esp-partition 0))))) + (append (if esp-partition + (list (partition->user-partition esp-partition)) + '()) + (create-adjacent-partitions! disk + new-partitions* + #:last-partition-end + (or end-esp-partition 0)))))) ;; -- cgit v1.2.3 From 820429517f9cc8333704a839b4346ac4b02468c4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 May 2019 12:25:54 +0200 Subject: gnu: guix: Update to 1.0.1. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b4e1e077fe..b8313d20ca 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,9 +110,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.0.0") - (commit "326dcbf1b3c30aa525185fda435c34cb9495dd04") - (revision 1)) + (let ((version "1.0.1") + (commit "d68de958b60426798ed62797ff7c96c327a672ac") + (revision 0)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "0k9v9lh69q353x055id1sq1gx4p8idg8ifrgidv5s73wdil2cflm")) + "0x63rxpk2hm6d5pbihwrp218cajs3wf5pxa8w0c1rm06sxd1qwlf")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From fb2abbd6f5abac8ae0fec594594dd54ff7e3f4db Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 May 2019 16:01:47 +0200 Subject: gnu: guix: Update to 8204295. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b8313d20ca..a356a6dab7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "d68de958b60426798ed62797ff7c96c327a672ac") - (revision 0)) + (commit "820429517f9cc8333704a839b4346ac4b02468c4") + (revision 1)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "0x63rxpk2hm6d5pbihwrp218cajs3wf5pxa8w0c1rm06sxd1qwlf")) + "1vfp7ps1k1cwn8p0gsgarlxcy982hzyvb7zqnj66jqd258a1qfgh")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3