entangle: move to by-name; nixfmt

pkgs/by-name/en/entangle/package.nix

@@ -1,53 +1,53 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitLab
+  stdenv,
-, fetchpatch
+  fetchFromGitLab,
-, itstool
+  fetchpatch,
-, libxml2
+  itstool,
-, meson
+  libxml2,
-, ninja
+  meson,
-, perl
+  ninja,
-, python3
+  perl,
-, pkgconf
+  python3,
-, wrapGAppsHook3
+  pkgconf,
-, at-spi2-core
+  wrapGAppsHook3,
-, dbus
+  at-spi2-core,
-, elfutils
+  dbus,
-, libepoxy
+  elfutils,
-, gexiv2
+  libepoxy,
-, glib
+  gexiv2,
-, gobject-introspection
+  glib,
-, gst-plugins-base
+  gobject-introspection,
-, gstreamer
+  gst_all_1,
-, gtk3
+  gtk3,
-, lcms2
+  lcms2,
-, libdatrie
+  libdatrie,
-, libgphoto2
+  libgphoto2,
-, libgudev
+  libgudev,
-, libpeas
+  libpeas,
-, libraw
+  libraw,
-, libselinux
+  libselinux,
-, libsepol
+  libsepol,
-, libthai
+  libthai,
-, libunwind
+  libunwind,
-, libxkbcommon
+  libxkbcommon,
-, orc
+  orc,
-, pcre
+  pcre,
-, pcre2
+  pcre2,
-, udev
+  udev,
-, util-linux
+  util-linux,
-, xorg
+  xorg,
-, zstd
+  zstd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "entangle";
   version = "3.0";
 
   src = fetchFromGitLab {
     owner = "entangle";
     repo = "entangle";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
   };
 
@@ -73,37 +73,39 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs = [
+  buildInputs =
-    at-spi2-core
+    [
-    dbus
+      at-spi2-core
-    libepoxy
+      dbus
-    elfutils
+      libepoxy
-    gexiv2
+      elfutils
-    glib
+      gexiv2
-    gst-plugins-base
+      glib
-    gstreamer
+      gst_all_1.gst-plugins-base
-    gtk3
+      gst_all_1.gstreamer
-    lcms2
+      gtk3
-    libdatrie
+      lcms2
-    libgphoto2
+      libdatrie
-    libgudev
+      libgphoto2
-    libpeas
+      libgudev
-    libraw
+      libpeas
-    libselinux
+      libraw
-    libsepol
+      libselinux
-    libthai
+      libsepol
-    libunwind
+      libthai
-    libxkbcommon
+      libunwind
-    orc
+      libxkbcommon
-    pcre # required by libselinux before we USE_PCRE2
+      orc
-    pcre2 # required by glib-2.0
+      pcre # required by libselinux before we USE_PCRE2
-    udev
+      pcre2 # required by glib-2.0
-    util-linux
+      udev
-    zstd
+      util-linux
-  ] ++ (with xorg; [
+      zstd
-    libXdmcp
+    ]
-    libXtst
+    ++ (with xorg; [
-  ]);
+      libXdmcp
+      libXtst
+    ]);
 
   # Disable building of doc/reference since it requires network connection to render XML to HTML
   # Patch build script shebangs
@@ -120,7 +122,7 @@ stdenv.mkDerivation rec {
       --replace "Exec=entangle" "Exec=$out/bin/entangle"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tethered camera control and capture";
     longDescription = ''
       Entangle uses GTK and libgphoto2 to provide a graphical interface
@@ -130,9 +132,9 @@ stdenv.mkDerivation rec {
       This app can also serve as a camera app for mobile devices.
     '';
     homepage = "https://gitlab.com/entangle/entangle";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
-    maintainers = with maintainers; [ ShamrockLee ];
+    maintainers = with lib.maintainers; [ ShamrockLee ];
     mainProgram = "entangle";
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -29193,10 +29193,6 @@ with pkgs;
 
   enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
 
-  entangle = callPackage ../applications/video/entangle {
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-  };
-
   eolie = callPackage ../applications/networking/browsers/eolie { };
 
   eos-installer = callPackage ../applications/misc/eos-installer { };