Merge pull request #294294 from amaxine/gnome-2024-03-03-staging-updates
[staging] GNOME 45 updates (2024-03-03)
This commit is contained in:
commit
acefd0f368
4 changed files with 25 additions and 6 deletions
|
@ -19,13 +19,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "glib-networking";
|
pname = "glib-networking";
|
||||||
version = "2.78.0";
|
version = "2.78.1";
|
||||||
|
|
||||||
outputs = [ "out" "installedTests" ];
|
outputs = [ "out" "installedTests" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "Uv5M6T99xRM0sQKJRZmFjSPIplrEoRELMJIFZdaNOro=";
|
sha256 = "5I8t27BJgyy7CSMFKcXkXayp8N8O2jJfgy9zeYWb8J8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
|
||||||
})
|
})
|
||||||
|
|
||||||
./installed-tests-path.patch
|
./installed-tests-path.patch
|
||||||
|
|
||||||
|
# pkcs11 tests provide a relative path that gnutls of course isn't able to
|
||||||
|
# load, resulting in test failures
|
||||||
|
# https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/certificate.c#L926
|
||||||
|
# https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/connection.c#L3380
|
||||||
|
./disable-pkcs11-tests.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 0b3b8c0..7f6ce09 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -86,7 +86,7 @@ if gnutls_dep.found()
|
||||||
|
backends += ['gnutls']
|
||||||
|
# test-specific, maybe move to tls/tests
|
||||||
|
if cc.has_function('gnutls_pkcs11_init', prefix: '#include <gnutls/pkcs11.h>', dependencies: gnutls_dep)
|
||||||
|
- config_h.set10('HAVE_GNUTLS_PKCS11', true)
|
||||||
|
+ config_h.set10('HAVE_GNUTLS_PKCS11', false)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libhandy";
|
pname = "libhandy";
|
||||||
version = "1.8.2";
|
version = "1.8.3";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-0RqizT5XCsbQ79ukbRcxR8EfRYJkV+kkwFmQuy4N+a0=";
|
sha256 = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "pango";
|
pname = "pango";
|
||||||
version = "1.51.0";
|
version = "1.51.2";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
|
outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "dO/BCa5vkDu+avd+qirGCUuO4kWi4j8TKnqPCGLRqfU=";
|
sha256 = "sha256-PbpAfytfwRfhkvMCXwocyO3B/ZuTSxxXiyuXNCE5QVo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
|
|
Loading…
Reference in a new issue