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 /tests/cpio.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 'tests/cpio.scm')
-rw-r--r-- | tests/cpio.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/cpio.scm b/tests/cpio.scm index 832101d1bb..35a704822b 100644 --- a/tests/cpio.scm +++ b/tests/cpio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,8 +19,8 @@ (define-module (test-cpio) #:use-module (guix cpio) #:use-module (guix tests) - #:use-module ((guix build utils) #:select (which)) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) + #:use-module ((guix build utils) + #:select (which call-with-temporary-output-file)) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (rnrs io ports) |