diff options
| author | tv <tv@krebsco.de> | 2018-09-16 22:09:50 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-16 22:09:50 +0200 |
| commit | caca1e362041e68b78067ea9e3296763db79c95c (patch) | |
| tree | 13bdfcbb1320b830bc693b3b3d5547abc74400c2 /krebs | |
| parent | b3b50f8d39f3a72fa383b82234f8fa571d3e18d9 (diff) | |
| parent | fca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/reaktor-krebs.nix | 6 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/Reaktor/default.nix | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix index ba3715161..dc2838cae 100644 --- a/krebs/2configs/reaktor-krebs.nix +++ b/krebs/2configs/reaktor-krebs.nix @@ -10,6 +10,7 @@ with import <stockholm/lib>; ]; extraEnviron = { REAKTOR_HOST = "irc.freenode.org"; + REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password"; }; plugins = with pkgs.ReaktorPlugins; [ sed-plugin @@ -21,4 +22,9 @@ with import <stockholm/lib>; (attrValues (todo "agenda")) ; }; + krebs.secret.files.nix-serve-key = { + path = "/var/lib/Reaktor/reaktor_nickserv_password"; + owner.name = "Reaktor"; + source-path = toString <secrets> + "/reaktor_nickserv_password"; + }; } diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix index 6989bb02b..a9566087f 100644 --- a/krebs/5pkgs/simple/Reaktor/default.nix +++ b/krebs/5pkgs/simple/Reaktor/default.nix @@ -1,8 +1,8 @@ -{ lib, pkgs,python3Packages,fetchurl, ... }: +{ lib, pkgs, python3Packages, fetchFromGitHub, ... }: python3Packages.buildPythonPackage rec { name = "Reaktor-${version}"; - version = "0.5.1"; + version = "0.6.0"; doCheck = false; @@ -10,9 +10,11 @@ python3Packages.buildPythonPackage rec { python3Packages.docopt python3Packages.requests ]; - src = fetchurl { - url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; - sha256 = "0dn9r0cyxi1sji2pnybsrc4hhaaq7hmf235nlgkrxqlsdb7y6n6n"; + src = fetchFromGitHub { + owner = "krebs"; + repo = "Reaktor"; + rev = version; + sha256 = "0nsnv1rixmlg5wkb74b4f5bycb42b9rp4b14hijh558hbsa1b9am"; }; meta = { homepage = http://krebsco.de/; |