diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-07 21:31:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-07 21:31:17 +0100 |
commit | d53dfa2dbdf9c26b754e2d98f333499a180405b3 (patch) | |
tree | 191548214817b3e36846386e201ffb7e73126f26 /pkgs/applications/virtualization | |
parent | fbdf78236a346f57f716fb66ed62e1993260c9e5 (diff) | |
parent | b52ab3b712cc44b5eb88557ad2ca206dcd10af20 (diff) | |
download | nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar.gz nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar.bz2 nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar.lz nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar.xz nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.tar.zst nixpkgs-d53dfa2dbdf9c26b754e2d98f333499a180405b3.zip |
Merge pull request #144983 from Stunkymonkey/application-pname-version-2
Diffstat (limited to 'pkgs/applications/virtualization')
4 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index cf6395c8a53..7b9dc2de485 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit }: -stdenv.mkDerivation { - name = "win-pvdrivers-git-20150701"; - version = "20150701"; +stdenv.mkDerivation { + pname = "win-pvdrivers"; + version = "unstable-2015-07-01"; src = fetchgit { url = "https://github.com/ts468/win-pvdrivers"; @@ -12,13 +12,13 @@ stdenv.mkDerivation { buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]); installPhase = '' mkdir -p $out cp -r x86 $out/. cp -r amd64 $out/. - ''; + ''; meta = with lib; { description = "Xen Subproject: Windows PV Driver"; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 7c1eb0055a3..a4cd8dacc44 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, p7zip }: -stdenv.mkDerivation { - name = "win-qemu-0.1.105-1"; +stdenv.mkDerivation rec { + pname = "win-qemu"; version = "0.1.105-1"; dontUnpack = true; src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso"; + url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; }; buildPhase = '' ${p7zip}/bin/7z x $src - ''; + ''; installPhase = let @@ -23,10 +23,10 @@ stdenv.mkDerivation { mkdir -p $out/${arch}/qemuagent cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; + ''; copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); + (copy "amd64" "w8.1") + (copy "x86" "w8.1"); meta = with lib; { description = "Windows QEMU Drivers"; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index e9ad3b86338..ef8ec062e4d 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -12,8 +12,8 @@ let }; in -stdenv.mkDerivation { - name = "gplpv-0.11.0.373"; +stdenv.mkDerivation { + pname = "gplpv"; version = "0.11.0.373"; dontUnpack = true; @@ -23,13 +23,13 @@ stdenv.mkDerivation { (cd x86; ${p7zip}/bin/7z e ${src_x86}) mkdir -p amd64 (cd amd64; ${p7zip}/bin/7z e ${src_amd64}) - ''; + ''; installPhase = '' mkdir -p $out/x86 $out/amd64 cp x86/* $out/x86/. cp amd64/* $out/amd64/. - ''; + ''; meta = with lib; { description = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation { Windows to be para-virtualized. The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. - ''; + ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8ac00d1f8e1..c7a3620d644 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { - name = "qboot-20200423"; + pname = "qboot"; + version = "unstable-2020-04-23"; src = fetchFromGitHub { owner = "bonzini"; @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } |