From 9e7fbae80e7f4d11d06cf0cb9fe9e503f668326b Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Thu, 1 Aug 2024 18:26:17 +0200
Subject: [PATCH] feat: use isisdl from unstable branch

---
 modules/nix.nix                    |  1 -
 overlays/isisdl.nix                | 66 ------------------------------
 overlays/pppdf/default.nix         |  7 +++-
 users/gandalf/modules/packages.nix |  2 +-
 4 files changed, 7 insertions(+), 69 deletions(-)
 delete mode 100644 overlays/isisdl.nix

diff --git a/modules/nix.nix b/modules/nix.nix
index 775965f..f949a2f 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -15,7 +15,6 @@
         mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix { }).driver;
         mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix { }).cupswrapper;
         pppdf = (super.python3Packages.callPackage ../overlays/pppdf { });
-        isisdl = (super.python3Packages.callPackage ../overlays/isisdl.nix { });
         iglesia-light = (super.callPackage ../overlays/fonts/iglesia-light.nix { });
       })
     ];
diff --git a/overlays/isisdl.nix b/overlays/isisdl.nix
deleted file mode 100644
index 183340c..0000000
--- a/overlays/isisdl.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ pkgs
-, lib
-, buildPythonApplication
-, fetchPypi
-, python3Packages
-, withFFmpeg ? false
-}:
-buildPythonApplication rec {
-  pname = "isisdl";
-  version = "1.3.20";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-s0vGCJVSa6hf6/sIhzmaxpziP4izoRwcZfxvm//5inY=";
-  };
-
-  pyproject = true;
-
-    build-system = with python3Packages; [
-    setuptools
-  ];
-
-  nativeBuildInputs = with python3Packages; [
-    pythonRelaxDepsHook
-  ];
-
-  dependencies = with python3Packages; [
-    cryptography
-    requests
-    pyyaml
-    packaging
-    colorama
-    pyinotify
-    distro
-    psutil
-  ];
-
-  pythonRelaxDeps = [
-    "cryptography"
-    "requests"
-    "packaging"
-    "distro"
-  ];
-
-  buildInputs = [
-    pkgs.util-linux # for runtime dependency `lsblk`
-  ] ++ lib.optionals withFFmpeg [
-    pkgs.ffmpeg
-  ];
-
-  # disable tests since they require valid login credentials
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/Emily3403/isisdl";
-    description = "A downloader for ISIS of TU-Berlin";
-    longDescription = ''
-      A downloading utility for ISIS of TU-Berlin.
-      Download all your files and videos from ISIS.
-    '';
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ bchmnn ];
-    mainProgram = "isisdl";
-    platforms = platforms.linux;
-  };
-}
diff --git a/overlays/pppdf/default.nix b/overlays/pppdf/default.nix
index 293143e..1cf671d 100644
--- a/overlays/pppdf/default.nix
+++ b/overlays/pppdf/default.nix
@@ -9,7 +9,12 @@ buildPythonApplication {
     pkgs.gobject-introspection
   ];
 
-  propagatedBuildInputs = with python3Packages; [ pkgs.gtk3 pygobject3 notify2 pikepdf ];
+  propagatedBuildInputs = with python3Packages; [
+    pkgs.gtk3
+    pygobject3
+    notify2
+    pikepdf
+  ];
 
   dontUnpack = true;
   format = "other";
diff --git a/users/gandalf/modules/packages.nix b/users/gandalf/modules/packages.nix
index b484176..a350be7 100644
--- a/users/gandalf/modules/packages.nix
+++ b/users/gandalf/modules/packages.nix
@@ -16,7 +16,7 @@
     ghostscript # postscript interpreter (mainline version)
     pdftk # command-line tool for working with pdfs
     ventoy-full # bootable usb solution
-    isisdl # downloader for isis of tu-berlin
+    unstable.isisdl # downloader for isis of tu-berlin
     sage # open source mathematics software, free alternative to magma, maple, mathematica, and matlab
   ];