mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
treewide: remove unreferenced patch files (#346477)
This commit is contained in:
h7x4
GitHub
commit
64a98027b4
@ -1,13 +0,0 @@
|
||||
diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c
|
||||
index b8f09a1f..f8a15c1b 100644
|
||||
--- a/libcrystfel/src/image-cbf.c
|
||||
+++ b/libcrystfel/src/image-cbf.c
|
||||
@@ -287,7 +287,7 @@ static float *read_cbf_data(const char *filename, int gz, int *w, int *h)
|
||||
|
||||
} else {
|
||||
|
||||
- #ifdef HAVE_ZLIB
|
||||
+ #if defined(HAVE_ZLIB) && !(defined(__aarch64__) && defined(__APPLE__))
|
||||
gzFile gzfh;
|
||||
int len_read;
|
||||
size_t len;
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
|
||||
index 0fbf832e..c6077114 100644
|
||||
--- a/src/protocols/LinuxDMABUF.cpp
|
||||
+++ b/src/protocols/LinuxDMABUF.cpp
|
||||
@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
||||
+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
||||
drmFreeDevice(&device);
|
||||
- removeGlobal();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
From 8304b645c655832c47ee9ca706d182c26d29eaff Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Tue, 9 Apr 2024 06:35:39 +0000
|
||||
Subject: [PATCH] Revert "rust: recursively pull proc-macro dependencies as
|
||||
well"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit aee941559c4b88a062e88186819a820c69c200ae.
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
mesonbuild/build.py | 2 ++
|
||||
test cases/rust/18 proc-macro/lib.rs | 8 --------
|
||||
test cases/rust/18 proc-macro/meson.build | 11 -----------
|
||||
test cases/rust/18 proc-macro/subdir/meson.build | 1 -
|
||||
.../rust/18 proc-macro/transitive-proc-macro.rs | 7 -------
|
||||
5 files changed, 2 insertions(+), 27 deletions(-)
|
||||
delete mode 100644 test cases/rust/18 proc-macro/lib.rs
|
||||
delete mode 100644 test cases/rust/18 proc-macro/subdir/meson.build
|
||||
delete mode 100644 test cases/rust/18 proc-macro/transitive-proc-macro.rs
|
||||
|
||||
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
|
||||
index 6f0d6a2dd..7be9b497b 100644
|
||||
--- a/mesonbuild/build.py
|
||||
+++ b/mesonbuild/build.py
|
||||
@@ -1295,6 +1295,8 @@ def get_dependencies_recurse(self, result: OrderedSet[BuildTargetTypes], include
|
||||
for t in self.link_targets:
|
||||
if t in result:
|
||||
continue
|
||||
+ if t.rust_crate_type == 'proc-macro':
|
||||
+ continue
|
||||
if include_internals or not t.is_internal():
|
||||
result.add(t)
|
||||
if isinstance(t, StaticLibrary):
|
||||
diff --git a/test cases/rust/18 proc-macro/lib.rs b/test cases/rust/18 proc-macro/lib.rs
|
||||
deleted file mode 100644
|
||||
index 5242886cc..000000000
|
||||
--- a/test cases/rust/18 proc-macro/lib.rs
|
||||
+++ /dev/null
|
||||
@@ -1,8 +0,0 @@
|
||||
-extern crate proc_macro_examples;
|
||||
-use proc_macro_examples::make_answer;
|
||||
-
|
||||
-make_answer!();
|
||||
-
|
||||
-pub fn func() -> u32 {
|
||||
- answer()
|
||||
-}
|
||||
diff --git a/test cases/rust/18 proc-macro/meson.build b/test cases/rust/18 proc-macro/meson.build
|
||||
index e8b28eda1..c5f0dfc82 100644
|
||||
--- a/test cases/rust/18 proc-macro/meson.build
|
||||
+++ b/test cases/rust/18 proc-macro/meson.build
|
||||
@@ -31,14 +31,3 @@ main = executable(
|
||||
)
|
||||
|
||||
test('main_test2', main)
|
||||
-
|
||||
-subdir('subdir')
|
||||
-
|
||||
-staticlib = static_library('staticlib', 'lib.rs',
|
||||
- link_with: pm_in_subdir,
|
||||
- rust_dependency_map : {'proc_macro_examples3' : 'proc_macro_examples'}
|
||||
-)
|
||||
-
|
||||
-executable('transitive-proc-macro', 'transitive-proc-macro.rs',
|
||||
- link_with: staticlib,
|
||||
-)
|
||||
diff --git a/test cases/rust/18 proc-macro/subdir/meson.build b/test cases/rust/18 proc-macro/subdir/meson.build
|
||||
deleted file mode 100644
|
||||
index 04842c431..000000000
|
||||
--- a/test cases/rust/18 proc-macro/subdir/meson.build
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-pm_in_subdir = rust.proc_macro('proc_macro_examples3', '../proc.rs')
|
||||
diff --git a/test cases/rust/18 proc-macro/transitive-proc-macro.rs b/test cases/rust/18 proc-macro/transitive-proc-macro.rs
|
||||
deleted file mode 100644
|
||||
index 4c804b3b6..000000000
|
||||
--- a/test cases/rust/18 proc-macro/transitive-proc-macro.rs
|
||||
+++ /dev/null
|
||||
@@ -1,7 +0,0 @@
|
||||
-extern crate staticlib;
|
||||
-use staticlib::func;
|
||||
-
|
||||
-
|
||||
-fn main() {
|
||||
- assert_eq!(42, func());
|
||||
-}
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in
|
||||
index 8529d89fe..94879ee01 100644
|
||||
--- a/thrust/thrust/cmake/thrust-header-search.cmake.in
|
||||
+++ b/thrust/thrust/cmake/thrust-header-search.cmake.in
|
||||
@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@")
|
||||
find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h
|
||||
NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search
|
||||
NO_DEFAULT_PATH # Only search explicit paths below:
|
||||
- PATHS
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
+ PATHS "@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
)
|
||||
set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL)
|
||||
@ -1,37 +0,0 @@
|
||||
From 52ac1d6548b4a92d569c5d2f53b84c604c7fce8a Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 1 Feb 2024 22:42:39 +0100
|
||||
Subject: [PATCH] Remove custom check target
|
||||
|
||||
The automatic one provides better controls for us
|
||||
---
|
||||
CMakeLists.txt | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index af643a7..75b3cc1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -105,18 +105,13 @@ add_subdirectory("data")
|
||||
|
||||
|
||||
if(ENABLE_TESTS)
|
||||
-enable_testing()
|
||||
+include(CTest)
|
||||
|
||||
pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
|
||||
include_directories(${QTDBUSTEST_INCLUDE_DIRS})
|
||||
|
||||
add_subdirectory(tests)
|
||||
|
||||
-ADD_CUSTOM_TARGET(
|
||||
- check
|
||||
- ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
|
||||
-)
|
||||
-
|
||||
find_package(CoverageReport)
|
||||
enable_coverage_report(
|
||||
TARGETS
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
From cf8ba54d22f5ac839004c0d984fb402bde82b527 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Mon, 8 Apr 2024 15:22:55 +0200
|
||||
Subject: [PATCH] Launch module-created systemd service
|
||||
|
||||
---
|
||||
data/com.lomiri.UserMetrics.service.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/data/com.lomiri.UserMetrics.service.in b/data/com.lomiri.UserMetrics.service.in
|
||||
index c2e6ae1..212e24f 100644
|
||||
--- a/data/com.lomiri.UserMetrics.service.in
|
||||
+++ b/data/com.lomiri.UserMetrics.service.in
|
||||
@@ -3,3 +3,4 @@ Name=com.lomiri.UserMetrics
|
||||
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/usermetricsservice
|
||||
User=usermetrics
|
||||
StandardOutput=syslog
|
||||
+SystemdService=dbus-com.lomiri.UserMetrics.service
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a407271b4..593628e0f 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -310,7 +310,7 @@ if(GCC)
|
||||
endif()
|
||||
check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN)
|
||||
if (CC_HAS_STACK_REALIGN)
|
||||
- add_definitions(-mstackrealign)
|
||||
+ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>)
|
||||
endif()
|
||||
# Disable exceptions. Reduce executable size, increase compability.
|
||||
check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG)
|
||||
@@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
|
||||
list(APPEND ASM_OBJS ${ASM}.${SUFFIX})
|
||||
add_custom_command(
|
||||
OUTPUT ${ASM}.${SUFFIX}
|
||||
- COMMAND ${CMAKE_CXX_COMPILER}
|
||||
+ COMMAND ${CMAKE_ASM_COMPILER}
|
||||
ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
|
||||
DEPENDS ${ASM_SRC})
|
||||
endforeach()
|
||||
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
|
||||
index 12b643ad5..876f3543d 100644
|
||||
--- a/common/CMakeLists.txt
|
||||
+++ b/common/CMakeLists.txt
|
||||
@@ -16,6 +16,7 @@ endif(EXTRA_LIB)
|
||||
if(ENABLE_ASSEMBLY)
|
||||
set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1)
|
||||
list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1")
|
||||
+ enable_language(ASM)
|
||||
endif(ENABLE_ASSEMBLY)
|
||||
|
||||
if(ENABLE_ASSEMBLY AND X86)
|
||||
@ -1,27 +0,0 @@
|
||||
From 5f843f7c8554e2feab7f57d8718231408196fd80 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weiss <dev.primeos@gmail.com>
|
||||
Date: Fri, 1 Nov 2019 18:47:14 +0100
|
||||
Subject: [PATCH] setup.py: Fix the setuptools version check
|
||||
|
||||
This broke the Nix build after setuptools.__version__ changed from
|
||||
"41.2.0" to "41.4.0.post20191022".
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 0d987d5c..4f625d7c 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -63,7 +63,7 @@ try:
|
||||
|
||||
setup, Command = setuptools.setup, setuptools.Command
|
||||
|
||||
- observed_version = [int(x) for x in setuptools.__version__.split('.')]
|
||||
+ observed_version = [int(x) for x in setuptools.__version__.split('.')[0:3]]
|
||||
required_version = [36, 2, 0]
|
||||
|
||||
# NOTE(etingof): require fresh setuptools to build proper wheels
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608
|
||||
|
||||
Fix llvm testsuite failure on a single test:
|
||||
FAIL: LLVM :: tools/gold/PowerPC/mtriple.ll (43659 of 49708)
|
||||
ld.gold: internal error in add_output_section_to_load, at output.cc:4097
|
||||
|
||||
From: Alan Modra <amodra@gmail.com>
|
||||
Date: Thu, 24 Aug 2023 23:42:18 +0000 (+0930)
|
||||
Subject: PR30794, PowerPC gold: internal error in add_output_section_to_load
|
||||
X-Git-Tag: gdb-14-branchpoint~482
|
||||
X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608
|
||||
|
||||
PR30794, PowerPC gold: internal error in add_output_section_to_load
|
||||
|
||||
Caused by commit 5a97377e5513, specifically this code added to
|
||||
Target_powerpc::do_relax
|
||||
+ if (parameters->options().output_is_position_independent())
|
||||
+ this->rela_dyn_size_
|
||||
+ = this->rela_dyn_section(layout)->current_data_size();
|
||||
|
||||
The problem here is that if .rela.dyn isn't already created then the
|
||||
call to rela_dyn_section creates it, and as this comment in
|
||||
Target_powerpc::do_finalize_sections says:
|
||||
// Annoyingly, we need to make these sections now whether or
|
||||
// not we need them. If we delay until do_relax then we
|
||||
// need to mess with the relaxation machinery checkpointing.
|
||||
We can't be creating sections in do_relax.
|
||||
|
||||
PR 30794
|
||||
* powerpc.cc (Target_powerpc::do_relax): Only set rela_dyn_size_
|
||||
for size == 64, and assert that rela_dyn_ already exists.
|
||||
Tidy code setting plt_thread_safe, which also only needs to be
|
||||
set when size == 64 for ELFv1.
|
||||
---
|
||||
|
||||
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
|
||||
index e66d9cbb900..a4fecaae55a 100644
|
||||
--- a/gold/powerpc.cc
|
||||
+++ b/gold/powerpc.cc
|
||||
@@ -3714,12 +3714,7 @@ Target_powerpc<size, big_endian>::do_relax(int pass,
|
||||
unsigned int prev_brlt_size = 0;
|
||||
if (pass == 1)
|
||||
{
|
||||
- bool thread_safe
|
||||
- = this->abiversion() < 2 && parameters->options().plt_thread_safe();
|
||||
- if (size == 64
|
||||
- && this->abiversion() < 2
|
||||
- && !thread_safe
|
||||
- && !parameters->options().user_set_plt_thread_safe())
|
||||
+ if (size == 64 && this->abiversion() < 2)
|
||||
{
|
||||
static const char* const thread_starter[] =
|
||||
{
|
||||
@@ -3747,29 +3742,37 @@ Target_powerpc<size, big_endian>::do_relax(int pass,
|
||||
/* libgo */
|
||||
"__go_go",
|
||||
};
|
||||
+ bool thread_safe = parameters->options().plt_thread_safe();
|
||||
|
||||
- if (parameters->options().shared())
|
||||
- thread_safe = true;
|
||||
- else
|
||||
+ if (!thread_safe
|
||||
+ && !parameters->options().user_set_plt_thread_safe())
|
||||
{
|
||||
- for (unsigned int i = 0;
|
||||
- i < sizeof(thread_starter) / sizeof(thread_starter[0]);
|
||||
- i++)
|
||||
+ if (parameters->options().shared())
|
||||
+ thread_safe = true;
|
||||
+ else
|
||||
{
|
||||
- Symbol* sym = symtab->lookup(thread_starter[i], NULL);
|
||||
- thread_safe = (sym != NULL
|
||||
- && sym->in_reg()
|
||||
- && sym->in_real_elf());
|
||||
- if (thread_safe)
|
||||
- break;
|
||||
+ for (unsigned int i = 0;
|
||||
+ i < sizeof(thread_starter) / sizeof(thread_starter[0]);
|
||||
+ i++)
|
||||
+ {
|
||||
+ Symbol* sym = symtab->lookup(thread_starter[i], NULL);
|
||||
+ thread_safe = (sym != NULL
|
||||
+ && sym->in_reg()
|
||||
+ && sym->in_real_elf());
|
||||
+ if (thread_safe)
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
+ this->plt_thread_safe_ = thread_safe;
|
||||
}
|
||||
- this->plt_thread_safe_ = thread_safe;
|
||||
|
||||
- if (parameters->options().output_is_position_independent())
|
||||
- this->rela_dyn_size_
|
||||
- = this->rela_dyn_section(layout)->current_data_size();
|
||||
+ if (size == 64
|
||||
+ && parameters->options().output_is_position_independent())
|
||||
+ {
|
||||
+ gold_assert (this->rela_dyn_);
|
||||
+ this->rela_dyn_size_ = this->rela_dyn_->current_data_size();
|
||||
+ }
|
||||
|
||||
this->stub_group_size_ = parameters->options().stub_group_size();
|
||||
bool no_size_errors = true;
|
||||
@ -1,107 +0,0 @@
|
||||
--- objc4-551.1/runtime/objc-os.h 2013-06-10 21:16:15.000000000 -0400
|
||||
+++ ../objc4-551.1/runtime/objc-os.h 2015-01-19 01:01:36.000000000 -0500
|
||||
@@ -77,27 +77,72 @@
|
||||
# include <mach-o/getsect.h>
|
||||
# include <mach-o/dyld_priv.h>
|
||||
# include <malloc/malloc.h>
|
||||
-# include <os/lock_private.h>
|
||||
# include <libkern/OSAtomic.h>
|
||||
# include <libkern/OSCacheControl.h>
|
||||
-# include <System/pthread_machdep.h>
|
||||
# include "objc-probes.h" // generated dtrace probe definitions.
|
||||
|
||||
+#define __PTK_FRAMEWORK_OBJC_KEY5 45
|
||||
+#define __PTK_FRAMEWORK_OBJC_KEY6 46
|
||||
+#define __PTK_FRAMEWORK_OBJC_KEY7 47
|
||||
+#define __PTK_FRAMEWORK_OBJC_KEY8 48
|
||||
+#define __PTK_FRAMEWORK_OBJC_KEY9 49
|
||||
+
|
||||
+extern "C" int pthread_key_init_np(int, void (*)(void *));
|
||||
+
|
||||
// Some libc functions call objc_msgSend()
|
||||
// so we can't use them without deadlocks.
|
||||
void syslog(int, const char *, ...) UNAVAILABLE_ATTRIBUTE;
|
||||
void vsyslog(int, const char *, va_list) UNAVAILABLE_ATTRIBUTE;
|
||||
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
+
|
||||
+// Inlined spinlock.
|
||||
+// Not for arm on iOS because it hurts uniprocessor performance.
|
||||
+
|
||||
+#define ARR_SPINLOCK_INIT 0
|
||||
+// XXX -- Careful: OSSpinLock isn't volatile, but should be
|
||||
+typedef volatile int ARRSpinLock;
|
||||
+__attribute__((always_inline))
|
||||
+static inline void ARRSpinLockLock(ARRSpinLock *l)
|
||||
+{
|
||||
+ unsigned y;
|
||||
+again:
|
||||
+ if (__builtin_expect(__sync_lock_test_and_set(l, 1), 0) == 0) {
|
||||
+ return;
|
||||
+ }
|
||||
+ for (y = 1000; y; y--) {
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
+ asm("pause");
|
||||
+#endif
|
||||
+ if (*l == 0) goto again;
|
||||
+ }
|
||||
+ thread_switch(THREAD_NULL, SWITCH_OPTION_DEPRESS, 1);
|
||||
+ goto again;
|
||||
+}
|
||||
+__attribute__((always_inline))
|
||||
+static inline void ARRSpinLockUnlock(ARRSpinLock *l)
|
||||
+{
|
||||
+ __sync_lock_release(l);
|
||||
+}
|
||||
+__attribute__((always_inline))
|
||||
+static inline int ARRSpinLockTry(ARRSpinLock *l)
|
||||
+{
|
||||
+ return __sync_bool_compare_and_swap(l, 0, 1);
|
||||
+}
|
||||
+
|
||||
+#define spinlock_t ARRSpinLock
|
||||
+#define spinlock_trylock(l) ARRSpinLockTry(l)
|
||||
+#define spinlock_lock(l) ARRSpinLockLock(l)
|
||||
+#define spinlock_unlock(l) ARRSpinLockUnlock(l)
|
||||
+#define SPINLOCK_INITIALIZER ARR_SPINLOCK_INIT
|
||||
|
||||
-#define spinlock_t os_lock_handoff_s
|
||||
-#define spinlock_trylock(l) os_lock_trylock(l)
|
||||
-#define spinlock_lock(l) os_lock_lock(l)
|
||||
-#define spinlock_unlock(l) os_lock_unlock(l)
|
||||
-#define SPINLOCK_INITIALIZER OS_LOCK_HANDOFF_INIT
|
||||
+#endif
|
||||
|
||||
|
||||
#if !TARGET_OS_IPHONE
|
||||
-# include <CrashReporterClient.h>
|
||||
+#define CRSetCrashLogMessage(msg)
|
||||
+#define CRGetCrashLogMessage() 0
|
||||
+#define CRSetCrashLogMessage2(msg)
|
||||
#else
|
||||
// CrashReporterClient not yet available on iOS
|
||||
__BEGIN_DECLS
|
||||
@@ -594,21 +639,13 @@
|
||||
{
|
||||
assert(is_valid_direct_key(k));
|
||||
|
||||
- if (_pthread_has_direct_tsd()) {
|
||||
- return _pthread_getspecific_direct(k);
|
||||
- } else {
|
||||
- return pthread_getspecific(k);
|
||||
- }
|
||||
+ return pthread_getspecific(k);
|
||||
}
|
||||
static inline void tls_set_direct(tls_key_t k, void *value)
|
||||
{
|
||||
assert(is_valid_direct_key(k));
|
||||
|
||||
- if (_pthread_has_direct_tsd()) {
|
||||
- _pthread_setspecific_direct(k, value);
|
||||
- } else {
|
||||
- pthread_setspecific(k, value);
|
||||
- }
|
||||
+ pthread_setspecific(k, value);
|
||||
}
|
||||
|
||||
// not arm
|
||||
@ -1,18 +0,0 @@
|
||||
--- old/private/http.scm
|
||||
+++ new/private/http.scm
|
||||
@@ -101,14 +101,7 @@
|
||||
;; shouldn't, but it's an old issue.
|
||||
(log/error "Could not load libcurl. Please install the curl development(!) package.")
|
||||
(exit 1)))
|
||||
- (case (os-name)
|
||||
- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib")))
|
||||
- ((msys) (set! libcurl (open-shared-object "msys-curl-4")))
|
||||
- (else
|
||||
- (guard (exn
|
||||
- (else
|
||||
- (set! libcurl (open-shared-object "libcurl.so.3"))))
|
||||
- (set! libcurl (open-shared-object "libcurl.so.4"))))))
|
||||
+ (set! libcurl (open-shared-object "@libcurl@")))
|
||||
(letrec ()
|
||||
(define %curl_global_init (foreign-procedure libcurl int curl_global_init (long)))
|
||||
(call %curl_global_init #b11)))
|
||||
@ -1,40 +0,0 @@
|
||||
From 9e434fff4486afeb3cc3f631f6dc56492b204704 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Wed, 31 Jul 2024 23:53:31 +0200
|
||||
Subject: [PATCH] add extra-experimental-features for nix-command
|
||||
|
||||
fixes https://github.com/NixOS/nixpkgs/pull/331230
|
||||
---
|
||||
nix-serve.psgi | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/nix-serve.psgi b/nix-serve.psgi
|
||||
index 928fa3b..65a8680 100644
|
||||
--- a/nix-serve.psgi
|
||||
+++ b/nix-serve.psgi
|
||||
@@ -64,7 +64,7 @@ my $app = sub {
|
||||
return [404, ['Content-Type' => 'text/plain'], ["Incorrect NAR hash. Maybe the path has been recreated.\n"]]
|
||||
unless $narHash eq "sha256:$expectedNarHash";
|
||||
my $fh = new IO::Handle;
|
||||
- open $fh, "-|", "nix", "dump-path", "--", $storePath;
|
||||
+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath;
|
||||
return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh];
|
||||
}
|
||||
|
||||
@@ -75,14 +75,14 @@ my $app = sub {
|
||||
return [404, ['Content-Type' => 'text/plain'], ["No such path.\n"]] unless $storePath;
|
||||
my ($deriver, $narHash, $time, $narSize, $refs) = $store->queryPathInfo($storePath, 1) or die;
|
||||
my $fh = new IO::Handle;
|
||||
- open $fh, "-|", "nix", "dump-path", "--", $storePath;
|
||||
+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath;
|
||||
return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh];
|
||||
}
|
||||
|
||||
elsif ($path =~ /^\/log\/([0-9a-z]+-[0-9a-zA-Z\+\-\.\_\?\=]+)/) {
|
||||
my $storePath = "$Nix::Config::storeDir/$1";
|
||||
my $fh = new IO::Handle;
|
||||
- open $fh, "-|", "nix", "log", $storePath;
|
||||
+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "log", $storePath;
|
||||
return [200, ['Content-Type' => 'text/plain' ], $fh];
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user