diff --git a/pkgs/by-name/an/antimicrox/package.nix b/pkgs/by-name/an/antimicrox/package.nix
index 207eb187851b..dfbd5289ba25 100644
--- a/pkgs/by-name/an/antimicrox/package.nix
+++ b/pkgs/by-name/an/antimicrox/package.nix
@@ -12,14 +12,14 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "antimicrox";
   version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "AntiMicroX";
-    repo = pname;
-    rev = version;
+    repo = "antimicrox";
+    rev = finalAttrs.version;
     sha256 = "sha256-ZIHhgyOpabWkdFZoha/Hj/1d8/b6qVolE6dn0xAFZVw=";
   };
 
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     udevCheckHook
     libsForQt5.wrapQtAppsHook
   ];
+
   buildInputs = [
     SDL2
     libsForQt5.qttools
@@ -46,10 +47,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     maintainers = [ ];
     license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux;
     mainProgram = "antimicrox";
   };
-}
+})
diff --git a/pkgs/by-name/ma/makehuman/package.nix b/pkgs/by-name/ma/makehuman/package.nix
index e5a56d273542..103f021ef60b 100644
--- a/pkgs/by-name/ma/makehuman/package.nix
+++ b/pkgs/by-name/ma/makehuman/package.nix
@@ -15,27 +15,27 @@ let
   ];
   python = python3.withPackages (pkgs: pydeps);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "makehuman";
   version = "1.3.0";
 
   source = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4=";
-    name = "${pname}-source";
+    name = "makehuman-source";
   };
 
   assets = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman-assets";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Jd2A0PAHVdFMnDLq4Mu5wsK/E6A4QpKjUyv66ix1Gbo=";
-    name = "${pname}-assets-source";
+    name = "makehuman-assets-source";
   };
 
-  srcs = [
+  srcs = with finalAttrs; [
     source
     assets
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = pydeps;
 
-  finalSource = "${pname}-final";
+  finalSource = "makehuman-final";
 
   postUnpack = ''
     mkdir -p $finalSource
@@ -108,4 +108,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ elisesouche ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/qm/qmediathekview/package.nix b/pkgs/by-name/qm/qmediathekview/package.nix
index e83a58bf02d1..e23be092fe02 100644
--- a/pkgs/by-name/qm/qmediathekview/package.nix
+++ b/pkgs/by-name/qm/qmediathekview/package.nix
@@ -8,14 +8,14 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "QMediathekView";
   version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "adamreichold";
     repo = "QMediathekView";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";
   };
 
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Alternative Qt-based front-end for the database maintained by the MediathekView project";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ dotlambda ];
     broken = stdenv.hostPlatform.isAarch64;
     mainProgram = "QMediathekView";
   };
-}
+})
diff --git a/pkgs/by-name/qs/qsudo/package.nix b/pkgs/by-name/qs/qsudo/package.nix
index 4fd3e778845b..8664489fd033 100644
--- a/pkgs/by-name/qs/qsudo/package.nix
+++ b/pkgs/by-name/qs/qsudo/package.nix
@@ -6,18 +6,18 @@
   sudo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsudo";
   version = "2020.03.27";
 
   src = fetchFromGitHub {
     owner = "project-trident";
     repo = "qsudo";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl";
   };
 
-  sourceRoot = "${src.name}/src-qt5";
+  sourceRoot = "${finalAttrs.src.name}/src-qt5";
 
   nativeBuildInputs = [
     libsForQt5.qmake
@@ -41,4 +41,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
-}
+})
diff --git a/pkgs/by-name/qt/qtemu/package.nix b/pkgs/by-name/qt/qtemu/package.nix
index 183144ae0bd4..8d6abd65e517 100644
--- a/pkgs/by-name/qt/qtemu/package.nix
+++ b/pkgs/by-name/qt/qtemu/package.nix
@@ -7,14 +7,14 @@
   qemu,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtemu";
   version = "2.1";
 
   src = fetchFromGitLab {
     owner = "qtemu";
     repo = "gui";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "1555178mkfw0gwmw8bsxmg4339j2ifp0yb4b2f39nxh9hwshg07j";
   };
 
@@ -51,4 +51,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ romildo ];
     mainProgram = "qtemu";
   };
-}
+})