mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
treewide: remove redundant patches and locks
These files are no longer referenced.
This commit is contained in:
aleksana
parent
9f737b7fbe
commit
b74fdd2386
@ -1,49 +0,0 @@
|
||||
diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp
|
||||
index d349f4b..b00ec83 100644
|
||||
--- a/src/MACLib/APELink.cpp
|
||||
+++ b/src/MACLib/APELink.cpp
|
||||
@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
|
||||
if (pData != NULL)
|
||||
{
|
||||
// parse out the information
|
||||
- char * pHeader = strstr(pData, APE_LINK_HEADER);
|
||||
- char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
|
||||
- char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
|
||||
- char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
|
||||
+ const char * pHeader = strstr(pData, APE_LINK_HEADER);
|
||||
+ const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
|
||||
+ const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
|
||||
+ const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
|
||||
|
||||
if (pHeader && pImageFile && pStartBlock && pFinishBlock)
|
||||
{
|
||||
@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
|
||||
|
||||
// get the path
|
||||
char cImageFile[MAX_PATH + 1]; int nIndex = 0;
|
||||
- char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
|
||||
+ const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
|
||||
while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
|
||||
cImageFile[nIndex++] = *pImageCharacter++;
|
||||
cImageFile[nIndex] = 0;
|
||||
diff --git a/src/Shared/All.h b/src/Shared/All.h
|
||||
index 328addc..7730e89 100644
|
||||
--- a/src/Shared/All.h
|
||||
+++ b/src/Shared/All.h
|
||||
@@ -21,6 +21,8 @@ Global includes
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
#ifdef _WIN32
|
||||
#include <mmsystem.h>
|
||||
#include <tchar.h>
|
||||
@@ -34,7 +36,6 @@ Global includes
|
||||
#include "NoWindows.h"
|
||||
#endif
|
||||
|
||||
-#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h
|
||||
index fce901b..1f73c5e 100644
|
||||
--- a/intern/smoke/intern/WAVELET_NOISE.h
|
||||
+++ b/intern/smoke/intern/WAVELET_NOISE.h
|
||||
@@ -43,6 +43,7 @@
|
||||
#ifndef WAVELET_NOISE_H
|
||||
#define WAVELET_NOISE_H
|
||||
|
||||
+#include <string.h>
|
||||
#include <MERSENNETWISTER.h>
|
||||
|
||||
#ifdef WIN32
|
||||
@ -1,100 +0,0 @@
|
||||
diff --git a/back.c b/back.c
|
||||
index c1810dc..75416fb 100644
|
||||
--- a/back.c
|
||||
+++ b/back.c
|
||||
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "cfgfile.h"
|
||||
#include "cmd.h"
|
||||
|
||||
-#define CFGFILE "/etc/spnavrc"
|
||||
|
||||
int get_daemon_pid(void);
|
||||
static int update_cfg(void);
|
||||
@@ -127,7 +126,7 @@ int get_daemon_pid(void)
|
||||
|
||||
static int update_cfg(void)
|
||||
{
|
||||
- if(write_cfg(CFGFILE, &cfg) == -1) {
|
||||
+ if(write_cfg(cfg_path(), &cfg) == -1) {
|
||||
fprintf(stderr, "failed to update config file\n");
|
||||
return -1;
|
||||
}
|
||||
diff --git a/cfgfile.c b/cfgfile.c
|
||||
index 5a9c502..2ea323d 100644
|
||||
--- a/cfgfile.c
|
||||
+++ b/cfgfile.c
|
||||
@@ -22,12 +22,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <pwd.h>
|
||||
#include "cfgfile.h"
|
||||
|
||||
enum {TX, TY, TZ, RX, RY, RZ};
|
||||
|
||||
static const int def_axmap[] = {0, 2, 1, 3, 5, 4};
|
||||
static const int def_axinv[] = {0, 1, 1, 0, 1, 1};
|
||||
+static char* config_path;
|
||||
+
|
||||
+char* cfg_path()
|
||||
+{
|
||||
+ char* buf;
|
||||
+ if((buf = getenv("XDG_CONFIG_HOME"))) {
|
||||
+ if(config_path == NULL) {
|
||||
+ config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1);
|
||||
+ if ( config_path != NULL) {
|
||||
+ sprintf(config_path, "%s/spnavrc", buf);
|
||||
+ }
|
||||
+ };
|
||||
+ return config_path;
|
||||
+ } else {
|
||||
+ if (!(buf = getenv("HOME"))) {
|
||||
+ struct passwd *pw = getpwuid(getuid());
|
||||
+ buf = pw->pw_dir;
|
||||
+ }
|
||||
+ config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1);
|
||||
+ if ( config_path != NULL) {
|
||||
+ sprintf(config_path, "%s/.config/spnavrc", buf);
|
||||
+ }
|
||||
+ return config_path;
|
||||
+ }
|
||||
+}
|
||||
|
||||
void default_cfg(struct cfg *cfg)
|
||||
{
|
||||
diff --git a/cfgfile.h b/cfgfile.h
|
||||
index dfed8c9..5bb1b2c 100644
|
||||
--- a/cfgfile.h
|
||||
+++ b/cfgfile.h
|
||||
@@ -47,6 +47,7 @@ struct cfg {
|
||||
int devid[MAX_CUSTOM][2]; /* custom USB vendor/product id list */
|
||||
};
|
||||
|
||||
+char* cfg_path(void);
|
||||
void default_cfg(struct cfg *cfg);
|
||||
int read_cfg(const char *fname, struct cfg *cfg);
|
||||
int write_cfg(const char *fname, struct cfg *cfg);
|
||||
diff --git a/front_gtk.c b/front_gtk.c
|
||||
index e4c2cd7..6a800a0 100644
|
||||
--- a/front_gtk.c
|
||||
+++ b/front_gtk.c
|
||||
@@ -28,8 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "cmd.h"
|
||||
#include "ui.h"
|
||||
|
||||
-#define CFGFILE "/etc/spnavrc"
|
||||
-
|
||||
#define CHK_AXINV_TRANS_X "axinv_trans_x"
|
||||
#define CHK_AXINV_TRANS_Y "axinv_trans_y"
|
||||
#define CHK_AXINV_TRANS_Z "axinv_trans_z"
|
||||
@@ -121,7 +119,7 @@ void frontend(int pfd)
|
||||
|
||||
gtk_init(&argc, 0);
|
||||
|
||||
- read_cfg(CFGFILE, &cfg);
|
||||
+ read_cfg(cfg_path(), &cfg);
|
||||
|
||||
create_ui();
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/back.c b/back.c
|
||||
index f364e31..c1810dc 100644
|
||||
--- a/back.c
|
||||
+++ b/back.c
|
||||
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "cmd.h"
|
||||
|
||||
#define CFGFILE "/etc/spnavrc"
|
||||
-#define PIDFILE "/var/run/spnavd.pid"
|
||||
|
||||
int get_daemon_pid(void);
|
||||
static int update_cfg(void);
|
||||
@@ -97,11 +96,26 @@ int get_daemon_pid(void)
|
||||
{
|
||||
FILE *fp;
|
||||
char buf[64];
|
||||
+ char* xdg_runtime_dir;
|
||||
+ char* pidfile;
|
||||
|
||||
- if(!(fp = fopen(PIDFILE, "r"))) {
|
||||
+ if(!(xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))){
|
||||
+ fprintf(stderr, "XDG_RUNTIME_DIR not set, can't find spacenav pid file\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ pidfile = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1);
|
||||
+ if (pidfile == NULL) {
|
||||
+ fprintf(stderr, "failed to allocate memory\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ sprintf(pidfile, "%s/spnavd.pid", xdg_runtime_dir);
|
||||
+
|
||||
+ if(!(fp = fopen(pidfile, "r"))) {
|
||||
fprintf(stderr, "no spacenav pid file, can't find daemon\n");
|
||||
+ free(pidfile);
|
||||
return -1;
|
||||
}
|
||||
+ free(pidfile);
|
||||
if(!fgets(buf, sizeof buf, fp) || !isdigit(buf[0])) {
|
||||
fprintf(stderr, "corrupted pidfile, can't find the daemon\n");
|
||||
fclose(fp);
|
||||
@ -1,77 +0,0 @@
|
||||
From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
|
||||
Date: Tue, 5 Mar 2024 04:12:28 +0100
|
||||
Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on
|
||||
rust >=1.78. r=glandium
|
||||
|
||||
We only need this on ARM32 because the ARM64 intrinsics are stable.
|
||||
|
||||
stdarch_arm_neon_intrinsics was split out from stdsimd here:
|
||||
https://github.com/rust-lang/stdarch/pull/1486
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D203039
|
||||
---
|
||||
Cargo.lock | 1 +
|
||||
gfx/qcms/Cargo.toml | 3 +++
|
||||
gfx/qcms/build.rs | 7 +++++++
|
||||
gfx/qcms/src/lib.rs | 6 ++++--
|
||||
4 files changed, 15 insertions(+), 2 deletions(-)
|
||||
create mode 100644 gfx/qcms/build.rs
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index aba397832e..8f0a879a87 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -4276,6 +4276,7 @@ name = "qcms"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
+ "version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
|
||||
index e976054a7b..f50d6623a1 100644
|
||||
--- a/gfx/qcms/Cargo.toml
|
||||
+++ b/gfx/qcms/Cargo.toml
|
||||
@@ -20,3 +20,6 @@ cmyk = []
|
||||
|
||||
[dependencies]
|
||||
libc = {version = "0.2", optional = true }
|
||||
+
|
||||
+[build-dependencies]
|
||||
+version_check = "0.9"
|
||||
diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
|
||||
new file mode 100644
|
||||
index 0000000000..6810a8828e
|
||||
--- /dev/null
|
||||
+++ b/gfx/qcms/build.rs
|
||||
@@ -0,0 +1,7 @@
|
||||
+extern crate version_check as rustc;
|
||||
+
|
||||
+fn main() {
|
||||
+ if rustc::is_min_version("1.78.0").unwrap_or(false) {
|
||||
+ println!("cargo:rustc-cfg=stdsimd_split");
|
||||
+ }
|
||||
+}
|
||||
diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
|
||||
index c311964ee3..fc496816a8 100644
|
||||
--- a/gfx/qcms/src/lib.rs
|
||||
+++ b/gfx/qcms/src/lib.rs
|
||||
@@ -7,9 +7,11 @@
|
||||
#![allow(non_upper_case_globals)]
|
||||
// These are needed for the neon SIMD code and can be removed once the MSRV supports the
|
||||
// instrinsics we use
|
||||
-#![cfg_attr(feature = "neon", feature(stdsimd))]
|
||||
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
|
||||
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
|
||||
+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
|
||||
#![cfg_attr(
|
||||
- feature = "neon",
|
||||
+ all(target_arch = "arm", feature = "neon"),
|
||||
feature(arm_target_feature, raw_ref_op)
|
||||
|
||||
)]
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
|
||||
|
||||
[[package]]
|
||||
name = "tiny"
|
||||
-version = "0.10.0"
|
||||
+version = "0.11.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"dirs",
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp
|
||||
index ac2929a..c399706 100644
|
||||
--- c/src/cgraphicsscene.cpp
|
||||
+++ i/src/cgraphicsscene.cpp
|
||||
@@ -1436,7 +1436,7 @@ namespace Caneda
|
||||
QPointF newPos = m_currentWiringWire->mapFromScene(pos);
|
||||
QPointF refPos = m_currentWiringWire->port1()->pos();
|
||||
|
||||
- if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) {
|
||||
+ if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) {
|
||||
m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y()));
|
||||
}
|
||||
else {
|
||||
@ -1,122 +0,0 @@
|
||||
--- a/src/svncpp/client_ls.cpp
|
||||
+++ b/src/svncpp/client_ls.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "svn_client.h"
|
||||
#include "svn_path.h"
|
||||
#include "svn_sorts.h"
|
||||
+#include "svn_version.h"
|
||||
//#include "svn_utf.h"
|
||||
|
||||
// svncpp
|
||||
@@ -35,6 +36,7 @@
|
||||
#include "m_is_empty.hpp"
|
||||
|
||||
|
||||
+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
|
||||
static int
|
||||
compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
|
||||
{
|
||||
@@ -84,6 +86,72 @@ namespace svn
|
||||
}
|
||||
}
|
||||
|
||||
+#else
|
||||
+
|
||||
+#include <algorithm>
|
||||
+
|
||||
+static svn_error_t* store_entry(
|
||||
+ void *baton,
|
||||
+ const char *path,
|
||||
+ const svn_dirent_t *dirent,
|
||||
+ const svn_lock_t *,
|
||||
+ const char *abs_path,
|
||||
+ const char *,
|
||||
+ const char *,
|
||||
+ apr_pool_t *scratch_pool)
|
||||
+{
|
||||
+ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
|
||||
+ if (path[0] == '\0') {
|
||||
+ if (dirent->kind == svn_node_file) {
|
||||
+ // for compatibility with svn_client_ls behaviour, listing a file
|
||||
+ // stores that file name
|
||||
+ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
|
||||
+ }
|
||||
+ } else {
|
||||
+ entries->push_back(svn::DirEntry(path, dirent));
|
||||
+ }
|
||||
+ return SVN_NO_ERROR;
|
||||
+}
|
||||
+
|
||||
+static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
|
||||
+{
|
||||
+ return svn_path_compare_paths(a.name(), b.name()) < 0;
|
||||
+}
|
||||
+
|
||||
+namespace svn
|
||||
+{
|
||||
+ DirEntries
|
||||
+ Client::list(const char * pathOrUrl,
|
||||
+ svn_opt_revision_t * revision,
|
||||
+ bool recurse) throw(ClientException)
|
||||
+ {
|
||||
+ Pool pool;
|
||||
+ DirEntries entries;
|
||||
+
|
||||
+ svn_error_t * error =
|
||||
+ svn_client_list3(pathOrUrl,
|
||||
+ revision,
|
||||
+ revision,
|
||||
+ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
|
||||
+ SVN_DIRENT_ALL,
|
||||
+ FALSE, // fetch locks
|
||||
+ FALSE, // include externals
|
||||
+ &store_entry,
|
||||
+ &entries,
|
||||
+ *m_context,
|
||||
+ pool);
|
||||
+
|
||||
+ if (error != SVN_NO_ERROR)
|
||||
+ throw ClientException(error);
|
||||
+
|
||||
+ std::sort(entries.begin(), entries.end(), &sort_by_path);
|
||||
+
|
||||
+ return entries;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
/* -----------------------------------------------------------------
|
||||
* local variables:
|
||||
* eval: (load-file "../../rapidsvn-dev.el")
|
||||
--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100
|
||||
+++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100
|
||||
@@ -47,7 +47,7 @@
|
||||
{
|
||||
}
|
||||
|
||||
- Data(const char * _name, svn_dirent_t * dirEntry)
|
||||
+ Data(const char * _name, const svn_dirent_t * dirEntry)
|
||||
: name(_name), kind(dirEntry->kind), size(dirEntry->size),
|
||||
hasProps(dirEntry->has_props != 0),
|
||||
createdRev(dirEntry->created_rev), time(dirEntry->time)
|
||||
@@ -78,7 +78,7 @@
|
||||
{
|
||||
}
|
||||
|
||||
- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
|
||||
+ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
|
||||
: m(new Data(name, DirEntry))
|
||||
{
|
||||
}
|
||||
--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100
|
||||
+++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
/**
|
||||
* constructor for existing @a svn_dirent_t entries
|
||||
*/
|
||||
- DirEntry(const char * name, svn_dirent_t * dirEntry);
|
||||
+ DirEntry(const char * name, const svn_dirent_t * dirEntry);
|
||||
|
||||
/**
|
||||
* copy constructor
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur reposurgeon-3.44/Makefile reposurgeon-3.44-new/Makefile
|
||||
--- reposurgeon-3.44/Makefile 2018-04-29 12:27:43.000000000 -0700
|
||||
+++ reposurgeon-3.44-new/Makefile 2018-08-01 17:38:15.582789739 -0700
|
||||
@@ -36,7 +36,7 @@
|
||||
MANPAGES = reposurgeon.1 repotool.1 repodiffer.1 repomapper.1 repocutter.1
|
||||
HTMLFILES = $(MANPAGES:.1=.html) \
|
||||
dvcs-migration-guide.html features.html reporting-bugs.html
|
||||
-SHARED = README.md NEWS TODO reposurgeon-git-aliases $(HTMLFILES)
|
||||
+SHARED = reposurgeon-git-aliases $(HTMLFILES)
|
||||
|
||||
all: $(MANPAGES) $(HTMLFILES)
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001
|
||||
From: VuiMuich <vuimuich@quantentunnel.de>
|
||||
Date: Mon, 2 Sep 2024 11:15:27 +0200
|
||||
Subject: [PATCH] fix rust 1.80.x for nixpkgs
|
||||
|
||||
---
|
||||
Cargo.lock | 16 ++++++++++++----
|
||||
1 file changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index f8a82eecf..5728b55bf 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -777,6 +777,12 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "num-conv"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
+
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.17"
|
||||
@@ -1218,13 +1224,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.30"
|
||||
+version = "0.3.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
|
||||
+checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
+ "num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.15"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
+ "num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 5ae2bd6..e4c6f18 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -5676,9 +5676,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.34"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.17"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
File diff suppressed because it is too large
Load Diff
3058
pkgs/development/compilers/scryer-prolog/Cargo.lock
generated
3058
pkgs/development/compilers/scryer-prolog/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,61 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ab3884c..c0fd356 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -38,32 +38,23 @@ include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
${TOML++}
|
||||
- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
|
||||
- GIT_SHALLOW ON
|
||||
- GIT_SUBMODULES ""
|
||||
- GIT_TAG "v3.3.0"
|
||||
+ DOWNLOAD_COMMAND true
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
${SOL2}
|
||||
- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
|
||||
- GIT_SHALLOW ON
|
||||
- GIT_SUBMODULES ""
|
||||
- GIT_TAG "v3.3.0"
|
||||
+ DOWNLOAD_COMMAND true
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
${MAGIC_ENUM}
|
||||
- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
|
||||
- GIT_SHALLOW ON
|
||||
- GIT_SUBMODULES ""
|
||||
- GIT_TAG "v0.8.2"
|
||||
+ DOWNLOAD_COMMAND true
|
||||
)
|
||||
|
||||
FetchContent_GetProperties(${TOML++})
|
||||
if(NOT ${TOML++}_POPULATED)
|
||||
message(STATUS "Cloning ${TOML++}")
|
||||
- FetchContent_Populate(${TOML++})
|
||||
+ FetchContent_Populate(${TOML++})
|
||||
FetchContent_MakeAvailable(${TOML++})
|
||||
endif()
|
||||
|
||||
@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
|
||||
find_package(Lua)
|
||||
endif()
|
||||
|
||||
-include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
|
||||
+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC)
|
||||
|
||||
set(SOURCES
|
||||
src/toml.cpp
|
||||
@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES})
|
||||
|
||||
if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
|
||||
-else()
|
||||
- target_link_libraries(toml.lua ${LUA_LIBRARIES})
|
||||
+else()
|
||||
+ target_link_libraries(toml.lua ${LUA_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if (LINK_FLAGS)
|
||||
@ -1,23 +0,0 @@
|
||||
--- a/Makefile 2007-10-30 01:59:10.000000000 +0300
|
||||
+++ b/Makefile 2014-09-18 11:04:53.176320021 +0400
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
include $(CONFIG)
|
||||
|
||||
-ifeq "$(LUA_VERSION_NUM)" "500"
|
||||
-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
|
||||
-endif
|
||||
-
|
||||
SRCS= src/lua$T.c
|
||||
OBJS= src/lua$T.o $(COMPAT_O)
|
||||
|
||||
@@ -19,9 +15,6 @@
|
||||
src/$(LIBNAME): $(OBJS)
|
||||
export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
|
||||
|
||||
-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
|
||||
- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
|
||||
-
|
||||
install: src/$(LIBNAME)
|
||||
mkdir -p $(LUA_LIBDIR)
|
||||
cp src/$(LIBNAME) $(LUA_LIBDIR)
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/src/elf_locations.ml b/src/elf_locations.ml
|
||||
index a08b359..0db9274 100644
|
||||
--- a/src/elf_locations.ml
|
||||
+++ b/src/elf_locations.ml
|
||||
@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter =
|
||||
| Some section ->
|
||||
let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in
|
||||
let rec aux () =
|
||||
- match Owee_debug_line.read_chunk body with
|
||||
+ let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in
|
||||
+ match Owee_debug_line.read_chunk body ~pointers_to_other_sections with
|
||||
| None -> ()
|
||||
| Some (header, chunk) ->
|
||||
(* CR-soon mshinwell: fix owee .mli to note that [state] is
|
||||
@ -1,51 +0,0 @@
|
||||
From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001
|
||||
From: Alan Modra <amodra@gmail.com>
|
||||
Date: Mon, 21 Feb 2022 10:58:57 +1030
|
||||
Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel
|
||||
|
||||
Commit b25f942e18d6 made .machine more strict. Weaken it again.
|
||||
|
||||
* config/tc-ppc.c (ppc_machine): Treat an early .machine specially,
|
||||
keeping sticky options to work around gcc bugs.
|
||||
---
|
||||
gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++-
|
||||
1 file changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
|
||||
index 054f9c72161..89bc7d3f9b9 100644
|
||||
--- a/gas/config/tc-ppc.c
|
||||
+++ b/gas/config/tc-ppc.c
|
||||
@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED)
|
||||
options do not count as a new machine, instead they add
|
||||
to currently selected opcodes. */
|
||||
ppc_cpu_t machine_sticky = 0;
|
||||
- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
|
||||
+ /* Unfortunately, some versions of gcc emit a .machine
|
||||
+ directive very near the start of the compiler's assembly
|
||||
+ output file. This is bad because it overrides user -Wa
|
||||
+ cpu selection. Worse, there are versions of gcc that
|
||||
+ emit the *wrong* cpu, not even respecting the -mcpu given
|
||||
+ to gcc. See gcc pr101393. And to compound the problem,
|
||||
+ as of 20220222 gcc doesn't pass the correct cpu option to
|
||||
+ gas on the command line. See gcc pr59828. Hack around
|
||||
+ this by keeping sticky options for an early .machine. */
|
||||
+ asection *sec;
|
||||
+ for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
|
||||
+ {
|
||||
+ segment_info_type *info = seg_info (sec);
|
||||
+ /* Are the frags for this section perturbed from their
|
||||
+ initial state? Even .align will count here. */
|
||||
+ if (info != NULL
|
||||
+ && (info->frchainP->frch_root != info->frchainP->frch_last
|
||||
+ || info->frchainP->frch_root->fr_type != rs_fill
|
||||
+ || info->frchainP->frch_root->fr_fix != 0))
|
||||
+ break;
|
||||
+ }
|
||||
+ new_cpu = ppc_parse_cpu (ppc_cpu,
|
||||
+ sec == NULL ? &sticky : &machine_sticky,
|
||||
+ cpu_string);
|
||||
if (new_cpu != 0)
|
||||
ppc_cpu = new_cpu;
|
||||
else
|
||||
--
|
||||
2.31.1
|
||||
@ -1,10 +0,0 @@
|
||||
--- old/Makefile.conf 2014-05-19 16:53:09.263564921 +0200
|
||||
+++ new/Makefile.conf 2014-05-19 16:53:42.213152994 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
# Where binaries are installed:
|
||||
-BINDIR := `dirname \`which ocamlc\``
|
||||
+BINDIR := $(out)/bin
|
||||
|
||||
####
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
diff --git a/src/spnavd.c b/src/spnavd.c
|
||||
index 2d4eca6..a5227ed 100644
|
||||
--- a/src/spnavd.c
|
||||
+++ b/src/spnavd.c
|
||||
@@ -27,6 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include <sys/select.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <pwd.h>
|
||||
#include "spnavd.h"
|
||||
#include "logger.h"
|
||||
#include "dev.h"
|
||||
@@ -47,13 +49,39 @@ static void handle_events(fd_set *rset);
|
||||
static void sig_handler(int s);
|
||||
static char *fix_path(char *str);
|
||||
|
||||
-static char *cfgfile = DEF_CFGFILE;
|
||||
+static char* config_path;
|
||||
+char* cfg_path()
|
||||
+{
|
||||
+ char* buf;
|
||||
+ if((buf = getenv("XDG_CONFIG_HOME"))) {
|
||||
+ if(config_path == NULL) {
|
||||
+ config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1);
|
||||
+ if ( config_path != NULL) {
|
||||
+ sprintf(config_path, "%s/spnavrc", buf);
|
||||
+ }
|
||||
+ };
|
||||
+ return config_path;
|
||||
+ } else {
|
||||
+ if (!(buf = getenv("HOME"))) {
|
||||
+ struct passwd *pw = getpwuid(getuid());
|
||||
+ buf = pw->pw_dir;
|
||||
+ }
|
||||
+ config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1);
|
||||
+ if ( config_path != NULL) {
|
||||
+ sprintf(config_path, "%s/.config/spnavrc", buf);
|
||||
+ }
|
||||
+ return config_path;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static char *cfgfile = NULL;
|
||||
static char *logfile = DEF_LOGFILE;
|
||||
static char *pidpath = NULL;
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i, pid, ret, become_daemon = 1;
|
||||
+ cfgfile = cfg_path();
|
||||
|
||||
for(i=1; i<argc; i++) {
|
||||
if(argv[i][0] == '-') {
|
||||
@@ -247,7 +275,7 @@ static void print_usage(const char *argv0)
|
||||
printf("usage: %s [options]\n", argv0);
|
||||
printf("options:\n");
|
||||
printf(" -d: do not daemonize\n");
|
||||
- printf(" -c <file>: config file path (default: " DEF_CFGFILE ")\n");
|
||||
+ printf(" -c <file>: config file path (default: %s)\n", cfg_path());
|
||||
printf(" -l <file>|syslog: log file path or log to syslog (default: " DEF_LOGFILE ")\n");
|
||||
printf(" -v: verbose output\n");
|
||||
printf(" -V,-version: print version number and exit\n");
|
||||
@ -1,82 +0,0 @@
|
||||
diff --git a/src/spnavd.c b/src/spnavd.c
|
||||
index 03080da..2d4eca6 100644
|
||||
--- a/src/spnavd.c
|
||||
+++ b/src/spnavd.c
|
||||
@@ -42,12 +42,14 @@ static void cleanup(void);
|
||||
static void daemonize(void);
|
||||
static int write_pid_file(void);
|
||||
static int find_running_daemon(void);
|
||||
+static char *pidfile_path(void);
|
||||
static void handle_events(fd_set *rset);
|
||||
static void sig_handler(int s);
|
||||
static char *fix_path(char *str);
|
||||
|
||||
static char *cfgfile = DEF_CFGFILE;
|
||||
static char *logfile = DEF_LOGFILE;
|
||||
+static char *pidpath = NULL;
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
@@ -270,7 +272,7 @@ static void cleanup(void)
|
||||
remove_device(tmp);
|
||||
}
|
||||
|
||||
- remove(PIDFILE);
|
||||
+ remove(pidfile_path());
|
||||
}
|
||||
|
||||
static void daemonize(void)
|
||||
@@ -314,7 +316,7 @@ static int write_pid_file(void)
|
||||
FILE *fp;
|
||||
int pid = getpid();
|
||||
|
||||
- if(!(fp = fopen(PIDFILE, "w"))) {
|
||||
+ if(!(fp = fopen(pidfile_path(), "w"))) {
|
||||
return -1;
|
||||
}
|
||||
fprintf(fp, "%d\n", pid);
|
||||
@@ -329,7 +331,7 @@ static int find_running_daemon(void)
|
||||
struct sockaddr_un addr;
|
||||
|
||||
/* try to open the pid-file */
|
||||
- if(!(fp = fopen(PIDFILE, "r"))) {
|
||||
+ if(!(fp = fopen(pidfile_path(), "r"))) {
|
||||
return -1;
|
||||
}
|
||||
if(fscanf(fp, "%d\n", &pid) != 1) {
|
||||
@@ -356,6 +358,22 @@ static int find_running_daemon(void)
|
||||
return pid;
|
||||
}
|
||||
|
||||
+char *pidfile_path(void)
|
||||
+{
|
||||
+ char *xdg_runtime_dir;
|
||||
+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
|
||||
+ if ( pidpath == NULL ) {
|
||||
+ pidpath = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1);
|
||||
+ if ( pidpath != NULL ) {
|
||||
+ sprintf(pidpath, "%s/spnavd.pid", xdg_runtime_dir);
|
||||
+ }
|
||||
+ };
|
||||
+ return pidpath;
|
||||
+ } else {
|
||||
+ return DEFAULT_PIDFILE;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void handle_events(fd_set *rset)
|
||||
{
|
||||
int dev_fd, hotplug_fd;
|
||||
diff --git a/src/spnavd.h b/src/spnavd.h
|
||||
index 2d1c48b..17d22d3 100644
|
||||
--- a/src/spnavd.h
|
||||
+++ b/src/spnavd.h
|
||||
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define DEF_CFGFILE "/etc/spnavrc"
|
||||
#define DEF_LOGFILE "/var/log/spnavd.log"
|
||||
|
||||
-#define PIDFILE "/var/run/spnavd.pid"
|
||||
+#define DEFAULT_PIDFILE "/run/spnavd.pid"
|
||||
#define DEFAULT_SOCK_NAME "/run/spnav.sock"
|
||||
#define SYSLOG_ID "spnavd"
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
diff --git a/src/proto_unix.c b/src/proto_unix.c
|
||||
index 998f234..d38452c 100644
|
||||
--- a/src/proto_unix.c
|
||||
+++ b/src/proto_unix.c
|
||||
@@ -36,11 +36,14 @@ enum {
|
||||
|
||||
static int lsock = -1;
|
||||
|
||||
+static char *spath = NULL;
|
||||
+
|
||||
int init_unix(void)
|
||||
{
|
||||
int s;
|
||||
mode_t prev_umask;
|
||||
struct sockaddr_un addr;
|
||||
+ char *sock_path;
|
||||
|
||||
if(lsock >= 0) return 0;
|
||||
|
||||
@@ -49,16 +52,18 @@ int init_unix(void)
|
||||
return -1;
|
||||
}
|
||||
|
||||
- unlink(SOCK_NAME); /* in case it already exists */
|
||||
+ sock_path = socket_path();
|
||||
+
|
||||
+ unlink(sock_path); /* in case it already exists */
|
||||
|
||||
memset(&addr, 0, sizeof addr);
|
||||
addr.sun_family = AF_UNIX;
|
||||
- strcpy(addr.sun_path, SOCK_NAME);
|
||||
+ strcpy(addr.sun_path, sock_path);
|
||||
|
||||
prev_umask = umask(0);
|
||||
|
||||
if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
|
||||
- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));
|
||||
+ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));
|
||||
close(s);
|
||||
return -1;
|
||||
}
|
||||
@@ -68,7 +73,7 @@ int init_unix(void)
|
||||
if(listen(s, 8) == -1) {
|
||||
logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));
|
||||
close(s);
|
||||
- unlink(SOCK_NAME);
|
||||
+ unlink(sock_path);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -82,7 +87,7 @@ void close_unix(void)
|
||||
close(lsock);
|
||||
lsock = -1;
|
||||
|
||||
- unlink(SOCK_NAME);
|
||||
+ unlink(socket_path());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)
|
||||
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+char *socket_path(void)
|
||||
+{
|
||||
+ char *xdg_runtime_dir;
|
||||
+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
|
||||
+ if ( spath == NULL ) {
|
||||
+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
|
||||
+ if ( spath != NULL ) {
|
||||
+ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
|
||||
+ }
|
||||
+ };
|
||||
+ return spath;
|
||||
+ } else {
|
||||
+ return DEFAULT_SOCK_NAME;
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/proto_unix.h b/src/proto_unix.h
|
||||
index 045b379..ec4509c 100644
|
||||
--- a/src/proto_unix.h
|
||||
+++ b/src/proto_unix.h
|
||||
@@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "event.h"
|
||||
#include "client.h"
|
||||
|
||||
+char *socket_path(void);
|
||||
int init_unix(void);
|
||||
void close_unix(void);
|
||||
int get_unix_socket(void);
|
||||
diff --git a/src/spnavd.c b/src/spnavd.c
|
||||
index cbea191..03080da 100644
|
||||
--- a/src/spnavd.c
|
||||
+++ b/src/spnavd.c
|
||||
@@ -344,7 +344,7 @@ static int find_running_daemon(void)
|
||||
}
|
||||
memset(&addr, 0, sizeof addr);
|
||||
addr.sun_family = AF_UNIX;
|
||||
- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);
|
||||
+ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);
|
||||
|
||||
if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
|
||||
close(s);
|
||||
diff --git a/src/spnavd.h b/src/spnavd.h
|
||||
index fa0a916..2d1c48b 100644
|
||||
--- a/src/spnavd.h
|
||||
+++ b/src/spnavd.h
|
||||
@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define DEF_CFGFILE "/etc/spnavrc"
|
||||
#define DEF_LOGFILE "/var/log/spnavd.log"
|
||||
|
||||
-#define SOCK_NAME "/var/run/spnav.sock"
|
||||
#define PIDFILE "/var/run/spnavd.pid"
|
||||
+#define DEFAULT_SOCK_NAME "/run/spnav.sock"
|
||||
#define SYSLOG_ID "spnavd"
|
||||
|
||||
/* Multiple devices support */
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/src/fbio.cpp b/src/fbio.cpp
|
||||
index e5afc44..2485227 100644
|
||||
--- a/src/fbio.cpp
|
||||
+++ b/src/fbio.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <sys/select.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include "config.h"
|
||||
@ -1,64 +0,0 @@
|
||||
From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Tojnar <jtojnar@gmail.com>
|
||||
Date: Sun, 3 Mar 2019 11:50:27 +0100
|
||||
Subject: [PATCH] build: Add datadir option for /usr/share
|
||||
|
||||
Hardcoded /usr/share does not work for platforms that do not have global /usr like Nix.
|
||||
Let’s introduce a new DATADIR option, that allows overriding the directory and use it for metainfodir.
|
||||
|
||||
While at it, let’s also use it for SHAREDIR and MANDIR for consistency,
|
||||
following the GNU directory convention:
|
||||
https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
|
||||
---
|
||||
SConstruct | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 05755e4b..3fbdc1d8 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -49,9 +49,10 @@
|
||||
PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ),
|
||||
PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ),
|
||||
PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ),
|
||||
- PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ),
|
||||
+ PathVariable( "DATADIR", "Overwrite the directory where platform-independent files are installed to.", "$PREFIX/share", PathVariable.PathAccept ),
|
||||
+ PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$DATADIR/libffado", PathVariable.PathAccept ),
|
||||
PathVariable( "LIBDATADIR", "Location for architecture-dependent data.", "$LIBDIR/libffado", PathVariable.PathAccept ),
|
||||
- PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ),
|
||||
+ PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$DATADIR/man", PathVariable.PathAccept ),
|
||||
PathVariable( "PYPKGDIR", "The directory where the python modules get installed.",
|
||||
distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ),
|
||||
PathVariable( "UDEVDIR", "Overwrite the directory where udev rules are installed to.", "/lib/udev/rules.d/", PathVariable.PathAccept ),
|
||||
@@ -523,6 +524,7 @@
|
||||
env['BINDIR'] = Template( env['BINDIR'] ).safe_substitute( env )
|
||||
env['LIBDIR'] = Template( env['LIBDIR'] ).safe_substitute( env )
|
||||
env['INCLUDEDIR'] = Template( env['INCLUDEDIR'] ).safe_substitute( env )
|
||||
+env['DATADIR'] = Template( env['DATADIR'] ).safe_substitute( env )
|
||||
env['SHAREDIR'] = Template( env['SHAREDIR'] ).safe_substitute( env )
|
||||
env['LIBDATADIR'] = Template( env['LIBDATADIR'] ).safe_substitute( env )
|
||||
env['UDEVDIR'] = Template( env['UDEVDIR'] ).safe_substitute( env )
|
||||
@@ -531,18 +533,21 @@
|
||||
env['bindir'] = Template( env.destdir + env['BINDIR'] ).safe_substitute( env )
|
||||
env['libdir'] = Template( env.destdir + env['LIBDIR'] ).safe_substitute( env )
|
||||
env['includedir'] = Template( env.destdir + env['INCLUDEDIR'] ).safe_substitute( env )
|
||||
+env['datadir'] = Template( env.destdir + env['DATADIR'] ).safe_substitute( env )
|
||||
env['sharedir'] = Template( env.destdir + env['SHAREDIR'] ).safe_substitute( env )
|
||||
env['libdatadir'] = Template( env.destdir + env['LIBDATADIR'] ).safe_substitute( env )
|
||||
env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env )
|
||||
env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env )
|
||||
env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env )
|
||||
env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env )
|
||||
-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env )
|
||||
-
|
||||
+env['metainfodir'] = Template( env.destdir + env['DATADIR'] + "/metainfo" ).safe_substitute( env )
|
||||
+
|
||||
+env.Command( target=env['datadir'], source="", action=Mkdir( env['datadir'] ) )
|
||||
env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
|
||||
|
||||
env.Alias( "install", env['libdir'] )
|
||||
env.Alias( "install", env['includedir'] )
|
||||
+env.Alias( "install", env['datadir'] )
|
||||
env.Alias( "install", env['sharedir'] )
|
||||
env.Alias( "install", env['libdatadir'] )
|
||||
env.Alias( "install", env['bindir'] )
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
|
||||
index d2bc3e5c1..329580075 100644
|
||||
--- a/crypto/x509/x509_def.c
|
||||
+++ b/crypto/x509/x509_def.c
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
#define X509_CERT_AREA OPENSSLDIR
|
||||
#define X509_CERT_DIR OPENSSLDIR "/certs"
|
||||
-#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
||||
+#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
|
||||
#define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
||||
#define X509_CERT_DIR_EVP "SSL_CERT_DIR"
|
||||
#define X509_CERT_FILE_EVP "SSL_CERT_FILE"
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c215f3bf..f5aa25d8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -67,7 +67,7 @@ AC_C_BIGENDIAN
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LIBTOOL
|
||||
-AC_PATH_PROG([AR], [ar])
|
||||
+AC_PATH_TOOL([AR], [ar])
|
||||
AC_PATH_PROG([CAT], [cat])
|
||||
AC_PATH_PROG([CHMOD], [chmod])
|
||||
AC_PATH_PROG([CHOWN], [chown])
|
||||
1016
pkgs/servers/monitoring/prometheus/Cargo.lock
generated
1016
pkgs/servers/monitoring/prometheus/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@
|
||||
diff --git a/mk/run_test.sh b/mk/run_test.sh
|
||||
index 7e95df2ac..58420c317 100755
|
||||
--- a/mk/run_test.sh
|
||||
+++ b/mk/run_test.sh
|
||||
@@ -27,7 +27,6 @@ run_test "$1"
|
||||
# appear randomly without anyone knowing why.
|
||||
# See https://github.com/NixOS/nix/issues/3605 for more info
|
||||
if [[ $status -ne 0 && $status -ne 99 && \
|
||||
- "$(uname)" == "Darwin" && \
|
||||
"$log" =~ "unexpected EOF reading a line" \
|
||||
]]; then
|
||||
echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)"
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/gl/stdint_.h b/gl/stdint_.h
|
||||
index bc27595..303e81a 100644
|
||||
--- a/gl/stdint_.h
|
||||
+++ b/gl/stdint_.h
|
||||
@@ -62,7 +62,7 @@
|
||||
int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
|
||||
<inttypes.h> also defines intptr_t and uintptr_t. */
|
||||
# define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
|
||||
-# include <inttypes.h>
|
||||
+// # include <inttypes.h>
|
||||
# undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
|
||||
#elif @HAVE_SYS_INTTYPES_H@
|
||||
/* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
|
||||
@ -1,385 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e41780e..15db50e 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -119,11 +119,11 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
-version = "0.57.0"
|
||||
+version = "0.68.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
|
||||
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 2.5.0",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"lazy_static",
|
||||
@@ -134,6 +134,7 @@ dependencies = [
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
+ "syn 2.0.59",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -157,6 +158,12 @@ version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "2.5.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
+
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.9.0"
|
||||
@@ -189,9 +196,9 @@ checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
-version = "0.4.0"
|
||||
+version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
|
||||
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
@@ -243,7 +250,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
"strsim",
|
||||
"term_size",
|
||||
"textwrap",
|
||||
@@ -439,6 +446,16 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
|
||||
|
||||
+[[package]]
|
||||
+name = "errno"
|
||||
+version = "0.3.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "failure"
|
||||
version = "0.1.8"
|
||||
@@ -457,10 +474,16 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "fastrand"
|
||||
+version = "2.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
|
||||
+
|
||||
[[package]]
|
||||
name = "fixedbitset"
|
||||
version = "0.2.0"
|
||||
@@ -609,9 +632,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.109"
|
||||
+version = "0.2.153"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01"
|
||||
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@@ -629,6 +652,12 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
|
||||
|
||||
+[[package]]
|
||||
+name = "linux-raw-sys"
|
||||
+version = "0.4.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
|
||||
+
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.5"
|
||||
@@ -665,6 +694,12 @@ version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd"
|
||||
|
||||
+[[package]]
|
||||
+name = "minimal-lexical"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
+
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.4.4"
|
||||
@@ -689,12 +724,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nettle-sys"
|
||||
-version = "2.0.8"
|
||||
+version = "2.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b95aff9e61c8d8132e41dceae74c6e526edcac8d120072c87a300b9ab7e75226"
|
||||
+checksum = "b495053a10a19a80e3a26bf1212e92e29350797b5f5bdc58268c3f3f818e66ec"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
+ "cc",
|
||||
+ "libc",
|
||||
"pkg-config",
|
||||
+ "tempfile",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
@@ -706,12 +744,12 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
-version = "5.1.2"
|
||||
+version = "7.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
|
||||
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
- "version_check",
|
||||
+ "minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -851,18 +889,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.33"
|
||||
+version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
|
||||
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
- "unicode-xid",
|
||||
+ "unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
-version = "1.0.10"
|
||||
+version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
|
||||
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -909,7 +947,7 @@ version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -951,6 +989,19 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
+[[package]]
|
||||
+name = "rustix"
|
||||
+version = "0.38.32"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.5.0",
|
||||
+ "errno",
|
||||
+ "libc",
|
||||
+ "linux-raw-sys",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.6"
|
||||
@@ -1053,9 +1104,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
-version = "0.1.1"
|
||||
+version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
|
||||
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "signature"
|
||||
@@ -1117,6 +1168,17 @@ dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "2.0.59"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-ident",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "synstructure"
|
||||
version = "0.12.6"
|
||||
@@ -1125,10 +1187,22 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "tempfile"
|
||||
+version = "3.10.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "fastrand",
|
||||
+ "rustix",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.7.0"
|
||||
@@ -1177,7 +1251,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1226,6 +1300,12 @@ version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
|
||||
|
||||
+[[package]]
|
||||
+name = "unicode-ident"
|
||||
+version = "1.0.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
+
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.19"
|
||||
@@ -1306,6 +1386,79 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
+[[package]]
|
||||
+name = "windows-sys"
|
||||
+version = "0.52.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
+dependencies = [
|
||||
+ "windows-targets",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows-targets"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
+dependencies = [
|
||||
+ "windows_aarch64_gnullvm",
|
||||
+ "windows_aarch64_msvc",
|
||||
+ "windows_i686_gnu",
|
||||
+ "windows_i686_gnullvm",
|
||||
+ "windows_i686_msvc",
|
||||
+ "windows_x86_64_gnu",
|
||||
+ "windows_x86_64_gnullvm",
|
||||
+ "windows_x86_64_msvc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_aarch64_gnullvm"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_aarch64_msvc"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_i686_gnu"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_i686_gnullvm"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_i686_msvc"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_gnu"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_gnullvm"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_msvc"
|
||||
+version = "0.52.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
+
|
||||
[[package]]
|
||||
name = "xxhash-rust"
|
||||
version = "0.8.2"
|
||||
@@ -1329,6 +1482,6 @@ checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"synstructure",
|
||||
]
|
||||
Loading…
Reference in New Issue
Block a user