diff options
31 files changed, 455 insertions, 249 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 1d6a9457dde..6357baf29e0 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -213,7 +213,7 @@ in { systemd.services.libvirtd = { requires = [ "libvirtd-config.service" ]; - after = [ "systemd-udev-settle.service" "libvirtd-config.service" ] + after = [ "libvirtd-config.service" ] ++ optional vswitch.enable "ovs-vswitchd.service"; environment.LIBVIRTD_ARGS = escapeShellArgs ( diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 9a5a1faac5a..4436264ba26 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.28-1"; + version = "0.8.29"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-a+w/909PZuHsgIQEtO2IWQijsERfAKJUZ8K30+PhD3k="; + sha256 = "sha256-O5GIbX7qp+Te5QQuqytC9rsQJ5FuXtUl5h2DZXsfMPk="; }; - cargoSha256 = "sha256-Zz844XDx5qj2hQlf99uvHV6e5wmDAlYh3zBvcpdoiIo="; + cargoSha256 = "sha256-4VmRIrd79odnYrHuBLdFwere+7bvtUI3daVs3ZUKsdY="; nativeBuildInputs = [ clang ]; @@ -35,8 +35,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; - license = licenses.gpl3; - maintainers = with maintainers; [ akru andresilva RaghavSood ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ akru andresilva asymmetric RaghavSood ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 12e25fb774e..a12e914097c 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -16,6 +16,7 @@ , gettext , coreutils , ncurses +, caf }: stdenv.mkDerivation rec { @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "py" ]; cmakeFlags = [ + "-DCAF_ROOT=${caf}" "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/applications/video/alass/default.nix new file mode 100644 index 00000000000..c57a224ee0a --- /dev/null +++ b/pkgs/applications/video/alass/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, ffmpeg +}: + +rustPlatform.buildRustPackage rec { + pname = "alass"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "kaegi"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU="; + }; + + cargoSha256 = "sha256-6CVa/ypz37bm/3R0Gi65ovu4SIwWcgVde3Z2W1R16mk="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/alass-cli" --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" + ''; + + meta = with lib; { + description = "Automatic Language-Agnostic Subtitle Synchronization"; + homepage = "https://github.com/kaegi/alass"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 070bcc90685..9cda6eb0a2b 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , rustPlatform +, makeWrapper +, alass }: rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kl"; repo = pname; - # Upstream doesn't tag releases. - rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff"; - sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE="; + rev = "v${version}"; + sha256 = "sha256-5fDnSmnnVB1RGrNrnmp40OGFF+OAhppnhOjVgnYxXr0="; }; - cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; + cargoSha256 = "sha256-cj1htJcUPCeYbP0t15UcMv4WQAG7tUROb97v4rUeMvU="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/sub-batch" --prefix PATH : "${lib.makeBinPath [ alass ]}" + ''; meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 4813e431a66..da4ba218fdf 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU="; + sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; + changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/indilib/indi-3rdparty.nix b/pkgs/development/libraries/indilib/indi-3rdparty.nix index 02862820b3a..e6e82bc0249 100644 --- a/pkgs/development/libraries/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/indilib/indi-3rdparty.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "indi-3rdparty"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "indilib"; repo = pname; rev = "v${version}"; - sha256 = "18ii9qsghrvj8y4y6c7bx6kjradybnmyq8i5phj7pv4r8w91rq7g"; + sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy"; }; cmakeFlags = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.indilib.org/"; description = "Third party drivers for the INDI astronomical software suite"; + changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 27487c6a315..ced1c3e7bb9 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch + ./nix-store-date.patch ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $a \ --replace /bin/bash ${stdenv.shell} done + substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date ''; PREFIX = placeholder "out"; diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/development/libraries/libfaketime/nix-store-date.patch new file mode 100644 index 00000000000..b88245dfe8f --- /dev/null +++ b/pkgs/development/libraries/libfaketime/nix-store-date.patch @@ -0,0 +1,29 @@ +From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001 +From: Finn Behrens <me@kloenk.de> +Date: Fri, 5 Mar 2021 21:58:57 +0100 +Subject: [PATCH] use nix date path + +--- + src/faketime.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/faketime.c b/src/faketime.c +index af618f2..48e47da 100644 +--- a/src/faketime.c ++++ b/src/faketime.c +@@ -50,11 +50,7 @@ + + const char version[] = "0.9.9"; + +-#ifdef __APPLE__ +-static const char *date_cmd = "gdate"; +-#else +-static const char *date_cmd = "date"; +-#endif ++static const char *date_cmd = "@DATE_CMD@"; + + #define PATH_BUFSIZE 4096 + +-- +2.24.3 (Apple Git-128) + diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/development/libraries/maxflow/default.nix new file mode 100644 index 00000000000..9c53a16d372 --- /dev/null +++ b/pkgs/development/libraries/maxflow/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "maxflow"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "gerddie"; + repo = pname; + rev = version; + hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Software for computing mincut/maxflow in a graph"; + homepage = "https://github.com/gerddie/maxflow"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.tadfisher ]; + }; +} diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 151c74f0b70..da60f2b27fc 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,20 +1,24 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, elogind, systemd, libdrm }: +, pipewire, wayland, systemd, libdrm }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; + sha256 = "1vjz0y3ib1xw25z8hl679l2p6g4zcg7b8fcd502bhmnqgwgdcsfx"; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; - buildInputs = [ pipewire wayland elogind systemd libdrm ]; + buildInputs = [ pipewire wayland systemd libdrm ]; + + mesonFlags = [ + "-Dsd-bus-provider=libsystemd" + ]; meta = with lib; { homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index f793ecfae37..776cc4d38e9 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -22,6 +23,12 @@ buildPythonPackage rec { pytestCheckHook ]; + # https://github.com/agronholm/cbor2/issues/99 + disabledTests = lib.optionals stdenv.is32bit [ + "test_huge_truncated_bytes" + "test_huge_truncated_string" + ]; + pythonImportsCheck = [ "cbor2" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix index f0d3bad7a04..9a09c7cc75d 100644 --- a/pkgs/development/python-modules/dulwich/0_19.nix +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = "https://samba.org/~jelmer/dulwich/"; + homepage = "https://www.dulwich.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 02ee088782a..609dcb82237 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.34.0"; + version = "0.35.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63"; + sha256 = "80e51d5aa02ad72da9870e89d21f9b152b0220ca551b4596a6c0614bcde336fc"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 3f67c044dea..48ed52499c5 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, pythonAtLeast , pythonOlder , fetchPypi , python @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - version = "0.51.2"; + version = "0.52.0"; pname = "numba"; - # uses f-strings - disabled = pythonOlder "3.6"; + # uses f-strings, python 3.9 is not yet supported + disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768"; + sha256 = "44661c5bd85e3d3619be0a40eedee34e397e9ccb3d4c458b70e10bf95d1ce933"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index bb04309d1a5..10a3b4482fc 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -27,7 +27,8 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.7.4"; + version = "0.7.6"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; + sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn"; }; nativeBuildInputs = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" ''; + # Disable using conan for build preBuild = '' export DISABLE_CONAN=1 ''; diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 7374d7ce017..9346fae9743 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -22,6 +22,7 @@ , nbconvert , nbformat , pproxy +, qiskit-aer , vcrpy }: @@ -38,7 +39,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.11.1"; + version = "0.12.1"; disabled = pythonOlder "3.6"; @@ -46,7 +47,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h"; + sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx"; }; propagatedBuildInputs = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { nbconvert nbformat pproxy + qiskit-aer vcrpy ] ++ lib.optionals (!withVisualization) visualizationPackages; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 3c7a0044202..5051c6541cd 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.23.5"; + version = "0.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; + sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 8cce139facb..c4b7a6323e4 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , rustPlatform , fetchFromGitHub # Check inputs , pytestCheckHook +, networkx , numpy }: buildPythonPackage rec { pname = "retworkx"; - version = "0.6.0"; + version = "0.8.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = version; - sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; + sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo="; }; - format = "pyproject"; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; doInstallCheck = true; - installCheckInputs = [ pytestCheckHook numpy ]; + installCheckInputs = [ pytestCheckHook networkx numpy ]; preCheck = '' export TESTDIR=$(mktemp -d) diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix new file mode 100644 index 00000000000..f70e4921b9e --- /dev/null +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, oauthlib +, pytestCheckHook +, pytz +, requests +, requests-mock +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "ring-doorbell"; + version = "0.7.0"; + disabled = !isPy3k; + + src = fetchPypi { + pname = "ring_doorbell"; + inherit version; + sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg"; + }; + + propagatedBuildInputs = [ + oauthlib + pytz + requests + requests_oauthlib + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "ring_doorbell" ]; + + meta = with lib; { + homepage = "https://github.com/tchellomello/python-ring-doorbell"; + description = "A Python library to communicate with Ring Door Bell (https://ring.com/)"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ad33bd7473a..4c61d1047d8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-03-01"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "826878c41e546a93919aba08e5a134433222b3a5"; - sha256 = "00nfjxrakl6p1knz8gy0n4flm537acj66nxvnb5hq3isn8h06gbw"; + rev = "8c5081f6316183c97298ec4a819fd94c2a2a9516"; + sha256 = "1k1d19w9avvxk6ccgdj2sricr3c3crvlwdfj0g7ybgh8nyn2isvs"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-02-27"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "f7f017e24277266984b54a9829adf51ba13f085d"; - sha256 = "0kp8z1pwn057hm6bccp0v94mvvm2dcpdw6qlhjp1pzs8prgvp0nl"; + rev = "8e018dee9c5e2205288bda01be0de196b04b7cf2"; + sha256 = "1ghv6zp3qajd4n9qv3mnxqhczi77qmds2b2iicbl252slvldr604"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "a43d2124a6b994df18b26a8a783f16534bac14cf"; - sha256 = "0pqd4593wnlr7x6rb4lmj3vz4j41rrlkmbd4a18lq8ivp9q6faa0"; + rev = "4608bbe255e66f463cf08de888e470cb00966f8d"; + sha256 = "06rkj244frd2a7w0x0dp4nnzn8sdnbyww1jwn9xlypfcn67gg0nn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-02-21"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "29eee5e5c23b3fde59192df92baf7ba775867092"; - sha256 = "0plq37r00d5sn6hci7wn8df09dca3cigvd80pq08pcngbm4h19wl"; + rev = "9063153b05ca47c030a5f656411dbbed33697678"; + sha256 = "011017ywcgjcflsl21fjcrz7ap68aqvgx5y5z64075qkrk1pqgz1"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -461,12 +461,12 @@ let coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2020-12-17"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "5a0685a6e9eac82d5b1912e10b4ebdd41823dccd"; - sha256 = "16g10s8zwzjzk21s09bvlc8z20gxv0whb83wf9kbysiv5aamf0n1"; + rev = "57116d2f999dfa025fac579835fd23e1a6341fa2"; + sha256 = "0m2khf11krkqmbykfx21yq9ydglz6dldw4xml5nkyqm93n37xn1s"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -509,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "6f5b03b5d0ea59d73f809cb2a26317be6b0e14b8"; - sha256 = "1vcqm994i8d985k2fp09s3y1db87yk6pa4mnywzg561nk00rm5vh"; + rev = "9454f352914475f3595efad08bb1524cf8812853"; + sha256 = "0j3h8jyn2gbyyk7vpbjprg4kpk77j85npb0m090z0iqhlvcdrhh1"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-02-25"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "70e5a383cd1c5e39505ef016e8507e7daa4bc7dc"; - sha256 = "0mgaj8d1jl2rh56a5mgl0wwwjmgmyk4vcxh19yyvpji73gpkywxh"; + rev = "71b5766a7cc28daef89fac7db99340cd532035b3"; + sha256 = "035fhkf6n4iyi01jc84a8bsaapz5dd3m49cbilxag2wr85gc4b9p"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -593,12 +593,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2020-06-02"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "ea7a889bda2849ba87fc12053bf6dd14467d7b72"; - sha256 = "02rswhlkgbapnjzqi2nv95ag08p9cjlqscwv6i17f9kvba929hkl"; + rev = "7c14a8c0da5127c38f0c5b1b7061491c3cfb5ea3"; + sha256 = "128331ipqjqicb5j8jifmg268faxfd4lwy4b20h5hy9macfyvys6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -630,12 +630,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-24"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "b1521bb52a9ddeacc2a7db56aa26d45dc91e6277"; - sha256 = "1dknyar320rpaqq8l5kwq0n3lvmgw4qpjybg4dnz69ms54xijpr7"; + rev = "0739a2587e8d12fd746964578ba5c579fec1560a"; + sha256 = "11fjpvzng735b7zyaia6dhshca9j22gx65k6r85j0698pwrk9wz6"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -714,12 +714,12 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-09-17"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce"; - sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8"; + rev = "f5e4ed8f7847cd5474017459c2a0f2dfd2bf971c"; + sha256 = "039mnsd6k0sgs8l1a8ngl3y817c8g657nv8v9bdw9h8l5a934cb2"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -738,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-03-01"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "7f6509ab9d405c9ba7a1f06cb9533bfe570becf5"; - sha256 = "088iy90rsxskaalqagw54w159gy0wlcq751b989bf5knz2f1d3c5"; + rev = "5e78fa379d6c1a604834e89eff31c9a28123c6d9"; + sha256 = "1phkq68hv6pi1z637in8hl5m5xzaw7ybmqyvljy8rly89w9gis5w"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -858,12 +858,12 @@ let dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-02-27"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "3957e4d25c9625812d9d47ea448c68015b1092e8"; - sha256 = "15jbszl0ip5hjf9nfvs9y90shqz0ix04za1l96kfik1p47y7wjd8"; + rev = "dbcee4399394e56e4bbae5039af78408b2a35334"; + sha256 = "1p6ckanaqxgag1l1kmpiwq2fxygfp6rghbf4a3mx5ldh17lhnii8"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-26"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "4eb4327162c4ec885446b349149b5d25b7307bc7"; - sha256 = "0h4f1axd53lc5k5c6kv2zcsxhh3pjbl7hmi7y15qnvbgr8xa8s4x"; + rev = "db2d82cfbd85d8b6caafbd967a27f4d1c6ea5fa6"; + sha256 = "173nmv0d729hk9xbz9jdk9h9zlm9dhz89pgda7vggrp9dp8d1z5v"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1256,12 +1256,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-12-23"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "e7154372adc95d637ccd911c2f8601d9ff2eac1f"; - sha256 = "1li5q3151kjh8c6a7cdnmbydxhkjgqsa5nlv49dy6dnqc3b50m7s"; + rev = "32f0a489d1f47405f3327d0686f8d96da216cead"; + sha256 = "1czs335wdjs8vfx3ydy92m145wibp6jy47fia5p5mhrp6zncibqq"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1535,12 +1535,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-22"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "916c00d6a53ab492a46b1f8aa3e052136e804483"; - sha256 = "18yvbxa5rc2s1qyv94d7y6jd2b10ivcv01i42w80gp2kbipp9nay"; + rev = "dd1cd3098f95423fa744be5d65b61132caae51b5"; + sha256 = "12k25aq9giivfh2nw086ha8jq77bd5d5v9mmqsxjb15bp6b2mbc5"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1619,12 +1619,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-03-01"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "cdf8e98ca16521138e1376279772dfcf60008ec8"; - sha256 = "0f4lw019qdsxj9rqpcjc5rr9wgabwbp1af0r2p56zx2cy9iyz4y6"; + rev = "d54291e425d324db56a4b0990c73a0facb9ae877"; + sha256 = "1zwnsblklw9a9khr6xpwsfn115synrzg1b92pvzsh5p53ydaqaj2"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1703,12 +1703,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-02-23"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "deb4e40e4f26b0ca9db81e5463110c060f24635a"; - sha256 = "1l1bji23vgxgs23a2gpywnq9q03bd44lh159da54pdk69fngj3lk"; + rev = "197103a55543b1398c194369306cff896bfd3fc1"; + sha256 = "18ng4qk4wi56bq64hc7sw3dx299cnjcg0zghk9r39dpi5fv68d8h"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1787,12 +1787,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-02-26"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "b844a533d654271c66cea44182522a56b2d0c8c1"; - sha256 = "0v54q2dz98k9qivsmcj3l41gxc1abdfvvgkksclqjg8qcqq1pl6w"; + rev = "114354c337dc0f492b014853f8972fa42ca4c379"; + sha256 = "0laxlhzv70zln8wsxdcgimbc3zg4dpyixik7qa44lw4g8szmpyxc"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2040,12 +2040,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "6db659027d6a5ba6b11b1a3333b0bd301dd01574"; - sha256 = "0c7qcafjk0chdxg027lihrypxlr10nvk1xzs82icqis0ija3yppg"; + rev = "ebafbe4e5fbeee5f6af70fb46e51bd10b00fd589"; + sha256 = "1i7ylv0pwvqqaggvdcv8n2sm4wdfny76kny2qp21r47xj6dyw2sf"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2304,24 +2304,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-28"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "1fabedb8d93896abda55660c8fd6c8ad7d953af0"; - sha256 = "0lib7ly88isbz1kqj172fjycw71a9rl2zhffipkkgwlcz5i5hkm9"; + rev = "afbe401bf8e8b02e4b61459d012bf2c1c70b7cf0"; + sha256 = "03hbh3y5ya0v2qgc5mhs0v7vwn2z56c8srg3arfqaphhr18da7s7"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-28"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8c8a4896125e9d01063bbf906af77c9d8faf39b4"; - sha256 = "0zz2b5ph7jadfk6kw14s38w4nch4wyrvm24qyijpan67k7nz1qpy"; + rev = "9c9212c5b63675b43459e29858d3e0a64bce9507"; + sha256 = "07nz7wj8vr9dckbfx3dymjv9yq1q3wyy7mcj8lvlg1d9g28snnd1"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2388,12 +2388,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3fe7878d83156cc9351fa94e25b0de854bcd6f8d"; - sha256 = "1l9di7q0mlbcgs4xbqg2ias3hy5qib72zi1nwjw06snxlffz2hpq"; + rev = "df3bef57602e9633151c9c4a0ab2b48f1c0d5abc"; + sha256 = "1v4k8nhss8asg2p5jdxkjaqg3z7w1byzxi62vl4k1wkzmp5afpnf"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2700,12 +2700,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-03-01"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "61a1e55394124d66288ecd1b963ad91e6304e463"; - sha256 = "15s8glj9i72n1ckfrffbd7w0widc1vgnppir9n3qn9niwxby24xa"; + rev = "974f8c51385710a1422e841372848308ca7e615b"; + sha256 = "1n0y4gsjbh4yc5b1smckzx7gy4kzavdp7dpaic03adf23akndm1i"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2940,12 +2940,12 @@ let nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; - version = "2021-03-01"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "nathunsmitty"; repo = "nvim-ale-diagnostic"; - rev = "0d1d7a7ba78e9ad0b57060ba7372c486cb341139"; - sha256 = "0pd47yxac81dxp3w3a5pf5k16pc5j9m2pqwdf5nnxwy0by94nak9"; + rev = "894a6790637fdda0df1a2ee1de3f58cd8c276e10"; + sha256 = "07jfmhac8s27awx9pknxlaqz9x3sbmjx7n90pr4np389b43zgrmp"; }; meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/"; }; @@ -2964,12 +2964,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "7a998c5716c2bb9a25276cf1ce7076f99582a45a"; - sha256 = "0hhznddyy3a8k7vlqhwm6fg8hsyy88ifg7a7rcxd6q8zffm66r1i"; + rev = "c2dcc0d7469da71728a5443c053cd51a32c600fa"; + sha256 = "049ngs57xn19yv6p0xbz69riykxdv9mas5aj8ivdph67kwi5c7ym"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2988,12 +2988,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-23"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6dbb5924dfecb28127171648115f2a9d8675bf0e"; - sha256 = "1vwra4bf7q5vy2f80fc4cj78i2jnwpci2yclqwy3df5fn3ldri74"; + rev = "9d2a8bf00b26c2acafdf921f3c81ee2283e5daff"; + sha256 = "1qma3cnh7hm81qpx1x8zx5qbqjh4m0c7n7x7622vs4c0698j9nqc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3024,24 +3024,24 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-03-01"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c70b96f4a385f3d6dd0e96ad59382e0834be8eab"; - sha256 = "0kr45hrqvxl81hvbqr7w4zn0yw01qwnaq0bd60v0ibr8q79zck5m"; + rev = "5567fddecd08115857ef9fa49d1341ea6acf8620"; + sha256 = "02wgywj3sm4pc65qchdv3b217wrrrg11l5k60vrilqdk2spc4xvp"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-02-14"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1e06ce52015d0578cd24c5b01fcae1a2e2abbdc2"; - sha256 = "1c6crqc3yfi3h8mh55555sjrlif7j2q0j9wvajiagjfhggkhdggb"; + rev = "3ce138f52ba5fb8731899bcee0323594bf0aa7a0"; + sha256 = "042x1s1xqv81ym1jblhpm6ak8nf6s9pax6g340nac639x34zm7bh"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3060,12 +3060,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-02-25"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "fa2d4af6127c646ae1f2b68b3ae2abe495cdc6a1"; - sha256 = "1f67k8c0rq9wbk9alvcc1py0rw6rrvas8wc25ngscwcnvp3ksyw8"; + rev = "58e7ee50b847956e31b4e293efc24fe86eb1e193"; + sha256 = "063vgba5bqgji416bmp4vzy4pfsmvn3gjflinkyv05vcs76vy82w"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3084,12 +3084,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "470b0cf45a7e60243e97628c21b05804088dfbf5"; - sha256 = "1qw5psrcxl154qgqf9w6sqhv8y92nwjryz3fcqc6n2jl2p4fszv0"; + rev = "100a8bbfa621db3d373dc41b6f593719b53f860c"; + sha256 = "1p781j10mhyv8vgi9chkv36kxhy09hpnlk0iam915fhpm050q887"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3108,24 +3108,24 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-03-01"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "c8be830b8b594480cac5ae2ab1af94cce1e85029"; - sha256 = "1l09xaw7xlsh1rk0amq9n22lg44wa5sn2hhmkmxyzrn3h80kg432"; + rev = "4da5cd216643ec15164237cdbab4884604053b46"; + sha256 = "0q5j3d4bdapb9m5h5ijkxh05q4fsc2inbskq2rhmannlq94myljb"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "da24e049457ddd1f3e1b9305693bee70c8d1567b"; - sha256 = "0g17x5kl2ifhfl62wapb5aazv2w502r072k604q7wbc64kjg62sk"; + rev = "33e5262777b26e1e81a887d1a85fb0d2037c8249"; + sha256 = "0agk44v8l91cmaczrraylkb8k69s1c05cz0yj9ipn06l0dmj2rlh"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3156,12 +3156,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-03-01"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d162a83d824fcb7ec44472288af2d7379b4bd8b0"; - sha256 = "0b1qqy32lcjgfkq9s570g0248qff1901l2hadkaqv5i2az3dgp96"; + rev = "2f60b43c0f003f549f845ac1578878c69514929b"; + sha256 = "1q7q5rd7cyjk7s83w5vnfin76dv52ggjn3q2ja15zayi758bg78k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3180,24 +3180,24 @@ let nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-01-07"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "16bbe963d044ec94316679868e0988caa7b5b4c3"; - sha256 = "0jgasxphwi222ga73y3jh5zq9m95n74331jn8r3nv741lk2g0772"; + rev = "c87b8ecd7ae2d337499df9f2e70400250c921ca9"; + sha256 = "17z9p6vkpw264cbrh9napkqkqazlp90yv0qz7j6w6ac4z5mgv0mp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-02-14"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "b0f6d2c91b46faecee8b44f426de4b40d8ec8494"; - sha256 = "1r93lbh6yzq59nzkj8sdmdy4pjris5cjlh7w491xkahyizfja1ln"; + rev = "ffe8dbb0f6ab22ed746ef753535a849e3147d914"; + sha256 = "0bq3416v9wijcx1jw5nqvjgn8md9fr4hgnm7pnf16dyrpvmihf4m"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3336,12 +3336,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-18"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "e6b4bacf355c9ef2daed4ff40887f949da9da019"; - sha256 = "1x7m2pw2klk4m4hv0h5cjxzr46ljiyxrmwq4c38zbk2x5mncy5jr"; + rev = "3c7bdd7afb0a0149fdf3e77ec8d6dd93b3159d52"; + sha256 = "1dxx0mjyms5h2a5g6abbmjvq00sn25q1xw4r4fa7l8sifsa9i7r4"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3432,12 +3432,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-28"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "4cc823c409b1e6e2c4cc6ec02ee7ec404aaa7f94"; - sha256 = "02mw8qc9i3ncdv49qjpg0d8mqh6xfk64bpkgfbqx05aq1xs1cvi4"; + rev = "41b4f834c4cc22ff283f381fd3fe3e00ead3099d"; + sha256 = "0vd4haaj2agsy3592j6kp72azpjj3lm51gahq2s7d4a63cr93xl8"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3805,12 +3805,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-02-22"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1a7f12cb1f878063d675924ac97f242950805541"; - sha256 = "1nmicnq2b6n8a9zmgqqkzd9y47x2d11n75ix114qv3xyin0vqnqc"; + rev = "3a3210c8f1c4edf884a853631e641ea7c309cea0"; + sha256 = "04x1jfshk2j4mr7l9bybpk2q64ilgh1yf20qjw1fzdh5l395dv6q"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3973,12 +3973,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-02-22"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "df823938421e66adbd6c570bacdc3ce85d6c776c"; - sha256 = "02hcdsdvbdybcpamj304jld4sh3mxp3j78idzv7ybkizvp8wjlpd"; + rev = "f0d785f7607be60c282b5f5a5d32a2e51560c07c"; + sha256 = "1gbnhl1w0krlf2ppiz4h4fvnrjf8i0552nckhd67gfba2nqha0z4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4215,12 +4215,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "678494e503d3c717df8295f55a6f3c7d3309b7fa"; - sha256 = "04vazlzfx9ab016mgnw0mazg3nvfvf81b947c70vzl1jdyn5d73w"; + rev = "6e941e0ecec1ab6a1b4ce40c693ef1272c505abb"; + sha256 = "1dd7al3zh02fdjsnvxcbqxw9q27x57fl5krcdwn5yifadwmbrdml"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4384,12 +4384,12 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2020-11-10"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "9ceb50062135dd30de3da000d5fd46125f51887d"; - sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg"; + rev = "1dce5c869f2cec23b6bcc0b40330e358ada9f37d"; + sha256 = "198bvd54m8dvhj0jwfzkws35fw18cc075023c8hirplbsgyj6msm"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -4466,6 +4466,18 @@ let meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; + embark-vim = buildVimPluginFrom2Nix { + pname = "embark-vim"; + version = "2021-02-23"; + src = fetchFromGitHub { + owner = "embark-theme"; + repo = "vim"; + rev = "d9ea898794c486e2517823f24b9577ce4c488364"; + sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw"; + }; + meta.homepage = "https://github.com/embark-theme/vim/"; + }; + vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; version = "2020-10-30"; @@ -4720,12 +4732,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-02-15"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "cb1bc19064d3762e4e08103afb37a246b797d902"; - sha256 = "1mw62q54cybybbmlvw7f0yzwr41dv4rsgqvk7psazb5zwjrsqn0z"; + rev = "df956aa08b8bdb176d7127cc4940aea123ec4ffc"; + sha256 = "1wk9df1c80198xpp6zd2yxh3j216w573lv5ssfq6ck26jy7p4q44"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4744,12 +4756,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-02-12"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "d148d42d9caf331ff08b6cae683d5b210003cde7"; - sha256 = "0dd0vp72r95wqa2780rbdmj61mcj77b4hg6fpkwbb07apizrp43b"; + rev = "fa808d74e0aacf131337b58f01ee45fd3d3588af"; + sha256 = "02dq887676dq2rm1fxpzf3piyabs6zj0rvc70nxa5vvlv68qp6k7"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4996,12 +5008,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-27"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "8b618fcbbee7cf30ce9d05be00706ddb558f96af"; - sha256 = "19x69jhn0j5qa1hz46piv54v2nq3g14pqbdvap2h8w9bb62a3yh6"; + rev = "791e2e7cffc6db2858dc6099af109e3b6e9d7f19"; + sha256 = "1d5z4s3llkz324ij9cz7sxhzn0a5bjgdvxg0wnd8v9d1vc7hjpp3"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5632,12 +5644,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-22"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "c66412d238bd2e6c7b84c01a7e92b399bfbf1915"; - sha256 = "0mlvm6x754251pcd9hdwwnjfbwnvkbpywfnyp090dkvhlx19rm0w"; + rev = "a4c834bc8ed2e7e2ef3f02de2d3055007e464956"; + sha256 = "0lhfdnsqys0091k85nkd1g68xgv09m6jymv8ikax0xfar1zmymx3"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6378,24 +6390,24 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-11-27"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "532979346087c029badd02c9605a4efa84ac032a"; - sha256 = "1hjhwaw5bl37a2c9s0wd16z3x9pf0d26dwbrh6s3jk6ivwiz0v7p"; + rev = "0dc9c746ef2459964bab31ccca4225320fe0d687"; + sha256 = "1fkbi0yw62ga0fmyi40gz173ydydlp0xkbxl0c8l40d68yx0ckvh"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; vim-lightline-coc = buildVimPluginFrom2Nix { pname = "vim-lightline-coc"; - version = "2020-11-15"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "josa42"; repo = "vim-lightline-coc"; - rev = "92a32b37ac1039ba39a451bd928bc62a316f0a7a"; - sha256 = "1qwim9y20ffn6dx4s69389w4d2c0rwlp7ri2pxhfb6bgyvibrc3s"; + rev = "53465b2c2ce7b6ae3497ad1cdb751dd3d8084d5c"; + sha256 = "1r1w4j2ir6lzrlr2jhhy3ai4arswrbvjp46dxb6y9fyl516z5mza"; }; meta.homepage = "https://github.com/josa42/vim-lightline-coc/"; }; @@ -6462,12 +6474,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-02-28"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "ca2b527dc5f8cc4e6fbccda735e179ff19e388a1"; - sha256 = "02qpmhd4hzvdg743r9j8fjrzr2mdbvhypyvkb3ph9sdrzc4kwpvd"; + rev = "fea03524cb89385dc8997867a8588135bbd454ca"; + sha256 = "1p8ahb8wl6prs7jdbjchk9w3h3yfz9mnklr4k5j360nwdj7mvbm8"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6547,12 +6559,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-02-27"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "69208b080114be6d038fcdca4a70adb24b6539be"; - sha256 = "12m46f4h5ia16gyj6yv7al813qmwxbsj5ddfmdz03mxa373fwwlm"; + rev = "4f5619fd1ad2b1aa36536b332b058ef6a3387a85"; + sha256 = "0420fmdjbyi037ghs2g49zzxcpfb2vf6dnn3dk4xivl2af2jrr43"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6787,12 +6799,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-02-19"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "ba6a32d0d079b3670cc3c02257dccea4808fdfa1"; - sha256 = "0h4k9p5r7xwwwbi28p013dqhpl75k8458xiisl5ncswyw4wva75v"; + rev = "400bee047d116d1cbe72a479943ec69d5b5bba01"; + sha256 = "0njprv1h38rsagpmp1z68vq90pf9fll3pa8767nhgv2kyadn29jx"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -6943,12 +6955,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2021-02-18"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "36509e99779746866f34dadc8df64449aaca9c27"; - sha256 = "1ir7nymhz613w5bfmk927w892lpz92b71by0j2jfnb7flh9ad6f4"; + rev = "76812f583d7fbec2ef0257424ec1f43fd32473fb"; + sha256 = "0dfhn03nirz2iccpsi9g3rdw3vg1pm0hv75swv5dwhshjzw8rw70"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -7507,12 +7519,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2021-01-09"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "72171eaaf176d7eb3f73ecebf86ff3e5f4ba7dbd"; - sha256 = "0rcy6p4g8784w2dbbq0b7y1z3anqjpvycns40d556vbf1y1pbc41"; + rev = "a522fed677e50175f52efc5848cc35209af33216"; + sha256 = "0k4b629jn6xlxyjxdl3cgm06v9dmx967rqnslv5m82c9kscwpyh4"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -7808,12 +7820,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-02-15"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "5a1cfbbd2b34a64852760497945dd3a5c5df349a"; - sha256 = "164i8kzqyald74ibqimn6871ma02wwnx82d4rz9g21x2qgwyy6gr"; + rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8"; + sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7928,12 +7940,12 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2021-03-01"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "9cb40a1e0c8cfad2e2180e5225d3880109cb9fc4"; - sha256 = "0prh8zphcacn9w19s82v58km7jsdgxg0gbrq5d3sf1p82p13r5z5"; + rev = "f8b5ef76ecbdc38d2b38abc3df218b47e5320c30"; + sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; @@ -7976,12 +7988,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-02-19"; + version = "2021-03-04"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "753c64f356da0e1bed43ce0b9e8923b1e9fc0670"; - sha256 = "06j03r6hqb72ahmdpwxxys9nw86b8c63zsxhrlngzqa5z02z6k9c"; + rev = "e47a0cc3eaedb4072c564d616001dc61ae403ab6"; + sha256 = "1kjp6rx7k1svr90s56z8xqs4j1hii7y48acmdcl6lmhyxp5jindk"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8166,6 +8178,18 @@ let meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; }; + vim-wayland-clipboard = buildVimPluginFrom2Nix { + pname = "vim-wayland-clipboard"; + version = "2021-02-17"; + src = fetchFromGitHub { + owner = "jasonccox"; + repo = "vim-wayland-clipboard"; + rev = "2dc05c0f556213068a9ddf37a8b9b2276deccf84"; + sha256 = "16x7dk1x9q8kzjcgapgb9hw8hm4w8v1g6pzpiz6ccsd0ab0jzf40"; + }; + meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; + }; + vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; version = "2021-02-09"; @@ -8348,12 +8372,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2021-01-01"; + version = "2021-03-02"; src = fetchFromGitHub { owner = "hugolgst"; repo = "vimsence"; - rev = "d135a75530d2ad4d034a5a2515136f043ffcecb2"; - sha256 = "0v0qbqms513c4fcwa69d175ylkzb9n5i93gz1pqlcgnfmzdsfn22"; + rev = "16ce1f653d3ae7b65506f7e35c3723aeea9f758f"; + sha256 = "0rnfmr8qk59dbdwd2jjjlkjwh82w58pmsm7p8b3lr2hhxz0z4sfd"; }; meta.homepage = "https://github.com/hugolgst/vimsence/"; }; @@ -8372,12 +8396,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-02-27"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "5bd83d3e37403d8cc7ad3378a58d58f06a53d318"; - sha256 = "114bpbb82w9q79c7qq51c2w00qyagbj0l8jasr0giwhfxcxys1nb"; + rev = "943ae6c7c9d0f256e444c3ddc5e876156335f997"; + sha256 = "0wfdb89iafpwazgg42wxq1fd5g99gyrmk95nzxvnws2a7fy5hi65"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8385,12 +8409,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "eb6b84315f7d8d698d8839f9685283e6ec9adbbd"; - sha256 = "1hgpx95hpwdvldhv9k1a7p9acd5ppp8z2fl9brq3fs8h5ci272x0"; + rev = "f64e85873dbe654937a9ce50c987440c5a53975b"; + sha256 = "1nnj5qgb9hnkrp7hj0hiiacckak97mrygsv4j44rxqgdibwszi9h"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8615,12 +8639,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-03-01"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "58e31c89350d50e16f52911e60bb3b66160255b5"; - sha256 = "1yyv9grk2wdp308wc3g227iq4rrflv443z8hxi66wknjffjs51wr"; + rev = "18d39cb21e00e0cd6b24a39f0c012c288d624246"; + sha256 = "12m0i9ma0lmy5vmc9b7ksijnn8lr5a4jkwgnfch496cyakpipvd9"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c216d2a7d44..eebeeb4dad5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -106,6 +106,7 @@ eikenb/acp elixir-editors/vim-elixir elmcast/elm-vim elzr/vim-json +embark-theme/vim as embark-vim embear/vim-localvimrc enomsg/vim-haskellConcealPlus enricobacis/vim-airline-clock @@ -197,6 +198,7 @@ jacoborus/tender.vim jakwings/vim-pony jamessan/vim-gnupg@main jaredgorski/SpaceCamp +jasonccox/vim-wayland-clipboard jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher jceb/vim-hier diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bc9768a7345..042246db04b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -679,7 +679,7 @@ "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ pyrisco ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ddd4a45323..8931bf65b5c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -23,6 +23,11 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Pinned due to bug in ring-doorbell 0.7.0 + # https://github.com/tchellomello/python-ring-doorbell/issues/240 + (mkOverride "ring-doorbell" "0.6.2" + "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 23a8d34a632..c8cb13022e2 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mod_auth_mellon"; - version = "0.13.1"; + version = "0.17.0"; src = fetchFromGitHub { - owner = "UNINETT"; + owner = "latchset"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk"; + sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s"; }; patches = [ diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch index 63b69fb142f..4f814ad6036 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch @@ -1,8 +1,23 @@ +diff --git a/Makefile.in b/Makefile.in +index 1388c91..ab28982 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -42,7 +42,7 @@ DISTFILES=$(SRC) \ + all: mod_auth_mellon.la + + mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h +- @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) ++ @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) + + + # Building configure (for distribution) +diff --git a/configure.ac b/configure.ac +index 421b952..e62768e 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,6 +74,16 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) +@@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS) + + AC_SUBST(MELLON_CFLAGS) +#include <libxml/uri.h> +PKG_CHECK_MODULES(LIBXML2, libxml-2.0) @@ -17,14 +32,3 @@ # Test to see if we can include lasso/utils.h # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS. ---- a/Makefile.in -+++ b/Makefile.in -@@ -25,7 +25,7 @@ - all: mod_auth_mellon.la - - mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h -- @APXS2@ -Wc,"-std=c99 @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) -+ @APXS2@ -Wc,"-std=c99 @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) - - - # Building configure (for distribution) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index a7893ac754f..b2cbe58ce96 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-ZN62RIQEokailZRBQUq8nX4Eq/b9GGPmxln8j5KGW+8="; + sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz"; }; - cargoSha256 = "sha256-tcC8GfEeHaM7XcAXw56/wdygfGPj4vOgn5sZd0KuGkA="; + cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1"; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 951cb8b5caa..401636ab687 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -14,10 +14,10 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.2"; - gitRev = "43a260c221d5dac4a44fd82271736c8444474eec"; - sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n"; - cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4"; + version = "1.3"; + gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1"; + sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92"; + cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; @@ -25,13 +25,13 @@ in (rustPlatform.buildRustPackage rec { meta = with lib; { description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; + homepage = "https://github.com/nix-community/lorri"; license = licenses.asl20; maintainers = with maintainers; [ grahamc Profpatsch ]; }; src = fetchFromGitHub { - owner = "target"; + owner = "nix-community"; repo = pname; rev = gitRev; inherit sha256; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 6ea2f45b806..17c29c27cb1 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.5.2"; + version = "1.0.0"; # do not upgrate 1.1.0 yet, because it doesn't build on Darwin src = fetchCrate { inherit version; crateName = pname; - sha256 = "1mxl71yz2iy5s6pbp33cwkfzzilkla4qqiskd6jsd5fdlrrwlxqm"; + sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q"; }; - cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; + cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 400d4e3a8f1..3bec75450df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11258,7 +11258,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackage ./dhall-packages.nix { }; + dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; @@ -13250,6 +13250,8 @@ in agg = callPackage ../development/libraries/agg { }; + alass = callPackage ../applications/video/alass { }; + allegro = allegro4; allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; @@ -15976,6 +15978,8 @@ in matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + maxflow = callPackage ../development/libraries/maxflow { }; + mbedtls = callPackage ../development/libraries/mbedtls { }; mdctags = callPackage ../development/tools/misc/mdctags { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a392ef3764f..451a198e7c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6951,7 +6951,7 @@ in { retrying = callPackage ../development/python-modules/retrying { }; - retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + retworkx = callPackage ../development/python-modules/retworkx { }; rfc3986 = callPackage ../development/python-modules/rfc3986 { }; @@ -6969,6 +6969,8 @@ in { rig = callPackage ../development/python-modules/rig { }; + ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + ripser = callPackage ../development/python-modules/ripser { }; rising = callPackage ../development/python-modules/rising { }; |