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

change buildipnut of calbire to fix "test failur" of odfpy

Browse Source
This commit is contained in:
stubbfel
2018-01-21 18:04:52 +01:00
parent 36605cef5c
commit 2329bd8685
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/news2kindle/news2kindle.nix
View File

@@ -44,11 +44,17 @@ dailyUpdateScript = pkgs.writeText "dailyUpdates.sh" ''#!/bin/bash
${concatStrings callConvertScripts} ${concatStrings callConvertScripts}
''; '';
odfpyNoTest = pkgs.python2Packages.odfpy.overrideAttrs (oldAttrs: rec {
doInstallCheck = false;
});
calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec { calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec {
installPhase = '' installPhase = ''
mkdir -p $out/var/news2kindle/recipes mkdir -p $out/var/news2kindle/recipes
cp -ravf recipes $out/var/news2kindle cp -ravf recipes $out/var/news2kindle
''+ oldAttrs.installPhase ; ''+ oldAttrs.installPhase ;
buildInputs = (remove pkgs.python2Packages.odfpy oldAttrs.buildInputs) ++ [odfpyNoTest];
}); });

10
services/news2kindle.nix
View File

@@ -2,9 +2,9 @@
{ {
services.postfix.enable = true; services.postfix.enable = true;
services.postfix.extraConfig = "message_size_limit=52428800"; services.postfix.extraConfig = "message_size_limit=52428800";
services.news2kindle = { services.news2kindle = {
enable = false; enable = true;
recipients = [ recipients = [
{ {
mail = "stubbfel@kindle.com"; mail = "stubbfel@kindle.com";
@@ -26,7 +26,7 @@ class BasicUserRecipe1414943033(AutomaticNewsRecipe):
oldest_article = 7 oldest_article = 7
max_articles_per_feed = 100 max_articles_per_feed = 100
auto_cleanup = True auto_cleanup = True
feeds = [(u'Postilion', feeds = [(u'Postilion',
u'http://feeds.feedburner.com/blogspot/rkEL')] u'http://feeds.feedburner.com/blogspot/rkEL')]
'';} '';}
{ name = "Stoerungsmelder"; { name = "Stoerungsmelder";
@@ -36,7 +36,7 @@ class BasicUserRecipe1397125629(AutomaticNewsRecipe):
oldest_article = 7 oldest_article = 7
max_articles_per_feed = 100 max_articles_per_feed = 100
auto_cleanup = True auto_cleanup = True
feeds = [(u'st\xf6rungsmelder', feeds = [(u'st\xf6rungsmelder',
u'http://blog.zeit.de/stoerungsmelder/feed')] u'http://blog.zeit.de/stoerungsmelder/feed')]
'';} '';}
]; ];
@@ -65,7 +65,7 @@ class AdvancedUserRecipe1422191832(BasicNewsRecipe):
''; '';
} }
]; ];
} }
]; ];
}; };
} }

21
services/nginx.nix.orig
View File

@@ -1,21 +0,0 @@
{ config, pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [80 443];
services.nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
<<<<<<< HEAD
recommendedTlsSettings = false;
=======
recommendedTlsSettings = true;
sslCiphers ="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!AES128";
>>>>>>> 5f7acd102b79f7c454d0472d0bb2edfaf140640f
};
}