Replace unstable with stable in environment

2 files changed, 22 insertions, 9 deletions

diff --git a/default.nix b/default.nix
index a76cf7a..4e50c59 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,6 @@
 with import ./libs.nix;
-with nixpkgs_unstable;
+with import <nixpkgs> {};
 let
-  stable_nixpkgs = import <nixpkgs> {};
   mypkgs = {};
   postHook =  ''
     header() {
@@ -76,7 +75,7 @@ let
     configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
   });
 
-  mypkgs.weechat = weechat.override {
+  mypkgs.weechat = nixpkgs_unstable.weechat.override {
     configure = { availablePlugins, ... }: {
       plugins = with availablePlugins; [
          (python.withPackages (ps: with ps; [websocket_client emoji]))
@@ -93,7 +92,7 @@ let
       sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq";
     };
     outputs = ["out" "man"];
-    propragatedBuildInputs = [ perlPackages.YAML ];
+    propagatedBuildInputs = [ perlPackages.YAML ];
     meta = with stdenv.lib; {
       description = "A perl script for maintaining notes";
       homepage    = http://www.daemon.de/NOTE;
@@ -113,7 +112,7 @@ let
       ./patches/terminal_velocity_sort_found_notes.patch
     ];
 
-    propagatedBuildInputs = [ chardet urwid sh pyyaml ];
+    propagatedBuildInputs = [ chardet urwid nixpkgs_unstable.python2Packages.sh pyyaml ];
     buildInputs = [ m2r restructuredtext_lint pygments ];
 
     src = fetchPypi {
@@ -270,7 +269,6 @@ in
     inherit timewarrior;
     inherit sc-im;
     inherit pal;
-    inherit duplicity duply;
     inherit pdftk;
     inherit googler;
     inherit jrnl;
@@ -306,4 +304,19 @@ in
     # todo: lx* ?, unrar, unzip, zeromq?
     #inherit nextcloud-client;
     #inherit nixos;
-  }
+  } // (with nixpkgs_unstable; {
+    inherit googler;
+    inherit khal;
+    inherit newsboat;
+    inherit xmr-stak;
+    inherit urlwatch;
+    inherit graphicsmagick;
+    inherit ncmpc;
+    inherit solc;
+    inherit w3m lynx links;
+    inherit valgrind;
+    inherit ranger;
+    inherit strace;
+    inherit notmuch;
+    stgit = gitAndTools.stgit;
+  })
diff --git a/fetched/elinks.json b/fetched/elinks.json
index 993bdee..ea13b1f 100644
--- a/fetched/elinks.json
+++ b/fetched/elinks.json
@@ -1,5 +1,5 @@
 {
-  "tag": "25c2850-master",
+  "tag": "f86be65-master",
   "meta": {
     "name": "elinks",
     "url": "https://github.com/nabetaro/elinks",
@@ -8,7 +8,7 @@
   "github": {
     "owner": "nabetaro",
     "repo": "elinks",
-    "rev": "25c2850b597ee9a89bda8920e7f3d65ac3ac7e01",
+    "rev": "f86be659718c0cd0a67f88b42f07044c23d0d028",
     "sha256": "1jxb7xgawcjkb3gw4gqyw26g02709wwdbhyczfckh3l4njxhy14m",
     "fetchSubmodules": true
   }