From 55cdd65163c34fa899557305ffc68fad02ed7d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 4 Jul 2024 12:36:42 -0400
Subject: [PATCH 1/3] pdfarranger: migrate to pkgs/by-name

---
 .../default.nix => by-name/pd/pdfarranger/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/pdfarranger/default.nix => by-name/pd/pdfarranger/package.nix} (100%)

diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/by-name/pd/pdfarranger/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdfarranger/default.nix
rename to pkgs/by-name/pd/pdfarranger/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56cd947e5bec..6a20e0cb6e81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11601,8 +11601,6 @@ with pkgs;
 
   pdf-quench = callPackage ../applications/misc/pdf-quench { };
 
-  pdfarranger = callPackage ../applications/misc/pdfarranger { };
-
   briss = callPackage ../tools/graphics/briss { };
 
   brickd = callPackage ../servers/brickd { };

From 0cdfbcb1c681279b0c3bed8a9effa6e13e45ea2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 4 Jul 2024 15:16:56 -0400
Subject: [PATCH 2/3] pdfarranger: modernise

---
 pkgs/by-name/pd/pdfarranger/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 5dda053eb753..79eef7f4ed09 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -21,9 +21,11 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [
     wrapGAppsHook3
-  ] ++ (with python3Packages; [
+  ];
+
+  build-system = with python3Packages; [
     setuptools
-  ]);
+  ];
 
   buildInputs = [
     gtk3
@@ -31,7 +33,7 @@ python3Packages.buildPythonApplication rec {
     libhandy
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     pygobject3
     pikepdf
     img2pdf
@@ -42,19 +44,19 @@ python3Packages.buildPythonApplication rec {
   # incompatible with wrapGAppsHook3
   strictDeps = false;
   dontWrapGApps = true;
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+  ];
 
   doCheck = false; # no tests
 
-  meta = with lib; {
+  meta = {
     inherit (src.meta) homepage;
-    description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface";
+    description = "Merge or split pdf documents and rotate, crop and rearrange their pages using a graphical interface";
     mainProgram = "pdfarranger";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ symphorien ];
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ symphorien ];
+    license = lib.licenses.gpl3Plus;
     changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}";
   };
 }

From fdbeea2a9f11ee61f6b162d8db3c387f567fa75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 4 Jul 2024 15:17:18 -0400
Subject: [PATCH 3/3] pdfarranger: nixfmt-rfc-style

---
 pkgs/by-name/pd/pdfarranger/package.nix | 27 ++++++++++---------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 79eef7f4ed09..bcbad7a32dcb 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -1,10 +1,11 @@
-{ fetchFromGitHub
-, lib
-, wrapGAppsHook3
-, python3Packages
-, gtk3
-, poppler_gi
-, libhandy
+{
+  fetchFromGitHub,
+  lib,
+  wrapGAppsHook3,
+  python3Packages,
+  gtk3,
+  poppler_gi,
+  libhandy,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -19,13 +20,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA=";
   };
 
-  nativeBuildInputs = [
-    wrapGAppsHook3
-  ];
+  nativeBuildInputs = [ wrapGAppsHook3 ];
 
-  build-system = with python3Packages; [
-    setuptools
-  ];
+  build-system = with python3Packages; [ setuptools ];
 
   buildInputs = [
     gtk3
@@ -44,9 +41,7 @@ python3Packages.buildPythonApplication rec {
   # incompatible with wrapGAppsHook3
   strictDeps = false;
   dontWrapGApps = true;
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
   doCheck = false; # no tests