From 52d71fe8dd924a28ff39a988cc65d660dab989f8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 20 Apr 2021 12:19:33 +0200 Subject: gnu: guile-git: Update to 0.5.1. Fixes . Reported by Bone Baboon . * gnu/packages/guile.scm (guile-git): Update to 0.5.1. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1616991cca..15d5b2cdf2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -776,7 +776,7 @@ type system, elevating types to first-class status.") (define-public guile-git (package (name "guile-git") - (version "0.5.0") + (version "0.5.1") (home-page "https://gitlab.com/guile-git/guile-git.git") (source (origin (method git-fetch) @@ -786,7 +786,7 @@ type system, elevating types to first-class status.") (file-name (git-file-name name version)) (sha256 (base32 - "1hqw3jy81cnsgybsbnfvwvhv1bajwq662hikkrr6dcgky6yspsxx")))) + "1x3wa6la4j1wcfxyhhjlmd7yp85wwpny0y6lrzpz803i9z5fwagc")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings -- cgit 1.4.1 From e318e989b7be7f328f9ef801cd90c539893af962 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 22 Apr 2021 22:41:01 +0200 Subject: file-systems: read-partition-{uuid,label} don't swallow ENOENT & co. Previously, (read-partition-uuid "/does/not/exist") would return #f. With this change, a 'system-error exception is raised as expected. * gnu/build/file-systems.scm (ENOENT-safe): Clarify docstring. (partition-field-reader): Remove use of 'ENOENT-safe'. (partition-predicate): Wrap READER in 'ENOENT-safe'. --- gnu/build/file-systems.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 304805db62..6111cd747c 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -644,16 +644,13 @@ if DEVICE does not contain a NTFS file system." (loop parts)))))))))) (define (ENOENT-safe proc) - "Wrap the one-argument PROC such that ENOENT errors are caught and lead to a -warning and #f as the result." + "Wrap the one-argument PROC such that ENOENT, EIO, and ENOMEDIUM errors are +caught and lead to a warning and #f as the result." (lambda (device) (catch 'system-error (lambda () (proc device)) (lambda args - ;; When running on the hand-made /dev, - ;; 'disk-partitions' could return partitions for which - ;; we have no /dev node. Handle that gracefully. (let ((errno (system-error-errno args))) (cond ((= ENOENT errno) (format (current-error-port) @@ -671,11 +668,10 @@ warning and #f as the result." (define (partition-field-reader read field) "Return a procedure that takes a device and returns the value of a FIELD in the partition superblock or #f." - (let ((read (ENOENT-safe read))) - (lambda (device) - (let ((sblock (read device))) - (and sblock - (field sblock)))))) + (lambda (device) + (let ((sblock (read device))) + (and sblock + (field sblock))))) (define (read-partition-field device partition-field-readers) "Returns the value of a FIELD in the partition superblock of DEVICE or #f. It @@ -742,11 +738,14 @@ partition field reader that returned a value." (define (partition-predicate reader =) "Return a predicate that returns true if the FIELD of partition header that was READ is = to the given value." - (lambda (expected) - (lambda (device) - (let ((actual (reader device))) - (and actual - (= actual expected)))))) + ;; When running on the hand-made /dev, 'disk-partitions' could return + ;; partitions for which we have no /dev node. Handle that gracefully. + (let ((reader (ENOENT-safe reader))) + (lambda (expected) + (lambda (device) + (let ((actual (reader device))) + (and actual + (= actual expected))))))) (define partition-label-predicate (partition-predicate read-partition-label string=?)) -- cgit 1.4.1 From bdb0ba51f8249ab0ba3654904962e6103927254e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 19 Apr 2021 17:05:52 -0400 Subject: gnu: icecat: Update to 78.10.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2021-23961, CVE-2021-23994, CVE-2021-23995, CVE-2021-23998, CVE-2021-23999, CVE-2021-24002, CVE-2021-29945, and CVE-2021-29946. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update upstream source hash. --- gnu/packages/gnuzilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f2de477548..99e534c05e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -694,8 +694,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.9.0-guix0-preview1") -(define %icecat-build-id "20210323000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.10.0-guix0-preview1") +(define %icecat-build-id "20210419000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -717,7 +717,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0r28wrsk2k6pc922zfs5wljh8ziqm4a98lisn7409j2szhfsq0wf")))) + "0h6zl87czbhyhy3597bxqzwy4p1vsaqimkg92lw31gjbv6k434cp")))) (upstream-icecat-base-version "78.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) -- cgit 1.4.1 From 533359cea8fcc305e288ef67be5fa6362e8100e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Apr 2021 16:10:39 +0200 Subject: gnu: wireshark: Update to 3.4.5 [security fixes]. * gnu/packages/networking.scm (wireshark): Update to 3.4.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f7557fc331..69b223fb66 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1421,14 +1421,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.4.4") + (version "3.4.5") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j")))) + (base32 "0cyk8nqws9gp8p2ywszbynh8vawivnbhw60dhmy21qd1038sy6ny")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1 From 075de760d314b4b191a524f02255699746d4064c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 25 Apr 2021 18:04:19 +0200 Subject: gnu: xfdesktop: Add Guix logo to default background. * gnu/packages/xfce.scm (xfdesktop)[arguments]: In 'prepare-background-image' phase, add "xfce-verticals.png". --- gnu/packages/xfce.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 38240d7b9f..b4a8245548 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -892,7 +892,8 @@ on the screen.") (copy-file "/tmp/final.jpg" image)) '(;; "backgrounds/xfce-blue.jpg" "backgrounds/xfce-stripes.png" - "backgrounds/xfce-teal.jpg")) + "backgrounds/xfce-teal.jpg" + "backgrounds/xfce-verticals.png")) #t))) #:disallowed-references (,inkscape ,imagemagick))) -- cgit 1.4.1 From 601d86183a101db07be373a5414cce7a75d800f4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 25 Apr 2021 21:37:52 +0200 Subject: gnu: xfce, mate: Propagate 'font-dejavu'. Fixes . Reported by bo0od . This ensures applications such as IceCat can properly text (numbers in the case of IceCat). * gnu/packages/enlightenment.scm (enlightenment)[propagated-inputs]: Add FONT-DEJAVU. * gnu/packages/mate.scm (mate)[propagated-inputs]: New field. * gnu/packages/xfce.scm (xfce)[propagated-inputs]: New field. --- gnu/packages/enlightenment.scm | 6 +++++- gnu/packages/mate.scm | 5 ++++- gnu/packages/xfce.scm | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 15ea89454f..079d60e45a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) @@ -370,7 +371,10 @@ Libraries with some extra bells and whistles.") (propagated-inputs `(("efl" ,efl) ("libxkbcommon" ,libxkbcommon) - ("wayland-protocols" ,wayland-protocols))) + ("wayland-protocols" ,wayland-protocols) + + ;; Default font that applications such as IceCat require. + ("font-dejavu" ,font-dejavu))) (home-page "https://www.enlightenment.org/about-enlightenment") (synopsis "Lightweight desktop environment") (description diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 44420147a3..82b2d6e0fd 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe @@ -1580,6 +1580,9 @@ used to bring up authentication dialogs.") ("shared-mime-info" ,shared-mime-info) ("yelp" ,yelp) ("zenity" ,zenity))) + (propagated-inputs + ;; Default font that applications such as IceCat require. + `(("font-dejavu" ,font-dejavu))) (synopsis "The MATE desktop environment") (home-page "https://mate-desktop.org/") (description diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b4a8245548..fcddd08b91 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -991,6 +992,9 @@ on your desktop.") ("xfce4-clipman-plugin" ,xfce4-clipman-plugin) ("xfce4-pulseaudio-plugin" ,xfce4-pulseaudio-plugin) ("xfce4-xkb-plugin" ,xfce4-xkb-plugin))) + (propagated-inputs + ;; Default font that applications such as IceCat require. + `(("font-dejavu" ,font-dejavu))) (native-search-paths ;; For finding panel plugins. (package-native-search-paths xfce4-panel)) -- cgit 1.4.1 From 8121bfb7d6d016e063a9166ff70938fe7b98c111 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 25 Apr 2021 23:13:52 +0200 Subject: gnu: kmscon: Open a new keymap-update FIFO once a request has been processed. Fixes . Reported by Maxim Cournoyer . Until now, as soon as you had selected the keyboard layout in the Guix System installer, kmscon would start spinning on epoll_wait(2) calls because of an event on the initial FIFO file descriptor (corresponding to the fact that the client closed it.) * gnu/packages/patches/kmscon-runtime-keymap-switch.patch: In 'uxkb_keymap_update_handler', add calls to 'ev_eloop_rm_fd', 'close', and 'uxkb_dev_keymap_update' In 'uxkb_dev_keymap_update', add call to 'unlink'. --- .../patches/kmscon-runtime-keymap-switch.patch | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch index deb5688daf..480aaecad2 100644 --- a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch +++ b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch @@ -1,5 +1,9 @@ -By Mathieu Othacehe . -Modified by Florian Pelz . +Make kmscon listen to a FIFO in /tmp that clients can write to +to request a keymap change. + +Patch by Mathieu Othacehe . +Modified by Florian Pelz +and Ludovic Courtès . diff --git a/src/pty.c b/src/pty.c index 1443f4a..f64cb5b 100644 @@ -115,7 +119,7 @@ index 04e6cc9..ec44459 100644 uint16_t key_state, uint16_t code); diff --git a/src/uterm_input_uxkb.c b/src/uterm_input_uxkb.c -index 925c755..5d5c22e 100644 +index 925c755..8fe08f8 100644 --- a/src/uterm_input_uxkb.c +++ b/src/uterm_input_uxkb.c @@ -31,6 +31,9 @@ @@ -128,7 +132,7 @@ index 925c755..5d5c22e 100644 #include #include "shl_hook.h" #include "shl_llog.h" -@@ -178,6 +181,87 @@ static void timer_event(struct ev_timer *timer, uint64_t num, void *data) +@@ -178,6 +181,95 @@ static void timer_event(struct ev_timer *timer, uint64_t num, void *data) shl_hook_call(dev->input->hook, dev->input, &dev->repeat_event); } @@ -169,6 +173,13 @@ index 925c755..5d5c22e 100644 + model, layout, variant); + uxkb_desc_init(dev->input, model, layout, variant, options, NULL); + ++ /* The client will now close the FIFO. Close it too, and re-create a ++ * FIFO so other clients can eventually connect. */ ++ ev_eloop_rm_fd(fd); ++ close(dev->rupdate_fd); ++ dev->rupdate_fd = -1; ++ uxkb_dev_keymap_update(dev); ++ + dev->state = xkb_state_new(dev->input->keymap); + if (!dev->state) { + llog_error(dev->input, "cannot create XKB state"); @@ -186,6 +197,7 @@ index 925c755..5d5c22e 100644 + if (ret < 0) + return ret; + ++ (void) unlink(file); + ret = mkfifo(file, S_IRWXU); + if (ret < 0) { + llog_warn(dev->input, "could not open fifo"); -- cgit 1.4.1 From 2b645e359e18742c7aed90eeb96a412ae5130a5a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 27 Apr 2021 17:39:42 +0200 Subject: installer: Force GPT disk label when UEFI is supported. * gnu/installer/newt/partition.scm (run-label-page): Force the GPT disk label when UEFI is supported. --- gnu/installer/newt/partition.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 81cf68d782..2bb9b16945 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -95,14 +95,17 @@ DEVICES list." (define (run-label-page button-text button-callback) "Run a page asking the user to select a partition table label." - (run-listbox-selection-page - #:info-text (G_ "Select a new partition table type. \ + ;; Force the GPT label if UEFI is supported. + (if (efi-installation?) + "gpt" + (run-listbox-selection-page + #:info-text (G_ "Select a new partition table type. \ Be careful, all data on the disk will be lost.") - #:title (G_ "Partition table") - #:listbox-items '("msdos" "gpt") - #:listbox-item->text identity - #:button-text button-text - #:button-callback-procedure button-callback)) + #:title (G_ "Partition table") + #:listbox-items '("msdos" "gpt") + #:listbox-item->text identity + #:button-text button-text + #:button-callback-procedure button-callback))) (define (run-type-page partition) "Run a page asking the user to select a partition type." -- cgit 1.4.1 From c254af8c73ca0aa6e2179112cdd1ea70800fa5ea Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 25 Apr 2021 19:06:31 +0200 Subject: installer: Add MSDOS disk label support on UEFI systems. Fixes: . * gnu/installer/parted.scm (esp-partition?): Remove the MSDOS check. (auto-partition!): On MSDOS disks, check if an ESP partition is present. If that's the case, do not remove it. Otherwise, if UEFI is supported, create one. --- gnu/installer/parted.scm | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 9ef263d1f9..6d6e500d71 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -70,6 +70,7 @@ small-freespace-partition? esp-partition? boot-partition? + efi-installation? default-esp-mount-point with-delay-device-in-use? @@ -193,12 +194,8 @@ inferior to MAX-SIZE, #f otherwise." (define (esp-partition? partition) "Return #t if partition has the ESP flag, return #f otherwise." (let* ((disk (partition-disk partition)) - (disk-type (disk-disk-type disk)) - (has-extended? (disk-type-check-feature - disk-type - DISK-TYPE-FEATURE-EXTENDED))) + (disk-type (disk-disk-type disk))) (and (data-partition? partition) - (not has-extended?) (partition-is-flag-available? partition PARTITION-FLAG-ESP) (partition-get-flag partition PARTITION-FLAG-ESP)))) @@ -918,30 +915,26 @@ exists." ;; disk space. Otherwise, set the swap size to 5% of the disk space. (swap-size (min default-swap-size five-percent-disk))) - (if has-extended? - ;; msdos - remove everything. - (disk-remove-all-partitions disk) - ;; gpt - remove everything but esp if it exists. - (for-each - (lambda (partition) - (and (data-partition? partition) - (disk-remove-partition* disk partition))) - non-boot-partitions)) + ;; Remove everything but esp if it exists. + (for-each + (lambda (partition) + (and (data-partition? partition) + (disk-remove-partition* disk partition))) + non-boot-partitions) (let* ((start-partition - (and (not has-extended?) - (if (efi-installation?) - (and (not esp-partition) - (user-partition - (fs-type 'fat32) - (esp? #t) - (size new-esp-size) - (mount-point (default-esp-mount-point)))) + (if (efi-installation?) + (and (not esp-partition) (user-partition - (fs-type 'ext4) - (bootable? #t) - (bios-grub? #t) - (size bios-grub-size))))) + (fs-type 'fat32) + (esp? #t) + (size new-esp-size) + (mount-point (default-esp-mount-point)))) + (user-partition + (fs-type 'ext4) + (bootable? #t) + (bios-grub? #t) + (size bios-grub-size)))) (new-partitions (cond ((or (eq? scheme 'entire-root) -- cgit 1.4.1 From 68110f72880a5b57fad34a7868f1f0722d52842a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 29 Apr 2021 11:11:32 +0200 Subject: gnu: kmscon: Fix layout setup. Kmscon may discover multiple inputs, corresponding to multiple devices. This means that the uxkb_dev_keymap_update function may be called multiple times, and the FIFO is registered on each input poll loop. When a new layout is written on the FIFO by the installer, the first input picking up the message, will apply the new layout. However, that input may not be the input that the user is currently using. To fix it, register the FIFO on the first input poll loop, but apply the new layout on all the inputs in the uxkb_keymap_update_handler function. * gnu/packages/patches/kmscon-runtime-keymap-switch.patch (uxkb_keymap_update_handler): Apply the new layout to all the inputs. (input_new_dev): Register the FIFO fd only on the first input poll loop. --- .../patches/kmscon-runtime-keymap-switch.patch | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch index 480aaecad2..6692e761bc 100644 --- a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch +++ b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch @@ -79,11 +79,13 @@ diff --git a/src/uterm_input.c b/src/uterm_input.c index 6fcbc4b..990a09d 100644 --- a/src/uterm_input.c +++ b/src/uterm_input.c -@@ -178,6 +178,8 @@ static void input_new_dev(struct uterm_input *input, +@@ -178,6 +178,10 @@ static void input_new_dev(struct uterm_input *input, if (ret) goto err_rcodepoints; -+ uxkb_dev_keymap_update(dev); ++ /* Add the FIFO fd only to the first input poll loop. */ ++ if (shl_dlist_empty(&input->devices)) ++ uxkb_dev_keymap_update(dev); + if (input->awake > 0) { ret = input_wake_up_dev(dev); @@ -132,7 +134,7 @@ index 925c755..8fe08f8 100644 #include #include "shl_hook.h" #include "shl_llog.h" -@@ -178,6 +181,95 @@ static void timer_event(struct ev_timer *timer, uint64_t num, void *data) +@@ -178,6 +181,106 @@ static void timer_event(struct ev_timer *timer, uint64_t num, void *data) shl_hook_call(dev->input->hook, dev->input, &dev->repeat_event); } @@ -171,7 +173,23 @@ index 925c755..8fe08f8 100644 + + llog_info(dev->input, "HANDLER CALLED %s|%s|%s\n", + model, layout, variant); -+ uxkb_desc_init(dev->input, model, layout, variant, options, NULL); ++ ++ struct uterm_input *input = dev->input; ++ struct shl_dlist *iter; ++ ++ /* Apply the new layout to all the inputs. */ ++ shl_dlist_for_each(iter, &input->devices) { ++ struct uterm_input_dev *dev; ++ dev = shl_dlist_entry(iter, ++ struct uterm_input_dev, ++ list); ++ uxkb_desc_init(dev->input, model, layout, variant, options, NULL); ++ dev->state = xkb_state_new(dev->input->keymap); ++ if (!dev->state) { ++ llog_error(dev->input, "cannot create XKB state"); ++ return; ++ } ++ } + + /* The client will now close the FIFO. Close it too, and re-create a + * FIFO so other clients can eventually connect. */ @@ -180,11 +198,6 @@ index 925c755..8fe08f8 100644 + dev->rupdate_fd = -1; + uxkb_dev_keymap_update(dev); + -+ dev->state = xkb_state_new(dev->input->keymap); -+ if (!dev->state) { -+ llog_error(dev->input, "cannot create XKB state"); -+ return; -+ } +} + +int uxkb_dev_keymap_update(struct uterm_input_dev *dev) -- cgit 1.4.1 From 6fd7f161d7cd6248e99e9ba44424b162d443cd61 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Apr 2021 17:38:02 -0400 Subject: gnu: guix: Update to 1.3.0rc1. --- 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 08050e9747..284982b7a3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,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.2.0") - (commit "4dff6ecde85eec473ab231cf75f51e98e8aca1e9") - (revision 21)) + (let ((version "1.3.0rc1") + (commit "0d353b06ec6571972d2e8a3e3a3f0b27aa950e1c") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1n16j7rb4n4pjmp8ck5g206rphmzxii2mbyz1nk4qk70zc3mwszq")) + "0zqdi8nsyarj6jlbx2i6q3fns9chi04yfazlkfkm1fwqd7jlvg35")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 9bf205e5a07d9cc6e225f25e60482db7d446afcc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Apr 2021 21:18:56 -0400 Subject: gnu: guix: Update to 6fd7f16. --- 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 284982b7a3..b3f4b44dd3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0rc1") - (commit "0d353b06ec6571972d2e8a3e3a3f0b27aa950e1c") - (revision 0)) + (commit "6fd7f161d7cd6248e99e9ba44424b162d443cd61") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0zqdi8nsyarj6jlbx2i6q3fns9chi04yfazlkfkm1fwqd7jlvg35")) + "0b92w6lqp4h75dds3fbxdp5shvfpkcdin809f8v94l4a2fbxkais")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 92b02d0c18a6783c751a5b8b28d6bfbb77184ac7 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sat, 17 Apr 2021 16:33:06 +1000 Subject: gnu: openjdk: Clean up runtime dependencies between Java versions. * gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11): Do not consider icedtea/openjdk input paths when rewriting JNI libraries. Signed-off-by: Andreas Enge --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 207f136513..3c4013ab6f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen -;;; Copyright © 2017, 2019 Carlo Zancanaro +;;; Copyright © 2017, 2019, 2021 Carlo Zancanaro ;;; Copyright © 2017-2020 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong @@ -1792,8 +1792,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) + (use-modules (srfi srfi-1)) + (define (icedtea-or-openjdk? path) + (or (string-contains path "openjdk") + (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? + (search-path-as-string->list + (getenv "LIBRARY_PATH")))) (find-library (lambda (name) (search-path library-path @@ -1931,12 +1936,18 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) + (use-modules (srfi srfi-1)) + (define (icedtea-or-openjdk? path) + (or (string-contains path "openjdk") + (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? + (search-path-as-string->list + (getenv "LIBRARY_PATH")))) (find-library (lambda (name) - (search-path - library-path - (string-append "lib" name ".so"))))) + (or (search-path + library-path + (string-append "lib" name ".so")) + (string-append "lib" name ".so"))))) (for-each (lambda (file) (catch 'decoding-error @@ -2139,8 +2150,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) + (use-modules (srfi srfi-1)) + (define (icedtea-or-openjdk? path) + (or (string-contains path "openjdk") + (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? + (search-path-as-string->list + (getenv "LIBRARY_PATH")))) (find-library (lambda (name) (search-path library-path -- cgit 1.4.1 From 522a48a2280347442fcefdfd68444fd8d108fd6b Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Tue, 20 Apr 2021 21:22:20 +1000 Subject: gnu: openjdk: Fix library substitution when libraries aren't found. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]: Change 'find-library' to always return a string. Change 'find-library' callers to use 'string-append' rather than 'format'. Starting from 97a43db8b4416a1450aa61737edba9cf4126cf1c, 'find-library' could return #f and JNI substitutions would emit a literal "#f". Co-authored-by: Ludovic Courtès --- gnu/packages/java.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3c4013ab6f..ae31f5ba42 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1800,9 +1800,10 @@ new Date();")) (search-path-as-string->list (getenv "LIBRARY_PATH")))) (find-library (lambda (name) - (search-path - library-path - (string-append "lib" name ".so"))))) + (or (search-path + library-path + (string-append "lib" name ".so")) + (string-append "lib" name ".so"))))) (for-each (lambda (file) (catch 'decoding-error @@ -1810,9 +1811,9 @@ new Date();")) (substitute* file (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" _ name version) - (format #f "\"~a\"" (find-library name))) + (string-append "\"" (find-library name) "\"")) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) - (format #f "\"~a\"" (find-library name))))) + (string-append "\"" (find-library name) "\"")))) (lambda _ ;; Those are safe to skip. (format (current-error-port) @@ -1955,9 +1956,9 @@ new Date();")) (substitute* file (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" _ name version) - (format #f "\"~a\"" (find-library name))) + (string-append "\"" (find-library name) "\"")) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) - (format #f "\"~a\"" (find-library name))))) + (string-append "\"" (find-library name) "\"")))) (lambda _ ;; Those are safe to skip. (format (current-error-port) @@ -2158,9 +2159,10 @@ new Date();")) (search-path-as-string->list (getenv "LIBRARY_PATH")))) (find-library (lambda (name) - (search-path - library-path - (string-append "lib" name ".so"))))) + (or (search-path + library-path + (string-append "lib" name ".so")) + (string-append "lib" name ".so"))))) (for-each (lambda (file) (catch 'decoding-error @@ -2168,9 +2170,9 @@ new Date();")) (substitute* file (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" _ name version) - (format #f "\"~a\"" (find-library name))) + (string-append "\"" (find-library name) "\"")) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) - (format #f "\"~a\"" (find-library name))))) + (string-append "\"" (find-library name) "\"")))) (lambda _ ;; Those are safe to skip. (format (current-error-port) -- cgit 1.4.1 From 668384d160b58cd137072c34e66e65e1c11851d4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 21 Apr 2021 12:52:21 +0200 Subject: gnu: openjdk: Avoid non-top-level 'use-modules'. * gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]: Replace non-top-level 'use-modules' by '@'. --- gnu/packages/java.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ae31f5ba42..3cd976685c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1792,10 +1792,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) @@ -1937,10 +1940,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) @@ -2151,10 +2157,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) -- cgit 1.4.1 From 78789cb6e26b59b3fb863854b7c8d99401dc7620 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 21 Apr 2021 12:53:54 +0200 Subject: gnu: openjdk: Disallow references to the JDK used for build. This ensures JDKs don't unintentionally keep references to the one used to build them, as reported at and fixed by 97a43db8b4416a1450aa61737edba9cf4126cf1c. * gnu/packages/java.scm (icedtea-8)[arguments]: Add #:disallowed-references. (openjdk9)[arguments]: Likewise. (openjdk10)[arguments]: Likewise. (openjdk11)[arguments]: Likewise. --- gnu/packages/java.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3cd976685c..8a1ba5f262 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1749,6 +1749,9 @@ IcedTea build harness.") ((guix build ant-build-system) (guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references ((,icedtea-7 "jdk")) + ,@(substitute-keyword-arguments (package-arguments icedtea-7) ((#:modules modules) `((guix build utils) @@ -1902,6 +1905,9 @@ new Date();")) #:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references (,icedtea-8 (,icedtea-8 "jdk")) + #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'fix-java-shebangs @@ -2097,7 +2103,9 @@ new Date();")) "--with-libjpeg=system" "--with-native-debug-symbols=zipped" (string-append "--prefix=" (assoc-ref outputs "out"))) - #t)))))) + #t)))) + ((#:disallowed-references _ '()) + `(,openjdk9 (,openjdk9 "jdk"))))) (native-inputs `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") @@ -2127,6 +2135,9 @@ new Date();")) (arguments `(#:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references (,openjdk10 (,openjdk10 "jdk")) + #:tests? #f; requires jtreg ;; TODO package jtreg #:configure-flags -- cgit 1.4.1 From ce5026b9f44b72ff2571a1d259d1abd8658cd1f4 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 18 Apr 2021 16:23:26 +1000 Subject: gnu: xfce4-settings: Add gsettings-desktop-schemas. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-settings):[propagated-inputs]: Add gsettings-desktop-schemas. This makes it appear in the system profile via the xfce service. This fixes a bug where changing icon theme causes xfce4-appearance-settings to crash with the error: GLib-GIO-ERROR **: 15:41:45.828: Settings schema 'org.gnome.desktop.interface' is not installed Trace/breakpoint trap Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fcddd08b91..9c17fc7f2a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -756,6 +756,10 @@ allows you to shut down the computer from Xfce.") ("upower" ,upower) ;; TODO needs upower-glib ("python" ,python) ;; for xfce4-compose-mail ("xf86-input-libinput" ,xf86-input-libinput))) + (propagated-inputs + ;; Some operations, such as changing icon themes, require these schemas + ;; to be in the search path. + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://www.xfce.org/") (synopsis "Xfce settings manager") (description -- cgit 1.4.1 From 2e4808465d7ea5cbff0486a515cd67e3370877ce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 May 2021 22:04:00 +0200 Subject: locale: Remove glibc 2.29 from '%default-locale-libcs'. Having 2.29 is most likely no longer justified. Removing it reduces the closure size returned by: guix size $(guix system build gnu/system/install.scm) from 1.6G to 1.5G. * gnu/system/locale.scm (%default-locale-libcs): Remove GLIBC-2.29. --- gnu/system/locale.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 689d238d1a..18bbe5ba32 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -148,7 +148,7 @@ data format changes between libc versions." (define %default-locale-libcs ;; The libcs for which we build locales by default. ;; List the previous and current libc to ease transition. - (list glibc-2.29 glibc)) + (list glibc)) (define %default-locale-definitions ;; Arbitrary set of locales that are built by default. They are here mostly -- cgit 1.4.1 From 72b7ea416b2c3aef31434f026238c97bd97b6bc8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 14:04:39 +0200 Subject: gnu: guix: Add run-time dependency on Guile-Lib. This is a followup to 02e2e093e858e8a0ca7bd66c1f1f6fd0a1705edb, which added Guile-Lib as an input but did not add it to the wrapper's search path. * gnu/packages/package-management.scm (guix)[arguments]: In 'wrap-program' phase, add GUILE-LIB to DEPS. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b3f4b44dd3..0add8f4220 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -317,7 +317,7 @@ $(prefix)/etc/openrc\n"))) (gnutls (assoc-ref inputs "gnutls")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git - bs ssh zlib lzlib zstd)) + bs ssh zlib lzlib zstd guile-lib)) (deps* ,@(if (%current-target-system) '(deps) '((cons avahi deps)))) -- cgit 1.4.1 From c47f3fc13562d82edfd2d47342574154c452843a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 14:35:31 +0200 Subject: gnu: guix: Avoid Bash wrapper. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Bash wrapper created by 'wrap-program' creates an extra indirection and may annoyingly emit locale warnings: /gnu/store/…-bash-minimal-5.0.16/bin/bash: warning: setlocale: LC_ALL: cannot change locale (wtf) This warning would typically show up when running Guix, as produced by 'guix pack guix', on a foreign distro, annihilating efforts made in 1d4ab335b22a93e01c2eb1eb3e93fc6534157040 and 8a973abc6f7eebfcd8a904bfbb99cb9f86f66ef0. * gnu/packages/package-management.scm (guix)[arguments]: In 'wrap-program' phase, remove 'string-join' call for PATH and GOPATH. Replace 'wrap-program' call with a 'substitute*' form. Remove (when target ...) form. [inputs]: Remove "bash-minimal" added in commit 38b9af7c92344a17b6680ebd2aeea14171f84a1c and no longer needed. --- gnu/packages/package-management.scm | 56 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0add8f4220..56b436c6f8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -326,31 +326,38 @@ $(prefix)/etc/openrc\n"))) (open-pipe* OPEN_READ (string-append guile "/bin/guile") "-c" "(display (effective-version))"))) - (path (string-join - (map (cut string-append <> - "/share/guile/site/" - effective) - (delete #f deps*)) - ":")) - (gopath (string-join - (map (cut string-append <> - "/lib/guile/" effective - "/site-ccache") - (delete #f deps*)) - ":")) + (path (map (cut string-append <> + "/share/guile/site/" + effective) + (delete #f deps*))) + (gopath (map (cut string-append <> + "/lib/guile/" effective + "/site-ccache") + (delete #f deps*))) (locpath (string-append locales "/lib/locale"))) - (wrap-program (string-append out "/bin/guix") - `("GUILE_LOAD_PATH" ":" prefix (,path)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)) - `("GUIX_LOCPATH" ":" suffix (,locpath))) - - (when target - ;; XXX Touching wrap-program rebuilds world - (let ((bash (assoc-ref inputs "bash"))) - (substitute* (string-append out "/bin/guix") - (("^#!.*/bash") (string-append "#! " bash "/bin/bash"))))) - #t))) + ;; Modify 'guix' directly instead of using + ;; 'wrap-program'. This avoids the indirection + ;; through Bash, which in turn avoids getting Bash's + ;; own locale warnings. + (substitute* (string-append out "/bin/guix") + (("!#") + (string-append + "!#\n\n" + (object->string + `(set! %load-path (append ',path %load-path))) + "\n" + (object->string + `(set! %load-compiled-path + (append ',gopath %load-compiled-path))) + "\n" + (object->string + `(let ((path (getenv "GUIX_LOCPATH"))) + (setenv "GUIX_LOCPATH" + (if path + (string-append path ":" ,locpath) + ,locpath)))) + "\n\n")))))) ;; The 'guix' executable has 'OUT/libexec/guix/guile' as ;; its shebang; that should remain unchanged, thus remove @@ -405,8 +412,7 @@ $(prefix)/etc/openrc\n"))) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) '()) ,@(if (%current-target-system) - `(("bash" ,bash-minimal) - ("xz" ,xz)) + `(("xz" ,xz)) '()) ;; Tests also rely on these bootstrap executables. -- cgit 1.4.1 From af66a9510fdbe9a7cb3ad2a1acdf190553727704 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 15:17:45 +0200 Subject: gnu: guix: Phases refer to #:system, #:target, and #:native-inputs. * gnu/packages/package-management.scm (guix)[arguments]: In 'copy-bootstrap-guile' and 'wrap-program' phases, refer to #:system, #:native-inputs, and #:target instead of unquoting (%current-system) and (%current-target-system). --- gnu/packages/package-management.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 56b436c6f8..3f72d4fac9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -261,11 +261,9 @@ $(prefix)/etc/openrc\n"))) (intern (assoc-ref inputs "boot-guile") #f) ;; On x86_64 some tests need the i686 Guile. - ,@(if (and (not (%current-target-system)) - (string=? (%current-system) - "x86_64-linux")) - '((intern (assoc-ref inputs "boot-guile/i686") #f)) - '()) + (when (and (not target) + (string=? system "x86_64-linux")) + (intern (assoc-ref inputs "boot-guile/i686") #f)) ;; Copy the bootstrap executables. (for-each (lambda (input) @@ -299,9 +297,8 @@ $(prefix)/etc/openrc\n"))) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) - (guile ,@(if (%current-target-system) - '((assoc-ref native-inputs "guile")) - '((assoc-ref inputs "guile")))) + (guile (assoc-ref (or native-inputs inputs) + "guile")) (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) (guile-lib (assoc-ref inputs "guile-lib")) @@ -318,9 +315,7 @@ $(prefix)/etc/openrc\n"))) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh zlib lzlib zstd guile-lib)) - (deps* ,@(if (%current-target-system) - '(deps) - '((cons avahi deps)))) + (deps* (if avahi (cons avahi deps) deps)) (effective (read-line (open-pipe* OPEN_READ -- cgit 1.4.1 From 6b0704339dacaada2dd9a999395c2dffc1bd9af0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 17 Apr 2021 00:29:06 -0400 Subject: services: Fix the spice-vdagent service. * gnu/services/spice.scm (spice-vdagent-activation): Update runtime directory from /var/run/spice-vdagentd to /run/spice-vdagentd. (spice-vdagent-service-type): Specify a default value and fix indentation. --- gnu/services/spice.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/services/spice.scm b/gnu/services/spice.scm index fd85dc234f..a2aee4ab2a 100644 --- a/gnu/services/spice.scm +++ b/gnu/services/spice.scm @@ -38,7 +38,7 @@ "Return the activation gexp for CONFIG." #~(begin (use-modules (guix build utils)) - (mkdir-p "/var/run/spice-vdagentd"))) + (mkdir-p "/run/spice-vdagentd"))) (define (spice-vdagent-shepherd-service config) "Return a for spice-vdagentd with CONFIG." @@ -61,14 +61,16 @@ (compose list spice-vdagent-configuration-spice-vdagent)) (define spice-vdagent-service-type - (service-type (name 'spice-vdagent) - (extensions - (list (service-extension shepherd-root-service-type - spice-vdagent-shepherd-service) - (service-extension activation-service-type - spice-vdagent-activation) - (service-extension profile-service-type - spice-vdagent-profile))))) + (service-type + (name 'spice-vdagent) + (default-value (spice-vdagent-configuration)) + (extensions + (list (service-extension shepherd-root-service-type + spice-vdagent-shepherd-service) + (service-extension activation-service-type + spice-vdagent-activation) + (service-extension profile-service-type + spice-vdagent-profile))))) (define* (spice-vdagent-service #:optional (config (spice-vdagent-configuration))) -- cgit 1.4.1 From 3a3e62cc56317acdba9d84fb2ade34b562c4e14c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 May 2021 00:23:49 +0200 Subject: gnu: guile-zlib: Add Guile 2.2 variant. * gnu/packages/guile.scm (guile2.2-zlib): New variable. --- gnu/packages/guile.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 15d5b2cdf2..d0caba7834 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -856,6 +856,9 @@ Guile's foreign function interface.") (home-page "https://notabug.org/guile-zlib/guile-zlib") (license license:gpl3+))) +(define-public guile2.2-zlib + (package-for-guile-2.2 guile-zlib)) + (define-public guile-lzlib (package (name "guile-lzlib") -- cgit 1.4.1 From ca3780835f8d417ac41a80d5456749c327b4bb92 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 May 2021 00:24:22 +0200 Subject: gnu: guile-lzlib: Add Guile 2.2 variant. * gnu/packages/guile.scm (guile2.2-lzlib): New variable. --- gnu/packages/guile.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d0caba7834..13fcf19606 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -895,6 +895,9 @@ pure Scheme by using Guile's foreign function interface.") (home-page "https://notabug.org/guile-lzlib/guile-lzlib") (license license:gpl3+))) +(define-public guile2.2-lzlib + (package-for-guile-2.2 guile-lzlib)) + (define-public guile-zstd (package (name "guile-zstd") -- cgit 1.4.1 From 76c4646beb878e19a4cf1ca5789b699e597f27b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 May 2021 00:52:27 +0200 Subject: gnu: guile2.2-guix: Add missing dependencies. Reported by Maxime Devos . * gnu/packages/package-management.scm (guile2.2-guix)[inputs] [propagated-inputs]: Add GUILE2.2-LIB, GUILE2.2-ZLIB, and GUILE2.2-LZLIB. --- gnu/packages/package-management.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3f72d4fac9..9e9edcf70d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -524,12 +524,16 @@ the Nix package manager.") ("gnutls" ,guile2.2-gnutls) ("guile-gcrypt" ,guile2.2-gcrypt) ("guile-json" ,guile2.2-json) + ("guile-lib" ,guile2.2-lib) ("guile-sqlite3" ,guile2.2-sqlite3) ("guile-ssh" ,guile2.2-ssh) ("guile-git" ,guile2.2-git) + ("guile-zlib" ,guile2.2-zlib) + ("guile-lzlib" ,guile2.2-lzlib) ,@(fold alist-delete (package-native-inputs guix) '("guile" "gnutls" "guile-gcrypt" "guile-json" - "guile-sqlite3" "guile-ssh" "guile-git")))) + "guile-lib" "guile-sqlite3" "guile-ssh" "guile-git" + "guile-zlib" "guile-lzlib")))) (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guix)))) @@ -537,9 +541,12 @@ the Nix package manager.") `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile2.2-gcrypt) ("guile-json" ,guile2.2-json) + ("guile-lib" ,guile2.2-lib) ("guile-sqlite3" ,guile2.2-sqlite3) ("guile-ssh" ,guile2.2-ssh) - ("guile-git" ,guile2.2-git))))) + ("guile-git" ,guile2.2-git) + ("guile-zlib" ,guile2.2-zlib) + ("guile-lzlib" ,guile2.2-lzlib))))) (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) -- cgit 1.4.1 From a33afba4f1fa6350fe6e1100c6277ca92aca8a40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 6 May 2021 10:57:54 -0400 Subject: gnu: spice-vdagent: Update to 0.21.0 and enable GTK+ support. * gnu/packages/spice.scm (spice-vdagent): Update to 0.21.0. Remove trailing #t. [make-flags]: New argument. [phases]{fix-test-termination}: New phase. [inputs]: Add gtk+. [native-inputs]{procps}: New input. --- gnu/packages/spice.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 92aeef7f79..0e47609b9e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -261,7 +261,7 @@ Internet and from a wide variety of machine architectures.") (define-public spice-vdagent (package (name "spice-vdagent") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (string-append @@ -269,11 +269,14 @@ Internet and from a wide variety of machine architectures.") "spice-vdagent-" version ".tar.bz2")) (sha256 (base32 - "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf")))) + "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--localstatedir=/var") + ;; The test-session-info test fails for unknown reasons (see: + ;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/issues/24). + #:make-flags '("XFAIL_TESTS=tests/test-session-info") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile.in @@ -281,19 +284,27 @@ Internet and from a wide variety of machine architectures.") (substitute* "Makefile.in" (((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)" "\\$\\(localstatedir\\)/run/spice-vdagentd")) - "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd")) - #t)) + "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd")))) (add-after 'unpack 'patch-spice-vdagent.desktop (lambda* (#:key outputs #:allow-other-keys) (substitute* "data/spice-vdagent.desktop" (("Exec=/usr/bin/spice-vdagent") (string-append "Exec=" (assoc-ref outputs "out") - "/bin/spice-vdagent"))) - #t))))) + "/bin/spice-vdagent"))))) + (add-after 'unpack 'fix-test-termination + (lambda _ + ;; The termination tests depend on finding the socket file name + ;; in the spice-vdagent command line it launched, but by default + ;; ps truncates its output, which causes the test to fail (see: + ;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/merge_requests/36). + (substitute* "tests/test-termination.c" + (("ps -ef") + "ps -efww"))))))) (inputs `(("alsa-lib" ,alsa-lib) ("dbus" ,dbus) ("glib" ,glib) + ("gtk+" ,gtk+) ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("libx11" ,libx11) @@ -303,7 +314,8 @@ Internet and from a wide variety of machine architectures.") ("libxrandr" ,libxrandr) ("spice-protocol" ,spice-protocol))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("procps" ,procps))) ;tests use 'ps' (synopsis "Spice agent for Linux") (description "Spice-vdagent enables sharing the clipboard and guest display resolution scaling on graphical console window resize.") -- cgit 1.4.1 From b39c4e18f28d39929a034a2350b316038044638e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 5 May 2021 21:44:44 -0400 Subject: services: spice-vdagent: Clear the socket file prior to starting. This fixes the following issue where spice-vdagent would fail to start if the spice-vdagent-sock socket file already existed: spice-vdagentd: Fatal could not create the server socket /run/spice-vdagentd/spice-vdagent-sock: Error binding to address: Address already in use The requirement is also modified to depend on dbus-system, a cue taken from upstream's own systemd service file (see 'data/spice-vdagentd.service' in the sources). * gnu/services/spice.scm (spice-vdagent-activation): Delete procedure. (spice-vdagent-shepherd-service): Fix indentation. [requirement]: Replace udev by dbus-system. [start]: Ensure the spice-vdagentd run-time directory exists and that the spice-vdagent-sock socket file does *not* exist before forking the daemon. --- gnu/services/spice.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/services/spice.scm b/gnu/services/spice.scm index a2aee4ab2a..3b88e29043 100644 --- a/gnu/services/spice.scm +++ b/gnu/services/spice.scm @@ -34,28 +34,29 @@ (spice-vdagent spice-vdagent-configuration-spice-vdagent (default spice-vdagent))) -(define (spice-vdagent-activation config) - "Return the activation gexp for CONFIG." - #~(begin - (use-modules (guix build utils)) - (mkdir-p "/run/spice-vdagentd"))) - (define (spice-vdagent-shepherd-service config) "Return a for spice-vdagentd with CONFIG." (define spice-vdagent (spice-vdagent-configuration-spice-vdagent config)) (define spice-vdagentd-command (list - (file-append spice-vdagent "/sbin/spice-vdagentd") - "-x")) + (file-append spice-vdagent "/sbin/spice-vdagentd") + "-x")) (list - (shepherd-service - (documentation "Spice vdagentd service") - (requirement '(udev)) - (provision '(spice-vdagentd)) - (start #~(make-forkexec-constructor '#$spice-vdagentd-command)) - (stop #~(make-kill-destructor))))) + (shepherd-service + (documentation "Spice vdagentd service") + (requirement '(dbus-system)) + (provision '(spice-vdagentd)) + (start #~(lambda args + ;; spice-vdagentd supports being activated upon the client + ;; connecting to its socket; when not using such feature, the + ;; socket should not exist before vdagentd creates it itself. + (mkdir-p "/run/spice-vdagentd") + (false-if-exception + (delete-file "/run/spice-vdagentd/spice-vdagent-sock")) + (fork+exec-command '#$spice-vdagentd-command))) + (stop #~(make-kill-destructor))))) (define spice-vdagent-profile (compose list spice-vdagent-configuration-spice-vdagent)) @@ -67,8 +68,6 @@ (extensions (list (service-extension shepherd-root-service-type spice-vdagent-shepherd-service) - (service-extension activation-service-type - spice-vdagent-activation) (service-extension profile-service-type spice-vdagent-profile))))) -- cgit 1.4.1 From 3ab48ed6cd4b1f87a4c339b172dd8a107478654c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 5 May 2021 12:07:39 -0400 Subject: gnu: system: Add SPICE capability to the VM image. * gnu/system/examples/vm-image.tmpl (services) [spice-vdagent-service-type]: Add service. [slim-service-type] : Add the xf86-video-qxl module. --- gnu/system/examples/vm-image.tmpl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index bcb2ba614c..1a2dfca452 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -5,7 +5,7 @@ ;; (use-modules (gnu) (guix) (srfi srfi-1)) -(use-service-modules desktop networking ssh xorg) +(use-service-modules desktop networking spice ssh xorg) (use-package-modules bootloaders certs fonts nvi package-management wget xorg) @@ -75,11 +75,20 @@ root ALL=(ALL) ALL (default-user "guest") (xorg-configuration (xorg-configuration + ;; The QXL virtual GPU driver is added to provide + ;; a better SPICE experience. + (modules (cons xf86-video-qxl + %default-xorg-modules)) (keyboard-layout keyboard-layout))))) ;; Uncomment the line below to add an SSH server. ;;(service openssh-service-type) + ;; Add support for the SPICE protocol, which enables dynamic + ;; resizing of the guest screen resolution, clipboard + ;; integration with the host, etc. + (service spice-vdagent-service-type) + ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) -- cgit 1.4.1 From 7a65beff0f3c3958ae38087bb7b565e981e99ac1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 7 May 2021 12:17:26 -0400 Subject: system: Add wget to %base-packages-networking. Fixes . Wget is typically included with most GNU/Linux distributions. It adds about ~3 MiB to the system size. * gnu/system.scm (%base-packages-networking): Add the wget package. --- gnu/system.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index 5bf2a85272..675f6692bf 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages package-management) #:use-module (gnu packages pciutils) #:use-module (gnu packages texinfo) + #:use-module (gnu packages wget) #:use-module (gnu packages zile) #:use-module (gnu services) #:use-module (gnu services shepherd) @@ -806,6 +807,7 @@ of PROVENANCE-SERVICE-TYPE to its services." ;; Default set of networking packages. (list inetutils isc-dhcp iproute + wget ;; wireless-tools is deprecated in favor of iw, but it's still what ;; many people are familiar with, so keep it around. iw wireless-tools)) -- cgit 1.4.1 From 566982bc7133173ed863b543fa2fd38d8fab9af7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 May 2021 00:29:22 -0400 Subject: gnu: guix: Update to 1.3.0rc2. --- 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 9e9edcf70d..f7b0215050 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,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.3.0rc1") - (commit "6fd7f161d7cd6248e99e9ba44424b162d443cd61") - (revision 1)) + (let ((version "1.3.0rc2") + (commit "7a65beff0f3c3958ae38087bb7b565e981e99ac1") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0b92w6lqp4h75dds3fbxdp5shvfpkcdin809f8v94l4a2fbxkais")) + "18gi8v2xni8q8xrcmcbzqs6q2gkghvbi9456ly8q0isv14b11g6s")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From dde029147619cdee9956dfa053933f9a4e619b5d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 May 2021 00:33:14 -0400 Subject: gnu: guix: Update to 566982b. --- 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 f7b0215050..9ad4f0901d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0rc2") - (commit "7a65beff0f3c3958ae38087bb7b565e981e99ac1") - (revision 0)) + (commit "566982bc7133173ed863b543fa2fd38d8fab9af7") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "18gi8v2xni8q8xrcmcbzqs6q2gkghvbi9456ly8q0isv14b11g6s")) + "0ys8sjckp1a9hmisvjwjr34w7bzi9pskgkwiiqhjm36fs0z8ks30")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 945ad48cd8029fa77a643e00c7fd350e98cacca0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 9 May 2021 23:40:34 -0400 Subject: system: vm-image.tmpl: Add a crutch to allow refreshing the resolution. Inspired by https://github.com/jollheef/appvm/commit/1270b2e209bc002e69bbe6351ad5b04b7facfcc8. The price to pay is about 5% of a CPU core usage in the guest in the worst scenario. * gnu/system/examples/vm-image.tmpl (auto-update-resolution-crutch): New mcron job. [services]: Extend the mcron-service with it. --- gnu/system/examples/vm-image.tmpl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 1a2dfca452..697019e877 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -5,7 +5,7 @@ ;; (use-modules (gnu) (guix) (srfi srfi-1)) -(use-service-modules desktop networking spice ssh xorg) +(use-service-modules desktop mcron networking spice ssh xorg) (use-package-modules bootloaders certs fonts nvi package-management wget xorg) @@ -24,6 +24,18 @@ Run '\x1b[1;37minfo guix\x1b[0m' to browse documentation. accounts.\x1b[0m ")) +;;; XXX: Xfce does not implement what is needed for the SPICE dynamic +;;; resolution to work (see: +;;; https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/142). Workaround it +;;; by manually invoking xrandr every second. +(define auto-update-resolution-crutch + #~(job '(next-second) + (lambda () + (setenv "DISPLAY" ":0.0") + (setenv "XAUTHORITY" "/home/guest/.Xauthority") + (execl (string-append #$xrandr "/bin/xrandr") "xrandr" "-s" "0")) + #:user "guest")) + (operating-system (host-name "gnu") (timezone "Etc/UTC") @@ -89,6 +101,9 @@ root ALL=(ALL) ALL ;; integration with the host, etc. (service spice-vdagent-service-type) + (simple-service 'cron-jobs mcron-service-type + (list auto-update-resolution-crutch)) + ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) -- cgit 1.4.1 From 771b866c55e5f992df60f6c32f5fdd78b64e17f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 May 2021 14:15:04 -0400 Subject: gnu: guix: Update to 1.3.0. --- 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 9ad4f0901d..ac6701f4f3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,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.3.0rc2") - (commit "566982bc7133173ed863b543fa2fd38d8fab9af7") - (revision 1)) + (let ((version "1.3.0") + (commit "a0178d34f582b50e9bdbb0403943129ae5b560ff") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0ys8sjckp1a9hmisvjwjr34w7bzi9pskgkwiiqhjm36fs0z8ks30")) + "1b4kbcv55vvabyzrpwdbr29lif4m4f628lm3h9si4qiw5czjwswv")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From fb5d04d36334784a5ac76c4a90de1e1376120885 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 May 2021 16:27:17 -0400 Subject: gnu: guix: Update to 771b866. --- 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 ac6701f4f3..9991c584f0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "a0178d34f582b50e9bdbb0403943129ae5b560ff") - (revision 0)) + (commit "771b866c55e5f992df60f6c32f5fdd78b64e17f6") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1b4kbcv55vvabyzrpwdbr29lif4m4f628lm3h9si4qiw5czjwswv")) + "0w8w05w6v3lc6478vfw67jzn0hbd9nsncpx9i9ch1lck53r8vs44")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1