commit
e76e5ab75f
@ -1,35 +0,0 @@ |
|||||||
From 5dd2593369645b11a9dc03e1930617d2f5dbd039 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
||||||
Date: Wed, 11 Nov 2020 11:48:49 +0100
|
|
||||||
Subject: [PATCH] hardcode json file path
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
|
||||||
---
|
|
||||||
wee_slack.py | 8 +-------
|
|
||||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/wee_slack.py b/wee_slack.py
|
|
||||||
index a3d779c..5942289 100644
|
|
||||||
--- a/wee_slack.py
|
|
||||||
+++ b/wee_slack.py
|
|
||||||
@@ -5136,13 +5136,7 @@ def create_slack_debug_buffer():
|
|
||||||
|
|
||||||
def load_emoji():
|
|
||||||
try:
|
|
||||||
- weechat_dir = w.info_get('weechat_dir', '')
|
|
||||||
- weechat_sharedir = w.info_get('weechat_sharedir', '')
|
|
||||||
- local_weemoji, global_weemoji = ('{}/weemoji.json'.format(path)
|
|
||||||
- for path in (weechat_dir, weechat_sharedir))
|
|
||||||
- path = (global_weemoji if os.path.exists(global_weemoji) and
|
|
||||||
- not os.path.exists(local_weemoji) else local_weemoji)
|
|
||||||
- with open(path, 'r') as ef:
|
|
||||||
+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
|
|
||||||
emojis = json.loads(ef.read())
|
|
||||||
if 'emoji' in emojis:
|
|
||||||
print_error('The weemoji.json file is in an old format. Please update it.')
|
|
||||||
--
|
|
||||||
2.29.0
|
|
||||||
|
|
@ -1,13 +1,13 @@ |
|||||||
diff --git a/wee_slack.py b/wee_slack.py
|
diff --git a/wee_slack.py b/wee_slack.py
|
||||||
index dbe6446..d1b7546 100644
|
index e4716b4..f673b7c 100644
|
||||||
--- a/wee_slack.py
|
--- a/wee_slack.py
|
||||||
+++ b/wee_slack.py
|
+++ b/wee_slack.py
|
||||||
@@ -25,6 +25,8 @@ import random
|
@@ -31,6 +31,8 @@ import string
|
||||||
import socket
|
# See https://github.com/numpy/numpy/issues/11925
|
||||||
import string
|
sys.modules["numpy"] = None
|
||||||
|
|
||||||
+sys.path.append('@env@')
|
+sys.path.append('@env@')
|
||||||
+
|
+
|
||||||
from websocket import ABNF, create_connection, WebSocketConnectionClosedException
|
from websocket import ( # noqa: E402
|
||||||
|
ABNF,
|
||||||
try:
|
create_connection,
|
||||||
|
@ -0,0 +1,25 @@ |
|||||||
|
diff --git a/wee_slack.py b/wee_slack.py
|
||||||
|
index e4716b4..ffd122d 100644
|
||||||
|
--- a/wee_slack.py
|
||||||
|
+++ b/wee_slack.py
|
||||||
|
@@ -6092,19 +6092,7 @@ def create_slack_debug_buffer():
|
||||||
|
|
||||||
|
def load_emoji():
|
||||||
|
try:
|
||||||
|
- weechat_dir = w.info_get("weechat_data_dir", "") or w.info_get(
|
||||||
|
- "weechat_dir", ""
|
||||||
|
- )
|
||||||
|
- weechat_sharedir = w.info_get("weechat_sharedir", "")
|
||||||
|
- local_weemoji, global_weemoji = (
|
||||||
|
- "{}/weemoji.json".format(path) for path in (weechat_dir, weechat_sharedir)
|
||||||
|
- )
|
||||||
|
- path = (
|
||||||
|
- global_weemoji
|
||||||
|
- if os.path.exists(global_weemoji) and not os.path.exists(local_weemoji)
|
||||||
|
- else local_weemoji
|
||||||
|
- )
|
||||||
|
- with open(path, "r") as ef:
|
||||||
|
+ with open("@out@/share/wee-slack/weemoji.json", "r") as ef:
|
||||||
|
emojis = json.loads(ef.read())
|
||||||
|
if "emoji" in emojis:
|
||||||
|
print_error(
|
@ -0,0 +1,14 @@ |
|||||||
|
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
index 00bd60bc24bb..17416b0bd3c0 100644
|
||||||
|
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
|
||||||
|
// as gold requires -plugin to come before any -plugin-opt that -Wl might
|
||||||
|
// forward.
|
||||||
|
CmdArgs.push_back("-plugin");
|
||||||
|
- std::string Plugin =
|
||||||
|
- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so";
|
||||||
|
+ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so";
|
||||||
|
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
||||||
|
|
||||||
|
// Try to pass driver level flags relevant to LTO code generation down to
|
@ -0,0 +1,13 @@ |
|||||||
|
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
index 6b6e276b8ce7..7896542a1202 100644
|
||||||
|
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
|
||||||
|
|
||||||
|
SmallString<1024> Plugin;
|
||||||
|
llvm::sys::path::native(
|
||||||
|
- Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix,
|
||||||
|
+ Twine("@libllvmLibdir@" "/LLVMgold") + Suffix,
|
||||||
|
Plugin);
|
||||||
|
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
||||||
|
}
|
@ -0,0 +1,15 @@ |
|||||||
|
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
index 37ec73468570..b73e75aa6e59 100644
|
||||||
|
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||||
|
@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
SmallString<1024> Plugin;
|
||||||
|
- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) +
|
||||||
|
- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" +
|
||||||
|
+ llvm::sys::path::native(Twine("@libllvmLibdir@"
|
||||||
|
+ "/LLVMgold") +
|
||||||
|
Suffix,
|
||||||
|
Plugin);
|
||||||
|
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
@ -0,0 +1,13 @@ |
|||||||
|
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200
|
||||||
|
+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200
|
||||||
|
@@ -333,7 +333,7 @@
|
||||||
|
# So, try first to find the CMake module provided by libxml2 package, then fallback
|
||||||
|
# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially
|
||||||
|
# in static build case).
|
||||||
|
-find_package(LibXml2 QUIET NO_MODULE)
|
||||||
|
+find_package(LibXml2 QUIET MODULE)
|
||||||
|
if(DEFINED LIBXML2_VERSION_STRING)
|
||||||
|
set(LIBXML2_FOUND ON)
|
||||||
|
set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
|
||||||
|
Seulement dans b: good.patch
|
@ -0,0 +1,13 @@ |
|||||||
|
diff -Naur a/configure.ac b/configure.ac
|
||||||
|
--- a/configure.ac 2008-04-23 20:37:42.000000000 +0900
|
||||||
|
+++ b/configure.ac 2021-05-16 01:28:24.000000000 +0900
|
||||||
|
@@ -46,9 +46,7 @@
|
||||||
|
|
||||||
|
# Checks for library functions.
|
||||||
|
AC_FUNC_CHOWN
|
||||||
|
-AC_FUNC_MALLOC
|
||||||
|
AC_FUNC_MKTIME
|
||||||
|
-AC_FUNC_REALLOC
|
||||||
|
AC_FUNC_SELECT_ARGTYPES
|
||||||
|
AC_FUNC_STRFTIME
|
||||||
|
AC_FUNC_UTIME_NULL
|
@ -1,513 +0,0 @@ |
|||||||
diff --git a/Cargo.lock b/Cargo.lock
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..1dff162
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Cargo.lock
|
|
||||||
@@ -0,0 +1,507 @@
|
|
||||||
+# This file is automatically @generated by Cargo.
|
|
||||||
+# It is not intended for manual editing.
|
|
||||||
+[[package]]
|
|
||||||
+name = "ansi_term"
|
|
||||||
+version = "0.11.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
|
||||||
+dependencies = [
|
|
||||||
+ "winapi",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "anyhow"
|
|
||||||
+version = "1.0.34"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "arrayref"
|
|
||||||
+version = "0.3.6"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "arrayvec"
|
|
||||||
+version = "0.5.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
|
||||||
+
|
|
||||||
+[[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 = "b3sum"
|
|
||||||
+version = "0.3.7"
|
|
||||||
+dependencies = [
|
|
||||||
+ "anyhow",
|
|
||||||
+ "blake3",
|
|
||||||
+ "clap",
|
|
||||||
+ "duct",
|
|
||||||
+ "hex",
|
|
||||||
+ "memmap",
|
|
||||||
+ "rayon",
|
|
||||||
+ "tempfile",
|
|
||||||
+ "wild",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "bitflags"
|
|
||||||
+version = "1.2.1"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "blake3"
|
|
||||||
+version = "0.3.7"
|
|
||||||
+dependencies = [
|
|
||||||
+ "arrayref",
|
|
||||||
+ "arrayvec",
|
|
||||||
+ "cc",
|
|
||||||
+ "cfg-if 0.1.10",
|
|
||||||
+ "constant_time_eq",
|
|
||||||
+ "crypto-mac",
|
|
||||||
+ "digest",
|
|
||||||
+ "rayon",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "cc"
|
|
||||||
+version = "1.0.62"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
|
|
||||||
+
|
|
||||||
+[[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 = [
|
|
||||||
+ "ansi_term",
|
|
||||||
+ "atty",
|
|
||||||
+ "bitflags",
|
|
||||||
+ "strsim",
|
|
||||||
+ "textwrap",
|
|
||||||
+ "unicode-width",
|
|
||||||
+ "vec_map",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "const_fn"
|
|
||||||
+version = "0.4.3"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "constant_time_eq"
|
|
||||||
+version = "0.1.5"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
|
||||||
+
|
|
||||||
+[[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",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[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",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "crossbeam-epoch"
|
|
||||||
+version = "0.9.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
|
|
||||||
+dependencies = [
|
|
||||||
+ "cfg-if 1.0.0",
|
|
||||||
+ "const_fn",
|
|
||||||
+ "crossbeam-utils",
|
|
||||||
+ "lazy_static",
|
|
||||||
+ "memoffset",
|
|
||||||
+ "scopeguard",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "crossbeam-utils"
|
|
||||||
+version = "0.8.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
|
|
||||||
+dependencies = [
|
|
||||||
+ "autocfg",
|
|
||||||
+ "cfg-if 1.0.0",
|
|
||||||
+ "const_fn",
|
|
||||||
+ "lazy_static",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "crypto-mac"
|
|
||||||
+version = "0.8.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
|
|
||||||
+dependencies = [
|
|
||||||
+ "generic-array",
|
|
||||||
+ "subtle",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "digest"
|
|
||||||
+version = "0.9.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
|
|
||||||
+dependencies = [
|
|
||||||
+ "generic-array",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "duct"
|
|
||||||
+version = "0.13.4"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "f90a9c3a25aafbd538c7d40a53f83c4487ee8216c12d1c8ef2c01eb2f6ea1553"
|
|
||||||
+dependencies = [
|
|
||||||
+ "libc",
|
|
||||||
+ "once_cell",
|
|
||||||
+ "os_pipe",
|
|
||||||
+ "shared_child",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "either"
|
|
||||||
+version = "1.6.1"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "generic-array"
|
|
||||||
+version = "0.14.4"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
|
|
||||||
+dependencies = [
|
|
||||||
+ "typenum",
|
|
||||||
+ "version_check",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "getrandom"
|
|
||||||
+version = "0.1.15"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
|
|
||||||
+dependencies = [
|
|
||||||
+ "cfg-if 0.1.10",
|
|
||||||
+ "libc",
|
|
||||||
+ "wasi",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "glob"
|
|
||||||
+version = "0.3.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "hermit-abi"
|
|
||||||
+version = "0.1.17"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
|
|
||||||
+dependencies = [
|
|
||||||
+ "libc",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "hex"
|
|
||||||
+version = "0.4.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
|
|
||||||
+
|
|
||||||
+[[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.80"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
|
|
||||||
+
|
|
||||||
+[[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.5.6"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
|
|
||||||
+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 = "once_cell"
|
|
||||||
+version = "1.5.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "os_pipe"
|
|
||||||
+version = "0.9.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213"
|
|
||||||
+dependencies = [
|
|
||||||
+ "libc",
|
|
||||||
+ "winapi",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "ppv-lite86"
|
|
||||||
+version = "0.2.10"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "rand"
|
|
||||||
+version = "0.7.3"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
|
||||||
+dependencies = [
|
|
||||||
+ "getrandom",
|
|
||||||
+ "libc",
|
|
||||||
+ "rand_chacha",
|
|
||||||
+ "rand_core",
|
|
||||||
+ "rand_hc",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[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",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "rand_core"
|
|
||||||
+version = "0.5.1"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
|
||||||
+dependencies = [
|
|
||||||
+ "getrandom",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "rand_hc"
|
|
||||||
+version = "0.2.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
|
||||||
+dependencies = [
|
|
||||||
+ "rand_core",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[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",
|
|
||||||
+ "crossbeam-deque",
|
|
||||||
+ "crossbeam-utils",
|
|
||||||
+ "lazy_static",
|
|
||||||
+ "num_cpus",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "redox_syscall"
|
|
||||||
+version = "0.1.57"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
|
||||||
+
|
|
||||||
+[[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 = "scopeguard"
|
|
||||||
+version = "1.1.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "shared_child"
|
|
||||||
+version = "0.3.4"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2"
|
|
||||||
+dependencies = [
|
|
||||||
+ "libc",
|
|
||||||
+ "winapi",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "strsim"
|
|
||||||
+version = "0.8.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "subtle"
|
|
||||||
+version = "2.3.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "tempfile"
|
|
||||||
+version = "3.1.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
|
|
||||||
+dependencies = [
|
|
||||||
+ "cfg-if 0.1.10",
|
|
||||||
+ "libc",
|
|
||||||
+ "rand",
|
|
||||||
+ "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 = "typenum"
|
|
||||||
+version = "1.12.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "unicode-width"
|
|
||||||
+version = "0.1.8"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "vec_map"
|
|
||||||
+version = "0.8.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "version_check"
|
|
||||||
+version = "0.9.2"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "wasi"
|
|
||||||
+version = "0.9.0+wasi-snapshot-preview1"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
|
||||||
+
|
|
||||||
+[[package]]
|
|
||||||
+name = "wild"
|
|
||||||
+version = "2.0.4"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020"
|
|
||||||
+dependencies = [
|
|
||||||
+ "glob",
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
+[[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-x86_64-pc-windows-gnu"
|
|
||||||
+version = "0.4.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
@ -1,19 +0,0 @@ |
|||||||
#!/bin/sh |
|
||||||
|
|
||||||
# This updates cargo-lock.patch for the b3sum version listed in default.nix. |
|
||||||
|
|
||||||
set -eu -o verbose |
|
||||||
|
|
||||||
here=$PWD |
|
||||||
version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) |
|
||||||
checkout=$(mktemp -d) |
|
||||||
git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout" |
|
||||||
cd "$checkout" |
|
||||||
|
|
||||||
(cd b3sum && cargo generate-lockfile) |
|
||||||
mv b3sum/Cargo.lock ./ |
|
||||||
git add -f Cargo.lock |
|
||||||
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch |
|
||||||
|
|
||||||
cd "$here" |
|
||||||
rm -rf "$checkout" |
|
Loading…
Reference in new issue