Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2018-09-17 10:10:53 +02:00
commit 9155ef1caa
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/5pkgs/simple/Reaktor/plugins.nix
View File

@ -120,7 +120,7 @@ rec {
url-title = (buildSimpleReaktorPlugin "url-title" { url-title = (buildSimpleReaktorPlugin "url-title" {
pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$"; pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$";
path = with pkgs; [ curl perl ]; path = with pkgs; [ curl perl ];
script = pkgs.writePython3 "url-title" [ "beautifulsoup4" "lxml" ] '' script = pkgs.writePython3 "url-title" { deps = [ "beautifulsoup4" "lxml" ]; } ''
import cgi import cgi
import sys import sys
import urllib.request import urllib.request

2
lass/2configs/reaktor-coders.nix
View File

@ -65,7 +65,7 @@ with import <stockholm/lib>;
}) })
(buildSimpleReaktorPlugin "random-unicorn-porn" { (buildSimpleReaktorPlugin "random-unicorn-porn" {
pattern = "^!rup$$"; pattern = "^!rup$$";
script = pkgs.writePython2 "rup" [] '' script = pkgs.writePython2 "rup" {} ''
t1 = """ t1 = """
_. _.
;=',_ () ;=',_ ()

5
tv/1systems/mu/config.nix
View File

@ -2,9 +2,7 @@ with import <stockholm/lib>;
{ config, pkgs, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
<stockholm/krebs> <stockholm/tv>
<stockholm/tv/2configs>
<stockholm/tv/3modules>
<stockholm/tv/2configs/exim-retiolum.nix> <stockholm/tv/2configs/exim-retiolum.nix>
<stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/retiolum.nix>
]; ];
@ -57,6 +55,7 @@ with import <stockholm/lib>;
gimp gimp
iptables iptables
libreoffice libreoffice
plasma-pa
(pkgs.pidgin-with-plugins.override { (pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ]; plugins = [ pkgs.pidginotr ];
}) })