Merge pull request #135004 from Stunkymonkey/vm-phases

vm: deprecate phases
This commit is contained in:
davidak 2021-08-26 02:24:23 +02:00 committed by GitHub
commit 6f42a23a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -494,7 +494,9 @@ rec {
tarball must contain an RPM specfile. */
buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({
phases = "prepareImagePhase sysInfoPhase buildPhase installPhase";
prePhases = [ prepareImagePhase sysInfoPhase ];
dontUnpack = true;
dontConfigure = true;
outDir = "rpms/${attrs.diskImage.name}";

View File

@ -1,4 +1,4 @@
with import ../../.. {};
with import ../../.. { };
with vmTools;
{
@ -30,7 +30,7 @@ with vmTools;
src = patchelf.src;
diskImage = diskImages.ubuntu1204i386;
memSize = 512;
phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";
prePhases = [ sysInfoPhase ];
sysInfoPhase = ''
dpkg-query --list
'';