about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt2023-11-06 23:43:02 +0200
committerGitHub2023-11-06 23:43:02 +0200
commit61a70ae22d3cf4ed3ad5229e7f4b0804c63ac104 (patch)
tree3afae65088759c7a47620424ef23211f69dcb0ce /pkgs
parent87ccd64effb536ada1b96a49a5452c9eb9aa9b2c (diff)
parent58d3a7b8708155dd753d72b3a8b8d17f0c8600cf (diff)
Merge pull request #265547 from numinit/update-ovftool
ovftool: 4.5.0 -> 4.6.2 (4.6.0 on i686-linux)
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/virtualization/ovftool/default.nix22
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix
index 5f501647783e..5cc8fb01b41b 100644
--- a/pkgs/tools/virtualization/ovftool/default.nix
+++ b/pkgs/tools/virtualization/ovftool/default.nix
@@ -4,7 +4,8 @@
 }:
 
 let
-  version = "4.5.0-20459872";
+  version = "4.6.2-22220919";
+  version_i686 = "4.6.0-21452615";
 
   ovftoolZipUnpackPhase = ''
     runHook preUnpack
@@ -23,15 +24,15 @@ let
     baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public";
   in {
     "i686-linux" = rec {
-      filename = "VMware-ovftool-${version}-lin.i386.zip";
-      url = "${baseUrl}/b70b2ad5-861a-4c11-b081-e541586bf934/57109c63-6b80-4ced-95f2-1b7255200a36/${filename}";
-      sha256 = "11zs5dm4gmssm94s501p66l4s8v9p7prrd87cfa903mwmyp0ihnx";
+      name = "VMware-ovftool-${version_i686}-lin.i386.zip";
+      url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}";
+      hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0=";
       unpackPhase = ovftoolZipUnpackPhase;
     };
     "x86_64-linux" = rec {
-      filename = "VMware-ovftool-${version}-lin.x86_64.zip";
-      url = "${baseUrl}/f87355ff-f7a9-4532-b312-0be218a92eac/b2916af6-9f4f-4112-adac-49d1d6c81f63/${filename}";
-      sha256 = "1fkm18yfkkm92m7ccl6b4nxy5lagwwldq56b567091a5sgad38zw";
+      name = "VMware-ovftool-${version}-lin.x86_64.zip";
+      url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}";
+      hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY=";
       unpackPhase = ovftoolZipUnpackPhase;
     };
   };
@@ -44,9 +45,7 @@ let
                     ovftoolBundles.${system}
                   else
                     fetchurl {
-                      name = ovftoolSystem.filename;
-                      url = ovftoolSystem.url;
-                      sha256 = ovftoolSystem.sha256;
+                      inherit (ovftoolSystem) name url hash;
                     };
 in
 stdenv.mkDerivation rec {
@@ -55,9 +54,6 @@ stdenv.mkDerivation rec {
 
   src = ovftoolSource;
 
-  # Maintainers: try downloading a NixOS OVA and run the following to test:
-  # `./result/bin/ovftool https://channels.nixos.org/nixos-unstable/latest-nixos-x86_64-linux.ova nixos.ovf`
-  # Some dependencies are not loaded until operations actually occur!
   buildInputs = [
     glibc
     libxcrypt-legacy