diff options
author | Naïm Favier <n@monade.li> | 2024-01-25 12:42:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-25 12:42:50 +0100 |
commit | 6d11e88fed7c5c1e375f2293f3e842ff895d9ffd (patch) | |
tree | f4913eb5f152bd27a01a5bb3fea550e1d08f53da /pkgs | |
parent | b63791c6e5ca0aa4d9637450a7555a1a5273ce1f (diff) | |
parent | 1db64f27b41e695392cf0cee375d7491a2c4fcc7 (diff) | |
download | nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar.gz nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar.bz2 nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar.lz nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar.xz nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.tar.zst nixlib-6d11e88fed7c5c1e375f2293f3e842ff895d9ffd.zip |
Merge pull request #280945 from katexochen/treewide/unref-patches
treewide: cleanup unreferenced patch files
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch | 13 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/rename-numa-api-call.patch | 32 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/sphinx-4-configuration.patch | 11 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/llvm-7-musl.patch | 92 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lxc/support-db2x.patch | 16 | ||||
-rw-r--r-- | pkgs/servers/code-server/playwright.patch | 10 |
6 files changed, 0 insertions, 174 deletions
diff --git a/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch b/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch deleted file mode 100644 index c20c62f9cf6f..000000000000 --- a/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in -index 2670ad3cf1..d2f9d85c31 100644 ---- a/docs/users_guide/ghc_config.py.in -+++ b/docs/users_guide/ghc_config.py.in -@@ -1,6 +1,6 @@ - extlinks = { -- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue #'), -- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki'), -+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue %s'), -+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki %s'), - } - - libs_base_uri = '../libraries' diff --git a/pkgs/development/compilers/ghc/rename-numa-api-call.patch b/pkgs/development/compilers/ghc/rename-numa-api-call.patch deleted file mode 100644 index 747d7a81a11e..000000000000 --- a/pkgs/development/compilers/ghc/rename-numa-api-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c ---- a/rts/win32/OSMem.c -+++ b/rts/win32/OSMem.c -@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL; - typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD); - - /* Cache NUMA API call. */ --VirtualAllocExNumaProc VirtualAllocExNuma; -+VirtualAllocExNumaProc _VirtualAllocExNuma; - - void - osMemInit(void) -@@ -52,8 +52,8 @@ osMemInit(void) - /* Resolve and cache VirtualAllocExNuma. */ - if (osNumaAvailable() && RtsFlags.GcFlags.numa) - { -- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); -- if (!VirtualAllocExNuma) -+ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); -+ if (!_VirtualAllocExNuma) - { - sysErrorBelch( - "osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?"); -@@ -569,7 +569,7 @@ void osBindMBlocksToNode( - On windows also -xb is broken, it does nothing so that can't - be used to tweak it (see #12577). So for now, just let the OS decide. - */ -- temp = VirtualAllocExNuma( -+ temp = _VirtualAllocExNuma( - GetCurrentProcess(), - NULL, // addr? See base memory - size, diff --git a/pkgs/development/compilers/ghc/sphinx-4-configuration.patch b/pkgs/development/compilers/ghc/sphinx-4-configuration.patch deleted file mode 100644 index 884a0bb39a5f..000000000000 --- a/pkgs/development/compilers/ghc/sphinx-4-configuration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200 -+++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200 -@@ -100,7 +100,7 @@ - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} diff --git a/pkgs/development/compilers/llvm/llvm-7-musl.patch b/pkgs/development/compilers/llvm/llvm-7-musl.patch deleted file mode 100644 index 0dac12cc20d6..000000000000 --- a/pkgs/development/compilers/llvm/llvm-7-musl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8c747d3157df2830eed9205e7caf1203b345de17 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 4 Feb 2023 13:54:41 -0800 -Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems - -Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based -systems. This will make sure that 64bit versions of LFS functions are -used e.g. seek will behave same as lseek64. Also revert [1] partially -because this added a cmake test to detect lseek64 but then forgot to -pass the needed macro to actual compile, this test was incomplete too -since libc implementations like musl has 64bit off_t by default on 32bit -systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE -like glibc, which means the compile now fails on musl because the cmake -check passes but we do not have _LARGEFILE64_SOURCE defined. Using the -*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64 -instead - -[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b -[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc - -Reviewed By: MaskRay - -Differential Revision: https://reviews.llvm.org/D139752 - -(cherry picked from commit 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67) ---- - cmake/config-ix.cmake | 13 ++++++++++--- - include/llvm/Config/config.h.cmake | 3 --- - lib/Support/raw_ostream.cpp | 2 -- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake -index 18977d9950ff..b558aa83fa62 100644 ---- a/cmake/config-ix.cmake -+++ b/cmake/config-ix.cmake -@@ -197,9 +197,6 @@ check_symbol_exists(posix_fallocate fcntl.h HAVE_POSIX_FALLOCATE) - if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) - check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) - endif() --set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") --check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) --set(CMAKE_REQUIRED_DEFINITIONS "") - check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) - check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) - check_symbol_exists(malloc_zone_statistics malloc/malloc.h -@@ -237,6 +234,16 @@ if( PURE_WINDOWS ) - check_function_exists(__main HAVE___MAIN) - check_function_exists(__cmpdi2 HAVE___CMPDI2) - endif() -+ -+check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) -+if( LLVM_USING_GLIBC ) -+# enable 64bit off_t on 32bit systems using glibc -+ if (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ add_compile_definitions(_FILE_OFFSET_BITS=64) -+ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") -+ endif() -+endif() -+ - if( HAVE_DLFCN_H ) - if( HAVE_LIBDL ) - list(APPEND CMAKE_REQUIRED_LIBRARIES dl) -diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake -index e934617d7ec7..3c39c373b3c1 100644 ---- a/include/llvm/Config/config.h.cmake -+++ b/include/llvm/Config/config.h.cmake -@@ -112,9 +112,6 @@ - /* Define to 1 if you have the <link.h> header file. */ - #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} - --/* Define to 1 if you have the `lseek64' function. */ --#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} -- - /* Define to 1 if you have the <mach/mach.h> header file. */ - #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} - -diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp -index 038ad00bd608..921ab8409008 100644 ---- a/lib/Support/raw_ostream.cpp -+++ b/lib/Support/raw_ostream.cpp -@@ -677,8 +677,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { - flush(); - #ifdef _WIN32 - pos = ::_lseeki64(FD, off, SEEK_SET); --#elif defined(HAVE_LSEEK64) -- pos = ::lseek64(FD, off, SEEK_SET); - #else - pos = ::lseek(FD, off, SEEK_SET); - #endif --- -2.37.1 - diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch deleted file mode 100644 index 16715992d35f..000000000000 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 84f8699..dce9033 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then - AC_SUBST(db2xman) - fi - AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) --AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) -+AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) - --if test "x$db2xman" = "xdocbook2man"; then -+if test "x$db2xman" = "no-no-no"; then - docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" - else - docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch deleted file mode 100644 index 95a74748189d..000000000000 --- a/pkgs/servers/code-server/playwright.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -+++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -@@ -14,6 +14,4 @@ - * limitations under the License. - */ - --const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); -- --installDefaultBrowsersForNpmInstall(); -+process.stdout.write('Browser install disabled by Nix build script\n'); |