From b3ec466c5abbda7de279dccb010ab10e74dd07ee Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Tue, 17 Oct 2023 19:11:41 +0700
Subject: [PATCH] remove deprecated URL literals and unused args

- get rid of deprecated URL literals (see RFC 45)
- remove unused derivation args
- remove one instance of unused rec, and two unused variable in let's
---
 boot/recovery-menu/default.nix                      | 2 +-
 boot/script-loader/mruby-lvgui-native/default.nix   | 2 --
 boot/script-loader/mruby-lvgui-native/lvgui.nix     | 2 +-
 devices/families/mainline-chromeos-sc7180/sound.nix | 3 ---
 devices/families/sdm845-mainline/kernel/default.nix | 2 +-
 devices/motorola-potter/firmware/default.nix        | 1 -
 devices/motorola-potter/kernel/default.nix          | 1 -
 devices/pine64-pinephonepro/kernel/default.nix      | 1 -
 overlay/make_ext4fs/default.nix                     | 2 +-
 overlay/mruby-builder/mruby/default.nix             | 2 +-
 overlay/ufdt-apply-overlay/default.nix              | 2 +-
 11 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/boot/recovery-menu/default.nix b/boot/recovery-menu/default.nix
index 79ae3d7b..f9d6301b 100644
--- a/boot/recovery-menu/default.nix
+++ b/boot/recovery-menu/default.nix
@@ -1,4 +1,4 @@
-{ lib, runCommand, mobile-nixos }:
+{ lib, mobile-nixos }:
 
 mobile-nixos.mkLVGUIApp {
   name = "boot-recovery-menu.mrb";
diff --git a/boot/script-loader/mruby-lvgui-native/default.nix b/boot/script-loader/mruby-lvgui-native/default.nix
index 15ce473a..1d1b5050 100644
--- a/boot/script-loader/mruby-lvgui-native/default.nix
+++ b/boot/script-loader/mruby-lvgui-native/default.nix
@@ -1,7 +1,5 @@
 { mrbgems
 , callPackage
-, fetchFromGitHub
-, pkg-config
 , buildPackages
 
 # Configuration
diff --git a/boot/script-loader/mruby-lvgui-native/lvgui.nix b/boot/script-loader/mruby-lvgui-native/lvgui.nix
index 3bd3bbc2..c67ff668 100644
--- a/boot/script-loader/mruby-lvgui-native/lvgui.nix
+++ b/boot/script-loader/mruby-lvgui-native/lvgui.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  inherit (lib) optional optionals optionalString;
+  inherit (lib) optional optionals;
   simulatorDeps = [
     SDL2
   ];
diff --git a/devices/families/mainline-chromeos-sc7180/sound.nix b/devices/families/mainline-chromeos-sc7180/sound.nix
index ec9de8c0..3c4d24e8 100644
--- a/devices/families/mainline-chromeos-sc7180/sound.nix
+++ b/devices/families/mainline-chromeos-sc7180/sound.nix
@@ -10,9 +10,6 @@
     (self: super: {
       google-trogdor-alsa-ucm = self.callPackage (
         { runCommand, fetchgit }:
-        let
-          rev = "fac4d7e17871a8e7ec1c39f58257389e9bf62f06";
-        in
         runCommand "google-trogdor-alsa-ucm" {
           src = fetchgit {
             url = "https://chromium.googlesource.com/chromiumos/overlays/board-overlays";
diff --git a/devices/families/sdm845-mainline/kernel/default.nix b/devices/families/sdm845-mainline/kernel/default.nix
index 9dc1ec5d..f5c54a27 100644
--- a/devices/families/sdm845-mainline/kernel/default.nix
+++ b/devices/families/sdm845-mainline/kernel/default.nix
@@ -4,7 +4,7 @@
 , ...
 }:
 
-mobile-nixos.kernel-builder rec {
+mobile-nixos.kernel-builder {
   version = "6.4.0";
   configfile = ./config.aarch64;
 
diff --git a/devices/motorola-potter/firmware/default.nix b/devices/motorola-potter/firmware/default.nix
index 9432e563..71e7830c 100644
--- a/devices/motorola-potter/firmware/default.nix
+++ b/devices/motorola-potter/firmware/default.nix
@@ -1,6 +1,5 @@
 { lib
 , runCommand
-, fetchFromGitHub
 , fetchurl
 , modem ? builtins.throw ''
 
diff --git a/devices/motorola-potter/kernel/default.nix b/devices/motorola-potter/kernel/default.nix
index b2a3625a..6b06e29e 100644
--- a/devices/motorola-potter/kernel/default.nix
+++ b/devices/motorola-potter/kernel/default.nix
@@ -1,5 +1,4 @@
 { mobile-nixos
-, stdenv
 , fetchFromGitHub
 , ...
 }:
diff --git a/devices/pine64-pinephonepro/kernel/default.nix b/devices/pine64-pinephonepro/kernel/default.nix
index b959ba77..13e92cd0 100644
--- a/devices/pine64-pinephonepro/kernel/default.nix
+++ b/devices/pine64-pinephonepro/kernel/default.nix
@@ -1,6 +1,5 @@
 {
   mobile-nixos
-, fetchpatch
 , fetchFromGitLab
 , ...
 }:
diff --git a/overlay/make_ext4fs/default.nix b/overlay/make_ext4fs/default.nix
index 79be7180..5cd1326c 100644
--- a/overlay/make_ext4fs/default.nix
+++ b/overlay/make_ext4fs/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    homepage = https://git.openwrt.org/?p=project/make_ext4fs.git;
+    homepage = "https://git.openwrt.org/?p=project/make_ext4fs.git";
     description = "Standalone fork of Android make_ext4fs utility";
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/overlay/mruby-builder/mruby/default.nix b/overlay/mruby-builder/mruby/default.nix
index 8ac83080..ffb9e51a 100644
--- a/overlay/mruby-builder/mruby/default.nix
+++ b/overlay/mruby-builder/mruby/default.nix
@@ -233,7 +233,7 @@ let
 
     meta = with lib; {
       description = "An embeddable implementation of the Ruby language";
-      homepage = https://mruby.org;
+      homepage = "https://mruby.org";
       maintainers = [ maintainers.samueldr ];
       license = licenses.mit;
       platforms = platforms.unix;
diff --git a/overlay/ufdt-apply-overlay/default.nix b/overlay/ufdt-apply-overlay/default.nix
index 5c2b7d45..fa83c319 100644
--- a/overlay/ufdt-apply-overlay/default.nix
+++ b/overlay/ufdt-apply-overlay/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     # up-upstream: https://android.googlesource.com/platform/system/libufdt/
-    homepage = https://github.com/hybris-mobian/android-platform-system-libufdt;
+    homepage = "https://github.com/hybris-mobian/android-platform-system-libufdt";
     description = "Standalone fork of platform/system/libufdt";
     platforms = platforms.linux;
     maintainers = [ maintainers.samueldr ];