tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part)

This commit is contained in:
Jan Malakhovski
2018-04-25 04:18:46 +00:00
parent f07f0c6009
commit 7438083a4d
135 changed files with 326 additions and 52 deletions
+20 -4
View File
@@ -36,9 +36,7 @@ let
substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
'';
# use 'if c then x else null' to avoid rebuilding
# patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
patches = if stdenv.hostPlatform.isMusl then [
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
@@ -55,7 +53,11 @@ let
sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";
})
# (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
] else null;
];
# Set to `true` after the next FIXME gets fixed or this gets some
# common derivation infra. Too much copy-paste to fix one by one.
doCheck = false;
# FIXME: convert these to a single multiple-outputs package?
@@ -99,6 +101,8 @@ let
mv $out/lib/python* $python/lib/
'';
inherit doCheck;
meta = apparmor-meta "library";
};
@@ -131,6 +135,8 @@ let
done
'';
inherit doCheck;
meta = apparmor-meta "user-land utilities";
};
@@ -154,6 +160,8 @@ let
makeFlags = ''LANGS= USE_SYSTEM=1'';
installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin'';
inherit doCheck;
meta = apparmor-meta "binary user-land utilities";
};
@@ -177,6 +185,8 @@ let
makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include'';
installFlags = ''DESTDIR=$(out) DISTRO=unknown'';
inherit doCheck;
meta = apparmor-meta "rule parser";
};
@@ -192,6 +202,8 @@ let
makeFlags = ''USE_SYSTEM=1'';
installFlags = ''DESTDIR=$(out)'';
inherit doCheck;
meta = apparmor-meta "PAM service";
};
@@ -204,6 +216,8 @@ let
postPatch = "cd ./profiles";
installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles'';
inherit doCheck;
meta = apparmor-meta "profiles";
};
@@ -218,6 +232,8 @@ let
cp -R ./kernel-patches/* "$out"
'';
inherit doCheck;
meta = apparmor-meta "kernel patches";
};