diff options
| author | lassulus <lass@blue.r> | 2018-09-17 10:10:53 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-17 10:10:53 +0200 |
| commit | 9155ef1caa5e06dfa284d39ab7d9b21d67dcd2ce (patch) | |
| tree | fdcd9d1139498a7241e8ab4f22af0ce0c4e42dec | |
| parent | 1662e21c330506f17bf37c08cf50ad594637be94 (diff) | |
| parent | 3b15b226ffa808a04790e6ac24a2f7c128b0347d (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/5pkgs/simple/Reaktor/plugins.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/reaktor-coders.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/mu/config.nix | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index 92a270ef3..2ccc1c8e9 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -120,7 +120,7 @@ rec { url-title = (buildSimpleReaktorPlugin "url-title" { pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$"; path = with pkgs; [ curl perl ]; - script = pkgs.writePython3 "url-title" [ "beautifulsoup4" "lxml" ] '' + script = pkgs.writePython3 "url-title" { deps = [ "beautifulsoup4" "lxml" ]; } '' import cgi import sys import urllib.request diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix index 9365582b8..44d8984d7 100644 --- a/lass/2configs/reaktor-coders.nix +++ b/lass/2configs/reaktor-coders.nix @@ -65,7 +65,7 @@ with import <stockholm/lib>; }) (buildSimpleReaktorPlugin "random-unicorn-porn" { pattern = "^!rup$$"; - script = pkgs.writePython2 "rup" [] '' + script = pkgs.writePython2 "rup" {} '' t1 = """ _. ;=',_ () diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 6c22971bf..f51366546 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -2,9 +2,7 @@ with import <stockholm/lib>; { config, pkgs, ... }: { imports = [ - <stockholm/krebs> - <stockholm/tv/2configs> - <stockholm/tv/3modules> + <stockholm/tv> <stockholm/tv/2configs/exim-retiolum.nix> <stockholm/tv/2configs/retiolum.nix> ]; @@ -57,6 +55,7 @@ with import <stockholm/lib>; gimp iptables libreoffice + plasma-pa (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) |