apt-offline: adopt and refactor

- remove rec
- remove nested with

2 files changed, 16 insertions, 13 deletions

diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/by-name/ap/apt-offline/package.nix
index 585033068d17..4eef07f030c5 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -1,15 +1,22 @@
-{ lib, fetchFromGitHub, python3Packages, nix-update-script, gnupg }:
+{ lib
+, fetchFromGitHub
+, python3Packages
+, gnupg
+}:
 
-python3Packages.buildPythonApplication rec {
+let
   pname = "apt-offline";
   version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "rickysarraf";
-    repo = pname;
+    repo = "apt-offline";
     rev = "v${version}";
-    sha256 = "RBf/QG0ewLS6gnQTBXi0I18z8QrxoBAqEXZ7dro9z5A=";
+    hash = "sha256-RBf/QG0ewLS6gnQTBXi0I18z8QrxoBAqEXZ7dro9z5A=";
   };
+in
+python3Packages.buildPythonApplication {
+  inherit pname version src;
 
   postPatch = ''
     substituteInPlace org.debian.apt.aptoffline.policy \
@@ -24,17 +31,15 @@ python3Packages.buildPythonApplication rec {
     rm "$out/bin/apt-offline-gui-pkexec"
   '';
 
-  doCheck = false;
+  doCheck = false; # API incompatibilities, maybe?
 
   pythonImportsCheck = [ "apt_offline_core" ];
 
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/rickysarraf/apt-offline";
     description = "Offline APT package manager";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "apt-offline";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }
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 { };