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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-29 00:03:09 +00:00
committed by GitHub
parent 98530c2e9e c72c4650de
commit e6c1d10f4b
8 changed files with 184 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libgrss/default.nix
+10 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
let
version = "0.7.0";
@@ -14,6 +14,15 @@ stdenv.mkDerivation {
sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
};
patches = [
(fetchpatch {
name = "CVE-2016-20011.patch";
# https://gitlab.gnome.org/GNOME/libgrss/-/merge_requests/7, not yet merged!
url = "https://gitlab.gnome.org/GNOME/libgrss/-/commit/2c6ea642663e2a44efc8583fae7c54b7b98f72b3.patch";
sha256 = "1ijvq2jl97vphcvrbrqxvszdmv6yyjfygdca9vyaijpafwyzzb18";
})
];
nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ glib libxml2 libsoup ];
pkgs/development/libraries/libslirp/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "libslirp";
version = "4.5.0";
version = "4.6.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "slirp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk=";
sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw=";
};
nativeBuildInputs = [ meson ninja pkg-config ];