Merge remote-tracking branch 'ni/master'

krebs/5pkgs/git-hooks/default.nix

@@ -1,13 +1,10 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
-with lib;
-
-let
-  out = {
-    inherit irc-announce;
-  };
+with import <stockholm/lib>;
 
+{
   # TODO irc-announce should return a derivation
+  #      but it cannot because krebs.git.repos.*.hooks :: attrsOf str
   irc-announce = { nick, channel, server, port ? 6667, verbose ? false, branches ? [] }: ''
     #! /bin/sh
     set -euf
@@ -37,7 +34,7 @@ let
     port=${toString port}
 
     host=$nick
-    cgit_endpoint=http://cgit.$host
+    cgit_endpoint=http://cgit.$host.r
 
     empty=0000000000000000000000000000000000000000
 
@@ -99,7 +96,7 @@ let
     done
 
     if test -n "''${message-}"; then
-      exec ${irc-announce-script} \
+      exec ${pkgs.irc-announce}/bin/irc-announce \
         "$server" \
         "$port" \
         "$nick" \
@@ -107,6 +104,4 @@ let
         "$message"
     fi
   '';
-
-  irc-announce-script = "${pkgs.irc-announce}/bin/irc-announce";
-in out
+}

shared/2configs/default.nix

@@ -11,7 +11,7 @@ with import <stockholm/lib>;
     nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
     nixpkgs.git = {
       url = https://github.com/NixOS/nixpkgs;
-      ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-04
+      ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03
     };
     secrets.file =
       if getEnv "dummy_secrets" == "true"
@@ -30,10 +30,6 @@ with import <stockholm/lib>;
   ];
   nix.useSandbox = true;
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    nano = pkgs.vim;
-  };
-
   environment.systemPackages = with pkgs; [
     git
     rxvt_unicode.terminfo

tv/2configs/default.nix

@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "53a2baa"; # nixos-unstable (17.03-rc)
+        ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";

tv/2configs/urlwatch.nix

@@ -31,7 +31,7 @@ with import <stockholm/lib>;
 
       ## other
 
-      https://nixos.org/channels/nixos-16.09/git-revision
+      https://nixos.org/channels/nixos-17.03/git-revision
       https://nixos.org/channels/nixos-unstable/git-revision
 
       ## 2014-10-17