gphoto2,gphoto2fs: move gphoto2 and gphoto2fs to pkgs/by-name

- 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
This commit is contained in:
Guy Chronister
2026-04-13 22:37:24 +02:00
committed by Weijia Wang
parent 8eb81a3093
commit 29bfc9b4d7
3 changed files with 8 additions and 12 deletions
@@ -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";
};
}
})
@@ -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
];
};
}
})
-4
View File
@@ -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;