l vim: remove unstable_nixpkgs hack

This commit is contained in:
lassulus 2018-10-06 21:49:36 +02:00
parent 96c3bdb8f4
commit 43f5473ddc

View File

@ -2,12 +2,6 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let
unstable_nixpkgs = import (pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "a8c71037e041725d40fbf2f3047347b6833b1703";
sha256 = "1z4cchcw7qgjhy0x6mnz7iqvpswc2nfjpdynxc54zpm66khfrjqw";
}) {};
out = { out = {
environment.systemPackages = [ environment.systemPackages = [
(hiPrio vim) (hiPrio vim)
@ -15,7 +9,7 @@ let
(pkgs.writeDashBin "govet" '' (pkgs.writeDashBin "govet" ''
go vet "$@" go vet "$@"
'') '')
(hiPrio (unstable_nixpkgs.python3.withPackages (ps: [ (hiPrio (pkgs.python3.withPackages (ps: [
ps.python-language-server ps.python-language-server
ps.pyls-isort ps.pyls-isort
]))) ])))
@ -135,7 +129,7 @@ let
pkgs.vimPlugins.undotree pkgs.vimPlugins.undotree
pkgs.vimPlugins.vim-go pkgs.vimPlugins.vim-go
pkgs.vimPlugins.fzf-vim pkgs.vimPlugins.fzf-vim
unstable_nixpkgs.vimPlugins.LanguageClient-neovim pkgs.vimPlugins.LanguageClient-neovim
(pkgs.vimUtils.buildVimPlugin { (pkgs.vimUtils.buildVimPlugin {
name = "file-line-1.0"; name = "file-line-1.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {