Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-01-06 10:38:20 +01:00
commit 17ab5f9d88
41 changed files with 709 additions and 256 deletions

View File

@ -8,4 +8,4 @@
## Technical details
Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result.
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.

View File

@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem.
Add any other context about the problem here.
**Metadata**
Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result.
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
Maintainer information:
```yaml

View File

@ -7290,6 +7290,11 @@
githubId = 797581;
name = "Vincent Bernardoff";
};
vcanadi = {
email = "vito.canadi@gmail.com";
github = "vcanadi";
name = "Vitomir Čanadi";
};
vcunat = {
name = "Vladimír Čunát";
email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03

View File

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/6chjfy4j6hjwj5f8zcbbdg02i21x1qsi-nix-2.3.1";
i686-linux = "/nix/store/xa8z7fwszjjm4kiwrxfc8xv9c1pzzm7a-nix-2.3.1";
aarch64-linux = "/nix/store/8cac1ivcnchlpzmdjby2f71l1fwpnymr-nix-2.3.1";
x86_64-darwin = "/nix/store/6639l9815ggdnb4aka22qcjy7p8w4hb9-nix-2.3.1";
x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2";
i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2";
aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2";
x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2";
}

View File

@ -331,9 +331,9 @@ in
};
xkbOptions = mkOption {
type = types.str;
type = types.commas;
default = "terminate:ctrl_alt_bksp";
example = "grp:caps_toggle, grp_led:scroll";
example = "grp:caps_toggle,grp_led:scroll";
description = ''
X keyboard options; layout switching goes here.
'';

View File

@ -146,6 +146,7 @@ let
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
kruler = callPackage ./kruler.nix {};
ksudoku = callPackage ./ksudoku.nix {};
ksystemlog = callPackage ./ksystemlog.nix {};
ktnef = callPackage ./ktnef.nix {};
ktouch = callPackage ./ktouch.nix {};

View File

@ -0,0 +1,18 @@
{ lib
, mkDerivation
, extra-cmake-modules
, libGLU
, kdoctools
, kdeclarative
, libkdegames
}:
mkDerivation {
name = "ksudoku";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libGLU kdeclarative libkdegames ];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ genesis ];
};
}

View File

@ -2,15 +2,15 @@
buildGoPackage rec {
pname = "git-bug";
version = "0.5.0";
rev = "8d7a2c076a38c89085fd3191a2998efb659650c2";
version = "0.6.0";
rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf";
goPackagePath = "github.com/MichaelMure/git-bug";
src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
sha256 = "1l86m0y360lmpmpw2id0k7zc2nyq1irr26k2ik06lxhzvpbyajz6";
sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli";
};
buildFlagsArray = ''

View File

@ -0,0 +1,75 @@
{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
with stdenv.lib;
let
version = "1.3.0";
incfile = builtins.toFile "make.inc.custom" ''
CC = g++
FORT = gfortran
ARCH = ar
ARCHFLAGS = cr
RANLIB = ranlib
OPTS = -fPIC -O3 -DADD_ -Wall
FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input
F77OPTS = -fPIC -O3 -DADD_ -Wall
LDOPTS = -fPIC
-include make.check-mkl
-include make.check-clblas
# Gnu mkl is not available I guess?
#LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp
LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp
LIB += -lclBLAS -lOpenCL
LIBDIR = -L$(MKLROOT)/lib/intel64 \
-L$(MKLROOT)/../compiler/lib/intel64 \
-L$(clBLAS)/lib64
INC = -I$(clBLAS)/include
#-I$(AMDAPP)/include
'';
in stdenv.mkDerivation {
name = "clmagma-${version}";
src = fetchurl {
url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz";
sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7";
name = "clmagma-${version}.tar.gz";
};
buildInputs = [
gfortran
clblas
opencl-headers
ocl-icd
mkl
intel-ocl
];
enableParallelBuilding=true;
MKLROOT = "${mkl}";
clBLAS = "${clblas}";
# Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors,
# which is not available.
OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors";
preBuild = ''
# By default it tries to use GPU, and thus fails for CPUs
sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp
sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal
cp ${incfile} make.inc
'';
meta = with stdenv.lib; {
description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port";
license = licenses.bsd3;
homepage = http://icl.cs.utk.edu/magma/index.html;
platforms = platforms.linux;
maintainers = with maintainers; [ volhovm ];
};
}

View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, fetchPypi, buildPythonPackage, django }:
buildPythonPackage rec {
pname = "django-ranged-response";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "11gr3jpmb5rvg3scv026kjwwkmnxwivgq5ypxadnnc9p58szy7zp";
};
# tests not included in PyPi package, github source is not up to date with 0.2.0
doCheck = false;
propagatedBuildInputs = [ django ];
meta = with stdenv.lib; {
description = "A modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly";
homepage = "https://github.com/wearespindle/django-ranged-fileresponse";
license = licenses.mit;
maintainers = with maintainers; [ mrmebelman ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, six
, testfixtures
, django
, django-ranged-response
, pillow
, withTTS ? true
, flite
}:
buildPythonPackage rec {
pname = "django-simple-captcha";
version = "0.5.12";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw";
extension = "zip";
};
checkInputs = [ testfixtures ];
checkPhase = ''
cd testproject
${python.interpreter} manage.py test captcha
'';
propagatedBuildInputs = [ django django-ranged-response six pillow ]
++ lib.optional withTTS flite;
meta = with lib; {
description = "An extremely simple, yet highly customizable Django application to add captcha images to any Django form";
homepage = "https://github.com/mbi/django-simple-captcha";
license = licenses.mit;
maintainers = with maintainers; [ mrmebelman schmittlauch ];
};
}

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dkimpy";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "5d5ba1a15dd8c980d4183989f383bd5522a88dafde4eee5e4eebf9ee6942d94e";
sha256 = "19rz48pzz1i5cc896khaqx2hkhcj5hwsklnyynrdgdr5818qjyff";
};
checkInputs = [ pytest ];

View File

@ -7,7 +7,7 @@
}:
buildPythonPackage rec {
version = "2.2.0";
version = "3.0.0";
pname = "fints";
disabled = isPy27;
@ -15,14 +15,9 @@ buildPythonPackage rec {
owner = "raphaelm";
repo = "python-fints";
rev = "v${version}";
sha256 = "1gx173dzdprf3jsc7dss0xax8s6l2hr02qg9m5c4rksb3dl5fl8w";
sha256 = "00fqgnmv7z6d792ga4cyzn9lrfjf79jplkssm2jbyb0akfggfj7h";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'sepaxml==2.0.*' 'sepaxml~=2.0'
'';
propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
checkInputs = [ pytest ];

View File

@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, flask }:
buildPythonPackage rec {
pname = "flask-swagger-ui";
version = "3.20.9";
src = fetchPypi {
inherit pname version;
sha256 = "3282c770764c8053360f33b2fc120e1d169ecca2138537d0e6e1135b1f9d4ff2";
};
doCheck = false; # there are no tests
propagatedBuildInputs = [
flask
];
meta = with stdenv.lib; {
homepage = "https://github.com/sveint/flask-swagger-ui";
license = licenses.mit;
description = "Swagger UI blueprint for Flask";
maintainers = with maintainers; [ vanschelven ];
};
}

View File

@ -22,30 +22,18 @@
, sure
, werkzeug
, xmltodict
, isPy38
, parameterized
}:
buildPythonPackage rec {
pname = "moto";
version = "1.3.13";
version = "1.3.14";
src = fetchPypi {
inherit pname version;
sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m";
sha256 = "0fm09074qic24h8rw9a0paklygyb7xd0ch4890y4v8lj2pnsxbkr";
};
# 3.8 is not yet support
# https://github.com/spulec/moto/pull/2519
disabled = isPy38;
# Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198.
patches = [
(fetchpatch {
url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff";
sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "jsondiff==1.1.2" "jsondiff~=1.1"
@ -74,13 +62,21 @@ buildPythonPackage rec {
xmltodict
] ++ lib.optionals isPy27 [ backports_tempfile ];
checkInputs = [ boto3 freezegun nose sure ];
checkInputs = [ boto3 freezegun nose sure parameterized ];
checkPhase = ''nosetests -v ./tests/ \
-e test_invoke_function_from_sns \
-e test_invoke_requestresponse_function \
-e test_context_manager \
-e test_decorator_start_and_stop'';
checkPhase = ''
nosetests -v ./tests/ \
-e test_invoke_function_from_sns \
-e test_invoke_requestresponse_function \
-e test_context_manager \
-e test_decorator_start_and_stop \
-e test_invoke_event_function \
-e test_invoke_function_from_dynamodb \
-e test_invoke_function_from_sqs \
-e test_invoke_lambda_error \
-e test_invoke_async_function \
-e test_passthrough_requests
'';
meta = with lib; {
description = "Allows your tests to easily mock out AWS Services";

View File

@ -0,0 +1,37 @@
{ buildPythonPackage
, fetchPypi
, lib
, nbconvert
, nbformat
, notebook
, pandoc-attributes
, six
}:
buildPythonPackage rec {
pname = "notedown";
version = "1.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee";
};
propagatedBuildInputs = [
notebook
nbconvert
nbformat
pandoc-attributes
six
];
# No tests in pypi source
doCheck = false;
meta = {
homepage = https://github.com/aaren/notedown;
description = "Convert IPython Notebooks to markdown (and back)";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ vcanadi ];
};
}

View File

@ -0,0 +1,29 @@
{ buildPythonPackage
, fetchPypi
, lib
, pandocfilters
}:
buildPythonPackage rec {
pname = "pandoc-attributes";
version = "0.1.7";
src = fetchPypi {
inherit pname version;
sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c";
};
propagatedBuildInputs = [
pandocfilters
];
# No tests in pypi source
doCheck = false;
meta = {
homepage = https://github.com/aaren/pandoc-attributes;
description = "An Attribute class to be used with pandocfilters";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ vcanadi ];
};
}

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
@ -28,7 +29,7 @@ buildPythonPackage rec {
cmakeFlags = [
"-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
] ++ lib.optionals (python.isPy3k) [
] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [
# Enable some tests only on Python 3. The "test_string_view" test
# 'testTypeError: string_view16_chars(): incompatible function arguments'
# fails on Python 2.

View File

@ -12,9 +12,6 @@ buildPythonPackage rec {
sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526";
};
# Fixes incorrect specified requirement (part of next release)
patches = [ ./fix_pytestrunner_req.patch ];
propagatedBuildInputs = [ wheel setuptools packaging ];
checkInputs = [
cmake ninja cython codecov coverage six pathpy

View File

@ -1,13 +0,0 @@
diff --git a/setup.py b/setup.py
index dd348fa..4de89c6 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ with open('requirements-dev.txt', 'r') as fp:
dev_requirements = list(filter(bool, (line.strip() for line in fp)))
# Require pytest-runner only when running tests
-pytest_runner = (['pytest-runner>=2.0,<3dev']
+pytest_runner = (['pytest-runner>=2.0']
if any(arg in sys.argv for arg in ('pytest', 'test'))
else [])

View File

@ -0,0 +1,22 @@
diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py
index ee21113..a4f4589 100644
--- a/sphinxcontrib/tikz.py
+++ b/sphinxcontrib/tikz.py
@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False):
tf.write(latex)
tf.close()
- system([self.builder.config.latex_engine, '--interaction=nonstopmode',
+ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode',
'tikz-%s.tex' % shasum],
self.builder)
@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False):
'-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution,
'-f', 'tikz-%s.pdf' % shasum], self.builder)
elif self.builder.config.tikz_proc_suite == "pdf2svg":
- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder)
+ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder)
else:
self.builder._tikz_warned = True
raise TikzExtError('Error (tikz extension): Invalid configuration '

View File

@ -0,0 +1,38 @@
{ lib
, substituteAll
, buildPythonPackage
, fetchPypi
, sphinx
, pdf2svg
, texLive
}:
buildPythonPackage rec {
pname = "sphinxcontrib-tikz";
version = "0.4.6";
src = fetchPypi {
inherit pname version;
sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3";
};
patches = [
(substituteAll {
src = ./binary-paths.patch;
inherit texLive pdf2svg;
})
];
propagatedBuildInputs = [ sphinx ];
# no tests in package
doCheck = false;
meta = with lib; {
description = "TikZ extension for Sphinx";
homepage = https://bitbucket.org/philexander/tikz;
maintainers = with maintainers; [ costrouc ];
license = licenses.bsd3;
};
}

View File

@ -1,21 +1,29 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }:
rustPlatform.buildRustPackage rec {
pname = "parinfer-rust";
version = "0.3.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "eraserhd";
repo = "parinfer-rust";
rev = "v${version}";
sha256 = "0w7fcg33k8k16q8wzax44ck8csa2dr7bmwcz1g57dz33vhxi8ajc";
sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l";
};
cargoSha256 = "17fkzpvfaxixllr9nxx7dnpqxkiighggryxf30j3lafghyrx987f";
cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn";
buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
postInstall = ''
mkdir -p $out/share/kak/autoload/plugins
cp rc/parinfer.kak $out/share/kak/autoload/plugins/
rtpPath=$out/share/vim-plugins/parinfer-rust
mkdir -p $rtpPath/plugin
sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \
plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim
'';
meta = with stdenv.lib; {

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "racer";
version = "2.1.27";
version = "2.1.28";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "racer";
rev = "v${version}";
sha256 = "1ajj515ck5n0mzig77xnq1qgb2s4gf6ahgd5mab91406jvij9qf3";
sha256 = "1zifbcqy9hmcdbz7sl046l2631f5a3j65kyin38l7wm7vrqx9s3h";
};
cargoSha256 = "0ki5j5gh59c92a0w43kzljpiamv2jvyk4m2w8qldfyl5kaa40dxb";
cargoSha256 = "1ys1yb939y144lhjr451cpqrayqn66r0zp71xm90fkqxsbv7wkqv";
buildInputs = [ makeWrapper ]
++ stdenv.lib.optional stdenv.isDarwin Security;
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
description = "A utility intended to provide Rust code completion for editors and IDEs";
homepage = https://github.com/racer-rust/racer;
license = licenses.mit;
maintainers = with maintainers; [ jagajaga ];
maintainers = with maintainers; [ jagajaga ma27 ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,30 @@
{ stdenv, fetchbzr, intltool
, gtk2, wrapGAppsHook, autoreconfHook, pkgconfig
, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "gweled";
version = "unstable-2018-02-15";
src = fetchbzr {
url = "lp:gweled";
rev = "94";
sha256 = "01c38y4df5a06wqbsmsn8ysxx7hav9yvw6zdwbc9m5m55z7vmdb8";
};
doCheck = false;
nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkgconfig ];
buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ];
configureFlags = [ "--disable-setgid" ];
meta = with stdenv.lib; {
description = "Bejeweled clone game";
homepage = "https://gweled.org";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.genesis ];
};
}

View File

@ -39,12 +39,12 @@ let
agda-vim = buildVimPluginFrom2Nix {
pname = "agda-vim";
version = "2019-12-08";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "derekelkins";
repo = "agda-vim";
rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337";
sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv";
rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a";
sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni";
};
};
@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2019-12-03";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
rev = "5f84325cd811ec179b7f3642652438c6a45b174d";
sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2";
rev = "4afbf2f25dc0ce86b118261b0cfb904c80ae6ba0";
sha256 = "1p2g745gyhzs6qql6gnwsn2yxvzf2409andbd8xgrc9bi9cn25pj";
};
};
@ -336,12 +336,12 @@ let
coc-go = buildVimPluginFrom2Nix {
pname = "coc-go";
version = "2019-12-16";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-go";
rev = "2408fb2c163aef22857645b58537879562373fbb";
sha256 = "1cffcrmz72cn9sd7yl5z4r9yqzavh9dd9pjhxyjy80g5f0ryxc93";
rev = "f2a24f2e35350811845c6a14438a94341217992b";
sha256 = "1ramsl7dpgh9l801jq9g8jpg2n757c7r6w8jgfx6gpqmm47iqgrs";
};
};
@ -422,6 +422,17 @@ let
};
};
coc-metals = buildVimPluginFrom2Nix {
pname = "coc-metals";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "ckipp01";
repo = "coc-metals";
rev = "a2c71dc75b35251549d1ba2cdb5f9ee286ab9f90";
sha256 = "0hzd7m1rli2vgwvykrv9ld5q9na867l5d56fl02d7d3q9ykfn6j7";
};
};
coc-neco = buildVimPluginFrom2Nix {
pname = "coc-neco";
version = "2019-09-23";
@ -435,12 +446,12 @@ let
coc-pairs = buildVimPluginFrom2Nix {
pname = "coc-pairs";
version = "2019-12-09";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-pairs";
rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c";
sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh";
rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd";
sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5";
};
};
@ -501,12 +512,12 @@ let
coc-snippets = buildVimPluginFrom2Nix {
pname = "coc-snippets";
version = "2019-12-10";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-snippets";
rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702";
sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg";
rev = "b57debd2faa71118258f29968f17b3cd06664b1e";
sha256 = "1jk20qjr5az6hjxrmjm8vdq0ks40bq55cw0y7xsmivw6cb61m367";
};
};
@ -733,12 +744,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
version = "2019-12-17";
version = "2019-12-27";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
rev = "012cd2637d48aa33541078451d70d66930e03e0f";
sha256 = "1gaqxhpzskcc28qma6vcjwig8v3q3a8sf7b2ckm14i7cb4c1lyh5";
rev = "ece4fde5a377d52ba737b991b8a320ada5d1ac95";
sha256 = "0aqxvhv70mbsr1gsybs8np82nhvixydivnbj2jp8cy43c1hvyxlh";
};
};
@ -799,12 +810,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2019-11-28";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "4dc152ac826a825b69741cc79681a257e24497dc";
sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv";
rev = "aa1b5c762bbabaeeb5f3eca976e65bbb2f82a883";
sha256 = "0pfsky4i4h769fjmrvy89d9ickkfifvmq0m54c6qhs24bycx0s7j";
};
};
@ -843,12 +854,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2019-12-16";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "35ceadf33e1248caead987fc83f01336b81d98fb";
sha256 = "1bazm1n2hqgg13yp5gywzghq310qhkbfqg1v42lyvc0gax8dngzj";
rev = "908cd3a3fe5b03783da7186441b2fe0c146f31b3";
sha256 = "0qrz0mrrx79525rzab0l1qx3q49531306b05hgqrlkzx9zcppk8l";
};
};
@ -888,35 +899,35 @@ let
deoplete-fish = buildVimPluginFrom2Nix {
pname = "deoplete-fish";
version = "2018-09-15";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "ponko2";
repo = "deoplete-fish";
rev = "9b9a686186e6484163b34eb6e620b83be355e82c";
sha256 = "1v7ay0isrgcz0hgyggdqvmrldz0in26prj7p9l8ygkyrjq2w6b8a";
rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969";
sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1";
};
};
deoplete-go = buildVimPluginFrom2Nix {
pname = "deoplete-go";
version = "2019-12-21";
version = "2020-01-01";
src = fetchFromGitHub {
owner = "zchee";
repo = "deoplete-go";
rev = "bed0a49705caf350e4f1ac51172bb3021a723734";
sha256 = "022n512rr4szw0jn10d056qc5kaykpkqjlgpnnlfq00i1ns7gpm6";
rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487";
sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08";
fetchSubmodules = true;
};
};
deoplete-jedi = buildVimPluginFrom2Nix {
pname = "deoplete-jedi";
version = "2019-12-13";
version = "2019-12-22";
src = fetchFromGitHub {
owner = "deoplete-plugins";
repo = "deoplete-jedi";
rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4";
sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2";
rev = "63beb118c8d215bad4f8759b84608fd463abebc5";
sha256 = "1rilqprq6fq01qj1idgvy38p827gjq2bsx93xfbim6yc4hkj10d9";
fetchSubmodules = true;
};
};
@ -945,12 +956,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
version = "2019-12-13";
version = "2019-12-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0";
sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j";
rev = "0985ba9f5a5f35521087b9ca0858c96ab3785158";
sha256 = "09bfsd217qi1ndfrfrjla1vlhnp8r9q9qirkwjjajbqhk4ws90pm";
};
};
@ -989,23 +1000,23 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-12-18";
version = "2019-12-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "18681650e81e809cd56e1006cf92cd7f9108266b";
sha256 = "0rlh97bdmiagrxs9gqjvrimpqcj9w0ys77l0kyxb111zcgcr8s9s";
rev = "840c46aed8033efe19c7a5a809713c809b4a6bb5";
sha256 = "09bivhh6iig9vskia9fz1cz2c6dbn3xf4cgm77z9ppaii00n9wh3";
};
};
dhall-vim = buildVimPluginFrom2Nix {
pname = "dhall-vim";
version = "2019-12-20";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "vmchale";
repo = "dhall-vim";
rev = "016420bcae13eb13d47fd6717b0d5905e79d6dde";
sha256 = "1j15nrv3cdcjxssspzw3zz77kmpkr5r4w00ili0br2a4wlr94id6";
rev = "607958520f8bd4308fe52937e211f6db4ad84cf3";
sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817";
};
};
@ -1044,12 +1055,12 @@ let
editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim";
version = "2019-12-10";
version = "2019-12-27";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-vim";
rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0";
sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln";
rev = "7e5b4a91ad55b992247edb87543ed7855db1a199";
sha256 = "0cbdk4bxk0alq69fjxk4ryfk1w6pvjkqp2sv7rj8qgrwgpqdv5wd";
fetchSubmodules = true;
};
};
@ -1101,12 +1112,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2019-12-14";
version = "2020-01-01";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
rev = "55ef64a057025209c48905df06f725430e63542f";
sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw";
rev = "419279ec95260efe3af42c8b03b823e59f09c3bc";
sha256 = "1cydvb4jbh8h1n09rc8446fspvfvbgbqz5a21nbadbkg3106wn3c";
};
};
@ -1487,24 +1498,24 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
version = "2019-12-20";
version = "2020-01-01";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
rev = "55120b28e4f8aa1da6b5677ebd627a5f5557a9c7";
sha256 = "1q4645ayqyi82j0pbak6i8r6pkq553yr67rd21x22rghwg6h37la";
rev = "2572136fcb4c9941553dd05504007806613c8946";
sha256 = "08fdaxaldbmg76bkj0xni4cpgqiss4cdxnv3jxskwvs6v9dxmbcs";
fetchSubmodules = true;
};
};
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
pname = "Jenkinsfile-vim-syntax";
version = "2019-06-17";
version = "2019-12-31";
src = fetchFromGitHub {
owner = "martinda";
repo = "Jenkinsfile-vim-syntax";
rev = "bf7ca0927c82edc495f7fa67bebc58e92567aa20";
sha256 = "1ikpbg8whabfir6xpb6z4hs8ay3rg9q2qw45sn1ggfikp7dxfwbx";
rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac";
sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm";
};
};
@ -1631,12 +1642,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
version = "2019-12-13";
version = "2019-12-29";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479";
sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068";
rev = "6e60e3a6575449e08feb27fb3528b55e71fd56e3";
sha256 = "054wxj8f23ddqs3mp8rvw2lsplqfyn352zcq6biywbybjm2xphf7";
};
};
@ -1653,12 +1664,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
version = "2019-12-20";
version = "2019-12-27";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
rev = "6fb3ddd293cbd0614f6ed5e637a059c72de643f7";
sha256 = "1c0dsxqj5f3i2i3k6q7m1b2xlxz9mizmchydw1mz7s3rd0vs06sq";
rev = "f4fa096a67afbe593bd53cf618850c32512b5d47";
sha256 = "0qrz4nwb4imnxiqk3p1r4sxib1gjicpsr3g6l8mdgw806l1jc9mg";
};
};
@ -1862,12 +1873,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2019-12-01";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5";
sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r";
rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9";
sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4";
};
};
@ -1917,12 +1928,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
version = "2019-12-12";
version = "2019-12-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef";
sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w";
rev = "6cccbd41851f3d8f47c5e225d552a217cede4f3f";
sha256 = "0jrdya11fzis746x1s802g2w20v47dhaxlmczb2fv4x3fxfwql5p";
};
};
@ -1983,23 +1994,23 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2019-12-21";
version = "2019-12-30";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdcommenter";
rev = "ce590719f67ec031f75935bdbfe0c9616ea878b9";
sha256 = "09q72ddypwh8mpg467nl6z16mvs29gxhwlmm3npn0817c6sf9dqb";
rev = "24df32304e20677ab061115e7bc8a37f382c60e9";
sha256 = "00w46597m8xsdksm2smqmslxk6ydnig4ycwn4fn0ybrlmyalclhi";
};
};
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
version = "2019-12-16";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
rev = "1ab85e33bef8763a618c505ee5a0611519f81e5a";
sha256 = "1fxbl06pqm1zay0lbg9q6qq21rbcbpmbn53kfw86qyqj71rayd01";
rev = "8a14891241e3468f9c13deaa6cf88aebe53b519f";
sha256 = "033qnzna0awys5w5wf9sj2gydm433l1919zz9cm984l0nmgmkp29";
};
};
@ -2071,12 +2082,12 @@ let
nvim-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lsp";
version = "2019-12-22";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lsp";
rev = "842c4413c1e6585960db503080c8ac663dba9440";
sha256 = "0nbbsq8y51c15wh29c3ia6lk6ahr8r281r5069x56v478n8p82h8";
rev = "7a15a52c0a7d735625ac73dc4d8efe70c5e99707";
sha256 = "1wpp54gvb90qhgnxmp3fvfc3dbkdxk3q712c7wyd9alpbk4608fk";
};
};
@ -2346,12 +2357,12 @@ let
readline-vim = buildVimPluginFrom2Nix {
pname = "readline-vim";
version = "2019-12-12";
version = "2019-12-28";
src = fetchFromGitHub {
owner = "ryvnf";
repo = "readline.vim";
rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3";
sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2";
rev = "48f04c651728e8a7a8352eec697801aa32348564";
sha256 = "1vs91lkm9gwvp0bahx80ag6lw03r5x6kyih70l4sq8q0kydp5f13";
};
};
@ -2522,12 +2533,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
version = "2019-10-09";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
rev = "ed1e2b20a6c2c4945b529799f2cdb0409f6a10d2";
sha256 = "0yl82pp23nfg4ckrq33a3flisp7all6gs3aza7z9swv966y1qhwx";
rev = "c09ffbbf54b4c25996f864b0f75ebc7a1fca6919";
sha256 = "1sn952wil99jqc3r9hr017604s6gb99jwwmbldmkdh9qcr03kjvm";
};
};
@ -2566,12 +2577,12 @@ let
splice-vim = buildVimPluginFrom2Nix {
pname = "splice-vim";
version = "2017-09-03";
version = "2019-12-23";
src = fetchFromGitHub {
owner = "sjl";
repo = "splice.vim";
rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
rev = "fb0d7052e5569f59cb94f0e4303307affdd0e271";
sha256 = "1vxxlh88dxmrsfr8w87395h84hgflcgaj6s35vjg34464xzsdn8s";
};
};
@ -2676,12 +2687,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
version = "2019-12-22";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "tagbar";
rev = "ce30e3f0d1d2ceaad44a2e3550738b6bc71628a1";
sha256 = "1sx3jnb7zifjhrg27kfh0q7r038yy3qlyf778hrkfpcqfmrki992";
rev = "3753b235a1163cfbc3b7c417825d1910b2f66100";
sha256 = "16nw145n17d9fnwhcp42k85sf2mx2nyp7wy4gllhw48xnwgh6qpb";
};
};
@ -2709,12 +2720,12 @@ let
tcomment_vim = buildVimPluginFrom2Nix {
pname = "tcomment_vim";
version = "2019-08-11";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tcomment_vim";
rev = "c9cecefc639b6019e0f12b7e9fb5a2375cd550c1";
sha256 = "0xb61wchvj1iqzwxzscv3zwbsx1qjh8qhkmijsrjz92566g12xhy";
rev = "239c0c08d3e691a2c447278b88de91b602fa50bd";
sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa";
};
};
@ -2842,12 +2853,12 @@ let
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
version = "2019-12-19";
version = "2020-01-01";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
rev = "c4bb89495a2af3ed41a510db9a2f589748643801";
sha256 = "0xwcx35aj32h99l5gb8qb4xvddpcndim998p0vrirzj0mi08avlx";
rev = "96026a4df27899b9e4029dd3b2977ad2ed819caf";
sha256 = "1lp6rggsdq7hhis02yyzb79y30g3f7zcydwsi0hjpnnrwvani6s3";
};
};
@ -2930,12 +2941,12 @@ let
vim = buildVimPluginFrom2Nix {
pname = "vim";
version = "2019-12-19";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
rev = "a6f90e5691d8b80db024d8298b3fb461752e0248";
sha256 = "1g19lgjlqcyvs5x120sv5iwnggjyfzyl1k9w4b39yhhfmqi1vvf9";
rev = "5a633625615c79f87786d74ea925790ccdd82aba";
sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5";
};
};
@ -3161,23 +3172,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2019-12-19";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "b93492b40b068d4bb3020c123295061aaba7c846";
sha256 = "12nb31ca6w3wv7b5sq7msasm39mjcxd3ii8r94y18lhxz223dgzj";
rev = "66f77d4a77e54946fedaac7d54d02271751eab40";
sha256 = "008k8v0nx219lbn0vsc1cwr537lg0gdb9s4d7hjpdq2rhh79zsg3";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2019-12-19";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "945bc057d1e96c99834f1beee6c9f03f0d430b97";
sha256 = "0v6q71hyd4pn46636xb9crlydjds05dvrq0idwjxb62146j83m32";
rev = "14c3a60ab0f42aa1001d8f32ffaab2c28935a1e7";
sha256 = "0k25x599sfaw931p5b83cpqhz5dzjxp01v3qlsi78rhjyw1y83jf";
};
};
@ -3348,12 +3359,12 @@ let
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2019-11-20";
version = "2020-01-01";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "dae6dd82a98eda68af83a1f725cc570ef3b1ae7d";
sha256 = "0w2djjs29dgd5jcfglvgb4mb60vb1bj34mxzbx2sidp3lb15xn4y";
rev = "7556c68b1d68b9a2b1b4a9df838cdc4bcf87ba0a";
sha256 = "0bi6nbma0bwzvn7l6w88qgr4fbpfbipv936z346sh59dk17j4nv6";
};
};
@ -3579,12 +3590,12 @@ let
vim-easymotion = buildVimPluginFrom2Nix {
pname = "vim-easymotion";
version = "2019-03-23";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "easymotion";
repo = "vim-easymotion";
rev = "85e90c9759e14633d878ed534ef313876ab96555";
sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq";
rev = "83a09a19e7a9c51c6ca2e0f90f1dd27ef4c159c6";
sha256 = "1xaliyiv80vcsl5gqj40avgdf4384d5xhnvhh0jaklk1hmrdzxgf";
};
};
@ -3777,12 +3788,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2019-12-11";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4";
sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05";
rev = "ddd64fc4c5c5365d56478f100f19898375244890";
sha256 = "1b6mw8bb8dc46vjz5qb2v0n5kfvwz4hk7q0frflrsyc6z3pw7hab";
};
};
@ -3799,12 +3810,12 @@ let
vim-gista = buildVimPluginFrom2Nix {
pname = "vim-gista";
version = "2017-02-20";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "vim-gista";
rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
rev = "af13c0062a46d73384f15abee5a54e164fcaad8e";
sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd";
};
};
@ -3854,12 +3865,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2019-12-18";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "b1b9a1b0d4e9b2408b29ed566135f56ec27629b9";
sha256 = "1m4ldfc7k5ds8z4bjl8dpx63dx7d4b75ifkpjxz8l9rq6ix8i4y8";
rev = "ee2071d8e63f9aab98d750a91fcc3358e9987bc9";
sha256 = "0a2ac5y8x3lhry5dzq2jbzvryfbvrdvn7bkd2wwm5bf2y9zpkbwk";
};
};
@ -4339,12 +4350,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-12-17";
version = "2019-12-30";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "0fd38b8a93ab16d380aed8467a5059e5b3932a2e";
sha256 = "06jz7f5npwm2iknpfmzz5x8lw5377hzc5kpg6n5p2icjwzaha6mz";
rev = "6cb8410e10f1b6a23adf238c1f93ce19a3eef83a";
sha256 = "1zqv58s35qvp53an15mvs7ywvarsqxc0has6yji99jwmjiq68pag";
};
};
@ -4680,12 +4691,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
version = "2019-12-11";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
rev = "359ce90b9b37442974fd3ccd9279493d85efb3af";
sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s";
rev = "2f5f74e5e67f657e9fdac54891a76721bcd3ead3";
sha256 = "08772rc8wqpbxwqqkl8v9x79sijkdigypqlr12ph7jc45qfdqblp";
};
};
@ -4702,12 +4713,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
version = "2019-12-12";
version = "2019-12-31";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
rev = "cea0d08a062478503814e51aa21c6486a0dd1b21";
sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc";
rev = "e8454d66ab8376cf9c7e42f09749d5bd17d98f89";
sha256 = "19hajmja01hrzmq6f0lfnc03d7zpk0ixa9h9j5giskxp151f7vjr";
};
};
@ -4900,12 +4911,12 @@ let
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
version = "2019-11-13";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
rev = "76f62675a1814abcfbacb296f60dbb2d9d2b2f5f";
sha256 = "05fmzd368d0mn141a1awhybl19bgls5j8czmyyvygx5pawjl3s6f";
rev = "86f49aca266e4b17420bcadd29009997d15668d8";
sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c";
};
};
@ -5010,12 +5021,12 @@ let
vim-sneak = buildVimPluginFrom2Nix {
pname = "vim-sneak";
version = "2019-11-06";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-sneak";
rev = "24e6c3f4cd6004e2b44e4022dee0260aba6132aa";
sha256 = "000i2x36b8l5vc1li0f4jazs06nch9pca95yqr4w4m5hgjpzs5qs";
rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521";
sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx";
};
};
@ -5032,12 +5043,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2019-12-19";
version = "2020-01-03";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "180d239935a2cb496c7b702d9fbe38f05fe3dea2";
sha256 = "0gz8yk87c0v0vaamy2nz7flrklzb00867nm7vcmyfpamha4wkib4";
rev = "f324a43a5f6a941a55ee992bb852f3c2c504a509";
sha256 = "0dgxsn96vw4zgci58lzr4d4d4kwjbk9d52h51ibh3mhsikmpr7xk";
};
};
@ -5197,12 +5208,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
version = "2019-12-16";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
rev = "bff65bf59401ef7d165637aedafe72f212ddf4c7";
sha256 = "1jgzir5qn9v0ws6yb6d0hc3p859gy81x22wkqk58w55xxmfxd7am";
rev = "1df8ac3e1bc33e1c70bd3a1713d8c9cd2eb491e1";
sha256 = "0ivkm9vzzfn1iwzkkgk54kn846qnhvsaf8f4nzz3mllirjsl14am";
};
};
@ -5274,12 +5285,12 @@ let
vim-textobj-variable-segment = buildVimPluginFrom2Nix {
pname = "vim-textobj-variable-segment";
version = "2019-05-05";
version = "2019-12-30";
src = fetchFromGitHub {
owner = "Julian";
repo = "vim-textobj-variable-segment";
rev = "1af9cdef58a4072dddbe926e7c8c53903e97b70a";
sha256 = "0spfbc30sli7ckpfbmjspfrbcg9dq5k0aimzbxx06rimbba8f846";
rev = "78457d4322b44bf89730e708b62b69df48c39aa3";
sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj";
};
};
@ -5626,12 +5637,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-12-15";
version = "2019-12-31";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "7c08bf73aa15bc794c79b1e8750df3c18066c6fb";
sha256 = "130x4nwp2wci67nf7v73r4b7xgmfgs18ls1ckyrsq54k16016dbz";
rev = "020206fbe1f6981855a3fe2f96ef893db782d4b8";
sha256 = "113d1zdmx3vhjig4xrp1kqlzapdhygis2ky2paww42j22vakqywc";
};
};
@ -5648,12 +5659,12 @@ let
vimwiki = buildVimPluginFrom2Nix {
pname = "vimwiki";
version = "2019-08-08";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "vimwiki";
repo = "vimwiki";
rev = "57d23fa763b498561aca7eb4efb05b52efd120c9";
sha256 = "034857pz36rps7jmg79brcb25vfb4dgqpdhfy24vyhn3nil46jxs";
rev = "b90e6f2e3343277faca65156d733f725f76f1e53";
sha256 = "1z3mj73iqh4h3wx5cq4k7gp2nkbaj85v665v0phqw42c213064nb";
};
};
@ -5769,24 +5780,24 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
version = "2019-11-30";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445";
sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22";
rev = "48184a10ecdda3efce0131aa73495f1edc449a33";
sha256 = "0nsdq17r2m2pmnz077rliqdlwk5sn1aj3bxl648bsli7rjacgaqq";
fetchSubmodules = true;
};
};
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
version = "2019-12-18";
version = "2020-01-04";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
rev = "9e2ab00bd54cf41787079bcc22e8d67ce9b27ec2";
sha256 = "0fnir9hlpmh4k8cg79lcir51aydrsfnwn9w9nnxa4yi8qnvc0pgs";
rev = "d9a9ce47de8b88100e4230805bf44d394197476d";
sha256 = "1ggr6dhppmc34wah8d6dwjfb9kkaazlxajvnd972pyx9c56crl89";
fetchSubmodules = true;
};
};
@ -5826,12 +5837,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2019-12-10";
version = "2020-01-02";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed";
sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r";
rev = "7b644a313bf3e32a3b0c4616660d61f5ec8872d9";
sha256 = "1icv1qa4wf1kaknfs045m8md2938qggzl6a5wf76lcn1iw5nr1cc";
};
};

View File

@ -129,12 +129,12 @@ self: super: {
# NB: Make sure you pick a rev from the release branch!
coc-nvim = buildVimPluginFrom2Nix rec {
pname = "coc-nvim";
version = "2019-11-30";
version = "2020-01-05";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "42a45c639e2c43f9f1795c3804787c6a686781c0";
sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s";
rev = "984779f2f825626aa9d441746d8b4ee079137c65";
sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg";
};
};

View File

@ -47,6 +47,7 @@ chriskempson/base16-vim
christoomey/vim-sort-motion
christoomey/vim-tmux-navigator
ckarnell/antonys-macro-repeater
ckipp01/coc-metals
cloudhead/neovim-fuzzy
CoatiSoftware/vim-sourcetrail
cocopon/iceberg.vim

View File

@ -140,6 +140,29 @@ in
};
};
scala-lang.scala = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "scala";
publisher = "scala-lang";
version = "0.3.8";
sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9";
};
meta = {
license = stdenv.lib.licenses.mit;
};
};
scalameta.metals = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.6.3";
sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7";
};
meta = {
license = stdenv.lib.licenses.asl20;
};
};
skyapps.fish-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.92";
version = "4.19.93";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9";
sha256 = "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.7";
version = "5.4.8";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb";
sha256 = "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22";
};
} // (args.argsOverride or {}))

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17163";
rev = "17165";
sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789";
}
, ...

View File

@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
version = "2020-01-01";
version = "2020-01-04";
pname = "oh-my-zsh";
rev = "ca627655dbd1d110dbea34ec4a8c1964a1da83d2";
rev = "78b07e92fd4a3a5e1f92ee4e3d680c39b72c2245";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "1hr7qaad8mr8bvx54ql5q97da6fhppdgk087mc5flygky6vf4yp6";
sha256 = "1s5vr89dxgm1g3jcqybx4an80x0gmda4lh8y36r2dafxwmb09qmk";
};
pathsToLink = [ "/share/oh-my-zsh" ];

View File

@ -21,11 +21,14 @@ mkDerivation {
cmakeFlags = [
"-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}"
"-DLIBUSB_LIBRARY=${libusb1}"
];
preConfigure = ''
# Give ownership of the Galaxy S USB device to the logged in user.
substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
'';
installPhase = ''

View File

@ -0,0 +1,26 @@
From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Jan 2020 15:35:15 +0100
Subject: [PATCH] Fix darwin build
---
rwcancel/select_default.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go
index dd23cda..03f3452 100644
--- a/rwcancel/select_default.go
+++ b/rwcancel/select_default.go
@@ -9,6 +9,7 @@ package rwcancel
import "golang.org/x/sys/unix"
-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
- return unix.Select(nfd, r, w, e, timeout)
+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) {
+ _, err = unix.Select(nfd, r, w, e, timeout)
+ return
}
--
2.23.1

View File

@ -11,6 +11,8 @@ buildGoPackage rec {
sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i";
};
patches = [ ./0001-Fix-darwin-build.patch ];
goDeps = ./deps.nix;
passthru.updateScript = ./update.sh;

View File

@ -2,7 +2,7 @@
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
, aws-sdk-cpp, boehmgc, boost
, boehmgc
, stdenv, llvmPackages_6
}:
@ -170,17 +170,17 @@ in rec {
# Nix1 has the perl bindings by default, so no need to build the manually.
includesPerl = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
inherit storeDir stateDir confDir boehmgc;
};
nixStable = callPackage common (rec {
name = "nix-2.3.1";
name = "nix-2.3.2";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b";
sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8";
};
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
inherit storeDir stateDir confDir boehmgc;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv;
});
@ -196,7 +196,7 @@ in rec {
};
fromGit = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
inherit storeDir stateDir confDir boehmgc;
});
nixFlakes = lib.lowPrio (callPackage common rec {
@ -210,7 +210,7 @@ in rec {
};
fromGit = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
inherit storeDir stateDir confDir boehmgc;
});
}

View File

@ -0,0 +1,39 @@
{ version, sha256, installFiles }:
{ lib, mkDerivation, fetchFromGitHub, qtbase, qmake, cmake, zip }:
mkDerivation rec {
passthru = {
inherit version;
inherit sha256;
inherit installFiles;
};
pname = "uefitool";
inherit version;
src = fetchFromGitHub {
inherit sha256;
owner = "LongSoft";
repo = pname;
rev = version;
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake cmake zip ];
configurePhase = ":";
buildPhase = "bash unixbuild.sh";
installPhase = ''
mkdir -p "$out"/bin
cp ${lib.concatStringsSep " " installFiles} "$out"/bin
'';
meta = with lib; {
description = "UEFI firmware image viewer and editor";
homepage = "https://github.com/LongSoft/uefitool";
license = licenses.bsd2;
maintainers = with maintainers; [ ajs124 ];
# uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,15 @@
{ libsForQt5 }:
let
common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
in rec {
new-engine = common rec {
version = "A56";
sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp";
installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ];
};
old-engine = common rec {
version = "0.27.0";
sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h";
installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ];
};
}

View File

@ -21704,6 +21704,9 @@ in
udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };
uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
uefitool = uefitoolPackages.new-engine;
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
inherit (ocaml-ng.ocamlPackages_4_05) unison;
@ -22902,6 +22905,8 @@ in
gtypist = callPackage ../games/gtypist { };
gweled = callPackage ../games/gweled {};
gzdoom = callPackage ../games/gzdoom { };
harmonist = callPackage ../games/harmonist { };
@ -23883,6 +23888,7 @@ in
lie = callPackage ../applications/science/math/LiE { };
magma = callPackage ../development/libraries/science/math/magma { };
clmagma = callPackage ../development/libraries/science/math/clmagma { };
mathematica = callPackage ../applications/science/math/mathematica { };
mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
@ -24763,18 +24769,6 @@ in
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };
# Tarball evaluation fails with a gcc9 based nix-env.
# $ nix-build pkgs/top-level/release.nix -A tarball
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
aws-sdk-cpp = aws-sdk-cpp.override {
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
boost = boost.override {
buildPackages = buildPackages // {
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
})
nix
nix1

View File

@ -3203,18 +3203,22 @@ in {
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };
django-ranged-response = callPackage ../development/python-modules/django-ranged-response { };
django-rest-auth = callPackage ../development/python-modules/django-rest-auth { };
django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
django-storages = callPackage ../development/python-modules/django-storages { };
django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { };
django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { };
django-sites = callPackage ../development/python-modules/django-sites { };
django-sr = callPackage ../development/python-modules/django-sr { };
django-storages = callPackage ../development/python-modules/django-storages { };
django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { };
django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { };
django_tagging = callPackage ../development/python-modules/django_tagging { };
@ -3426,6 +3430,8 @@ in {
flask-swagger = callPackage ../development/python-modules/flask-swagger { };
flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };
flask_testing = callPackage ../development/python-modules/flask-testing { };
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
@ -4294,6 +4300,8 @@ in {
notebook = if isPy3k then callPackage ../development/python-modules/notebook { }
else callPackage ../development/python-modules/notebook/2.nix { };
notedown = callPackage ../development/python-modules/notedown { };
notify = callPackage ../development/python-modules/notify { };
notify2 = callPackage ../development/python-modules/notify2 {};
@ -5792,6 +5800,10 @@ in {
sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz {
texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; };
};
sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };
Pweave = callPackage ../development/python-modules/pweave { };
@ -6334,6 +6346,8 @@ in {
pandocfilters = callPackage ../development/python-modules/pandocfilters { };
pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
htmltreediff = callPackage ../development/python-modules/htmltreediff { };
repeated_test = callPackage ../development/python-modules/repeated_test { };