{autotiling, sponge, jackett, apulse, lemmy-ui}: modernize derivations (#459641)

pkgs/misc/apulse/default.nix

@@ -14,15 +14,15 @@ let
   oz = x: if x then "1" else "0";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "apulse";
   version = "0.1.14";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI=";
+    repo = "apulse";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI=";
   };
 
   nativeBuildInputs = [
@@ -40,12 +40,13 @@ stdenv.mkDerivation rec {
     "-DLOG_TO_STDERR=${oz logToStderr}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "PulseAudio emulation for ALSA";
     homepage = "https://github.com/i-rinat/apulse";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.jagajaga ];
+    changelog = "https://github.com/i-rinat/apulse/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.jagajaga ];
     mainProgram = "apulse";
   };
-}
+})

pkgs/misc/autotiling/default.nix

@@ -13,7 +13,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
-    repo = pname;
+    repo = "autotiling";
     tag = "v${version}";
     hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk=";
   };
@@ -24,12 +24,12 @@ buildPythonApplication rec {
   ];
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nwg-piotr/autotiling";
     description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ artturin ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ artturin ];
     mainProgram = "autotiling";
   };
 }

pkgs/servers/jackett/default.nix

@@ -14,9 +14,9 @@ buildDotnetModule rec {
   version = "0.22.2390";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
+    owner = "jackett";
+    repo = "jackett";
+    tag = "v${version}";
     hash = "sha512-Viz9gU16NG6nYeEwhar3OCSPnsHrM6ZehsOcNxteaGyvgrhbyWt5rNI54wCJ7OngHaZgIoQhMoNNkvIhX8JDUg==";
   };
 
@@ -51,13 +51,13 @@ buildDotnetModule rec {
 
   passthru.tests = { inherit (nixosTests) jackett; };
 
-  meta = with lib; {
+  meta = {
     description = "API Support for your favorite torrent trackers";
     mainProgram = "jackett";
     homepage = "https://github.com/Jackett/Jackett/";
     changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       edwtjo
       nyanloutre
       purcell

pkgs/servers/web-apps/lemmy/ui.nix

@@ -11,7 +11,6 @@
 
 let
   pinData = lib.importJSON ./pin.json;
-
 in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     with finalAttrs;
     fetchFromGitHub {
       owner = "LemmyNet";
-      repo = pname;
+      repo = "lemmy-ui";
       rev = version;
       fetchSubmodules = true;
       hash = pinData.uiHash;
@@ -79,15 +78,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   distPhase = "true";
 
-  passthru.updateScript = ./update.py;
-  passthru.tests.lemmy-ui = nixosTests.lemmy;
-  passthru.commit_sha = finalAttrs.src.rev;
+  passthru = {
+    updateScript = ./update.py;
+    tests.lemmy-ui = nixosTests.lemmy;
+    commit_sha = finalAttrs.src.rev;
+  };
 
-  meta = with lib; {
+  meta = {
     description = "Building a federated alternative to reddit in rust";
     homepage = "https://join-lemmy.org/";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       happysalada
       billewanick
       georgyo

pkgs/shells/fish/plugins/sponge.nix

@@ -10,15 +10,15 @@ buildFishPlugin rec {
 
   src = fetchFromGitHub {
     owner = "meaningful-ooo";
-    repo = pname;
+    repo = "sponge";
     rev = version;
     sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons";
     homepage = "https://github.com/meaningful-ooo/sponge";
-    license = licenses.mit;
-    maintainers = with maintainers; [ quantenzitrone ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ quantenzitrone ];
   };
 }