diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-02-23 21:15:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-23 21:15:44 +0800 |
commit | e17dff11049665db53d2f7096f9f23ec224237ab (patch) | |
tree | 95f1f8824e06c156c4c5e1f8d6efe6f4c531799f /pkgs/applications/virtualization/crun | |
parent | 14fb155d3e33dc733b3ae09cbcf10da166abfb74 (diff) | |
parent | ee027c128beaa78c3e143f1422bb3b1d2ba758e8 (diff) |
Merge pull request #80004 from peterhoeg/f/crun
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 9eaf2d6c5c24..c82e29eb9a64 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.2.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"; |