From d01d38daf660248af76d77d039d18a1d7b26c76a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 3 Apr 2017 12:18:50 +0200
Subject: [PATCH 1/4] tv nixpkgs: 5b0c9d4 -> e840e05

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d17e41351..2f4e90e7d 100644
--- a/tv/2configs/default.nix
+++ b/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 = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03
+        ref = "e840e05425d00c7432d6169013cfe7ef84427009"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";

From 7dcc3a5afba1817d74c092fac2b68c578e98b621 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 4 Apr 2017 08:38:20 +0200
Subject: [PATCH 2/4] tv vim: make wrapper greppable

---
 tv/2configs/vim.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 8b83b0503..b534c3f42 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
 let {
   body = {
     environment.systemPackages = [
-      vim
+      vim-wrapper
     ];
 
     environment.etc.vimrc.source = vimrc;
@@ -297,7 +297,7 @@ let {
     alldirs = attrValues dirs ++ map dirOf (attrValues files);
   in unique (sort lessThan alldirs);
 
-  vim = pkgs.concat "vim" [
+  vim-wrapper = pkgs.concat "vim" [
     pkgs.vim_configurable
     (pkgs.writeDashBin "vim" ''
       set -efu

From 13d6c9a9b40c393fe5c4e5075d2abbe162253f04 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 4 Apr 2017 12:35:30 +0200
Subject: [PATCH 3/4] tv nixpkgs: e840e05 -> 9626bc7d

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 2f4e90e7d..4e3d72216 100644
--- a/tv/2configs/default.nix
+++ b/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 = "e840e05425d00c7432d6169013cfe7ef84427009"; # nixos-17.03
+        ref = "9626bc7db7690fdbd26e83403a627057a7a0a89d"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";

From 6edf616847178eaa4bed454f2c2fc7687fd78838 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 11 Apr 2017 12:51:15 +0200
Subject: [PATCH 4/4] tv nixpkgs: 9626bc7d -> 69d90619

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4e3d72216..618dcdccb 100644
--- a/tv/2configs/default.nix
+++ b/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 = "9626bc7db7690fdbd26e83403a627057a7a0a89d"; # nixos-17.03
+        ref = "69d9061908162bd973fcf34d0fc6dc9d9f8cf9ed"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";