Merge remote-tracking branch 'nin/master'

This commit is contained in:
makefu 2017-02-09 23:18:54 +01:00
commit cf68213c44
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 3 additions and 1 deletions

View File

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

View File

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