diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-02-10 12:01:48 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2020-02-10 12:01:48 +0800 |
commit | ee027c128beaa78c3e143f1422bb3b1d2ba758e8 (patch) | |
tree | 52787227cbdf3080884d76aec8cbe4f9cdb3807f /pkgs/applications/virtualization/crun | |
parent | 8130f3c1c2bb0e533b5e150c39911d6e61dcecc2 (diff) |
crun: run tests and show the proper version number
Diffstat (limited to 'pkgs/applications/virtualization/crun')
-rw-r--r-- | pkgs/applications/virtualization/crun/default.nix | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index f976ede79c46..224bee784cfa 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -1,6 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig -, libcap, libseccomp, python3, systemd, yajl }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, go-md2man +, pkgconfig +, libcap +, libseccomp +, python3 +, systemd +, yajl +}: +let + # these tests require additional permissions + disabledTests = [ + "test_capabilities.py" + "test_cwd.py" + "test_detach.py" + "test_exec.py" + "test_hooks.py" + "test_hostname.py" + "test_paths.py" + "test_pid.py" + "test_pid_file.py" + "test_preserve_fds.py" + "test_start.py" + "test_uid_gid.py" + "test_update.py" + "tests_libcrun_utils" + ]; + +in stdenv.mkDerivation rec { pname = "crun"; version = "0.12.1"; @@ -19,16 +49,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = '' - cat > git-version.h <<EOF - #ifndef GIT_VERSION - # define GIT_VERSION "nixpkgs-${version}" - #endif - EOF + # we need this before autoreconfHook does its thing in order to initialize + # config.h with the correct values + postPatch = '' + echo ${version} > .tarball-version + echo '#define GIT_VERSION "${src.rev}"' > git-version.h + + ${lib.concatMapStringsSep "\n" (e: + "substituteInPlace Makefile.am --replace 'tests/${e}' ''" + ) disabledTests} ''; - # the tests require additional permissions - doCheck = false; + doCheck = true; meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; |