From eb0087649d7174763cc790313994f2d9f2f62c19 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sun, 16 Sep 2018 19:46:08 +0200
Subject: Reaktor: 0.5.1 -> 0.6.0

---
 krebs/5pkgs/simple/Reaktor/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
index 6989bb02..a9566087 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/;
-- 
cgit v1.2.3


From 4bcb98a3c4c29a20289b7706667d24c514edd62c Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sun, 16 Sep 2018 19:49:54 +0200
Subject: reaktor-krebs: configure nickserv password

---
 krebs/2configs/reaktor-krebs.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index ba371516..dc2838ca 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";
+  };
 }
-- 
cgit v1.2.3