1 files changed, 34 insertions, 37 deletions

diff --git a/default.nix b/default.nix
index c8d8c8b..ad9bca7 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
 with import ./libs.nix;
-with import <nixpkgs> {};
+with import <immaeNixpkgsNext> {};
 let
   mypkgs = {};
 
@@ -26,11 +26,13 @@ let
     }
   );
 
-  mypkgs.weboob = pythonPackages.weboob.overrideAttrs (old: rec {
-    postInstall = ''${old.postInstall or ""}
-      mkdir -p $out/share/bash-completion/completions/
-      cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob
-    '';
+  mypkgs.weboob = (pythonPackages.weboob.overridePythonAttrs {
+      setupPyBuildFlags = [ "--no-qt" "--xdg" ];
+    }).overrideAttrs (old: rec {
+      postInstall = ''${old.postInstall or ""}
+        mkdir -p $out/share/bash-completion/completions/
+        cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob
+      '';
   });
 
   mypkgs.slrn = slrn.overrideAttrs (old: rec {
@@ -61,7 +63,17 @@ let
     configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
   });
 
-  mypkgs.weechat = nixpkgs_unstable.weechat.override {
+  mypkgs.weechat = (wrapWeechat (
+    weechat-unwrapped.overrideAttrs (old: rec {
+      version = "2.3";
+      name = "weechat-${version}";
+      src = fetchurl {
+        url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
+        sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w";
+      };
+      patches = [];
+    })
+  ) {}).override {
     configure = { availablePlugins, ... }: {
       plugins = with availablePlugins; [
          (python.withPackages (ps: with ps; [websocket_client emoji]))
@@ -89,18 +101,19 @@ let
     };
   };
 
-  mypkgs.terminal-velocity = with python2Packages; buildPythonApplication rec {
+  mypkgs.terminal-velocity = with python3Packages; buildPythonApplication rec {
     pname = "terminal-velocity-git";
     version = "0.2.0";
 
     patches = [
+      ./patches/terminal_velocity_sort_found_notes.patch
+      ./patches/terminal_velocity_python3_support.patch
       # FIXME: update this patch when version changes
       ./patches/terminal_velocity_fix_build.patch
-      ./patches/terminal_velocity_sort_found_notes.patch
     ];
 
-    propagatedBuildInputs = [ chardet urwid nixpkgs_unstable.python2Packages.sh pyyaml ];
-    buildInputs = [ m2r restructuredtext_lint pygments ];
+    propagatedBuildInputs = [ chardet urwid (sh.overridePythonAttrs { doCheck = false; }) pyyaml ];
+    buildInputs = [ m2r (restructuredtext_lint.overridePythonAttrs { doCheck = false; }) pygments ];
 
     postInstall = ''
       rm $out/bin/terminal_velocity
@@ -456,9 +469,9 @@ let
 
   mypkgs.notmuch-vim = stdenv.mkDerivation rec {
     name = "notmuch-vim-${version}";
-    version = nixpkgs_unstable.notmuch.version;
+    version = notmuch.version;
     outputs = [ "out" ];
-    src = nixpkgs_unstable.notmuch.src;
+    src = notmuch.src;
     phases = [ "unpackPhase" "installPhase" ];
     installPhase = ''
       make -C vim DESTDIR=$out prefix="/share/vim/vimfiles" install
@@ -467,10 +480,10 @@ let
 
   mypkgs.notmuch-python2 = stdenv.mkDerivation rec {
     name = "notmuch-python2-${version}";
-    version = nixpkgs_unstable.notmuch.version;
+    version = notmuch.version;
     outputs = [ "out" ];
     buildInputs = [ python2Packages.sphinx python2Packages.python ];
-    src = nixpkgs_unstable.notmuch.src;
+    src = notmuch.src;
     phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
     buildPhase = ''
       cd bindings/python
@@ -483,10 +496,10 @@ let
 
   mypkgs.notmuch-python3 = stdenv.mkDerivation rec {
     name = "notmuch-python3-${version}";
-    version = nixpkgs_unstable.notmuch.version;
+    version = notmuch.version;
     outputs = [ "out" ];
-    buildInputs = [ nixpkgs_unstable.python3Packages.sphinx nixpkgs_unstable.python3Packages.python ];
-    src = nixpkgs_unstable.notmuch.src;
+    buildInputs = [ python3Packages.sphinx python3Packages.python ];
+    src = notmuch.src;
     phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
     buildPhase = ''
       cd bindings/python
@@ -581,24 +594,8 @@ in
     inherit feh imagemagick;
     inherit lftp;
     stgit = gitAndTools.stgit;
-    # 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 notmuch-mutt;
-    stgit = gitAndTools.stgit;
     inherit bundix;
     bower2nix = nodePackages.bower2nix;
-  })
+    # todo: unrar, unzip
+    #inherit nixos;
+  }