diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 9a1e6b6618d..e052632ecaf 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -562,6 +562,21 @@ self: super:
no longer uses the deprecated cirrus and vesa device dependent X drivers by default. It also enables both amdgpu and nouveau drivers by default now.
+
+
+ The apacheKafka packages are now built with
+ version-matched JREs. Versions 2.6 and above, the ones that recommend it,
+ use jdk11, while versions below remain on jdk8. The NixOS service has
+ been adjusted to start the service using the same version as the package,
+ adjustable with the new
+ services.apache-kafka.jre
+ option. Furthermore, the default list of
+ services.apache-kafka.jvmOptions
+ have been removed. You should set your own according to the
+ upstream documentation
+ for your Kafka version.
+
+
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index f3a650a260f..69dfadfe54e 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -90,19 +90,7 @@ in {
jvmOptions = mkOption {
description = "Extra command line options for the JVM running Kafka.";
- default = [
- "-server"
- "-Xmx1G"
- "-Xms1G"
- "-XX:+UseCompressedOops"
- "-XX:+UseParNewGC"
- "-XX:+UseConcMarkSweepGC"
- "-XX:+CMSClassUnloadingEnabled"
- "-XX:+CMSScavengeBeforeRemark"
- "-XX:+DisableExplicitGC"
- "-Djava.awt.headless=true"
- "-Djava.net.preferIPv4Stack=true"
- ];
+ default = [];
type = types.listOf types.str;
example = [
"-Djava.net.preferIPv4Stack=true"
@@ -118,6 +106,13 @@ in {
type = types.package;
};
+ jre = mkOption {
+ description = "The JRE with which to run Kafka";
+ default = cfg.package.passthru.jre;
+ defaultText = "pkgs.apacheKafka.passthru.jre";
+ type = types.package;
+ };
+
};
config = mkIf cfg.enable {
@@ -138,7 +133,7 @@ in {
after = [ "network.target" ];
serviceConfig = {
ExecStart = ''
- ${pkgs.jre}/bin/java \
+ ${cfg.jre}/bin/java \
-cp "${cfg.package}/libs/*" \
-Dlog4j.configuration=file:${logConfig} \
${toString cfg.jvmOptions} \
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index d5c54f7d991..034601c815b 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -30,11 +30,6 @@ let
'';
package = kafkaPackage;
zookeeper = "zookeeper1:2181";
- # These are the default options, but UseCompressedOops doesn't work with 32bit JVM
- jvmOptions = [
- "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
- "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
- ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
};
networking.firewall.allowedTCPPorts = [ 9092 ];
@@ -82,4 +77,5 @@ let
in with pkgs; {
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
+ kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6;
}
diff --git a/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
new file mode 100644
index 00000000000..5c8008abb18
--- /dev/null
+++ b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
@@ -0,0 +1,19 @@
+Bump security-framework from 2.1.1 to 2.1.2
+
+security-framework=2.1.1 doesn't build on Darwin 10.12.
+https://github.com/kornelski/rust-security-framework/issues/124
+
+--- c/Cargo.lock
++++ i/Cargo.lock
+@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+ [[package]]
+ name = "security-framework"
+-version = "2.1.1"
++version = "2.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+ dependencies = [
+ "bitflags 1.2.1",
+ "core-foundation",
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index e78eaca5490..ad8d64b9720 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
+{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
@@ -14,22 +14,25 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
+ sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
};
- cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
+ cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
nativeBuildInputs = [ pkg-config ];
+ cargoPatches = [ ./bump-security-framework-crate.patch ];
+
buildInputs = [ ncurses openssl ]
+ ++ lib.optional stdenv.isDarwin libiconv
++ lib.optional withALSA alsaLib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index c484f6e1924..a26af9023a8 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.4.1";
+ version = "3.4.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U=";
+ sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
};
appimageContents = appimageTools.extractType2 {
@@ -32,8 +32,9 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
license = licenses.unfree;
- maintainers = with maintainers; [ killercup ];
+ maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 8eee8c1f09f..010d28eef59 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,5 +1,20 @@
-{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch
-, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
+{ mkDerivation
+, lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, qmake
+, qttools
+, qttranslations
+, gdal
+, proj
+, qtsvg
+, qtwebkit
+, withGeoimage ? true, exiv2
+, withGpsdlib ? (!stdenv.isDarwin), gpsd
+, withLibproxy ? false, libproxy
+, withZbar ? false, zbar
+}:
mkDerivation rec {
pname = "merkaartor";
@@ -13,24 +28,48 @@ mkDerivation rec {
};
patches = [
+ # Fix build with Qt 5.15 (missing QPainterPath include)
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
})
+ # Added a condition to use the new timespec_t on gpsd APIs >= 9
+ (fetchpatch {
+ url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch";
+ sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb";
+ })
];
- nativeBuildInputs = [ qmake pkg-config ];
+ nativeBuildInputs = [ qmake qttools ];
- buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
+ buildInputs = [ gdal proj qtsvg qtwebkit ]
+ ++ lib.optional withGeoimage exiv2
+ ++ lib.optional withGpsdlib gpsd
+ ++ lib.optional withLibproxy libproxy
+ ++ lib.optional withZbar zbar;
- enableParallelBuilding = true;
+ preConfigure = ''
+ lrelease src/src.pro
+ '';
- NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
+ qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ]
+ ++ lib.optional withGeoimage "GEOIMAGE=1"
+ ++ lib.optional withGpsdlib "GPSDLIB=1"
+ ++ lib.optional withLibproxy "LIBPROXY=1"
+ ++ lib.optional withZbar "ZBAR=1";
+
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/Applications
+ mv binaries/bin/merkaartor.app $out/Applications
+ mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents
+ wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor
+ '';
meta = with lib; {
description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index c904c221260..c83cd772659 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
- version = "0.10.11";
+ version = "0.10.19";
desktopItem = makeDesktopItem rec {
name = "SideQuest";
@@ -15,8 +15,8 @@
inherit pname version;
src = fetchurl {
- url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
- sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
+ url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+ sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2";
};
nativeBuildInputs = [ makeWrapper ];
@@ -46,8 +46,8 @@
meta = with lib; {
description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
- homepage = "https://github.com/the-expanse/SideQuest";
- downloadPage = "https://github.com/the-expanse/SideQuest/releases";
+ homepage = "https://github.com/SideQuestVR/SideQuest";
+ downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
license = licenses.mit;
maintainers = with maintainers; [ joepie91 rvolosatovs ];
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index d53abe3569c..bef5d230ece 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "helm-secrets";
- version = "3.4.1";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "jkroepke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
+ hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 02f1e7ed344..3421050d1ed 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.4.10";
+ version = "1.4.12";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
+ sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 802685970ac..46b2748cad9 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -18,7 +18,7 @@
assert !cudaSupport || cudatoolkit != null;
let
- version = "4.0.5";
+ version = "4.1.0";
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
- sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
+ sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU=";
};
postPatch = ''
diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix
index b8147f8d281..ecea6c0f62e 100644
--- a/pkgs/development/octave-modules/sparsersb/default.nix
+++ b/pkgs/development/octave-modules/sparsersb/default.nix
@@ -13,7 +13,7 @@ buildOctavePackage rec {
sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
};
- buildInputs = [
+ propagatedBuildInputs = [
librsb
];
@@ -22,7 +22,5 @@ buildOctavePackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ KarlJoad ];
description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
- # Mark this way until KarlJoad builds librsb specifically for this package.
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 054cce0ce52..4faedcada3b 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ec981b4f07f7582fc564aba8b57763a549392e9ef8b6a338e9da54cdd229cf95";
+ sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index fcbeb1f1f4d..86840257725 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ase";
- version = "3.20.1";
+ version = "3.21.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca";
+ sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b";
};
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 2f368b82649..c7528dace27 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iotcentral";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a";
+ sha256 = "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 32b3bfc4b83..ea33a13dc36 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.24"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E=";
+ sha256 = "sha256-v0oyHafb4MWiA4D/n2qKTi4TXnKkA0iJASKhlzaLRCE=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 29f00d87ad3..3f7fb23822d 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.24"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws=";
+ sha256 = "sha256-k5i82UkUQqpVmnwRG5YAS7Bq9hLlO6pxZbCmRrtDU00=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index a12fbf48c82..4ea08c8a7b0 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,22 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, mock }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, mock
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "cssutils";
- version = "1.0.2";
+ version = "2.0.0";
+
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf";
+ sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
};
- buildInputs = [ mock ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
- # couple of failing tests
- doCheck = false;
+ disabledTests = [
+ "test_parseUrl" # accesses network
+ ];
+
+ pythonImportsCheck = [ "cssutils" ];
meta = with lib; {
- description = "A Python package to parse and build CSS";
- homepage = "http://cthedot.de/cssutils/";
+ description = "A CSS Cascading Style Sheets library for Python";
+ homepage = "https://github.com/jaraco/cssutils";
+ changelog = "https://github.com/jaraco/cssutils/blob/v${version}/CHANGES.rst";
license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 455eeebddde..9bd72965cf8 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "django-extensions";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec=";
+ sha256 = "0ss5x3d21c3g8i1s79l4akazlf116yp4y50gx4vrk1dxh3jb29zj";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
index 9fd36fab294..f8468209bb4 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "flowlogs_reader";
- version = "2.3.0";
+ version = "2.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef";
+ sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4";
};
propagatedBuildInputs = [ botocore boto3 docutils ];
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 0370f80b4a4..beaf1e4f903 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "3.6.0";
+ version = "3.7.0";
pname = "gspread";
src = fetchPypi {
inherit pname version;
- sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
+ sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
index f1b0d13e56e..cc953aa696e 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "0.14.1";
+ version = "0.14.2";
pname = "hdmedians";
src = fetchPypi {
inherit pname version;
- sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871";
+ sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6";
};
# nose was specified in setup.py as a build dependency...
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 058133665f4..6e8fd896d91 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }:
+{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
buildPythonPackage rec {
pname = "mpi4py";
@@ -9,6 +9,12 @@ buildPythonPackage rec {
sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
};
+ patches = [ (fetchpatch {
+ name = "disable-broken-test"; # upstream patch
+ url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch";
+ sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx";
+ })];
+
passthru = {
inherit mpi;
};
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index f11cf1c0984..e2496d6097d 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "4.13.0";
+ version = "4.14.3";
src = fetchPypi {
inherit pname version;
- sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66";
+ sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix
index 88fb6e3abf9..1b5af02dca0 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/pkgs/development/python-modules/pre-commit/default.nix
@@ -2,7 +2,6 @@
, aspy-yaml
, cached-property
, cfgv
-, futures
, identify
, importlib-metadata
, importlib-resources
@@ -16,13 +15,13 @@
buildPythonPackage rec {
pname = "pre-commit";
- version = "2.7.1";
+ version = "2.11.0";
disabled = isPy27;
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
+ sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
};
patches = [
diff --git a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
index c1bead48b34..6d274aae3c0 100644
--- a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
+++ b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
@@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644
if version != C.DEFAULT:
cmd.extend(['-n', version])
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
-index e17376e..0c1d2ab 100644
+index 43b7280..f0f2338 100644
--- a/pre_commit/languages/python.py
+++ b/pre_commit/languages/python.py
-@@ -204,7 +204,7 @@ def install_environment(
+@@ -192,7 +192,7 @@ def install_environment(
+ additional_dependencies: Sequence[str],
) -> None:
envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
+- venv_cmd = [sys.executable, '-mvirtualenv', envdir]
++ venv_cmd = ['@virtualenv@/bin/virtualenv', envdir]
python = norm_version(version)
-- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
-+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python)
- install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
-
- with clean_path_on_failure(envdir):
+ if python is not None:
+ venv_cmd.extend(('-p', python))
diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix
index ec9dbd947c0..1532fca78c4 100644
--- a/pkgs/development/python-modules/update-dotdee/default.nix
+++ b/pkgs/development/python-modules/update-dotdee/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "update-dotdee";
- version = "5.0";
+ version = "6.0";
src = fetchFromGitHub {
owner = "xolox";
repo = "python-update-dotdee";
rev = version;
- sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01";
+ sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
};
propagatedBuildInputs = [ executor naturalsort ];
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 8e1c032cdaf..fd995216281 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.32.12";
+ version = "0.32.14";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA=";
+ sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
- cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw=";
+ cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index f867fd836a3..f43a0a369d6 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
@@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
- nativeBuildInputs = [ perl ]
- ++ lib.optionals stdenv.isLinux [ pkg-config ];
+ nativeBuildInputs = [ pkg-config ];
- buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+ buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
+ OPENSSL_NO_VENDOR = 1;
+
# tries to use "/homeless-shelter" and fails
doCheck = false;
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index dae3243e1e7..2d04fc51c81 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "6.5.0";
+ version = "6.6.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o=";
+ sha256 = "13zw9gyaqna9d82mwrglab4dfx5y9faqf36d6xplq0z6vnzig1rg";
};
# don't remove runtime deps
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8ac029250ec..da4f37d28a0 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-04";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "8c5081f6316183c97298ec4a819fd94c2a2a9516";
- sha256 = "1k1d19w9avvxk6ccgdj2sricr3c3crvlwdfj0g7ybgh8nyn2isvs";
+ rev = "c21d6afd2fb799013e3894d393bf976d9da31e65";
+ sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-02-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "691155697a809af8797c1b935aa4e73187516d42";
- sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg";
+ rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0";
+ sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -257,12 +257,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-02-18";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "42d7112d78839ef9bd2b283ec0d9d82134e94b4f";
- sha256 = "0i2vx60h27sal1crl8di4rq6dp4c8zjarknjl9z09l1s798l5i62";
+ rev = "85432f426b7473bb7a4de9f698f91848737b0fd8";
+ sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "4608bbe255e66f463cf08de888e470cb00966f8d";
- sha256 = "06rkj244frd2a7w0x0dp4nnzn8sdnbyww1jwn9xlypfcn67gg0nn";
+ rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e";
+ sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -509,12 +509,12 @@ let
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "9454f352914475f3595efad08bb1524cf8812853";
- sha256 = "0j3h8jyn2gbyyk7vpbjprg4kpk77j85npb0m090z0iqhlvcdrhh1";
+ rev = "946e8393cd9189f97a50084c2a040966dce0f0cb";
+ sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-03";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "71b5766a7cc28daef89fac7db99340cd532035b3";
- sha256 = "035fhkf6n4iyi01jc84a8bsaapz5dd3m49cbilxag2wr85gc4b9p";
+ rev = "ab4f3f5797754334def047466a998b92f3076db9";
+ sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-03-04";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "5e78fa379d6c1a604834e89eff31c9a28123c6d9";
- sha256 = "1phkq68hv6pi1z637in8hl5m5xzaw7ybmqyvljy8rly89w9gis5w";
+ rev = "3b61d0755a4523a131096c97fb016b102e7b1672";
+ sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -846,24 +846,24 @@ let
dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin";
- version = "2020-11-10";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "dart-lang";
repo = "dart-vim-plugin";
- rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d";
- sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf";
+ rev = "a2821046c45d25258aeddd4d64d607070b93dd88";
+ sha256 = "0wpsv0qz5dyp484ilvlkmd8jlb6b9s0p96lsw103jpj1dlf2n7la";
};
meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
};
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-03";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "dbcee4399394e56e4bbae5039af78408b2a35334";
- sha256 = "1p6ckanaqxgag1l1kmpiwq2fxygfp6rghbf4a3mx5ldh17lhnii8";
+ rev = "6849ecf77a6075e55946c642f07a562fcdcdd579";
+ sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -882,24 +882,24 @@ let
defx-icons = buildVimPluginFrom2Nix {
pname = "defx-icons";
- version = "2020-08-09";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "defx-icons";
- rev = "3259550f918b2cfb9794b62e7bb94b863f75f489";
- sha256 = "1a65p99f9f1idzkxl4fd1klxidf40lvs79bym1fydv1zw34x8qzv";
+ rev = "563bc2d07d6c369a293ea8cb2fad8afd38bf4a02";
+ sha256 = "0gp65vf7lb00k4pk9iyr2zm6q3lfz16ad70hh3ldnj2azdfz539m";
};
meta.homepage = "https://github.com/kristijanhusak/defx-icons/";
};
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-02-28";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "f4e082b3e4a62ca2cd5dfe041288f4acf3b2031f";
- sha256 = "1lm4x0skg9mm776bm7s34sjmxjjvcsy7gjn95qhplg7r6799xsn0";
+ rev = "fc76104d2b7204c016bd8e1750a06150800c4735";
+ sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "a4683be7c58c346458e2cdb1f8b244e14fe35a8e";
- sha256 = "0ph4mj4s2gklr8rz8ny80i91r7fcivh9kb5q0y20c19mmyjsvifm";
+ rev = "aa32b3d2e8f4240c7908f098f89359d20063c691";
+ sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1256,12 +1256,12 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2021-03-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "32f0a489d1f47405f3327d0686f8d96da216cead";
- sha256 = "1czs335wdjs8vfx3ydy92m145wibp6jy47fia5p5mhrp6zncibqq";
+ rev = "561c21a96249e7411b409817c00d472a26337b8d";
+ sha256 = "0nb1s9c6av6jkvc3gc239llzsa34n50nfqf6swvvbazn7j29sz7c";
};
meta.homepage = "https://github.com/dracula/vim/";
};
@@ -1315,6 +1315,18 @@ let
meta.homepage = "https://github.com/dmix/elvish.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/";
+ };
+
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
version = "2020-10-21";
@@ -1523,24 +1535,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-02-02";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "02a192ea0bed22a015e005b281e55e0da2a8e496";
- sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv";
+ rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4";
+ sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "dd1cd3098f95423fa744be5d65b61132caae51b5";
- sha256 = "12k25aq9giivfh2nw086ha8jq77bd5d5v9mmqsxjb15bp6b2mbc5";
+ rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a";
+ sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1619,12 +1631,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-04";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "d54291e425d324db56a4b0990c73a0facb9ae877";
- sha256 = "1zwnsblklw9a9khr6xpwsfn115synrzg1b92pvzsh5p53ydaqaj2";
+ rev = "6f282d9e99e04780d645e0133c4376486bd16c23";
+ sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1787,12 +1799,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "114354c337dc0f492b014853f8972fa42ca4c379";
- sha256 = "0laxlhzv70zln8wsxdcgimbc3zg4dpyixik7qa44lw4g8szmpyxc";
+ rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7";
+ sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -1895,12 +1907,12 @@ let
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
- version = "2021-01-22";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "207e001be64b39b72f8661e4a723d5bab698b5cd";
- sha256 = "0vnnfm319y3n0vvwbwls40fb6s73rqc8yyi31g0f0hdwd6ahsafm";
+ rev = "47691a67b690ad6ebd9df67574691822d226a5b6";
+ sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2052,12 +2064,12 @@ let
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-02-17";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "7f967873c8a3e566bdf10715569319a632f3de93";
- sha256 = "1db6i2w93pfgw1nkhgw9m75crbx62rh5cvw7pbjs69xmbfd2zlld";
+ rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b";
+ sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -2184,24 +2196,24 @@ let
lh-brackets = buildVimPluginFrom2Nix {
pname = "lh-brackets";
- version = "2021-01-15";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-brackets";
- rev = "7e0e38857de5558de04c251cf6ddc350724562d9";
- sha256 = "105dgm80946jvx9qxs10vscgrplwpg89nwd6cmpm47wzj8999r8b";
+ rev = "73efae0e97b8c661bf36d3637c3ba1ee02b4fe07";
+ sha256 = "122jhh3vkapxz42sa6l9sdxcdl4fzq4xfrjmaak815nvf3bg249a";
};
meta.homepage = "https://github.com/LucHermitte/lh-brackets/";
};
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2021-02-23";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "7afb5525addfab7c177c2912a7aa98053c79e495";
- sha256 = "18jwc65q0k1q7nd2w31gi476cg4h7bfrr7z39is3s3qw0z2nprp9";
+ rev = "0618a099fa7895c5d25b80cc1bea948ebdc64a96";
+ sha256 = "1k2kz3475f15n1y7dkac45fw4mbr33fgbf2j7vmlshb4796j5fw3";
};
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
};
@@ -2304,24 +2316,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "afbe401bf8e8b02e4b61459d012bf2c1c70b7cf0";
- sha256 = "03hbh3y5ya0v2qgc5mhs0v7vwn2z56c8srg3arfqaphhr18da7s7";
+ rev = "80c29017e9897280273473956009cc641a0b3709";
+ sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-02";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "9c9212c5b63675b43459e29858d3e0a64bce9507";
- sha256 = "07nz7wj8vr9dckbfx3dymjv9yq1q3wyy7mcj8lvlg1d9g28snnd1";
+ rev = "332f488e2499d0f7a09276adcdd50995b348f7de";
+ sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2748,12 +2760,12 @@ let
neosnippet-snippets = buildVimPluginFrom2Nix {
pname = "neosnippet-snippets";
- version = "2021-01-20";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet-snippets";
- rev = "b10b14873fc0fd46a7daab251e83eaad6c17e1e3";
- sha256 = "1y5bp92dvz356nzl14bcqhdvfwc59ckc45nw0m4lh43q2h0lvdg1";
+ rev = "97ce53528ded53cc2355acb64d285a6291cca099";
+ sha256 = "0kms714cgryajrjmw0fpxv8k5xdrs6jz68jqd5hj4cs8rj72vpjk";
};
meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
};
@@ -2928,12 +2940,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-02-26";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "536f99f6c5aa27f3362be6c7bc61e5251c9bdbcc";
- sha256 = "1n0xrzvplsrrc17jyqnyapwx2vj7b39d2ma0pd40qjf97rsvv4a4";
+ rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297";
+ sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -2950,16 +2962,28 @@ let
meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/";
};
- nvim-autopairs= buildVimPluginFrom2Nix {
+ nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-02-25";
+ version = "2021-02-08";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
};
- meta.homepage = "https://github.com/windwp/nvim-autopairs";
+ meta.homepage = "https://github.com/windwp/nvim-autopairs/";
+ };
+
+ nvim-bqf = buildVimPluginFrom2Nix {
+ pname = "nvim-bqf";
+ version = "2021-03-08";
+ src = fetchFromGitHub {
+ owner = "kevinhwang91";
+ repo = "nvim-bqf";
+ rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade";
+ sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad";
+ };
+ meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-cm-racer = buildVimPluginFrom2Nix {
@@ -2974,26 +2998,14 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
- nvim-bqf = buildVimPluginFrom2Nix {
- pname = "nvim-bqf";
- version = "2021-02-25";
- src = fetchFromGitHub {
- owner = "kevinhwang91";
- repo = "nvim-bqf";
- rev = "4a424267e110e9637b84096a7080aa280c56be31";
- sha256 = "034x827nka73znvnbm5slnypw1az9s7xlrpkv5ia6hi7pcapjyfn";
- };
- meta.homepage = "https://github.com/kevinhwang91/nvim-bqf";
- };
-
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "c2dcc0d7469da71728a5443c053cd51a32c600fa";
- sha256 = "049ngs57xn19yv6p0xbz69riykxdv9mas5aj8ivdph67kwi5c7ym";
+ rev = "25170751944b64bb7b65af1e35772361485bc936";
+ sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3036,24 +3048,24 @@ let
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-02-25";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "5a95e50556deebf45d771abc58c7cd440fd6390a";
- sha256 = "187yxnjxb9pp98yzvkpssmdcfqwvggzg5fpc20jwa7fvq8cdl0a0";
+ rev = "07aa4b435a832b122154a157ab6892ac4efb81fb";
+ sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-03-03";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "5567fddecd08115857ef9fa49d1341ea6acf8620";
- sha256 = "02wgywj3sm4pc65qchdv3b217wrrrg11l5k60vrilqdk2spc4xvp";
+ rev = "5f189ece5e071f4133ce756bec0ab7da1f6eece6";
+ sha256 = "1s59fr7ppw37c98skrlbbcw583dhrqwjwd2nwjhmhhc884r88d5x";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -3084,12 +3096,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-02";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "58e7ee50b847956e31b4e293efc24fe86eb1e193";
- sha256 = "063vgba5bqgji416bmp4vzy4pfsmvn3gjflinkyv05vcs76vy82w";
+ rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78";
+ sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3108,12 +3120,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "100a8bbfa621db3d373dc41b6f593719b53f860c";
- sha256 = "1p781j10mhyv8vgi9chkv36kxhy09hpnlk0iam915fhpm050q887";
+ rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950";
+ sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3132,24 +3144,24 @@ let
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
- rev = "4da5cd216643ec15164237cdbab4884604053b46";
- sha256 = "0q5j3d4bdapb9m5h5ijkxh05q4fsc2inbskq2rhmannlq94myljb";
+ rev = "b88638d1067364965c214860cc2e5048caa617f7";
+ sha256 = "17hc37f7gm1wbrj6mzq3walb1a5km901viq0nx8n93r957sj98dd";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "33e5262777b26e1e81a887d1a85fb0d2037c8249";
- sha256 = "0agk44v8l91cmaczrraylkb8k69s1c05cz0yj9ipn06l0dmj2rlh";
+ rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda";
+ sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3168,36 +3180,36 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-02-26";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "1984c125100247f79e1aaa4de335032ea6092d63";
- sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49";
+ rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4";
+ sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-04";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "2f60b43c0f003f549f845ac1578878c69514929b";
- sha256 = "1q7q5rd7cyjk7s83w5vnfin76dv52ggjn3q2ja15zayi758bg78k";
+ rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644";
+ sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-02-16";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "0dda360a8f841550ca565564c5a409746353e94e";
- sha256 = "058hfybqhcwvmhjm7k9iww2baz2fpww7nq6m9xngj3wdwfkylcfy";
+ rev = "ff4955b250eebc320d32d6459297117004c68d3e";
+ sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@@ -3360,12 +3372,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-04";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "3c7bdd7afb0a0149fdf3e77ec8d6dd93b3159d52";
- sha256 = "1dxx0mjyms5h2a5g6abbmjvq00sn25q1xw4r4fa7l8sifsa9i7r4";
+ rev = "6a169bec7d15d24c1d680fb75aa24a2921829442";
+ sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3456,12 +3468,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "41b4f834c4cc22ff283f381fd3fe3e00ead3099d";
- sha256 = "0vd4haaj2agsy3592j6kp72azpjj3lm51gahq2s7d4a63cr93xl8";
+ rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727";
+ sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3493,12 +3505,12 @@ let
popup-nvim = buildVimPluginFrom2Nix {
pname = "popup-nvim";
- version = "2020-12-12";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "popup.nvim";
- rev = "6f8f4cf35278956de1095b0d10701c6b579a2a57";
- sha256 = "0mvcms1ica4kpl5na0cppk0advyq96707zj394wvlnnq18dnsj4z";
+ rev = "bc98ca6df9179452c368f0d7bac821a8fd4c01ac";
+ sha256 = "0j1gkaba6z5vb922j47i7sq0d1zwkr5581w0nxd8c31klghg3kyn";
};
meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
};
@@ -4239,12 +4251,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "6e941e0ecec1ab6a1b4ce40c693ef1272c505abb";
- sha256 = "1dd7al3zh02fdjsnvxcbqxw9q27x57fl5krcdwn5yifadwmbrdml";
+ rev = "add7ee394350f268684cff03d844f32f255fec47";
+ sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4359,7 +4371,7 @@ let
};
tremor-vim = buildVimPluginFrom2Nix {
- pname = "tremor-nvim";
+ pname = "tremor-vim";
version = "2020-11-19";
src = fetchFromGitHub {
owner = "tremor-rs";
@@ -4367,7 +4379,7 @@ let
rev = "17e53c33f3b0e825330580034ca60172b8ddaadc";
sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki";
};
- meta.homepage = "https://github.com/tremor-rs/tremor-vim";
+ meta.homepage = "https://github.com/tremor-rs/tremor-vim/";
};
tslime-vim = buildVimPluginFrom2Nix {
@@ -4502,18 +4514,6 @@ 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";
@@ -4768,12 +4768,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-03-02";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "df956aa08b8bdb176d7127cc4940aea123ec4ffc";
- sha256 = "1wk9df1c80198xpp6zd2yxh3j216w573lv5ssfq6ck26jy7p4q44";
+ rev = "09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783";
+ sha256 = "0hi4yvd5b8il63a42kk10hxc8ixb1khf8h8q601qipkvgla8mpiy";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -4924,12 +4924,12 @@ let
vim-beancount = buildVimPluginFrom2Nix {
pname = "vim-beancount";
- version = "2020-08-06";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "nathangrigg";
repo = "vim-beancount";
- rev = "6d762beaa526d4e56280619aa62b1013b50457b7";
- sha256 = "0r4ziynmil432k1xjglqjx0bh5069aav3k9r58ksqg716w4zvzys";
+ rev = "30b55500094325af9e9498b72e75c8c1090df436";
+ sha256 = "0bh7q7s3zb2yrnck3zx1cx0kv8lm8zp4p5fwj6kv35y27v109pfm";
};
meta.homepage = "https://github.com/nathangrigg/vim-beancount/";
};
@@ -5044,12 +5044,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "791e2e7cffc6db2858dc6099af109e3b6e9d7f19";
- sha256 = "1d5z4s3llkz324ij9cz7sxhzn0a5bjgdvxg0wnd8v9d1vc7hjpp3";
+ rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09";
+ sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5284,12 +5284,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-02-26";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "28c3b294c9f1d88078eeebfa62a8533e6ea97f87";
- sha256 = "0myj7ng62sjxhrq0lfk142dzr637rfl0ll6khrd0a3hrwxjjnb2x";
+ rev = "c1f00249cb47dae2457ae8b748284620b622e642";
+ sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5500,12 +5500,12 @@ let
vim-endwise = buildVimPluginFrom2Nix {
pname = "vim-endwise";
- version = "2020-04-19";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-endwise";
- rev = "97180a73ad26e1dcc1eebe8de201f7189eb08344";
- sha256 = "1f9nwp9qiip4alkpacwaq2nzsrx80a4cdwyrvajs6lrk48dv4hbw";
+ rev = "4289889a2622f9bc7c594a6dd79763781f63dfb5";
+ sha256 = "0sixr3rpcgqbaiyk7w6ghcrvllh35cb3gq9isdlwkww3dz4jyyxc";
};
meta.homepage = "https://github.com/tpope/vim-endwise/";
};
@@ -5680,12 +5680,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-03-05";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "a4c834bc8ed2e7e2ef3f02de2d3055007e464956";
- sha256 = "0lhfdnsqys0091k85nkd1g68xgv09m6jymv8ikax0xfar1zmymx3";
+ rev = "7b0eb92e72a6d6aef3c31faa868e2d2a4af81951";
+ sha256 = "08sf9idvrjqf6bvi5p98w8fj2r7c1czkvsyfjch77bwr20gdf2wy";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5728,12 +5728,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6";
- sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz";
+ rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7";
+ sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5848,12 +5848,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-02-20";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5";
- sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw";
+ rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05";
+ sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6233,12 +6233,12 @@ let
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
- version = "2020-05-11";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
- rev = "3c90d0cc37bb8b78422f647e62587f498a5dd7bd";
- sha256 = "16s3s883azfmwkr6hhnh8m7ibk6jm3vnvpmsagangxn0mz6ky533";
+ rev = "c7593e69bf64c3157b50cd0aea257c5abb8ae6a0";
+ sha256 = "11792qbl0080s8kxprfzc0xnb3abw1zsvb4vq2fc61q50afn775j";
};
meta.homepage = "https://github.com/pangloss/vim-javascript/";
};
@@ -6426,12 +6426,12 @@ let
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
- version = "2021-03-05";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
- rev = "0dc9c746ef2459964bab31ccca4225320fe0d687";
- sha256 = "1fkbi0yw62ga0fmyi40gz173ydydlp0xkbxl0c8l40d68yx0ckvh";
+ rev = "96ec5f9a14211c3b1b2e4632c07df3a5fb68ef3b";
+ sha256 = "0kawxaxahg7sdpkyp65k7gy6hqbfcs1hy8w8rzvi2h9kw4y8xkr7";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@@ -6510,12 +6510,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "fea03524cb89385dc8997867a8588135bbd454ca";
- sha256 = "1p8ahb8wl6prs7jdbjchk9w3h3yfz9mnklr4k5j360nwdj7mvbm8";
+ rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b";
+ sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -6991,12 +6991,12 @@ let
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2021-03-02";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "76812f583d7fbec2ef0257424ec1f43fd32473fb";
- sha256 = "0dfhn03nirz2iccpsi9g3rdw3vg1pm0hv75swv5dwhshjzw8rw70";
+ rev = "aba6b5596cf0e879a83a2aa5edc93e5e5753bea8";
+ sha256 = "0hgzmfcyl3qhdmyyxdaynlm7psk164v8xg5j1kvdaxxgj4lwbnig";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
@@ -7447,12 +7447,12 @@ let
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
- version = "2020-01-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
- rev = "86f49aca266e4b17420bcadd29009997d15668d8";
- sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c";
+ rev = "9450c4ea654649b6199750edc9f3f84637268d7b";
+ sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg";
};
meta.homepage = "https://github.com/tpope/vim-scriptease/";
};
@@ -7471,12 +7471,12 @@ let
vim-sexp = buildVimPluginFrom2Nix {
pname = "vim-sexp";
- version = "2017-05-15";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "guns";
repo = "vim-sexp";
- rev = "12292941903d9ac8151513189d2007e1ccfc95f0";
- sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0";
+ rev = "14464d4580af43424ed8f2614d94e62bfa40bb4d";
+ sha256 = "139krxpjhbyypbl6v2jik1rms2fxl3dkqrl4rb7sms6c3p5764qx";
};
meta.homepage = "https://github.com/guns/vim-sexp/";
};
@@ -7519,12 +7519,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
- version = "2021-01-28";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
- rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689";
- sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm";
+ rev = "2542b6459085f3d1e361e8b5bf406dec6448487e";
+ sha256 = "1m7m1fwn4bpbqfji7fvvgx00fxz1hy5nvfajbpj4vpgaxzqwsf8k";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@@ -7627,12 +7627,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-02-25";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "24a9bf959211bb0ba9ada17d6425ff167adf7bd9";
- sha256 = "0jwjhpw1g0hy935vzslbhcw9n5sfbpcc7hs1bvvvir05619hr21y";
+ rev = "d30f65105e1f73c63c92c22c4afbad51539f5744";
+ sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7651,12 +7651,12 @@ let
vim-sort-motion = buildVimPluginFrom2Nix {
pname = "vim-sort-motion";
- version = "2018-07-15";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "christoomey";
repo = "vim-sort-motion";
- rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
- sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
+ rev = "c8782be8f7da414c6442b3ba4b6abb0345d392d9";
+ sha256 = "1vq2jrn75g3gd8vfgbnkn0w2qc4gbnrn2lg0wmzsvvxdvj8m9lii";
};
meta.homepage = "https://github.com/christoomey/vim-sort-motion/";
};
@@ -7831,12 +7831,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
- version = "2020-12-10";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
- rev = "aa7877acb5dd81bed70c1188667b76cfde5b67bf";
- sha256 = "0ibks0ykybiardppad9psjh2qmh29s9mbjf2d4jg8hbx59kvj32g";
+ rev = "e62cac4d3186209a510f51becd768ee414b2be76";
+ sha256 = "1c93kvlrgzp5fw5rgv053sin0f2f2chydxbvrkprpz71qmxqmq05";
};
meta.homepage = "https://github.com/hashivim/vim-terraform/";
};
@@ -8024,12 +8024,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-04";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "e47a0cc3eaedb4072c564d616001dc61ae403ab6";
- sha256 = "1kjp6rx7k1svr90s56z8xqs4j1hii7y48acmdcl6lmhyxp5jindk";
+ rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22";
+ sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8445,24 +8445,24 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "f64e85873dbe654937a9ce50c987440c5a53975b";
- sha256 = "1nnj5qgb9hnkrp7hj0hiiacckak97mrygsv4j44rxqgdibwszi9h";
+ rev = "3af88f325e4784bd209df490dbf648a942326d57";
+ sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-02-23";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "5b1791673c1a089a78be16187f7532f95e50580b";
- sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc";
+ rev = "29d46f6bc158c28b85ae540dc29459ff41211233";
+ sha256 = "1yd9pmyzqyk7mcsa9gkvsz6i9g6zkm63mm9h26713simy1idl536";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -8493,12 +8493,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2021-02-26";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e";
- sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq";
+ rev = "954754c830d2ca7da3157cdea029c8d50021d0bc";
+ sha256 = "1cw79hzkisii0g2n457wbzha65wbpp00x3yrb8rb3d5299bz0z72";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -8675,24 +8675,24 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-05";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "18d39cb21e00e0cd6b24a39f0c012c288d624246";
- sha256 = "12m0i9ma0lmy5vmc9b7ksijnn8lr5a4jkwgnfch496cyakpipvd9";
+ rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7";
+ sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2021-02-23";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c";
- sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx";
+ rev = "ead21935391bb1f3906c7358af7ebe5572592cfd";
+ sha256 = "1qcd7w5hadf6h4lxrvj8xjl729csy0bc0dch39xy4j6iph9w8jpq";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 90dce90b072..1b06a2e9109 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -729,7 +729,7 @@ self: super: {
libiconv
];
- cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi";
+ cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a1d970c26a1..2076e24423d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -627,7 +627,7 @@ tpope/vim-tbone
tpope/vim-unimpaired
tpope/vim-vinegar
travitch/hasksyn
-tremor-rs/tremor-vim
+tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
twerth/ir_black
diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix
index 39dd6f90b80..7e7d0c618b7 100644
--- a/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
- version = "2.7.0";
+ version = "2.8.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
- sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp";
+ sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s";
};
patches = [ ./fix-terraform-ls.patch ];
diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 3d5cc51fe2a..9c076d06df4 100644
--- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,18 +1,17 @@
diff --git a/out/extension.js b/out/extension.js
-index 375048c..fa5eff0 100644
+index 4a2c6a9..158fe28 100644
--- a/out/extension.js
+++ b/out/extension.js
-@@ -209,20 +209,7 @@ function pathToBinary() {
+@@ -215,19 +215,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
- const installDir = `${extensionPath}/lsp`;
-- const installer = new languageServerInstaller_1.LanguageServerInstaller();
+- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
- try {
- yield installer.install(installDir);
- }
- catch (err) {
-- vscode.window.showErrorMessage(err);
- reporter.sendTelemetryException(err);
- throw err;
- }
@@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644
- command = `${installDir}/terraform-ls`;
+ command = 'TERRAFORM-LS-PATH';
}
- _pathToBinaryPromise = Promise.resolve(command);
- }
+ else {
+ reporter.sendTelemetryEvent('usePathToBinary');
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 4bd50653d52..935db27044f 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,21 +1,29 @@
-{ lib, stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
+{ lib, stdenv, fetchurl, jdk8_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
majorVersion ? "1.0" }:
let
+ jre8 = jdk8_headless;
+ jre11 = jdk11_headless;
versionMap = {
"2.4" = {
kafkaVersion = "2.4.1";
scalaVersion = "2.12";
sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
+ jre = jre8;
};
"2.5" = {
- kafkaVersion = "2.5.0";
+ kafkaVersion = "2.5.1";
+ scalaVersion = "2.12";
+ sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv";
+ jre = jre8;
+ };
+ "2.6" = {
+ kafkaVersion = "2.6.1";
scalaVersion = "2.13";
- sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi";
+ sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y";
+ jre = jre11;
};
};
-
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
in
with versionMap.${majorVersion};
@@ -63,5 +71,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.ragge ];
platforms = platforms.unix;
};
-
+ passthru = { inherit jre; };
}
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index ceb9cc9d8af..65107191938 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
- version = "5.1.0";
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
- sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m";
+ sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk=";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 59da5a80a37..5c980f7e401 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squid";
- version = "4.13";
+ version = "4.14";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
- sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8";
+ sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6960b3212ba..1c191b567d7 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
homepage = "https://ohmyz.sh/";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ scolobb nequissimus ];
+ maintainers = with maintainers; [ nequissimus ];
};
}
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index ce3dbcc74be..1e962e5ee9a 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.22"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.24"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw=";
+ sha256 = "sha256-eB81VdFB09QuagANaZxQuOe8N0AnqgL4aIu5HDrYg2I=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix
index 034e73207e3..d2a14aae330 100644
--- a/pkgs/tools/audio/yabridge/default.nix
+++ b/pkgs/tools/audio/yabridge/default.nix
@@ -56,14 +56,14 @@ let
};
in stdenv.mkDerivation rec {
pname = "yabridge";
- version = "3.0.1";
+ version = "3.0.2";
- # NOTE: Also update yabridgectl's cargoSha256 when this is updated
+ # NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
- hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0=";
+ hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI=";
};
# Unpack subproject sources
diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix
index 6a77b502aee..5c7f3a628f5 100644
--- a/pkgs/tools/audio/yabridgectl/default.nix
+++ b/pkgs/tools/audio/yabridgectl/default.nix
@@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec {
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
- cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc=";
+ cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0=";
patches = [
# By default, yabridgectl locates libyabridge.so by using
- # hard-coded distro-specific lib paths. This patch replaces those
- # hard coded paths with lib paths from NIX_PROFILE.
+ # hard coded distro specific lib paths. This patch replaces those
+ # hard coded paths with lib paths from NIX_PROFILES.
./libyabridge-from-nix-profiles.patch
];
diff --git a/pkgs/tools/security/rbw/bump-security-framework-crate.patch b/pkgs/tools/security/rbw/bump-security-framework-crate.patch
new file mode 100644
index 00000000000..9074dd925b8
--- /dev/null
+++ b/pkgs/tools/security/rbw/bump-security-framework-crate.patch
@@ -0,0 +1,19 @@
+Bump security-framework from 2.1.1 to 2.1.2
+
+security-framework=2.1.1 doesn't build on Darwin 10.12.
+https://github.com/kornelski/rust-security-framework/issues/124
+
+--- i/Cargo.lock
++++ w/Cargo.lock
+@@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+ [[package]]
+ name = "security-framework"
+-version = "2.1.1"
++version = "2.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+ dependencies = [
+ "bitflags",
+ "core-foundation",
diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix
index 17c29c27cb1..9f19a34c162 100644
--- a/pkgs/tools/security/rbw/default.nix
+++ b/pkgs/tools/security/rbw/default.nix
@@ -7,6 +7,7 @@
, pkg-config
, makeWrapper
, Security
+, libiconv
# rbw-fzf
, withFzf ? false, fzf, perl
@@ -20,22 +21,24 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
- version = "1.0.0"; # do not upgrate 1.1.0 yet, because it doesn't build on Darwin
+ version = "1.1.2";
src = fetchCrate {
inherit version;
crateName = pname;
- sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q";
+ sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx";
};
- cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm";
+ cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b";
+
+ cargoPatches = [ ./bump-security-framework-crate.patch ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
postPatch = ''
substituteInPlace src/pinentry.rs \
diff --git a/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
new file mode 100644
index 00000000000..c8c56ffdb62
--- /dev/null
+++ b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
@@ -0,0 +1,935 @@
+From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon"
+Date: Fri, 5 Mar 2021 16:59:41 -0500
+Subject: [PATCH 1/1] Create cargo lock file for 0.4.5
+
+---
+ Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 916 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..136677d
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,916 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "anyhow"
++version = "1.0.38"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "bit-set"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
++dependencies = [
++ "bit-vec",
++]
++
++[[package]]
++name = "bit-vec"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "bstr"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
++dependencies = [
++ "lazy_static",
++ "memchr",
++ "regex-automata",
++ "serde",
++]
++
++[[package]]
++name = "bumpalo"
++version = "3.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
++
++[[package]]
++name = "byteorder"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++
++[[package]]
++name = "cast"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
++dependencies = [
++ "rustc_version",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "clap"
++version = "2.33.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
++dependencies = [
++ "bitflags",
++ "textwrap",
++ "unicode-width",
++]
++
++[[package]]
++name = "criterion"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
++dependencies = [
++ "atty",
++ "cast",
++ "clap",
++ "criterion-plot",
++ "csv",
++ "itertools 0.10.0",
++ "lazy_static",
++ "num-traits",
++ "oorandom",
++ "plotters",
++ "rayon",
++ "regex",
++ "serde",
++ "serde_cbor",
++ "serde_derive",
++ "serde_json",
++ "tinytemplate",
++ "walkdir",
++]
++
++[[package]]
++name = "criterion-plot"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
++dependencies = [
++ "cast",
++ "itertools 0.9.0",
++]
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
++dependencies = [
++ "crossbeam-utils 0.7.2",
++ "maybe-uninit",
++]
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils 0.8.3",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-epoch",
++ "crossbeam-utils 0.8.3",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils 0.8.3",
++ "lazy_static",
++ "memoffset",
++ "scopeguard",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++dependencies = [
++ "autocfg",
++ "cfg-if 0.1.10",
++ "lazy_static",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
++dependencies = [
++ "autocfg",
++ "cfg-if 1.0.0",
++ "lazy_static",
++]
++
++[[package]]
++name = "csv"
++version = "1.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
++dependencies = [
++ "bstr",
++ "csv-core",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "csv-core"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "doc-comment"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "fnv"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++
++[[package]]
++name = "fst"
++version = "0.4.5"
++dependencies = [
++ "doc-comment",
++ "fnv",
++ "memmap",
++ "quickcheck",
++ "rand 0.7.3",
++ "utf8-ranges",
++]
++
++[[package]]
++name = "fst"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f"
++dependencies = [
++ "utf8-ranges",
++]
++
++[[package]]
++name = "fst-bench"
++version = "0.0.1"
++dependencies = [
++ "criterion",
++ "fnv",
++ "fst 0.4.5",
++]
++
++[[package]]
++name = "fst-bin"
++version = "0.4.1"
++dependencies = [
++ "anyhow",
++ "bit-set",
++ "bstr",
++ "clap",
++ "crossbeam-channel 0.4.4",
++ "csv",
++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memmap",
++ "num_cpus",
++ "regex-automata",
++ "serde",
++ "tempfile",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.10.2+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "half"
++version = "1.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "itertools"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itertools"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++
++[[package]]
++name = "js-sys"
++version = "0.3.48"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
++dependencies = [
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.88"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
++
++[[package]]
++name = "log"
++version = "0.4.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++
++[[package]]
++name = "memchr"
++version = "2.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++
++[[package]]
++name = "memmap"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
++dependencies = [
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "memoffset"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "oorandom"
++version = "11.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
++
++[[package]]
++name = "plotters"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
++dependencies = [
++ "num-traits",
++ "plotters-backend",
++ "plotters-svg",
++ "wasm-bindgen",
++ "web-sys",
++]
++
++[[package]]
++name = "plotters-backend"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
++
++[[package]]
++name = "plotters-svg"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
++dependencies = [
++ "plotters-backend",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "quickcheck"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
++dependencies = [
++ "rand 0.7.3",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom 0.1.16",
++ "libc",
++ "rand_chacha 0.2.2",
++ "rand_core 0.5.1",
++ "rand_hc 0.2.0",
++]
++
++[[package]]
++name = "rand"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
++dependencies = [
++ "libc",
++ "rand_chacha 0.3.0",
++ "rand_core 0.6.2",
++ "rand_hc 0.3.0",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.6.2",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom 0.1.16",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
++dependencies = [
++ "getrandom 0.2.2",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++dependencies = [
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
++dependencies = [
++ "rand_core 0.6.2",
++]
++
++[[package]]
++name = "rayon"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
++dependencies = [
++ "autocfg",
++ "crossbeam-deque",
++ "either",
++ "rayon-core",
++]
++
++[[package]]
++name = "rayon-core"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
++dependencies = [
++ "crossbeam-channel 0.5.0",
++ "crossbeam-deque",
++ "crossbeam-utils 0.8.3",
++ "lazy_static",
++ "num_cpus",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "regex"
++version = "1.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
++dependencies = [
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-automata"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
++dependencies = [
++ "byteorder",
++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++dependencies = [
++ "semver",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++dependencies = [
++ "semver-parser",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++
++[[package]]
++name = "serde"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_cbor"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
++dependencies = [
++ "half",
++ "serde",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.64"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
++dependencies = [
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.61"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "rand 0.8.3",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "tinytemplate"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
++dependencies = [
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
++
++[[package]]
++name = "walkdir"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++dependencies = [
++ "same-file",
++ "winapi",
++ "winapi-util",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.2+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
++dependencies = [
++ "cfg-if 1.0.0",
++ "wasm-bindgen-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
++dependencies = [
++ "bumpalo",
++ "lazy_static",
++ "log",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
++
++[[package]]
++name = "web-sys"
++version = "0.3.48"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+--
+2.29.2
+
diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix
new file mode 100644
index 00000000000..738fd69dc64
--- /dev/null
+++ b/pkgs/tools/text/fst/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, libiconv
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fst";
+ version = "0.4.5";
+
+ src = fetchFromGitHub {
+ owner = "BurntSushi";
+ repo = pname;
+ rev = version;
+ sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3";
+ };
+
+ cargoPatches = [
+ # Add Cargo.lock lockfile, which upstream does not include
+ ./0001-cargo-lockfile.patch
+ ];
+
+ cargoBuildFlags = [ "--workspace" ];
+ cargoSha256 = "0svn2gzipslz939396rcydqx3i1x07l7acas7fhql12n59n2yrxw";
+
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ csv="$(mktemp)"
+ fst="$(mktemp)"
+ printf "abc,1\nabcd,1" > "$csv"
+ $out/bin/fst map "$csv" "$fst" --force
+ $out/bin/fst fuzzy "$fst" 'abc'
+ $out/bin/fst --help > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Represent large sets and maps compactly with finite state transducers";
+ homepage = "https://github.com/BurntSushi/fst";
+ license = with licenses; [ unlicense /* or */ mit ];
+ maintainers = with maintainers; [ rmcgibbo ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d838e14156..989fd945d03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2351,6 +2351,8 @@ in
fsmon = callPackage ../tools/misc/fsmon { };
+ fst = callPackage ../tools/text/fst { };
+
fsql = callPackage ../tools/misc/fsql { };
fop = callPackage ../tools/typesetting/fop {
@@ -11868,9 +11870,10 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheKafka = apacheKafka_2_5;
+ apacheKafka = apacheKafka_2_6;
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
+ apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; };
kt = callPackage ../tools/misc/kt {};
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index 6278a7042e1..115b38095ed 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -179,11 +179,7 @@ makeScope newScope (self:
sockets = callPackage ../development/octave-modules/sockets { };
- sparsersb = callPackage ../development/octave-modules/sparsersb {
- librsb = null;
- # TODO: Package the librsb library to build this package.
- # http://librsb.sourceforge.net/
- };
+ sparsersb = callPackage ../development/octave-modules/sparsersb { };
stk = callPackage ../development/octave-modules/stk { };