Move packages to flakes

4 files changed, 1 insertions, 77 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index 9b0615a..b01dd81 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,7 @@
 let
   flakeCompat = import ../lib/flake-compat.nix;
   flakes = builtins.foldl' (a: b: a // b) {} (map (n: (flakeCompat n).overlays) [
+    ../flakes/backports
     ../flakes/libspf2
     ../flakes/openarc
     ../flakes/opendmarc
@@ -39,7 +40,6 @@ in flakes // {
   sudo = import ./sudo;
   taskwarrior = import ./taskwarrior;
   vcsh = import ./vcsh;
-  weboob = import ./weboob;
   weechat = import ./weechat;
   ympd = import ./ympd;
   doing = import ./doing;
diff --git a/overlays/python-packages/default.nix b/overlays/python-packages/default.nix
index 11dea09..601eed1 100644
--- a/overlays/python-packages/default.nix
+++ b/overlays/python-packages/default.nix
@@ -22,7 +22,6 @@ in
   } // super.lib.attrsets.listToAttrs overriddenPythons;
 
 
-  apprise = fromMyPythonPackages "apprise";
   blivet3 = fromMyPythonPackages "blivet3";
   buildbot = import ./buildbot.nix;
   wokkel = fromMyPythonPackages "wokkel";
diff --git a/overlays/weboob/default.nix b/overlays/weboob/default.nix
deleted file mode 100644
index 6e5656b..0000000
--- a/overlays/weboob/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-self: super: {
-  weboob = self.callPackage ./weboob.nix {
-    inherit (super.python3Packages) buildPythonPackage fetchPypi nose
-    pillow prettytable pyyaml dateutil gdata requests feedparser lxml
-    pyqt5 simplejson cssselect pdfminer termcolor
-    google_api_python_client unidecode Babel html5lib html2text;
-  };
-}
diff --git a/overlays/weboob/weboob.nix b/overlays/weboob/weboob.nix
deleted file mode 100644
index faafbc4..0000000
--- a/overlays/weboob/weboob.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ buildPythonPackage, fetchurl, fetchPypi, stdenv
-, nose, pillow, prettytable, pyyaml, dateutil, gdata
-, requests, feedparser, lxml, gnupg, pyqt5
-, libyaml, simplejson, cssselect, pdfminer
-, termcolor, google_api_python_client, html2text
-, unidecode, html5lib, Babel
-}:
-let
-  mechanize = buildPythonPackage rec {
-    pname = "mechanize";
-    version = "0.4.4";
-    src = fetchPypi {
-      inherit version pname;
-      sha256 = "9fff89e973bdf1aee75a351bd4dde53ca51a7e76944ddeae3ea3b6ad6c46045c";
-    };
-    propagatedBuildInputs = [ html5lib ];
-    doCheck = false;
-  };
-in
-
-buildPythonPackage rec {
-  pname = "weboob";
-  version = "2.0";
-
-  src = fetchurl {
-    url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz";
-    sha256 = "1p0wd6k28s0cdxkrj5s6vmi120w6v5vfxxyddqg7s2xjxv6mbbbm";
-  };
-
-  postPatch = ''
-    # Disable doctests that require networking:
-    sed -i -n -e '/^ *def \+pagination *(.*: *$/ {
-      p; n; p; /"""\|'\'\'\'''/!b
-
-      :loop
-      n; /^ *\(>>>\|\.\.\.\)/ { h; bloop }
-      x; /^ *\(>>>\|\.\.\.\)/bloop; x
-      p; /"""\|'\'\'\'''/b
-      bloop
-    }; p' weboob/browser/browsers.py weboob/browser/pages.py
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/bash-completion/completions/
-    cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob
-  '';
-
-  checkInputs = [ nose ];
-
-  nativeBuildInputs = [ pyqt5 ];
-
-  propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
-    gdata requests feedparser lxml gnupg pyqt5 libyaml
-    simplejson cssselect mechanize pdfminer termcolor
-    google_api_python_client html2text unidecode Babel ];
-
-  checkPhase = ''
-    nosetests
-  '';
-
-  meta = {
-    homepage = http://weboob.org;
-    description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
-    license = stdenv.lib.licenses.agpl3;
-  };
-}
-