diff options
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r-- | pkgs/aszlig/santander/default.nix | 2 | ||||
-rw-r--r-- | pkgs/aszlig/vim/default.nix | 47 |
2 files changed, 44 insertions, 5 deletions
diff --git a/pkgs/aszlig/santander/default.nix b/pkgs/aszlig/santander/default.nix index bedff554..adac0a8d 100644 --- a/pkgs/aszlig/santander/default.nix +++ b/pkgs/aszlig/santander/default.nix @@ -4,7 +4,7 @@ let patchedWine = let - libpcsclite = "${pcsclite}/lib/libpcsclite.so"; + libpcsclite = "${lib.getLib pcsclite}/lib/libpcsclite.so"; in winePackages.minimal.overrideAttrs (drv: { scard4wine = fetchgit { url = "git://git.code.sf.net/p/scard4wine/code"; diff --git a/pkgs/aszlig/vim/default.nix b/pkgs/aszlig/vim/default.nix index c75c4f30..6c1c6bab 100644 --- a/pkgs/aszlig/vim/default.nix +++ b/pkgs/aszlig/vim/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, writeText, writeTextFile, writeScript -, pythonPackages, ledger, vim +, python3Packages, ledger, meson, vim }: let @@ -108,6 +108,27 @@ let endfun ''; }; + + pug = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-pug"; + rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; + sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; + }; + + scss = fetchFromGitHub { + owner = "cakebaker"; + repo = "scss-syntax.vim"; + rev = "4461789d02f81fd328afbdf27d6404b6c763c25f"; + sha256 = "0d227d2c1pvcksk2njzpkgmxivrnfb0apn2r62q7q89s61ggbzfj"; + }; + + less = fetchFromGitHub { + owner = "groenewege"; + repo = "vim-less"; + rev = "6e818d5614d5fc18d95a48c92b89e6db39f9e3d6"; + sha256 = "0rhqcdry8ycnfbg534q4b3hm78an7mnqhiazxik7k08a57dk9dbm"; + }; }; plugins = pluginDeps // { @@ -177,8 +198,8 @@ let lnl7 = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "e9abff9a0f4d594e360a5216c4e8f9ed3bcae2c0"; - sha256 = "1gznb0wlwsx94b620m8ccl5046di525z698mswy8xxq1vyjcimi7"; + rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; + sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; }; src = fetchFromGitHub { @@ -296,6 +317,24 @@ let rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; }; + + vue = fetchFromGitHub { + owner = "posva"; + repo = "vim-vue"; + rev = "e531e1d24f24385a5f4d2f1ba36d972a57ec52d9"; + sha256 = "1vi4i9ybwg1l1xmarsdhzd08py4w0yfg4xswbz3qrvihk8nhg1km"; + }; + + meson = stdenv.mkDerivation { + name = "meson-vim-${meson.version}"; + inherit (meson) src; + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + postPatch = '' + sed -i -e '/^ *echom \+getline/d' \ + data/syntax-highlighting/vim/indent/meson.vim + ''; + installPhase = "cp -r data/syntax-highlighting/vim \"$out\""; + }; }; generic = '' @@ -334,7 +373,7 @@ let let python_highlight_numbers = 1 let python_highlight_builtins = 1 let python_highlight_exceptions = 1 - let g:flake8_cmd = '${pythonPackages.flake8}/bin/flake8' + let g:flake8_cmd = '${python3Packages.flake8}/bin/flake8' " ledger let g:ledger_bin = '${ledger}/bin/ledger' |