From 31c1369438d1b8ca8d3aff30b8f9694ca6a45328 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 14 Jul 2025 10:36:22 -0500
Subject: [PATCH] instaloader: migrate to by-name

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>

Apply suggestion from @Aleksanaa

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>

Update pkgs/by-name/in/instaloader/package.nix

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>

Update pkgs/by-name/in/instaloader/package.nix

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>

instaloader: format with treefmt
---
 .../in/instaloader/package.nix}               | 28 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 19 deletions(-)
 rename pkgs/{tools/misc/instaloader/default.nix => by-name/in/instaloader/package.nix} (54%)

diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/by-name/in/instaloader/package.nix
similarity index 54%
rename from pkgs/tools/misc/instaloader/default.nix
rename to pkgs/by-name/in/instaloader/package.nix
index bad52de30dd2..60d9ec1ed193 100644
--- a/pkgs/tools/misc/instaloader/default.nix
+++ b/pkgs/by-name/in/instaloader/package.nix
@@ -1,43 +1,37 @@
 {
   lib,
-  buildPythonPackage,
-  pythonOlder,
+  python3Packages,
   fetchFromGitHub,
-  setuptools,
-  sphinx,
-  requests,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "instaloader";
   version = "4.14.2";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "instaloader";
     repo = "instaloader";
     tag = "v${version}";
-    sha256 = "sha256-q5/lZ+BHnrod0vG/ZJw/5iJRKKaP3Gbns5yaZH0P2rE=";
+    hash = "sha256-q5/lZ+BHnrod0vG/ZJw/5iJRKKaP3Gbns5yaZH0P2rE=";
   };
 
-  nativeBuildInputs = [
-    setuptools
+  build-system = [
+    python3Packages.setuptools
   ];
 
-  propagatedBuildInputs = [
-    requests
-    sphinx
+  dependencies = [
+    python3Packages.requests
+    python3Packages.sphinx
   ];
 
   pythonImportsCheck = [ "instaloader" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://instaloader.github.io/";
     description = "Download pictures (or videos) along with their captions and other metadata from Instagram";
-    maintainers = with maintainers; [ creator54 ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ creator54 ];
+    license = lib.licenses.mit;
     mainProgram = "instaloader";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 785dbf474368..af6e7a822fca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14776,8 +14776,6 @@ with pkgs;
 
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
-  instaloader = python3Packages.callPackage ../tools/misc/instaloader { };
-
   iortcw = callPackage ../games/iortcw { };
   # used as base package for iortcw forks
   iortcw_sp = callPackage ../games/iortcw/sp.nix { };