Elpy is no longer in pythonPackages? Other misc changes.

pkgs/pkgsets.nix

@@ -17,7 +17,7 @@ let
     cryptsetup
     dhcpcd
     dnsutils
-    git git-lfs
+    gitFull git-lfs
     gnupg
     gptfdisk
     haskellPackages.nix-derivation
@@ -68,7 +68,7 @@ let
     whois
     wirelesstools
     wpa_supplicant
-    zip
+    zip unzipNLS
     zlib
     zsh
   ];
@@ -86,7 +86,7 @@ let
     rainbow-delimiters # color parenthesis by indentation
     color-identifiers-mode
     /* Python */
-    company-jedi pylint melpaStablePackages.elpy flycheck-mypy
+    company-jedi pylint elpy flycheck-mypy
     /* Git support */
     magit
     emms # multimedia support
@@ -181,13 +181,12 @@ let
     })
   ];
 
-  python3 = stablepkgs.python3Full.withPackages(ps: with ps; [
+  python3 = gitpkgs.python3Full.withPackages(ps: with ps; [
     GitPython
     bpython
-    cairosvg cairocffi
+    # cairosvg cairocffi
     configparser
     django
-    elpy
     emoji
     epc
     flake8