From 29bfc9b4d79630c8dd1095797d0da8f901918c6b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 15 Nov 2025 13:41:12 +0000
Subject: [PATCH] gphoto2,gphoto2fs: move gphoto2 and gphoto2fs to pkgs/by-name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- gphoto2: migrate to `pkgs/by-name/gp/gphoto2/package.nix`
  • switch to `stdenv.mkDerivation (finalAttrs: { ... })`
  • use `tag`/`hash` instead of `rev`/`sha256`
  • drop `with lib;` in meta, qualify licenses/platforms/maintainers

- gphoto2fs: migrate to `pkgs/by-name/gp/gphoto2fs/package.nix`
  • switch to `stdenv.mkDerivation (finalAttrs: { ... })`
  • update to `hash` form
  • drop `with lib;` in meta, qualify licenses/platforms/maintainers

- all-packages.nix: remove old `callPackage` entries
---
 .../default.nix => by-name/gp/gphoto2/package.nix}        | 8 ++++----
 .../gphotofs.nix => by-name/gp/gphoto2fs/package.nix}     | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/misc/gphoto2/default.nix => by-name/gp/gphoto2/package.nix} (86%)
 rename pkgs/{applications/misc/gphoto2/gphotofs.nix => by-name/gp/gphoto2fs/package.nix} (73%)

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/by-name/gp/gphoto2/package.nix
similarity index 86%
rename from pkgs/applications/misc/gphoto2/default.nix
rename to pkgs/by-name/gp/gphoto2/package.nix
index 2c5e1483f332..afed03c7c766 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/by-name/gp/gphoto2/package.nix
@@ -13,15 +13,15 @@
   readline,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gphoto2";
   version = "2.5.32";
 
   src = fetchFromGitHub {
     owner = "gphoto";
     repo = "gphoto2";
-    rev = "v${version}";
-    sha256 = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA=";
   };
 
   nativeBuildInputs = [
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.jcumming ];
     mainProgram = "gphoto2";
   };
-}
+})
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/by-name/gp/gphoto2fs/package.nix
similarity index 73%
rename from pkgs/applications/misc/gphoto2/gphotofs.nix
rename to pkgs/by-name/gp/gphoto2fs/package.nix
index 9232705e06d3..c6ed189ad97c 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/by-name/gp/gphoto2fs/package.nix
@@ -9,12 +9,12 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gphoto2fs";
   version = "0.5.0";
   src = fetchurl {
-    url = "mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
-    sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
+    url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2";
+    hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
       gpl2
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca745747ca7..1b155beb481c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9591,10 +9591,6 @@ with pkgs;
 
   molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
 
-  gphoto2 = callPackage ../applications/misc/gphoto2 { };
-
-  gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
-
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;