diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
commit | da77ea23daa0bfa4a73290dff99b22d6825ff80b (patch) | |
tree | 748d24e62b93c8ab8f999d6415d9f65c3d317da2 /gnu/system/images/orangepi-r1-plus-lts-rk3328.scm | |
parent | 4eeb6922449285f9bce615f6e4ffe4375fa0233f (diff) | |
parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
download | guix-chris-core-updates-no-duplicates-attempt.tar guix-chris-core-updates-no-duplicates-attempt.tar.gz |
Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt
Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/llvm.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/system/images/orangepi-r1-plus-lts-rk3328.scm')
-rw-r--r-- | gnu/system/images/orangepi-r1-plus-lts-rk3328.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm index eaaa12ba78..6ec644f113 100644 --- a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm +++ b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm @@ -21,7 +21,6 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) - #:use-module (gnu packages certs) #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) @@ -55,8 +54,7 @@ (term "vt100") (tty "ttyS2"))) (service dhcp-client-service-type) - (service ntp-service-type) %base-services)) - (packages (cons nss-certs %base-packages)))) + (service ntp-service-type) %base-services)))) (define orangepi-r1-plus-lts-rk3328-image-type (image-type (name 'orangepi-r1-plus-lts-rk3328-raw) |