diff options
| author | tv <tv@krebsco.de> | 2018-05-09 11:07:27 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-05-09 11:07:27 +0200 |
| commit | 3f3c12dcd06ba211a484aabf011880a83e5832fd (patch) | |
| tree | e713b5f6e9084c3ff5cf185a1aafc12437822ea8 /lass/5pkgs | |
| parent | edafe24e94252e2be936a760ce47485c8e4fa0af (diff) | |
| parent | af75b96fbe412527c4bf9129de850bcab3e7c7cb (diff) | |
Merge remote-tracking branch 'prism/master' (despite bad style)
Diffstat (limited to 'lass/5pkgs')
| -rw-r--r-- | lass/5pkgs/custom/xmonad-lass/default.nix | 2 | ||||
| -rw-r--r-- | lass/5pkgs/nichtparasoup/default.nix | 15 | ||||
| -rw-r--r-- | lass/5pkgs/nichtparasoup/exception.patch | 13 |
3 files changed, 29 insertions, 1 deletions
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix index 18cb25b5b..868c1072a 100644 --- a/lass/5pkgs/custom/xmonad-lass/default.nix +++ b/lass/5pkgs/custom/xmonad-lass/default.nix @@ -90,7 +90,7 @@ main' = do myLayoutHook = defLayout where - defLayout = minimize $ ((avoidStruts $ Tall 1 (3/100) (1/2) ||| Full ||| Mirror (Tall 1 (3/100) (1/2))) ||| FixedColumn 2 80 80 1 ||| simplestFloat) + defLayout = minimize $ ((avoidStruts $ Mirror (Tall 1 (3/100) (1/2))) ||| Full ||| FixedColumn 2 80 80 1 ||| Tall 1 (3/100) (1/2) ||| simplestFloat) floatHooks :: Query (Endo WindowSet) floatHooks = composeAll . concat $ diff --git a/lass/5pkgs/nichtparasoup/default.nix b/lass/5pkgs/nichtparasoup/default.nix new file mode 100644 index 000000000..fcff7ad54 --- /dev/null +++ b/lass/5pkgs/nichtparasoup/default.nix @@ -0,0 +1,15 @@ +{ stdenv, pkgs, ... }: +let + py = pkgs.python3Packages.python.withPackages (p: [ + p.werkzeug + p.beautifulsoup4 + ]); + src = pkgs.fetchFromGitHub { + owner = "k4cg"; + repo = "nichtparasoup"; + rev = "c6dcd0d"; + sha256 = "10xy20bjdnd5bjv2hf6v5y5wi0mc9555awxkjqf57rk6ngc5w6ss"; + }; +in pkgs.writeDashBin "nichtparasoup" '' + ${py}/bin/python ${src}/nichtparasoup.py "$@" +'' diff --git a/lass/5pkgs/nichtparasoup/exception.patch b/lass/5pkgs/nichtparasoup/exception.patch new file mode 100644 index 000000000..34c177de0 --- /dev/null +++ b/lass/5pkgs/nichtparasoup/exception.patch @@ -0,0 +1,13 @@ +diff --git a/nichtparasoup.py b/nichtparasoup.py +index 9da9a2b..833ca71 100755 +--- a/nichtparasoup.py ++++ b/nichtparasoup.py +@@ -211,7 +211,7 @@ def cache_fill_loop(): + try: + sources[crawler][site].crawl() + info = Crawler.info() +- except Exception, e: ++ except Exception as e: + logger.error("Error in crawler %s - %s: %s" % (crawler, site, e)) + break + |