diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
| commit | 9875bbae75231f395ab020fbef6cbae698cc75c5 (patch) | |
| tree | eabae7448bcbba0d55420a068f5f55728e1736dc /pkgs/applications/virtualization | |
| parent | 320f79365d41aef687a07b50c725926932c9372b (diff) | |
| parent | 73dc3fc400141176138c95ea9c3f28750b2608e6 (diff) | |
| download | nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.gz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.bz2 nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.lz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.xz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.zst nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/OVMF/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/tini/default.nix | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 310d41df36da..19ba8ced4973 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -57,6 +57,6 @@ edk2.mkDerivation projectDscPath { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 551f134478ba..3b9b76c03ee0 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -28,7 +28,16 @@ let ] ++ extraPackages); in runCommand podman.name { - inherit (podman) name pname version meta outputs; + name = "${podman.pname}-wrapper-${podman.version}"; + inherit (podman) pname version; + + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index e3e6bae6cfe8..db3fb1c96eb3 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.19.0"; pname = "tini"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; |