diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix
index 6945721494f5..150cd1d3c079 100644
--- a/pkgs/by-name/as/as-tree/package.nix
+++ b/pkgs/by-name/as/as-tree/package.nix
@@ -12,16 +12,16 @@ rustPlatform.buildRustPackage {
     owner = "jez";
     repo = "as-tree";
     rev = "0036c20f66795774eb9cda3ccbae6ca1e1c19444";
-    sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
+    hash = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
   };
 
   cargoHash = "sha256-HTwzmfpp9HKBKvjYXUqVDv9GUHl+2K3LMBSy1+GfmNU=";
 
-  meta = with lib; {
+  meta = {
     description = "Print a list of paths as a tree of paths";
     homepage = "https://github.com/jez/as-tree";
-    license = with licenses; [ blueOak100 ];
-    maintainers = with maintainers; [ jshholland ];
+    license = with lib.licenses; [ blueOak100 ];
+    maintainers = with lib.maintainers; [ jshholland ];
     mainProgram = "as-tree";
   };
 }
diff --git a/pkgs/by-name/as/asap/package.nix b/pkgs/by-name/as/asap/package.nix
index df54e9102e28..5029244131eb 100644
--- a/pkgs/by-name/as/asap/package.nix
+++ b/pkgs/by-name/as/asap/package.nix
@@ -5,13 +5,13 @@
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asap";
   version = "6.0.3";
 
   src = fetchzip {
-    url = "mirror://sourceforge/project/asap/asap/${version}/asap-${version}.tar.gz";
-    sha256 = "sha256-a4RUtFue5wdoGUykLRb46s4+yR/I/7DhwE1SiWPRg8s=";
+    url = "mirror://sourceforge/project/asap/asap/${finalAttrs.version}/asap-${finalAttrs.version}.tar.gz";
+    hash = "sha256-a4RUtFue5wdoGUykLRb46s4+yR/I/7DhwE1SiWPRg8s=";
   };
 
   outputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     "install-lib"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://asap.sourceforge.net/";
     mainProgram = "asap-sdl";
     description = "Another Slight Atari Player";
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
       music (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) on modern computers and
       mobile devices.
     '';
-    maintainers = with maintainers; [ OPNA2608 ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/as/ascii-image-converter/package.nix b/pkgs/by-name/as/ascii-image-converter/package.nix
index a74990a9b548..e33dceccb3bf 100644
--- a/pkgs/by-name/as/ascii-image-converter/package.nix
+++ b/pkgs/by-name/as/ascii-image-converter/package.nix
@@ -11,17 +11,17 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TheZoraiz";
     repo = "ascii-image-converter";
-    rev = "v${version}";
-    sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
+    tag = "v${version}";
+    hash = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
   };
 
   vendorHash = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs=";
 
-  meta = with lib; {
+  meta = {
     description = "Convert images into ASCII art on the console";
     homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme";
-    license = licenses.asl20;
-    maintainers = [ maintainers.danth ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ danth ];
     mainProgram = "ascii-image-converter";
   };
 }
diff --git a/pkgs/by-name/as/asciidoctorj/package.nix b/pkgs/by-name/as/asciidoctorj/package.nix
index db2d8d46dbf3..bf3fb5d67603 100644
--- a/pkgs/by-name/as/asciidoctorj/package.nix
+++ b/pkgs/by-name/as/asciidoctorj/package.nix
@@ -6,13 +6,13 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asciidoctorj";
   version = "3.0.0";
 
   src = fetchzip {
-    url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "sha256-F4tmpdNS0PIoLpqV9gifJf2iQ/kX+cp3EssRyhzyOUw=";
+    url = "mirror://maven/org/asciidoctor/asciidoctorj/${finalAttrs.version}/asciidoctorj-${finalAttrs.version}-bin.zip";
+    hash = "sha256-F4tmpdNS0PIoLpqV9gifJf2iQ/kX+cp3EssRyhzyOUw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       --prefix JAVA_HOME : ${jdk}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Official library for running Asciidoctor on the JVM";
     longDescription = ''
       AsciidoctorJ is the official library for running Asciidoctor on the JVM.
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       languages.
     '';
     homepage = "https://asciidoctor.org/docs/asciidoctorj/";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ moaxcp ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ moaxcp ];
     mainProgram = "asciidoctorj";
   };
-}
+})
diff --git a/pkgs/by-name/as/asciigraph/package.nix b/pkgs/by-name/as/asciigraph/package.nix
index f70593abe5e5..a69f3c500a3a 100644
--- a/pkgs/by-name/as/asciigraph/package.nix
+++ b/pkgs/by-name/as/asciigraph/package.nix
@@ -11,8 +11,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guptarohit";
     repo = "asciigraph";
-    rev = "v${version}";
-    sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
+    tag = "v${version}";
+    hash = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
   };
 
   vendorHash = null;
@@ -22,11 +22,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/guptarohit/asciigraph";
     description = "Lightweight ASCII line graph ╭┈╯ command line app";
     mainProgram = "asciigraph";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mmahut ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mmahut ];
   };
 }
diff --git a/pkgs/by-name/as/asciiquarium/package.nix b/pkgs/by-name/as/asciiquarium/package.nix
index 54c4723e7cdf..8263b9d05094 100644
--- a/pkgs/by-name/as/asciiquarium/package.nix
+++ b/pkgs/by-name/as/asciiquarium/package.nix
@@ -6,15 +6,12 @@
   perlPackages,
 }:
 
-let
-  version = "1.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asciiquarium";
-  inherit version;
+  version = "1.1";
   src = fetchurl {
-    url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
-    sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";
+    url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${finalAttrs.version}.tar.gz";
+    hash = "sha256-GwjGYTUl516HVG9OiYSrOzPx6SIIAmjHSfF3fVbJ02E=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,15 +25,15 @@ stdenv.mkDerivation {
       --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Enjoy the mysteries of the sea from the safety of your own terminal";
     mainProgram = "asciiquarium";
     homepage = "https://robobunny.com/projects/asciiquarium/html/";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       sigmasquadron
       utdemir
     ];
   };
-}
+})
diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 1acbce85e93a..dc0160f61c38 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -46,15 +46,15 @@ let
     ${asdfReshimFile}
   '';
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asdf-vm";
   version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
-    rev = "v${version}";
-    sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
   };
 
   nativeBuildInputs = [
@@ -86,12 +86,12 @@ stdenv.mkDerivation rec {
       --bash completions/asdf.bash
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extendable version manager with support for Ruby, Node.js, Erlang & more";
     homepage = "https://asdf-vm.com/";
-    license = licenses.mit;
-    maintainers = [ maintainers.c4605 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ c4605 ];
     mainProgram = "asdf";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/as/aseq2json/package.nix b/pkgs/by-name/as/aseq2json/package.nix
index 57b19a87c5bd..d975ca8164ba 100644
--- a/pkgs/by-name/as/aseq2json/package.nix
+++ b/pkgs/by-name/as/aseq2json/package.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google";
     repo = "midi-dump-tools";
     rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a";
-    sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
+    hash = "sha256-LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
   };
-  sourceRoot = "${finalAttrs.src.name}/aseq2json";
+  sourceRoot = "source/aseq2json";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
     install -D --target-directory "$out/bin" aseq2json
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout";
     mainProgram = "aseq2json";
     homepage = "https://github.com/google/midi-dump-tools";
-    license = licenses.asl20;
-    maintainers = [ maintainers.queezle ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ queezle ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/as/asleap/package.nix b/pkgs/by-name/as/asleap/package.nix
index ac7d564a9b60..8c6697c33435 100644
--- a/pkgs/by-name/as/asleap/package.nix
+++ b/pkgs/by-name/as/asleap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     owner = "zackw";
     repo = "asleap";
     rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f";
-    sha256 = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8=";
+    hash = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/as/asmfmt/package.nix b/pkgs/by-name/as/asmfmt/package.nix
index 598ec7fd563d..ee2468cfca91 100644
--- a/pkgs/by-name/as/asmfmt/package.nix
+++ b/pkgs/by-name/as/asmfmt/package.nix
@@ -11,8 +11,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "klauspost";
     repo = "asmfmt";
-    rev = "v${version}";
-    sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
+    tag = "v${version}";
+    hash = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
   };
 
   vendorHash = null;
@@ -29,7 +29,7 @@ buildGoModule rec {
   # There are no tests.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Go assembler formatter";
     mainProgram = "asmfmt";
     longDescription = ''
@@ -37,8 +37,8 @@ buildGoModule rec {
       your Go code.
     '';
     homepage = "https://github.com/klauspost/asmfmt";
-    changelog = "https://github.com/klauspost/asmfmt/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kalbasit ];
+    changelog = "https://github.com/klauspost/asmfmt/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
 }
diff --git a/pkgs/by-name/as/asn1c/package.nix b/pkgs/by-name/as/asn1c/package.nix
index 61f45133bf8f..1072090c2112 100644
--- a/pkgs/by-name/as/asn1c/package.nix
+++ b/pkgs/by-name/as/asn1c/package.nix
@@ -5,13 +5,13 @@
   perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asn1c";
   version = "0.9.28";
 
   src = fetchurl {
-    url = "https://lionet.info/soft/asn1c-${version}.tar.gz";
-    sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
+    url = "https://lionet.info/soft/asn1c-${finalAttrs.version}.tar.gz";
+    hash = "sha256-gAdEC2R+8t2ftz2THDOsEXZOavskN9vmOLtOX8gjhrk=";
   };
 
   outputs = [
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://lionet.info/asn1c/compiler.html";
     description = "Open Source ASN.1 Compiler";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.numinit ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ numinit ];
   };
-}
+})
diff --git a/pkgs/by-name/as/aspino/package.nix b/pkgs/by-name/as/aspino/package.nix
index 3ed47f59f021..6a0ccf0a2c95 100644
--- a/pkgs/by-name/as/aspino/package.nix
+++ b/pkgs/by-name/as/aspino/package.nix
@@ -10,7 +10,7 @@
 let
   glucose' = fetchurl {
     url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
-    sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
+    hash = "sha256-jboqQX/Z8RcPG30UVHaI7hLJKpgOCwCeha7BpaSgBS8=";
   };
 in
 
@@ -51,11 +51,11 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
     homepage = "https://alviano.net/software/maxino/";
   };
 }
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index 69332a0a81bb..c5d31f1300cd 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -19,15 +19,15 @@
   server ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "assaultcube";
   version = "1.3.0.2";
 
   src = fetchFromGitHub {
     owner = "assaultcube";
     repo = "AC";
-    rev = "v${version}";
-    sha256 = "0qv339zw9q5q1y7bghca03gw7z4v89sl4lbr6h3b7siy08mcwiz9";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6UfOKgI+6rMGNHlRQnVCm/zD3wCKwbeOD7jgxH8aY2M=";
   };
 
   nativeBuildInputs = [
@@ -50,16 +50,16 @@ stdenv.mkDerivation rec {
     libvorbis
   ];
 
-  targets = (lib.optionalString server "server") + (lib.optionalString client " client");
   makeFlags = [
     "-C source/src"
     "CXX=${stdenv.cc.targetPrefix}c++"
-    targets
-  ];
+  ]
+  ++ lib.optionals server [ "server" ]
+  ++ lib.optionals client [ "client" ];
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
+      name = "assaultcube";
       desktopName = "AssaultCube";
       comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay.";
       genericName = "First-person shooter";
@@ -69,45 +69,41 @@ stdenv.mkDerivation rec {
         "Shooter"
       ];
       icon = "assaultcube";
-      exec = pname;
+      exec = "assaultcube";
     })
   ];
 
-  gamedatadir = "/share/games/${pname}";
-
   installPhase = ''
     runHook preInstall
 
-    bindir=$out/bin
+    mkdir -p $out/bin $out/share/games/assaultcube
 
-    mkdir -p $bindir $out/$gamedatadir
-
-    cp -r config packages $out/$gamedatadir
+    cp -r config packages $out/share/games/assaultcube
 
     if (test -e source/src/ac_client) then
-      cp source/src/ac_client $bindir
+      cp source/src/ac_client $out/bin
       mkdir -p $out/share/applications
       install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
       install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
 
-      makeWrapper $out/bin/ac_client $out/bin/${pname} \
-        --chdir "$out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
+      makeWrapper $out/bin/ac_client $out/bin/assaultcube \
+        --chdir "$out/share/games/assaultcube" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
     fi
 
     if (test -e source/src/ac_server) then
-      cp source/src/ac_server $bindir
-      makeWrapper $out/bin/ac_server $out/bin/${pname}-server \
-        --chdir "$out/$gamedatadir" --add-flags "-Cconfig/servercmdline.txt"
+      cp source/src/ac_server $out/bin
+      makeWrapper $out/bin/ac_server $out/bin/assaultcube-server \
+        --chdir "$out/share/games/assaultcube" --add-flags "-Cconfig/servercmdline.txt"
     fi
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";
     homepage = "https://assault.cubers.net";
-    platforms = platforms.linux; # should work on darwin with a little effort.
-    license = licenses.unfree;
-    maintainers = with maintainers; [ darkonion0 ];
+    platforms = lib.platforms.linux; # should work on darwin with a little effort.
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ darkonion0 ];
   };
-}
+})
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index c2f5eecd3ee5..8d7c9cc6db2e 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -15,8 +15,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "advanced-ssh-config";
     owner = "moul";
-    rev = "v${version}";
-    sha256 = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
+    tag = "v${version}";
+    hash = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
   };
 
   vendorHash = "sha256-L2Uo/jsMtxQClF1UDa7NIUbOm7BflvncNsjqGnCsPKo=";
diff --git a/pkgs/by-name/as/assign-lb-ip/package.nix b/pkgs/by-name/as/assign-lb-ip/package.nix
index b80fd5c5ce23..176e15568a26 100644
--- a/pkgs/by-name/as/assign-lb-ip/package.nix
+++ b/pkgs/by-name/as/assign-lb-ip/package.nix
@@ -11,17 +11,17 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nordix";
     repo = "assign-lb-ip";
-    rev = "v${version}";
-    sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
+    tag = "v${version}";
+    hash = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
   };
 
   vendorHash = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w=";
 
-  meta = with lib; {
+  meta = {
     description = "Assigns loadBalancerIP address to a Kubernetes service for testing purposes";
     mainProgram = "assign-lb-ip";
     homepage = "https://github.com/Nordix/assign-lb-ip";
-    license = licenses.asl20;
-    maintainers = [ maintainers.starcraft66 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ starcraft66 ];
   };
 }
diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix
index 71af59c5fea8..c50ccb7cd6a6 100644
--- a/pkgs/by-name/as/astc-encoder/package.nix
+++ b/pkgs/by-name/as/astc-encoder/package.nix
@@ -45,15 +45,15 @@ let
       (head isas);
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "astc-encoder";
   version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "ARM-software";
     repo = "astc-encoder";
-    rev = version;
-    sha256 = "sha256-15fX+3wzDoVzvQAhneeGajMsFXqSwmYtlsi3qrNFNus=";
+    tag = finalAttrs.version;
+    hash = "sha256-15fX+3wzDoVzvQAhneeGajMsFXqSwmYtlsi3qrNFNus=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -87,9 +87,9 @@ stdenv.mkDerivation rec {
       and HDR mode and can read various image formats. Run `astcenc
       -help` to see all the options.
     '';
-    platforms = platforms.unix;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dasisdormax ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dasisdormax ];
     broken = !stdenv.hostPlatform.is64bit;
   };
-}
+})
diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index a81ef23cca00..6c9af1bc9d09 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -6,15 +6,15 @@
   patchelf,
   asterisk,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asterisk-module-sccp";
   version = "4.3.5";
 
   src = fetchFromGitHub {
     owner = "chan-sccp";
     repo = "chan-sccp";
-    rev = "v${version}";
-    sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
   };
 
   nativeBuildInputs = [ patchelf ];
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$p:${lib.makeLibraryPath [ binutils-unwrapped ]}" "$p"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Replacement for the SCCP channel driver in Asterisk";
-    license = licenses.gpl1Only;
-    maintainers = with maintainers; [ das_j ];
+    license = lib.licenses.gpl1Only;
+    maintainers = with lib.maintainers; [ das_j ];
   };
-}
+})
diff --git a/pkgs/by-name/as/astrolabe-generator/package.nix b/pkgs/by-name/as/astrolabe-generator/package.nix
index 90cb20eb005e..c82eaf7806a3 100644
--- a/pkgs/by-name/as/astrolabe-generator/package.nix
+++ b/pkgs/by-name/as/astrolabe-generator/package.nix
@@ -7,13 +7,13 @@
   unzip,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "astrolabe-generator";
   version = "3.3";
 
   src = fetchurl {
-    url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${version}/AstrolabeGenerator-${version}.zip";
-    sha256 = "141gfmrqa1mf2qas87qig4phym9fg9gbrcfl2idzd5gi91824dn9";
+    url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${finalAttrs.version}/AstrolabeGenerator-${finalAttrs.version}.zip";
+    hash = "sha256-yTYiUEjxlfZbFNSxvF56LlUPL3kRH6QVFq4GhXN1L5A=";
   };
 
   buildInputs = [ jre ];
@@ -25,19 +25,19 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,share/java}
-    cp AstrolabeGenerator-${version}.jar $out/share/java
+    cp AstrolabeGenerator-${finalAttrs.version}.jar $out/share/java
 
     makeWrapper ${jre}/bin/java $out/bin/AstrolabeGenerator \
-      --add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar"
+      --add-flags "-jar $out/share/java/AstrolabeGenerator-${finalAttrs.version}.jar"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.astrolabeproject.com";
     description = "Java-based tool for generating EPS files for constructing astrolabes and related tools";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl3;
-    maintainers = [ ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "AstrolabeGenerator";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/as/astrolog/package.nix b/pkgs/by-name/as/astrolog/package.nix
index 75bb669a0d9a..50fe03eab302 100644
--- a/pkgs/by-name/as/astrolog/package.nix
+++ b/pkgs/by-name/as/astrolog/package.nix
@@ -30,17 +30,17 @@ stdenv.mkDerivation {
     let
       ephemeris = fetchzip {
         url = "http://astrolog.org/ftp/ephem/astephem.zip";
-        sha256 = "1mwvpvfk3lxjcc79zvwl4ypqzgqzipnc01cjldxrmx56xkc35zn7";
+        hash = "sha256-+on9LE27hCPRacHaIo6wz6M3V+G1QpyJ1Rp4wHbycM0=";
         stripRoot = false;
       };
       moonsEphemeris = fetchzip {
         url = "https://www.astrolog.org/ftp/ephem/moons/sepm.zip";
-        sha256 = "0labcidm8mrwvww93nwpp5738m9ff9q48cqzbgd18xny1jf6f8xd";
+        hash = "sha256-bHJc1yyR2loSOC4QJWsYNtKRYpxN9ZnKK5cWCapAptI=";
         stripRoot = false;
       };
       atlas = fetchurl {
         url = "http://astrolog.org/ftp/atlas/atlasbig.as";
-        sha256 = "001bmqyldsbk4bdliqfl4a9ydrh1ff13wccvfniwaxlmvkridx2q";
+        hash = "sha256-5DVfW3IaOwOguH9cv2opr1gIWo+K/Q2bLtRM35oD/EM=";
       };
     in
     ''
@@ -60,12 +60,12 @@ stdenv.mkDerivation {
       ''}
     '';
 
-  meta = with lib; {
-    maintainers = [ maintainers.kmein ];
+  meta = {
+    maintainers = with lib.maintainers; [ kmein ];
     homepage = "https://astrolog.org/astrolog.htm";
     description = "Freeware astrology program";
     mainProgram = "astrolog";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/by-name/as/asuka/package.nix b/pkgs/by-name/as/asuka/package.nix
index 1f9f85521ed5..2526441c0de3 100644
--- a/pkgs/by-name/as/asuka/package.nix
+++ b/pkgs/by-name/as/asuka/package.nix
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromSourcehut {
     owner = "~julienxx";
     repo = "asuka";
-    rev = version;
-    sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
+    tag = version;
+    hash = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
   };
 
   cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4=";
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Gemini Project client written in Rust with NCurses";
     mainProgram = "asuka";
     homepage = "https://git.sr.ht/~julienxx/asuka";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ sikmir ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }
diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix
index eedbdef3393f..c567e342913b 100644
--- a/pkgs/by-name/as/asunder/package.nix
+++ b/pkgs/by-name/as/asunder/package.nix
@@ -24,12 +24,23 @@
 #, aacSupport ? false, TODO: neroAacEnc
 }:
 
-stdenv.mkDerivation rec {
+let
+  runtimeDeps =
+    lib.optional mp3Support lame
+    ++ lib.optional oggSupport vorbis-tools
+    ++ lib.optional flacSupport flac
+    ++ lib.optional opusSupport opusTools
+    ++ lib.optional wavpackSupport wavpack
+    ++ lib.optional monkeysAudioSupport monkeysAudio
+    ++ [ cdparanoia ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
   version = "3.0.1";
   pname = "asunder";
   src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
+    url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
   };
 
   nativeBuildInputs = [
@@ -42,27 +53,18 @@ stdenv.mkDerivation rec {
     libcddb
   ];
 
-  runtimeDeps =
-    lib.optional mp3Support lame
-    ++ lib.optional oggSupport vorbis-tools
-    ++ lib.optional flacSupport flac
-    ++ lib.optional opusSupport opusTools
-    ++ lib.optional wavpackSupport wavpack
-    ++ lib.optional monkeysAudioSupport monkeysAudio
-    ++ [ cdparanoia ];
-
   postInstall = ''
     wrapProgram "$out/bin/asunder" \
       --prefix PATH : "${lib.makeBinPath runtimeDeps}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical Audio CD ripper and encoder for Linux";
     mainProgram = "asunder";
     homepage = "http://littlesvr.ca/asunder/index.php";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ mudri ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ mudri ];
+    platforms = lib.platforms.linux;
 
     longDescription = ''
       Asunder is a graphical Audio CD ripper and encoder for Linux. You can use
@@ -70,4 +72,4 @@ stdenv.mkDerivation rec {
       WavPack, Musepack, AAC, and Monkey's Audio files.
     '';
   };
-}
+})