Merge remote-tracking branch 'onondaga/master'

This commit is contained in:
lassulus 2017-02-09 23:07:54 +01:00
commit 0d81f95c41
2 changed files with 3 additions and 1 deletions

View File

@ -38,6 +38,8 @@ with import <stockholm/lib>;
aliases = [ aliases = [
"onondaga.retiolum" "onondaga.retiolum"
"onondaga.r" "onondaga.r"
"cgit.onondaga.r"
"cgit.onondaga.retiolum"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

View File

@ -3,6 +3,6 @@
{ {
krebs.build.source.nixpkgs.git = { krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs; url = https://github.com/nixos/nixpkgs;
ref = "6b28bd0daf00b8e5e370a04347844cb8614138ff"; ref = "d2cd8a0";
}; };
} }