b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #214150 from jtojnar/gnome

Browse source 
GNOME updates
This commit is contained in:
Jan Tojnar 2023-02-03 14:36:56 +01:00 committed by GitHub
parent 7f3a205816 781678b78b
commit 780c989913
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 108 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/gnome-builder/default.nix
View file

@ -41,13 +41,13 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "43.4";
version = "43.5";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw=";
sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o=";
};
patches = [

52
pkgs/applications/terminal-emulators/gnome-console/default.nix
View file

@ -1,72 +1,50 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, gettext
, gnome
, libgtop
, gtk3
, libhandy
, gtk4
, libadwaita
, pcre2
, vte
, appstream-glib
, vte-gtk4
, desktop-file-utils
, git
, meson
, ninja
, pkg-config
, python3
, sassc
, wrapGAppsHook
, wrapGAppsHook4
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "gnome-console";
# Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved!
version = "42.2";
version = "43.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4=";
};
patches = [
(fetchpatch {
name = "fix-clang-build-issues.patch";
url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
})
];
buildInputs = [
gettext
libgtop
gtk3
libhandy
pcre2
vte
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils
git
gettext
meson
ninja
pkg-config
python3
sassc
wrapGAppsHook
wrapGAppsHook4
];
mesonFlags = [
"-Dnautilus=disabled"
buildInputs = [
libgtop
gtk4
libadwaita
pcre2
vte-gtk4
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gnome-console";
};
};

4
pkgs/desktops/gnome/apps/gnome-maps/default.nix
View file

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
version = "43.3";
version = "43.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE=";
sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8=";
};
doCheck = true;

8
pkgs/desktops/gnome/core/zenity/default.nix
View file

@ -15,13 +15,17 @@
stdenv.mkDerivation rec {
pname = "zenity";
version = "3.43.0";
version = "3.44.0";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM=";
sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U=";
};
patches = [
./fix-icon-install.patch
];
nativeBuildInputs = [
meson
ninja

12
pkgs/desktops/gnome/core/zenity/fix-icon-install.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/data/meson.build b/data/meson.build
index 339b3cff..aca65efd 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -9,5 +9,6 @@ install_data(
'zenity-text.png',
'zenity-scale.png',
'zenity-entry.png',
- 'zenity-notification.png']
+ 'zenity-notification.png'],
+ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps',
)

4
pkgs/development/libraries/gupnp/1.6.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "gupnp";
version = "1.6.2";
version = "1.6.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8=";
sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg=";
};
depsBuildBuild = [

15
pkgs/development/libraries/gvfs/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch2
, meson
, ninja
, pkg-config
@ -44,13 +45,23 @@
stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.50.2";
version = "1.50.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4=";
sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0=";
};
patches = [
# Hardcode the ssh path again.
# https://gitlab.gnome.org/GNOME/gvfs/-/issues/465
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch";
hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8=";
revert = true;
})
];
postPatch = ''
# patchShebangs requires executable file
chmod +x meson_post_install.py

20
pkgs/development/libraries/libchamplain/default.nix
View file

@ -1,5 +1,4 @@
{ fetchurl
, fetchpatch
, lib
, stdenv
, meson
@ -23,25 +22,15 @@
stdenv.mkDerivation rec {
pname = "libchamplain";
version = "0.12.20";
version = "0.12.21";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac=";
};
patches = lib.optionals withLibsoup3 [
# Port to libsoup3
# https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch";
excludes = [ ".gitlab-ci.yml" ];
sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk=";
})
];
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [
meson
ninja
@ -68,6 +57,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Dvapi=true"
(lib.mesonBool "libsoup3" withLibsoup3)
];
passthru = {

4
pkgs/development/libraries/libhandy/default.nix
View file

@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "libhandy";
version = "1.8.0";
version = "1.8.1";
outputs = [
"out"
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg=";
sha256 = "sha256-N2a5qIH+BljMYIBFOiIZCGw/bb2CBp3kCbirP1mUinA=";
};
depsBuildBuild = [

4
pkgs/development/libraries/libsigcxx/3.0.nix
View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libsigc++";
version = "3.2.0";
version = "3.4.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE=";
sha256 = "AuJjD/tc6TzVLDhCNSHf5wYzKIY6bpbUHXZaYRa4cH4=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/tracker-miners/default.nix
View file

@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "3.4.2";
version = "3.4.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw=";
sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus=";
};
nativeBuildInputs = [

7
pkgs/development/libraries/vte/default.nix
View file

@ -48,6 +48,13 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
})
# Fix copying text with GTK 4.
# https://gitlab.gnome.org/GNOME/vte/-/issues/2584
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch";
hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY=";
})
];
nativeBuildInputs = [

29
pkgs/tools/networking/networkmanager/libnma/default.nix
View file

@ -23,25 +23,24 @@
, glib
, substituteAll
, lib
, _experimental-update-script-combinators
, makeHardcodeGsettingsPatch
}:
stdenv.mkDerivation rec {
pname = "libnma";
version = "1.10.4";
version = "1.10.6";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "eecw3aGfmzSIb0BkqhcPGiMmsIMp1lXYC2fpBsf3i3w=";
sha256 = "U6b7KxkK03xZhsrtPpi+3nw8YCOZ7k+TyPwFQwPXbas=";
};
patches = [
# Needed for wingpanel-indicator-network and switchboard-plug-network
./hardcode-gsettings.patch
# Removing path from eap schema to fix bug when creating new VPN connection
# https://gitlab.gnome.org/GNOME/libnma/-/issues/18
./remove-path-from-eap.patch
];
nativeBuildInputs = [
@ -86,10 +85,24 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {
schemaIdToVariableMapping = {
"org.gnome.nm-applet.eap" = "NM_APPLET_GSETTINGS";
};
inherit src;
};
updateScript =
let
updateSource = gnome.updateScript {
packageName = "libnma";
versionPolicy = "odd-unstable";
};
updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "libnma.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
in
_experimental-update-script-combinators.sequence [
updateSource
updateGsettingsPatch
];
};
meta = with lib; {

36
pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
View file

@ -1,26 +1,24 @@
diff --git a/src/nma-ws/nma-eap.c b/src/nma-ws/nma-eap.c
index fa36907..81df821 100644
--- a/src/nma-ws/nma-eap.c
+++ b/src/nma-ws/nma-eap.c
@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection)
static GSettings *
_get_ca_ignore_settings (NMConnection *connection)
{
+ g_autoptr (GSettingsSchemaSource) *schema_source;
+ g_autoptr (GSettingsSchema) *schema;
GSettings *settings;
char *path = NULL;
const char *uuid;
g_return_val_if_fail (connection, NULL);
+ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL);
+ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE);
+
uuid = nm_connection_get_uuid (connection);
@@ -252,7 +252,18 @@ _get_ca_ignore_settings (NMConnection *connection)
g_return_val_if_fail (uuid && *uuid, NULL);
path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
- settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
+ settings = g_settings_new_full (schema, NULL, path);
+ {
+ g_autoptr(GSettingsSchemaSource) schema_source;
+ g_autoptr(GSettingsSchema) schema;
+ schema_source = g_settings_schema_source_new_from_directory("@NM_APPLET_GSETTINGS@",
+ g_settings_schema_source_get_default(),
+ TRUE,
+ NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
+ "org.gnome.nm-applet.eap",
+ FALSE);
+ settings = g_settings_new_full(schema, NULL, path);
+ }
g_free (path);
return settings;

32
pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch
View file

@ -1,32 +0,0 @@
From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Wed, 9 Nov 2022 08:00:19 +0000
Subject: [PATCH] gschema: Remove path from eap schema
This one needs to be relocatable, otherwise creating a new VPN
connection will fail with:
settings object created with schema 'org.gnome.nm-applet.eap'
and path '/org/gnome/nm-applet/eap/<uuid>/',
but path '/org/gnome/nm-applet/eap/' is specified by schema
Fixes: https://bugs.archlinux.org/task/76490
---
org.gnome.nm-applet.eap.gschema.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in
index 0fc3ca9f..f4a56ea6 100644
--- a/org.gnome.nm-applet.eap.gschema.xml.in
+++ b/org.gnome.nm-applet.eap.gschema.xml.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
- <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet">
+ <schema id="org.gnome.nm-applet.eap" gettext-domain="nm-applet">
<key name="ignore-ca-cert" type="b">
<default>false</default>
<summary>Ignore CA certificate</summary>
--
GitLab