diff --git a/pkgs/by-name/ar/ardopc/package.nix b/pkgs/by-name/ar/ardopc/package.nix
index 1ca0c08e02ae..82121c5e107a 100644
--- a/pkgs/by-name/ar/ardopc/package.nix
+++ b/pkgs/by-name/ar/ardopc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hamarituc";
     repo = "ardop";
-    rev = "20210828";
+    tag = "20210828";
     hash = "sha256-OUw9spFTsQLnsXksbfl3wD2NyY40JTyvlvONEIeZyWo=";
   };
 
diff --git a/pkgs/by-name/co/colormake/package.nix b/pkgs/by-name/co/colormake/package.nix
index 6d897f5de8fc..df7d76447ad8 100644
--- a/pkgs/by-name/co/colormake/package.nix
+++ b/pkgs/by-name/co/colormake/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pagekite";
     repo = "Colormake";
-    rev = "66544f40d";
+    rev = "66544f40d4626aace137c6a502b3c70b56c770c1";
     sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7";
   };
 
diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index fb32c80736b6..38d833a6d5e0 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       fetchFromGitHub {
         owner = "clibs";
         repo = "cmocka";
-        rev = "f5e2cd7";
+        rev = "f5e2cd77c88d9f792562888d2b70c5a396bfbf7a";
         hash = "sha256-Oq0nFsZhl8IF7kQN/LgUq8VBy+P7gO98ep/siy5A7Js=";
       }
     } dependencies/.cache/cmocka
diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix
index d36607d76249..a356f595383f 100644
--- a/pkgs/by-name/cu/cups-zj-58/package.nix
+++ b/pkgs/by-name/cu/cups-zj-58/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "klirichek";
     repo = "zj-58";
-    rev = "e4212cd";
+    rev = "e4212cd702113a4bd4d7013744291c9f60bc5273";
     sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
   };
 
diff --git a/pkgs/by-name/de/dec-decode/package.nix b/pkgs/by-name/de/dec-decode/package.nix
index 5f853b3ba6c6..8200c5d304bb 100644
--- a/pkgs/by-name/de/dec-decode/package.nix
+++ b/pkgs/by-name/de/dec-decode/package.nix
@@ -11,7 +11,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "sammiq";
     repo = "dec-decode";
-    rev = "6ee103c";
+    rev = "6ee103cfaa9365f930da65b13f2e296c4e1ef8c3";
     hash = "sha256-vOYKVl00oaXwp77pRLqUPnXQT5QuJfqnGGkQVBMq5W0=";
   };
 
diff --git a/pkgs/by-name/em/emojipick/package.nix b/pkgs/by-name/em/emojipick/package.nix
index c9f4b5bf1668..c6f551213225 100644
--- a/pkgs/by-name/em/emojipick/package.nix
+++ b/pkgs/by-name/em/emojipick/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "thingsiplay";
     repo = "emojipick";
-    rev = "20210127";
+    tag = "20210127";
     sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp";
   };
 
diff --git a/pkgs/by-name/if/ifdnfc/package.nix b/pkgs/by-name/if/ifdnfc/package.nix
index e8e6ab3cffd1..a06e65f67f19 100644
--- a/pkgs/by-name/if/ifdnfc/package.nix
+++ b/pkgs/by-name/if/ifdnfc/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "nfc-tools";
     repo = "ifdnfc";
-    rev = "0e48e8e";
+    rev = "0e48e8e107dc42f68fb472bb06d257503ad45b1d";
     sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/liberal-crime-squad/package.nix b/pkgs/by-name/li/liberal-crime-squad/package.nix
index 4bcbc3083f75..48ed43a65862 100644
--- a/pkgs/by-name/li/liberal-crime-squad/package.nix
+++ b/pkgs/by-name/li/liberal-crime-squad/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Kamal-Sadek";
     repo = "Liberal-Crime-Squad";
-    rev = "2ace84e";
+    rev = "2ace84ebe4b65b9d4ef67430d5419d57d340f055";
     sha256 = "0mcldn8ivlfyjfx22ygzcbbw3bzl0j6vi3g6jyj8jmcrni61mgmb";
   };
 
diff --git a/pkgs/by-name/ls/lssecret/package.nix b/pkgs/by-name/ls/lssecret/package.nix
index 76097c930bad..c161aff448a8 100644
--- a/pkgs/by-name/ls/lssecret/package.nix
+++ b/pkgs/by-name/ls/lssecret/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitLab {
     owner = "GrantMoyer";
     repo = "lssecret";
-    rev = "20fd771a";
+    rev = "20fd771a678a241abbb57152e3c2d9a8eee353cb";
     hash = "sha256-yU70WZj4EC/sFJxyq2SQ0YQ6RCQHYiW/aQiYWo7+ujk=";
   };
 
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index 3f597590465c..3e63afa83d0f 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -56,7 +56,7 @@ let
     src = fetchFromGitHub {
       owner = "qcscine";
       repo = "nevpt2";
-      rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake
+      rev = "e1484fd4901ae93ab0188bde417cf5dc440a8a3b"; # Must match tag in cmake/custom/nevpt2.cmake
       hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0=";
     };
     patches = [ ./nevpt2.patch ];
diff --git a/pkgs/by-name/pa/pax-britannica/package.nix b/pkgs/by-name/pa/pax-britannica/package.nix
index 468d2fb5ed6b..510a96269f10 100644
--- a/pkgs/by-name/pa/pax-britannica/package.nix
+++ b/pkgs/by-name/pa/pax-britannica/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     domain = "salsa.debian.org";
     owner = "games-team";
     repo = "pax-britannica";
-    rev = "00ccbac5";
+    rev = "00ccbac55fe6ff1217e0870d69ea403b05292c53";
     hash = "sha256-j69di+3P+vaFzv8Zke1MdABMkLtknTNvlfPk1YVUfmU=";
   };
 
diff --git a/pkgs/by-name/pg/pgpkeyserver-lite/package.nix b/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
index f15cb0c9b29e..a02f44cd6c93 100644
--- a/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
+++ b/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mattrude";
     repo = "pgpkeyserver-lite";
-    rev = "a038cb7";
+    rev = "a038cb79b927c99bf7da62f20d2c6a2f20374339";
     sha256 = "12pn92pcpv38b2gmamppn9yzdn7x52pgxnzpal22gqsxwimhs2rx";
   };
 
diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index 7617b7ce877b..357ffecc6c53 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -31,7 +31,7 @@ let
       src = fetchFromGitHub {
         owner = "OpenSmalltalk";
         repo = "opensmalltalk-vm";
-        rev = "202206021410";
+        tag = "202206021410";
         hash = "sha256-QqElPiJuqD5svFjWrLz1zL0Tf+pHxQ2fPvkVRn2lyBI=";
       };
     in
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
index a9a5b5153fbd..f1d47ef83cb8 100644
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ b/pkgs/development/python-modules/worldengine/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src-data = fetchFromGitHub {
     owner = "Mindwerks";
     repo = "worldengine-data";
-    rev = "029051e";
+    rev = "029051e707f4702cb2af1a23b8222cca7dc88930";
     sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm";
   };
 
diff --git a/pkgs/os-specific/linux/xpad-noone/default.nix b/pkgs/os-specific/linux/xpad-noone/default.nix
index b82955345ddc..f96e1148cd73 100644
--- a/pkgs/os-specific/linux/xpad-noone/default.nix
+++ b/pkgs/os-specific/linux/xpad-noone/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttr: {
   src = fetchFromGitHub {
     owner = "medusalix";
     repo = finalAttr.pname;
-    rev = "c3d1610";
+    tag = "c3d1610";
     hash = "sha256-jDRyvbU9GsnM1ARTuwnoD7ZXlfBxne13UpSKRo7HHSY=";
   };
 
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 23dd1a0f906e..f0993d4d0766 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -156,7 +156,7 @@ in
       src = fetchFromGitHub {
         owner = "HaxeFoundation";
         repo = "hxnodejs";
-        rev = "cf80c6a";
+        rev = "cf80c6a077e705d39f752418e95555b346f4d9b2";
         sha256 = "0mdiacr5b2m8jrlgyd2d3vp1fha69lcfb67x4ix7l7zfi8g460gs";
       };
       installPhase = installLibHaxe { inherit libname version; };