pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub 309163ae 8eabe2ec
+8
-2
nixos/modules/services/security/tor.nix
+8
-2
nixos/modules/services/security/tor.nix
···
170
170
else if k == "ServerTransportPlugin" then
171
171
optionalString (v.transports != []) "${concatStringsSep "," v.transports} exec ${v.exec}"
172
172
else if k == "HidServAuth" then
173
-
concatMapStringsSep "\n${k} " (settings: settings.onion + " " settings.auth) v
173
+
v.onion + " " + v.auth
174
174
else generators.mkValueStringDefault {} v;
175
175
genTorrc = settings:
176
176
generators.toKeyValue {
···
715
715
(submodule {
716
716
options = {
717
717
onion = mkOption {
718
-
type = strMatching "[a-z2-7]{16}(\\.onion)?";
718
+
type = strMatching "[a-z2-7]{16}\\.onion";
719
719
description = "Onion address.";
720
720
example = "xxxxxxxxxxxxxxxx.onion";
721
721
};
···
726
726
};
727
727
})
728
728
]);
729
+
example = [
730
+
{
731
+
onion = "xxxxxxxxxxxxxxxx.onion";
732
+
auth = "xxxxxxxxxxxxxxxxxxxxxx";
733
+
}
734
+
];
729
735
};
730
736
options.HiddenServiceNonAnonymousMode = optionBool "HiddenServiceNonAnonymousMode";
731
737
options.HiddenServiceStatistics = optionBool "HiddenServiceStatistics";
+2
-2
pkgs/applications/blockchains/ledger-live-desktop/default.nix
+2
-2
pkgs/applications/blockchains/ledger-live-desktop/default.nix
···
2
2
3
3
let
4
4
pname = "ledger-live-desktop";
5
-
version = "2.24.0";
5
+
version = "2.26.1";
6
6
name = "${pname}-${version}";
7
7
8
8
src = fetchurl {
9
9
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
10
-
sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n";
10
+
sha256 = "0zbzqq3c0q45dz4vvgfbvqcgda7413mnwixi7yi78qb9mp8zxkhy";
11
11
};
12
12
13
13
appimageContents = appimageTools.extractType2 {
+3
-1
pkgs/applications/misc/xplr/default.nix
+3
-1
pkgs/applications/misc/xplr/default.nix
···
1
-
{ lib, rustPlatform, fetchFromGitHub }:
1
+
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "xplr";
···
10
10
rev = "v${version}";
11
11
sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj";
12
12
};
13
+
14
+
buildInputs = lib.optional stdenv.isDarwin libiconv;
13
15
14
16
cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r";
15
17
+4
-4
pkgs/applications/terminal-emulators/wezterm/default.nix
+4
-4
pkgs/applications/terminal-emulators/wezterm/default.nix
···
58
58
59
59
rustPlatform.buildRustPackage rec {
60
60
pname = "wezterm";
61
-
version = "20210407-nightly";
61
+
version = "20210502-154244-3f7122cb";
62
62
63
63
src = fetchFromGitHub {
64
64
owner = "wez";
65
65
repo = pname;
66
-
rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
67
-
sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
66
+
rev = version;
67
+
sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw=";
68
68
fetchSubmodules = true;
69
69
};
70
70
···
72
72
echo ${version} > .tag
73
73
'';
74
74
75
-
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
75
+
cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU=";
76
76
77
77
nativeBuildInputs = [
78
78
pkg-config
+1
-1
pkgs/development/libraries/gcr/default.nix
+1
-1
pkgs/development/libraries/gcr/default.nix
+6
-6
pkgs/development/tools/clang-tools/default.nix
+6
-6
pkgs/development/tools/clang-tools/default.nix
···
1
1
{ lib, stdenv, llvmPackages }:
2
2
3
3
let
4
-
clang = llvmPackages.clang-unwrapped;
4
+
unwrapped = llvmPackages.clang-unwrapped;
5
5
6
6
in stdenv.mkDerivation {
7
7
pname = "clang-tools";
8
-
version = lib.getVersion clang;
8
+
version = lib.getVersion unwrapped;
9
9
10
10
dontUnpack = true;
11
11
12
+
clang = llvmPackages.clang;
13
+
inherit unwrapped;
14
+
12
15
installPhase = ''
13
16
runHook preInstall
14
17
15
18
mkdir -p $out/bin
16
-
export libc_includes="${lib.getDev stdenv.cc.libc}/include"
17
-
export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1"
18
19
19
-
export clang=${clang}
20
20
substituteAll ${./wrapper} $out/bin/clangd
21
21
chmod +x $out/bin/clangd
22
22
for tool in \
···
32
32
runHook postInstall
33
33
'';
34
34
35
-
meta = clang.meta // {
35
+
meta = unwrapped.meta // {
36
36
description = "Standalone command line tools for C++ development";
37
37
maintainers = with lib.maintainers; [ aherrmann ];
38
38
};
+13
-6
pkgs/development/tools/clang-tools/wrapper
+13
-6
pkgs/development/tools/clang-tools/wrapper
···
1
1
#!/bin/sh
2
2
3
3
buildcpath() {
4
-
local path
4
+
local path after
5
5
while (( $# )); do
6
6
case $1 in
7
7
-isystem)
8
8
shift
9
9
path=$path${path:+':'}$1
10
+
;;
11
+
-idirafter)
12
+
shift
13
+
after=$after${after:+':'}$1
14
+
;;
10
15
esac
11
16
shift
12
17
done
13
-
echo $path
18
+
echo $path${after:+':'}$after
14
19
}
15
20
16
-
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE})
17
-
export CPATH=${CPATH}${CPATH:+':'}@libc_includes@
18
-
export CPLUS_INCLUDE_PATH=${CPATH}${CPATH:+':'}@libcpp_includes@
21
+
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
22
+
$(<@clang@/nix-support/libc-cflags))
23
+
export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
24
+
$(<@clang@/nix-support/libcxx-cxxflags) \
25
+
$(<@clang@/nix-support/libc-cflags))
19
26
20
-
exec -a "$0" @clang@/bin/$(basename $0) "$@"
27
+
exec -a "$0" @unwrapped@/bin/$(basename $0) "$@"
+3
-1
pkgs/development/tools/rust/cargo-expand/default.nix
+3
-1
pkgs/development/tools/rust/cargo-expand/default.nix
···
1
-
{ lib, rustPlatform, fetchFromGitHub }:
1
+
{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "cargo-expand";
···
12
12
};
13
13
14
14
cargoSha256 = "sha256-C9lpA2n7EI7Ga3Nnj80dkvbZmqjuxf0wjoQUEr0N8FE=";
15
+
16
+
buildInputs = lib.optional stdenv.isDarwin libiconv;
15
17
16
18
meta = with lib; {
17
19
description =
+3
-1
pkgs/development/tools/rust/cargo-feature/default.nix
+3
-1
pkgs/development/tools/rust/cargo-feature/default.nix
···
1
-
{ lib, rustPlatform, fetchFromGitHub }:
1
+
{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "cargo-feature";
···
12
12
};
13
13
14
14
cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq";
15
+
16
+
buildInputs = lib.optional stdenv.isDarwin libiconv;
15
17
16
18
meta = with lib; {
17
19
description = "Allows conveniently modify features of crate";
+3
-1
pkgs/development/tools/rust/cargo-fuzz/default.nix
+3
-1
pkgs/development/tools/rust/cargo-fuzz/default.nix
···
1
-
{ lib, fetchFromGitHub, rustPlatform }:
1
+
{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }:
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "cargo-fuzz";
···
12
12
};
13
13
14
14
cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8=";
15
+
16
+
buildInputs = lib.optional stdenv.isDarwin libiconv;
15
17
16
18
doCheck = false;
17
19
+6
-1
pkgs/development/tools/rust/cargo-msrv/default.nix
+6
-1
pkgs/development/tools/rust/cargo-msrv/default.nix
···
4
4
, nix-update-script
5
5
, pkg-config
6
6
, openssl
7
+
, stdenv
8
+
, libiconv
9
+
, Security
7
10
}:
8
11
9
12
rustPlatform.buildRustPackage rec {
···
28
31
# Integration tests fail
29
32
doCheck = false;
30
33
31
-
buildInputs = [ openssl ];
34
+
buildInputs = if stdenv.isDarwin
35
+
then [ libiconv Security ]
36
+
else [ openssl ];
32
37
33
38
nativeBuildInputs = [ pkg-config ];
34
39
+4
-2
pkgs/os-specific/linux/dbus-broker/default.nix
+4
-2
pkgs/os-specific/linux/dbus-broker/default.nix
···
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "dbus-broker";
6
-
version = "22";
6
+
version = "28";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "bus1";
10
10
repo = "dbus-broker";
11
11
rev = "v${version}";
12
-
sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x";
12
+
sha256 = "1rsn74x6yhyl9w7jqgnzgzyhp9cln1602jyzpw5qvrkdk5b7zzgs";
13
13
fetchSubmodules = true;
14
14
};
15
15
16
16
nativeBuildInputs = [ docutils meson ninja pkg-config ];
17
17
18
18
buildInputs = [ dbus linuxHeaders systemd ];
19
+
20
+
mesonFlags = [ "-D=system-console-users=gdm,sddm,lightdm" ];
19
21
20
22
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
21
23
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+4
-3
pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix
+4
-3
pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mbp2018-bridge-drv";
5
-
version = "0.01";
5
+
version = "2020-01-31";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "MCMrARM";
9
9
repo = "mbp2018-bridge-drv";
10
-
rev = "${version}";
11
-
sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53";
10
+
rev = "b43fcc069da73e051072fde24af4014c9c487286";
11
+
sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik=";
12
12
};
13
13
14
14
buildPhase = ''
···
30
30
license = lib.licenses.gpl2Only;
31
31
platforms = platforms.linux;
32
32
maintainers = [ lib.maintainers.hlolli ];
33
+
broken = kernel.kernelOlder "5.4";
33
34
};
34
35
}
-37
pkgs/os-specific/linux/nvidia-x11/default.nix
-37
pkgs/os-specific/linux/nvidia-x11/default.nix
···
14
14
15
15
kernel = callPackage # a hacky way of extracting parameters from callPackage
16
16
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
17
-
18
-
maybePatch_drm_legacy =
19
-
lib.optional (lib.versionOlder "4.14" (kernel.version or "0"))
20
-
(fetchurl {
21
-
url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1"
22
-
+ "/packages/x11/driver/xf86-video-nvidia-legacy/patches/"
23
-
+ "xf86-video-nvidia-legacy-0010-kernel-4.14.patch";
24
-
sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5";
25
-
});
26
17
in
27
18
rec {
28
19
# Policy: use the highest stable version as the default (on our master).
···
72
63
useGLVND = false;
73
64
74
65
patches = [ ./vm_operations_struct-fault.patch ];
75
-
};
76
-
77
-
legacy_304 = generic {
78
-
version = "304.137";
79
-
sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
80
-
sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
81
-
settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj";
82
-
persistencedSha256 = null;
83
-
useGLVND = false;
84
-
useProfiles = false;
85
-
settings32Bit = true;
86
-
87
-
prePatch = let
88
-
debPatches = fetchurl {
89
-
url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
90
-
+ "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
91
-
sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
92
-
};
93
-
prefix = "debian/module/debian/patches";
94
-
applyPatches = pnames: if pnames == [] then null else
95
-
''
96
-
tar xf '${debPatches}'
97
-
sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
98
-
patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
99
-
'';
100
-
in applyPatches [ "fix-typos" ];
101
-
patches = maybePatch_drm_legacy;
102
-
broken = lib.versionAtLeast kernel.version "4.18";
103
66
};
104
67
}
+2
-2
pkgs/tools/audio/abcmidi/default.nix
+2
-2
pkgs/tools/audio/abcmidi/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "abcMIDI";
5
-
version = "2021.04.26";
5
+
version = "2021.05.09";
6
6
7
7
src = fetchzip {
8
8
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
9
-
sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4=";
9
+
sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4=";
10
10
};
11
11
12
12
meta = with lib; {
+791
pkgs/tools/misc/bottom-rs/cargo-lock.patch
+791
pkgs/tools/misc/bottom-rs/cargo-lock.patch
···
1
+
diff --git a/Cargo.lock b/Cargo.lock
2
+
new file mode 100644
3
+
index 0000000..edc9428
4
+
--- /dev/null
5
+
+++ b/Cargo.lock
6
+
@@ -0,0 +1,785 @@
7
+
+# This file is automatically @generated by Cargo.
8
+
+# It is not intended for manual editing.
9
+
+[[package]]
10
+
+name = "ansi_term"
11
+
+version = "0.11.0"
12
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
13
+
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
14
+
+dependencies = [
15
+
+ "winapi",
16
+
+]
17
+
+
18
+
+[[package]]
19
+
+name = "anyhow"
20
+
+version = "1.0.40"
21
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
22
+
+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
23
+
+
24
+
+[[package]]
25
+
+name = "atty"
26
+
+version = "0.2.14"
27
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
28
+
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
29
+
+dependencies = [
30
+
+ "hermit-abi",
31
+
+ "libc",
32
+
+ "winapi",
33
+
+]
34
+
+
35
+
+[[package]]
36
+
+name = "autocfg"
37
+
+version = "1.0.1"
38
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
39
+
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
40
+
+
41
+
+[[package]]
42
+
+name = "bitflags"
43
+
+version = "1.2.1"
44
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
45
+
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
46
+
+
47
+
+[[package]]
48
+
+name = "bottom-bench"
49
+
+version = "0.1.0"
50
+
+dependencies = [
51
+
+ "bottomify",
52
+
+ "criterion",
53
+
+]
54
+
+
55
+
+[[package]]
56
+
+name = "bottomify"
57
+
+version = "1.2.0"
58
+
+dependencies = [
59
+
+ "anyhow",
60
+
+ "clap",
61
+
+ "phf",
62
+
+ "phf_codegen",
63
+
+]
64
+
+
65
+
+[[package]]
66
+
+name = "bstr"
67
+
+version = "0.2.15"
68
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
69
+
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
70
+
+dependencies = [
71
+
+ "lazy_static",
72
+
+ "memchr",
73
+
+ "regex-automata",
74
+
+ "serde",
75
+
+]
76
+
+
77
+
+[[package]]
78
+
+name = "bumpalo"
79
+
+version = "3.6.1"
80
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
81
+
+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
82
+
+
83
+
+[[package]]
84
+
+name = "byteorder"
85
+
+version = "1.4.3"
86
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
87
+
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
88
+
+
89
+
+[[package]]
90
+
+name = "cast"
91
+
+version = "0.2.5"
92
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
93
+
+checksum = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75"
94
+
+dependencies = [
95
+
+ "rustc_version",
96
+
+]
97
+
+
98
+
+[[package]]
99
+
+name = "cfg-if"
100
+
+version = "1.0.0"
101
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
102
+
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
103
+
+
104
+
+[[package]]
105
+
+name = "clap"
106
+
+version = "2.33.3"
107
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
108
+
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
109
+
+dependencies = [
110
+
+ "ansi_term",
111
+
+ "atty",
112
+
+ "bitflags",
113
+
+ "strsim",
114
+
+ "textwrap",
115
+
+ "unicode-width",
116
+
+ "vec_map",
117
+
+]
118
+
+
119
+
+[[package]]
120
+
+name = "criterion"
121
+
+version = "0.3.4"
122
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
123
+
+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
124
+
+dependencies = [
125
+
+ "atty",
126
+
+ "cast",
127
+
+ "clap",
128
+
+ "criterion-plot",
129
+
+ "csv",
130
+
+ "itertools 0.10.0",
131
+
+ "lazy_static",
132
+
+ "num-traits",
133
+
+ "oorandom",
134
+
+ "plotters",
135
+
+ "rayon",
136
+
+ "regex",
137
+
+ "serde",
138
+
+ "serde_cbor",
139
+
+ "serde_derive",
140
+
+ "serde_json",
141
+
+ "tinytemplate",
142
+
+ "walkdir",
143
+
+]
144
+
+
145
+
+[[package]]
146
+
+name = "criterion-plot"
147
+
+version = "0.4.3"
148
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
149
+
+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
150
+
+dependencies = [
151
+
+ "cast",
152
+
+ "itertools 0.9.0",
153
+
+]
154
+
+
155
+
+[[package]]
156
+
+name = "crossbeam-channel"
157
+
+version = "0.5.1"
158
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
159
+
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
160
+
+dependencies = [
161
+
+ "cfg-if",
162
+
+ "crossbeam-utils",
163
+
+]
164
+
+
165
+
+[[package]]
166
+
+name = "crossbeam-deque"
167
+
+version = "0.8.0"
168
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
169
+
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
170
+
+dependencies = [
171
+
+ "cfg-if",
172
+
+ "crossbeam-epoch",
173
+
+ "crossbeam-utils",
174
+
+]
175
+
+
176
+
+[[package]]
177
+
+name = "crossbeam-epoch"
178
+
+version = "0.9.3"
179
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
180
+
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
181
+
+dependencies = [
182
+
+ "cfg-if",
183
+
+ "crossbeam-utils",
184
+
+ "lazy_static",
185
+
+ "memoffset",
186
+
+ "scopeguard",
187
+
+]
188
+
+
189
+
+[[package]]
190
+
+name = "crossbeam-utils"
191
+
+version = "0.8.3"
192
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
193
+
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
194
+
+dependencies = [
195
+
+ "autocfg",
196
+
+ "cfg-if",
197
+
+ "lazy_static",
198
+
+]
199
+
+
200
+
+[[package]]
201
+
+name = "csv"
202
+
+version = "1.1.6"
203
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
204
+
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
205
+
+dependencies = [
206
+
+ "bstr",
207
+
+ "csv-core",
208
+
+ "itoa",
209
+
+ "ryu",
210
+
+ "serde",
211
+
+]
212
+
+
213
+
+[[package]]
214
+
+name = "csv-core"
215
+
+version = "0.1.10"
216
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
217
+
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
218
+
+dependencies = [
219
+
+ "memchr",
220
+
+]
221
+
+
222
+
+[[package]]
223
+
+name = "either"
224
+
+version = "1.6.1"
225
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
226
+
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
227
+
+
228
+
+[[package]]
229
+
+name = "getrandom"
230
+
+version = "0.1.16"
231
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
232
+
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
233
+
+dependencies = [
234
+
+ "cfg-if",
235
+
+ "libc",
236
+
+ "wasi",
237
+
+]
238
+
+
239
+
+[[package]]
240
+
+name = "half"
241
+
+version = "1.7.1"
242
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
243
+
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
244
+
+
245
+
+[[package]]
246
+
+name = "hermit-abi"
247
+
+version = "0.1.18"
248
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
249
+
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
250
+
+dependencies = [
251
+
+ "libc",
252
+
+]
253
+
+
254
+
+[[package]]
255
+
+name = "itertools"
256
+
+version = "0.9.0"
257
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
258
+
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
259
+
+dependencies = [
260
+
+ "either",
261
+
+]
262
+
+
263
+
+[[package]]
264
+
+name = "itertools"
265
+
+version = "0.10.0"
266
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
267
+
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
268
+
+dependencies = [
269
+
+ "either",
270
+
+]
271
+
+
272
+
+[[package]]
273
+
+name = "itoa"
274
+
+version = "0.4.7"
275
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
276
+
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
277
+
+
278
+
+[[package]]
279
+
+name = "js-sys"
280
+
+version = "0.3.50"
281
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
282
+
+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
283
+
+dependencies = [
284
+
+ "wasm-bindgen",
285
+
+]
286
+
+
287
+
+[[package]]
288
+
+name = "lazy_static"
289
+
+version = "1.4.0"
290
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
291
+
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
292
+
+
293
+
+[[package]]
294
+
+name = "libc"
295
+
+version = "0.2.94"
296
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
297
+
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
298
+
+
299
+
+[[package]]
300
+
+name = "log"
301
+
+version = "0.4.14"
302
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
303
+
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
304
+
+dependencies = [
305
+
+ "cfg-if",
306
+
+]
307
+
+
308
+
+[[package]]
309
+
+name = "memchr"
310
+
+version = "2.3.4"
311
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
312
+
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
313
+
+
314
+
+[[package]]
315
+
+name = "memoffset"
316
+
+version = "0.6.3"
317
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
318
+
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
319
+
+dependencies = [
320
+
+ "autocfg",
321
+
+]
322
+
+
323
+
+[[package]]
324
+
+name = "num-traits"
325
+
+version = "0.2.14"
326
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
327
+
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
328
+
+dependencies = [
329
+
+ "autocfg",
330
+
+]
331
+
+
332
+
+[[package]]
333
+
+name = "num_cpus"
334
+
+version = "1.13.0"
335
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
336
+
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
337
+
+dependencies = [
338
+
+ "hermit-abi",
339
+
+ "libc",
340
+
+]
341
+
+
342
+
+[[package]]
343
+
+name = "oorandom"
344
+
+version = "11.1.3"
345
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
346
+
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
347
+
+
348
+
+[[package]]
349
+
+name = "phf"
350
+
+version = "0.8.0"
351
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
352
+
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
353
+
+dependencies = [
354
+
+ "phf_shared",
355
+
+]
356
+
+
357
+
+[[package]]
358
+
+name = "phf_codegen"
359
+
+version = "0.8.0"
360
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
361
+
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
362
+
+dependencies = [
363
+
+ "phf_generator",
364
+
+ "phf_shared",
365
+
+]
366
+
+
367
+
+[[package]]
368
+
+name = "phf_generator"
369
+
+version = "0.8.0"
370
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
371
+
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
372
+
+dependencies = [
373
+
+ "phf_shared",
374
+
+ "rand",
375
+
+]
376
+
+
377
+
+[[package]]
378
+
+name = "phf_shared"
379
+
+version = "0.8.0"
380
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
381
+
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
382
+
+dependencies = [
383
+
+ "siphasher",
384
+
+]
385
+
+
386
+
+[[package]]
387
+
+name = "plotters"
388
+
+version = "0.3.0"
389
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
390
+
+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
391
+
+dependencies = [
392
+
+ "num-traits",
393
+
+ "plotters-backend",
394
+
+ "plotters-svg",
395
+
+ "wasm-bindgen",
396
+
+ "web-sys",
397
+
+]
398
+
+
399
+
+[[package]]
400
+
+name = "plotters-backend"
401
+
+version = "0.3.0"
402
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
403
+
+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
404
+
+
405
+
+[[package]]
406
+
+name = "plotters-svg"
407
+
+version = "0.3.0"
408
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
409
+
+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
410
+
+dependencies = [
411
+
+ "plotters-backend",
412
+
+]
413
+
+
414
+
+[[package]]
415
+
+name = "ppv-lite86"
416
+
+version = "0.2.10"
417
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
418
+
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
419
+
+
420
+
+[[package]]
421
+
+name = "proc-macro2"
422
+
+version = "1.0.26"
423
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
424
+
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
425
+
+dependencies = [
426
+
+ "unicode-xid",
427
+
+]
428
+
+
429
+
+[[package]]
430
+
+name = "quote"
431
+
+version = "1.0.9"
432
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
433
+
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
434
+
+dependencies = [
435
+
+ "proc-macro2",
436
+
+]
437
+
+
438
+
+[[package]]
439
+
+name = "rand"
440
+
+version = "0.7.3"
441
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
442
+
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
443
+
+dependencies = [
444
+
+ "getrandom",
445
+
+ "libc",
446
+
+ "rand_chacha",
447
+
+ "rand_core",
448
+
+ "rand_hc",
449
+
+ "rand_pcg",
450
+
+]
451
+
+
452
+
+[[package]]
453
+
+name = "rand_chacha"
454
+
+version = "0.2.2"
455
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
456
+
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
457
+
+dependencies = [
458
+
+ "ppv-lite86",
459
+
+ "rand_core",
460
+
+]
461
+
+
462
+
+[[package]]
463
+
+name = "rand_core"
464
+
+version = "0.5.1"
465
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
466
+
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
467
+
+dependencies = [
468
+
+ "getrandom",
469
+
+]
470
+
+
471
+
+[[package]]
472
+
+name = "rand_hc"
473
+
+version = "0.2.0"
474
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
475
+
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
476
+
+dependencies = [
477
+
+ "rand_core",
478
+
+]
479
+
+
480
+
+[[package]]
481
+
+name = "rand_pcg"
482
+
+version = "0.2.1"
483
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
484
+
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
485
+
+dependencies = [
486
+
+ "rand_core",
487
+
+]
488
+
+
489
+
+[[package]]
490
+
+name = "rayon"
491
+
+version = "1.5.0"
492
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
493
+
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
494
+
+dependencies = [
495
+
+ "autocfg",
496
+
+ "crossbeam-deque",
497
+
+ "either",
498
+
+ "rayon-core",
499
+
+]
500
+
+
501
+
+[[package]]
502
+
+name = "rayon-core"
503
+
+version = "1.9.0"
504
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
505
+
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
506
+
+dependencies = [
507
+
+ "crossbeam-channel",
508
+
+ "crossbeam-deque",
509
+
+ "crossbeam-utils",
510
+
+ "lazy_static",
511
+
+ "num_cpus",
512
+
+]
513
+
+
514
+
+[[package]]
515
+
+name = "regex"
516
+
+version = "1.4.6"
517
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
518
+
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
519
+
+dependencies = [
520
+
+ "regex-syntax",
521
+
+]
522
+
+
523
+
+[[package]]
524
+
+name = "regex-automata"
525
+
+version = "0.1.9"
526
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
527
+
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
528
+
+dependencies = [
529
+
+ "byteorder",
530
+
+]
531
+
+
532
+
+[[package]]
533
+
+name = "regex-syntax"
534
+
+version = "0.6.23"
535
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
536
+
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
537
+
+
538
+
+[[package]]
539
+
+name = "rustc_version"
540
+
+version = "0.2.3"
541
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
542
+
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
543
+
+dependencies = [
544
+
+ "semver",
545
+
+]
546
+
+
547
+
+[[package]]
548
+
+name = "ryu"
549
+
+version = "1.0.5"
550
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
551
+
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
552
+
+
553
+
+[[package]]
554
+
+name = "same-file"
555
+
+version = "1.0.6"
556
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
557
+
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
558
+
+dependencies = [
559
+
+ "winapi-util",
560
+
+]
561
+
+
562
+
+[[package]]
563
+
+name = "scopeguard"
564
+
+version = "1.1.0"
565
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
566
+
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
567
+
+
568
+
+[[package]]
569
+
+name = "semver"
570
+
+version = "0.9.0"
571
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
572
+
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
573
+
+dependencies = [
574
+
+ "semver-parser",
575
+
+]
576
+
+
577
+
+[[package]]
578
+
+name = "semver-parser"
579
+
+version = "0.7.0"
580
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
581
+
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
582
+
+
583
+
+[[package]]
584
+
+name = "serde"
585
+
+version = "1.0.125"
586
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
587
+
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
588
+
+
589
+
+[[package]]
590
+
+name = "serde_cbor"
591
+
+version = "0.11.1"
592
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
593
+
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
594
+
+dependencies = [
595
+
+ "half",
596
+
+ "serde",
597
+
+]
598
+
+
599
+
+[[package]]
600
+
+name = "serde_derive"
601
+
+version = "1.0.125"
602
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
603
+
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
604
+
+dependencies = [
605
+
+ "proc-macro2",
606
+
+ "quote",
607
+
+ "syn",
608
+
+]
609
+
+
610
+
+[[package]]
611
+
+name = "serde_json"
612
+
+version = "1.0.64"
613
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
614
+
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
615
+
+dependencies = [
616
+
+ "itoa",
617
+
+ "ryu",
618
+
+ "serde",
619
+
+]
620
+
+
621
+
+[[package]]
622
+
+name = "siphasher"
623
+
+version = "0.3.5"
624
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
625
+
+checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27"
626
+
+
627
+
+[[package]]
628
+
+name = "strsim"
629
+
+version = "0.8.0"
630
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
631
+
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
632
+
+
633
+
+[[package]]
634
+
+name = "syn"
635
+
+version = "1.0.70"
636
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
637
+
+checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
638
+
+dependencies = [
639
+
+ "proc-macro2",
640
+
+ "quote",
641
+
+ "unicode-xid",
642
+
+]
643
+
+
644
+
+[[package]]
645
+
+name = "textwrap"
646
+
+version = "0.11.0"
647
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
648
+
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
649
+
+dependencies = [
650
+
+ "unicode-width",
651
+
+]
652
+
+
653
+
+[[package]]
654
+
+name = "tinytemplate"
655
+
+version = "1.2.1"
656
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
657
+
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
658
+
+dependencies = [
659
+
+ "serde",
660
+
+ "serde_json",
661
+
+]
662
+
+
663
+
+[[package]]
664
+
+name = "unicode-width"
665
+
+version = "0.1.8"
666
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
667
+
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
668
+
+
669
+
+[[package]]
670
+
+name = "unicode-xid"
671
+
+version = "0.2.1"
672
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
673
+
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
674
+
+
675
+
+[[package]]
676
+
+name = "vec_map"
677
+
+version = "0.8.2"
678
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
679
+
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
680
+
+
681
+
+[[package]]
682
+
+name = "walkdir"
683
+
+version = "2.3.2"
684
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
685
+
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
686
+
+dependencies = [
687
+
+ "same-file",
688
+
+ "winapi",
689
+
+ "winapi-util",
690
+
+]
691
+
+
692
+
+[[package]]
693
+
+name = "wasi"
694
+
+version = "0.9.0+wasi-snapshot-preview1"
695
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
696
+
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
697
+
+
698
+
+[[package]]
699
+
+name = "wasm-bindgen"
700
+
+version = "0.2.73"
701
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
702
+
+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
703
+
+dependencies = [
704
+
+ "cfg-if",
705
+
+ "wasm-bindgen-macro",
706
+
+]
707
+
+
708
+
+[[package]]
709
+
+name = "wasm-bindgen-backend"
710
+
+version = "0.2.73"
711
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
712
+
+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
713
+
+dependencies = [
714
+
+ "bumpalo",
715
+
+ "lazy_static",
716
+
+ "log",
717
+
+ "proc-macro2",
718
+
+ "quote",
719
+
+ "syn",
720
+
+ "wasm-bindgen-shared",
721
+
+]
722
+
+
723
+
+[[package]]
724
+
+name = "wasm-bindgen-macro"
725
+
+version = "0.2.73"
726
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
727
+
+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
728
+
+dependencies = [
729
+
+ "quote",
730
+
+ "wasm-bindgen-macro-support",
731
+
+]
732
+
+
733
+
+[[package]]
734
+
+name = "wasm-bindgen-macro-support"
735
+
+version = "0.2.73"
736
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
737
+
+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
738
+
+dependencies = [
739
+
+ "proc-macro2",
740
+
+ "quote",
741
+
+ "syn",
742
+
+ "wasm-bindgen-backend",
743
+
+ "wasm-bindgen-shared",
744
+
+]
745
+
+
746
+
+[[package]]
747
+
+name = "wasm-bindgen-shared"
748
+
+version = "0.2.73"
749
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
750
+
+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
751
+
+
752
+
+[[package]]
753
+
+name = "web-sys"
754
+
+version = "0.3.50"
755
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
756
+
+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
757
+
+dependencies = [
758
+
+ "js-sys",
759
+
+ "wasm-bindgen",
760
+
+]
761
+
+
762
+
+[[package]]
763
+
+name = "winapi"
764
+
+version = "0.3.9"
765
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
766
+
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
767
+
+dependencies = [
768
+
+ "winapi-i686-pc-windows-gnu",
769
+
+ "winapi-x86_64-pc-windows-gnu",
770
+
+]
771
+
+
772
+
+[[package]]
773
+
+name = "winapi-i686-pc-windows-gnu"
774
+
+version = "0.4.0"
775
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
776
+
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
777
+
+
778
+
+[[package]]
779
+
+name = "winapi-util"
780
+
+version = "0.1.5"
781
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
782
+
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
783
+
+dependencies = [
784
+
+ "winapi",
785
+
+]
786
+
+
787
+
+[[package]]
788
+
+name = "winapi-x86_64-pc-windows-gnu"
789
+
+version = "0.4.0"
790
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
791
+
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+23
pkgs/tools/misc/bottom-rs/default.nix
+23
pkgs/tools/misc/bottom-rs/default.nix
···
1
+
{ lib, rustPlatform, fetchFromGitHub }:
2
+
3
+
rustPlatform.buildRustPackage rec {
4
+
pname = "bottom-rs";
5
+
version = "unstable-2021-04-27";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "bottom-software-foundation";
9
+
repo = pname;
10
+
rev = "3451cdadd7c4e64fe8e7f43e986a18628a741dec";
11
+
sha256 = "0kr18q80021s1n9zzzff6w6yvbbjnk6zbbabi5b42b0rfv6fnfn2";
12
+
};
13
+
14
+
cargoPatches = [ ./cargo-lock.patch ];
15
+
cargoSha256 = "0nyzg6pg69bf9vvc3r5lnhmkb9s1508c1gqcra3y43zffdlwml1y";
16
+
17
+
meta = with lib; {
18
+
description = "Fantastic (maybe) CLI for translating between bottom and human-readable text";
19
+
homepage = "https://github.com/bottom-software-foundation/bottom-rs";
20
+
license = licenses.mit;
21
+
maintainers = with maintainers; [ winterqt ];
22
+
};
23
+
}
+14
-22
pkgs/tools/misc/etcher/default.nix
+14
-22
pkgs/tools/misc/etcher/default.nix
···
2
2
, fetchurl
3
3
, gcc-unwrapped
4
4
, dpkg
5
-
, polkit
6
5
, util-linux
7
6
, bash
8
-
, nodePackages
9
7
, makeWrapper
10
-
, electron_7
8
+
, electron_12
11
9
}:
12
10
13
11
let
14
12
sha256 = {
15
-
"x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk";
16
-
"i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8";
13
+
"x86_64-linux" = "03nxcafg405vcs4sb5qhpm5aqaai87d9ksqkl37mmzf6g0n4qbih";
14
+
"i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1";
17
15
}."${stdenv.system}";
18
16
19
17
arch = {
···
21
19
"i686-linux" = "i386";
22
20
}."${stdenv.system}";
23
21
24
-
electron = electron_7;
22
+
electron = electron_12;
25
23
26
24
in
27
25
28
26
stdenv.mkDerivation rec {
29
27
pname = "etcher";
30
-
version = "1.5.86";
28
+
version = "1.5.117";
31
29
32
30
src = fetchurl {
33
31
url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb";
34
32
inherit sha256;
35
33
};
36
34
37
-
dontBuild = true;
35
+
nativeBuildInputs = [ makeWrapper ];
36
+
38
37
dontConfigure = true;
39
-
40
-
nativeBuildInputs = [ makeWrapper ];
38
+
dontBuild = true;
41
39
42
40
unpackPhase = ''
43
41
${dpkg}/bin/dpkg-deb -x $src .
···
45
43
46
44
# sudo-prompt has hardcoded binary paths on Linux and we patch them here
47
45
# along with some other paths
48
-
patchPhase = ''
49
-
${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp
46
+
postPatch = ''
50
47
# use Nix(OS) paths
51
-
sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js
52
-
sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js
53
-
sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
54
-
sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js
55
-
${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar
56
-
rm -rf tmp
48
+
substituteInPlace opt/balenaEtcher/resources/app/generated/gui.js \
49
+
--replace '/usr/bin/pkexec' '/usr/bin/pkexec", "/run/wrappers/bin/pkexec' \
50
+
--replace '/bin/bash' '${bash}/bin/bash' \
51
+
--replace '"lsblk"' '"${util-linux}/bin/lsblk"'
57
52
'';
58
53
59
54
installPhase = ''
···
64
59
cp -a usr/share/* $out/share
65
60
cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname}
66
61
67
-
substituteInPlace $out/share/applications/balena-etcher-electron.desktop \
68
-
--replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}'
69
-
70
62
runHook postInstall
71
63
'';
72
64
73
65
postFixup = ''
74
66
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
75
-
--add-flags $out/share/${pname}/resources/app.asar \
67
+
--add-flags $out/share/${pname}/resources/app \
76
68
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
77
69
'';
78
70
+3
-3
pkgs/tools/networking/findomain/default.nix
+3
-3
pkgs/tools/networking/findomain/default.nix
···
9
9
10
10
rustPlatform.buildRustPackage rec {
11
11
pname = "findomain";
12
-
version = "4.1.0";
12
+
version = "4.1.1";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "Edu4rdSHL";
16
16
repo = pname;
17
17
rev = version;
18
-
sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8=";
18
+
sha256 = "sha256-ySpkWAhLS4jPFviKnzcnW7vuUFyojTBhooq7CFz/y3w=";
19
19
};
20
20
21
-
cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g=";
21
+
cargoSha256 = "sha256-KWh++MHaCJpJq7mS2lRCUh0nN+e8McKWcTknUC8VFuo=";
22
22
23
23
nativeBuildInputs = [ installShellFiles perl ];
24
24
buildInputs = lib.optional stdenv.isDarwin Security;
+3
-1
pkgs/tools/package-management/cargo-about/default.nix
+3
-1
pkgs/tools/package-management/cargo-about/default.nix
···
1
-
{ lib, rustPlatform, fetchFromGitHub }:
1
+
{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
2
2
rustPlatform.buildRustPackage rec {
3
3
pname = "cargo-about";
4
4
version = "0.3.0";
···
11
11
};
12
12
13
13
cargoSha256 = "sha256-ssAmY+o+/2+C9sol+PeFlpNwVuN5JNoofgkr3cUW+S4=";
14
+
15
+
buildInputs = lib.optional stdenv.isDarwin libiconv;
14
16
15
17
meta = with lib; {
16
18
description = "Cargo plugin to generate list of all licenses for a crate";
+2
pkgs/tools/security/hashcat/default.nix
+2
pkgs/tools/security/hashcat/default.nix
···
28
28
29
29
preFixup = ''
30
30
for f in $out/share/hashcat/OpenCL/*.cl; do
31
+
# Rewrite files to be included for compilation at runtime for opencl offload
31
32
sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f"
33
+
sed "s|#define COMPARE_\([SM]\) \"\(.*\.cl\)\"|#define COMPARE_\1 \"$out/share/hashcat/OpenCL/\2\"|g" -i "$f"
32
34
done
33
35
'';
34
36
+5
-2
pkgs/top-level/all-packages.nix
+5
-2
pkgs/top-level/all-packages.nix
···
1934
1934
1935
1935
buildpack = callPackage ../development/tools/buildpack { };
1936
1936
1937
+
bottom-rs = callPackage ../tools/misc/bottom-rs { };
1938
+
1937
1939
buildtorrent = callPackage ../tools/misc/buildtorrent { };
1938
1940
1939
1941
bustle = haskellPackages.bustle;
···
11542
11544
cargo-make = callPackage ../development/tools/rust/cargo-make {
11543
11545
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
11544
11546
};
11545
-
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { };
11547
+
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
11548
+
inherit (darwin.apple_sdk.frameworks) Security;
11549
+
};
11546
11550
cargo-play = callPackage ../development/tools/rust/cargo-play { };
11547
11551
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
11548
11552
inherit (darwin.apple_sdk.frameworks) Security;
···
20308
20312
20309
20313
nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
20310
20314
20311
-
nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
20312
20315
nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
20313
20316
nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
20314
20317
nvidia_x11_beta = nvidiaPackages.beta;