Merge remote-tracking branch 'prism/master'
This commit is contained in:
commit
caca1e3620
@ -10,6 +10,7 @@ with import <stockholm/lib>;
|
|||||||
];
|
];
|
||||||
extraEnviron = {
|
extraEnviron = {
|
||||||
REAKTOR_HOST = "irc.freenode.org";
|
REAKTOR_HOST = "irc.freenode.org";
|
||||||
|
REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
|
||||||
};
|
};
|
||||||
plugins = with pkgs.ReaktorPlugins; [
|
plugins = with pkgs.ReaktorPlugins; [
|
||||||
sed-plugin
|
sed-plugin
|
||||||
@ -21,4 +22,9 @@ with import <stockholm/lib>;
|
|||||||
(attrValues (todo "agenda"))
|
(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";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ lib, pkgs,python3Packages,fetchurl, ... }:
|
{ lib, pkgs, python3Packages, fetchFromGitHub, ... }:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
name = "Reaktor-${version}";
|
name = "Reaktor-${version}";
|
||||||
version = "0.5.1";
|
version = "0.6.0";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
@ -10,9 +10,11 @@ python3Packages.buildPythonPackage rec {
|
|||||||
python3Packages.docopt
|
python3Packages.docopt
|
||||||
python3Packages.requests
|
python3Packages.requests
|
||||||
];
|
];
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz";
|
owner = "krebs";
|
||||||
sha256 = "0dn9r0cyxi1sji2pnybsrc4hhaaq7hmf235nlgkrxqlsdb7y6n6n";
|
repo = "Reaktor";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0nsnv1rixmlg5wkb74b4f5bycb42b9rp4b14hijh558hbsa1b9am";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://krebsco.de/;
|
homepage = http://krebsco.de/;
|
||||||
|
@ -34,6 +34,10 @@ let
|
|||||||
rules = concatMap make-rules (attrValues repos);
|
rules = concatMap make-rules (attrValues repos);
|
||||||
|
|
||||||
public-repos = mapAttrs make-public-repo {
|
public-repos = mapAttrs make-public-repo {
|
||||||
|
Reaktor = {
|
||||||
|
cgit.desc = "Reaktor IRC bot";
|
||||||
|
cgit.section = "software";
|
||||||
|
};
|
||||||
buildbot-classic = {
|
buildbot-classic = {
|
||||||
cgit.desc = "fork of buildbot";
|
cgit.desc = "fork of buildbot";
|
||||||
cgit.section = "software";
|
cgit.section = "software";
|
||||||
@ -54,6 +58,10 @@ let
|
|||||||
cgit.desc = "take a rss feed and a timeout and print it to stdout";
|
cgit.desc = "take a rss feed and a timeout and print it to stdout";
|
||||||
cgit.section = "software";
|
cgit.section = "software";
|
||||||
};
|
};
|
||||||
|
nix-writers = {
|
||||||
|
cgit.desc = "high level writers for nix";
|
||||||
|
cgit.section = "software";
|
||||||
|
};
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
cgit.desc = "nixpkgs fork";
|
cgit.desc = "nixpkgs fork";
|
||||||
cgit.section = "configuration";
|
cgit.section = "configuration";
|
||||||
|
Loading…
Reference in New Issue
Block a user