public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05

Browse Source
This commit is contained in:
Jonathan Ringer
2021-05-31 12:44:56 -07:00
parent 813b3b2a0c 0c2e856ea0
commit 7b601ada77
138 changed files with 1684 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/arrow-cpp/default.nix
+6 -6
View File
@@ -22,12 +22,12 @@ let
in stdenv.mkDerivation rec {
pname = "arrow-cpp";
version = "4.0.0";
version = "4.0.1";
src = fetchurl {
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa";
sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m";
};
sourceRoot = "apache-arrow-${version}/cpp";
@@ -146,11 +146,11 @@ in stdenv.mkDerivation rec {
--exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$'
'';
meta = {
meta = with lib; {
description = "A cross-language development platform for in-memory data";
homepage = "https://arrow.apache.org/";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ tobim veprbl ];
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ tobim veprbl ];
};
}
pkgs/development/libraries/getdata/default.nix
+8 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libtool }:
{ lib, stdenv, fetchurl, fetchpatch, libtool }:
stdenv.mkDerivation rec {
pname = "getdata";
version = "0.10.0";
@@ -7,6 +7,13 @@ stdenv.mkDerivation rec {
sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
};
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch";
sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm";
})
];
buildInputs = [ libtool ];
meta = with lib; {
pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch
+13
View File
@@ -0,0 +1,13 @@
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200
+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200
@@ -333,7 +333,7 @@
# So, try first to find the CMake module provided by libxml2 package, then fallback
# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially
# in static build case).
-find_package(LibXml2 QUIET NO_MODULE)
+find_package(LibXml2 QUIET MODULE)
if(DEFINED LIBXML2_VERSION_STRING)
set(LIBXML2_FOUND ON)
set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
Seulement dans b: good.patch
pkgs/development/libraries/libiio/default.nix
+4
View File
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7";
};
# Revert after https://github.com/NixOS/nixpkgs/issues/125008 is
# fixed properly
patches = [ ./cmake-fix-libxml2-find-package.patch ];
nativeBuildInputs = [
cmake
flex
pkgs/development/libraries/libxlsxwriter/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libxlsxwriter";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "jmcnamara";
repo = "libxlsxwriter";
rev = "RELEASE_${version}";
sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v";
sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx";
};
nativeBuildInputs = [
pkgs/development/libraries/mpich/default.nix
+3 -19
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, perl, gfortran
, openssh, hwloc, autoconf, automake, libtool
, openssh, hwloc
# either libfabric or ucx work for ch4backend on linux. On darwin, neither of
# these libraries currently build so this argument is ignored on Darwin.
, ch4backend
@@ -11,29 +11,13 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
stdenv.mkDerivation rec {
pname = "mpich";
version = "3.4.1";
version = "3.4.2";
src = fetchurl {
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
sha256 = "09wpfw9lsrc84vcmfw94razd4xv4znx4mmg7rqmljvgg0jc96dl8";
sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw";
};
patches = [
# Reverts an upstream change that causes json-c test to fail
./jsonc-test.patch
];
# Required for the json-c patch
nativeBuildInputs = [ autoconf automake libtool ];
# Update configure after patch
postPatch = ''
cd modules/json-c
./autogen.sh
cd ../..
'';
configureFlags = [
"--enable-shared"
"--enable-sharedlib"
pkgs/development/libraries/mpich/jsonc-test.patch
-62
View File
@@ -1,62 +0,0 @@
--- b/modules/json-c/configure.ac
+++ a/modules/json-c/configure.ac
@@ -75,7 +75,7 @@
AC_FUNC_VPRINTF
AC_FUNC_MEMCMP
AC_CHECK_FUNCS([realloc])
+AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open strncasecmp setlocale)
-AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf open strncasecmp setlocale)
AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]])
AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]])
AC_CHECK_DECLS([isnan], [], [], [[#include <math.h>]])
--- b/modules/json-c/json_pointer.c
+++ a/modules/json-c/json_pointer.c
@@ -208,7 +208,7 @@
}
va_start(args, path_fmt);
+ rc = vasprintf(&path_copy, path_fmt, args);
- rc = json_vasprintf(&path_copy, path_fmt, args);
va_end(args);
if (rc < 0)
@@ -287,7 +287,7 @@
/* pass a working copy to the recursive call */
va_start(args, path_fmt);
+ rc = vasprintf(&path_copy, path_fmt, args);
- rc = json_vasprintf(&path_copy, path_fmt, args);
va_end(args);
if (rc < 0)
--- b/modules/json-c/printbuf.c
+++ a/modules/json-c/printbuf.c
@@ -129,7 +129,7 @@
would have been written - this code handles both cases. */
if(size == -1 || size > 127) {
va_start(ap, msg);
+ if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
- if((size = json_vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
va_end(ap);
printbuf_memappend(p, t, size);
free(t);
--- b/modules/json-c/vasprintf_compat.h
+++ a/modules/json-c/vasprintf_compat.h
@@ -8,8 +8,9 @@
#include "snprintf_compat.h"
+#if !defined(HAVE_VASPRINTF)
/* CAW: compliant version of vasprintf */
+static int vasprintf(char **buf, const char *fmt, va_list ap)
-static int json_vasprintf(char **buf, const char *fmt, va_list ap)
{
#ifndef WIN32
static char _T_emptybuffer = '\0';
@@ -40,5 +41,6 @@
return chars;
}
+#endif /* !HAVE_VASPRINTF */
#endif /* __vasprintf_compat_h */
pkgs/development/libraries/nv-codec-headers/10_x.nix
+22
View File
@@ -0,0 +1,22 @@
{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "nv-codec-headers";
version = "10.0.26.2";
src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}";
sha256 = "0n5jlwjfv5irx1if1g0n52m279bw7ab6bd3jz2v4vwg9cdzbxx85";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = {
description = "FFmpeg version of headers for NVENC";
homepage = "https://ffmpeg.org/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.MP2E ];
platforms = lib.platforms.all;
};
}
pkgs/development/libraries/poppler/default.nix
+1 -2
View File
@@ -65,10 +65,9 @@ stdenv.mkDerivation rec {
cairo
lcms
curl
nss
] ++ lib.optionals qt5Support [
qtbase
] ++ lib.optionals utils [
nss
] ++ lib.optionals introspectionSupport [
gobject-introspection
];
pkgs/development/libraries/qhull/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "qhull";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
meta = with lib; {
homepage = "http://www.qhull.org/";
pkgs/development/libraries/vapoursynth/plugin-interface.nix
+3 -2
View File
@@ -8,10 +8,11 @@ plugins: let
getRecursivePropagatedBuildInputs = pkgs: lib.flatten
(map
(pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs))
(pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs;
in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs))
pkgs);
deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins);
deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins));
pluginsEnv = buildEnv {
name = "vapoursynth-plugins-env";
pkgs/development/libraries/webkitgtk/428774.patch
+86
View File
@@ -0,0 +1,86 @@
diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500
+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400
@@ -87,7 +87,7 @@
if (!m_store.createSharedMemoryHandle(handle))
return;
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
uint64_t dataSize = handle.size();
#else
uint64_t dataSize = 0;
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400
@@ -26,8 +26,6 @@
#include "config.h"
#include "IPCSemaphore.h"
-#if !OS(DARWIN)
-
namespace IPC {
Semaphore::Semaphore() = default;
@@ -46,5 +44,3 @@
}
}
-
-#endif
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400
@@ -29,7 +29,7 @@
#include <wtf/Optional.h>
#include <wtf/Seconds.h>
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
#include <mach/semaphore.h>
#include <wtf/MachSendRight.h>
#endif
@@ -51,7 +51,7 @@
void encode(Encoder&) const;
static Optional<Semaphore> decode(Decoder&);
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
explicit Semaphore(MachSendRight&&);
void signal();
@@ -64,7 +64,7 @@
#endif
private:
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
void destroy();
MachSendRight m_sendRight;
semaphore_t m_semaphore { SEMAPHORE_NULL };
Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500
+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400
@@ -75,7 +75,7 @@
bool isNull() const;
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
size_t size() const { return m_size; }
#endif
diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500
+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400
@@ -119,7 +119,7 @@
return;
// FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
uint64_t dataSize = handle.size();
#else
uint64_t dataSize = 0;
Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
pkgs/development/libraries/webkitgtk/default.nix
+36
View File
@@ -1,5 +1,7 @@
{ lib, stdenv
, runCommandNoCC
, fetchurl
, fetchpatch
, perl
, python3
, ruby
@@ -34,6 +36,7 @@
, libidn
, libedit
, readline
, sdk
, libGL
, libGLU
, mesa
@@ -78,6 +81,32 @@ stdenv.mkDerivation rec {
inherit (addOpenGLRunpath) driverLink;
})
./libglvnd-headers.patch
] ++ lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff";
sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA=";
excludes = [ "Source/WebKit/ChangeLog" ];
})
# https://bugs.webkit.org/show_bug.cgi?id=225856
(fetchpatch {
url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU=";
excludes = [ "Source/WebCore/ChangeLog" ];
})
# https://bugs.webkit.org/show_bug.cgi?id=225850
./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774
(fetchpatch {
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776";
sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ=";
excludes = [ "Source/WTF/ChangeLog" ];
})
(fetchpatch {
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778";
sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo=";
excludes = [ "Source/WebKit/ChangeLog" ];
})
];
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@@ -96,6 +125,7 @@ stdenv.mkDerivation rec {
gperf
ninja
perl
perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
pkg-config
python3
ruby
@@ -143,6 +173,12 @@ stdenv.mkDerivation rec {
]) ++ lib.optionals stdenv.isDarwin [
libedit
readline
# Pull a header that contains a definition of proc_pid_rusage().
# (We pick just that one because using the other headers from `sdk` is not
# compatible with our C++ standard library)
(runCommandNoCC "${pname}_headers" {} ''
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
'')
] ++ lib.optionals stdenv.isLinux [
bubblewrap
libseccomp