gnu: Remove python2-oslo.utils.

This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-oslo.utils): Remove variable.
author: Marius Bakke <mbakke@fastmail.com> 2020-03-16 13:08:48 +0100
committer: Marius Bakke <mbakke@fastmail.com> 2020-03-16 15:45:35 +0100
commit: 538f44de9ba74ebce637ab437b245bc546c6318b (patch)
tree: e36ccf87a784bed6e795c56181e8b415f9f081dc /doc
parent: 710f7b57422bbbd171dac823de91d4c279f6ddef (diff)
download: guix-538f44de9ba74ebce637ab437b245bc546c6318b.tar.gz
guix-538f44de9ba74ebce637ab437b245bc546c6318b.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 949f7e0bc8..dac6cb1453 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -24,6 +24,7 @@
    (eval . (put 'guard 'scheme-indent-function 1))
    (eval . (put 'lambda* 'scheme-indent-function 1))
    (eval . (put 'substitute* 'scheme-indent-function 1))
+   (eval . (put 'match-record 'scheme-indent-function 2))
 
    ;; 'modify-phases' and its keywords.
    (eval . (put 'modify-phases 'scheme-indent-function 1))
diff --git a/README b/README
index 4192eb4129..d96a43bbef 100644
--- a/README
+++ b/README
@@ -25,13 +25,14 @@ GNU Guix currently depends on the following packages:
   - [[https://www.gnu.org/software/make/][GNU Make]]
   - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled.
   - [[https://gitlab.com/guile-git/guile-git][Guile-Git]]
+  - [[http://www.zlib.net/][zlib]]
   - optionally [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command
 
 Unless `--disable-daemon' was passed, the following packages are needed:
 
   - [[https://sqlite.org/][SQLite 3]]
-  - [[http://www.bzip.org][libbz2]]
   - [[https://gcc.gnu.org][GCC's g++]]
+  - optionally [[http://www.bzip.org][libbz2]]
 
 When `--disable-daemon' was passed, you instead need the following:
 
diff --git a/config-daemon.ac b/config-daemon.ac
index 42b59819d3..80d84cbdbc 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -18,11 +18,18 @@ if test "x$guix_build_daemon" = "xyes"; then
   dnl Use 64-bit file system calls so that we can support files > 2 GiB.
   AC_SYS_LARGEFILE
 
-  dnl Look for libbz2, a required dependency.
-  AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [true],
-    [AC_MSG_ERROR([Guix requires libbz2, which is part of bzip2.  See http://www.bzip.org/.])])
-  AC_CHECK_HEADERS([bzlib.h], [true],
-    [AC_MSG_ERROR([Guix requires libbz2, which is part of bzip2.  See http://www.bzip.org/.])])
+  dnl Look for zlib, a required dependency.
+  AC_CHECK_LIB([z], [gzdopen], [true],
+    [AC_MSG_ERROR([Guix requires zlib.  See http://www.zlib.net/.])])
+  AC_CHECK_HEADERS([zlib.h], [true],
+    [AC_MSG_ERROR([Guix requires zlib.  See http://www.zlib.net/.])])
+
+  dnl Look for libbz2, an optional dependency.
+  AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [HAVE_LIBBZ2=yes], [HAVE_LIBBZ2=no])
+  if test "x$HAVE_LIBBZ2" = xyes; then
+    AC_CHECK_HEADERS([bzlib.h])
+    HAVE_LIBBZ2="$ac_cv_header_bzlib_h"
+  fi
 
   dnl Look for SQLite, a required dependency.
   PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19])
@@ -163,6 +170,7 @@ if test "x$guix_build_daemon" = "xyes"; then
     [chmod +x nix/scripts/offload])
 fi
 
+AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"])
 AM_CONDITIONAL([BUILD_DAEMON], [test "x$guix_build_daemon" = "xyes"])
 AM_CONDITIONAL([BUILD_DAEMON_OFFLOAD],			\
   [test "x$guix_build_daemon" = "xyes"			\
diff --git a/configure.ac b/configure.ac
index aa70f140d3..53efa4a684 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,10 @@ AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"])
 dnl Make sure we have a full-fledged Guile.
 GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
 
+dnl Make sure we don't suffer from the bug in 'equal?' wrt. syntax objects
+dnl found in 2.2.1.  See <https://bugs.gnu.org/29903>.
+GUIX_ASSERT_SYNTAX_OBJECT_EQUAL
+
 dnl Decompressors, for use by the substituter and other modules.
 AC_PATH_PROG([GZIP], [gzip])
 AC_PATH_PROG([BZIP2], [bzip2])
diff --git a/doc/guix.texi b/doc/guix.texi
index 1d1f30f000..6245d54e8d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
author	Marius Bakke <mbakke@fastmail.com>	2020-03-16 13:08:48 +0100
committer	Marius Bakke <mbakke@fastmail.com>	2020-03-16 15:45:35 +0100
commit	538f44de9ba74ebce637ab437b245bc546c6318b (patch)
tree	e36ccf87a784bed6e795c56181e8b415f9f081dc /doc
parent	710f7b57422bbbd171dac823de91d4c279f6ddef (diff)
download	guix-538f44de9ba74ebce637ab437b245bc546c6318b.tar.gz guix-538f44de9ba74ebce637ab437b245bc546c6318b.zip