dnl GNU Guix --- Functional package management for GNU dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017 Efraim Flashner dnl Copyright © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. dnl dnl GNU Guix is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 3 of the License, or (at dnl your option) any later version. dnl dnl GNU Guix is distributed in the hope that it will be useful, but dnl WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with GNU Guix. If not, see
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/admin.scm16
1 files changed, 4 insertions, 12 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 67d836112d..9e28d2e8c0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2835,13 +2835,13 @@ specified directories.")
(define-public ansible-core
(package
(name "ansible-core")
- (version "2.14.4")
+ (version "2.15.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible-core" version))
(sha256
- (base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh"))))
+ (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc"))))
(build-system python-build-system)
(arguments
`(#:modules ((guix build python-build-system)
@@ -2911,14 +2911,6 @@ test_context)" all)
(when tests?
;; Otherwise Ansible fails to create its config directory.
(setenv "HOME" "/tmp")
- ;; This test module messes up with sys.path and causes many
- ;; test failures.
- (delete-file "test/units/_vendor/test_vendor.py")
- ;; The test fails when run in the container, for reasons
- ;; unknown.
- (delete-file "test/units/utils/test_display.py")
- ;; This test fail for reasons unknown.
- (delete-file "test/units/cli/test_adhoc.py")
;; These tests fail in the container; it appears that the
;; mocking of the absolute file names such as /usr/bin/svcs do
;; not work as intended there.
@@ -2933,7 +2925,7 @@ test_command_nonexisting.py")
;; does some extra environment setup. Taken from
;; https://raw.githubusercontent.com/ansible/ansible/\
;; devel/test/utils/shippable/shippable.sh.
- (invoke "ansible-test" "units" "-v"
+ (invoke "./bin/ansible-test" "units" "-v"
"--num-workers" (number->string
(parallel-job-count)))))))))
(native-inputs
@@ -2954,7 +2946,7 @@ test_command_nonexisting.py")
python-jinja2
python-pyyaml
python-packaging ;for version number parsing
- python-resolvelib-0.5))
+ python-resolvelib))
(home-page "https://www.ansible.com/")
(synopsis "Radically simple IT automation")
(description "Ansible aims to be a radically simple IT automation system.
T_DIRECTORY AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ AC_CACHE_CHECK([for unit test root directory], [ac_cv_guix_test_root], [ac_cv_guix_test_root="`pwd`/test-tmp"]) ]) dnl 'BINPRM_BUF_SIZE' constant in Linux (we leave room for the trailing zero.) dnl The Hurd has a limit of about a page (see exec/hashexec.c.) m4_define([LINUX_HASH_BANG_LIMIT], 127) dnl Hardcoded 'sun_path' length in . m4_define([SOCKET_FILE_NAME_LIMIT], 108) dnl GUIX_SOCKET_FILE_NAME_LENGTH AC_DEFUN([GUIX_SOCKET_FILE_NAME_LENGTH], [ AC_CACHE_CHECK([the length of the installed socket file name], [ac_cv_guix_socket_file_name_length], [ac_cv_guix_socket_file_name_length="`echo -n "$guix_localstatedir/guix/daemon-socket/socket" | wc -c`"]) ]) dnl GUIX_TEST_SOCKET_FILE_NAME_LENGTH AC_DEFUN([GUIX_TEST_SOCKET_FILE_NAME_LENGTH], [ AC_REQUIRE([GUIX_TEST_ROOT_DIRECTORY]) AC_CACHE_CHECK([the length of the socket file name used in tests], [ac_cv_guix_test_socket_file_name_length], [ac_cv_guix_test_socket_file_name_length="`echo -n "$ac_cv_guix_test_root/var/123456/daemon-socket/socket" | wc -c`"]) ]) dnl GUIX_HASH_BANG_LENGTH AC_DEFUN([GUIX_HASH_BANG_LENGTH], [ AC_CACHE_CHECK([the length of a typical hash bang line], [ac_cv_guix_hash_bang_length], [ac_cv_guix_hash_bang_length=`echo -n "$storedir/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bootstrap-binaries-0/bin/bash" | wc -c`]) ]) dnl GUIX_TEST_HASH_BANG_LENGTH AC_DEFUN([GUIX_TEST_HASH_BANG_LENGTH], [ AC_REQUIRE([GUIX_TEST_ROOT_DIRECTORY]) AC_CACHE_CHECK([the length of a hash bang line used in tests], [ac_cv_guix_test_hash_bang_length], [ac_cv_guix_test_hash_bang_length=`echo -n "$ac_cv_guix_test_root/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bootstrap-binaries-0/bin/bash" | wc -c`]) ]) dnl GUIX_CHECK_FILE_NAME_LIMITS dnl dnl GNU/Linux has a couple of silly limits that we can easily run into. dnl Make sure everything is fine with the current settings. Set $1 to dnl 'yes' if tests can run, 'no' otherwise. AC_DEFUN([GUIX_CHECK_FILE_NAME_LIMITS], [ AC_REQUIRE([GUIX_SOCKET_FILE_NAME_LENGTH]) AC_REQUIRE([GUIX_TEST_SOCKET_FILE_NAME_LENGTH]) AC_REQUIRE([GUIX_HASH_BANG_LENGTH]) AC_REQUIRE([GUIX_TEST_HASH_BANG_LENGTH]) if test "$ac_cv_guix_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then AC_MSG_ERROR([socket file name would exceed the maxium allowed length]) fi if test "$ac_cv_guix_test_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then AC_MSG_WARN([socket file name limit may be exceeded when running tests]) fi $1=yes if test "$ac_cv_guix_hash_bang_length" -ge ]LINUX_HASH_BANG_LIMIT[; then $1=no AC_MSG_ERROR([store directory '$storedir' would lead to overly long hash-bang lines]) fi if test "$ac_cv_guix_test_hash_bang_length" -ge ]LINUX_HASH_BANG_LIMIT[; then $1=no AC_MSG_WARN([test directory '$ac_cv_guix_test_root' may lead to overly long hash-bang lines]) fi ]) dnl GUIX_CHECK_CXX11 dnl dnl Check whether the C++ compiler can compile a typical C++11 program. AC_DEFUN([GUIX_CHECK_CXX11], [ AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([whether $CXX supports C++11], [ac_cv_guix_cxx11_support], [save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="-std=c++11 $CXXFLAGS" AC_COMPILE_IFELSE([ AC_LANG_SOURCE([ #include std::function return_plus_lambda (int x) { auto result = [[&]](int y) { return x + y; }; return result; } ])], [ac_cv_guix_cxx11_support=yes], [ac_cv_guix_cxx11_support=no]) CXXFLAGS="$save_CXXFLAGS" ]) ]) dnl GUIX_ASSERT_CXX11 dnl dnl Error out if the C++ compiler cannot compile C++11 code. AC_DEFUN([GUIX_ASSERT_CXX11], [ GUIX_CHECK_CXX11 if test "x$ac_cv_guix_cxx11_support" != "xyes"; then AC_MSG_ERROR([C++ compiler '$CXX' does not support the C++11 standard]) fi ]) dnl GUIX_LIBGCRYPT_LIBDIR VAR dnl dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR. AC_DEFUN([GUIX_LIBGCRYPT_LIBDIR], [ AC_PATH_PROG([LIBGCRYPT_CONFIG], [libgcrypt-config]) AC_CACHE_CHECK([libgcrypt's library directory], [guix_cv_libgcrypt_libdir], [if test "x$LIBGCRYPT_CONFIG" != "x"; then guix_cv_libgcrypt_libdir=`$LIBGCRYPT_CONFIG --libs | grep -e -L | sed -e "s/.*-L\([[^ ]]\+\)[[[:blank:]]]\+-lgcrypt.*/\1/g"` else guix_cv_libgcrypt_libdir="" fi]) $1="$guix_cv_libgcrypt_libdir" ]) dnl GUIX_CURRENT_LOCALSTATEDIR dnl dnl Determine the localstatedir of an existing Guix installation and set dnl 'guix_cv_current_localstatedir' accordingly. Set it to "none" if no dnl existing installation was found. AC_DEFUN([GUIX_CURRENT_LOCALSTATEDIR], [ AC_PATH_PROG([GUILE], [guile]) AC_CACHE_CHECK([the current installation's localstatedir], [guix_cv_current_localstatedir], [dnl Call 'dirname' because (guix config) appends "/guix" to LOCALSTATEDIR. guix_cv_current_localstatedir="`"$GUILE" \ -c '(use-modules (guix config)) (when (string=? %store-directory "'$storedir'") (display (dirname %state-directory)))' \ 2>/dev/null`" if test "x$guix_cv_current_localstatedir" = "x"; then guix_cv_current_localstatedir=none fi])]) dnl GUIX_CHECK_LOCALSTATEDIR dnl dnl Check that the LOCALSTATEDIR value is consistent with that of the existing dnl Guix installation, if any. Error out or warn if they do not match. AC_DEFUN([GUIX_CHECK_LOCALSTATEDIR], [ AC_REQUIRE([GUIX_CURRENT_LOCALSTATEDIR]) if test "x$guix_cv_current_localstatedir" != "xnone"; then if test "$guix_cv_current_localstatedir" != "$guix_localstatedir"; then case "$localstatedir" in NONE|\${prefix}*) # User kept the default value---i.e., did not pass '--localstatedir'. AC_MSG_ERROR([chosen localstatedir '$guix_localstatedir' does not match \ that of the existing installation '$guix_cv_current_localstatedir' Installing may corrupt $storedir! Use './configure --localstatedir=$guix_cv_current_localstatedir'.]) ;; *) # User passed an explicit '--localstatedir'. Assume they know what # they're doing. AC_MSG_WARN([chosen localstatedir '$guix_localstatedir' does not match \ that of the existing installation '$guix_cv_current_localstatedir']) AC_MSG_WARN([installing may corrupt $storedir!]) ;; esac fi fi]) dnl GUIX_CHANNEL_METADATA dnl dnl Provide the channel metadata for this build. This allows 'guix describe' dnl to return meaningful data, as it would for a 'guix pull'-provided 'guix'. dnl The default URL and introduction are taken from (guix channels). AC_DEFUN([GUIX_CHANNEL_METADATA], [ AC_ARG_WITH([channel-url], [AS_HELP_STRING([--with-channel-url=URL], [assert that this is built from the Git repository at URL])], [guix_channel_url="\"$withval\""], [guix_channel_url="\"https://git.savannah.gnu.org/git/guix.git\""]) AC_ARG_WITH([channel-commit], [AS_HELP_STRING([--with-channel-commit=COMMIT], [assert that this is built from COMMIT])], [guix_channel_commit="\"$withval\""], [guix_channel_commit="#f"]) AC_ARG_WITH([channel-introduction], [AS_HELP_STRING([--with-channel-introduction=COMMIT:FINGERPRINT], [specify COMMIT and FINGERPRINT as the introduction of this channel])], [guix_channel_introduction="'(\"`echo $withval | cut -f1 -d:`\" \"`echo $withval | cut -f2 -d:`\")"], [guix_channel_introduction="'(\"9edb3f66fd807b096b48283debdcddccfea34bad\" . \"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA\")"]) GUIX_CHANNEL_URL="$guix_channel_url" GUIX_CHANNEL_COMMIT="$guix_channel_commit" GUIX_CHANNEL_INTRODUCTION="$guix_channel_introduction" AC_SUBST([GUIX_CHANNEL_URL]) AC_SUBST([GUIX_CHANNEL_COMMIT]) AC_SUBST([GUIX_CHANNEL_INTRODUCTION]) ])