diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index 26778014e84f..4ec271a6fe3a 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -12,29 +12,29 @@
   mesa,
 }:
 
-let
-  avogadroI18N = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "avogadro-i18n";
-    tag = "1.103.0";
-    hash = "sha256-gdr0Ed0UWjQB0LQq+6RvlAb8ZNFQAjV9mrgFLePG+CM=";
-  };
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "avogadro2";
-  version = "1.103.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
     rev = finalAttrs.version;
-    hash = "sha256-nmvK3R966Xv2Xs5wXDh/8itIZLIRqbXHFe8dffFiI+s=";
+    hash = "sha256-+/NZwLRrbrfrQqxLqgiqZk6324BGoN+qRfOq7G+UIBE=";
   };
 
-  postUnpack = ''
-    cp -r ${avogadroI18N} avogadro-i18n
-  '';
+  postUnpack =
+    let
+      avogadroI18N = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "avogadro-i18n";
+        tag = finalAttrs.version;
+        hash = "sha256-5eiOFJ5tbS+HFbnLbc6sjk62BvXDMQYpPsB4xFpVWXM=";
+      };
+    in
+    ''
+      cp -r ${avogadroI18N} avogadro-i18n
+    '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index 0ac82bdacfb7..476fa6e19eff 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -23,44 +23,45 @@ let
       numpy
     ]
   );
-
-  # Pure data repositories
-  moleculesRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "molecules";
-    tag = "1.103.0";
-    hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
-  };
-  crystalsRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "crystals";
-    tag = "1.103.0";
-    hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
-  };
-  fragmentsRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "fragments";
-    tag = "1.103.0";
-    hash = "sha256-jH8k+qPlyU3Tset63uxrDlMFLdcWh8JhJoe5sl1pJ2E=";
-  };
-
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "avogadrolibs";
-  version = "1.103.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadrolibs";
     tag = finalAttrs.version;
-    hash = "sha256-2SuSNaZnY3LXcUuGboc8ZRCCeoClENoYtWmNNahdor4=";
+    hash = "sha256-Un1TSXFucCFmHq8DoWQS7RaNgtXiD2JcXGueavugU64=";
   };
 
-  postUnpack = ''
-    cp -r ${moleculesRepo} molecules
-    cp -r ${crystalsRepo} crystals
-    cp -r ${fragmentsRepo} fragments
-  '';
+  postUnpack =
+    let
+      # Pure data repositories
+      moleculesRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "molecules";
+        tag = finalAttrs.version;
+        hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
+      };
+      crystalsRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "crystals";
+        tag = finalAttrs.version;
+        hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
+      };
+      fragmentsRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "fragments";
+        tag = finalAttrs.version;
+        hash = "sha256-OLLcQX3a9j9rEJtBziEU4fCZB2DiDDzql2mr2KfSp70=";
+      };
+    in
+    ''
+      cp -r ${moleculesRepo} molecules
+      cp -r ${crystalsRepo} crystals
+      cp -r ${fragmentsRepo} fragments
+    '';
 
   nativeBuildInputs = [
     cmake