diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/get/default.nix | 37 | ||||
| -rw-r--r-- | makefu/1systems/pnp.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/Reaktor/stockholmLentil.nix | 9 | ||||
| -rw-r--r-- | makefu/2configs/Reaktor/titlebot.nix | 38 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 1 |
8 files changed, 89 insertions, 4 deletions
@@ -19,11 +19,11 @@ $(systems): else ifdef system .PHONY: deploy deploy:;@ - make eval system=$(system) get=config.krebs.build.script filter=json | sh + make -s eval system=$(system) get=config.krebs.build.script filter=json | sh .PHONY: infest infest:;@ - make eval system=$(system) get=config.krebs.build.infest filter=json | sh + make -s eval system=$(system) get=config.krebs.build.infest filter=json | sh .PHONY: eval eval: diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 39d3d69ce..52b5dc78c 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -11,6 +11,7 @@ rec { charybdis = callPackage ./charybdis {}; dic = callPackage ./dic {}; genid = callPackage ./genid {}; + get = callPackage ./get {}; github-hosts-sync = callPackage ./github-hosts-sync {}; github-known_hosts = callPackage ./github-known_hosts {}; hashPassword = callPackage ./hashPassword {}; diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/get/default.nix new file mode 100644 index 000000000..87e5808b9 --- /dev/null +++ b/krebs/5pkgs/get/default.nix @@ -0,0 +1,37 @@ +{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }: + +stdenv.mkDerivation { + name = "get-1.1.0"; + + src = fetchgit { + url = http://cgit.cd.retiolum/get; + rev = "e75084e39f0402107bb520b5c9d5434a9d7f5d64"; + sha256 = "5bafc9fa68cdb8ab76437a00354cbe4af4020cbbbbce848c325cae55863d9477"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + installPhase = + let + path = stdenv.lib.makeSearchPath "bin" [ + coreutils + gnugrep + gnused + jq + nix + ]; + in + '' + mkdir -p $out/bin + + sed \ + '1s,.*,&\nPATH=${path},' \ + < ./get \ + > $out/bin/get + + chmod +x $out/bin/get + ''; +} diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index e70fb6179..2dce87d5d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -22,6 +22,7 @@ ## \/ are only plugins, must enable Reaktor explicitly ../2configs/Reaktor/stockholmLentil.nix ../2configs/Reaktor/simpleExtend.nix + ../2configs/Reaktor/titlebot.nix ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix @@ -29,6 +30,7 @@ # ../2configs/graphite-standalone.nix ]; krebs.Reaktor.enable = true; + krebs.Reaktor.debug = true; krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; diff --git a/makefu/2configs/Reaktor/stockholmLentil.nix b/makefu/2configs/Reaktor/stockholmLentil.nix index 147fb5a7a..21f0305fb 100644 --- a/makefu/2configs/Reaktor/stockholmLentil.nix +++ b/makefu/2configs/Reaktor/stockholmLentil.nix @@ -2,7 +2,12 @@ with pkgs; let - random-issue = pkgs.writeScript "random-issue" (builtins.readFile ./random-issue.sh); + random-issue = pkgs.substituteAll( { + name="random-issue"; + dir= "bin"; + isExecutable=true; + src= ./random-issue.sh; + }); random-issue-path = lib.makeSearchPath "bin" (with pkgs; [ coreutils git @@ -14,7 +19,7 @@ in { public_commands.insert(0,{ 'capname' : "stockholm-issue", 'pattern' : indirect_pattern.format("stockholm-issue"), - 'argv' : ["${random-issue}"], + 'argv' : ["${random-issue}/bin/random-issue"], 'env' : { 'state_dir': workdir, 'PATH':'${random-issue-path}', 'origin':'http://cgit.pnp/stockholm' } }) diff --git a/makefu/2configs/Reaktor/titlebot.nix b/makefu/2configs/Reaktor/titlebot.nix new file mode 100644 index 000000000..9ef02548b --- /dev/null +++ b/makefu/2configs/Reaktor/titlebot.nix @@ -0,0 +1,38 @@ +{ stdenv,config, lib, pkgs, ... }: + +with pkgs; +let + pypkgs = pkgs.python3Packages; + titlebot_cmds = pypkgs.buildPythonPackage { + name = "titlebot_cmds"; + propagatedBuildInputs = with pypkgs; [ setuptools ]; + src = fetchurl { + # https://github.com/makefu/reaktor-titlebot tag 2.1.0 + url = "https://github.com/makefu/reaktor-titlebot/archive/2.1.0.tar.gz"; + sha256 = "0wvf09wmk8b52f9j65qrw81nwrhs9pfhijwrlkzp5l7l2q8cjkp6"; + }; + }; + pub_cmds = ["up" "help" "list" "top" "highest" "undo" ]; + priv_cmds = [ "clear" ]; +in { + # TODO: write identify file in + # {config.users.extraUsers.Reaktor.home}/state/admin.lst + krebs.Reaktor.extraConfig = '' + def titlebot_cmd(cmd): + return { + 'capname': cmd, + 'env': { + 'TITLEDB': + '${config.users.extraUsers.Reaktor.home}/suggestions.json' + }, + 'pattern': '^\\.' + cmd + '\\s*(?:\\s+(?P<args>.*))?$$', + 'argv': [ '${titlebot_cmds}/bin/' + cmd ] } + # TODO: for each element in ${titlebot_cmds}/bin/* + public_commands.insert(0,titlebot_cmd('up')) + public_commands.insert(0,titlebot_cmd('help')) + public_commands.insert(0,titlebot_cmd('list')) + public_commands.insert(0,titlebot_cmd('top')) + public_commands.insert(0,titlebot_cmd('new')) + commands.insert(0,titlebot_cmd('clear')) + ''; +} diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 6cd1565f7..36733ac41 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -71,6 +71,7 @@ with lib; cac dic file + get gitAndTools.qgit gnupg21 haskellPackages.hledger diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 264cb4a1c..6624d62dc 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -26,6 +26,7 @@ let cgserver = {}; crude-mail-setup = {}; dot-xmonad = {}; + get = {}; hack = {}; load-env = {}; make-snapshot = {}; |