diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
| commit | 154d97abdd16674fdebc763351f661bbcdc869a4 (patch) | |
| tree | 0277a9380edd1390f16e432283d32499ffed36d1 /gnu/tests | |
| parent | e4696c69d75f4fcf54c42beeb928032726bdaf7d (diff) | |
| parent | 87e7faa2ae641d8302efc8b90f1e45f43f67f6da (diff) | |
| download | guix-154d97abdd16674fdebc763351f661bbcdc869a4.tar guix-154d97abdd16674fdebc763351f661bbcdc869a4.tar.gz | |
Merge remote-tracking branch master into core-updates
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/docker.scm | 2 | ||||
| -rw-r--r-- | gnu/tests/install.scm | 6 | ||||
| -rw-r--r-- | gnu/tests/singularity.scm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 3f98a1e316..10882b9d1f 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -171,7 +171,7 @@ standard output device and then enters a new line.") (home-page #f) (license license:public-domain))) (profile (profile-derivation (packages->manifest - (list guile-2.2 guile-json + (list guile-2.2 guile-json-3 guest-script-package)) #:hooks '() #:locales? #f)) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 124d176181..22c9554705 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -138,7 +138,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.2G \\ + mkpart primary ext2 3M 1.4G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vdb2 @@ -163,7 +163,7 @@ guix --version export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ - mkpart ext2 1M 1.2G \\ + mkpart ext2 1M 1.4G \\ set 1 legacy_boot on mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 mount /dev/vdb1 /mnt @@ -365,7 +365,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vda mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.2G \\ + mkpart primary ext2 3M 1.4G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vda2 diff --git a/gnu/tests/singularity.scm b/gnu/tests/singularity.scm index 2f3a6f289d..1fc2773a00 100644 --- a/gnu/tests/singularity.scm +++ b/gnu/tests/singularity.scm @@ -138,7 +138,7 @@ ;; 'singularity exec' insists on having /bin/sh in the image. (profile (profile-derivation (packages->manifest (list bash-minimal - guile-2.2 guile-json)) + guile-2.2 guile-json-3)) #:hooks '() #:locales? #f)) (tarball (squashfs-image "singularity-pack" profile |