nixos-config/stubbfelnix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix news2kindle module, disable apsw tests

Browse Source
This commit is contained in:
stubbfel
2020-06-11 18:43:17 +02:00
parent 07cb96807f
commit 45cba0bdae
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/news2kindle/news2kindle.nix
View File

@@ -63,7 +63,9 @@ odfpyNoTest = pkgs.python2Packages.odfpy.overrideAttrs (oldAttrs: rec {
doInstallCheck = false; doInstallCheck = false;
}); });
apswNoTest = pkgs.python2Packages.apsw.overrideAttrs (oldAttrs: rec {
doInstallCheck = false;
});
calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec { calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec {
installPhase = '' installPhase = ''
@@ -71,7 +73,7 @@ calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec {
cp -ravf recipes $out/var/news2kindle cp -ravf recipes $out/var/news2kindle
''+ oldAttrs.installPhase ; ''+ 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 = oldAttrs.patches ++ [./calibre-disable_plugins.patch];
# patches = [./calibre-disable_plugins.patch]; # patches = [./calibre-disable_plugins.patch];
@@ -163,7 +165,12 @@ in
###### implementation ###### implementation
config = mkIf cfg.enable{ 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.enable = true;
services.cron.systemCronJobs = jobs; services.cron.systemCronJobs = jobs;
}; };