From 45cba0bdae964fa3bffa0ae4d9f6f8c6d085dfb5 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Thu, 11 Jun 2020 18:43:17 +0200 Subject: [PATCH] fix news2kindle module, disable apsw tests --- module/news2kindle/news2kindle.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/module/news2kindle/news2kindle.nix b/module/news2kindle/news2kindle.nix index 280f53e..f038b4c 100644 --- a/module/news2kindle/news2kindle.nix +++ b/module/news2kindle/news2kindle.nix @@ -63,7 +63,9 @@ odfpyNoTest = pkgs.python2Packages.odfpy.overrideAttrs (oldAttrs: rec { doInstallCheck = false; }); - +apswNoTest = pkgs.python2Packages.apsw.overrideAttrs (oldAttrs: rec { + doInstallCheck = false; +}); calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec { installPhase = '' @@ -71,7 +73,7 @@ calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec { cp -ravf recipes $out/var/news2kindle ''+ oldAttrs.installPhase ; - buildInputs = (remove pkgs.python2Packages.odfpy oldAttrs.buildInputs) ++ [odfpyNoTest pkgs.python27Packages.feedparser]; + buildInputs = (remove pkgs.python2Packages.apsw (remove pkgs.python2Packages.odfpy oldAttrs.buildInputs)) ++ [odfpyNoTest apswNoTest pkgs.python27Packages.feedparser]; # patches = oldAttrs.patches ++ [./calibre-disable_plugins.patch]; # patches = [./calibre-disable_plugins.patch]; @@ -163,7 +165,12 @@ in ###### implementation config = mkIf cfg.enable{ - environment.systemPackages = [pkgs.python27Packages.pyqt5 pkgs.python36Packages.pyqt5 pkgs.mailsend calibreWithRecipes]; + environment.systemPackages = [ + # pkgs.python27Packages.pyqt5 + # pkgs.python36Packages.pyqt5 + pkgs.mailsend + calibreWithRecipes + ]; services.cron.enable = true; services.cron.systemCronJobs = jobs; };