diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index cd1a36075ec0..31e5a3a58d9a 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -11,7 +11,7 @@ buildOctavePackage rec {
 
   src = fetchFromBitbucket {
     owner = "jgpallero";
-    repo = pname;
+    repo = "octproj";
     rev = "OctPROJ-${version}";
     sha256 = "sha256-d/Zf172Etj+GA0cnGsQaKMjOmirE7Hwyj4UECpg7QFM=";
   };
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index fa1470213238..07c78d872452 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -11,15 +11,15 @@ python3.pkgs.buildPythonApplication rec {
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "mikr";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";
+    repo = "whatstyle";
+    tag = "v${version}";
+    hash = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";
   };
 
   # Fix references to previous version, to avoid confusion:
   postPatch = ''
-    substituteInPlace setup.py --replace 0.1.6 ${version}
-    substituteInPlace ${pname}.py --replace 0.1.6 ${version}
+    substituteInPlace setup.py --replace-fail 0.1.9 ${version}
+    substituteInPlace whatstyle.py --replace-fail 0.1.9 ${version}
   '';
 
   nativeCheckInputs = [
diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix
index c48010ef21d6..9d811996d625 100644
--- a/pkgs/development/tools/prospector/default.nix
+++ b/pkgs/development/tools/prospector/default.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "prospector";
     tag = "v${version}";
     hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM=";
   };
diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix
index a0f17481a92c..243bae936cf9 100644
--- a/pkgs/os-specific/linux/cpupower-gui/default.nix
+++ b/pkgs/os-specific/linux/cpupower-gui/default.nix
@@ -18,7 +18,6 @@
   pkg-config,
   pygobject3,
   pyxdg,
-  systemd,
   wrapGAppsHook3,
 }:
 
@@ -31,8 +30,8 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "vagnum08";
-    repo = pname;
-    rev = "v${version}";
+    repo = "cpupower-gui";
+    tag = "v${version}";
     sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";
   };
 
diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix
index 3db979bee6d9..e269916674d3 100644
--- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix
+++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix
@@ -4,19 +4,18 @@
   fetchFromGitHub,
   kernel,
   kernelModuleMakeFlags,
-  kmod,
 }:
 
 let
   kerneldir = "lib/modules/${kernel.modDirVersion}";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gcadapter-oc-kmod";
   version = "unstable-2021-12-11";
 
   src = fetchFromGitHub {
     owner = "HannesMann";
-    repo = pname;
+    repo = "gcadapter-oc-kmod";
     rev = "d4ddf15deb74c51dbdfc814d481ef127c371f444";
     sha256 = "sha256-bHA1611rcO8/d48b1CHsiurEt3/n+5WErtHXAU7Eh1o=";
   };
diff --git a/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix b/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix
index 12296de0bf0b..f2e68888fa03 100644
--- a/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix
@@ -6,15 +6,15 @@
   sqlite,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mod_mbtiles";
   version = "unstable-2022-05-25";
 
   src = fetchFromGitHub {
     owner = "systemed";
-    repo = pname;
+    repo = "mod_mbtiles";
     rev = "f9d12a9581820630dd923c3c90aa8dcdcf65cb87";
-    sha256 = "sha256-wOoLSNLgh0YXHUFn7WfUkQXpyWsgCrVZlMg55rvi9q4=";
+    hash = "sha256-wOoLSNLgh0YXHUFn7WfUkQXpyWsgCrVZlMg55rvi9q4=";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index abe4144e0d0f..e92390f8c982 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   nodejs,
   lib,
   python3Packages,
@@ -18,7 +17,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "posativ";
-    repo = pname;
+    repo = "isso";
     tag = version;
     sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
   };
diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/servers/monitoring/prometheus/sachet.nix
index 168694f24e85..27384f4ac18e 100644
--- a/pkgs/servers/monitoring/prometheus/sachet.nix
+++ b/pkgs/servers/monitoring/prometheus/sachet.nix
@@ -10,8 +10,8 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "messagebird";
-    repo = pname;
-    rev = version;
+    repo = "sachet";
+    tag = version;
     hash = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ=";
   };
 
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index f2f059be025e..6bd614eaa089 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "Tautulli";
-    repo = pname;
+    repo = "Tautulli";
     tag = "v${version}";
     sha256 = "sha256-nqSqWRst+gx9aZ2Ko+/tKzpQX7wuU4Bn3vLR5F87aJA=";
   };
diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/shells/fish/plugins/bass.nix
index 4894e95c2b47..2749828cbafe 100644
--- a/pkgs/shells/fish/plugins/bass.nix
+++ b/pkgs/shells/fish/plugins/bass.nix
@@ -5,13 +5,13 @@
   python3,
 }:
 
-buildFishPlugin rec {
+buildFishPlugin {
   pname = "bass";
   version = "1.0-unstable-2021-02-18";
 
   src = fetchFromGitHub {
     owner = "edc";
-    repo = pname;
+    repo = "bass";
     rev = "2fd3d2157d5271ca3575b13daec975ca4c10577a";
     sha256 = "0mb01y1d0g8ilsr5m8a71j6xmqlyhf8w4xjf00wkk8k41cz3ypky";
   };
diff --git a/pkgs/shells/fish/plugins/fzf.nix b/pkgs/shells/fish/plugins/fzf.nix
index fccbc588c715..0edddc91f3f7 100644
--- a/pkgs/shells/fish/plugins/fzf.nix
+++ b/pkgs/shells/fish/plugins/fzf.nix
@@ -3,13 +3,13 @@
   buildFishPlugin,
   fetchFromGitHub,
 }:
-buildFishPlugin rec {
+buildFishPlugin {
   pname = "fzf";
   version = "0.16.6-unstable-2021-05-12";
 
   src = fetchFromGitHub {
     owner = "jethrokuan";
-    repo = pname;
+    repo = "fzf";
     rev = "479fa67d7439b23095e01b64987ae79a91a4e283";
     sha256 = "sha256-28QW/WTLckR4lEfHv6dSotwkAKpNJFCShxmKFGQQ1Ew=";
   };
diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
index 0a6b078aad78..a0a9761a1db4 100644
--- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
+++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
@@ -10,8 +10,8 @@ buildFishPlugin rec {
 
   src = fetchFromGitHub {
     owner = "z11i";
-    repo = pname;
-    rev = version;
+    repo = "github-copilot-cli.fish";
+    tag = version;
     hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg=";
   };
 
diff --git a/pkgs/shells/fish/plugins/pisces.nix b/pkgs/shells/fish/plugins/pisces.nix
index 0ddbe19c83b3..cd768233ae3b 100644
--- a/pkgs/shells/fish/plugins/pisces.nix
+++ b/pkgs/shells/fish/plugins/pisces.nix
@@ -10,9 +10,9 @@ buildFishPlugin rec {
 
   src = fetchFromGitHub {
     owner = "laughedelic";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw=";
+    repo = "pisces";
+    tag = "v${version}";
+    hash = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw=";
   };
 
   meta = {
diff --git a/pkgs/shells/fish/plugins/z.nix b/pkgs/shells/fish/plugins/z.nix
index e613a746cc14..63b37396bc7f 100644
--- a/pkgs/shells/fish/plugins/z.nix
+++ b/pkgs/shells/fish/plugins/z.nix
@@ -3,13 +3,13 @@
   buildFishPlugin,
   fetchFromGitHub,
 }:
-buildFishPlugin rec {
+buildFishPlugin {
   pname = "z";
   version = "0-unstable-2022-04-08";
 
   src = fetchFromGitHub {
     owner = "jethrokuan";
-    repo = pname;
+    repo = "z";
     rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
     sha256 = "sha256-+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
   };
diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix
index 4be8bdc21aee..f11bce479b4a 100644
--- a/pkgs/tools/misc/dialogbox/default.nix
+++ b/pkgs/tools/misc/dialogbox/default.nix
@@ -7,13 +7,13 @@
   qtbase,
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "dialogbox";
   version = "1.0+unstable=2020-11-16";
 
   src = fetchFromGitHub {
     owner = "martynets";
-    repo = pname;
+    repo = "dialogbox";
     rev = "6989740746f376becc989ab2698e77d14186a0f9";
     hash = "sha256-paTas3KbV4yZ0ePnrOH1S3bLLHDddFml1h6b6azK4RQ=";
   };
diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix
index 612a519517a8..4c5521b1d7aa 100644
--- a/pkgs/tools/misc/pandoc-eqnos/default.nix
+++ b/pkgs/tools/misc/pandoc-eqnos/default.nix
@@ -13,9 +13,9 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "tomduck";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
+    repo = "pandoc-eqnos";
+    tag = version;
+    hash = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix
index ab87b09f4264..f8202cd8f695 100644
--- a/pkgs/tools/misc/pandoc-tablenos/default.nix
+++ b/pkgs/tools/misc/pandoc-tablenos/default.nix
@@ -13,9 +13,9 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "tomduck";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
+    repo = "pandoc-tablenos";
+    tag = version;
+    hash = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/pass/extensions/file.nix b/pkgs/tools/security/pass/extensions/file.nix
index 1291ebeea5dd..1fbb73888069 100644
--- a/pkgs/tools/security/pass/extensions/file.nix
+++ b/pkgs/tools/security/pass/extensions/file.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pass-file";
   version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "dvogt23";
-    repo = pname;
-    rev = version;
+    repo = "pass-file";
+    tag = finalAttrs.version;
     hash = "sha256-18KvmcfLwelyk9RV/IMaj6O/nkQEQz84eUEB/mRaKE4=";
   };
 
@@ -24,4 +24,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ taranarmo ];
     platforms = lib.platforms.unix;
   };
-}
+})