From c169308100c5c53e629ac83334e30d4473bfc968 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:52:15 -0300
Subject: [PATCH 1/8] eclipse: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/applications/editors/eclipse/plugins.nix | 240 +++++++++---------
 1 file changed, 120 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 3ab4107eb206a..e5d2251c022d4 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -130,12 +130,12 @@ rec {
       sha256 = "1cn64xj2bm69vnn9db2xxh6kq148v83w5nx3183mrqb59ym3v9kf";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/tobiasmelcher/EclipseAceJump";
       description = "Provides fast jumps to text based on initial letter";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.mit;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -153,12 +153,12 @@ rec {
       sha256 = "1j42l0xxzs89shqkyn91lb0gia10mifzy0i73c3n7gj7sv2ddbjq";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://mihai-nita.net/java/#ePluginAEC";
       description = "Adds support for ANSI escape sequences in the Eclipse console";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -176,12 +176,12 @@ rec {
       cp -v $src $dropinDir/${name}.jar
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Powerful parser generator for processing structured text or binary files";
       homepage = "https://www.antlr.org/";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.bsd3;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.bsd3;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -199,12 +199,12 @@ rec {
       cp -v $src $dropinDir/${name}.jar
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Powerful parser generator for processing structured text or binary files";
       homepage = "https://www.antlr.org/";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.bsd3;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.bsd3;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -222,12 +222,12 @@ rec {
       sha256 = "1ip8dk92ka7bczw1bkbs3zkclmwr28ds5q1wrzh525wb70x8v6fi";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/iloveeclipse/plugins";
       description = "Adds new tools to the context menu of text-based editors";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -245,12 +245,12 @@ rec {
       sha256 = "1n2rzybfcwp3ss2qi0fhd8vm38vdwav8j837lqiqlfcnvzwsk86m";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/cypher256/eclipse-encoding-plugin";
       description = "Show file encoding and line ending for the active editor in the eclipse status bar";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -268,12 +268,12 @@ rec {
       sha256 = "1bx860k4haqcnhy8825kn4df0pyzd680qbnvjmxfrlxrqhr66fbb";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/iloveeclipse/plugins";
       description = "Shows disassembled bytecode of current java editor or class file";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.bsd2;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.bsd2;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -288,13 +288,13 @@ rec {
       hash = "sha256-39AoB5cKRQMFpRaOlrTEsyEKZYVqdTp1tMtlaDjjZ84=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://eclipse.org/cdt/";
       description = "C/C++ development tooling";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
-      maintainers = [ maintainers.bjornfor ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.bjornfor ];
     };
   };
 
@@ -308,12 +308,12 @@ rec {
       sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://eclipse-cs.sourceforge.net/";
       description = "Checkstyle integration into the Eclipse IDE";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.lgpl21;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.lgpl21;
+      platforms = lib.platforms.all;
     };
 
   };
@@ -332,12 +332,12 @@ rec {
       sha256 = "0wz61909bhqwzpqwll27ia0cn3anyp81haqx3rj1iq42cbl42h0y";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "http://eclipsecolorthemes.org/";
       description = "Plugin to switch color themes conveniently and without side effects";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -365,12 +365,12 @@ rec {
 
     propagatedBuildInputs = [ zest ];
 
-    meta = with lib; {
+    meta = {
       homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php";
       description = "IDE for developing CUP based parsers";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      platforms = platforms.all;
-      maintainers = [ maintainers.romildo ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.romildo ];
     };
   };
 
@@ -391,11 +391,11 @@ rec {
       '';
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://www.drools.org/";
       description = "Drools is a Business Rules Management System (BRMS) solution";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -409,12 +409,12 @@ rec {
       sha256 = "0w1kwcjh45p7msv5vpc8i6dsqwrnfmjama6vavpnxlji56jd3c43";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://www.eclemma.org/";
       description = "EclEmma is a free Java code coverage tool for Eclipse";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -432,12 +432,12 @@ rec {
       sha256 = "10p3mrbp9wi6jhlmmc23qv7frh605a23pqsc7w96569bsfb5wa8q";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "http://findbugs.sourceforge.net/";
       description = "Plugin that uses static analysis to look for bugs in Java code";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -451,10 +451,10 @@ rec {
       stripRoot = false;
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/ddekany/jbosstools-freemarker";
       description = "Plugin that provides an editor for Apache FreeMarker files";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     };
   };
 
@@ -468,13 +468,13 @@ rec {
       sha256 = "sha256-0wHRIls48NGDQzD+wuX79Thgiax+VVYVPJw2Z6NEzsg=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/eclipse-embed-cdt/eclipse-plugins";
       description = "Embedded C/C++ Development Tools (formerly GNU MCU/ARM Eclipse)";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl20;
-      platforms = platforms.all;
-      maintainers = [ maintainers.bjornfor ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl20;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.bjornfor ];
     };
   };
   gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04
@@ -530,12 +530,12 @@ rec {
 
     propagatedBuildInputs = [ antlr-runtime_4_7 ];
 
-    meta = with lib; {
+    meta = {
       description = "Adds support for JSON files to Eclipse";
       homepage = "https://github.com/boothen/Json-Eclipse-Plugin";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -553,12 +553,12 @@ rec {
       sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/angelozerr/jdt-codemining";
       description = "Provides JDT Java CodeMining";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -578,12 +578,12 @@ rec {
       '';
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/RustDT";
       description = "Rust development tooling";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -596,12 +596,12 @@ rec {
       sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "http://scala-ide.org/";
       description = "Scala IDE for Eclipse";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.bsd3;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.bsd3;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -615,12 +615,12 @@ rec {
       sha256 = "0aanqwx3gy1arpbkqd846381hiy6272lzwhfjl94x8jhfykpqqbj";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://spotbugs.github.io/";
       description = "Plugin that uses static analysis to look for bugs in Java code";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.lgpl21;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.lgpl21;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -638,12 +638,12 @@ rec {
       sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://testng.org/doc/";
       description = "Eclipse plugin for the TestNG testing framework";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -660,13 +660,13 @@ rec {
       sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/vrapper/vrapper";
       description = "Wrapper to provide a Vim-like input scheme for moving around and editing text";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.gpl3;
-      platforms = platforms.all;
-      maintainers = [ maintainers.stumoss ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.gpl3;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.stumoss ];
     };
   };
 
@@ -684,12 +684,12 @@ rec {
       sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/oyse/yedit";
       description = "YAML editor plugin for Eclipse";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
-      platforms = platforms.all;
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
     };
   };
 
@@ -702,12 +702,12 @@ rec {
       sha256 = "01scn7cmcrjcp387spjm8ifgwrwwi77ypildandbisfvhj3qqs7m";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://www.eclipse.org/gef/zest/";
       description = "Eclipse Visualization Toolkit";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      platforms = platforms.all;
-      maintainers = [ maintainers.romildo ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.romildo ];
     };
   };
 
@@ -725,13 +725,13 @@ rec {
       hash = "sha256-lhwFwdMDwCIUrQjdWfe5ZSutCIsKtZSBT6FWthUipdk=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://ant.apache.org/ivy/ivyde/index.html";
       description = "Plugin which integrates Apache Ivy's dependency management";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = [ maintainers.r3dl3g ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.r3dl3g ];
     };
   };
 
@@ -749,17 +749,17 @@ rec {
       hash = "sha256-qjTvn1j7viSfzLkWnYjyS9Pj2ExqsiFGLzot3+oB0Tw=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://ant.apache.org/ivy/ivyde/index.html";
       description = "Graph viewer of the resolved dependencies";
       longDescription = ''
         Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since
         it requires additional plugins to be installed (Zest).
       '';
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = [ maintainers.r3dl3g ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.r3dl3g ];
     };
   };
 
@@ -777,13 +777,13 @@ rec {
       sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://ant.apache.org/ivy/index.html";
       description = "Popular dependency manager focusing on flexibility and simplicity";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = [ maintainers.r3dl3g ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.r3dl3g ];
     };
   };
 
@@ -801,13 +801,13 @@ rec {
       sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://ant.apache.org/ivy/ivyde/index.html";
       description = "Ant Tasks integrated into Eclipse's Ant runtime";
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = [ maintainers.r3dl3g ];
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
+      maintainers = [ lib.maintainers.r3dl3g ];
     };
   };
 }

From c02991aac38de8564945c7f94c3b3671ec2edb48 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:52:42 -0300
Subject: [PATCH 2/8] octoprint: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/oc/octoprint/plugins.nix | 186 +++++++++++++-------------
 1 file changed, 93 insertions(+), 93 deletions(-)

diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index 2dd462d4a4870..1809a0339f6a0 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -30,11 +30,11 @@ in
       sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Changes the \"Motors off\" button in octoprint's control tab to issue an M84 command to allow compatibility with Repetier firmware Resources";
       homepage = "https://github.com/ntoff/OctoPrint-M84MotOff";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ stunkymonkey ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ stunkymonkey ];
     };
   };
 
@@ -50,11 +50,11 @@ in
       sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Marlin auto bed leveling control, mesh correction, and z probe handling";
       homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ WhittlesJr ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ WhittlesJr ];
     };
   };
 
@@ -69,11 +69,11 @@ in
       sha256 = "sha256-6JcYvYgEmphp5zz4xZi4G0yTo4FCIR6Yh+MXYK7H7+w=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Displays 3D mesh of bed topography report";
       homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer";
-      license = licenses.mit;
-      maintainers = with maintainers; [ lovesegfault ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ lovesegfault ];
     };
   };
 
@@ -88,11 +88,11 @@ in
       sha256 = "sha256-04OPa/RpM8WehUmOp195ocsAjAvKdVY7iD5ybzQO7Dg=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Plugin to display the estimated print cost for the loaded model";
       homepage = "https://github.com/OllisGit/OctoPrint-CostEstimation";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ stunkymonkey ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ stunkymonkey ];
     };
   };
 
@@ -107,11 +107,11 @@ in
       sha256 = "sha256-54siSmzgPlnCRpkpZhXU9theNQ3hqL3j+Ip4Ie2w2vA=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Plugin for slicing via Cura Legacy from within OctoPrint";
       homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ gebner ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ gebner ];
     };
   };
 
@@ -126,11 +126,11 @@ in
       sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Displays the job progress on the printer's display";
       homepage = "https://github.com/OctoPrint/OctoPrint-DisplayProgress";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ stunkymonkey ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ stunkymonkey ];
     };
   };
 
@@ -145,11 +145,11 @@ in
       sha256 = "sha256-hhHc2SPixZCPJzCP8enMMWNYaYbNZAU0lNSx1B0d++4=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "OctoPrint-Plugin that sends the current progress of a print via M117 command";
       homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ j0hax ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ j0hax ];
     };
   };
 
@@ -164,11 +164,11 @@ in
       sha256 = "03bc2zbffw4ksk8if90kxhs3179nbhb4xikp4f0adm3lrnvxkd3s";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Fixes the double temperature reporting from the Creality Ender-3 v2 printer";
       homepage = "https://github.com/SimplyPrint/OctoPrint-Creality2xTemperatureReportingFix";
-      license = licenses.mit;
-      maintainers = with maintainers; [ illustris ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ illustris ];
     };
   };
 
@@ -185,11 +185,11 @@ in
 
     propagatedBuildInputs = with super; [ pyserial  ];
 
-    meta = with lib; {
+    meta = {
       description = "Printer Firmware Updater";
       homepage = "https://github.com/OctoPrint/OctoPrint-FirmwareUpdater";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -204,11 +204,11 @@ in
       sha256 = "sha256-Z8twpj+gqgbiWWxNd9I9qflEAln5Obpb3cn34KwSc5A=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Open webcam in fullscreen mode";
       homepage = "https://github.com/BillyBlaze/OctoPrint-FullScreen";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -223,11 +223,11 @@ in
       sha256 = "sha256-1Sk2ri3DKW8q8VJ/scFjpRsz65Pwt8OEURP1k70aydE=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Edit gcode on OctoPrint";
       homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ WhittlesJr ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ WhittlesJr ];
     };
   };
 
@@ -242,11 +242,11 @@ in
       sha256 = "sha256-3ay6iCxZk8QkFM/2Y14VTpPoxr6NXq14BFSHofn3q7I=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Displays GCode documentation for Marlin in the Octoprint terminal command line";
       homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ lovesegfault ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ lovesegfault ];
     };
   };
 
@@ -263,11 +263,11 @@ in
 
     propagatedBuildInputs = with super; [ paho-mqtt ];
 
-    meta = with lib; {
+    meta = {
       description = "Publish printer status MQTT";
       homepage = "https://github.com/OctoPrint/OctoPrint-MQTT";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ peterhoeg ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ peterhoeg ];
     };
   };
 
@@ -284,11 +284,11 @@ in
 
     propagatedBuildInputs = with super; [ jsonpath-ng ];
 
-    meta = with lib; {
+    meta = {
       description = "Enables Chamber temperature reporting via subscribing to an MQTT topic";
       homepage = "https://github.com/synman/OctoPrint-MqttChamberTemperature";
-      license = licenses.wtfpl;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.wtfpl;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -303,11 +303,11 @@ in
       sha256 = "sha256-ZPpTx+AadRffUb53sZbMUbCZa7xYGQW/5si7UB8mnVI=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Displays temperatures on navbar";
       homepage = "https://github.com/imrahil/OctoPrint-NavbarTemp";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -329,11 +329,11 @@ in
       distro
     ];
 
-    meta = with lib; {
+    meta = {
       description = "Monitor Octoprint-connected printers with Obico";
       homepage = "https://www.obico.io/";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -350,11 +350,11 @@ in
 
     propagatedBuildInputs = with super; [ pillow ];
 
-    meta = with lib; {
+    meta = {
       description = "OctoPod extension for OctoPrint";
       homepage = "https://github.com/gdombiak/OctoPrint-OctoPod";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -380,11 +380,11 @@ in
       sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Better print time estimation for OctoPrint";
       homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ gebner ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ gebner ];
     };
   };
 
@@ -401,11 +401,11 @@ in
 
     propagatedBuildInputs = with super; [ psutil  ];
 
-    meta = with lib; {
+    meta = {
       description = "Plugin that extracts thumbnails from uploaded gcode files sliced by PrusaSlicer";
       homepage = "https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -429,11 +429,11 @@ in
       sed /RPi.GPIO/d -i requirements.txt
     '';
 
-    meta = with lib; {
+    meta = {
       description = "OctoPrint plugin to control ATX/AUX power supply";
       homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ gebner ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ gebner ];
     };
   };
 
@@ -450,11 +450,11 @@ in
 
     propagatedBuildInputs = with super; [ psutil  ];
 
-    meta = with lib; {
+    meta = {
       description = "Plugin to view the current CPU and RAM usage on your system";
       homepage = "https://github.com/Renaud11232/OctoPrint-Resource-Monitor";
-      license = licenses.mit;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -469,11 +469,11 @@ in
       sha256 = "sha256-MbP3cKa9FPElQ/M8ykYh9kVXl8hNvmGiCHDvjgWvm9k=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Simple plugin that add an emergency stop buton on NavBar of OctoPrint";
       homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ WhittlesJr ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ WhittlesJr ];
     };
   };
 
@@ -488,11 +488,11 @@ in
       sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Simple stl viewer tab for OctoPrint";
       homepage = "https://github.com/jneilliii/Octoprint-STLViewer";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ abbradar ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ abbradar ];
     };
   };
 
@@ -509,11 +509,11 @@ in
 
     propagatedBuildInputs = with super; [ pillow ];
 
-    meta = with lib; {
+    meta = {
       description = "Plugin to send status messages and receive commands via Telegram messenger";
       homepage = "https://github.com/fabianonline/OctoPrint-Telegram";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ stunkymonkey ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ stunkymonkey ];
     };
   };
 
@@ -528,11 +528,11 @@ in
       sha256 = "sha256-om9IUSmxU8y0x8DrodW1EU/pilAN3+PbtYck6KfROEg=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Beautiful themes for OctoPrint";
       homepage = "https://github.com/birkbjo/OctoPrint-Themeify";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ lovesegfault ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ lovesegfault ];
     };
   };
 
@@ -547,11 +547,11 @@ in
       sha256 = "sha256-XS4m4KByScGTPfVE4kuRLw829gNE2CdM0RyhRqGGxyw=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Automatically deletes timelapses that are older than configured timeframe";
       homepage = "https://github.com/jneilliii/OctoPrint-TimelapsePurger";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ tri-ler ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ tri-ler ];
     };
   };
 
@@ -566,11 +566,11 @@ in
       sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Show printers status in window title";
       homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ abbradar ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ abbradar ];
     };
   };
 
@@ -585,11 +585,11 @@ in
       sha256 = "sha256-PNDCjY7FhfnwK7Nd86el9ZQ00G4uMANH2Sk080iMYXw=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Touch friendly interface for a small TFT module or phone for OctoPrint";
       homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ gebner ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ gebner ];
     };
   };
 
@@ -604,11 +604,11 @@ in
       sha256 = "sha256-6r5jJDSR0DxlDQ/XWmQgYUgeL1otNNBnwurX7bbcThg=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Plugin for a better integration of Klipper into OctoPrint";
       homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin";
-      license = licenses.agpl3Only;
-      maintainers = with maintainers; [ lovesegfault ];
+      license = lib.licenses.agpl3Only;
+      maintainers = with lib.maintainers; [ lovesegfault ];
     };
   };
 
@@ -637,11 +637,11 @@ in
 
     propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six pillow psutil file-read-backwards ];
 
-    meta = with lib; {
+    meta = {
       description = "Stabilized timelapses for Octoprint";
       homepage = "https://github.com/FormerLurker/OctoLapse";
-      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ illustris j0hax ];
+      license = lib.licenses.agpl3Plus;
+      maintainers = with lib.maintainers; [ illustris j0hax ];
       # requires pillow >=6.2.0,<7.0.0
       broken = true;
     };
@@ -658,11 +658,11 @@ in
       sha256 = "sha256-hLHT3Uze/6PlOCEICVZ2ieFTyXgcqCvgHOlIIEquujg=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Dashboard for Octoprint";
       homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard";
-      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ j0hax ];
+      license = lib.licenses.agpl3Plus;
+      maintainers = with lib.maintainers; [ j0hax ];
     };
   };
 } // lib.optionalAttrs config.allowAliases {

From 0c7aadf000e6bd575c6a6b6343416f44808e63e3 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:54:20 -0300
Subject: [PATCH 3/8] cpython: remove with lib in meta, remove top level with

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 .../interpreters/python/cpython/default.nix   | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 4027cc03da1bd..518eab48cf702 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -15,13 +15,13 @@
 , bzip2
 , expat
 , libffi
-, libxcrypt
 , mpdecimal
 , ncurses
 , openssl
 , sqlite
 , xz
 , zlib
+, libxcrypt
 
 # platform-specific dependencies
 , bash
@@ -120,7 +120,7 @@ let
   ;
 
   # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt
-  libxcrypt = if stdenv.hostPlatform.isFreeBSD then null else inputs.libxcrypt;
+  libxcrypt' = if stdenv.hostPlatform.isFreeBSD then null else libxcrypt;
 
   buildPackages = pkgsBuildHost;
   inherit (passthru) pythonOnBuildForHost;
@@ -166,7 +166,7 @@ let
     bzip2
     expat
     libffi
-    libxcrypt
+    libxcrypt'
     mpdecimal
     ncurses
     openssl
@@ -229,7 +229,7 @@ let
   in "${machdep}-${cpu}";
 
   execSuffix = stdenv.hostPlatform.extensions.executable;
-in with passthru; stdenv.mkDerivation (finalAttrs: {
+in stdenv.mkDerivation (finalAttrs: {
   pname = "python3";
   inherit src version;
 
@@ -240,7 +240,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
 
   prePatch = optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"'
-  '' + optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) ''
+  '' + optionalString (passthru.pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) ''
     # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch
     substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path
   '';
@@ -257,28 +257,28 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     # configurations. If you're reading this and it's been a long time
     # since this diff, consider submitting this patch upstream!
     ./freebsd-cross.patch
-  ] ++ optionals (pythonOlder "3.13") [
+  ] ++ optionals (passthru.pythonOlder "3.13") [
     # Make sure that the virtualenv activation scripts are
     # owner-writable, so venvs can be recreated without permission
     # errors.
     ./virtualenv-permissions.patch
-  ] ++ optionals (pythonAtLeast "3.13") [
+  ] ++ optionals (passthru.pythonAtLeast "3.13") [
     ./3.13/virtualenv-permissions.patch
   ] ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
-  ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
+  ] ++ optionals (passthru.pythonAtLeast "3.9" && passthru.pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
     # Stop checking for TCL/TK in global macOS locations
     ./3.9/darwin-tcl-tk.patch
-  ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
+  ] ++ optionals (hasDistutilsCxxPatch && passthru.pythonOlder "3.12") [
     # Fix for http://bugs.python.org/issue1222585
     # Upstream distutils is calling C compiler to compile C++ code, which
     # only works for GCC and Apple Clang. This makes distutils to call C++
     # compiler when needed.
     (
-      if pythonAtLeast "3.7" && pythonOlder "3.11" then
+      if passthru.pythonAtLeast "3.7" && passthru.pythonOlder "3.11" then
         ./3.7/python-3.x-distutils-C++.patch
-      else if pythonAtLeast "3.11" then
+      else if passthru.pythonAtLeast "3.11" then
         ./3.11/python-3.x-distutils-C++.patch
       else
         fetchpatch {
@@ -286,17 +286,17 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
           sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
         }
     )
-  ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.12") [
+  ] ++ optionals (passthru.pythonAtLeast "3.7" && passthru.pythonOlder "3.12") [
     # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
     ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
     # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules.
     ./3.7/fix-finding-headers-when-cross-compiling.patch
-  ] ++ optionals (pythonOlder "3.12") [
+  ] ++ optionals (passthru.pythonOlder "3.12") [
     # https://github.com/python/cpython/issues/90656
     ./loongarch-support.patch
-  ] ++ optionals (pythonAtLeast "3.12") [
+  ] ++ optionals (passthru.pythonAtLeast "3.12") [
     ./3.12/CVE-2024-12254.patch
-  ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
+  ] ++ optionals (passthru.pythonAtLeast "3.11" && passthru.pythonOlder "3.13") [
     # backport fix for https://github.com/python/cpython/issues/95855
     ./platform-triplet-detection.patch
   ] ++ optionals (stdenv.hostPlatform.isMinGW) (let
@@ -333,7 +333,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   '' + optionalString mimetypesSupport ''
     substituteInPlace Lib/mimetypes.py \
       --replace-fail "@mime-types@" "${mailcap}"
-  '' + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) ''
+  '' + optionalString (passthru.pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace-fail \
       "os.environ.get('TIX_LIBRARY')" \
       "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
@@ -368,15 +368,15 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     "--enable-shared"
   ] ++ optionals enableFramework [
     "--enable-framework=${placeholder "out"}/Library/Frameworks"
-  ] ++ optionals (pythonAtLeast "3.13") [
+  ] ++ optionals (passthru.pythonAtLeast "3.13") [
     (enableFeature enableGIL "gil")
   ] ++ optionals enableOptimizations [
     "--enable-optimizations"
   ] ++ optionals (sqlite != null) [
     "--enable-loadable-sqlite-extensions"
-  ] ++ optionals (libxcrypt != null) [
-    "CFLAGS=-I${libxcrypt}/include"
-    "LIBS=-L${libxcrypt}/lib"
+  ] ++ optionals (libxcrypt' != null) [
+    "CFLAGS=-I${libxcrypt'}/include"
+    "LIBS=-L${libxcrypt'}/lib"
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_buggy_getaddrinfo=no"
     # Assume little-endian IEEE 754 floating point when cross compiling
@@ -399,7 +399,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
     "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
     "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
-  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && passthru.pythonAtLeast "3.11") [
     "--with-build-python=${pythonOnBuildForHostInterpreter}"
   ] ++ optionals stdenv.hostPlatform.isLinux [
     # Never even try to use lchmod on linux,
@@ -417,7 +417,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     # Attempt to purify some of the host info collection
     sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
     sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
-  '' + optionalString (pythonOlder "3.12") ''
+  '' + optionalString (passthru.pythonOlder "3.12") ''
     # Improve purity
     for path in /usr /sw /opt /pkg; do
       substituteInPlace ./setup.py --replace-warn $path /no-such-path
@@ -427,11 +427,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}
     # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
     sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
-  '' + optionalString (pythonAtLeast "3.11") ''
+  '' + optionalString (passthru.pythonAtLeast "3.11") ''
     # Also override the auto-detection in `configure`.
     substituteInPlace configure \
       --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}'
-  '' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
+  '' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && passthru.pythonAtLeast "3.11") ''
     export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
     export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
   '' + optionalString stdenv.hostPlatform.isMusl ''
@@ -449,13 +449,13 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     export CFLAGS_NODIST="-fno-semantic-interposition"
   '';
 
-  setupHook = python-setup-hook sitePackages;
+  setupHook = python-setup-hook passthru.sitePackages;
 
   postInstall = let
     # References *not* to nuke from (sys)config files
     keep-references = concatMapStringsSep " " (val: "-e ${val}") ([
       (placeholder "out")
-    ] ++ lib.optional (libxcrypt != null) libxcrypt
+    ] ++ lib.optional (libxcrypt' != null) libxcrypt'
       ++ lib.optional tzdataSupport tzdata
     );
   in lib.optionalString enableFramework ''
@@ -465,7 +465,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   '' + ''
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
-    for item in $out/lib/${libPrefix}/test/*; do
+    for item in $out/lib/${passthru.libPrefix}/test/*; do
       if [[ "$item" != */test_support.py*
          && "$item" != */test/support
          && "$item" != */test/libregrtest
@@ -475,7 +475,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
         echo $item
       fi
     done
-    touch $out/lib/${libPrefix}/test/__init__.py
+    touch $out/lib/${passthru.libPrefix}/test/__init__.py
 
     # Determinism: Windows installers were not deterministic.
     # We're also not interested in building Windows installers.
@@ -492,7 +492,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     # Get rid of retained dependencies on -dev packages, and remove
     # some $TMPDIR references to improve binary reproducibility.
     # Note that the .pyc file of _sysconfigdata.py should be regenerated!
-    for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do
+    for i in $out/lib/${passthru.libPrefix}/_sysconfigdata*.py $out/lib/${passthru.libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do
        sed -i $i -e "s|$TMPDIR|/no-such-path|g"
     done
 
@@ -502,8 +502,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
 
     # Make the sysconfigdata module accessible on PYTHONPATH
     # This allows build Python to import host Python's sysconfigdata
-    mkdir -p "$out/${sitePackages}"
-    ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/"
+    mkdir -p "$out/${passthru.sitePackages}"
+    ln -s "$out/lib/${passthru.libPrefix}/"_sysconfigdata*.py "$out/${passthru.sitePackages}/"
     '' + optionalString stripConfig ''
     rm -R $out/bin/python*-config $out/lib/python*/config-*
     '' + optionalString stripIdlelib ''
@@ -516,7 +516,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
     '' + optionalString includeSiteCustomize ''
     # Include a sitecustomize.py file
-    cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
+    cp ${../sitecustomize.py} $out/${passthru.sitePackages}/sitecustomize.py
     '' + optionalString stripBytecode ''
     # Determinism: deterministic bytecode
     # First we delete all old bytecode.
@@ -541,7 +541,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py
 
     # Disable system-wide pip installation. See https://peps.python.org/pep-0668/.
-    cat <<'EXTERNALLY_MANAGED' > $out/lib/${libPrefix}/EXTERNALLY-MANAGED
+    cat <<'EXTERNALLY_MANAGED' > $out/lib/${passthru.libPrefix}/EXTERNALLY-MANAGED
     [externally-managed]
     Error=This command has been disabled as it tries to modify the immutable
      `/nix/store` filesystem.
@@ -610,9 +610,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   passthru = passthru // {
     doc = stdenv.mkDerivation {
       inherit src;
-      name = "python${pythonVersion}-${version}-doc";
+      name = "python${passthru.pythonVersion}-${version}-doc";
 
-      patches = optionals (pythonAtLeast "3.9" && pythonOlder "3.10") [
+      patches = optionals (passthru.pythonAtLeast "3.9" && passthru.pythonOlder "3.10") [
         # https://github.com/python/cpython/issues/98366
         (fetchpatch {
           url = "https://github.com/python/cpython/commit/5612471501b05518287ed61c1abcb9ed38c03942.patch";
@@ -627,7 +627,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
       sphinxRoot = "Doc";
 
       postInstallSphinx = ''
-        mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version}
+        mv $out/share/doc/* $out/share/doc/python${passthru.pythonVersion}-${version}
       '';
 
       nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ];
@@ -640,10 +640,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.python.org";
     changelog = let
-      majorMinor = versions.majorMinor version;
+      majorMinor = lib.versions.majorMinor version;
       dashedVersion = replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version;
     in
       if sourceVersion.suffix == "" then
@@ -660,10 +660,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = licenses.psfl;
+    license = lib.licenses.psfl;
     pkgConfigModules = [ "python3" ];
-    platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
-    mainProgram = executable;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows ++ lib.platforms.freebsd;
+    mainProgram = passthru.executable;
     maintainers = lib.teams.python.members;
   };
 })

From 613549ac2f80d5d9f82d37522aef084f759c2e07 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:54:58 -0300
Subject: [PATCH 4/8] hunspell/dictionaries: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 .../libraries/hunspell/dictionaries.nix       | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 617b8ed5f3e60..3fdb3981df0c6 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -38,12 +38,12 @@ let
         rev = "v${version}";
         sha256 = "sha256-oGnxOGHzDogzUMZESydIxRTbq9Dmd03flwHx16AK1yk=";
       };
-      meta = with lib; {
+      meta = {
         description = "Hunspell dictionary for ${shortDescription} from rla";
         homepage = "https://github.com/sbosio/rla-es";
-        license = with licenses; [ gpl3 lgpl3 mpl11 ];
-        maintainers = with maintainers; [ renzo ];
-        platforms = platforms.all;
+        license = with lib.licenses; [ gpl3 lgpl3 mpl11 ];
+        maintainers = with lib.maintainers; [ renzo ];
+        platforms = lib.platforms.all;
       };
       nativeBuildInputs = [ bash coreutils which zip unzip ];
       postPatch = ''
@@ -76,15 +76,15 @@ let
         url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt";
         sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc";
       };
-      meta = with lib; {
+      meta = {
         longDescription = ''
           Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran
           Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från
           LibreOffice då dsso.se inte längre verkar vara med oss.
         '';
         description = "Hunspell dictionary for ${shortDescription} from LibreOffice";
-        license = licenses.lgpl3;
-        platforms = platforms.all;
+        license = lib.licenses.lgpl3;
+        platforms = lib.platforms.all;
       };
       nativeBuildInputs = [ unzip ];
       sourceRoot = ".";
@@ -117,13 +117,13 @@ let
         url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip";
         sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0";
       };
-      meta = with lib; {
+      meta = {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
         homepage = "https://www.dicollecte.org/home.php?prj=fr";
-        license = licenses.mpl20;
-        maintainers = with maintainers; [ renzo ];
-        platforms = platforms.all;
+        license = lib.licenses.mpl20;
+        maintainers = with lib.maintainers; [ renzo ];
+        platforms = lib.platforms.all;
       };
       nativeBuildInputs = [ unzip ];
       sourceRoot = ".";
@@ -146,12 +146,12 @@ let
       pname = "hunspell-dict-${shortName}-wordlist";
       srcReadmeFile = "README_" + srcFileName + ".txt";
       readmeFile = "README_" + dictFileName + ".txt";
-      meta = with lib; {
+      meta = {
         description = "Hunspell dictionary for ${shortDescription} from Wordlist";
         homepage = "http://wordlist.aspell.net/";
-        license = licenses.bsd3;
-        maintainers = with maintainers; [ renzo ];
-        platforms = platforms.all;
+        license = lib.licenses.bsd3;
+        maintainers = with lib.maintainers; [ renzo ];
+        platforms = lib.platforms.all;
       };
       nativeBuildInputs = [ unzip ];
       sourceRoot = ".";
@@ -172,12 +172,12 @@ let
       version = "2.4";
       pname = "hunspell-dict-${shortName}-linguistico";
       readmeFile = dictFileName + "_README.txt";
-      meta = with lib; {
+      meta = {
         description = "Hunspell dictionary for ${shortDescription}";
         homepage = "https://sourceforge.net/projects/linguistico/";
-        license = licenses.gpl3;
-        maintainers = with maintainers; [ renzo ];
-        platforms = platforms.all;
+        license = lib.licenses.gpl3;
+        maintainers = with lib.maintainers; [ renzo ];
+        platforms = lib.platforms.all;
       };
       nativeBuildInputs = [ unzip ];
       sourceRoot = ".";
@@ -212,13 +212,13 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with lib; {
+      meta = {
         homepage = "http://xuxen.eus/";
         description = shortDescription;
         longDescription = longDescription;
-        license = licenses.gpl2;
-        maintainers = with maintainers; [ zalakain ];
-        platforms = platforms.all;
+        license = lib.licenses.gpl2;
+        maintainers = with lib.maintainers; [ zalakain ];
+        platforms = lib.platforms.all;
       };
     };
 
@@ -250,12 +250,12 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with lib; {
+      meta = {
         homepage = "https://www.j3e.de/ispell/igerman98/index_en.html";
         description = shortDescription;
-        license = with licenses; [ gpl2 gpl3 ];
-        maintainers = with maintainers; [ timor ];
-        platforms = platforms.all;
+        license = with lib.licenses; [ gpl2 gpl3 ];
+        maintainers = with lib.maintainers; [ timor ];
+        platforms = lib.platforms.all;
       };
     };
 
@@ -280,12 +280,12 @@ let
       buildPhase = ''
         cp -a ${sourceRoot}/* .
       '';
-      meta = with lib; {
+      meta = {
         homepage = "https://wiki.documentfoundation.org/Development/Dictionaries";
         description = "Hunspell dictionary for ${shortDescription} from LibreOffice";
         license = license;
-        maintainers = with maintainers; [ vlaci ];
-        platforms = platforms.all;
+        maintainers = with lib.maintainers; [ vlaci ];
+        platforms = lib.platforms.all;
       };
     };
 
@@ -734,12 +734,12 @@ rec {
       unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}}
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice";
       homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ dywedir ];
-      platforms = platforms.all;
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [ dywedir ];
+      platforms = lib.platforms.all;
     };
   };
 
@@ -796,11 +796,11 @@ rec {
       unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName}
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden";
       homepage = "https://github.com/jeppebundsgaard/stavekontrolden";
       license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
-      maintainers = with maintainers; [ louisdk1 ];
+      maintainers = with lib.maintainers; [ louisdk1 ];
     };
   };
 
@@ -826,11 +826,11 @@ rec {
     dictFileName = "nl_NL";
     readmeFile = "README.md";
 
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal";
       homepage = "https://www.opentaal.org/";
-      license = with licenses; [ bsd3 /* or */ cc-by-30 ];
-      maintainers = with maintainers; [ artturin ];
+      license = with lib.licenses; [ bsd3 /* or */ cc-by-30 ];
+      maintainers = with lib.maintainers; [ artturin ];
     };
   };
 
@@ -859,12 +859,12 @@ rec {
       rev = "419eb32115b936da9c949e35b35c29b8187f6c93";
       sha256 = "sha256-aXjof5dcEoCmep3PtvVkBhcgcd2NtqUpUEu37wsi1Uk=";
     };
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Central Thai (Thailand)";
       homepage = "https://github.com/SyafiqHadzir/Hunspell-TH";
-      license = with licenses; [ gpl3 ];
-      maintainers = with maintainers; [ toastal ]; # looking for a native speaker
-      platforms = platforms.all;
+      license = with lib.licenses; [ gpl3 ];
+      maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker
+      platforms = lib.platforms.all;
     };
   };
 
@@ -928,12 +928,12 @@ rec {
 
     dontBuild = true;
 
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Toki Pona";
       homepage = "https://github.com/somasis/hunspell-tok";
       license = with lib.licenses; [ cc0 publicDomain cc-by-sa-30 cc-by-sa-40 ];
-      maintainers = with maintainers; [ somasis ];
-      platforms = platforms.all;
+      maintainers = with lib.maintainers; [ somasis ];
+      platforms = lib.platforms.all;
     };
   };
 
@@ -993,12 +993,12 @@ rec {
       sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff
       runHook postBuild
     '';
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Persian (Iran)";
       homepage = "https://github.com/b00f/lilak";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ nix-julia ];
-      platforms = platforms.all;
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ nix-julia ];
+      platforms = lib.platforms.all;
     };
   };
 
@@ -1047,12 +1047,12 @@ rec {
     dictFileName = "tr_TR";
     readmeFile = "README.md";
 
-    meta = with lib; {
+    meta = {
       description = "Hunspell dictionary for Turkish (Turkey) from tdd-ai";
       homepage = "https://github.com/tdd-ai/hunspell-tr/";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ samemrecebi ];
-      platforms = platforms.all;
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [ samemrecebi ];
+      platforms = lib.platforms.all;
     };
   };
 

From 961866a87f82db9e8af7c41eae1f7ead7571c2b9 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:55:33 -0300
Subject: [PATCH 5/8] indilib: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 .../astronomy/indilib/indi-3rdparty.nix       | 138 +++++++++---------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index f009aef6d5d4a..4c965589baf75 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -109,13 +109,13 @@ let
             homepage = "https://www.indilib.org/";
             description = "Third party drivers for the INDI astronomical software suite";
             changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
-            license = licenses.lgpl2Plus;
-            maintainers = with maintainers; [
+            license = lib.licenses.lgpl2Plus;
+            maintainers = with lib.maintainers; [
               hjones2199
               sheepforce
               returntoreality
             ];
-            platforms = platforms.linux;
+            platforms = lib.platforms.linux;
           }
           // meta;
       }
@@ -123,9 +123,9 @@ let
 
   libahp-gt = buildIndi3rdParty {
     pname = "libahp-gt";
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
     };
   };
 
@@ -137,8 +137,8 @@ let
       urjtag
       libftdi1
     ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
       broken = true;
       platforms = [ ];
     };
@@ -146,9 +146,9 @@ let
 
   libaltaircam = buildIndi3rdParty {
     pname = "libaltaircam";
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -161,9 +161,9 @@ let
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
     cmakeFlags = [ "-DCONF_DIR=etc/" ];
-    meta = with lib; {
-      license = licenses.mpl20;
-      platforms = platforms.linux;
+    meta = {
+      license = lib.licenses.mpl20;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -181,9 +181,9 @@ let
       (lib.getLib stdenv.cc.cc)
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
     };
   };
 
@@ -191,9 +191,9 @@ let
     pname = "libastroasis";
     buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -206,18 +206,18 @@ let
       libdc1394
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
     };
   };
 
   libbressercam = buildIndi3rdParty {
     pname = "libbressercam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    meta = {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -233,9 +233,9 @@ let
       libusb1
     ];
 
-    meta = with lib; {
-      license = licenses.bsd2;
-      platforms = platforms.linux;
+    meta = {
+      license = lib.licenses.bsd2;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -245,9 +245,9 @@ let
       indilib
       libusb1
     ];
-    meta = with lib; {
-      license = licenses.bsd2;
-      platforms = platforms.linux;
+    meta = {
+      license = lib.licenses.bsd2;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -258,27 +258,27 @@ let
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
     };
   };
 
   libmallincam = buildIndi3rdParty {
     pname = "libmallincam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
   libmeadecam = buildIndi3rdParty {
     pname = "libmeadecam";
     buildInputs = [ libusb1 ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.lgpl21Only;
-      platforms = platforms.linux;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -286,36 +286,36 @@ let
     pname = "libmicam";
     buildInputs = [ libusb1 ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
     };
   };
 
   libnncam = buildIndi3rdParty {
     pname = "libnncam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
   libogmacam = buildIndi3rdParty {
     pname = "libogmacam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
   libomegonprocam = buildIndi3rdParty {
     pname = "libomegonprocam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -323,8 +323,8 @@ let
   libpigpiod = buildIndi3rdParty {
     pname = "libpigpiod";
     buildInputs = [ indilib ];
-    meta = with lib; {
-      license = licenses.unlicense;
+    meta = {
+      license = lib.licenses.unlicense;
       broken = true;
       platforms = [ ];
     };
@@ -340,9 +340,9 @@ let
 
     buildInputs = [ indilib ];
 
-    meta = with lib; {
-      license = licenses.lgpl3Plus;
-      platforms = platforms.linux;
+    meta = {
+      license = lib.licenses.lgpl3Plus;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -360,9 +360,9 @@ let
       systemd
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -389,9 +389,9 @@ let
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
 
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -402,9 +402,9 @@ let
       indilib
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = platforms.linux;
+      platforms = lib.platforms.linux;
     };
   };
 
@@ -415,9 +415,9 @@ let
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ i686 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ i686 ++ arm;
     };
   };
 
@@ -436,18 +436,18 @@ let
     buildInputs = [ libusb1 ];
     nativeBuildInputs = [ autoPatchelfHook ];
 
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
   libstarshootg = buildIndi3rdParty {
     pname = "libstarshootg";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
@@ -458,27 +458,27 @@ let
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
     };
   };
 
   libtoupcam = buildIndi3rdParty {
     pname = "libtoupcam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 
   libtscam = buildIndi3rdParty {
     pname = "libtscam";
     nativeBuildInputs = [ autoPatchelfHook ];
-    meta = with lib; {
+    meta = {
       license = lib.licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+      platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
     };
   };
 

From e759ab61e1ae224a071d49e8daee087cfbbbae5c Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:56:19 -0300
Subject: [PATCH 6/8] tmux-plugins: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/misc/tmux-plugins/default.nix | 96 +++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 74b201bc133ca..c617ced0516e5 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -101,12 +101,12 @@ in rec {
     postInstall = ''
       sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux
     '';
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/catppuccin/tmux";
       description = "Soothing pastel theme for Tmux!";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ jnsgruk ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ jnsgruk ];
     };
   };
 
@@ -204,12 +204,12 @@ in rec {
       rev = "v${version}";
       hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk=";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://draculatheme.com/tmux";
       description = "Feature packed Dracula theme for tmux!";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ ethancedwards8 ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ ethancedwards8 ];
     };
   };
 
@@ -295,11 +295,11 @@ in rec {
       rev = "28ed7ce3c73a328d8463d4f4aaa6ccb851e520fa";
       hash = "sha256-tl0SjG/CeolrN7OIHj6MgkB9lFmFgEuJevsSuwVs+78=";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/wfxr/tmux-fzf-url";
       description = "Quickly open urls on your terminal screen!";
-      license = licenses.mit;
-      platforms = platforms.unix;
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
     };
   };
 
@@ -328,12 +328,12 @@ in rec {
     postInstall = ''
       sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh
     '';
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/schasse/tmux-jump";
       description = "Vimium/Easymotion like navigation for tmux";
-      license = licenses.gpl3;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ arnarg ];
+      license = lib.licenses.gpl3;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ arnarg ];
     };
   };
 
@@ -357,12 +357,12 @@ in rec {
       rev = "11520829210a34dc9c7e5be9dead152eaf3a4423";
       sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4=";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/MunifTanjim/tmux-mode-indicator";
       description = "Plugin that displays prompt indicating currently active Tmux mode";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ aacebedo ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ aacebedo ];
     };
   };
 
@@ -480,10 +480,10 @@ in rec {
         ] )}
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Password-store browser using fzf in tmux";
       homepage = "https://github.com/rafi/tmux-pass";
-      license = licenses.unlicense;
+      license = lib.licenses.unlicense;
     };
   };
 
@@ -511,11 +511,11 @@ in rec {
       rev = "16bbde801378a70512059541d104c5ae35be32b9";
       hash = "sha256-IyYQyIONMnVBwhhcI3anOPxKpv2TfI2KZgJ5o5JtZ8I=";
     };
-    meta = with lib; {
+    meta = {
       description = "Tmux powerline theme";
       homepage = "https://github.com/wfxr/tmux-power";
-      license = licenses.mit;
-      platforms = platforms.unix;
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
     };
   };
 
@@ -608,7 +608,7 @@ in rec {
       rev = "V${version}";
       sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/27medkamal/tmux-session-wizard";
       description = "Tmux plugin for creating and switching between sessions based on recently accessed directories";
       longDescription = ''
@@ -618,9 +618,9 @@ in rec {
         * Switching sessions
         * Viewing current or creating new sessions in one popup
       '';
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ mandos ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ mandos ];
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
@@ -676,12 +676,12 @@ in rec {
       sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/jabirali/tmux-tilish";
       description = "Plugin which makes tmux work and feel like i3wm";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ arnarg ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ arnarg ];
     };
   };
 
@@ -695,12 +695,12 @@ in rec {
       rev = "d34f1487b4a644b13d8b2e9a2ee854ae62cc8d0e";
       hash = "sha256-3rMYYzzSS2jaAMLjcQoKreE0oo4VWF9dZgDtABCUOtY=";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/janoamaral/tokyo-night-tmux";
       description = "A clean, dark Tmux theme that celebrates the lights of Downtown Tokyo at night.";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ redyf ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ redyf ];
     };
   };
 
@@ -841,12 +841,12 @@ in rec {
       sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events";
       description = "Makes FocusGained and FocusLost autocommand events work in vim when using tmux";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ ronanmacf ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ ronanmacf ];
     };
   };
 
@@ -873,12 +873,12 @@ in rec {
       hash = "sha256-of9E/npEsF1JVc9ttwrbC5WkIAwCNBJAgTfExfj79i4=";
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/xamut/tmux-weather";
       description = "Shows weather in the status line";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ jfvillablanca ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ jfvillablanca ];
     };
   };
 
@@ -903,12 +903,12 @@ in rec {
       rev = "v${version}";
       sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh";
     };
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/o0th/tmux-nova";
       description = "tmux-nova theme";
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ o0th ];
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ o0th ];
     };
   };
 } // lib.optionalAttrs config.allowAliases {

From c8cd1bb3ce4a3e3ee7d28111fa7157f904f35524 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:56:57 -0300
Subject: [PATCH 7/8] nginx/modules: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/servers/http/nginx/modules.nix | 208 ++++++++++++++--------------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 44575bb91b573..556672965c27b 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -51,10 +51,10 @@ let
       "${src}/patch/${patchName}.patch"
     ];
 
-    meta = with lib; {
+    meta = {
       description = "Forward proxy module for CONNECT request handling";
       homepage = "https://github.com/chobits/ngx_http_proxy_connect_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -74,10 +74,10 @@ let self = {
 
     inputs = [ openssl ];
 
-    meta = with lib; {
+    meta = {
       description = "Validates Akamai v2 query string tokens";
       homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module";
-      license = with licenses; [ agpl3Only ];
+      license = with lib.licenses; [ agpl3Only ];
       maintainers = [ ];
     };
   };
@@ -106,10 +106,10 @@ let self = {
         }))
     ];
 
-    meta = with lib; {
+    meta = {
       description = "Integrate ARPA2 Resource ACLs into nginx";
       homepage = "https://gitlab.com/arpa2/nginx-auth-a2aclr";
-      license = with licenses; [ isc ];
+      license = with lib.licenses; [ isc ];
       maintainers = [ ];
     };
   };
@@ -124,10 +124,10 @@ let self = {
       sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Proxy to authenticated AWS services";
       homepage = "https://github.com/anomalizer/ngx_aws_auth";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -149,10 +149,10 @@ let self = {
 
     inputs = [ brotli ];
 
-    meta = with lib; {
+    meta = {
       description = "Brotli compression";
       homepage = "https://github.com/google/ngx_brotli";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -167,10 +167,10 @@ let self = {
       sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches";
       homepage = "https://github.com/nginx-modules/ngx_cache_purge";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -185,10 +185,10 @@ let self = {
       sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Collection of small and useful nginx add-ons";
       homepage = "https://github.com/FRiCKLE/ngx_coolkit";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -205,10 +205,10 @@ let self = {
 
     inputs = [ expat ];
 
-    meta = with lib; {
+    meta = {
       description = "WebDAV PROPFIND,OPTIONS,LOCK,UNLOCK support";
       homepage = "https://github.com/arut/nginx-dav-ext-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -223,10 +223,10 @@ let self = {
       hash= "sha256-/RQUVHwIdNqm3UemQ/oNs2ksg8beziA4Pxejd5Yg0Pg=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Adds additional generic tools that module developers can use in their own modules";
       homepage = "https://github.com/vision5/ngx_devel_kit";
-      license = with licenses; [ bsd3 ];
+      license = with lib.licenses; [ bsd3 ];
       maintainers = [ ];
     };
   };
@@ -243,10 +243,10 @@ let self = {
       hash = "sha256-K7oOE0yxPYLf+3YMVbBsncpHRpGHXjs/8B5QPO3MQC4=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Brings echo, sleep, time, exec and more shell-style goodies to Nginx";
       homepage = "https://github.com/openresty/echo-nginx-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -261,11 +261,11 @@ let self = {
       sha256 = "0nar45lp3jays3p6b01a78a6gwh6v0snpzcncgiphcqmj5kw8ipg";
     };
 
-    meta = with lib; {
+    meta = {
       description = " Fancy indexes module";
       homepage = "https://github.com/aperezdc/ngx-fancyindex";
-      license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ aneeshusa ];
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = with lib.maintainers; [ aneeshusa ];
     };
   };
 
@@ -279,10 +279,10 @@ let self = {
       sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Fluentd data collector";
       homepage = "https://github.com/fluent/nginx-fluentd-module";
-      license = with licenses; [ asl20 ];
+      license = with lib.licenses; [ asl20 ];
       maintainers = [ ];
     };
   };
@@ -299,11 +299,11 @@ let self = {
 
     inputs = [ libmaxminddb ];
 
-    meta = with lib; {
+    meta = {
       description = "Creates variables with values from the maxmind geoip2 databases";
       homepage = "https://github.com/leev/ngx_http_geoip2_module";
-      license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ pinpox ];
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = with lib.maintainers; [ pinpox ];
     };
   };
 
@@ -327,10 +327,10 @@ let self = {
 
     inputs = [ libbsd ];
 
-    meta = with lib; {
+    meta = {
       description = " IP address anonymizer";
       homepage = "https://github.com/masonicboom/ipscrub";
-      license = with licenses; [ bsd3 ];
+      license = with lib.licenses; [ bsd3 ];
       maintainers = [ ];
     };
   };
@@ -345,10 +345,10 @@ let self = {
       sha256 = "0kkrd08zpcwx938i2is07vq6pgjkvn97xzjab0g4zaz8bivgmjp8";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Limit the total speed from the specific user";
       homepage = "https://github.com/yaoweibin/nginx_limit_speed_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -363,10 +363,10 @@ let self = {
       sha256 = "1kpnhl4b50zim84z22ahqxyxfq4jv8ab85kzsy2n5ciqbyg491lz";
     };
 
-    meta = with lib; {
+    meta = {
       description = "HTTP live module";
       homepage = "https://github.com/arut/nginx-live-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -399,10 +399,10 @@ let self = {
 
     allowMemoryWriteExecute = true;
 
-    meta = with lib; {
+    meta = {
       description = "Embed the Power of Lua";
       homepage = "https://github.com/openresty/lua-nginx-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -420,10 +420,10 @@ let self = {
     inputs = [ luajit_openresty ];
     allowMemoryWriteExecute = true;
 
-    meta = with lib; {
+    meta = {
       description = "Expose Lua API to ngx_lua for Nginx upstreams";
       homepage = "https://github.com/openresty/lua-upstream-nginx-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -440,10 +440,10 @@ let self = {
 
     inputs = [ curl geoip libmodsecurity libxml2 lmdb yajl ];
 
-    meta = with lib; {
+    meta = {
       description = "Open source, cross platform web application firewall (WAF)";
       homepage = "https://github.com/SpiderLabs/ModSecurity";
-      license = with licenses; [ asl20 ];
+      license = with lib.licenses; [ asl20 ];
       maintainers = [ ];
     };
   };
@@ -458,11 +458,11 @@ let self = {
       sha256 = "sha256-X+ygIesQ9PGm5yM+u1BOLYVpm1172P8jWwXNr3ixFY4=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Set, add, and clear arbitrary output headers";
       homepage = "https://github.com/openresty/headers-more-nginx-module";
-      license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ SuperSandro2000 ];
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = with lib.maintainers; [ SuperSandro2000 ];
     };
   };
 
@@ -476,10 +476,10 @@ let self = {
       sha256 = "12dxcyy6wna1fccl3a9lnsbymd6p4apnwz6c24w74v97qvpfdxqd";
     };
 
-    meta = with lib; {
+    meta = {
       description = "MPEG-TS Live Module";
       homepage = "https://github.com/arut/nginx-ts-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -494,10 +494,10 @@ let self = {
       sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
     } + "/naxsi_src";
 
-    meta = with lib; {
+    meta = {
       description = "Open-source, high performance, low rules maintenance WAF";
       homepage = "https://github.com/nbs-system/naxsi";
-      license = with licenses; [ gpl3 ];
+      license = with lib.licenses; [ gpl3 ];
       maintainers = [ ];
     };
   };
@@ -524,10 +524,10 @@ let self = {
 
     inputs = [ which ];
 
-    meta = with lib; {
+    meta = {
       description = "Subset of the JavaScript language that allows extending nginx functionality";
       homepage = "https://nginx.org/en/docs/njs/";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -546,10 +546,10 @@ let self = {
 
     inputs = [ opentracing-cpp ];
 
-    meta = with lib; {
+    meta = {
       description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project";
       homepage = "https://github.com/opentracing-contrib/nginx-opentracing";
-      license = with licenses; [ asl20 ];
+      license = with lib.licenses; [ asl20 ];
       maintainers = [ ];
     };
   };
@@ -579,10 +579,10 @@ let self = {
     inputs = [ zlib libuuid ]; # psol deps
     allowMemoryWriteExecute = true;
 
-    meta = with lib; {
+    meta = {
       description = "Automatic PageSpeed optimization";
       homepage = "https://github.com/apache/incubator-pagespeed-ngx";
-      license = with licenses; [ asl20 ];
+      license = with lib.licenses; [ asl20 ];
       maintainers = [ ];
     };
   };
@@ -599,10 +599,10 @@ let self = {
 
     inputs = [ pam ];
 
-    meta = with lib; {
+    meta = {
       description = "Use PAM for simple http authentication";
       homepage = "https://github.com/sto/ngx_http_auth_pam_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -617,10 +617,10 @@ let self = {
       sha256 = "00fii8bjvyipq6q47xhjhm3ylj4rhzmlk3qwxmfpdn37j7bc8p8c";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Pinba module for nginx";
       homepage = "https://github.com/tony2001/ngx_http_pinba_module";
-      license = with licenses; [ unfree ]; # no license in repo
+      license = with lib.licenses; [ unfree ]; # no license in repo
       maintainers = [ ];
     };
   };
@@ -635,10 +635,10 @@ let self = {
       sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Pure stream http push technology";
       homepage = "https://github.com/wandenberg/nginx-push-stream-module";
-      license = with licenses; [ gpl3 ];
+      license = with lib.licenses; [ gpl3 ];
       maintainers = [ ];
     };
   };
@@ -653,10 +653,10 @@ let self = {
       sha256 = "0y45bswk213yhkc2v1xca2rnsxrhx8v6azxz9pvi71vvxcggqv6h";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Media Streaming Server";
       homepage = "https://github.com/arut/nginx-rtmp-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -674,10 +674,10 @@ let self = {
 
     inputs = [ openssl ];
 
-    meta = with lib; {
+    meta = {
       description = "Generates CDN tokens, either as a cookie or as a query string parameter";
       homepage = "https://github.com/kaltura/nginx-secure-token-module";
-      license = with licenses; [ agpl3Only ];
+      license = with lib.licenses; [ agpl3Only ];
       maintainers = [ ];
     };
   };
@@ -692,10 +692,10 @@ let self = {
       hash = "sha256-jMMj3Ki1uSfQzagoB/O4NarxPjiaF9YRwjSKo+cgMxo=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Various set_xxx directives added to the rewrite module (md5/sha1, sql/json quoting and many more)";
       homepage = "https://github.com/openresty/set-misc-nginx-module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -710,10 +710,10 @@ let self = {
       sha256 = "136zjipaz7iikgcgqwdv1mrh3ya996zyzbkdy6d4k07s2h9g7hy6";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Shibboleth auth request";
       homepage = "https://github.com/nginx-shib/nginx-http-shibboleth";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -728,10 +728,10 @@ let self = {
       sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Implements a collection of augmented statistics based on HTTP-codes and upstreams response time";
       homepage = "https://github.com/goldenclone/nginx-sla";
-      license = with licenses; [ unfree ]; # no license in repo
+      license = with lib.licenses; [ unfree ]; # no license in repo
       maintainers = [ ];
     };
   };
@@ -746,10 +746,10 @@ let self = {
       sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Adds ability to cache static files";
       homepage = "https://github.com/friCKLE/ngx_slowfs_cache";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -764,10 +764,10 @@ let self = {
       sha256 = "0p6b0hcws39n27fx4xp9k4hb3pcv7b6kah4qqaj0pzjy3nbp4gj7";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Expose querystring parameters sorted in a variable";
       homepage = "https://github.com/wandenberg/nginx-sorted-querystring-module";
-      license = with licenses; [ mit ];
+      license = with lib.licenses; [ mit ];
       maintainers = [ ];
     };
   };
@@ -784,11 +784,11 @@ let self = {
 
     inputs = [ libkrb5 ];
 
-    meta = with lib; {
+    meta = {
       description = "SPNEGO HTTP Authentication Module";
       homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module";
-      license = with licenses; [ bsd2 ];
-      maintainers = teams.deshaw.members;
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -802,10 +802,10 @@ let self = {
       sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Send statistics to statsd";
       homepage = "https://github.com/harvesthq/nginx-statsd";
-      license = with licenses; [ bsd3 ];
+      license = with lib.licenses; [ bsd3 ];
       maintainers = [ ];
     };
   };
@@ -820,10 +820,10 @@ let self = {
       sha256 = "1jdj1kik6l3rl9nyx61xkqk7hmqbncy0rrqjz3dmjqsz92y8zaya";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Stream server traffic status core module";
       homepage = "https://github.com/vozlt/nginx-module-stream-sts";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -838,10 +838,10 @@ let self = {
       sha256 = "0nvb29641x1i7mdbydcny4qwlvdpws38xscxirajd2x7nnfdflrk";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Stream server traffic status module";
       homepage = "https://github.com/vozlt/nginx-module-sts";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -856,10 +856,10 @@ let self = {
       sha256 = "sha256-3sWgue6QZYwK69XSi9q8r3WYGVyMCIgfqqLvPBHqJKU=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Filter module which can do both regular expression and fixed string substitutions";
       homepage = "https://github.com/yaoweibin/ngx_http_substitutions_filter_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -874,10 +874,10 @@ let self = {
       sha256 = "19c6w6wscbq9phnx7vzbdf4ay6p2ys0g7kp2rmc9d4fb53phrhfx";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Nginx sysguard module";
       homepage = "https://github.com/vozlt/nginx-module-sysguard";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -892,10 +892,10 @@ let self = {
       sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Handle file uploads using multipart/form-data encoding and resumable uploads";
       homepage = "https://github.com/fdintino/nginx-upload-module";
-      license = with licenses; [ bsd3 ];
+      license = with lib.licenses; [ bsd3 ];
       maintainers = [ ];
     };
   };
@@ -910,10 +910,10 @@ let self = {
       sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Support upstream health check";
       homepage = "https://github.com/yaoweibin/nginx_upstream_check_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -930,10 +930,10 @@ let self = {
 
     inputs = [ msgpuck.dev yajl ];
 
-    meta = with lib; {
+    meta = {
       description = "Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)";
       homepage = "https://github.com/tarantool/nginx_upstream_module";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -948,10 +948,10 @@ let self = {
       sha256 = "0mk1gjmfnry6hgdsnlavww9bn7223idw50jlkhh5k00q5509w4ip";
     };
 
-    meta = with lib; {
+    meta = {
       description = "URL encoding converting module";
       homepage = "https://github.com/vozlt/nginx-module-url";
-      license = with licenses; [ bsd2 ];
+      license = with lib.licenses; [ bsd2 ];
       maintainers = [ ];
     };
   };
@@ -969,10 +969,10 @@ let self = {
 
     inputs = [ ffmpeg-headless libjpeg ];
 
-    meta = with lib; {
+    meta = {
       description = "Extract thumbs from a video file";
       homepage = "https://github.com/wandenberg/nginx-video-thumbextractor-module";
-      license = with licenses; [ gpl3 ];
+      license = with lib.licenses; [ gpl3 ];
       maintainers = [ ];
     };
   };
@@ -993,10 +993,10 @@ let self = {
 
     inputs = [ ffmpeg_6-headless fdk_aac openssl libxml2 libiconv ];
 
-    meta = with lib; {
+    meta = {
       description = "VOD packager";
       homepage = "https://github.com/kaltura/nginx-vod-module";
-      license = with licenses; [ agpl3Only ];
+      license = with lib.licenses; [ agpl3Only ];
       maintainers = [ ];
     };
   };
@@ -1011,11 +1011,11 @@ let self = {
       sha256 = "sha256-ReTmYGVSOwtnYDMkQDMWwxw09vT4iHYfYZvgd8iBotk=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Virtual host traffic status module";
       homepage = "https://github.com/vozlt/nginx-module-vts";
-      license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ SuperSandro2000 ];
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = with lib.maintainers; [ SuperSandro2000 ];
     };
   };
 
@@ -1031,11 +1031,11 @@ let self = {
 
     inputs = [ zstd ];
 
-    meta = with lib; {
+    meta = {
       description = "Nginx modules for the Zstandard compression";
       homepage = "https://github.com/tokers/zstd-nginx-module";
-      license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ SuperSandro2000 ];
+      license = with lib.licenses; [ bsd2 ];
+      maintainers = with lib.maintainers; [ SuperSandro2000 ];
     };
   };
 }; in self // lib.optionalAttrs config.allowAliases {

From c281d764ecf85b8c3d3842c0801eb9a867e1ec11 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 14:57:25 -0300
Subject: [PATCH 8/8] perlPackages: remove with lib in meta

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/top-level/perl-packages.nix | 388 +++++++++++++++----------------
 1 file changed, 194 insertions(+), 194 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 94923ff13f683..e88f615baca36 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -228,7 +228,7 @@ with self; {
     meta = {
       description = "Perl extension for getting the Longest Common Sub-Sequence";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -309,7 +309,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Alien::FFI";
       description = "Build and make available libffi";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -492,7 +492,7 @@ with self; {
       description = "RSA public-key cryptosystem, using Math::BigInt";
       homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -877,7 +877,7 @@ with self; {
       description = "Fast CPAN module installer";
       homepage = "https://github.com/skaji/cpm";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
       mainProgram = "cpm";
     };
   };
@@ -893,7 +893,7 @@ with self; {
       description = "Write object oriented scripts with ease";
       homepage = "https://github.com/jhthorsen/applify";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -1062,7 +1062,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Archive::Libarchive";
       description = "Modern Perl bindings to libarchive";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -1079,7 +1079,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Archive::Libarchive::Extract";
       description = "Archive extracting mechanism (using libarchive)";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -1096,7 +1096,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Archive::Libarchive::Peek";
       description = "Peek into archives without extracting them";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -1438,7 +1438,7 @@ with self; {
       description = "OATH One Time Passwords";
       homepage = "https://github.com/oalders/authen-oath";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -1497,7 +1497,7 @@ with self; {
     meta = {
       description = "Stringprep Profile for User Names and Passwords (RFC 4013)";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -1514,7 +1514,7 @@ with self; {
       description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
       homepage = "https://github.com/dagolden/Authen-SCRAM";
       license = with lib.licenses; [ asl20 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -1963,7 +1963,7 @@ with self; {
     meta = {
       description = "BSD process resource limit and priority functions";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -2099,7 +2099,7 @@ with self; {
     meta = {
       description = "Perl extension to generate cryptographically-secure random bytes";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -2113,7 +2113,7 @@ with self; {
     meta = {
       description = "Tiny Perl extension to generate cryptographically-secure random bytes";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -2261,7 +2261,7 @@ with self; {
     meta = {
       description = "Sanity-check calling context";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -3090,7 +3090,7 @@ with self; {
     meta = {
       description = "Get the CDDB info for an audio cd";
       license = with lib.licenses; [ artistic1 ];
-      maintainers = [ maintainers.endgame ];
+      maintainers = [ lib.maintainers.endgame ];
       mainProgram = "cddb.pl";
     };
   };
@@ -3345,7 +3345,7 @@ with self; {
       description = "Communicate with a smart card using PC/SC";
       homepage = "https://pcsc-perl.apdu.fr/";
       license = with lib.licenses; [ gpl2Plus ];
-      maintainers = with maintainers; [ abbradar anthonyroussel ];
+      maintainers = with lib.maintainers; [ abbradar anthonyroussel ];
     };
   };
 
@@ -3373,7 +3373,7 @@ with self; {
       description = "Alias for __PACKAGE__";
       homepage = "https://metacpan.org/pod/CLASS";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -3570,7 +3570,7 @@ with self; {
     meta = {
       description = "Base class for hierarchally ordered objects";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -4083,7 +4083,7 @@ with self; {
       description = "Run external commands and Perl code refs";
       homepage = "https://github.com/skaji/Command-Runner";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -4338,7 +4338,7 @@ with self; {
       description = "Module for reading .ini-style configuration files";
       homepage = "https://metacpan.org/release/Config-IniFiles";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -4523,7 +4523,7 @@ with self; {
     meta = {
       description = "Convert binary octets into ASCII armoured messages";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -4551,7 +4551,7 @@ with self; {
     meta = {
       description = "Encoding and decoding of base32 strings";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -4777,7 +4777,7 @@ with self; {
       description = "Create a minimal mirror of CPAN";
       homepage = "https://github.com/rjbs/CPAN-Mini";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       mainProgram = "minicpan";
     };
   };
@@ -4809,7 +4809,7 @@ with self; {
       description = "Search packages in 02packages.details.txt";
       homepage = "https://github.com/skaji/CPAN-02Packages-Search";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -4980,7 +4980,7 @@ with self; {
     meta = {
       description = "CAST5 block cipher in pure Perl";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5039,7 +5039,7 @@ with self; {
     meta = {
       description = "Triple-DES EDE encryption/decryption";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5084,7 +5084,7 @@ with self; {
     meta = {
       description = "DSA Signatures and Key Generation";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5127,7 +5127,7 @@ with self; {
     meta = {
       description = "Conversion utilities for encryption applications";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5148,7 +5148,7 @@ with self; {
       description = "Secure memorable password generator";
       homepage = "http://www.bartb.ie/hsxkpasswd";
       license = with lib.licenses; [ bsd2 ];
-      maintainers = [ maintainers.dannixon ];
+      maintainers = [ lib.maintainers.dannixon ];
       mainProgram = "hsxkpasswd";
     };
     # Two tests fail as a result of https://github.com/bbusschots/hsxkpasswd/issues/42
@@ -5267,7 +5267,7 @@ with self; {
       description = "Provide strong randomness for seeding";
       homepage = "https://github.com/danaj/Crypt-Random-Seed";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5353,7 +5353,7 @@ with self; {
       description = "Perl extension for the RIPEMD-160 Hash function";
       homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5408,7 +5408,7 @@ with self; {
     meta = {
       description = "Provide non blocking randomness";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5425,7 +5425,7 @@ with self; {
       description = "Scrypt password based key derivation function";
       homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5455,7 +5455,7 @@ with self; {
       description = "Perl bindings for libsodium (NaCL)";
       homepage = "https://metacpan.org/release/Crypt-Sodium";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5469,7 +5469,7 @@ with self; {
     meta = {
       description = "Twofish Encryption Algorithm";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5497,7 +5497,7 @@ with self; {
       description = "Pure-Perl OpenPGP implementation";
       homepage = "https://github.com/btrott/Crypt-OpenPGP";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       mainProgram = "pgplet";
     };
   };
@@ -5598,7 +5598,7 @@ with self; {
       description = "Perl extension to OpenSSL's X509 API";
       homepage = "https://github.com/dsully/perl-crypt-openssl-x509";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5615,7 +5615,7 @@ with self; {
       description = "PBKDF2 password hash algorithm";
       homepage = "https://metacpan.org/release/Crypt-PBKDF2";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5632,7 +5632,7 @@ with self; {
     meta = {
       description = "Cryptography in pure Perl";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -5650,7 +5650,7 @@ with self; {
     meta = {
       description = "Minimal Ed25519 bindings";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = [ lib.maintainers.thoughtpolice ];
     };
   };
 
@@ -5979,7 +5979,7 @@ with self; {
       description = "Hexadecial Dumper";
       homepage = "https://github.com/neilb/Data-HexDump";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
+      maintainers = with lib.maintainers; [ ];
       mainProgram = "hexdump";
     };
   };
@@ -6066,7 +6066,7 @@ with self; {
       description = "Grep-like program for searching source code";
       homepage = "https://github.com/msgpack/msgpack-perl";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin
     };
   };
@@ -6316,7 +6316,7 @@ with self; {
       description = "Universally Unique Lexicographically Sortable Identifier";
       homepage = "https://metacpan.org/release/Data-ULID";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -7089,7 +7089,7 @@ with self; {
     meta = {
       description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7106,7 +7106,7 @@ with self; {
     meta = {
       description = "Resolve an Organizationally Unique Identifier";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7194,7 +7194,7 @@ with self; {
       description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)";
       homepage = "https://github.com/gooddata/DBD-MariaDB";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7397,7 +7397,7 @@ with self; {
       description = "Create a temporary database from a DBIx::Class::Schema";
       homepage = "https://metacpan.org/pod/DBICx::TestDatabase";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7462,7 +7462,7 @@ with self; {
       description = "Automatically set and update fields";
       homepage = "https://metacpan.org/pod/DBIx::Class::DynamicDefault";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7509,7 +7509,7 @@ with self; {
       description = "Inflators to serialize data structures for DBIx::Class";
       homepage = "https://metacpan.org/release/DBIx-Class-InflateColumn-Serializer";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7639,7 +7639,7 @@ with self; {
     meta = {
       description = "Read/write buffer class";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7925,7 +7925,7 @@ with self; {
     meta = {
       description = "Perl interface to the MD2 Algorithm";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -7993,7 +7993,7 @@ with self; {
       description = "Perl extension for SHA-3";
       homepage = "https://metacpan.org/release/Digest-SHA3";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       mainProgram = "sha3sum";
     };
   };
@@ -8645,7 +8645,7 @@ with self; {
       homepage = "https://www.matijs.net/software/msgconv/";
       description = ".MSG to mbox converter";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ peterhoeg ];
+      maintainers = with lib.maintainers; [ peterhoeg ];
       mainProgram = "msgconvert";
     };
   };
@@ -8701,7 +8701,7 @@ with self; {
       description = "More casual approach to creating and sending Email:: emails";
       homepage = "https://github.com/rjbs/Email-Stuffer";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -8761,7 +8761,7 @@ with self; {
       description = "High speed Base32 encoding using GMP with BigInt and MD5 support";
       homepage = "https://metacpan.org/release/Encode-Base32-GMP";
       license = with lib.licenses; [ mit ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -9006,11 +9006,11 @@ with self; {
       hash = "sha256-VaUsIz4troYRP58Zs09hftz8hBb5vs5nEme9GBGxIRE=";
     };
     outputs = [ "out" ];
-    meta = with lib; {
+    meta = {
       description = "Simplified safe evaluation of Perl code";
       homepage = "https://github.com/mkende/perl-eval-safe";
-      license = licenses.mit;
-      maintainers = with maintainers; [ figsoda ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ figsoda ];
     };
   };
 
@@ -9495,7 +9495,7 @@ with self; {
       homepage = "https://metacpan.org/pod/FFI::C";
       description = "C data types for FFI";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -9543,7 +9543,7 @@ with self; {
       homepage = "https://metacpan.org/pod/FFI::C::Stat";
       description = "Object-oriented FFI interface to native stat and lstat";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -9560,7 +9560,7 @@ with self; {
       homepage = "https://pl.atypus.org";
       description = "Write Perl bindings to non-Perl libraries with FFI. No XS required";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -9577,7 +9577,7 @@ with self; {
       homepage = "https://metacpan.org/pod/FFI::Platypus::Type::PtrObject";
       description = "Platypus custom type for an object wrapped around an opaque pointer";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -9594,7 +9594,7 @@ with self; {
       homepage = "https://metacpan.org/pod/FFI::Platypus::Type::Enum";
       description = "Custom platypus type for dealing with C enumerated types";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -9890,7 +9890,7 @@ with self; {
     meta = {
       description = "Simple filename and pathname matching";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -9904,7 +9904,7 @@ with self; {
     meta = {
       description = "File locking with fcntl(2)";
       license = with lib.licenses; [ artistic1 ];
-      maintainers = with maintainers; [ das_j ];
+      maintainers = with lib.maintainers; [ das_j ];
     };
   };
 
@@ -9918,7 +9918,7 @@ with self; {
     meta = {
       description = "Find matches to a pattern in a series of files and related functions";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -9934,7 +9934,7 @@ with self; {
       description = "FileHandle which supports multi-byte unget";
       homepage = "https://github.com/coppit/filehandle-unget";
       license = with lib.licenses; [ gpl2Only ];
-      maintainers = with maintainers; [ romildo ];
+      maintainers = with lib.maintainers; [ romildo ];
     };
   };
 
@@ -10161,7 +10161,7 @@ with self; {
     meta = {
       description = "Pid File Manipulation";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -10248,7 +10248,7 @@ with self; {
       homepage = "https://metacpan.org/pod/File::ShareDir::Dist";
       description = "Locate per-dist shared files";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -10359,7 +10359,7 @@ with self; {
     meta = {
       description = "Perl extension for reading from continously updated files";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -10374,7 +10374,7 @@ with self; {
       description = "Update file access and modification times, optionally creating files if needed";
       homepage = "https://github.com/neilb/File-Touch";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -10432,7 +10432,7 @@ with self; {
       description = "Cross-platform way to get system-wide & user private temporary directory";
       homepage = "https://metacpan.org/release/File-Util-Tempdir";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -10651,7 +10651,7 @@ with self; {
     meta = {
       description = "Deferred subroutine syntax for futures";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -10668,7 +10668,7 @@ with self; {
     meta = {
       description = "Future-returning IO methods";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -10811,7 +10811,7 @@ with self; {
     meta = {
       description = "Interpolates script options from files into @ARGV or another array";
       license = with lib.licenses; [ artistic1 ];
-      maintainers = [ maintainers.pSub ];
+      maintainers = [ lib.maintainers.pSub ];
     };
   };
 
@@ -10868,7 +10868,7 @@ with self; {
     meta = {
       description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
       license = with lib.licenses; [ gpl2Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -10886,7 +10886,7 @@ with self; {
     meta = {
       description = "Create fixup commits for topic branches";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = [ lib.maintainers.DamienCassou ];
       mainProgram = "git-autofixup";
     };
   };
@@ -11224,7 +11224,7 @@ with self; {
       description = "Search mailboxes for mail matching a regular expression";
       homepage = "https://github.com/coppit/grepmail";
       license = with lib.licenses; [ gpl2Only ];
-      maintainers = with maintainers; [ romildo ];
+      maintainers = with lib.maintainers; [ romildo ];
     };
   };
 
@@ -11255,7 +11255,7 @@ with self; {
     meta = {
       description = "Perl extension providing access to the GSSAPIv2 library";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -12494,7 +12494,7 @@ with self; {
       description = "Cache HTTP::Tiny responses";
       homepage = "https://metacpan.org/release/HTTP-Tiny-Cache";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -12570,7 +12570,7 @@ with self; {
     meta = {
       description = "Generate QR Code with Imager using libqrencode";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -12776,7 +12776,7 @@ with self; {
     meta = {
       description = "Use SSL/TLS with IO::Async";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -13269,7 +13269,7 @@ with self; {
       description = "Common utilities for IRC-related tasks";
       homepage = "https://metacpan.org/release/IRC-Utils";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -13520,7 +13520,7 @@ with self; {
       description = "Validate data against a JSON schema";
       homepage = "https://github.com/mojolicious/json-validator";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -13642,7 +13642,7 @@ with self; {
       description = "Transforms TeX and LaTeX into XML/HTML/MathML";
       homepage = "https://dlmf.nist.gov/LaTeXML/";
       license = with lib.licenses; [ publicDomain ];
-      maintainers = with maintainers; [ xworld21 ];
+      maintainers = with lib.maintainers; [ xworld21 ];
       mainProgram = "latexmlc";
     };
   };
@@ -14026,7 +14026,7 @@ with self; {
       description = "Embed / expand oEmbed resources and other URL / links";
       homepage = "https://github.com/jhthorsen/linkembedder";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -14042,7 +14042,7 @@ with self; {
     meta = {
       description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -14550,7 +14550,7 @@ with self; {
       description = "Perl module to rotate logfiles";
       homepage = "https://metacpan.org/dist/Logfile-Rotate";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -14565,7 +14565,7 @@ with self; {
       description = "Lightweight, flexible logging framework";
       homepage = "https://metacpan.org/release/Log-ger";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -15038,7 +15038,7 @@ with self; {
       description = "Fast and simple mbox folder reader";
       homepage = "https://github.com/coppit/mail-mbox-messageparser";
       license = with lib.licenses; [ gpl2Only ];
-      maintainers = with maintainers; [ romildo ];
+      maintainers = with lib.maintainers; [ romildo ];
     };
   };
 
@@ -15145,7 +15145,7 @@ with self; {
       description = "Simple platform independent mailer";
       homepage = "https://github.com/neilb/Mail-Sendmail";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -15254,7 +15254,7 @@ with self; {
       homepage = "https://github.com/Grinnz/Math-Calc-Parser";
       broken = true;
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -15387,7 +15387,7 @@ with self; {
       description = "Perl interface to the GMP integer functions";
       homepage = "https://github.com/sisyphus/math-gmpz";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -15488,7 +15488,7 @@ with self; {
       description = "Utilities related to prime numbers, including fast sieves and factoring";
       homepage = "https://github.com/danaj/Math-Prime-Util";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -15506,7 +15506,7 @@ with self; {
       description = "Utilities related to prime numbers, using GMP";
       homepage = "https://github.com/danaj/Math-Prime-Util-GMP";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -15522,7 +15522,7 @@ with self; {
     meta = {
       description = "Generate a provable prime number, in pure Perl";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -15774,7 +15774,7 @@ with self; {
     meta = {
       description = "Meta-programming API";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -15813,7 +15813,7 @@ with self; {
       description = "Comprehensive, DWIM-featured client to the MetaCPAN API";
       homepage = "https://github.com/metacpan/metacpan-client";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -15912,7 +15912,7 @@ with self; {
       description = "Deal with RFC 2047 encoded words (improved)";
       homepage = "https://metacpan.org/pod/MIME::EncWords";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -15986,7 +15986,7 @@ with self; {
       description = "High performance job queue for Perl";
       homepage = "https://github.com/mojolicious/minion";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16003,7 +16003,7 @@ with self; {
       homepage = "https://github.com/Difegue/Minion-Backend-Redis";
       description = "Redis backend for Minion job queue";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -16020,7 +16020,7 @@ with self; {
       description = "SQLite backend for Minion job queue";
       homepage = "https://github.com/Grinnz/Minion-Backend-SQLite";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16037,7 +16037,7 @@ with self; {
       description = "MySQL backend for the Minion job queue";
       homepage = "https://github.com/preaction/Minion-Backend-mysql";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16127,7 +16127,7 @@ with self; {
       description = "Parse cpmfile";
       homepage = "https://github.com/skaji/cpmfile";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -16441,7 +16441,7 @@ with self; {
       description = "Module::Install extension to include GitHub meta information in META.yml";
       homepage = "https://github.com/bingos/module-install-githubmeta";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16458,7 +16458,7 @@ with self; {
       description = "Module::Install extension to automatically convert POD to a README";
       homepage = "https://github.com/bingos/module-install-readmefrompod";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16475,7 +16475,7 @@ with self; {
       description = "Create README.mkdn from POD";
       homepage = "https://search.cpan.org/dist/Module-Install-ReadmeMarkdownFromPod";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16490,7 +16490,7 @@ with self; {
     meta = {
       description = "Automatically sets repository URL from svn/svk/Git checkout";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16731,7 +16731,7 @@ with self; {
       description = "Real-time web framework";
       homepage = "https://mojolicious.org";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ marcusramberg sgo thoughtpolice ];
+      maintainers = with lib.maintainers; [ marcusramberg sgo thoughtpolice ];
       mainProgram = "mojo";
     };
   };
@@ -16748,7 +16748,7 @@ with self; {
       description = "Compress and convert css, less, sass, javascript and coffeescript files";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -16763,7 +16763,7 @@ with self; {
     meta = {
       description = "Globally Recognized Avatars for Mojolicious";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -16794,7 +16794,7 @@ with self; {
       description = "Mojolicious Plugin for send mail";
       homepage = "https://github.com/sharifulin/Mojolicious-Plugin-Mail";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16810,7 +16810,7 @@ with self; {
       description = "OpenAPI / Swagger plugin for Mojolicious";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16826,7 +16826,7 @@ with self; {
       description = "\"render_file\" helper for Mojolicious";
       homepage = "https://github.com/koorchik/Mojolicious-Plugin-RenderFile";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -16842,7 +16842,7 @@ with self; {
       description = "Mojolicious server status";
       homepage = "https://mojolicious.org";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = [ lib.maintainers.thoughtpolice ];
     };
   };
 
@@ -16858,7 +16858,7 @@ with self; {
       description = "Plugin for enabling a Mojolicious app to log to syslog";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16875,7 +16875,7 @@ with self; {
       homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit";
       description = "Template Toolkit renderer plugin for Mojolicious";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -16891,7 +16891,7 @@ with self; {
       description = "Render exceptions as text in command line user agents";
       homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16907,7 +16907,7 @@ with self; {
       description = "Mojolicious <3 Webpack";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16923,7 +16923,7 @@ with self; {
       description = "Redis driver based on Mojo::IOLoop";
       homepage = "https://github.com/jhthorsen/mojo-redis";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16939,7 +16939,7 @@ with self; {
     meta = {
       description = "SAML2 toolkit using the Mojo toolkit";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16956,7 +16956,7 @@ with self; {
       description = "Tiny Mojolicious wrapper for SQLite";
       homepage = "https://github.com/Grinnz/Mojo-SQLite";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16973,7 +16973,7 @@ with self; {
       description = "Mojolicious and Async MySQL/MariaDB";
       homepage = "https://github.com/jhthorsen/mojo-mysql";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -16990,7 +16990,7 @@ with self; {
       description = "(DISCOURAGED) Promises/A+ and flow-control helpers";
       homepage = "https://github.com/jberger/Mojo-IOLoop-Delay";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -17011,7 +17011,7 @@ with self; {
       description = "(DEPRECATED) run blocking functions asynchronously by forking";
       homepage = "https://github.com/jberger/Mojo-IOLoop-ForkCall";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -17028,7 +17028,7 @@ with self; {
       description = "JSON Web Token the Mojo way";
       homepage = "https://github.com/jberger/Mojo-JWT";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -17045,7 +17045,7 @@ with self; {
       description = "Mojolicious ♥ PostgreSQL";
       homepage = "https://mojolicious.org";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -17063,7 +17063,7 @@ with self; {
       description = "Caching, Non-blocking I/O HTTP, Local file and WebSocket user agent";
       homepage = "https://github.com/nicomen/mojo-useragent-cached";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -17457,7 +17457,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Test::Archive::Libarchive";
       description = "Testing tools for Archive::Libarchive";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -18285,11 +18285,11 @@ with self; {
       hash = "sha256-hVnitkzZjZmrxmbt8qTIckyVNGEmFq8R9OsLvQ1CLaw=";
     };
     checkInputs = [ TestPod TestPodCoverage ];
-    meta = with lib; {
+    meta = {
       description = "Perl bindings to the msgpack C library";
       homepage = "https://github.com/jacquesg/p5-MsgPack-Raw";
-      license = with licenses; [ gpl1Plus /* or */ artistic1 ];
-      maintainers = with maintainers; [ figsoda ];
+      license = with lib.licenses; [ gpl1Plus /* or */ artistic1 ];
+      maintainers = with lib.maintainers; [ figsoda ];
     };
   };
 
@@ -18355,7 +18355,7 @@ with self; {
       description = "Generates a database upgrade instruction set";
       homepage = "https://github.com/estrabd/mysqldiff";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       mainProgram = "mysqldiff";
     };
   };
@@ -18414,11 +18414,11 @@ with self; {
     ];
     # TODO: fix tests
     doCheck = false;
-    meta = with lib; {
+    meta = {
       description = "Perl bindings for Neovim";
       homepage = "https://github.com/jacquesg/p5-Neovim-Ext";
-      license = with licenses; [ gpl1Plus /* or */ artistic1 ];
-      maintainers = with maintainers; [ figsoda ];
+      license = with lib.licenses; [ gpl1Plus /* or */ artistic1 ];
+      maintainers = with lib.maintainers; [ figsoda ];
     };
   };
 
@@ -18432,7 +18432,7 @@ with self; {
     meta = {
       description = "Non-blocking system DNS resolver";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -18571,7 +18571,7 @@ with self; {
     meta = {
       description = "Use HTTP with IO::Async";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -18587,7 +18587,7 @@ with self; {
     meta = {
       description = "Serve HTTP with IO::Async";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.anoa ];
+      maintainers = [ lib.maintainers.anoa ];
     };
   };
 
@@ -18624,7 +18624,7 @@ with self; {
     meta = {
       description = "Use WebSockets with IO::Async";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -18654,7 +18654,7 @@ with self; {
     meta = {
       description = "Manipulate IPv4/IPv6 netblocks in CIDR notation";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = [ lib.maintainers.bjornfor ];
     };
   };
 
@@ -18668,7 +18668,7 @@ with self; {
     meta = {
       description = "Perl extension for merging IPv4 or IPv6 CIDR addresses";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -18936,7 +18936,7 @@ with self; {
       description = "Perl extension for manipulating IPv4/IPv6 addresses";
       homepage = "https://metacpan.org/pod/Net::IP::Lite";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -19605,7 +19605,7 @@ with self; {
     meta = {
       description = "NTLM authentication module";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.pSub ];
+      maintainers = [ lib.maintainers.pSub ];
     };
   };
 
@@ -19663,7 +19663,7 @@ with self; {
     meta = {
       description = "Simple syntax for lexical field-based objects";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -19735,7 +19735,7 @@ with self; {
       description = "Client for talking to an Open API powered server";
       homepage = "https://github.com/jhthorsen/openapi-client";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -19779,7 +19779,7 @@ with self; {
     meta = {
       description = "Perl Open OpenDocument Connector";
       license = with lib.licenses; [ lgpl21Only ];
-      maintainers = [ maintainers.wentasah ];
+      maintainers = [ lib.maintainers.wentasah ];
     };
   };
 
@@ -19853,7 +19853,7 @@ with self; {
       description = "Perl extension for Apache ZooKeeper";
       homepage = "https://github.com/mark-5/p5-net-zookeeper";
       license = with lib.licenses; [ asl20 ];
-      maintainers = teams.deshaw.members ++ [ maintainers.ztzg ];
+      maintainers = lib.teams.deshaw.members ++ [ maintainers.ztzg ];
     };
   };
 
@@ -19975,7 +19975,7 @@ with self; {
       description = "Execute loops using parallel forked subprocesses";
       homepage = "https://github.com/pmorch/perl-Parallel-Loops";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -19991,7 +19991,7 @@ with self; {
       description = "Parallel processing using pipe(2) for communication and synchronization";
       homepage = "https://github.com/skaji/Parallel-Pipes";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -20087,7 +20087,7 @@ with self; {
     meta = {
       description = "General function library for safer, more secure programming";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -20141,9 +20141,9 @@ with self; {
       url = "mirror://cpan/authors/id/J/JM/JMACFARLA/Parse-Win32Registry-1.1.tar.gz";
       hash = "sha256-wWOyAr5q17WPSEZJT/crjJqXloPKmU5DgOmsZWTcBbo=";
     };
-    meta = with lib; {
+    meta = {
       description = "Module for parsing Windows Registry files";
-      license = with licenses; [ artistic1 gpl1Only ];
+      license = with lib.licenses; [ artistic1 gpl1Only ];
     };
   };
 
@@ -20200,7 +20200,7 @@ with self; {
       description = "Parser for the IRC protocol";
       homepage = "https://github.com/bingos/parse-irc";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -20230,7 +20230,7 @@ with self; {
     meta = {
       description = "Parser/Generator of human-readable conf files";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -20399,7 +20399,7 @@ with self; {
       description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2";
       homepage = "https://github.com/dagolden/PBKDF2-Tiny";
       license = with lib.licenses; [ asl20 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -20757,7 +20757,7 @@ with self; {
       description = "LDAP client library";
       homepage = "https://ldap.perl.org";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -20824,7 +20824,7 @@ with self; {
       description = "Pure-Perl Core-Only replacement for pkg-config";
       homepage = "https://metacpan.org/pod/PkgConfig";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
       mainProgram = "ppkg-config";
     };
   };
@@ -21048,7 +21048,7 @@ with self; {
       description = "Perl Language Server";
       homepage = "https://github.com/FractalBoy/perl-language-server";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.artturin ];
+      maintainers = [ lib.maintainers.artturin ];
       mainProgram = "pls";
     };
   };
@@ -21102,7 +21102,7 @@ with self; {
       description = "Portable, event-loop agnostic eventy networking and multitasking";
       homepage = "http://poe.perl.org";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
     };
   };
 
@@ -21117,7 +21117,7 @@ with self; {
       description = "Reusable tests for POE::Loop authors";
       homepage = "https://search.cpan.org/dist/POE-Test-Loops";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = teams.deshaw.members;
+      maintainers = lib.teams.deshaw.members;
       mainProgram = "poe-gen-tests";
     };
   };
@@ -21211,7 +21211,7 @@ with self; {
     meta = {
       description = "Pattern-based Perl Recognizer";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.artturin ];
+      maintainers = [ lib.maintainers.artturin ];
     };
   };
 
@@ -21381,7 +21381,7 @@ with self; {
       description = "Redis protocol parser/encoder with asynchronous capabilities";
       homepage = "https://github.com/und3f/protocol-redis";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -21397,7 +21397,7 @@ with self; {
       description = "Optimized pure-perl Redis protocol parser/encoder";
       homepage = "https://github.com/Grinnz/Protocol-Redis-Faster";
       license = with lib.licenses; [ artistic2 ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -22123,7 +22123,7 @@ with self; {
       description = "Date and time regexps";
       homepage = "https://github.com/manwar/Regexp-Common-time";
       license = with lib.licenses; [ artistic2 mit bsd3 ];
-      maintainers = [ maintainers.artturin ];
+      maintainers = [ lib.maintainers.artturin ];
     };
   };
 
@@ -22548,7 +22548,7 @@ with self; {
       description = "Fast, compact, powerful binary deserialization";
       homepage = "https://github.com/Sereal/Sereal";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = [ lib.maintainers.thoughtpolice ];
     };
   };
 
@@ -22564,7 +22564,7 @@ with self; {
       description = "Fast, compact, powerful binary serialization";
       homepage = "https://github.com/Sereal/Sereal";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = [ lib.maintainers.thoughtpolice ];
     };
   };
 
@@ -22580,7 +22580,7 @@ with self; {
     meta = {
       description = "Fast, compact, powerful binary (de-)serialization";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = [ lib.maintainers.thoughtpolice ];
     };
   };
 
@@ -22633,7 +22633,7 @@ with self; {
       description = "Secure, efficient, simple random session token generation";
       homepage = "https://github.com/hoytech/Session-Token";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -22701,7 +22701,7 @@ with self; {
       description = "Comments that do more than just sit there";
       homepage = "https://github.com/neilb/Smart-Comments";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -23351,7 +23351,7 @@ with self; {
       description = "Simple diff to String";
       homepage = "https://github.com/yappo/p5-String-Diff";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -23904,7 +23904,7 @@ with self; {
     meta = {
       description = "Read Perl's symbol table programmatically";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -23978,7 +23978,7 @@ with self; {
     meta = {
       description = "Try/catch/finally syntax for perl";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -23991,7 +23991,7 @@ with self; {
     };
     meta = {
       description = "Use mmap to map in a file as a Perl variable";
-      maintainers = with maintainers; [ peterhoeg ];
+      maintainers = with lib.maintainers; [ peterhoeg ];
       license = with lib.licenses; [ gpl2Plus ];
     };
   };
@@ -24006,7 +24006,7 @@ with self; {
     meta = {
       description = "Memory information";
       license = with lib.licenses; [ gpl2Plus ];
-      maintainers = [ maintainers.pSub ];
+      maintainers = [ lib.maintainers.pSub ];
     };
   };
 
@@ -24048,7 +24048,7 @@ with self; {
     meta = {
       description = "Set CPU affinity for processes";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -24786,7 +24786,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Test2::Tools::FFI";
       description = "Tools for testing FFI";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -24803,7 +24803,7 @@ with self; {
       homepage = "https://metacpan.org/pod/Test2::Tools::MemoryCycle";
       description = "Check for memory leaks and circular memory references";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ tomasajt ];
+      maintainers = with lib.maintainers; [ tomasajt ];
     };
   };
 
@@ -25723,7 +25723,7 @@ with self; {
       description = "Mysqld runner for tests";
       homepage = "https://github.com/kazuho/p5-test-mysqld";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -26690,7 +26690,7 @@ with self; {
       description = "Various subroutines to format text";
       homepage = "https://github.com/shlomif/perl-Module-Format";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ bcdarwin ];
+      maintainers = with lib.maintainers; [ bcdarwin ];
     };
   };
 
@@ -26705,7 +26705,7 @@ with self; {
     meta = {
       description = "Generate a colorful HTML diff of strings/files";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -26788,7 +26788,7 @@ with self; {
       description = "Test environment setup for development with IDE";
       homepage = "https://github.com/wchristian/Test-InDistDir";
       license = with lib.licenses; [ wtfpl ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -26843,7 +26843,7 @@ with self; {
     meta = {
       description = "Generate random Latin looking text";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
       mainProgram = "lorem";
     };
   };
@@ -27278,7 +27278,7 @@ with self; {
     meta = {
       description = "Extract collocations and Ngrams from text";
       license = with lib.licenses; [ gpl2Plus ];
-      maintainers = [ maintainers.bzizou ];
+      maintainers = [ lib.maintainers.bzizou ];
     };
   };
 
@@ -27425,7 +27425,7 @@ with self; {
     meta = {
       description = "Hashes (and objects based on hashes) with encrypting fields";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -27671,7 +27671,7 @@ with self; {
     meta = {
       description = "Perl module to deal with time periods";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.winpat ];
+      maintainers = [ lib.maintainers.winpat ];
     };
   };
 
@@ -27686,7 +27686,7 @@ with self; {
       description = "Object Oriented time objects";
       homepage = "https://metacpan.org/release/Time-Piece";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -27975,7 +27975,7 @@ with self; {
     meta = {
       description = "Preparation of Internationalized Strings (RFC 3454)";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -27991,7 +27991,7 @@ with self; {
       description = "Encoding and decoding of UTF-8 encoding form";
       homepage = "https://github.com/chansen/p5-unicode-utf8";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ sgo ];
+      maintainers = with lib.maintainers; [ sgo ];
     };
   };
 
@@ -28273,7 +28273,7 @@ with self; {
     meta = {
       description = "File manager USING vim itself";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.chreekat ];
+      maintainers = [ lib.maintainers.chreekat ];
       mainProgram = "vidir";
     };
   };
@@ -28615,7 +28615,7 @@ with self; {
     meta = {
       description = "Perl extension for inclusive (1.0 and 1.1) and exclusive canonicalization of XML using libxml2";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.sgo ];
+      maintainers = [ lib.maintainers.sgo ];
     };
   };
 
@@ -29170,7 +29170,7 @@ with self; {
     meta = {
       description = "XS functions to assist in parsing keyword syntax";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };
 
@@ -29187,7 +29187,7 @@ with self; {
     meta = {
       description = "XS functions to assist in parsing sub-like syntax";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.zakame ];
+      maintainers = [ lib.maintainers.zakame ];
     };
   };