diff options
| author | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
| commit | af1959e3bdaabc004663c2dc2120148c18aa6b7c (patch) | |
| tree | e9f5237e90903a3a1fede41dc2300cffd405e817 /makefu/5pkgs | |
| parent | a71a9ed33a92ba901f7c605506bb2c3ee506e6c7 (diff) | |
| parent | 33c96a89c5c72218a1c9f16bcea5909cd5135768 (diff) | |
Merge remote-tracking branch 'gum/master' into new-populate
Diffstat (limited to 'makefu/5pkgs')
| -rw-r--r-- | makefu/5pkgs/awesomecfg/kiosk.lua | 6 | ||||
| -rw-r--r-- | makefu/5pkgs/git-xlsx-textconv/default.nix | 30 |
2 files changed, 34 insertions, 2 deletions
diff --git a/makefu/5pkgs/awesomecfg/kiosk.lua b/makefu/5pkgs/awesomecfg/kiosk.lua index 81ec9922..ec255a8a 100644 --- a/makefu/5pkgs/awesomecfg/kiosk.lua +++ b/makefu/5pkgs/awesomecfg/kiosk.lua @@ -521,13 +521,15 @@ awful.rules.rules = { } -- awful.util.spawn_with_shell("chromium --new-window --kiosk https://www.checkpoint.com/ThreatPortal/livemap.html") -awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values") +--awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values") -- awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast") --awful.util.spawn_with_shell("chromium --new-window --kiosk http://gast.aramark.de/thales-deutschland/menu/pdf/woche_de.php") -awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://map.norsecorp.com") +--awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://map.norsecorp.com") --awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://threatmap.fortiguard.com") +awful.util.spawn_with_shell("chromium --new-window --kiosk 'https://ossim.siem/ossim/#dashboard/overview/overview'") +awful.util.spawn_with_shell("chromium --new-window --kiosk 'https://ossim.siem/ossim/#analysis/alarms/alarms'") -- }}} diff --git a/makefu/5pkgs/git-xlsx-textconv/default.nix b/makefu/5pkgs/git-xlsx-textconv/default.nix new file mode 100644 index 00000000..1f631f02 --- /dev/null +++ b/makefu/5pkgs/git-xlsx-textconv/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: +let + go-xlsx = goPackages.buildGoPackage rec { + name = "go-xlsx-${version}"; + version = "46e6e472d"; + + goPackagePath = "github.com/tealeg/xlsx"; + src = fetchFromGitHub { + rev = version; + owner = "tealeg"; + repo = "xlsx"; + sha256 = "1vls05asms7azhyszbqpgdby9l45jpgisbzzmbrzi30n6cvs89zg"; + }; +}; +in +(goPackages.buildGoPackage rec { + name = "git-xlsx-textconv-${version}"; + version = "70685e7f8"; + + + goPackagePath = "github.com/tokuhirom/git-xlsx-textconv"; + + src = fetchFromGitHub { + rev = version; + owner = "tokuhirom"; + repo = "git-xlsx-textconv"; + sha256 = "055f3caj1y8v7sc2pz9q0dfyi2ij77d499pby4sjfvm5kjy9msdi"; + }; + propagatedBuildInputs = [ go-xlsx ]; +}).bin |