Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2016-11-10 23:18:17 +01:00
commit 40befd5a36
12 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/os-release.nix
View File

@ -13,7 +13,7 @@ let
version-id = "${stockholm-version-id}/${nixos-version-id}"; version-id = "${stockholm-version-id}/${nixos-version-id}";
pretty-name = "${stockholm-pretty-name} / ${nixos-pretty-name}"; pretty-name = "${stockholm-pretty-name} / ${nixos-pretty-name}";
home-url = http://cgit.cd.krebsco.de/stockholm; home-url = http://cgit.ni.krebsco.de/stockholm;
in in
{ {
# http://0pointer.de/public/systemd-man/os-release.html # http://0pointer.de/public/systemd-man/os-release.html

2
krebs/3modules/tv/default.nix
View File

@ -222,12 +222,14 @@ with import <stockholm/lib>;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
''; '';
}; };
nets = { nets = {
internet = { internet = {
ip4.addr = "188.68.36.196"; ip4.addr = "188.68.36.196";
aliases = [ aliases = [
"cgit.ni.i"
"ni.i" "ni.i"
]; ];
ssh.port = 11423; ssh.port = 11423;

2
krebs/5pkgs/cac-api/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "cac-api-1.1.2"; name = "cac-api-1.1.2";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/cac-api; url = http://cgit.ni.krebsco.de/cac-api;
rev = "67e93510e7742acae44db30275abbfe671aa9b7b"; rev = "67e93510e7742acae44db30275abbfe671aa9b7b";
sha256 = "1vxh57j7vrq5sg9j1sam0538kkkhqpgf230vvdz2ifzgkj01z27l"; sha256 = "1vxh57j7vrq5sg9j1sam0538kkkhqpgf230vvdz2ifzgkj01z27l";
}; };

2
krebs/5pkgs/get/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "get-1.4.1"; name = "get-1.4.1";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/get; url = http://cgit.ni.krebsco.de/get;
rev = "41c0c35805ec1708729f73d14650d8ebc94a405b"; rev = "41c0c35805ec1708729f73d14650d8ebc94a405b";
sha256 = "0rx1qsbb4py14795yhhqwlvaibj2569fqm7x2671l868xi59h9f9"; sha256 = "0rx1qsbb4py14795yhhqwlvaibj2569fqm7x2671l868xi59h9f9";
}; };

2
krebs/5pkgs/haskell-overrides/blessings.nix
View File

@ -3,7 +3,7 @@ mkDerivation {
pname = "blessings"; pname = "blessings";
version = "1.0.0"; version = "1.0.0";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/blessings; url = http://cgit.ni.krebsco.de/blessings;
rev = "25a510dcb38ea9158e9969d56eb66cb1b860ab5f"; rev = "25a510dcb38ea9158e9969d56eb66cb1b860ab5f";
sha256 = "0xg329h1y68ndg4w3m1jp38pkg3gqg7r19q70gqqj4mswb6qcrqc"; sha256 = "0xg329h1y68ndg4w3m1jp38pkg3gqg7r19q70gqqj4mswb6qcrqc";
}; };

2
krebs/5pkgs/haskell-overrides/scanner.nix
View File

@ -3,7 +3,7 @@ mkDerivation {
pname = "scanner"; pname = "scanner";
version = "1.0.0"; version = "1.0.0";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/scanner; url = http://cgit.ni.krebsco.de/scanner;
rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad"; rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn"; sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
}; };

2
krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
View File

@ -5,7 +5,7 @@ mkDerivation {
pname = "xmonad-stockholm"; pname = "xmonad-stockholm";
version = "1.1.0"; version = "1.1.0";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/xmonad-stockholm; url = http://cgit.ni.krebsco.de/xmonad-stockholm;
rev = "179d29fd4c765dee698058ef63295331ac603639"; rev = "179d29fd4c765dee698058ef63295331ac603639";
sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj"; sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj";
}; };

2
krebs/5pkgs/much/default.nix
View File

@ -12,7 +12,7 @@ mkDerivation {
pname = "much"; pname = "much";
version = "1.0.0"; version = "1.0.0";
src = fetchgit { src = fetchgit {
url = "http://cgit.cd.krebsco.de/much"; url = "http://cgit.ni.krebsco.de/much";
rev = "045dc986b4de225a927175f81c8ccfdab450202c"; rev = "045dc986b4de225a927175f81c8ccfdab450202c";
sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766"; sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766";
}; };

2
krebs/5pkgs/populate/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/populate; url = http://cgit.ni.krebsco.de/populate;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07"; sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07";
}; };

2
krebs/5pkgs/push/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
name = "push-1.1.2"; name = "push-1.1.2";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/push; url = http://cgit.ni.krebsco.de/push;
rev = "da5b3a4b05ef822cc41d36b6cc2071a2e78506d4"; rev = "da5b3a4b05ef822cc41d36b6cc2071a2e78506d4";
sha256 = "0gfxz207lm11g77rw02jcqpvzhx07j9hzgjgscbmslzl5r8icd6g"; sha256 = "0gfxz207lm11g77rw02jcqpvzhx07j9hzgjgscbmslzl5r8icd6g";
}; };

2
krebs/5pkgs/with-tmpdir/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "with-tmpdir-1"; name = "with-tmpdir-1";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.krebsco.de/with-tmpdir; url = http://cgit.ni.krebsco.de/with-tmpdir;
rev = "3243c02ed8cd27a04c080bd39560204980f6c16a"; rev = "3243c02ed8cd27a04c080bd39560204980f6c16a";
sha256 = "80ee6cafb2c337999ddcd1e41747d6256b7cfcea605358c2046eb7e3729555c6"; sha256 = "80ee6cafb2c337999ddcd1e41747d6256b7cfcea605358c2046eb7e3729555c6";
}; };

2
tv/2configs/git.nix
View File

@ -84,7 +84,7 @@ let
make-public-repo = name: { cgit ? {}, ... }: { make-public-repo = name: { cgit ? {}, ... }: {
inherit cgit name; inherit cgit name;
public = true; public = true;
hooks = optionalAttrs (config.krebs.build.host.name == "cd") { hooks = optionalAttrs (config.krebs.build.host.name == "ni") {
post-receive = pkgs.git-hooks.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;