summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-02-09 23:07:54 +0100
committerlassulus <lass@lassul.us>2017-02-09 23:07:54 +0100
commit0d81f95c416bd2e5f9d637d469e2c1ecf3535e1c (patch)
tree6250f280d8eab89c1c2b8b227d9909eca9caee7b
parentec8687db5a9a4c73d15fd03679c2627776aaffe3 (diff)
parentb381a8b54701378c5d92f1b9c11dd4d3c8deaf93 (diff)
Merge remote-tracking branch 'onondaga/master'
-rw-r--r--krebs/3modules/nin/default.nix2
-rw-r--r--nin/2configs/nixpkgs.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/nin/default.nix b/krebs/3modules/nin/default.nix
index 3231c0e23..d5d13cd1a 100644
--- a/krebs/3modules/nin/default.nix
+++ b/krebs/3modules/nin/default.nix
@@ -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-----
diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index 9d73afbe0..27a845bd5 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "6b28bd0daf00b8e5e370a04347844cb8614138ff";
+ ref = "d2cd8a0";
};
}