Merge master into staging-next
This commit is contained in:
commit
0a8ec23e51
|
@ -562,6 +562,21 @@ self: super:
|
||||||
<xref linkend="opt-services.xserver.videoDrivers" /> no longer uses the deprecated <literal>cirrus</literal> and <literal>vesa</literal> device dependent X drivers by default. It also enables both <literal>amdgpu</literal> and <literal>nouveau</literal> drivers by default now.
|
<xref linkend="opt-services.xserver.videoDrivers" /> no longer uses the deprecated <literal>cirrus</literal> and <literal>vesa</literal> device dependent X drivers by default. It also enables both <literal>amdgpu</literal> and <literal>nouveau</literal> drivers by default now.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <package>apacheKafka</package> 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
|
||||||
|
<link linkend="opt-services.apache-kafka.jre">services.apache-kafka.jre</link>
|
||||||
|
option. Furthermore, the default list of
|
||||||
|
<link linkend="opt-services.apache-kafka.jvmOptions">services.apache-kafka.jvmOptions</link>
|
||||||
|
have been removed. You should set your own according to the
|
||||||
|
<link xlink:href="https://kafka.apache.org/documentation/#java">upstream documentation</link>
|
||||||
|
for your Kafka version.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -90,19 +90,7 @@ in {
|
||||||
|
|
||||||
jvmOptions = mkOption {
|
jvmOptions = mkOption {
|
||||||
description = "Extra command line options for the JVM running Kafka.";
|
description = "Extra command line options for the JVM running Kafka.";
|
||||||
default = [
|
default = [];
|
||||||
"-server"
|
|
||||||
"-Xmx1G"
|
|
||||||
"-Xms1G"
|
|
||||||
"-XX:+UseCompressedOops"
|
|
||||||
"-XX:+UseParNewGC"
|
|
||||||
"-XX:+UseConcMarkSweepGC"
|
|
||||||
"-XX:+CMSClassUnloadingEnabled"
|
|
||||||
"-XX:+CMSScavengeBeforeRemark"
|
|
||||||
"-XX:+DisableExplicitGC"
|
|
||||||
"-Djava.awt.headless=true"
|
|
||||||
"-Djava.net.preferIPv4Stack=true"
|
|
||||||
];
|
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
example = [
|
example = [
|
||||||
"-Djava.net.preferIPv4Stack=true"
|
"-Djava.net.preferIPv4Stack=true"
|
||||||
|
@ -118,6 +106,13 @@ in {
|
||||||
type = types.package;
|
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 {
|
config = mkIf cfg.enable {
|
||||||
|
@ -138,7 +133,7 @@ in {
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.jre}/bin/java \
|
${cfg.jre}/bin/java \
|
||||||
-cp "${cfg.package}/libs/*" \
|
-cp "${cfg.package}/libs/*" \
|
||||||
-Dlog4j.configuration=file:${logConfig} \
|
-Dlog4j.configuration=file:${logConfig} \
|
||||||
${toString cfg.jvmOptions} \
|
${toString cfg.jvmOptions} \
|
||||||
|
|
|
@ -30,11 +30,6 @@ let
|
||||||
'';
|
'';
|
||||||
package = kafkaPackage;
|
package = kafkaPackage;
|
||||||
zookeeper = "zookeeper1:2181";
|
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 ];
|
networking.firewall.allowedTCPPorts = [ 9092 ];
|
||||||
|
@ -82,4 +77,5 @@ let
|
||||||
in with pkgs; {
|
in with pkgs; {
|
||||||
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
|
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
|
||||||
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
|
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
|
||||||
|
kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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",
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
|
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
|
||||||
, withALSA ? true, alsaLib ? null
|
, withALSA ? true, alsaLib ? null
|
||||||
, withPulseAudio ? false, libpulseaudio ? null
|
, withPulseAudio ? false, libpulseaudio ? null
|
||||||
, withPortAudio ? false, portaudio ? null
|
, withPortAudio ? false, portaudio ? null
|
||||||
|
@ -14,22 +14,25 @@ let
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "ncspot";
|
pname = "ncspot";
|
||||||
version = "0.4.0";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hrkfdn";
|
owner = "hrkfdn";
|
||||||
repo = "ncspot";
|
repo = "ncspot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
|
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
|
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
|
||||||
|
|
||||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
cargoPatches = [ ./bump-security-framework-crate.patch ];
|
||||||
|
|
||||||
buildInputs = [ ncurses openssl ]
|
buildInputs = [ ncurses openssl ]
|
||||||
|
++ lib.optional stdenv.isDarwin libiconv
|
||||||
++ lib.optional withALSA alsaLib
|
++ lib.optional withALSA alsaLib
|
||||||
++ lib.optional withPulseAudio libpulseaudio
|
++ lib.optional withPulseAudio libpulseaudio
|
||||||
++ lib.optional withPortAudio portaudio
|
++ lib.optional withPortAudio portaudio
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "plexamp";
|
pname = "plexamp";
|
||||||
version = "3.4.1";
|
version = "3.4.3";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||||
name="${pname}-${version}.AppImage";
|
name="${pname}-${version}.AppImage";
|
||||||
sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U=";
|
sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
@ -32,8 +32,9 @@ in appimageTools.wrapType2 {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||||
homepage = "https://plexamp.com/";
|
homepage = "https://plexamp.com/";
|
||||||
|
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
maintainers = with maintainers; [ killercup ];
|
maintainers = with maintainers; [ killercup synthetica ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,20 @@
|
||||||
{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch
|
{ mkDerivation
|
||||||
, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
|
, 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 {
|
mkDerivation rec {
|
||||||
pname = "merkaartor";
|
pname = "merkaartor";
|
||||||
|
@ -13,24 +28,48 @@ mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Fix build with Qt 5.15 (missing QPainterPath include)
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
|
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
|
||||||
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
|
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; {
|
meta = with lib; {
|
||||||
description = "OpenStreetMap editor";
|
description = "OpenStreetMap editor";
|
||||||
homepage = "http://merkaartor.be/";
|
homepage = "http://merkaartor.be/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ sikmir ];
|
||||||
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
|
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
|
||||||
let
|
let
|
||||||
pname = "sidequest";
|
pname = "sidequest";
|
||||||
version = "0.10.11";
|
version = "0.10.19";
|
||||||
|
|
||||||
desktopItem = makeDesktopItem rec {
|
desktopItem = makeDesktopItem rec {
|
||||||
name = "SideQuest";
|
name = "SideQuest";
|
||||||
|
@ -15,8 +15,8 @@
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
|
url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
|
||||||
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
|
sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -46,8 +46,8 @@
|
||||||
|
|
||||||
meta = with lib; {
|
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";
|
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";
|
homepage = "https://github.com/SideQuestVR/SideQuest";
|
||||||
downloadPage = "https://github.com/the-expanse/SideQuest/releases";
|
downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ joepie91 rvolosatovs ];
|
maintainers = with maintainers; [ joepie91 rvolosatovs ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "helm-secrets";
|
pname = "helm-secrets";
|
||||||
version = "3.4.1";
|
version = "3.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jkroepke";
|
owner = "jkroepke";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
|
hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -13,13 +13,13 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "remmina";
|
pname = "remmina";
|
||||||
version = "1.4.10";
|
version = "1.4.12";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "Remmina";
|
owner = "Remmina";
|
||||||
repo = "Remmina";
|
repo = "Remmina";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
|
sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
assert !cudaSupport || cudatoolkit != null;
|
assert !cudaSupport || cudatoolkit != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "4.0.5";
|
version = "4.1.0";
|
||||||
|
|
||||||
cudatoolkit_joined = symlinkJoin {
|
cudatoolkit_joined = symlinkJoin {
|
||||||
name = "${cudatoolkit.name}-unsplit";
|
name = "${cudatoolkit.name}-unsplit";
|
||||||
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = with lib.versions; fetchurl {
|
src = with lib.versions; fetchurl {
|
||||||
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
|
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
|
sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -13,7 +13,7 @@ buildOctavePackage rec {
|
||||||
sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
|
sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
propagatedBuildInputs = [
|
||||||
librsb
|
librsb
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -22,7 +22,5 @@ buildOctavePackage rec {
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ KarlJoad ];
|
maintainers = with maintainers; [ KarlJoad ];
|
||||||
description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
|
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;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "Wand";
|
pname = "Wand";
|
||||||
version = "0.6.5";
|
version = "0.6.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "ec981b4f07f7582fc564aba8b57763a549392e9ef8b6a338e9da54cdd229cf95";
|
sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ase";
|
pname = "ase";
|
||||||
version = "3.20.1";
|
version = "3.21.1";
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca";
|
sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
|
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "azure-mgmt-iotcentral";
|
pname = "azure-mgmt-iotcentral";
|
||||||
version = "4.0.0";
|
version = "4.1.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "zip";
|
extension = "zip";
|
||||||
sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a";
|
sha256 = "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boto3";
|
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 {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E=";
|
sha256 = "sha256-v0oyHafb4MWiA4D/n2qKTi4TXnKkA0iJASKhlzaLRCE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "botocore";
|
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 {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws=";
|
sha256 = "sha256-k5i82UkUQqpVmnwRG5YAS7Bq9hLlO6pxZbCmRrtDU00=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -1,22 +1,38 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, mock }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, isPy27
|
||||||
|
, fetchPypi
|
||||||
|
, mock
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cssutils";
|
pname = "cssutils";
|
||||||
version = "1.0.2";
|
version = "2.0.0";
|
||||||
|
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf";
|
sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ mock ];
|
checkInputs = [
|
||||||
|
mock
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
# couple of failing tests
|
disabledTests = [
|
||||||
doCheck = false;
|
"test_parseUrl" # accesses network
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "cssutils" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Python package to parse and build CSS";
|
description = "A CSS Cascading Style Sheets library for Python";
|
||||||
homepage = "http://cthedot.de/cssutils/";
|
homepage = "https://github.com/jaraco/cssutils";
|
||||||
|
changelog = "https://github.com/jaraco/cssutils/blob/v${version}/CHANGES.rst";
|
||||||
license = licenses.lgpl3Plus;
|
license = licenses.lgpl3Plus;
|
||||||
|
maintainers = with maintainers; [ dotlambda ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,13 +18,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "django-extensions";
|
pname = "django-extensions";
|
||||||
version = "3.1.0";
|
version = "3.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec=";
|
sha256 = "0ss5x3d21c3g8i1s79l4akazlf116yp4y50gx4vrk1dxh3jb29zj";
|
||||||
};
|
};
|
||||||
|
|
||||||
LC_ALL = "en_US.UTF-8";
|
LC_ALL = "en_US.UTF-8";
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "flowlogs_reader";
|
pname = "flowlogs_reader";
|
||||||
version = "2.3.0";
|
version = "2.4.0";
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef";
|
sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ botocore boto3 docutils ];
|
propagatedBuildInputs = [ botocore boto3 docutils ];
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "3.6.0";
|
version = "3.7.0";
|
||||||
pname = "gspread";
|
pname = "gspread";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
|
sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
|
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.14.1";
|
version = "0.14.2";
|
||||||
pname = "hdmedians";
|
pname = "hdmedians";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871";
|
sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6";
|
||||||
};
|
};
|
||||||
|
|
||||||
# nose was specified in setup.py as a build dependency...
|
# nose was specified in setup.py as a build dependency...
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }:
|
{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mpi4py";
|
pname = "mpi4py";
|
||||||
|
@ -9,6 +9,12 @@ buildPythonPackage rec {
|
||||||
sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
|
sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ (fetchpatch {
|
||||||
|
name = "disable-broken-test"; # upstream patch
|
||||||
|
url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch";
|
||||||
|
sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx";
|
||||||
|
})];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit mpi;
|
inherit mpi;
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,11 +11,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "plotly";
|
pname = "plotly";
|
||||||
version = "4.13.0";
|
version = "4.14.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66";
|
sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, aspy-yaml
|
, aspy-yaml
|
||||||
, cached-property
|
, cached-property
|
||||||
, cfgv
|
, cfgv
|
||||||
, futures
|
|
||||||
, identify
|
, identify
|
||||||
, importlib-metadata
|
, importlib-metadata
|
||||||
, importlib-resources
|
, importlib-resources
|
||||||
|
@ -16,13 +15,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pre-commit";
|
pname = "pre-commit";
|
||||||
version = "2.7.1";
|
version = "2.11.0";
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version;
|
inherit version;
|
||||||
pname = "pre_commit";
|
pname = "pre_commit";
|
||||||
sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
|
sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644
|
||||||
if version != C.DEFAULT:
|
if version != C.DEFAULT:
|
||||||
cmd.extend(['-n', version])
|
cmd.extend(['-n', version])
|
||||||
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
|
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
|
--- a/pre_commit/languages/python.py
|
||||||
+++ b/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:
|
) -> None:
|
||||||
envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
|
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)
|
python = norm_version(version)
|
||||||
- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
|
if python is not None:
|
||||||
+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python)
|
venv_cmd.extend(('-p', python))
|
||||||
install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
|
|
||||||
|
|
||||||
with clean_path_on_failure(envdir):
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "update-dotdee";
|
pname = "update-dotdee";
|
||||||
version = "5.0";
|
version = "6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xolox";
|
owner = "xolox";
|
||||||
repo = "python-update-dotdee";
|
repo = "python-update-dotdee";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01";
|
sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ executor naturalsort ];
|
propagatedBuildInputs = [ executor naturalsort ];
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-make";
|
pname = "cargo-make";
|
||||||
version = "0.32.12";
|
version = "0.32.14";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA=";
|
sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
buildInputs = [ openssl ]
|
buildInputs = [ openssl ]
|
||||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||||
|
|
||||||
cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw=";
|
cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74=";
|
||||||
|
|
||||||
# Some tests fail because they need network access.
|
# Some tests fail because they need network access.
|
||||||
# However, Travis ensures a proper build.
|
# However, Travis ensures a proper build.
|
||||||
|
|
|
@ -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 {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "wrangler";
|
pname = "wrangler";
|
||||||
|
@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
|
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
|
||||||
|
|
||||||
nativeBuildInputs = [ perl ]
|
nativeBuildInputs = [ pkg-config ];
|
||||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
buildInputs = [ openssl ]
|
||||||
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
|
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
|
||||||
|
|
||||||
|
OPENSSL_NO_VENDOR = 1;
|
||||||
|
|
||||||
# tries to use "/homeless-shelter" and fails
|
# tries to use "/homeless-shelter" and fails
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cypress";
|
pname = "cypress";
|
||||||
version = "6.5.0";
|
version = "6.6.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||||
sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o=";
|
sha256 = "13zw9gyaqna9d82mwrglab4dfx5y9faqf36d6xplq0z6vnzig1rg";
|
||||||
};
|
};
|
||||||
|
|
||||||
# don't remove runtime deps
|
# don't remove runtime deps
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -729,7 +729,7 @@ self: super: {
|
||||||
libiconv
|
libiconv
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi";
|
cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
|
|
|
@ -627,7 +627,7 @@ tpope/vim-tbone
|
||||||
tpope/vim-unimpaired
|
tpope/vim-unimpaired
|
||||||
tpope/vim-vinegar
|
tpope/vim-vinegar
|
||||||
travitch/hasksyn
|
travitch/hasksyn
|
||||||
tremor-rs/tremor-vim
|
tremor-rs/tremor-vim@main
|
||||||
triglav/vim-visual-increment
|
triglav/vim-visual-increment
|
||||||
troydm/zoomwintab.vim
|
troydm/zoomwintab.vim
|
||||||
twerth/ir_black
|
twerth/ir_black
|
||||||
|
|
|
@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "terraform";
|
name = "terraform";
|
||||||
publisher = "hashicorp";
|
publisher = "hashicorp";
|
||||||
version = "2.7.0";
|
version = "2.8.1";
|
||||||
};
|
};
|
||||||
|
|
||||||
vsix = fetchurl {
|
vsix = fetchurl {
|
||||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||||
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
|
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 ];
|
patches = [ ./fix-terraform-ls.patch ];
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
diff --git a/out/extension.js b/out/extension.js
|
diff --git a/out/extension.js b/out/extension.js
|
||||||
index 375048c..fa5eff0 100644
|
index 4a2c6a9..158fe28 100644
|
||||||
--- a/out/extension.js
|
--- a/out/extension.js
|
||||||
+++ b/out/extension.js
|
+++ b/out/extension.js
|
||||||
@@ -209,20 +209,7 @@ function pathToBinary() {
|
@@ -215,19 +215,7 @@ function pathToBinary() {
|
||||||
if (!_pathToBinaryPromise) {
|
if (!_pathToBinaryPromise) {
|
||||||
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
|
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
|
||||||
if (!command) { // Skip install/upgrade if user has set custom binary path
|
if (!command) { // Skip install/upgrade if user has set custom binary path
|
||||||
- const installDir = `${extensionPath}/lsp`;
|
- const installDir = `${extensionPath}/lsp`;
|
||||||
- const installer = new languageServerInstaller_1.LanguageServerInstaller();
|
- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
|
||||||
- try {
|
- try {
|
||||||
- yield installer.install(installDir);
|
- yield installer.install(installDir);
|
||||||
- }
|
- }
|
||||||
- catch (err) {
|
- catch (err) {
|
||||||
- vscode.window.showErrorMessage(err);
|
|
||||||
- reporter.sendTelemetryException(err);
|
- reporter.sendTelemetryException(err);
|
||||||
- throw err;
|
- throw err;
|
||||||
- }
|
- }
|
||||||
|
@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644
|
||||||
- command = `${installDir}/terraform-ls`;
|
- command = `${installDir}/terraform-ls`;
|
||||||
+ command = 'TERRAFORM-LS-PATH';
|
+ command = 'TERRAFORM-LS-PATH';
|
||||||
}
|
}
|
||||||
_pathToBinaryPromise = Promise.resolve(command);
|
else {
|
||||||
}
|
reporter.sendTelemetryEvent('usePathToBinary');
|
||||||
|
|
|
@ -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" }:
|
majorVersion ? "1.0" }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
jre8 = jdk8_headless;
|
||||||
|
jre11 = jdk11_headless;
|
||||||
versionMap = {
|
versionMap = {
|
||||||
"2.4" = {
|
"2.4" = {
|
||||||
kafkaVersion = "2.4.1";
|
kafkaVersion = "2.4.1";
|
||||||
scalaVersion = "2.12";
|
scalaVersion = "2.12";
|
||||||
sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
|
sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
|
||||||
|
jre = jre8;
|
||||||
};
|
};
|
||||||
"2.5" = {
|
"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";
|
scalaVersion = "2.13";
|
||||||
sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi";
|
sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y";
|
||||||
|
jre = jre11;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
|
||||||
in
|
in
|
||||||
|
|
||||||
with versionMap.${majorVersion};
|
with versionMap.${majorVersion};
|
||||||
|
@ -63,5 +71,5 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = [ maintainers.ragge ];
|
maintainers = [ maintainers.ragge ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
passthru = { inherit jre; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "repmgr";
|
pname = "repmgr";
|
||||||
version = "5.1.0";
|
version = "5.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "2ndQuadrant";
|
owner = "2ndQuadrant";
|
||||||
repo = "repmgr";
|
repo = "repmgr";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m";
|
sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ flex ];
|
nativeBuildInputs = [ flex ];
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "squid";
|
pname = "squid";
|
||||||
version = "4.13";
|
version = "4.14";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
|
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8";
|
sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://ohmyz.sh/";
|
homepage = "https://ohmyz.sh/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ scolobb nequissimus ];
|
maintainers = with maintainers; [ nequissimus ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,11 +28,11 @@ let
|
||||||
in
|
in
|
||||||
with py.pkgs; buildPythonApplication rec {
|
with py.pkgs; buildPythonApplication rec {
|
||||||
pname = "awscli";
|
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 {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw=";
|
sha256 = "sha256-eB81VdFB09QuagANaZxQuOe8N0AnqgL4aIu5HDrYg2I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/aws/aws-cli/issues/4837
|
# https://github.com/aws/aws-cli/issues/4837
|
||||||
|
|
|
@ -56,14 +56,14 @@ let
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "yabridge";
|
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 {
|
src = fetchFromGitHub {
|
||||||
owner = "robbert-vdh";
|
owner = "robbert-vdh";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0=";
|
hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Unpack subproject sources
|
# Unpack subproject sources
|
||||||
|
|
|
@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
src = yabridge.src;
|
src = yabridge.src;
|
||||||
sourceRoot = "source/tools/yabridgectl";
|
sourceRoot = "source/tools/yabridgectl";
|
||||||
cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc=";
|
cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# By default, yabridgectl locates libyabridge.so by using
|
# By default, yabridgectl locates libyabridge.so by using
|
||||||
# hard-coded distro-specific lib paths. This patch replaces those
|
# hard coded distro specific lib paths. This patch replaces those
|
||||||
# hard coded paths with lib paths from NIX_PROFILE.
|
# hard coded paths with lib paths from NIX_PROFILES.
|
||||||
./libyabridge-from-nix-profiles.patch
|
./libyabridge-from-nix-profiles.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
19
pkgs/tools/security/rbw/bump-security-framework-crate.patch
Normal file
19
pkgs/tools/security/rbw/bump-security-framework-crate.patch
Normal file
|
@ -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",
|
|
@ -7,6 +7,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, Security
|
, Security
|
||||||
|
, libiconv
|
||||||
|
|
||||||
# rbw-fzf
|
# rbw-fzf
|
||||||
, withFzf ? false, fzf, perl
|
, withFzf ? false, fzf, perl
|
||||||
|
@ -20,22 +21,24 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rbw";
|
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 {
|
src = fetchCrate {
|
||||||
inherit version;
|
inherit version;
|
||||||
crateName = pname;
|
crateName = pname;
|
||||||
sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q";
|
sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm";
|
cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b";
|
||||||
|
|
||||||
|
cargoPatches = [ ./bump-security-framework-crate.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
makeWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/pinentry.rs \
|
substituteInPlace src/pinentry.rs \
|
||||||
|
|
935
pkgs/tools/text/fst/0001-cargo-lockfile.patch
Normal file
935
pkgs/tools/text/fst/0001-cargo-lockfile.patch
Normal file
|
@ -0,0 +1,935 @@
|
||||||
|
From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
|
||||||
|
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
|
||||||
|
|
45
pkgs/tools/text/fst/default.nix
Normal file
45
pkgs/tools/text/fst/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2351,6 +2351,8 @@ in
|
||||||
|
|
||||||
fsmon = callPackage ../tools/misc/fsmon { };
|
fsmon = callPackage ../tools/misc/fsmon { };
|
||||||
|
|
||||||
|
fst = callPackage ../tools/text/fst { };
|
||||||
|
|
||||||
fsql = callPackage ../tools/misc/fsql { };
|
fsql = callPackage ../tools/misc/fsql { };
|
||||||
|
|
||||||
fop = callPackage ../tools/typesetting/fop {
|
fop = callPackage ../tools/typesetting/fop {
|
||||||
|
@ -11868,9 +11870,10 @@ in
|
||||||
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
|
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
|
||||||
ant = apacheAnt;
|
ant = apacheAnt;
|
||||||
|
|
||||||
apacheKafka = apacheKafka_2_5;
|
apacheKafka = apacheKafka_2_6;
|
||||||
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
|
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
|
||||||
apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
|
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 {};
|
kt = callPackage ../tools/misc/kt {};
|
||||||
|
|
||||||
|
|
|
@ -179,11 +179,7 @@ makeScope newScope (self:
|
||||||
|
|
||||||
sockets = callPackage ../development/octave-modules/sockets { };
|
sockets = callPackage ../development/octave-modules/sockets { };
|
||||||
|
|
||||||
sparsersb = callPackage ../development/octave-modules/sparsersb {
|
sparsersb = callPackage ../development/octave-modules/sparsersb { };
|
||||||
librsb = null;
|
|
||||||
# TODO: Package the librsb library to build this package.
|
|
||||||
# http://librsb.sourceforge.net/
|
|
||||||
};
|
|
||||||
|
|
||||||
stk = callPackage ../development/octave-modules/stk { };
|
stk = callPackage ../development/octave-modules/stk { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue