octave-packages: simplify meta attribute set

In the comment presented here: #108562 (comment) I was presented with a simpler way of formatting/building the meta attribute set. This commit is a squash of performing these changes on all packages that are currently defined. octave/control: simplify meta attr set octave/general: simplify meta attr set octave/io: simplify meta attr set octave/level-set: simplify meta attr set octave/linear-algebra: simplify meta attr set octave/ltfat: simplify meta attr set octave/signal: simplify meta attr set octave/symbolic: simplify meta attr set
NixOS · Jan 6, 2021 · 53b5cfd · 53b5cfd
1 parent c5fbd61
commit 53b5cfd
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
@@ -23,10 +23,10 @@ buildOctaveLibrary rec {
     lapack blas
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with 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/general/default.nix b/pkgs/development/octave-modules/general/default.nix
@@ -19,10 +19,10 @@ buildOctaveLibrary rec {
     nettle
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ KarlJoad ];
     description = "General tools for Octave";
   };
 }
diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix
@@ -24,10 +24,10 @@ buildOctaveLibrary rec {
     cp -r doc $out/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = with stdenv.lib.licenses; [ gpl3Plus bsd2 ];
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = with licenses; [ gpl3Plus bsd2 ];
+    maintainers = with 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
@@ -12,11 +12,11 @@ buildOctaveLibrary rec {
     sha256 = "1rb318gs0avkn5j23xrjwhra4y2f13bahc5v4x5wrm978bcs5xlp";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     name = "Level Set";
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ KarlJoad ];
     description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
     broken = true;
     # During a simple build, I received the following error while building the package

diff --git a/pkgs/development/octave-modules/linear-algebra/default.nix b/pkgs/development/octave-modules/linear-algebra/default.nix
@@ -13,10 +13,10 @@ buildOctaveLibrary rec {
     sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    licenses = with stdenv.lib.licenses; [ gpl3Plus lgpl3Plus bsd ];
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    licenses = with licenses; [ gpl3Plus lgpl3Plus bsd ];
+    maintainers = with maintainers; [ KarlJoad ];
     description = "Additional linear algebra code, including matrix functions";
   };
 }
diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix
@@ -31,11 +31,11 @@ buildOctaveLibrary rec {
     jre
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     name = "The Large Time-Frequency Analysis Toolbox";
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with 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/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix
@@ -17,10 +17,10 @@ buildOctaveLibrary rec {
     control
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ KarlJoad ];
     description = "Signal processing tools, including filtering, windowing and display functions";
   };
 }
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
@@ -18,10 +18,10 @@
 
   buildInputs = [ pythonEnv ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://octave.sourceforge.io/${pname}/index.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.pkgs.maintainers; [ KarlJoad ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ KarlJoad ];
     description = "Adds symbolic calculation features to GNU Octave";
   };
 }).overrideAttrs (oldAttrs: rec {