From 1751247c95441716d5ba9b263be0928ce1d1c8a2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 13 Nov 2023 18:56:31 -0300
Subject: apt-offline: adopt and refactor

- remove rec
- remove nested with
---
 pkgs/by-name/ap/apt-offline/package.nix | 45 +++++++++++++++++++++++++++++++++
 pkgs/tools/misc/apt-offline/default.nix | 40 -----------------------------
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 45 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/ap/apt-offline/package.nix
 delete mode 100644 pkgs/tools/misc/apt-offline/default.nix

(limited to 'pkgs')

diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix
new file mode 100644
index 000000000000..4eef07f030c5
--- /dev/null
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -0,0 +1,45 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, gnupg
+}:
+
+let
+  pname = "apt-offline";
+  version = "1.8.4";
+
+  src = fetchFromGitHub {
+    owner = "rickysarraf";
+    repo = "apt-offline";
+    rev = "v${version}";
+    hash = "sha256-RBf/QG0ewLS6gnQTBXi0I18z8QrxoBAqEXZ7dro9z5A=";
+  };
+in
+python3Packages.buildPythonApplication {
+  inherit pname version src;
+
+  postPatch = ''
+    substituteInPlace org.debian.apt.aptoffline.policy \
+      --replace /usr/bin/ "$out/bin"
+
+    substituteInPlace apt_offline_core/AptOfflineCoreLib.py \
+      --replace /usr/bin/gpgv "${gnupg}/bin/gpgv"
+  '';
+
+  preFixup = ''
+    rm "$out/bin/apt-offline-gui"
+    rm "$out/bin/apt-offline-gui-pkexec"
+  '';
+
+  doCheck = false; # API incompatibilities, maybe?
+
+  pythonImportsCheck = [ "apt_offline_core" ];
+
+  meta = {
+    homepage = "https://github.com/rickysarraf/apt-offline";
+    description = "Offline APT package manager";
+    license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "apt-offline";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
deleted file mode 100644
index 585033068d17..000000000000
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nix-update-script, gnupg }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "apt-offline";
-  version = "1.8.4";
-
-  src = fetchFromGitHub {
-    owner = "rickysarraf";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "RBf/QG0ewLS6gnQTBXi0I18z8QrxoBAqEXZ7dro9z5A=";
-  };
-
-  postPatch = ''
-    substituteInPlace org.debian.apt.aptoffline.policy \
-      --replace /usr/bin/ "$out/bin"
-
-    substituteInPlace apt_offline_core/AptOfflineCoreLib.py \
-      --replace /usr/bin/gpgv "${gnupg}/bin/gpgv"
-  '';
-
-  preFixup = ''
-    rm "$out/bin/apt-offline-gui"
-    rm "$out/bin/apt-offline-gui-pkexec"
-  '';
-
-  doCheck = false;
-
-  pythonImportsCheck = [ "apt_offline_core" ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    homepage = "https://github.com/rickysarraf/apt-offline";
-    description = "Offline APT package manager";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f532949f71d..0cb9fcd20d5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3252,8 +3252,6 @@ with pkgs;
 
   apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { };
 
-  apt-offline = callPackage ../tools/misc/apt-offline { };
-
   aptly = callPackage ../tools/misc/aptly { };
 
   ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { };
-- 
cgit 1.4.1