diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/packages/serialization.scm | |
parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
download | guix-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz guix-9dea3f101f252331c049c03f501398a5ec837ba9.zip |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/packages/serialization.scm')
-rw-r--r-- | gnu/packages/serialization.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2f99407b94..95c7dcee63 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -424,9 +424,9 @@ it a convenient format to store user input files.") ;; /etc/services, which is not present in build environment. (substitute* "src/kj/async-io-test.c++" ((":http") ":80")) #t)) - (add-before 'check 'use-tmp-for-tempory-files + (add-before 'check 'use-tmp-for-temporary-files (lambda _ - ;; Use /tmp for tempory files, as the default /var/tmp directory + ;; Use /tmp for temporary files, as the default /var/tmp directory ;; doesn't exist. (substitute* "src/kj/filesystem-disk-test.c++" (("VAR\\_TMP \"/var/tmp\"") |