diff --git a/pkgs/development/octave-modules/arduino/default.nix b/pkgs/development/octave-modules/arduino/default.nix
index 0b758f191084..1f87233ccbee 100644
--- a/pkgs/development/octave-modules/arduino/default.nix
+++ b/pkgs/development/octave-modules/arduino/default.nix
@@ -23,11 +23,11 @@ buildOctavePackage rec {
     arduino-core-unwrapped
   ];
 
-  meta = with lib; {
+  meta = {
     name = "Octave Arduino Toolkit";
     homepage = "https://octave.sourceforge.io/arduino/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Basic Octave implementation of the matlab arduino extension, allowing communication to a programmed arduino board to control its hardware";
   };
 }
diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix
index 377cb36597c2..7a1c4273a3ea 100644
--- a/pkgs/development/octave-modules/audio/default.nix
+++ b/pkgs/development/octave-modules/audio/default.nix
@@ -27,11 +27,11 @@ buildOctavePackage rec {
     rtmidi
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/audio/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Audio and MIDI Toolbox for GNU Octave";
-    platforms = platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
+    platforms = lib.platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
   };
 }
diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index afffe81ef8e9..a058096ce517 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -22,10 +22,10 @@ buildOctavePackage rec {
     msh
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/bim/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Package for solving Diffusion Advection Reaction (DAR) Partial Differential Equations";
   };
 }
diff --git a/pkgs/development/octave-modules/bsltl/default.nix b/pkgs/development/octave-modules/bsltl/default.nix
index dfd225c9b52d..b8f8b9b54c01 100644
--- a/pkgs/development/octave-modules/bsltl/default.nix
+++ b/pkgs/development/octave-modules/bsltl/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0i8ry347y5f5db3702nhpsmfys9v18ks2fsmpdqpy3fcvrwaxdsb";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/bsltl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Free collection of OCTAVE/MATLAB routines for working with the biospeckle laser technique";
   };
 }
diff --git a/pkgs/development/octave-modules/cgi/default.nix b/pkgs/development/octave-modules/cgi/default.nix
index d486c4e0fb1d..5b04321fa285 100644
--- a/pkgs/development/octave-modules/cgi/default.nix
+++ b/pkgs/development/octave-modules/cgi/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0hygj7cpwrs2w9bfb7qrvv7gq410bfiddqvza8smg766pqmfp1s1";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/cgi/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Common Gateway Interface for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/communications/default.nix b/pkgs/development/octave-modules/communications/default.nix
index d77b072a2927..51f621d588fa 100644
--- a/pkgs/development/octave-modules/communications/default.nix
+++ b/pkgs/development/octave-modules/communications/default.nix
@@ -23,10 +23,10 @@ buildOctavePackage rec {
     signal
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/communications/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = " Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields";
   };
 }
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index 1f6ba3bb7fd5..fd1b98ea42b9 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -41,10 +41,10 @@ buildOctavePackage rec {
     blas
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gnu-octave.github.io/packages/control/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library";
   };
 }
diff --git a/pkgs/development/octave-modules/data-smoothing/default.nix b/pkgs/development/octave-modules/data-smoothing/default.nix
index 4e3924ccabb9..5ba36db4341f 100644
--- a/pkgs/development/octave-modules/data-smoothing/default.nix
+++ b/pkgs/development/octave-modules/data-smoothing/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     optim
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/data-smoothing/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Algorithms for smoothing noisy data";
   };
 }
diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix
index b5a5c0e9eca6..c9f90601660a 100644
--- a/pkgs/development/octave-modules/database/default.nix
+++ b/pkgs/development/octave-modules/database/default.nix
@@ -31,10 +31,10 @@ buildOctavePackage rec {
     struct
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/database/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interface to SQL databases, currently only postgresql using libpq";
   };
 }
diff --git a/pkgs/development/octave-modules/dataframe/default.nix b/pkgs/development/octave-modules/dataframe/default.nix
index 476ae4cabf18..92c54aef62dd 100644
--- a/pkgs/development/octave-modules/dataframe/default.nix
+++ b/pkgs/development/octave-modules/dataframe/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "10ara084gkb7d5vxv9qv7zpj8b4mm5y06nccrdy3skw5nfbb4djx";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/dataframe/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Data manipulation toolbox similar to R data.frame";
   };
 }
diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix
index 2f37f7210e63..e2646c23829f 100644
--- a/pkgs/development/octave-modules/dicom/default.nix
+++ b/pkgs/development/octave-modules/dicom/default.nix
@@ -25,10 +25,10 @@ buildOctavePackage rec {
     gdcm
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/dicom/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Digital communications in medicine (DICOM) file io";
   };
 }
diff --git a/pkgs/development/octave-modules/divand/default.nix b/pkgs/development/octave-modules/divand/default.nix
index 541805f7aefd..2033e4ec4579 100644
--- a/pkgs/development/octave-modules/divand/default.nix
+++ b/pkgs/development/octave-modules/divand/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0nmaz5j37dflz7p4a4lmwzkh7g1gghdh7ccvkbyy0fpgv9lr1amg";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/divand/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Performs an n-dimensional variational analysis (interpolation) of arbitrarily located observations";
   };
 }
diff --git a/pkgs/development/octave-modules/doctest/default.nix b/pkgs/development/octave-modules/doctest/default.nix
index 0e8edfc701ef..b0391d99796d 100644
--- a/pkgs/development/octave-modules/doctest/default.nix
+++ b/pkgs/development/octave-modules/doctest/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/doctest/index.html";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Find and run example code within documentation";
     longDescription = ''
       Find and run example code within documentation. Formatted blocks
diff --git a/pkgs/development/octave-modules/econometrics/default.nix b/pkgs/development/octave-modules/econometrics/default.nix
index 92d8b4613837..ea0363b95033 100644
--- a/pkgs/development/octave-modules/econometrics/default.nix
+++ b/pkgs/development/octave-modules/econometrics/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     optim
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/econometrics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Econometrics functions including MLE and GMM based techniques";
   };
 }
diff --git a/pkgs/development/octave-modules/fem-fenics/default.nix b/pkgs/development/octave-modules/fem-fenics/default.nix
index 472a3094ec6f..c363ffe5428d 100644
--- a/pkgs/development/octave-modules/fem-fenics/default.nix
+++ b/pkgs/development/octave-modules/fem-fenics/default.nix
@@ -25,10 +25,10 @@ buildOctavePackage rec {
     ffc
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/fem-fenics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Package for the resolution of partial differential equations based on fenics";
     # Lots of compilation errors for newer octave versions and syntax errors
     broken = true;
diff --git a/pkgs/development/octave-modules/financial/default.nix b/pkgs/development/octave-modules/financial/default.nix
index 15b0a2e7f04f..b539307d3980 100644
--- a/pkgs/development/octave-modules/financial/default.nix
+++ b/pkgs/development/octave-modules/financial/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0f963yg6pwvrdk5fg7b71ny47gzy48nqxdzj2ngcfrvmb5az4vmf";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/financial/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Monte Carlo simulation, options pricing routines, financial manipulation, plotting functions and additional date manipulation tools";
   };
 }
diff --git a/pkgs/development/octave-modules/fits/default.nix b/pkgs/development/octave-modules/fits/default.nix
index 5c1cc3c69dd6..70c044d2e5a4 100644
--- a/pkgs/development/octave-modules/fits/default.nix
+++ b/pkgs/development/octave-modules/fits/default.nix
@@ -33,10 +33,10 @@ buildOctavePackage rec {
     cfitsio
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/fits/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions for reading, and writing FITS (Flexible Image Transport System) files using cfitsio";
   };
 }
diff --git a/pkgs/development/octave-modules/fpl/default.nix b/pkgs/development/octave-modules/fpl/default.nix
index 75c7386deaf5..e7b4851459ec 100644
--- a/pkgs/development/octave-modules/fpl/default.nix
+++ b/pkgs/development/octave-modules/fpl/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "0cbpahn9flrv9ppp5xakhwh8vyyy7wzlsz22i3s93yqg9q2bh4ys";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/fpl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Collection of routines to export data produced by Finite Elements or Finite Volume Simulations in formats used by some visualization programs";
   };
 }
diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
index 7d368072a1ab..e4b0bce93ea1 100644
--- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
+++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
@@ -15,10 +15,10 @@ buildOctavePackage rec {
     sha256 = "sha256-lnYzX4rq3j7rrbD8m0EnrWpbMJD6tqtMVCYu4mlLFCM=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lmarkowsky/fuzzy-logic-toolkit";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Mostly MATLAB-compatible fuzzy logic toolkit for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/ga/default.nix b/pkgs/development/octave-modules/ga/default.nix
index 3f6367d4f667..b915bd534aa9 100644
--- a/pkgs/development/octave-modules/ga/default.nix
+++ b/pkgs/development/octave-modules/ga/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-hsrjh2rZFhP6WA+qaKjiGfJkDtT2nTlXlKr3jAJ5Y44=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/ga/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Genetic optimization code";
   };
 }
diff --git a/pkgs/development/octave-modules/general/default.nix b/pkgs/development/octave-modules/general/default.nix
index e424e11c97dd..fbb3662d8eb0 100644
--- a/pkgs/development/octave-modules/general/default.nix
+++ b/pkgs/development/octave-modules/general/default.nix
@@ -23,10 +23,10 @@ buildOctavePackage rec {
     nettle
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/general/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "General tools for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/generate_html/default.nix b/pkgs/development/octave-modules/generate_html/default.nix
index 405f80fcc0d9..28ddf2ee5770 100644
--- a/pkgs/development/octave-modules/generate_html/default.nix
+++ b/pkgs/development/octave-modules/generate_html/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-CHJ0+90+SNXmslLrQc+8aetSnHK0m9PqEBipFuFjwHw=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/generate_html/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides functions for generating HTML pages that contain the help texts for a set of functions";
     longDescription = ''
       This package provides functions for generating HTML pages that contain
diff --git a/pkgs/development/octave-modules/geometry/default.nix b/pkgs/development/octave-modules/geometry/default.nix
index 27f0c320d4dc..2c9a50aa59ec 100644
--- a/pkgs/development/octave-modules/geometry/default.nix
+++ b/pkgs/development/octave-modules/geometry/default.nix
@@ -19,13 +19,13 @@ buildOctavePackage rec {
     matgeom
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/geometry/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       boost
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Library for extending MatGeom functionality";
   };
 }
diff --git a/pkgs/development/octave-modules/gsl/default.nix b/pkgs/development/octave-modules/gsl/default.nix
index e7379d22cc7b..ee3eb30ac89e 100644
--- a/pkgs/development/octave-modules/gsl/default.nix
+++ b/pkgs/development/octave-modules/gsl/default.nix
@@ -19,10 +19,10 @@ buildOctavePackage rec {
     gsl
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/gsl/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Octave bindings to the GNU Scientific Library";
     # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'?
     # error: no member named 'is_real_type' in 'octave_value'
diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix
index d04928cbd603..5fea51124a4a 100644
--- a/pkgs/development/octave-modules/image-acquisition/default.nix
+++ b/pkgs/development/octave-modules/image-acquisition/default.nix
@@ -23,10 +23,10 @@ buildOctavePackage rec {
     libv4l
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/image-acquisition/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions to capture images from connected devices";
     longDescription = ''
       The Octave-forge Image Aquisition package provides functions to
diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix
index 7b4800be02db..e61eea8d196a 100644
--- a/pkgs/development/octave-modules/image/default.nix
+++ b/pkgs/development/octave-modules/image/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-m7JsyljrH77fs/hOPS5+HuteFtfr4yNbfBB9lPWNFBc=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/image/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions for processing images";
     longDescription = ''
       The Octave-forge Image package provides functions for processing
diff --git a/pkgs/development/octave-modules/instrument-control/default.nix b/pkgs/development/octave-modules/instrument-control/default.nix
index 033d04f6b131..72616e9a72b6 100644
--- a/pkgs/development/octave-modules/instrument-control/default.nix
+++ b/pkgs/development/octave-modules/instrument-control/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-Qm1aF+dbhwrDUSh8ViJHCZIc0DiZ1jI117TnSknqzX0=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/instrument-control/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Low level I/O functions for serial, i2c, spi, parallel, tcp, gpib, vxi11, udp and usbtmc interfaces";
   };
 }
diff --git a/pkgs/development/octave-modules/interval/default.nix b/pkgs/development/octave-modules/interval/default.nix
index 3c46b154bda2..ff03f43aa25a 100644
--- a/pkgs/development/octave-modules/interval/default.nix
+++ b/pkgs/development/octave-modules/interval/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     mpfr
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/interval/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interval arithmetic to evaluate functions over subsets of their domain";
     longDescription = ''
       The interval package for real-valued interval arithmetic allows one to
diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix
index ac825fd4f919..183f46b66b58 100644
--- a/pkgs/development/octave-modules/io/default.nix
+++ b/pkgs/development/octave-modules/io/default.nix
@@ -24,13 +24,13 @@ buildOctavePackage rec {
     unzip
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/io/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       bsd2
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Input/Output in external formats";
   };
 }
diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix
index c7b4729d2be0..9a70b7f96cbe 100644
--- a/pkgs/development/octave-modules/level-set/default.nix
+++ b/pkgs/development/octave-modules/level-set/default.nix
@@ -45,11 +45,11 @@ buildOctavePackage rec {
     cd -
   '';
 
-  meta = with lib; {
+  meta = {
     name = "Level Set";
     homepage = "https://octave.sourceforge.io/level-set/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
     # Got broke with octave 8.x update, and wasn't updated since 2019
     broken = true;
diff --git a/pkgs/development/octave-modules/linear-algebra/default.nix b/pkgs/development/octave-modules/linear-algebra/default.nix
index f7205dede500..a9af6ade4161 100644
--- a/pkgs/development/octave-modules/linear-algebra/default.nix
+++ b/pkgs/development/octave-modules/linear-algebra/default.nix
@@ -13,14 +13,14 @@ buildOctavePackage rec {
     sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/linear-algebra/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       lgpl3Plus
     ];
     # They claim to have a FreeBSD license, but none of their code seems to have it.
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional linear algebra code, including matrix functions";
   };
 }
diff --git a/pkgs/development/octave-modules/lssa/default.nix b/pkgs/development/octave-modules/lssa/default.nix
index 2635c57e4be2..5ebdb957fb2e 100644
--- a/pkgs/development/octave-modules/lssa/default.nix
+++ b/pkgs/development/octave-modules/lssa/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "10h9lzsi7pqh93i7y50b618g05fnbw9n0i505bz5kz4avfa990zh";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/lssa/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Tools to compute spectral decompositions of irregularly-spaced time series";
     longDescription = ''
       A package implementing tools to compute spectral decompositions of
diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix
index 43fe020b322a..5cd46d11adc3 100644
--- a/pkgs/development/octave-modules/ltfat/default.nix
+++ b/pkgs/development/octave-modules/ltfat/default.nix
@@ -32,11 +32,11 @@ buildOctavePackage rec {
     jdk
   ];
 
-  meta = with lib; {
+  meta = {
     name = "The Large Time-Frequency Analysis Toolbox";
     homepage = "https://octave.sourceforge.io/ltfat/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Toolbox for working with time-frequency analysis, wavelets and signal processing";
     longDescription = ''
       The Large Time/Frequency Analysis Toolbox (LTFAT) is a Matlab/Octave
diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix
index 39a3023c5203..5f713f062261 100644
--- a/pkgs/development/octave-modules/mapping/default.nix
+++ b/pkgs/development/octave-modules/mapping/default.nix
@@ -25,10 +25,10 @@ buildOctavePackage rec {
     geometry
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/mapping/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Simple mapping and GIS .shp .dxf and raster file functions";
   };
 }
diff --git a/pkgs/development/octave-modules/matgeom/default.nix b/pkgs/development/octave-modules/matgeom/default.nix
index fa12b82f8979..ac1ecd791c1d 100644
--- a/pkgs/development/octave-modules/matgeom/default.nix
+++ b/pkgs/development/octave-modules/matgeom/default.nix
@@ -13,13 +13,13 @@ buildOctavePackage rec {
     sha256 = "sha256-azRPhwMVvydCyojA/rXD2og1tPTL0vii15OveYQF+SA=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/matgeom/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd2
       gpl3Plus
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Geometry toolbox for 2D/3D geometric computing";
   };
 }
diff --git a/pkgs/development/octave-modules/miscellaneous/default.nix b/pkgs/development/octave-modules/miscellaneous/default.nix
index e39ad4bd2931..f3ab7d57c5bf 100644
--- a/pkgs/development/octave-modules/miscellaneous/default.nix
+++ b/pkgs/development/octave-modules/miscellaneous/default.nix
@@ -24,10 +24,10 @@ buildOctavePackage rec {
     units
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/miscellaneous/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Miscellaneous tools that don't fit somewhere else";
   };
 }
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index 181b0c2ac58f..d3c5a5bfd44d 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -45,10 +45,10 @@ buildOctavePackage rec {
     splines
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/msh/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Create and manage triangular and tetrahedral meshes for Finite Element or Finite Volume PDE solvers";
     longDescription = ''
       Create and manage triangular and tetrahedral meshes for Finite Element or
diff --git a/pkgs/development/octave-modules/mvn/default.nix b/pkgs/development/octave-modules/mvn/default.nix
index 65568d305dd3..db13692baa11 100644
--- a/pkgs/development/octave-modules/mvn/default.nix
+++ b/pkgs/development/octave-modules/mvn/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "00w69hxqnqdm3744z6p7gvzci44a3gy228x6bgq3xf5n3jwicnmg";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/mvn/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Multivariate normal distribution clustering and utility functions";
   };
 }
diff --git a/pkgs/development/octave-modules/nan/default.nix b/pkgs/development/octave-modules/nan/default.nix
index 5146d4c18983..4df0494a4677 100644
--- a/pkgs/development/octave-modules/nan/default.nix
+++ b/pkgs/development/octave-modules/nan/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     blas
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/nan/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Statistics and machine learning toolbox for data with and w/o missing values";
   };
 }
diff --git a/pkgs/development/octave-modules/ncarray/default.nix b/pkgs/development/octave-modules/ncarray/default.nix
index 57940c3411a3..3b6a55dd278b 100644
--- a/pkgs/development/octave-modules/ncarray/default.nix
+++ b/pkgs/development/octave-modules/ncarray/default.nix
@@ -23,10 +23,10 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/ncarray/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Access a single or a collection of NetCDF files as a multi-dimensional array";
   };
 }
diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index 332ee9978f1f..e1b89f1f136a 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     netcdf
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/netcdf/index.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "NetCDF interface for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/nurbs/default.nix b/pkgs/development/octave-modules/nurbs/default.nix
index 29309b59e163..4371da08048d 100644
--- a/pkgs/development/octave-modules/nurbs/default.nix
+++ b/pkgs/development/octave-modules/nurbs/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-QfF1tu9z/FQWNDirRs5OP3IRJOGkkR2lnHELn3ItknY=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/nurbs/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Collection of routines for the creation, and manipulation of Non-Uniform Rational B-Splines (NURBS), based on the NURBS toolbox by Mark Spink";
   };
 }
diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix
index 015441db1acc..e657e02c6e7d 100644
--- a/pkgs/development/octave-modules/ocl/default.nix
+++ b/pkgs/development/octave-modules/ocl/default.nix
@@ -14,10 +14,10 @@ buildOctavePackage rec {
     sha256 = "sha256-ErVMfYkWcdS+UqUH7q7gNQXQwAjrcyiUkWxagAKj3w0=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/ocl/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Use OpenCL for parallelization";
     longDescription = ''
       Package using OpenCL for parallelization, mostly suitable to
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index cefd09e7a25b..538dcb0c567a 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -22,11 +22,11 @@ buildOctavePackage rec {
     sed -i s/"error(errorText)"/"error(\"%s\", errorText)"/g src/*.cc
   '';
 
-  meta = with lib; {
+  meta = {
     name = "GNU Octave Clipping Polygons Tool";
     homepage = "https://octave.sourceforge.io/octclip/index.html";
-    license = with licenses; [ gpl3Plus ]; # modified BSD?
-    maintainers = with maintainers; [ KarlJoad ];
+    license = with lib.licenses; [ gpl3Plus ]; # modified BSD?
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
   };
 }
diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index d8da27eceb83..be417deda71b 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -26,10 +26,10 @@ buildOctavePackage rec {
     proj
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/octproj/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
   };
 }
diff --git a/pkgs/development/octave-modules/optics/default.nix b/pkgs/development/octave-modules/optics/default.nix
index c72df5c360a4..c0866b22ebf1 100644
--- a/pkgs/development/octave-modules/optics/default.nix
+++ b/pkgs/development/octave-modules/optics/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "1d9z82241a1zmr8m1vgw10pyk81vn0q4dcyx7d05pigfn5gykrgc";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/optics/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Functions covering various aspects of optics";
   };
 }
diff --git a/pkgs/development/octave-modules/optim/default.nix b/pkgs/development/octave-modules/optim/default.nix
index fd6282ccee66..de83bf7aa15b 100644
--- a/pkgs/development/octave-modules/optim/default.nix
+++ b/pkgs/development/octave-modules/optim/default.nix
@@ -27,14 +27,14 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/optim/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
     # Modified BSD code seems removed
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Non-linear optimization toolkit";
   };
 }
diff --git a/pkgs/development/octave-modules/optiminterp/default.nix b/pkgs/development/octave-modules/optiminterp/default.nix
index 439d8b687dd6..f13bcb79e1fa 100644
--- a/pkgs/development/octave-modules/optiminterp/default.nix
+++ b/pkgs/development/octave-modules/optiminterp/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     gfortran
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/optiminterp/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Optimal interpolation toolbox for octave";
     longDescription = ''
       An optimal interpolation toolbox for octave. This package provides
diff --git a/pkgs/development/octave-modules/parallel/default.nix b/pkgs/development/octave-modules/parallel/default.nix
index 342ac6a53cdb..4fba5058d0db 100644
--- a/pkgs/development/octave-modules/parallel/default.nix
+++ b/pkgs/development/octave-modules/parallel/default.nix
@@ -31,10 +31,10 @@ buildOctavePackage rec {
     struct
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/parallel/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Parallel execution package";
     # Although upstream has added an identical patch to that of ../database, it
     # still won't build with octave>8.1
diff --git a/pkgs/development/octave-modules/quaternion/default.nix b/pkgs/development/octave-modules/quaternion/default.nix
index b87771c7d52d..6604ce420ce0 100644
--- a/pkgs/development/octave-modules/quaternion/default.nix
+++ b/pkgs/development/octave-modules/quaternion/default.nix
@@ -21,10 +21,10 @@ buildOctavePackage rec {
     sed -i s/is_bool_type/islogical/g src/*.cc
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/quaternion/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Quaternion package for GNU Octave, includes a quaternion class with overloaded operators";
   };
 }
diff --git a/pkgs/development/octave-modules/queueing/default.nix b/pkgs/development/octave-modules/queueing/default.nix
index db0a635b9a09..7bf85c5b22dd 100644
--- a/pkgs/development/octave-modules/queueing/default.nix
+++ b/pkgs/development/octave-modules/queueing/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "1yhw277i1qgmddf6wbfb6a4zrfhvplkmfr20q1l15z4xi8afnm6d";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/queueing/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides functions for queueing networks and Markov chains analysis";
     longDescription = ''
       The queueing package provides functions for queueing networks and Markov
diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix
index b19e8d16a0ae..92e5f6ca0f73 100644
--- a/pkgs/development/octave-modules/signal/default.nix
+++ b/pkgs/development/octave-modules/signal/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     control
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/signal/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Signal processing tools, including filtering, windowing and display functions";
   };
 }
diff --git a/pkgs/development/octave-modules/sockets/default.nix b/pkgs/development/octave-modules/sockets/default.nix
index 3c114f7e05c9..37fea2007238 100644
--- a/pkgs/development/octave-modules/sockets/default.nix
+++ b/pkgs/development/octave-modules/sockets/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/sockets/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Socket functions for networking from within octave";
   };
 }
diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix
index d7c1beea493b..fa5dee1311d4 100644
--- a/pkgs/development/octave-modules/sparsersb/default.nix
+++ b/pkgs/development/octave-modules/sparsersb/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     librsb
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/sparsersb/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
     # Broken since octave>8.x
     broken = true;
diff --git a/pkgs/development/octave-modules/splines/default.nix b/pkgs/development/octave-modules/splines/default.nix
index 90330d2b7441..9748ed8ea388 100644
--- a/pkgs/development/octave-modules/splines/default.nix
+++ b/pkgs/development/octave-modules/splines/default.nix
@@ -13,13 +13,13 @@ buildOctavePackage rec {
     sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/splines/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional spline functions";
   };
 }
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index 25008d186138..3beea0ca2213 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -20,13 +20,13 @@ buildOctavePackage rec {
     io
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://packages.octave.org/statistics";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       publicDomain
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Statistics package for GNU Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix
index 13bea3633e2b..ecc5c1bf1457 100644
--- a/pkgs/development/octave-modules/stk/default.nix
+++ b/pkgs/development/octave-modules/stk/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/stk/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "STK is a (not so) Small Toolbox for Kriging";
     longDescription = ''
       The STK is a (not so) Small Toolbox for Kriging. Its primary focus is on
diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix
index 800cc0b0b7ec..cbd33a4f15f7 100644
--- a/pkgs/development/octave-modules/strings/default.nix
+++ b/pkgs/development/octave-modules/strings/default.nix
@@ -34,11 +34,11 @@ buildOctavePackage rec {
     sed -i s/toascii/double/g inst/*.m
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/strings/index.html";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     # Claims to have a freebsd license, but I found none.
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional functions for manipulation and analysis of strings";
     # Some pcre symbols claimed to be missing
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/octave-modules/struct/default.nix b/pkgs/development/octave-modules/struct/default.nix
index 2a89fa86940b..51316a9cdbc4 100644
--- a/pkgs/development/octave-modules/struct/default.nix
+++ b/pkgs/development/octave-modules/struct/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-/M6n3YTBEE7TurtHoo8F4AEqicKE85qwlAkEUJFSlM4=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/struct/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Additional structure manipulation functions";
   };
 }
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
index db6b106165c8..784ca5538ea2 100644
--- a/pkgs/development/octave-modules/symbolic/default.nix
+++ b/pkgs/development/octave-modules/symbolic/default.nix
@@ -26,10 +26,10 @@ buildOctavePackage rec {
 
   propagatedBuildInputs = [ pythonEnv ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/symbolic/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Adds symbolic calculation features to GNU Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/tisean/default.nix b/pkgs/development/octave-modules/tisean/default.nix
index a20810058af1..de6ccedad011 100644
--- a/pkgs/development/octave-modules/tisean/default.nix
+++ b/pkgs/development/octave-modules/tisean/default.nix
@@ -25,10 +25,10 @@ buildOctavePackage rec {
     signal
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/tisean/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Port of TISEAN 3.0.1";
     # Broken since octave 8.x update, and wasn't updated since 2021
     broken = true;
diff --git a/pkgs/development/octave-modules/tsa/default.nix b/pkgs/development/octave-modules/tsa/default.nix
index 52d61b070e0a..baba141b50f2 100644
--- a/pkgs/development/octave-modules/tsa/default.nix
+++ b/pkgs/development/octave-modules/tsa/default.nix
@@ -18,10 +18,10 @@ buildOctavePackage rec {
     nan
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/tsa/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Stochastic concepts and maximum entropy methods for time series analysis";
   };
 }
diff --git a/pkgs/development/octave-modules/vibes/default.nix b/pkgs/development/octave-modules/vibes/default.nix
index 53c49f43553f..3debe4c4358f 100644
--- a/pkgs/development/octave-modules/vibes/default.nix
+++ b/pkgs/development/octave-modules/vibes/default.nix
@@ -18,13 +18,13 @@ buildOctavePackage rec {
     vibes
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/vibes/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       mit
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Easily display results (boxes, pavings) from interval methods";
     longDescription = ''
       The VIBes API allows one to easily display results (boxes, pavings) from
diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index 8c7f139e587a..67f0e76c6498 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -26,13 +26,13 @@ buildOctavePackage rec {
     ffmpeg
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/video/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       bsd3
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
   };
 }
diff --git a/pkgs/development/octave-modules/vrml/default.nix b/pkgs/development/octave-modules/vrml/default.nix
index 46760f461877..26adac11aa18 100644
--- a/pkgs/development/octave-modules/vrml/default.nix
+++ b/pkgs/development/octave-modules/vrml/default.nix
@@ -31,13 +31,13 @@ buildOctavePackage rec {
     statistics
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/vrml/index.html";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       fdl12Plus
     ];
-    maintainers = with maintainers; [ KarlJoad ];
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "3D graphics using VRML";
     # Marked this way until KarlJoad gets freewrl as a runtime dependency.
     broken = true;
diff --git a/pkgs/development/octave-modules/windows/default.nix b/pkgs/development/octave-modules/windows/default.nix
index ca84bb887b90..0b402aff2d9b 100644
--- a/pkgs/development/octave-modules/windows/default.nix
+++ b/pkgs/development/octave-modules/windows/default.nix
@@ -13,10 +13,10 @@ buildOctavePackage rec {
     sha256 = "sha256-j/goQc57jcfxlCsbf31Mx8oNud1vNE0D/hNfXyvVmTc=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/windows/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "Provides COM interface and additional functionality on Windows";
   };
 }
diff --git a/pkgs/development/octave-modules/zeromq/default.nix b/pkgs/development/octave-modules/zeromq/default.nix
index f5a311422630..9969ae6c252e 100644
--- a/pkgs/development/octave-modules/zeromq/default.nix
+++ b/pkgs/development/octave-modules/zeromq/default.nix
@@ -33,10 +33,10 @@ buildOctavePackage rec {
     zeromq
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://octave.sourceforge.io/zeromq/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ KarlJoad ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ KarlJoad ];
     description = "ZeroMQ bindings for GNU Octave";
   };
 }