2025-02-17

7 files changed, 33 insertions, 36 deletions

diff --git a/packages/bruh.nix b/packages/bruh.nix
index 597dc04..68aefd2 100644
--- a/packages/bruh.nix
+++ b/packages/bruh.nix
@@ -8,14 +8,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "bruh";
   version = "2.1";
 
-  src =
-    with finalAttrs;
-    fetchFromGitHub {
-      owner = "kejpies";
-      repo = pname;
-      rev = version;
-      hash = "sha256-Uw6Qes0IZkkfBchFnvnX9l1ZG5T5pyExmV7yUJLPOJ0=";
-    };
+  src = fetchFromGitHub {
+    owner = "kejpies";
+    repo = finalAttrs.pname;
+    rev = finalAttrs.version;
+    hash = "sha256-Uw6Qes0IZkkfBchFnvnX9l1ZG5T5pyExmV7yUJLPOJ0=";
+  };
 
   postPatch = ''
     substituteInPlace bruh.c \
@@ -24,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Bruh sound, but as a program";
     inherit (finalAttrs.src.meta) homepage;
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.azahi ];
     mainProgram = "bruh";
   };
 })
diff --git a/packages/emacsql-sqlite.nix b/packages/emacsql-sqlite.nix
index ad948bc..6199459 100644
--- a/packages/emacsql-sqlite.nix
+++ b/packages/emacsql-sqlite.nix
@@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SQLite interop binary for emacsql-sqlite";
     inherit (finalAttrs.src.meta) homepage;
-    license = licenses.unlicense;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.azahi ];
     mainProgram = "emacsql-sqlite";
   };
 })
diff --git a/packages/hiccup.nix b/packages/hiccup.nix
index f74de74..4a748a0 100644
--- a/packages/hiccup.nix
+++ b/packages/hiccup.nix
@@ -26,10 +26,9 @@ buildNpmPackage rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A static start page to get to your most important links";
-    inherit (finalAttrs.src.meta) homepage;
-    license = licenses.mit;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.azahi ];
   };
 }
diff --git a/packages/lampray.nix b/packages/lampray.nix
index e9caa13..527c4b5 100644
--- a/packages/lampray.nix
+++ b/packages/lampray.nix
@@ -53,10 +53,10 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Mod manager for gaming on Linux";
     homepage = "https://github.com/CHollingworth/Lampray";
-    license = with licenses; [
+    license = with lib.licenses; [
       unlicense
       mpl20 # bit7z
       mit # json & pugixml
@@ -64,8 +64,8 @@ stdenv.mkDerivation {
       gpl2Only # l4z
     ];
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ azahi ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = [ lib.maintainers.azahi ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "lampray";
   };
 }
diff --git a/packages/myip.nix b/packages/myip.nix
index d40e1fd..4aaa10f 100644
--- a/packages/myip.nix
+++ b/packages/myip.nix
@@ -13,12 +13,12 @@ writeShellApplication {
     dig -6 +short @resolver1.opendns.com myip.opendns.com AAAA
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A dumb tool to get host's current public IP";
     homepage = "https://git.azahi.cc/nixfiles";
-    license = licenses.wtfpl;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.wtfpl;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.azahi ];
     mainProgram = "myip";
   };
 }
diff --git a/packages/nixfiles.nix b/packages/nixfiles.nix
index 8fdd419..7287afb 100644
--- a/packages/nixfiles.nix
+++ b/packages/nixfiles.nix
@@ -173,12 +173,12 @@ symlinkJoin {
     bashCompletion
   ];
 
-  meta = with lib; {
+  meta = {
     description = "A helper utility to manage NixOS configurations with Nix flakes";
     homepage = "https://git.azahi.cc/nixfiles";
-    license = licenses.wtfpl;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.wtfpl;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.azahi ];
     mainProgram = "nixfiles";
   };
 }
diff --git a/packages/openssl_1_0_0.nix b/packages/openssl_1_0_0.nix
index 8db3b39..c8b4b06 100644
--- a/packages/openssl_1_0_0.nix
+++ b/packages/openssl_1_0_0.nix
@@ -29,12 +29,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Ancient OpenSSL version that some GOG games require";
     homepage = "https://downloads.dotslashplay.it/resources/openssl";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with maintainers; [ azahi ];
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    maintainers = [ lib.maintainers.azahi ];
   };
 })