pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #280945 from katexochen/treewide/unref-patches

treewide: cleanup unreferenced patch files

authored by Naïm Favier and committed by GitHub 6d11e88f b63791c6

-174
unified split
-13
pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch
··· 1 - diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in 2 - index 2670ad3cf1..d2f9d85c31 100644 3 - --- a/docs/users_guide/ghc_config.py.in 4 - +++ b/docs/users_guide/ghc_config.py.in 5 - @@ -1,6 +1,6 @@ 6 - extlinks = { 7 - - 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue #'), 8 - - 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki'), 9 - + 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue %s'), 10 - + 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki %s'), 11 - } 12 - 13 - libs_base_uri = '../libraries'
-32
pkgs/development/compilers/ghc/rename-numa-api-call.patch
··· 1 - diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c 2 - --- a/rts/win32/OSMem.c 3 - +++ b/rts/win32/OSMem.c 4 - @@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL; 5 - typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD); 6 - 7 - /* Cache NUMA API call. */ 8 - -VirtualAllocExNumaProc VirtualAllocExNuma; 9 - +VirtualAllocExNumaProc _VirtualAllocExNuma; 10 - 11 - void 12 - osMemInit(void) 13 - @@ -52,8 +52,8 @@ osMemInit(void) 14 - /* Resolve and cache VirtualAllocExNuma. */ 15 - if (osNumaAvailable() && RtsFlags.GcFlags.numa) 16 - { 17 - - VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); 18 - - if (!VirtualAllocExNuma) 19 - + _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); 20 - + if (!_VirtualAllocExNuma) 21 - { 22 - sysErrorBelch( 23 - "osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?"); 24 - @@ -569,7 +569,7 @@ void osBindMBlocksToNode( 25 - On windows also -xb is broken, it does nothing so that can't 26 - be used to tweak it (see #12577). So for now, just let the OS decide. 27 - */ 28 - - temp = VirtualAllocExNuma( 29 - + temp = _VirtualAllocExNuma( 30 - GetCurrentProcess(), 31 - NULL, // addr? See base memory 32 - size,
-11
pkgs/development/compilers/ghc/sphinx-4-configuration.patch
··· 1 - --- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200 2 - +++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200 3 - @@ -100,7 +100,7 @@ 4 - latex_elements = { 5 - 'inputenc': '', 6 - 'utf8extra': '', 7 - - 'preamble': ''' 8 - + 'preamble': r''' 9 - \usepackage{fontspec} 10 - \usepackage{makeidx} 11 - \setsansfont{DejaVu Sans}
-92
pkgs/development/compilers/llvm/llvm-7-musl.patch
··· 1 - From 8c747d3157df2830eed9205e7caf1203b345de17 Mon Sep 17 00:00:00 2001 2 - From: Khem Raj <raj.khem@gmail.com> 3 - Date: Sat, 4 Feb 2023 13:54:41 -0800 4 - Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems 5 - 6 - Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based 7 - systems. This will make sure that 64bit versions of LFS functions are 8 - used e.g. seek will behave same as lseek64. Also revert [1] partially 9 - because this added a cmake test to detect lseek64 but then forgot to 10 - pass the needed macro to actual compile, this test was incomplete too 11 - since libc implementations like musl has 64bit off_t by default on 32bit 12 - systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE 13 - like glibc, which means the compile now fails on musl because the cmake 14 - check passes but we do not have _LARGEFILE64_SOURCE defined. Using the 15 - *64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64 16 - instead 17 - 18 - [1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b 19 - [2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc 20 - 21 - Reviewed By: MaskRay 22 - 23 - Differential Revision: https://reviews.llvm.org/D139752 24 - 25 - (cherry picked from commit 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67) 26 - --- 27 - cmake/config-ix.cmake | 13 ++++++++++--- 28 - include/llvm/Config/config.h.cmake | 3 --- 29 - lib/Support/raw_ostream.cpp | 2 -- 30 - 3 files changed, 10 insertions(+), 8 deletions(-) 31 - 32 - diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake 33 - index 18977d9950ff..b558aa83fa62 100644 34 - --- a/cmake/config-ix.cmake 35 - +++ b/cmake/config-ix.cmake 36 - @@ -197,9 +197,6 @@ check_symbol_exists(posix_fallocate fcntl.h HAVE_POSIX_FALLOCATE) 37 - if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) 38 - check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) 39 - endif() 40 - -set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") 41 - -check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) 42 - -set(CMAKE_REQUIRED_DEFINITIONS "") 43 - check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) 44 - check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) 45 - check_symbol_exists(malloc_zone_statistics malloc/malloc.h 46 - @@ -237,6 +234,16 @@ if( PURE_WINDOWS ) 47 - check_function_exists(__main HAVE___MAIN) 48 - check_function_exists(__cmpdi2 HAVE___CMPDI2) 49 - endif() 50 - + 51 - +check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) 52 - +if( LLVM_USING_GLIBC ) 53 - +# enable 64bit off_t on 32bit systems using glibc 54 - + if (CMAKE_SIZEOF_VOID_P EQUAL 4) 55 - + add_compile_definitions(_FILE_OFFSET_BITS=64) 56 - + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") 57 - + endif() 58 - +endif() 59 - + 60 - if( HAVE_DLFCN_H ) 61 - if( HAVE_LIBDL ) 62 - list(APPEND CMAKE_REQUIRED_LIBRARIES dl) 63 - diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake 64 - index e934617d7ec7..3c39c373b3c1 100644 65 - --- a/include/llvm/Config/config.h.cmake 66 - +++ b/include/llvm/Config/config.h.cmake 67 - @@ -112,9 +112,6 @@ 68 - /* Define to 1 if you have the <link.h> header file. */ 69 - #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} 70 - 71 - -/* Define to 1 if you have the `lseek64' function. */ 72 - -#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} 73 - - 74 - /* Define to 1 if you have the <mach/mach.h> header file. */ 75 - #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} 76 - 77 - diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp 78 - index 038ad00bd608..921ab8409008 100644 79 - --- a/lib/Support/raw_ostream.cpp 80 - +++ b/lib/Support/raw_ostream.cpp 81 - @@ -677,8 +677,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { 82 - flush(); 83 - #ifdef _WIN32 84 - pos = ::_lseeki64(FD, off, SEEK_SET); 85 - -#elif defined(HAVE_LSEEK64) 86 - - pos = ::lseek64(FD, off, SEEK_SET); 87 - #else 88 - pos = ::lseek(FD, off, SEEK_SET); 89 - #endif 90 - -- 91 - 2.37.1 92 -
-16
pkgs/os-specific/linux/lxc/support-db2x.patch
··· 1 - diff --git a/configure.ac b/configure.ac 2 - index 84f8699..dce9033 100644 3 - --- a/configure.ac 4 - +++ b/configure.ac 5 - @@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then 6 - AC_SUBST(db2xman) 7 - fi 8 - AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) 9 - -AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) 10 - +AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) 11 - 12 - -if test "x$db2xman" = "xdocbook2man"; then 13 - +if test "x$db2xman" = "no-no-no"; then 14 - docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" 15 - else 16 - docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
-10
pkgs/servers/code-server/playwright.patch
··· 1 - --- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js 2 - +++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js 3 - @@ -14,6 +14,4 @@ 4 - * limitations under the License. 5 - */ 6 - 7 - -const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); 8 - - 9 - -installDefaultBrowsersForNpmInstall(); 10 - +process.stdout.write('Browser install disabled by Nix build script\n');