Merge remote-tracking branch 'ni/master'

lass/2configs/newsbot-js.nix

@@ -163,7 +163,6 @@ let
     us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#news
     vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news
     weechat|http://dev.weechat.org/feed/atom|#news
-    wired_sci|http://www.wired.com/category/science/feed/|#news
     wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#news
     xkcd|https://xkcd.com/rss.xml|#news
     zdnet|http://www.zdnet.com/news/rss.xml|#news

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 = "33bd699008c8cb3d92a379de99aa1c65e6b1f8d1"; # nixos-17.03
+        ref = "7ad99e9fc8c1977f4d51ba8531386fce7276d300"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";