krunvm: migrate to by-name, switch to finalAttrs, strictDeps, and structuredAttrs (#531432)
This commit is contained in:
+9
-6
@@ -7,29 +7,32 @@
|
||||
buildah,
|
||||
buildah-unwrapped,
|
||||
cargo,
|
||||
darwin,
|
||||
libiconv,
|
||||
libkrun,
|
||||
makeWrapper,
|
||||
rustc,
|
||||
sigtool,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "krunvm";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libkrun";
|
||||
repo = "krunvm";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-peOaPivQKOwioh5skPNFiA3ptHv9pSsnjpy43cms8O8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-MRcQ0Vnd3PJqE2q981JpXPjwMUKT4t+RcOvzWptK7PQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
@@ -37,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
asciidoctor
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
|
||||
|
||||
buildInputs = [
|
||||
libkrun
|
||||
@@ -77,4 +80,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = libkrun.meta.platforms;
|
||||
mainProgram = "krunvm";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -2360,10 +2360,6 @@ with pkgs;
|
||||
|
||||
keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
|
||||
|
||||
krunvm = callPackage ../applications/virtualization/krunvm {
|
||||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
limine-full = limine.override { enableAll = true; };
|
||||
|
||||
logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
|
||||
|
||||
Reference in New Issue
Block a user