diff options
| author | lassulus <lass@lassul.us> | 2017-04-13 11:43:29 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-04-13 11:43:29 +0200 |
| commit | 34a7e67fe659d2823e536617e64dd71938be1dfd (patch) | |
| tree | 652ebe7054ace9e118e9fa43aa1cea305f5a59da | |
| parent | 022e26bf97ae821dd353b3f4c4865f89f2a247a7 (diff) | |
| parent | e832710a80ba5895bf6aa4cb996f79a7b7494038 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | lass/2configs/newsbot-js.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix index 3c6c5dc88..d38af211f 100644 --- a/lass/2configs/newsbot-js.nix +++ b/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 diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index d070273e1..8125a27ee 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 = "33bd699008c8cb3d92a379de99aa1c65e6b1f8d1"; # nixos-17.03 + ref = "7ad99e9fc8c1977f4d51ba8531386fce7276d300"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |