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

Merge branch 'release-21.05' into staging-21.05

Browse Source
This commit is contained in:
Vladimír Čunát
2021-06-05 07:30:40 +02:00
parent 65a1f5fbdc 0edbcd01f6
commit 7b686ba07b
123 changed files with 1590 additions and 738 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/lasso/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, fetchpatch, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
stdenv.mkDerivation rec {
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
};
patches = [
(fetchpatch {
name = "CVE-2021-28091.patch";
url = "https://git.entrouvert.org/lasso.git/patch/?id=ea7e5efe9741e1b1787a58af16cb15b40c23be5a";
sha256 = "0070x01pir30hsb21mp69pf9pxingadl3y4w0afw07a5c57drhn4";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
pkgs/development/libraries/libccd/default.nix
+10 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "libccd";
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc";
};
patches = [
# Fix pkgconfig file with absolute CMAKE_INSTALL_*DIR
# https://github.com/danfis/libccd/pull/76
(fetchpatch {
url = "https://github.com/danfis/libccd/commit/cd16c4f168ae308e4c77db66ac97a2eaf47e059e.patch";
sha256 = "02wj21c185kwf8bn4qi4cnna0ypzqm481xw9rr8jy1i0cb1r9idg";
})
];
nativeBuildInputs = [ cmake ];
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/libraspberrypi/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
# https://github.com/raspberrypi/userland/pull/670
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
})
];
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/polkit/default.nix
+7
View File
@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
})
(fetchpatch {
# https://www.openwall.com/lists/oss-security/2021/06/03/1
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/79
name = "CVE-2021-3560.patch";
url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch";
sha256 = "157ddsizgr290jsb8fpafrc37gc1qw5pdvl351vnn3pzhqs7n6f4";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
# Make netgroup support optional (musl does not have it)
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10