diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 490a59ec141e..ede272ca7317 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems, strip-nondeterminism, stripJavaArchivesHook }:
+{ lib, stdenv, fetchFromGitHub, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems, strip-nondeterminism, stripJavaArchivesHook }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hdfview";
-  version = "3.3.1";
+  version = "3.3.2";
 
-  src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-${finalAttrs.version}/src/hdfview-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-WcGYceMOB8gCycJSW4KdApy2gIBgTnE/d0PxGZClUqg=";
+  src = fetchFromGitHub {
+    owner = "HDFGroup";
+    repo = "hdfview";
+    rev = "refs/tags/v${finalAttrs.version}";
+    sha256 = "sha256-aJHeknkF38qDH9l+vuzdKFZZTcs/XMjtlHuu/LTF124=";
   };
 
   patches = [
@@ -77,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "A visual tool for browsing and editing HDF4 and HDF5 files";
     license = lib.licenses.free; # BSD-like
     homepage = "https://www.hdfgroup.org/downloads/hdfview";
+    downloadPage = "https://github.com/HDFGroup/hdfview";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jiegec ];
     mainProgram = "HDFView";
diff --git a/pkgs/tools/misc/hdfview/disable-mac-signing.patch b/pkgs/tools/misc/hdfview/disable-mac-signing.patch
index d7d67f7ac608..f72c1c4c3928 100644
--- a/pkgs/tools/misc/hdfview/disable-mac-signing.patch
+++ b/pkgs/tools/misc/hdfview/disable-mac-signing.patch
@@ -1,8 +1,31 @@
-diff --git a/build.xml b/build.xml
-index 70ab3e2..9460321 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1802,13 +1802,6 @@
+diff --git i/build.xml w/build.xml
+index 3bbd89b..5834e7c 100644
+--- i/build.xml
++++ w/build.xml
+@@ -1607,14 +1607,6 @@
+ 
+     <!-- package args for fixed jpackage -->
+     <target name="createJXPackageMac" depends="createJPackageBase" if="${isXMac}">
+-        <!-- unlock keychain -->
+-        <exec executable="security" dir="${dist.dir}" failonerror="true">
+-            <arg value="unlock-keychain" />
+-            <arg value="-p" />
+-            <arg value="${pass.keychain_key}" />
+-            <arg value="${name.keychain_key}" />
+-        </exec>
+-
+         <echo> JXPackage the mac application</echo>
+         <exec executable="${java.home}/bin/jpackage">
+             <!-- Basic usage -->
+@@ -1680,7 +1672,6 @@
+             <arg value="dmg" />
+             <arg value="--icon" />
+             <arg value="${basedir}/package_files/macosx/HDFView.icns" />
+-            <arg value="--mac-sign" />
+             <arg value="--mac-package-identifier" />
+             <arg value="HDFView.hdfgroup.org" />
+             <arg value="--mac-package-name" />
+@@ -2054,13 +2045,6 @@
              description="Create the final package for distribution" />
  
      <target name="createJPackageMac" depends="createJPackageBase" if="${isAppMac}">
@@ -10,13 +33,13 @@ index 70ab3e2..9460321 100644
 -        <exec executable="security" dir="${dist.dir}" failonerror="true">
 -            <arg value="unlock-keychain" />
 -            <arg value="-p" />
--            <arg value="${login.keychain_key}" />
--            <arg value="login.keychain" />
+-            <arg value="${pass.keychain_key}" />
+-            <arg value="${name.keychain_key}" />
 -        </exec>
  
          <echo> Create the mac jpackage</echo>
          <exec executable="${java.home}/bin/jpackage">
-@@ -1864,7 +1857,6 @@
+@@ -2116,7 +2100,6 @@
              <arg value="app-image" />
              <arg value="--icon" />
              <arg value="${basedir}/package_files/macosx/HDFView.icns" />