diff options
| author | makefu <github@syntax-fehler.de> | 2017-02-09 23:18:54 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-02-09 23:18:54 +0100 |
| commit | cf68213c44090ef4aae3d2e202d1a31e9ebbb4aa (patch) | |
| tree | 5b34d7153a5097c8de9ad759eaa8ea4884763673 | |
| parent | 8cefb4663624bcc4fbf0379b2cc02f2e84f0320b (diff) | |
| parent | b381a8b54701378c5d92f1b9c11dd4d3c8deaf93 (diff) | |
Merge remote-tracking branch 'nin/master'
| -rw-r--r-- | krebs/3modules/nin/default.nix | 2 | ||||
| -rw-r--r-- | nin/2configs/nixpkgs.nix | 2 |
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"; }; } |