diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index c160ab5783d..c6b0753ff9a 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -23,6 +23,9 @@
Support is planned until the end of October 2021, handing over to 21.09.
+
+ GNOME desktop environment was upgraded to 3.38, see its release notes.
+
diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix
index 34596bf7818..8c50d860e5b 100644
--- a/nixos/modules/services/desktops/telepathy.nix
+++ b/nixos/modules/services/desktops/telepathy.nix
@@ -38,6 +38,11 @@ with lib;
services.dbus.packages = [ pkgs.telepathy-mission-control ];
+ # Enable runtime optional telepathy in gnome-shell
+ services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [
+ telepathy-glib
+ telepathy-logger
+ ];
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index acccbdb9950..91492d561ba 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -69,6 +69,7 @@ in
core-os-services.enable = mkEnableOption "essential services for GNOME3";
core-shell.enable = mkEnableOption "GNOME Shell services";
core-utilities.enable = mkEnableOption "GNOME core utilities";
+ core-developer-tools.enable = mkEnableOption "GNOME core developer tools";
games.enable = mkEnableOption "GNOME games";
experimental-features = {
@@ -294,6 +295,12 @@ in
gnome-shell
];
+ services.udev.packages = with pkgs.gnome3; [
+ # Force enable KMS modifiers for devices that require them.
+ # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
+ mutter
+ ];
+
services.avahi.enable = mkDefault true;
xdg.portal.extraPortals = [
@@ -323,7 +330,7 @@ in
source-sans-pro
];
- # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [
adwaita-icon-theme
gnome-backgrounds
@@ -368,7 +375,7 @@ in
};
})
- # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst
(mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
baobab
@@ -387,17 +394,16 @@ in
gnome-logs
gnome-maps
gnome-music
- gnome-photos
+ pkgs.gnome-photos
gnome-screenshot
gnome-software
gnome-system-monitor
gnome-weather
nautilus
+ pkgs.gnome-connections
simple-scan
totem
yelp
- # Unsure if sensible for NixOS
- /* gnome-boxes */
] config.environment.gnome3.excludePackages);
# Enable default program modules
@@ -426,12 +432,43 @@ in
(mkIf serviceCfg.games.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
- aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
- gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-sudoku
- gnome-taquin gnome-tetravex hitori iagno lightsoff quadrapassel
- swell-foop tali
+ aisleriot
+ atomix
+ five-or-more
+ four-in-a-row
+ gnome-chess
+ gnome-klotski
+ gnome-mahjongg
+ gnome-mines
+ gnome-nibbles
+ gnome-robots
+ gnome-sudoku
+ gnome-taquin
+ gnome-tetravex
+ hitori
+ iagno
+ lightsoff
+ quadrapassel
+ swell-foop
+ tali
] config.environment.gnome3.excludePackages);
})
+
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
+ (mkIf serviceCfg.core-developer-tools.enable {
+ environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+ dconf-editor
+ devhelp
+ pkgs.gnome-builder
+ # boxes would make sense in this option, however
+ # it doesn't function well enough to be included
+ # in default configurations.
+ # https://github.com/NixOS/nixpkgs/issues/60908
+ /* gnome-boxes */
+ ] config.environment.gnome3.excludePackages);
+
+ services.sysprof.enable = true;
+ })
];
}
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index eae70a57c78..31e4cff438a 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -160,7 +160,7 @@ in
];
# Otherwise GDM will not be able to start correctly and display Wayland sessions
- systemd.packages = with pkgs.gnome3; [ gnome-session gnome-shell ];
+ systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ];
systemd.services.display-manager.wants = [
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index 50ca8ad2b50..e5d7009bb7b 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -94,6 +94,7 @@ in
glib-networking = callInstalledTest ./glib-networking.nix {};
gnome-photos = callInstalledTest ./gnome-photos.nix {};
graphene = callInstalledTest ./graphene.nix {};
+ gsconnect = callInstalledTest ./gsconnect.nix {};
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
glib-testing = callInstalledTest ./glib-testing.nix {};
diff --git a/nixos/tests/installed-tests/gsconnect.nix b/nixos/tests/installed-tests/gsconnect.nix
new file mode 100644
index 00000000000..ac39f743578
--- /dev/null
+++ b/nixos/tests/installed-tests/gsconnect.nix
@@ -0,0 +1,7 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.gnomeExtensions.gsconnect;
+
+ withX11 = true;
+}
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 192bf041c64..8f70f632cd6 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -6,7 +6,7 @@
, gettext
, glib
, gtk3
-, libhandy
+, libhandy_0
, meson
, ninja
, pango
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
dbus
glib
gtk3
- libhandy
+ libhandy_0
pango
];
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index c7df55118c7..cf3a8ae4197 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -10,7 +10,7 @@
, python3
, pkgconfig
, glib
-, libhandy
+, libhandy_0
, gtk3
, dbus
, openssl
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
glib
gtk3
- libhandy
+ libhandy_0
dbus
openssl
sqlite
diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix
index 055694fb40f..3572bbf88ab 100644
--- a/pkgs/applications/audio/shortwave/default.nix
+++ b/pkgs/applications/audio/shortwave/default.nix
@@ -8,7 +8,7 @@
, glib
, gst_all_1
, gtk3
-, libhandy
+, libhandy_0
, meson
, ninja
, openssl
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
gdk-pixbuf
glib
gtk3
- libhandy
+ libhandy_0
openssl
sqlite
] ++ (with gst_all_1; [
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index ad4fc9728be..c65d5bbc09a 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -12,7 +12,7 @@
, coreutils
, libsoup
, libsecret
-, libhandy
+, libhandy_0
, wrapGAppsHook
, libgpgerror
, json-glib
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
glib
gtk3
libsecret
- libhandy
+ libhandy_0
libgpgerror
json-glib
];
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index a94ab58a78f..bee059ecd2d 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2";
+ sha256 = "1olTi6+O+xrPfqYHJosaqhQY1VF9ktT2lGo9v4FOrlU=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
index 695a13eecab..ffdeb21de7f 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let
- version = "3.36.0";
+ version = "3.38.0";
pname = "gnome-latex";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn";
+ sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 337b8f4cba6..0d4b06c8c6d 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, fetchpatch
, at-spi2-core
, babl
, dbus
@@ -35,17 +36,32 @@
stdenv.mkDerivation rec {
pname = "gnome-photos";
- version = "3.34.2";
+ version = "3.38.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w";
+ sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6";
};
patches = [
./installed-tests-path.patch
+
+ # Port to Tracker 3
+ # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch";
+ sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch";
+ sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch";
+ sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index 17aa7e9aa06..44d4727edba 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -14,15 +14,16 @@
, libdazzle
, gnome3
, tracker
+, libhandy
}:
stdenv.mkDerivation rec {
pname = "gnome-usage";
- version = "3.33.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
+ sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl";
};
nativeBuildInputs = [
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
libdazzle
libgtop
tracker
+ libhandy
];
postPatch = ''
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 09717cd6426..4315af94f6b 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
+{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
pango, gobject-introspection, wrapGAppsHook, gettext,
# Optional packages:
enableOSM ? true, osm-gps-map,
@@ -13,7 +13,7 @@ in buildPythonApplication rec {
pname = "gramps";
nativeBuildInputs = [ wrapGAppsHook gettext ];
- buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
+ buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ]
# Map support
++ stdenv.lib.optional enableOSM osm-gps-map
# Graphviz support
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index ccb7f3e47c8..29ee6213a65 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "3.36.5";
+ version = "3.38.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x";
+ sha256 = "1vkg6p1dlrgx1yyscmy0m58inaq4ljshbdxw0nhi1nwqk3bpjchw";
};
patches = [
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index d364074d445..c84c09e59a7 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
+{ stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}:
-pythonPackages.buildPythonApplication {
+python3.pkgs.buildPythonApplication {
pname = "pdf-quench";
version = "1.0.5";
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication {
goocanvas2
poppler_gi
];
- propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
+ propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ];
format = "other";
doCheck = false;
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 39ad9ef1d15..e57cf810491 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -3,7 +3,7 @@
, meson
, ninja
, pkgconfig
-, libhandy
+, libhandy_0
, modemmanager
, gtk3
, gom
@@ -43,13 +43,12 @@ stdenv.mkDerivation rec {
buildInputs = [
modemmanager
- libhandy
+ libhandy_0
evolution-data-server
folks
gom
gsound
gtk3
- libhandy
libpeas
];
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 896904b0cac..441a80fc071 100644
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -8,7 +8,7 @@
, gdk-pixbuf
, glib
, gtk3
-, libhandy
+, libhandy_0
, openssl
, sqlite
, webkitgtk
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
gtk3
- libhandy
+ libhandy_0
openssl
sqlite
webkitgtk
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 68e7282870b..2bcd13744b6 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -12,7 +12,7 @@
, pkg-config
, gtksourceview4
, glib
-, libhandy
+, libhandy_0
, gtk3
, dbus
, openssl
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gst-validate
gtk3
gtksourceview4
- libhandy
+ libhandy_0
openssl
sqlite
];
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 52f8decf170..a81356da252 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
-, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt
-, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null
-, buildServer ? true, nocaps ? false }:
+, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
+, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo
+, buildServer ? true, nocaps ? false
+}:
let
cmFlag = flag: if flag then "ON" else "OFF";
@@ -49,8 +50,9 @@ in stdenv.mkDerivation rec {
buildInputs = with lib;
[
alsaLib
+ cairo
cups
- ffmpeg_3
+ ffmpeg
glib
gst-plugins-base
gst-plugins-good
@@ -65,6 +67,7 @@ in stdenv.mkDerivation rec {
libXrender
libXtst
libXv
+ libjpeg_turbo
libpulseaudio
libunwind
libusb1
@@ -93,6 +96,9 @@ in stdenv.mkDerivation rec {
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_SSE2 = stdenv.isx86_64;
+ WITH_VAAPI = true;
+ WITH_JPEG = (libjpeg_turbo != null);
+ WITH_CAIRO = (cairo != null);
};
meta = with lib; {
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index cf1e053dd53..e432b379517 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -59,6 +59,7 @@ buildPythonApplication rec {
description = "GTK3 & python based GUI for Syncthing";
homepage = "https://github.com/syncthing/syncthing-gtk";
license = licenses.gpl2;
+ broken = true;
maintainers = with maintainers; [ ];
platforms = syncthing.meta.platforms;
};
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 07af9341646..5068dc15f48 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
desktop-file-utils
gobject-introspection
wrapGAppsHook
+ gtk3 # for gtk-update-icon-cache
];
buildInputs = [
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 7c6041b576e..ffd804eaba0 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/kalj/xmonad-log-applet";
license = licenses.bsd3;
+ broken = desktopSupport == "gnomeflashback";
description = "An applet that will display XMonad log information (${desktopSupport} version)";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 294f210c21f..91abb04116a 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
- version = "3.36.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr";
+ sha256 = "12pfvivsgz4qvx3y6zndxln28fgvbdv2kjy6l892i4f5bmdxplrq";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index c0ca54d6fec..f05eb41d35e 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -15,15 +15,15 @@
, adwaita-icon-theme
}:
- python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "accerciser";
- version = "3.36.3";
+ version = "3.38.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zfhmpaqqwm89k8p4apq4la191icjvqh0097p5aig3yhy87fahp9";
+ sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 05a1cdbc088..c4998cc451f 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -1,17 +1,46 @@
-{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
-, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
-, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
-, libxslt, yelp-tools, gnome-common, gtk-doc
-, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2
-, meson, ninja, dbus, python3 }:
+{ stdenv
+, gettext
+, fetchurl
+, wrapGAppsHook
+, gnome-video-effects
+, libcanberra-gtk3
+, pkgconfig
+, gtk3
+, glib
+, clutter-gtk
+, clutter-gst
+, udev
+, gst_all_1
+, itstool
+, libgudev
+, vala
+, docbook_xml_dtd_43
+, docbook_xsl
+, appstream-glib
+, libxslt
+, yelp-tools
+, gnome-common
+, gtk-doc
+, adwaita-icon-theme
+, librsvg
+, totem
+, gdk-pixbuf
+, gnome3
+, gnome-desktop
+, libxml2
+, meson
+, ninja
+, dbus
+, python3
+}:
stdenv.mkDerivation rec {
pname = "cheese";
- version = "3.34.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni";
+ sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8";
};
postPatch = ''
@@ -24,15 +53,43 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib
- libxslt docbook_xml_dtd_43 docbook_xsl
- gtk-doc yelp-tools gnome-common python3
+ appstream-glib
+ docbook_xml_dtd_43
+ docbook_xsl
+ gettext
+ gnome-common
+ gtk-doc
+ itstool
+ libxml2
+ libxslt
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ yelp-tools
+ ];
+
+ buildInputs = [
+ adwaita-icon-theme
+ clutter-gst
+ clutter-gtk
+ dbus
+ gdk-pixbuf
+ glib
+ gnome-desktop
+ gnome-video-effects
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gstreamer
+ gtk3
+ libcanberra-gtk3
+ libgudev
+ librsvg
+ udev
];
- buildInputs = [ gtk3 glib gnome-video-effects
- gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
- gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
- libcanberra-gtk3 libgudev dbus ];
outputs = [ "out" "man" "devdoc" ];
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index f27050cd68f..2390498ce78 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.36.5";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hpjd5d3z52xcjcc1hg5z8ypnx2y6ml9snyrlpflg9bx16yhxm1x";
+ sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 7c518c4acd9..29e482135a2 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "file-roller";
- version = "3.36.3";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1dw1vfnfc44k57b6mip8fv565d2xv5wrigi4js044x3sbl5f2n89";
+ sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj";
};
LANG = "en_US.UTF-8"; # postinstall.py
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index ea33bc29324..78dc7623e34 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,29 +1,56 @@
-{ stdenv, meson, fetchurl, python3
-, pkgconfig, gtk3, glib, adwaita-icon-theme
-, libpeas, gtksourceview4, gsettings-desktop-schemas
-, wrapGAppsHook, ninja, libsoup, tepl
-, gnome3, gspell, perl, itstool, desktop-file-utils
+{ stdenv
+, meson
+, fetchurl
+, python3
+, pkgconfig
+, gtk3
+, glib
+, adwaita-icon-theme
+, libpeas
+, gtksourceview4
+, gsettings-desktop-schemas
+, wrapGAppsHook
+, ninja
+, libsoup
+, tepl
+, gnome3
+, gspell
+, perl
+, itstool
+, desktop-file-utils
+, vala
}:
stdenv.mkDerivation rec {
pname = "gedit";
- version = "3.36.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8";
+ sha256 = "1y2n3325qvfiaz526vdf7l5wbh5js25djkz3jmg6x3z5dn00dks6";
};
nativeBuildInputs = [
- pkgconfig wrapGAppsHook meson ninja
- python3 perl itstool desktop-file-utils
+ desktop-file-utils
+ itstool
+ meson
+ ninja
+ perl
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
];
buildInputs = [
- gtk3 glib
- adwaita-icon-theme libsoup
- libpeas gtksourceview4
- gsettings-desktop-schemas gspell
+ adwaita-icon-theme
+ glib
+ gsettings-desktop-schemas
+ gspell
+ gtk3
+ gtksourceview4
+ libpeas
+ libsoup
tepl
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 7432e8e96ed..e7ea02a2749 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -1,9 +1,30 @@
-{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
-, webkitgtk, gnome-desktop, libgepub, gnome3, gdk-pixbuf
-, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
-, docbook_xml_dtd_42, desktop-file-utils, python3
-, gobject-introspection, wrapGAppsHook }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, evince
+, gjs
+, pkgconfig
+, gtk3
+, glib
+, tracker
+, tracker-miners
+, libxslt
+, webkitgtk
+, gnome-desktop
+, libgepub
+, gnome3
+, gdk-pixbuf
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, docbook_xsl
+, docbook_xml_dtd_42
+, desktop-file-utils
+, python3
+, gobject-introspection
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
pname = "gnome-books";
@@ -15,15 +36,32 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- meson ninja pkgconfig gettext libxslt desktop-file-utils
- docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
+ meson
+ ninja
+ pkgconfig
+ gettext
+ libxslt
+ desktop-file-utils
+ docbook_xsl
+ docbook_xml_dtd_42
+ wrapGAppsHook
+ python3
];
buildInputs = [
- gtk3 glib gsettings-desktop-schemas
- gdk-pixbuf adwaita-icon-theme evince
- webkitgtk gjs gobject-introspection tracker
- tracker-miners gnome-desktop libgepub
+ gtk3
+ glib
+ gsettings-desktop-schemas
+ gdk-pixbuf
+ adwaita-icon-theme
+ evince
+ webkitgtk
+ gjs
+ gobject-introspection
+ tracker
+ tracker-miners
+ gnome-desktop
+ libgepub
];
postPatch = ''
@@ -39,6 +77,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
+ broken = true; # Tracker 3 not supported and it cannot start Tracker 2.
homepage = "https://wiki.gnome.org/Apps/Books";
description = "An e-book manager application for GNOME";
maintainers = teams.gnome.members;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 4acc687da8b..014ad123b41 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -11,12 +11,15 @@
, gobject-introspection
, libxml2
, gtk3
+, gtksourceview4
, gtk-vnc
, freerdp
, libvirt
, spice-gtk
, python3
+, appstream-glib
, spice-protocol
+, libhandy_0
, libsoup
, libosinfo
, systemd
@@ -51,16 +54,17 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
- version = "3.36.6";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c3cw90xqqcpacc2z06ljs0gg8saxizfgjzg9alhpwgz3gl4c5pg";
+ sha256 = "0zrm4mihkx5i42h3pvk9lmsqf983dqz4rnfcbccwhx4ml2s4w3qv";
};
doCheck = true;
nativeBuildInputs = [
+ appstream-glib # for appstream-util
desktop-file-utils
gettext
gobject-introspection
@@ -89,12 +93,14 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
gtk-vnc
gtk3
+ gtksourceview4
json-glib
libapparmor
libarchive
libcap
libcap_ng
libgudev
+ libhandy_0
libosinfo
librsvg
libsecret
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 988cb1ed2a3..1311bea08d4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,18 +1,45 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
-, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
-, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, libdazzle
+, libgweather
+, geoclue2
+, geocode-glib
+, python3
+, gettext
+, libxml2
+, gnome3
+, gtk3
+, evolution-data-server
+, libsoup
+, glib
+, gnome-online-accounts
+, gsettings-desktop-schemas
+, libhandy
+, adwaita-icon-theme
+}:
-let
+stdenv.mkDerivation rec {
pname = "gnome-calendar";
- version = "3.36.2";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.38.1";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j";
};
+ patches = [
+ # Port to libhandy-1
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch";
+ sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE=";
+ })
+ ];
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -20,10 +47,29 @@ in stdenv.mkDerivation rec {
};
};
- nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ gettext
+ libxml2
+ wrapGAppsHook
+ python3
+ ];
+
buildInputs = [
- gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
- gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy
+ gtk3
+ evolution-data-server
+ libsoup
+ glib
+ gnome-online-accounts
+ libdazzle
+ libgweather
+ geoclue2
+ geocode-glib
+ gsettings-desktop-schemas
+ adwaita-icon-theme
+ libhandy
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 5e3ff58b290..1ffd15cfc14 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "gnome-clocks";
- version = "3.36.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1rjicycgh9jvkqir2m8hx9m4jlaa3w5lqs43k185wa0zxhi1n6zi";
+ sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
new file mode 100644
index 00000000000..676e2359995
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetchurl
+, gnome3
+, meson
+, ninja
+, vala
+, pkg-config
+, glib
+, gtk3
+, python3
+, libxml2
+, gtk-vnc
+, gettext
+, desktop-file-utils
+, appstream-glib
+, gobject-introspection
+, freerdp
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-connections";
+ version = "3.38.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz";
+ hash = "sha256-Eob36/zoWIGdYMpWks280FoIHGL7AHUhinFA4cEqels=";
+ };
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ gettext
+ glib # glib-compile-resources
+ meson
+ appstream-glib
+ ninja
+ pkg-config
+ python3
+ vala
+ wrapGAppsHook
+
+ # for gtk-frdp subproject
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ glib
+ gtk-vnc
+ gtk3
+ libxml2
+
+ # for gtk-frdp subproject
+ freerdp
+ ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/postinstall.py
+ patchShebangs build-aux/meson/postinstall.py
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://gitlab.gnome.org/GNOME/connections";
+ description = "A remote desktop client for the GNOME desktop environment";
+ maintainers = teams.gnome.members;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 8d5501537a0..ec1268f0770 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -3,6 +3,7 @@
, ninja
, gettext
, fetchurl
+, fetchpatch
, evince
, gjs
, pkgconfig
@@ -28,6 +29,7 @@
, desktop-file-utils
, wrapGAppsHook
, python3
+, appstream-glib
, gsettings-desktop-schemas
}:
@@ -40,6 +42,14 @@ stdenv.mkDerivation rec {
sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq";
};
+ patches = [
+ # Fix inkscape 1.0 usage
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff";
+ sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s";
+ })
+ ];
+
nativeBuildInputs = [
meson
ninja
@@ -52,6 +62,7 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_42
wrapGAppsHook
python3
+ appstream-glib
# building getting started
inkscape
@@ -92,6 +103,12 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication"
'';
+ preConfigure =
+ # To silence inkscape warnings regarding profile directory
+ ''
+ export INKSCAPE_PROFILE_DIR="$(mktemp -d)"
+ '';
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -100,6 +117,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
+ broken = true; # Tracker 3 not supported and it cannot start Tracker 2.
homepage = "https://wiki.gnome.org/Apps/Documents";
description = "Document manager application designed to work with GNOME 3";
maintainers = teams.gnome.members;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 57ba6fd0766..ffc9c7cb443 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,29 +1,71 @@
-{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
-, gobject-introspection, gdk-pixbuf, librsvg, libgweather
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
-, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, gettext
+, python3
+, pkgconfig
+, gnome3
+, gtk3
+, gobject-introspection
+, gdk-pixbuf
+, librsvg
+, libgweather
+, geoclue2
+, wrapGAppsHook
+, folks
+, libchamplain
+, gfbgraph
+, libsoup
+, gsettings-desktop-schemas
+, webkitgtk
+, gjs
+, libgee
+, libhandy
+, geocode-glib
+, evolution-data-server
+, gnome-online-accounts
+}:
-let
+stdenv.mkDerivation rec {
pname = "gnome-maps";
- version = "3.36.4";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.38.1.1";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk";
};
doCheck = true;
- nativeBuildInputs = [ meson ninja pkgconfig gettext python3 wrapGAppsHook ];
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
+
buildInputs = [
+ evolution-data-server
+ folks
+ gdk-pixbuf
+ geoclue2
+ geocode-glib
+ gfbgraph
+ gjs
+ gnome-online-accounts
+ gnome3.adwaita-icon-theme
gobject-introspection
- gtk3 geoclue2 gjs libgee folks gfbgraph
- geocode-glib libchamplain libsoup
- gdk-pixbuf librsvg libgweather
- gsettings-desktop-schemas evolution-data-server
- gnome-online-accounts gnome3.adwaita-icon-theme
+ gsettings-desktop-schemas
+ gtk3
+ libchamplain
+ libgee
+ libgweather
+ libhandy
+ librsvg
+ libsoup
webkitgtk
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 92c40f4a008..ca59c5556fe 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "3.36.4.1";
+ version = "3.38.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh";
+ sha256 = "1sda943nd646nq2y5anj0d7aaxxddznva5bh5gsx6qx0mxhi5jrv";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index c32289d70d7..fab4c491a6b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -13,7 +13,7 @@
, evolution-data-server
, gnome-online-accounts
, libuuid
-, libhandy
+, libhandy_0
, webkitgtk
, zeitgeist
, gnome3
@@ -22,16 +22,13 @@
, tracker
}:
-let
- version = "3.36.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gnome-notes";
- inherit version;
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
- sha256 = "1midnphyg038s94ahhzv0pvbzzzn62ccky28c9nazxqvw4hvdsbh";
+ sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis=";
};
doCheck = true;
@@ -57,7 +54,7 @@ stdenv.mkDerivation {
glib
gtk3
libuuid
- libhandy
+ libhandy_0 # doesn't support libhandy-1 yet
webkitgtk
tracker
gnome-online-accounts
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index f4a72fdfb48..6875b2ec814 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -1,30 +1,60 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3
-, meson, ninja, python3, desktop-file-utils }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, gettext
+, gobject-introspection
+, wrapGAppsHook
+, gjs
+, glib
+, gtk3
+, gdk-pixbuf
+, gst_all_1
+, gnome3
+, meson
+, ninja
+, python3
+, desktop-file-utils
+, libhandy
+}:
stdenv.mkDerivation rec {
pname = "gnome-sound-recorder";
- version = "3.34.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9";
+ sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk=";
};
nativeBuildInputs = [
- pkgconfig gettext meson ninja gobject-introspection
- wrapGAppsHook python3 desktop-file-utils
+ pkgconfig
+ gettext
+ meson
+ ninja
+ gobject-introspection
+ wrapGAppsHook
+ python3
+ desktop-file-utils
];
- buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
+
+ buildInputs = [
+ gjs
+ glib
+ gtk3
+ gdk-pixbuf
+ libhandy
+ ] ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-bad # for gstreamer-player-1.0
+ ]);
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';
- # TODO: fix this in gstreamer
- # TODO: make stdenv.lib.getBin respect outputBin
- PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin";
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 514eecc1736..c16b1f2ab12 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
let
pname = "polari";
- version = "3.36.3";
+ version = "3.38.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0fpmrvhd40yay051bzn4x3gsrzdv42nav0pm5ps0np8wk1z689jg";
+ sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 3668fc171b3..370b7a07acf 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -22,16 +22,16 @@
, p11-kit
, openssh
, gsettings-desktop-schemas
-, libhandy
+, libhandy_0
}:
stdenv.mkDerivation rec {
pname = "seahorse";
- version = "3.36.2";
+ version = "3.37.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5";
+ hash = "sha256-flpBYSYDDDTONYZuRR3V2sx637Mp1dMQJ79fUGLtRio=";
};
doCheck = true;
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
openssh
openldap
libpwquality
- libhandy
+ libhandy_0 # not yet ported to libhandy-1
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 68c09cc9180..fa489e7695c 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "adwaita-icon-theme";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674";
+ sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6";
};
# For convenience, we can specify adwaita-icon-theme only in packages
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index dce14d6d1de..274989bf3b8 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,19 +1,19 @@
{ stdenv, gettext, fetchurl, vala, desktop-file-utils
-, meson, ninja, pkgconfig, gtk3, glib, libxml2
+, meson, ninja, pkgconfig, python3, gtk3, glib, libxml2
, wrapGAppsHook, itstool, gnome3 }:
let
pname = "baobab";
- version = "3.34.1";
+ version = "3.38.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z";
+ sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104";
};
- nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+ nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ];
buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index c6b02917ce4..00c9d3a4c90 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
let
pname = "dconf-editor";
- version = "3.36.4";
+ version = "3.38.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0y9yll77wkvr9ly132icfsl12sdz5aba9qc3aqm5rc90r6xhkhry";
+ sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 83c1f5d4a56..ce5ca16eb74 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [
- folks
+ (folks.override { telepathySupport = true; })
telepathy-logger
evolution-data-server
telepathy-mission-control
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 6ad0834724d..1e965b80528 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -8,6 +8,7 @@
, libxml2
, libjpeg
, libpeas
+, libportal
, gnome3
, gtk3
, glib
@@ -27,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "eog";
- version = "3.36.3";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp";
+ sha256 = "0qyrs9cp4hsh64jfdpdi2v1hag8izw77qqnsvqwdb33871ya98z1";
};
nativeBuildInputs = [
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libjpeg
+ libportal
gtk3
gdk-pixbuf
glib
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index ad2d67972a9..7b9c439b247 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -9,6 +9,7 @@
, icu
, wrapGAppsHook
, gnome3
+, libportal
, libxml2
, libxslt
, itstool
@@ -35,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "epiphany";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1gs2a94fzpciv58rljgbirsc2kqgiaiyc2yg6ff50nlgb2qpb2jq";
+ sha256 = "0hr87nl8pc7h8w65i8jwj5fdwr46wbygdnx6mhpbbyqirdm5gdsr";
};
# Tests need an X display
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
json-glib
libdazzle
libhandy
+ libportal
libnotify
libsecret
libsoup
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 11a5bcbd0f7..a2c7c52a1cc 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "3.36.7";
+ version = "3.38.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0clg9fhgjyj23mmcmw7dp512wzgv5m18fppn05qf1frz7r11mmk5";
+ sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6";
};
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 721b38d8564..9c73bf0e182 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
- version = "3.36.5";
+ version = "3.38.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nbzzqxlck3jz42wnxl281yfzpylcvbsbb0fvkh7nibdaj654mf5";
+ sha256 = "1dz4ybhq5rf1hnaf1d6h60ldn9xpdaj9nw42c4iqbw9lqglpiwlg";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 58c898a5f0d..f068ab531d9 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,35 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
-, accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
-, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, substituteAll
+, meson
+, ninja
+, python3
+, rsync
+, pkg-config
+, glib
+, itstool
+, libxml2
+, xorg
+, accountsservice
+, libX11
+, gnome3
+, systemd
+, dconf
+, gtk3
+, libcanberra-gtk3
+, pam
+, libselinux
+, keyutils
+, audit
+, gobject-introspection
+, plymouth
+, librsvg
+, coreutils
+, xwayland
+, dbus
+, nixos-icons
+}:
let
@@ -19,44 +47,64 @@ in
stdenv.mkDerivation rec {
pname = "gdm";
- version = "3.34.1";
+ version = "3.38.0";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1lyqvcwxhwxklbxn4xjswjzr6fhjix6h28mi9ypn34wdm9bzcpg8";
+ sha256 = "1fimhklb204rflz8k345756jikgbw8113hms3zlcwk6975f43m26";
};
- # Only needed to make it build
- preConfigure = ''
- substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
- '';
-
- initialVT = "7";
-
- configureFlags = [
+ mesonFlags = [
+ "-Dgdm-xsession=true"
+ # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6
+ "-Dinitial-vt=${passthru.initialVT}"
+ "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d"
+ "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
"--sysconfdir=/etc"
"--localstatedir=/var"
- "--with-plymouth=yes"
- "--enable-gdm-xsession"
- "--with-initial-vt=${initialVT}"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--with-udevdir=$(out)/lib/udev"
];
- nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
+ nativeBuildInputs = [
+ dconf
+ glib # for glib-compile-schemas
+ itstool
+ meson
+ ninja
+ pkg-config
+ python3
+ rsync
+ ];
+
buildInputs = [
- glib accountsservice systemd
- gobject-introspection libX11 gtk3
- libcanberra-gtk3 pam plymouth librsvg
+ accountsservice
+ audit
+ glib
+ gobject-introspection
+ gtk3
+ keyutils
+ libX11
+ libcanberra-gtk3
+ libselinux
+ pam
+ plymouth
+ systemd
+ xorg.libXdmcp
];
- enableParallelBuilding = true;
-
patches = [
+ # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch";
+ sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o=";
+ })
+
# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
- inherit coreutils plymouth xwayland;
+ inherit coreutils plymouth xwayland dbus;
})
# The following patches implement certain environment variables in GDM which are set by
@@ -74,23 +122,61 @@ stdenv.mkDerivation rec {
# Set up the environment properly when launching sessions
# https://github.com/NixOS/nixpkgs/issues/48255
./reset-environment.patch
+
+ # Fix runtime patch location.
+ # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/114
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/9d841d681f3d1c58e3df51a98421257f774cd185.patch";
+ sha256 = "0lf5kpz9ghylqlbybc0mpfsvr4i29z1ag8wf6j1918hjrfcipnxj";
+ })
];
- installFlags = [
- "sysconfdir=$(out)/etc"
- "dbusconfdir=$(out)/etc/dbus-1/system.d"
- ];
+ postPatch = ''
+ patchShebangs build-aux/meson_post_install.py
+
+ # Upstream checks some common paths to find an `X` binary. We already know it.
+ echo #!/bin/sh > build-aux/find-x-server.sh
+ echo "echo ${stdenv.lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
+ patchShebangs build-aux/find-x-server.sh
+ '';
preInstall = ''
- schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
- install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override
+ install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
'';
+ postInstall = ''
+ # Move stuff from DESTDIR to proper location.
+ # We use rsync to merge the directories.
+ rsync --archive "${DESTDIR}/etc" "$out"
+ rm --recursive "${DESTDIR}/etc"
+ for o in $outputs; do
+ rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
+ rm --recursive "${DESTDIR}/''${!o}"
+ done
+ # Ensure the DESTDIR is removed.
+ rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}"
+
+ # We are setting DESTDIR so the post-install script does not compile the schemas.
+ glib-compile-schemas "$out/share/glib-2.0/schemas"
+ '';
+
+ # HACK: We want to install configuration files to $out/etc
+ # but GDM should read them from /etc on a NixOS system.
+ # With autotools, it was possible to override Make variables
+ # at install time but Meson does not support this
+ # so we need to convince it to install all files to a temporary
+ # location using DESTDIR and then move it to proper one in postInstall.
+ DESTDIR = "${placeholder "out"}/dest";
+
passthru = {
updateScript = gnome3.updateScript {
packageName = "gdm";
attrPath = "gnome3.gdm";
};
+
+ # Used in GDM NixOS module
+ # Don't remove.
+ initialVT = "7";
};
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index 6b5bd6152bd..d649556fe9e 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -13,48 +13,70 @@
+++ b/daemon/gdm-manager.c
@@ -145,7 +145,7 @@
GError *error;
-
+
error = NULL;
-- res = g_spawn_command_line_sync ("/bin/plymouth --ping",
+- res = g_spawn_command_line_sync ("plymouth --ping",
+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping",
NULL, NULL, &status, &error);
if (! res) {
g_debug ("Could not ping plymouth: %s", error->message);
@@ -163,7 +163,7 @@
GError *error;
-
+
error = NULL;
-- res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
+- res = g_spawn_command_line_sync ("plymouth deactivate",
+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate",
NULL, NULL, NULL, &error);
if (! res) {
g_warning ("Could not deactivate plymouth: %s", error->message);
@@ -178,7 +178,7 @@
GError *error;
-
+
error = NULL;
-- res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error);
+- res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error);
+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error);
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
@@ -194,7 +194,7 @@
GError *error;
-
+
error = NULL;
-- res = g_spawn_command_line_async ("/bin/plymouth quit", &error);
+- res = g_spawn_command_line_async ("plymouth quit", &error);
+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error);
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
--- a/data/gdm.service.in
+++ b/data/gdm.service.in
-@@ -28,7 +28,7 @@ BusName=org.gnome.DisplayManager
- StandardOutput=syslog
- StandardError=inherit
- EnvironmentFile=-@LANG_CONFIG_FILE@
+@@ -26,7 +26,7 @@ Restart=always
+ IgnoreSIGPIPE=no
+ BusName=org.gnome.DisplayManager
+ EnvironmentFile=-${LANG_CONFIG_FILE}
-ExecReload=/bin/kill -SIGHUP $MAINPID
+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
KeyringMode=shared
-
+
[Install]
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self,
+ */
+ if (run_launcher) {
+ if (is_x11) {
+- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"",
++ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
+ register_session ? "--register-session " : "",
+ self->selected_program);
+ } else {
+- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
++ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
+ register_session ? "--register-session " : "",
+ self->selected_program);
+ }
+ } else {
+- program = g_strdup_printf ("dbus-run-session -- %s",
++ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s",
+ self->selected_program);
+ }
+ }
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index e8463c5b704..8df32a1486e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-backgrounds";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "02xvfwfi3133mjljl731z2hj9hfmjas3a1jl4fxmy24xrzj83jxq";
+ sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index ed647bb87d8..fa5b5abf0ff 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -6,14 +6,14 @@ let
pname = "gnome-bluetooth";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "3.34.1";
+ version = "3.34.3";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "11nk8nvz5yrbx7wp75vsiaf4rniv7ik2g3nwmgwx2b42q9v11j9y";
+ sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index e14d8d136cd..e92333642d4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calculator";
- version = "3.36.0";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1cqd4b25qp1i0p04m669jssg1l5sdapc1mniv9jssvw5r7wk1s52";
+ sha256 = "0jajgdl2338nwym980gqw77pcjkprzhnfg8asdjksiksgz8gzzvw";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 5372552a720..23e3821ac8c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -3,16 +3,15 @@
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3
, vala, meson, ninja, libhandy, gsettings-desktop-schemas
-# , telepathy-glib
}:
stdenv.mkDerivation rec {
pname = "gnome-contacts";
- version = "3.36.2";
+ version = "3.38";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy";
+ sha256 = "f8LuaJwfOcLmN163YLlOFlHOSoKK1AggbToD4TPaGa8=";
};
propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -26,7 +25,6 @@ stdenv.mkDerivation rec {
folks gnome-desktop libhandy
libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
- # telepathy-glib 3.35.90 fails to build with telepathy
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index ea28d651eba..1300f7a7503 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,4 +1,6 @@
{ fetchurl
+, fetchFromGitLab
+, fetchpatch
, stdenv
, substituteAll
, accountsservice
@@ -68,12 +70,16 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc";
+ sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
};
+ # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
+ prePatch = (import ../gvc-with-ucm-prePatch.nix {
+ inherit fetchFromGitLab;
+ });
nativeBuildInputs = [
docbook_xsl
@@ -143,6 +149,17 @@ stdenv.mkDerivation rec {
inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet;
})
+
+ # Fix double free when leaving user accounts panel.
+ # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch";
+ sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
+ sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
+ })
];
postPatch = ''
@@ -150,10 +167,6 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/meson_post_install.py
'';
- mesonFlags = [
- "-Dgnome_session_libexecdir=${gnome-session}/libexec"
- ];
-
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index e558eb66d40..a397ffe86d2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib
, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
pname = "gnome-desktop";
- version = "3.36.5";
+ version = "3.38.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0lxpgb199hn37vq822qg9g43pwixbki3x5lkazqa77qhjhlj98gf";
+ sha256 = "1q1vri9vsrdwhhl26dk1f79a3dhwfn9dhbaiczli826nzq9kb40p";
};
nativeBuildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
gtk-doc docbook_xsl glib
];
buildInputs = [
- libX11 bubblewrap xkeyboard_config isocodes wayland
+ bubblewrap xkeyboard_config isocodes wayland
gtk3 glib libseccomp systemd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 40085e501b6..444fcfc4f68 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
- version = "3.36.3";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0yhnjmjzkixj29vcw6rzaijpg4mlwm2k1kqp4g3hn1xb6qzks0yx";
+ sha256 = "08sj1csd1jsmph2lyw2lpj7jh40236alz56pmf315hwyimkcwd3p";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
similarity index 66%
rename from pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
rename to pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
index 94e14f688b3..d4065c14499 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
@@ -1,25 +1,35 @@
+From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001
+Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Sun, 20 Sep 2020 14:46:59 -0400
+Subject: [PATCH] fix paths
+
+---
+ data/gnome-welcome-tour | 4 ++--
+ gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
+ gnome-initial-setup/pages/timezone/tz.h | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
-index c479296..3dd629c 100755
+index 51c9b59..68ab0c4 100755
--- a/data/gnome-welcome-tour
+++ b/data/gnome-welcome-tour
-@@ -3,7 +3,7 @@
+@@ -3,11 +3,11 @@
cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
- # Don't do anything if yelp isn't installed
--yelp_path=$(which yelp 2>/dev/null)
-+yelp_path=@yelp@
- if test -z "${yelp_path}"; then
+ # Don't do anything if gnome-tour isn't installed
+-gnome_tour_path=$(which gnome-tour 2>/dev/null)
++gnome_tour_path="@gnome_tour@"
+ if test -z "${gnome_tour_path}"; then
rm -f $cfgdir/run-welcome-tour
exit
-@@ -17,5 +17,5 @@ geometry=(1024, 709)
- EOF
fi
--yelp help:gnome-help/getting-started
-+$yelp_path help:gnome-help/getting-started
+-gnome-tour
++@gnome_tour@
rm -f $cfgdir/run-welcome-tour
diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
-index 1c34ef7..a1e7f93 100644
+index 196abf6..613d0e5 100644
--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label,
@@ -34,7 +44,7 @@ index 1c34ef7..a1e7f93 100644
g_spawn_command_line_async (commandline, NULL);
g_free (commandline);
-@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
+@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
g_param_spec_string ("showing-extra", "", "", "",
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -44,7 +54,7 @@ index 1c34ef7..a1e7f93 100644
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_FIRST,
diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
-index 93905b3..e7ee785 100644
+index a2376f8..5cb7bc9 100644
--- a/gnome-initial-setup/pages/timezone/tz.h
+++ b/gnome-initial-setup/pages/timezone/tz.h
@@ -4,7 +4,7 @@
@@ -57,7 +67,7 @@ index 93905b3..e7ee785 100644
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
- #include
+ G_BEGIN_DECLS
#ifndef __sun
-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
@@ -65,3 +75,7 @@ index 93905b3..e7ee785 100644
#else
# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
#endif
+
+base-commit: 5132e206a6bf81964450561d68473ac015760455
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index ff7b1f45e45..b4771641adb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -32,15 +32,17 @@
, tzdata
, yelp
, libgnomekbd
+, gsettings-desktop-schemas
+, gnome-tour
}:
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s";
+ hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY=";
};
nativeBuildInputs = [
@@ -62,10 +64,12 @@ stdenv.mkDerivation rec {
gnome-desktop
gnome-getting-started-docs
gnome-online-accounts
+ gsettings-desktop-schemas
gtk3
json-glib
krb5
libgweather
+ libnma
libpwquality
librest
libsecret
@@ -73,14 +77,13 @@ stdenv.mkDerivation rec {
pango
polkit
webkitgtk
- libnma
];
patches = [
(substituteAll {
- src = ./fix-paths.patch;
+ src = ./0001-fix-paths.patch;
inherit tzdata libgnomekbd;
- yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour
+ gnome_tour = "${gnome-tour}/bin/gnome-tour";
})
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index ede2f279248..9a940458679 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,6 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
-, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, autoconf-archive
+, autoreconfHook
+, pkg-config
+, glib
+, gnome3
+, libxml2
+, libgdata
+, grilo
+, libzapojit
+, grilo-plugins
+, gnome-online-accounts
+, libmediaart
+, tracker
+, gfbgraph
+, librest
+, libsoup
+, json-glib
+, gmp
+, openssl
+, dleyna-server
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
pname = "gnome-online-miners";
@@ -11,15 +33,70 @@ stdenv.mkDerivation rec {
sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ patches = [
+ # Fix use after free
+ # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch";
+ sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA=";
+ })
+
+ # Port to Tracker 3
+ # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch";
+ sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch";
+ sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch";
+ sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch";
+ sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch";
+ sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ # patch changes configure.ac
+ autoconf-archive
+ autoreconfHook
+
+ pkg-config
+ wrapGAppsHook
+ ];
+
buildInputs = [
- glib libgdata libxml2 libsoup gmp openssl
- grilo libzapojit grilo-plugins
- gnome-online-accounts libmediaart
- tracker gfbgraph json-glib librest
+ glib
+ libgdata
+ libxml2
+ libsoup
+ gmp
+ openssl
+ grilo
+ libzapojit
+ grilo-plugins
+ gnome-online-accounts
+ libmediaart
+ tracker
+ gfbgraph
+ json-glib
+ librest
dleyna-server
];
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747
+ ];
+
enableParallelBuilding = true;
passthru = {
@@ -33,7 +110,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners";
description = "A set of crawlers that go through your online content and index them locally in Tracker";
maintainers = teams.gnome.members;
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
index a77aee4b890..87c0d1efc84 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
@@ -1,23 +1,48 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
-, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf }:
+{ stdenv
+, fetchurl
+, cairo
+, meson
+, ninja
+, pkgconfig
+, python3
+, wrapGAppsHook
+, glib
+, pipewire
+, systemd
+, libvncserver
+, libsecret
+, libnotify
+, gdk-pixbuf
+, freerdp
+}:
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
- version = "0.1.8";
+ version = "0.1.9";
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "jadahl";
- repo = "gnome-remote-desktop";
- rev = version;
- sha256 = "1wcvk0w4p0wnqnrjkbwvqcby9dd4nj0cm9cz0fqna31qfjrvb913";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8=";
};
- nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
buildInputs = [
- glib pipewire systemd libvncserver libsecret libnotify
+ cairo
+ freerdp
gdk-pixbuf # For libnotify
+ glib
+ libnotify
+ libsecret
+ libvncserver
+ pipewire
+ systemd
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 2eacfc2de77..05bb189c0e2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
+{ stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3, gsettings-desktop-schemas }:
let
pname = "gnome-screenshot";
- version = "3.36.0";
+ version = "3.38.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0rhj6fkpxfm26jv3vsn7yb2ybkc2k86ggy23nxa945q74y4msj9k";
+ sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5";
};
doCheck = true;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
- gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
+ gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme
gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix
new file mode 100644
index 00000000000..6bc18d5379f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, glib
+, systemd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-session-ctl";
+ version = "3.38.0";
+
+ src = fetchFromGitHub {
+ owner = "nix-community";
+ repo = pname;
+ rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main
+ hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo=";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ systemd
+ ];
+
+ meta = with stdenv.lib; {
+ description = "gnome-session-ctl extracted from gnome-session for nixpkgs";
+ homepage = "https://github.com/nix-community/gnome-session-ctl";
+ license = licenses.gpl2Plus;
+ maintainers = teams.gnome.members;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index b25688ea5a9..4684f3ebee0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,16 +1,16 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
stdenv.mkDerivation rec {
pname = "gnome-session";
- version = "3.36.0";
+ version = "3.38.0";
outputs = ["out" "sessions"];
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym";
+ sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v";
};
patches = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
})
];
- mesonFlags = [ "-Dsystemd=true" ];
+ mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];
nativeBuildInputs = [
meson ninja pkgconfig gettext makeWrapper
@@ -39,6 +39,14 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
+
+ # Use our provided `gnome-session-ctl`
+ original="@libexecdir@/gnome-session-ctl"
+ replacement="${gnome-session-ctl}/libexec/gnome-session-ctl"
+
+ find data/ -type f -name "*.service.in" -exec sed -i \
+ -e s,$original,$replacement,g \
+ {} +
'';
# `bin/gnome-session` will reset the environment when run in wayland, we
@@ -59,6 +67,9 @@ stdenv.mkDerivation rec {
mkdir $sessions
moveToOutput share/wayland-sessions "$sessions"
moveToOutput share/xsessions "$sessions"
+
+ # Our provided one is being used
+ rm -rf $out/libexec/gnome-session-ctl
'';
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index 2399c656016..320b3024dee 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
@@ -1,6 +1,8 @@
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index ddd1a591..46a3488b 100755
--- a/gnome-session/gnome-session.in
+++ b/gnome-session/gnome-session.in
-@@ -3,11 +3,13 @@
+@@ -3,17 +3,19 @@
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
[ -n "$SHELL" ] &&
@@ -12,24 +14,24 @@
+ ! (echo "$SHELL" | @grep@ -q "nologin"); then
if [ "$1" != '-l' ]; then
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
-+ # Make sure the shell actually sets up the environment
++ # Make sure the shell actually sets up the environment.
+ unset __NIXOS_SET_ENVIRONMENT_DONE
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
else
shift
fi
-@@ -13,7 +13,7 @@
- fi
fi
--SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region)
-+SETTING=$(G_MESSAGES_DEBUG= @gsettings@ get org.gnome.system.locale region)
+-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
++SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
REGION=${SETTING#\'}
REGION=${REGION%\'}
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 84edfbe5..e5285489 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
-@@ -203,7 +203,7 @@
+@@ -215,7 +215,7 @@ require_dbus_session (int argc,
}
new_argv[i + 2] = NULL;
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 2ee07fb09aa..3c039bc6310 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, fetchpatch
, substituteAll
, fetchurl
, meson
@@ -36,18 +37,25 @@
, tzdata
, nss
, gcr
+, gnome-session-ctl
}:
stdenv.mkDerivation rec {
pname = "gnome-settings-daemon";
- version = "3.36.1";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry";
+ sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2";
};
patches = [
+ # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch";
+ sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI=";
+ })
+
(substituteAll {
src = ./fix-paths.patch;
inherit tzdata;
@@ -95,6 +103,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dudev_dir=${placeholder "out"}/lib/udev"
+ "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
];
# Default for release buildtype but passed manually because
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index ba1b0faedb2..4b4901cab66 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
- version = "3.36.3";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1cg3dqvvxg8zrdqs2rci8sds2hxjahbhm87f0xpy8b3gq56lqrrb";
+ sha256 = "150c0jgjhbb59wf7lzcnp1f22lvrigw95mg5ad3jh15qzwqqd8wx";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 8f2e78c639c..3ebf409f030 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -16,15 +16,12 @@
, docbook-xsl-nons
, at-spi2-core
, libstartup_notification
-, telepathy-glib
-, telepathy-logger
, unzip
, shared-mime-info
, libgweather
, librsvg
, geoclue2
, perl
-, docbook_xml_dtd_412
, docbook_xml_dtd_42
, docbook_xml_dtd_43
, desktop-file-utils
@@ -51,6 +48,7 @@
, gtk3
, sassc
, systemd
+, pipewire
, gst_all_1
, adwaita-icon-theme
, gnome-bluetooth
@@ -67,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
- version = "3.36.5";
+ version = "3.38.1";
outputs = [ "out" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4";
+ url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1d0br74gxwnqbh102yjkszkc6fc4yd6p5lcs6bxcpi33chly72dp";
};
patches = [
@@ -84,13 +82,6 @@ stdenv.mkDerivation rec {
gsettings = "${glib.bin}/bin/gsettings";
})
- # Install bash-completions to correct prefix.
- # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch";
- sha256 = "18amnqw342vllcrjpfcq232z9xr28vgjsf2z8k73xx70nwah7hvz";
- })
-
# Use absolute path for libshew installation to make our patched gobject-introspection
# aware of the location to hardcode in the generated GIR file.
./shew-gir-path.patch
@@ -113,7 +104,7 @@ stdenv.mkDerivation rec {
pkg-config
gettext
docbook-xsl-nons
- docbook_xml_dtd_412
+ # Switch to 4.5 in the 40.
docbook_xml_dtd_42
docbook_xml_dtd_43
gtk-doc
@@ -139,7 +130,6 @@ stdenv.mkDerivation rec {
librsvg
networkmanager
libstartup_notification
- telepathy-glib
gjs
mutter
libpulseaudio
@@ -155,11 +145,11 @@ stdenv.mkDerivation rec {
upower
ibus
gnome-desktop
- telepathy-logger
gnome-settings-daemon
gobject-introspection
# recording
+ pipewire
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
@@ -197,7 +187,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# The services need typelibs.
- for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do
+ for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do
wrapGApp $out/share/gnome-shell/$svc
done
'';
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 7b93475619b..e17a608a2d8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -19,8 +19,8 @@
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
}
});
---- a/data/gnome-shell-disable-extensions.service
-+++ b/data/gnome-shell-disable-extensions.service
+--- a/data/org.gnome.Shell-disable-extensions.service
++++ b/data/org.gnome.Shell-disable-extensions.service
@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
[Service]
Type=simple
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 9f51227f235..c83f3e3268e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts
-, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
+, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils
+, sysprof }:
let
@@ -11,11 +12,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0vkgpy2afb33rrk94zqlm2q728xhzjj8s24n9wh9ylw00z3nckad";
+ sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7";
};
patches = [
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
gtk3 glib packagekit appstream-glib libsoup
gsettings-desktop-schemas gnome-desktop
gspell json-glib libsecret ostree
- polkit flatpak libxmlb gnome-online-accounts
+ polkit flatpak libxmlb gnome-online-accounts sysprof
] ++ stdenv.lib.optionals withFwupd [
fwupd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 2dd4ae9e7f7..d9e652de5f6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-system-monitor";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "18dwwwmw4m2kzvfmxyaxmnm66d1plwvh6c6naznb0xac1ymlfsw6";
+ sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 821d5707c7c..8c8cc88301d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }:
+, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2
+, libxslt, docbook-xsl-nons }:
stdenv.mkDerivation rec {
pname = "gnome-terminal";
- version = "3.36.2";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1";
+ sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r";
};
buildInputs = [
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
- pkgconfig gettext itstool which libxml2
+ pkgconfig gettext itstool which libxml2 libxslt docbook-xsl-nons
vala desktop-file-utils wrapGAppsHook pcre2
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
index 719e97647f7..ec2007e0ee4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
@@ -3,7 +3,7 @@
, gettext
, meson
, ninja
-, fetchFromGitLab
+, fetchurl
, pkg-config
, gtk3
, glib
@@ -13,34 +13,26 @@
, wrapGAppsHook
, python3
, gnome3
-, config
+, libhandy
+, librsvg
}:
rustPlatform.buildRustPackage rec {
pname = "gnome-tour";
- version = "0.0.1";
+ version = "3.38.0";
- # We don't use the uploaded tar.xz because it comes pre-vendored
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "GNOME";
- repo = "gnome-tour";
- rev = version;
- sha256 = "0lbkspnlziq3z177071w3jpghmdwflzra1krdwchzmkfmrhy50ch";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng=";
};
- cargoSha256 = "0k1wp9wswr57fv2d9bysxn97fchd4vz29n5r8gfyp0gcm8rclmij";
-
- mesonFlags = [
- "-Ddistro_name=NixOS"
- "-Ddistro_icon_name=nix-snowflake"
- "-Ddistro_version=20.09"
- ];
+ cargoVendorDir = "vendor";
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
+ glib # glib-compile-resources
meson
ninja
pkg-config
@@ -52,6 +44,8 @@ rustPlatform.buildRustPackage rec {
gdk-pixbuf
glib
gtk3
+ libhandy
+ librsvg
];
# Don't use buildRustPackage phases, only use it for rust deps setup
@@ -65,11 +59,11 @@ rustPlatform.buildRustPackage rec {
patchShebangs build-aux/meson_post_install.py
'';
- # passthru = {
- # updateScript = gnome3.updateScript {
- # packageName = pname;
- # };
- # };
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
meta = with stdenv.lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-tour";
diff --git a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix
new file mode 100644
index 00000000000..b2db2baf025
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix
@@ -0,0 +1,17 @@
+{ fetchFromGitLab }:
+
+let
+ # We need a gvc different then that which is shipped in the source tarball of
+ # whatever package that imports this file
+ gvc-src-with-ucm = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = "libgnome-volume-control";
+ rev = "7a621180b46421e356b33972e3446775a504139c";
+ sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9";
+ };
+in
+''
+ rm -r ./subprojects/gvc
+ cp -r ${gvc-src-with-ucm} ./subprojects/gvc
+''
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
new file mode 100644
index 00000000000..3691c034d1e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
@@ -0,0 +1,74 @@
+From 7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d Mon Sep 17 00:00:00 2001
+Message-Id: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH 1/7] EGL: Include EGL/eglmesaext.h
+
+From: Jan Alexander Steffens (heftig)
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+
+(cherry picked from commit a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90)
+---
+ cogl/cogl/meson.build | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c | 1 +
+ src/backends/meta-egl.h | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 1057ef9..9a64294 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+
+ if have_egl
+- cogl_egl_includes_string = '#include \n#include '
++ cogl_egl_includes_string = '#include \n#include \n#include '
+ else
+ cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d..db0b74f 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+
+ #include
+ #include
++#include
+
+ /*
+ * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be9..fdeff4f 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a8164..4591e7d 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+
+ #include
+ #include
++#include
+ #include
+
+ #define META_EGL_ERROR meta_egl_error_quark ()
+
+base-commit: 48ffbb582404c1d52196eb6cc5f082c31ca4910c
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
similarity index 82%
rename from pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch
rename to pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
index 0f60be3a121..28f89ac7c0c 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
@@ -1,36 +1,40 @@
-From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?=
+From 14cee101882e65a57dcd66ea0f8399477b23ce7e Mon Sep 17 00:00:00 2001
+Message-Id: <14cee101882e65a57dcd66ea0f8399477b23ce7e.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
Date: Sat, 19 Oct 2019 13:26:05 +0200
-Subject: [PATCH] drop inheritable
+Subject: [PATCH 2/7] drop inheritable
+
+From: Tor Hedin Brønner
Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01
We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell.
-
---
config.h.meson | 3 +++
meson.build | 5 +++++
meson_options.txt | 6 ++++++
- src/core/main.c | 11 +++++++++++
+ src/core/main.c | 10 ++++++++++
src/meson.build | 1 +
- 5 files changed, 26 insertions(+)
+ 5 files changed, 25 insertions(+)
diff --git a/config.h.meson b/config.h.meson
-index 0bab71848..202fb7ed1 100644
+index 0bab718..202fb7e 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -58,6 +58,9 @@
/* Xwayland applications allowed to issue keyboard grabs */
#mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES
-
+
+/* Defined if libcap-ng is available */
+#mesondefine HAVE_LIBCAPNG
+
/* XKB base prefix */
#mesondefine XKB_BASE
-
+
diff --git a/meson.build b/meson.build
-index 3322bd3b1..01c8020fa 100644
+index 29d495b..86970df 100644
--- a/meson.build
+++ b/meson.build
@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7'
@@ -38,7 +42,7 @@ index 3322bd3b1..01c8020fa 100644
libwacom_req = '>= 0.13'
atk_req = '>= 2.5.3'
+libcapng_req = '>= 0.7.9'
-
+
# optional version requirements
udev_req = '>= 228'
@@ -125,6 +126,7 @@ xau_dep = dependency('xau')
@@ -46,7 +50,7 @@ index 3322bd3b1..01c8020fa 100644
atk_dep = dependency('atk', version: atk_req)
libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))
-
+
# For now always require X11 support
have_x11 = true
@@ -256,6 +258,7 @@ have_core_tests = false
@@ -54,7 +58,7 @@ index 3322bd3b1..01c8020fa 100644
have_clutter_tests = false
have_installed_tests = false
+have_libcapng = libcapng_dep.found()
-
+
if have_tests
have_core_tests = get_option('core_tests')
@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom)
@@ -63,7 +67,7 @@ index 3322bd3b1..01c8020fa 100644
cdata.set('HAVE_INTROSPECTION', have_introspection)
+cdata.set('HAVE_LIBCAPNG', have_libcapng)
cdata.set('HAVE_PROFILER', have_profiler)
-
+
xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
@@ -443,6 +447,7 @@ output = [
' Startup notification..... ' + have_startup_notification.to_string(),
@@ -74,7 +78,7 @@ index 3322bd3b1..01c8020fa 100644
' Tests:',
'',
diff --git a/meson_options.txt b/meson_options.txt
-index 73aa7adde..8bfaacd9a 100644
+index 73aa7ad..8bfaacd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules',
@@ -88,13 +92,13 @@ index 73aa7adde..8bfaacd9a 100644
+ description: 'Enable libcap-ng support'
+)
diff --git a/src/core/main.c b/src/core/main.c
-index 7f4f666d2..b27968f13 100644
+index 3935f35..ecf3cb2 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -66,6 +66,10 @@
#include
#endif
-
+
+#ifdef HAVE_LIBCAPNG
+#include
+#endif
@@ -105,7 +109,7 @@ index 7f4f666d2..b27968f13 100644
@@ -673,6 +677,12 @@ meta_run (void)
if (!meta_display_open ())
meta_exit (META_EXIT_ERROR);
-
+
+#ifdef HAVE_LIBCAPNG
+ capng_clear(CAPNG_SELECT_BOTH);
+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
@@ -113,10 +117,10 @@ index 7f4f666d2..b27968f13 100644
+#endif
+
g_main_loop_run (meta_main_loop);
-
+
meta_finalize ();
diff --git a/src/meson.build b/src/meson.build
-index 90d80734f..a9fffa2c2 100644
+index 90d8073..a9fffa2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,6 +18,7 @@ mutter_pkg_deps = [
@@ -126,7 +130,6 @@ index 90d80734f..a9fffa2c2 100644
+ libcapng_dep,
pango_dep,
]
-
---
-2.23.0
-
+
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
similarity index 60%
rename from pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
rename to pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
index 7be00b33bba..9f78a324d9d 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
@@ -1,7 +1,12 @@
-From e10186284103d3ad8e425980b096eac813cae631 Mon Sep 17 00:00:00 2001
+From 5d2b9a03f24b4dbc423adff52b2eeb478c4b5913 Mon Sep 17 00:00:00 2001
+Message-Id: <5d2b9a03f24b4dbc423adff52b2eeb478c4b5913.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Sun, 5 Apr 2020 23:06:03 -0400
+Subject: [PATCH 3/7] Fix glitches in gala
+
From: worldofpeace
-Date: Sun, 5 Apr 2020 23:06:03 -0400
-Subject: [PATCH] Fix glitches in gala
This fixes issues for users of mutter like in gala[0].
@@ -12,7 +17,7 @@ Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
-index ecf9a597d..07b8b7155 100644
+index ecf9a59..07b8b71 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
@@ -25,5 +30,4 @@ index ecf9a597d..07b8b7155 100644
}
else
--
-2.25.1
-
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
new file mode 100644
index 00000000000..cd98d395041
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
@@ -0,0 +1,58 @@
+From 5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918 Mon Sep 17 00:00:00 2001
+Message-Id: <5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Wed, 30 Oct 2019 15:23:24 -0700
+Subject: [PATCH 4/7] profiler: track changes in GLib and Sysprof
+
+From: Christian Hergert
+
+This tracks the changes to gdbus-codegen in terms of how GUnixFDList is
+done to use the UnixFD annotation.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/908
+(cherry picked from commit 605171291993460f31d470a8143d6438d0c6169c)
+---
+ src/backends/meta-profiler.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/backends/meta-profiler.c b/src/backends/meta-profiler.c
+index 10d433a..0d62701 100644
+--- a/src/backends/meta-profiler.c
++++ b/src/backends/meta-profiler.c
+@@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler,
+ static gboolean
+ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+ GDBusMethodInvocation *invocation,
++ GUnixFDList *fd_list,
+ GVariant *options,
+ GVariant *fd_variant)
+ {
+ MetaProfiler *profiler = META_PROFILER (dbus_profiler);
+ GMainContext *main_context = g_main_context_default ();
+- GDBusMessage *message;
+- GUnixFDList *fd_list;
+ const char *group_name;
+ int position;
+ int fd = -1;
+@@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+
+ g_variant_get (fd_variant, "h", &position);
+
+- message = g_dbus_method_invocation_get_message (invocation);
+- fd_list = g_dbus_message_get_unix_fd_list (message);
+ if (fd_list)
+ fd = g_unix_fd_list_get (fd_list, position, NULL);
+
+@@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+
+ g_debug ("Profiler running");
+
+- meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation);
++ meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL);
+ return TRUE;
+ }
+
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
new file mode 100644
index 00000000000..138970ddda0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
@@ -0,0 +1,32 @@
+From 2caa072dd8e283a8e43febeab55fe8b76dda69b7 Mon Sep 17 00:00:00 2001
+Message-Id: <2caa072dd8e283a8e43febeab55fe8b76dda69b7.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Wed, 29 Jan 2020 11:02:33 +0100
+Subject: [PATCH 5/7] meta: Add missing display.h to meta-workspace-manager.h
+
+From: Corentin Noël
+
+This is required because MetaDisplayCorner is only defined in display.h
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/1025
+(cherry picked from commit 9d390ee49fb1f6300336e82ae94cc8061c6bae12)
+---
+ src/meta/meta-workspace-manager.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h
+index 0390c44..92cd681 100644
+--- a/src/meta/meta-workspace-manager.h
++++ b/src/meta/meta-workspace-manager.h
+@@ -26,6 +26,7 @@
+ #include
+
+ #include
++#include
+ #include
+ #include
+
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
new file mode 100644
index 00000000000..6d88f0f5e76
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
@@ -0,0 +1,102 @@
+From 0c95e5a5b31eab93f149b90982680f38e8977063 Mon Sep 17 00:00:00 2001
+Message-Id: <0c95e5a5b31eab93f149b90982680f38e8977063.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Sat, 4 Jul 2020 12:01:28 -0700
+Subject: [PATCH 6/7] build: bump ABI to sysprof-capture-4
+
+From: Christian Hergert
+
+GLib will now be linking against sysprof-capture-4.a. To support that,
+sysprof had to remove the GLib dependency from sysprof-capture-4 which
+had the side-effect of breaking ABi.
+
+This bumps the dependency and includes a fallback to compile just the
+libsysprof-capture-4.a using a subproject wrap.
+
+https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1352
+(cherry picked from commit 2c08eb6d163b6758efec9eafe1d5c17fc1ab3692)
+---
+ meson.build | 20 ++++++++++++++++++--
+ src/meson.build | 8 ++++++--
+ subprojects/sysprof.wrap | 4 ++++
+ 3 files changed, 28 insertions(+), 4 deletions(-)
+ create mode 100644 subprojects/sysprof.wrap
+
+diff --git a/meson.build b/meson.build
+index 86970df..3dc0098 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('mutter', 'c',
+ version: '3.34.6',
+- meson_version: '>= 0.50.0',
++ meson_version: '>= 0.51.0',
+ license: 'GPLv2+'
+ )
+
+@@ -52,6 +52,9 @@ gbm_req = '>= 10.3'
+ # screen cast version requirements
+ libpipewire_req = '>= 0.2.5'
+
++# profiler requirements
++sysprof_req = '>= 3.37.2'
++
+ gnome = import('gnome')
+ pkg = import('pkgconfig')
+ i18n = import('i18n')
+@@ -275,7 +278,20 @@ endif
+
+ have_profiler = get_option('profiler')
+ if have_profiler
+- sysprof_dep = dependency('sysprof-capture-3')
++ # libsysprof-capture support
++ sysprof_dep = dependency('sysprof-capture-4',
++ required: true,
++ default_options: [
++ 'enable_examples=false',
++ 'enable_gtk=false',
++ 'enable_tests=false',
++ 'enable_tools=false',
++ 'libsysprof=false',
++ 'with_sysprofd=none',
++ 'help=false',
++ ],
++ fallback: ['sysprof', 'libsysprof_capture_dep'],
++ )
+ endif
+
+ required_functions = [
+diff --git a/src/meson.build b/src/meson.build
+index a9fffa2..a91baa1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -711,9 +711,13 @@ if have_profiler
+ 'backends/meta-profiler.h',
+ ]
+
+- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
+- sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
++ if sysprof_dep.type_name() == 'pkgconfig'
++ sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
++ else
++ sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src')
++ endif
+
++ sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
+ dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
+ sysprof3_dbus_file,
+ interface_prefix: 'org.gnome.',
+diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap
+new file mode 100644
+index 0000000..c8f5883
+--- /dev/null
++++ b/subprojects/sysprof.wrap
+@@ -0,0 +1,4 @@
++[wrap-git]
++directory=sysprof
++url=https://gitlab.gnome.org/GNOME/sysprof.git
++revision=cae28263ff5dd4a510d82f3dc2e3a3b3d9b386fb
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
new file mode 100644
index 00000000000..8376fc649b5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
@@ -0,0 +1,27 @@
+From 7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4 Mon Sep 17 00:00:00 2001
+Message-Id: <7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE
+Date: Fri, 25 Sep 2020 20:48:33 -0400
+Subject: [PATCH 7/7] fix paths
+
+---
+ src/core/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/util.c b/src/core/util.c
+index 79bcfdc..87ce549 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -623,7 +623,7 @@ meta_show_dialog (const char *type,
+
+ args = g_ptr_array_new ();
+
+- append_argument (args, "zenity");
++ append_argument (args, "@zenity@/bin/zenity");
+ append_argument (args, type);
+
+ if (display)
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
index 87696987850..6afded76671 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
@@ -43,20 +43,19 @@
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.34.5";
+ version = "3.34.6";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
+ hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY=";
};
mesonFlags = [
"-Degl_device=true"
"-Dinstalled_tests=false" # TODO: enable these
"-Dwayland_eglstream=true"
- "-Dxwayland-path=${xwayland}/bin/Xwayland"
];
propagatedBuildInputs = [
@@ -105,45 +104,14 @@ stdenv.mkDerivation rec {
];
patches = [
- # Fix build with libglvnd provided headers
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
- sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
- })
-
- # gnome-3-34 2020-04-24
- # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
- (fetchpatch {
- url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
- sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
- })
-
- # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
- # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
- ./drop-inheritable.patch
-
- # See commit message for details
- ./0001-Fix-glitches-in-gala.patch
-
- # https://gitlab.gnome.org/GNOME/mutter/merge_requests/1094
- # https://gitlab.gnome.org/GNOME/mutter/merge_requests/957
- ./fix-sysprof.patch
-
- # profiler: track changes in GLib and Sysprof
- # https://gitlab.gnome.org/GNOME/mutter/merge_requests/908
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/605171291993460f31d470a8143d6438d0c6169c.patch";
- sha256 = "10fxzj0lmic2sp57w26w3r0bv1szngjjs50p3ka22wr9pxqmzl7l";
- })
-
- # Fixes https://github.com/elementary/wingpanel/issues/305
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/9d390ee49fb1f6300336e82ae94cc8061c6bae12.patch";
- sha256 = "12hmi07rvspwhp8h1y1vmcvmvbh8fihcrb07ja5g0qnh28ip5qfi";
- })
-
+ ./0001-EGL-Include-EGL-eglmesaext.h.patch
+ ./0002-drop-inheritable.patch
+ ./0003-Fix-glitches-in-gala.patch
+ ./0004-profiler-track-changes-in-GLib-and-Sysprof.patch
+ ./0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
+ ./0006-build-bump-ABI-to-sysprof-capture-4.patch
(substituteAll {
- src = ./fix-paths.patch;
+ src = ./0007-fix-paths.patch;
inherit zenity;
})
];
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch
deleted file mode 100644
index 1986c65e8f4..00000000000
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/util.c b/src/core/util.c
-index 57b73747d..f424cc81c 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
-
- args = g_ptr_array_new ();
-
-- append_argument (args, "zenity");
-+ append_argument (args, "@zenity@/bin/zenity");
- append_argument (args, type);
-
- if (display)
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch
deleted file mode 100644
index 481a0ab89cb..00000000000
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
-From: worldofpeace
-Date: Mon, 16 Sep 2019 11:18:27 -0400
-Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
-
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 182f7f5f5..43060865b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -710,7 +710,7 @@ if have_profiler
- 'backends/meta-profiler.h',
- ]
-
-- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
-+ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
- sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
-
- dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
---
-2.22.1
-
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 79cbbb9f5a8..35d2822e8fb 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -42,13 +42,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.36.5";
+ version = "3.38.1";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1py7sqrpvg2qvswxclshysx7hd9jk65i6cwqsagd6rg6rnjhblp0";
+ sha256 = "0cvs47h7xhalkh8xcchllaws212ml3d23aj0pmfq0qyzkw65f8g9";
};
patches = [
@@ -124,6 +124,9 @@ let self = stdenv.mkDerivation rec {
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
+ # Install udev files into our own tree.
+ PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+
passthru = {
libdir = "${self}/lib/mutter-6";
diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
index 1600db1e705..7374e1b8693 100644
--- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
@@ -102,18 +102,18 @@ index 7f4f666d2..b27968f13 100644
#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
#include
#endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */
-@@ -673,6 +677,12 @@ meta_run (void)
- if (!meta_display_open ())
- meta_exit (META_EXIT_ERROR);
-
+@@ -670,5 +674,12 @@ int
+ meta_run (void)
+ {
+ meta_start ();
++
+#ifdef HAVE_LIBCAPNG
+ capng_clear(CAPNG_SELECT_BOTH);
+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
+ capng_apply(CAPNG_SELECT_BOTH);
+#endif
+
- g_main_loop_run (meta_main_loop);
-
+ meta_run_main_loop ();
meta_finalize ();
diff --git a/src/meson.build b/src/meson.build
index 90d80734f..a9fffa2c2 100644
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 6145178de1e..2107cad4a5b 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -32,13 +32,24 @@
stdenv.mkDerivation rec {
pname = "nautilus";
- version = "3.36.3";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn";
+ sha256 = "1zfh48ibap6jnw20rxls7nbv4zzqs6n5abr2dzyvfx5p2cmq2gha";
};
+ patches = [
+ # Allow changing extension directory using environment variable.
+ ./extension_dir.patch
+
+ # Hardcode required paths.
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit tracker;
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
gettext
@@ -86,10 +97,6 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/postinstall.py
'';
- patches = [
- ./extension_dir.patch
- ];
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch
new file mode 100644
index 00000000000..dc9874359b2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index 28b96c996..0b1fad9ab 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -962,7 +962,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"@tracker@/bin/tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
index 4259f93eb24..6fe651b9cbb 100644
--- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
@@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build
-index 209d4187..58580980 100644
+index 4aa683d6..a930d533 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,11 @@ if not get_option('uninstalled')
@@ -14,7 +14,7 @@ index 209d4187..58580980 100644
+ endif
rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
- rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets')
+ rygel_presetdir = join_paths(rygel_datadir, 'presets')
@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
@@ -25,7 +25,7 @@ index 209d4187..58580980 100644
conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
diff --git a/meson_options.txt b/meson_options.txt
-index f09cac58..ff11c548 100644
+index cb604c4e..1b049b77 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,7 @@
@@ -33,6 +33,6 @@ index f09cac58..ff11c548 100644
option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation')
option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path')
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
- option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker'])
+ option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3'])
option('engines', type : 'array', choices : ['simple', 'gstreamer'])
option('examples', type : 'boolean', value : 'true')
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
index 529091e5fd6..f7ce3387fc0 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
- version = "0.38.4";
+ version = "0.40.0";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc";
+ sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn";
};
nativeBuildInputs = [
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
shared-mime-info
] ++ (with gst_all_1; [
gstreamer
+ gst-editing-services
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@@ -77,6 +78,8 @@ stdenv.mkDerivation rec {
"-Dapi-docs=false"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
+ # Build all plug-ins except for tracker 2
+ "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3"
];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index eebd307a306..66846876fae 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "09gmzrlljdqkj3w6wa1c27wypy6j8z9dw3jzv9izfqvp38liibsn";
+ sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 50ab50e58b2..e59265e79de 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "totem";
- version = "3.34.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b";
+ sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8";
};
doCheck = true;
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
];
+ mesonFlags = [
+ # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
+ ];
+
postPatch = ''
chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file
patchShebangs .
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 09019e6758c..a29a292b3d7 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "yelp-xsl";
- version = "3.36.0";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag";
+ sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 1235447c032..147809de9ef 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "yelp";
- version = "3.36.0";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "097djjyl096zmicjpxlb858yz6rd5cj813xc8azbxlhsscikwjzx";
+ sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl";
};
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 846eefa9fa9..302ad2c21aa 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-session = callPackage ./core/gnome-session { };
+ gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
+
gnome-shell = callPackage ./core/gnome-shell { };
gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 11bad7b89d1..52d0cefdc87 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "devhelp";
- version = "3.36.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0phcjdxnwgg0a0z9kyidp977jy365pny6bh2qhdyzcpvkqqq8nlb";
+ sha256 = "0s938p1snkskn8np5xh5fzp3zrjrnsh99haiz92nvci264bzp3li";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 3a53e592b5f..f42d1a93e01 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-devel-docs";
- version = "3.32.1";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0";
+ sha256 = "07849yhpc4l4jscskpsbjwsp5qs8f0jz3rmh3p1nj13vxmvgm5j5";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 98827fd3f6a..5e51b995a54 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -1,16 +1,37 @@
-{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound
-, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
-, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
+{ stdenv
+, fetchFromGitHub
+, substituteAll
+, openssl
+, gsound
+, meson
+, ninja
+, pkg-config
+, gobject-introspection
+, wrapGAppsHook
+, glib
+, gtk3
+, openssh
+, gnome3
+, gjs
+, nixosTests
+, atk
+, harfbuzz
+, pango
+, gdk-pixbuf
+, gsettings-desktop-schemas
+}:
stdenv.mkDerivation rec {
pname = "gnome-shell-gsconnect";
- version = "41";
+ version = "43";
+
+ outputs = [ "out" "installedTests" ];
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
- sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j";
+ sha256 = "0hm14hg4nhv9hrmjcf9dgm7dsvzpjfifihjmb6yc78y9yjw0i3v7";
};
patches = [
@@ -19,24 +40,23 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
gapplication = "${glib.bin}/bin/gapplication";
})
+
+ # Allow installing installed tests to a separate output
+ ./installed-tests-path.patch
];
nativeBuildInputs = [
- meson ninja pkgconfig
+ meson
+ ninja
+ pkg-config
gobject-introspection # for locating typelibs
wrapGAppsHook # for wrapping daemons
- libxml2 # xmllint
];
buildInputs = [
glib # libgobject
gtk3
- at-spi2-core # atspi
- gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension
- gnome3.nautilus-python
gsound
- upower
- gnome3.caribou
gjs # for running daemon
gnome3.evolution-data-server # for libebook-contacts typelib
];
@@ -51,11 +71,13 @@ stdenv.mkDerivation rec {
"-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
"-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
"-Dpost_install=true"
+ "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
];
postPatch = ''
patchShebangs meson/nmh.sh
patchShebangs meson/post-install.sh
+ patchShebangs installed-tests/prepare-tests.sh
# TODO: do not include every typelib everywhere
# for example, we definitely do not need nautilus
@@ -65,20 +87,34 @@ stdenv.mkDerivation rec {
done
'';
- postFixup = ''
+ postFixup = let
+ testDeps = [
+ gtk3 harfbuzz atk pango.out gdk-pixbuf
+ ];
+ in ''
# Let’s wrap the daemons
for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
echo "Wrapping program $file"
wrapGApp "$file"
done
+
+ wrapProgram "$installedTests/libexec/installed-tests/gsconnect/minijasmine" \
+ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
'';
uuid = "gsconnect@andyholmes.github.io";
+ passthru = {
+ tests = {
+ installedTests = nixosTests.installed-tests.gsconnect;
+ };
+ };
+
meta = with stdenv.lib; {
description = "KDE Connect implementation for Gnome Shell";
homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ etu ];
platforms = platforms.linux;
};
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch
new file mode 100644
index 00000000000..78e1ad96d74
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch
@@ -0,0 +1,30 @@
+diff --git a/installed-tests/meson.build b/installed-tests/meson.build
+index c7eff2fb..ef4f6052 100644
+--- a/installed-tests/meson.build
++++ b/installed-tests/meson.build
+@@ -1,5 +1,5 @@
+-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
+-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
+
+ installed_tests_srcdir = meson.current_source_dir()
+ installed_tests_builddir = meson.current_build_dir()
+diff --git a/meson_options.txt b/meson_options.txt
+index 8912e052..ca6ee5eb 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -116,6 +116,13 @@ option(
+ description: 'Native Messaging Host directory for Mozilla'
+ )
+
++option(
++ 'installed_test_prefix',
++ type: 'string',
++ value: '',
++ description: 'Prefix for installed tests'
++)
++
+ option(
+ 'installed_tests',
+ type: 'boolean',
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 3960f233003..7ed3a0d478c 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "four-in-a-row";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1y1ihh72zk0bgyj197dpwgwj1q91dhvp0rasrib8k18sisrdq31h";
+ sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 7747676f09e..d2f9cfaa2dd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-chess";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "165bk8s3nngyqbikggspj4rff5nxxfkfcmgzjb4grmsrgbqwk5di";
+ sha256 = "10y248xdjx9b0izxii9fjyvkra65jxfx66ivwznmn0cadda9gdqg";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index eb6f4b10dbd..a51b79e0f88 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-klotski";
- version = "3.36.3";
+ version = "3.38.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0fj1hlkqpjdb4hxd0di16ahm5j2r5j218ckyk88pmhjf8whb2g6z";
+ sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index fc706b89f1d..7a97002bc56 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -1,41 +1,45 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, gettext, itstool, libxml2
-, meson, ninja, python3, vala, desktop-file-utils
+, meson, ninja, glib, vala, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "gnome-mahjongg";
- version = "3.36.2";
+ version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; };
+ sha256 = "1wslwhr782pdzrvca7wa6smvyid5yr42kjlra6qd9ji5qss0i1wj";
};
nativeBuildInputs = [
- meson ninja vala python3 desktop-file-utils
+ meson ninja vala desktop-file-utils
pkgconfig gnome3.adwaita-icon-theme
libxml2 itstool gettext wrapGAppsHook
+ glib # for glib-compile-schemas
];
buildInputs = [
- gtk3 librsvg
+ glib
+ gtk3
+ librsvg
];
- postPatch = ''
- chmod +x data/meson_post_install.py
- patchShebangs data/meson_post_install.py
- '';
+ mesonFlags = [
+ "-Dcompile-schemas=enabled"
+ ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Apps/Mahjongg";
description = "Disassemble a pile of tiles by removing matching pairs";
maintainers = teams.gnome.members;
- license = licenses.gpl2;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index a9757de6393..770b8dde0c6 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-nibbles";
- version = "3.36.1";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "17n6ji6yr521kzxfbfm0yxvrlnw4hlzacbwn0jqmw7xf3pdq35z6";
+ sha256 = "096mk2hsa1za002rk4cnhm0h8ps99jzl47kap27i16s4m2ny71vk";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 2ba6d4e7044..1d9beca3667 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-robots";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0qmdwrl70ccs3blgwmpcf3sg9k8mcvsl1dr1gds4ba3fq9ca8ipb";
+ sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 0a84e1065f3..a46cfeee506 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sudoku";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "17a1r2jk5yygrxil1dycmamxyvyi64mr29mbyfgcx5hm2fylxxwm";
+ sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 99bdffe16ad..fc73ef1397e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-taquin";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0";
+ sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index f80012e22bb..afa12f1cf17 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-tetravex";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0amnmd12mpny3vnf946wnphlsnbvjrvkx29sarplm57m1571qdc5";
+ sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8d1c9e3dd65..7dac364dcb2 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "hitori";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0mq1jv8rbmvksnhbm1d25kcvcfr9lq58qipcacn7wa26xpx7cvs5";
+ sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 06831ecd0a9..08d402ead57 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "iagno";
- version = "3.36.4";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29";
+ sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index fd44bbece99..f5425205db6 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "lightsoff";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0qvafpciqbqmpan9i8ans3lqs29v02zblz6k0hzj4p3qq4sch3a3";
+ sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index a5302fee7ab..9bc1c5ee73a 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "quadrapassel";
- version = "3.36.05";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "04abxmimh5npw8rhz1sfi6wxilgc6i1wka9mlnfwp8v1p1cb00cv";
+ sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index 2fd1d034db3..fea6ce571e0 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
-, librsvg, gettext, itstool, libxml2, wrapGAppsHook
+, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook
, meson, ninja, python3, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "tali";
- version = "3.36.4";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c";
+ sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9";
};
passthru = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
pkgconfig gnome3.adwaita-icon-theme
libxml2 itstool gettext wrapGAppsHook
];
- buildInputs = [ gtk3 gdk-pixbuf librsvg ];
+ buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch
new file mode 100644
index 00000000000..abd8772cf31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch
@@ -0,0 +1,10 @@
+diff --git a/test/meson.build b/test/meson.build
+index 6ea5e27a..450c03e3 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration',
+ )
+
+ test('engine-tests', test_engine_bin)
+-test('client-tests', test_client_bin)
++test('client-tests', test_client_bin, timeout: 300)
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 0326e38aba7..6390b03efa3 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,44 +1,111 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
-, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch
-, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking
-, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, pkgconfig
+, gtk3
+, vala
+, enchant2
+, wrapGAppsHook
+, meson
+, ninja
+, desktop-file-utils
+, gnome-online-accounts
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, libpeas
+, libsecret
+, gmime3
+, isocodes
+, libxml2
+, gettext
+, sqlite
+, gcr
+, json-glib
+, itstool
+, libgee
+, gnome3
+, webkitgtk
+, python3
+, gnutls
+, cacert
+, xvfb_run
+, glibcLocales
+, dbus
+, shared-mime-info
+, libunwind
+, folks
+, glib-networking
+, gobject-introspection
+, gspell
+, appstream-glib
+, libytnef
+, libhandy
+, gsound
+}:
stdenv.mkDerivation rec {
pname = "geary";
- version = "3.36.2";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis";
+ sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7";
};
- nativeBuildInputs = [
- desktop-file-utils gettext itstool libxml2 meson ninja
- pkgconfig vala wrapGAppsHook python3 appstream-glib
- gobject-introspection
- ];
-
- buildInputs = [
- adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts
- gsettings-desktop-schemas gtk3 isocodes json-glib libpeas
- libgee libsecret sqlite webkitgtk glib-networking
- libunwind folks gspell libytnef libhandy
- ];
-
- checkInputs = [ xvfb_run dbus ];
-
- mesonFlags = [
- "-Dcontractor=true" # install the contractor file (Pantheon specific)
- ];
-
patches = [
# Longer timeout for client test.
- (fetchpatch {
- url = "https://salsa.debian.org/gnome-team/geary/raw/04be1e058a2e65075dd8cf8843d469ee45a9e09a/debian/patches/Bump-client-test-timeout-to-300s.patch";
- sha256 = "1zvnq8bgla160531bjdra8hcg15mp8r1j1n53m1xfgm0ssnj5knx";
- })
+ ./Bump-client-test-timeout-to-300s.patch
+ ];
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ gettext
+ gobject-introspection
+ itstool
+ libxml2
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ adwaita-icon-theme
+ enchant2
+ folks
+ gcr
+ glib-networking
+ gmime3
+ gnome-online-accounts
+ gsettings-desktop-schemas
+ gsound
+ gspell
+ gtk3
+ isocodes
+ json-glib
+ libgee
+ libhandy
+ libpeas
+ libsecret
+ libunwind
+ libytnef
+ sqlite
+ webkitgtk
+ ];
+
+ checkInputs = [
+ dbus
+ gnutls # for certtool
+ cacert # trust store for glib-networking
+ xvfb_run
+ glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation
+ ];
+
+ mesonFlags = [
+ "-Dcontractor=true" # install the contractor file (Pantheon specific)
];
# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
@@ -54,12 +121,12 @@ stdenv.mkDerivation rec {
chmod +x desktop/geary-attach
'';
- # FIXME: fix tests
- doCheck = false;
+ doCheck = true;
checkPhase = ''
NO_AT_BRIDGE=1 \
- XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \
+ GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \
+ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test -v --no-stdsplit
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index a33376618c2..f07d93d421c 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -1,10 +1,9 @@
{ stdenv
, fetchurl
-, intltool
+, gettext
, itstool
, libxml2
-, libxslt
-, pkgconfig
+, pkg-config
, gnome-panel
, gtk3
, glib
@@ -22,23 +21,20 @@
, gnome3
}:
-let
+stdenv.mkDerivation rec {
pname = "gnome-applets";
- version = "3.36.4";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.37.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1cd7y2air9cjznqmnynadbsayvq4dpsi39avnz46vv0bavx1aiwz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0l1mc9ymjg0bgk92a08zd85hx1vaqrzdj0dwzmna20rp51vf0l4a";
};
nativeBuildInputs = [
- intltool
+ gettext
itstool
- pkgconfig
+ pkg-config
libxml2
- libxslt
];
buildInputs = [
@@ -53,7 +49,7 @@ in stdenv.mkDerivation rec {
adwaita-icon-theme
libgweather
gucharmap
- tracker
+ # tracker # Tracker 3 not supported.
polkit
wirelesstools
linuxPackages.cpupower
@@ -63,9 +59,8 @@ in stdenv.mkDerivation rec {
doCheck = true;
- configureFlags = [
- "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
- ];
+ # Don't try to install modules to gnome panel's directory, as it's read only
+ PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index cde21551a8a..936ad3559c3 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -27,10 +27,9 @@
, xkeyboard_config
, runCommand
}:
-
let
pname = "gnome-flashback";
- version = "3.36.3";
+ version = "3.37.2";
# From data/sessions/Makefile.am
requiredComponentsCommon = [
@@ -55,13 +54,13 @@ let
"org.gnome.SettingsDaemon.Wacom"
"org.gnome.SettingsDaemon.XSettings"
];
- requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([wmName] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
+ requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
gnome-flashback = stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "19y1a4kq6db6a19basss76l4rypiz0lwr32ajli1ra1d1yj9xfid";
+ sha256 = "0lz6icgng8ri4sdi3lkdsyvxzfvlkayn85b5346g76vc1w5y03db";
};
# make .desktop Execs absolute
@@ -143,44 +142,46 @@ let
'';
};
- gnomeSession = writeTextFile {
- name = "gnome-flashback-${wmName}-gnome-session";
- destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
- text = ''
- [GNOME Session]
- Name=GNOME Flashback (${wmLabel})
- ${requiredComponents wmName}
+ gnomeSession = writeTextFile {
+ name = "gnome-flashback-${wmName}-gnome-session";
+ destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
+ text = ''
+ [GNOME Session]
+ Name=GNOME Flashback (${wmLabel})
+ ${requiredComponents wmName}
+ '';
+ };
+
+ executable = writeShellScriptBin "gnome-flashback-${wmName}" ''
+ if [ -z $XDG_CURRENT_DESKTOP ]; then
+ export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"
+ fi
+
+ export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS
+
+ exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@"
'';
+
+ in
+ writeTextFile
+ {
+ name = "gnome-flashback-${wmName}-xsession";
+ destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
+ text = ''
+ [Desktop Entry]
+ Name=GNOME Flashback (${wmLabel})
+ Comment=This session logs you into GNOME Flashback with ${wmLabel}
+ Exec=${executable}/bin/gnome-flashback-${wmName}
+ TryExec=${wmCommand}
+ Type=Application
+ DesktopNames=GNOME-Flashback;GNOME;
+ '';
+ } // {
+ providedSessions = [ "gnome-flashback-${wmName}" ];
};
- executable = writeShellScriptBin "gnome-flashback-${wmName}" ''
- if [ -z $XDG_CURRENT_DESKTOP ]; then
- export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"
- fi
-
- export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS
-
- exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@"
- '';
-
- in writeTextFile {
- name = "gnome-flashback-${wmName}-xsession";
- destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
- text = ''
- [Desktop Entry]
- Name=GNOME Flashback (${wmLabel})
- Comment=This session logs you into GNOME Flashback with ${wmLabel}
- Exec=${executable}/bin/gnome-flashback-${wmName}
- TryExec=${wmCommand}
- Type=Application
- DesktopNames=GNOME-Flashback;GNOME;
- '';
- } // {
- providedSessions = [ "gnome-flashback-${wmName}" ];
- };
-
mkSystemdTargetForWm = { wmName }:
- runCommand "gnome-flashback-${wmName}.target" {} ''
+ runCommand "gnome-flashback-${wmName}.target" { } ''
mkdir -p $out/lib/systemd/user
cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \
"$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target"
@@ -195,4 +196,5 @@ let
platforms = platforms.linux;
};
};
- in gnome-flashback
+in
+gnome-flashback
diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 037c7812105..b06bf1bcbea 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -18,19 +18,18 @@
, pkgconfig
, polkit
, systemd
-, wrapGAppsHook }:
+, wrapGAppsHook
+}:
-let
+stdenv.mkDerivation rec {
pname = "gnome-panel";
- version = "3.36.2";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.37.1";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0z0f64rgcwkv48kfd1ifzjvnmg3c386hwi9cj11mr5198rah0p4p";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ hash = "sha256-HVmP1okz52AY8vsRanhxy8ADPB8Qm/v+CKHstWBn0VI=";
};
# make .desktop Exec absolute
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 59b87c3367f..0f4b8174405 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -17,14 +17,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.36.3";
+ version = "3.38.2";
pname = "gpaste";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
- sha256 = "1p1p2ng095lkly5fp9120b23wlvkj1xf4fhivzsd72css0szy7mi";
+ sha256 = "1dnvwsmlayrhh9zd4v57kc9k03jhv7i0zyv0fbspzp4msmnb1w2x";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 1f9afefd2e4..fb472ffff1d 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,22 +1,43 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, vala, gnome3
-, libintl, meson, ninja }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, glib
+, gtk3
+, libgee
+, gettext
+, vala
+, gnome3
+, libintl
+, meson
+, ninja
+}:
-let
+stdenv.mkDerivation rec {
pname = "libgnome-games-support";
- version = "1.6.1";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "1.8.0";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1gq8p38k92lsr6dbav6pgmw0adnzzhcs06jqdkr37p145vv6ls7v";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb";
};
- nativeBuildInputs = [ meson ninja pkgconfig gettext vala ];
- buildInputs = [ libintl ];
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ libintl
+ ];
+
propagatedBuildInputs = [
# Required by libgnome-games-support-1.pc
- glib gtk3 libgee
+ glib
+ gtk3
+ libgee
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index e62c6fe7fee..04008f4c84b 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -5,6 +5,7 @@
, gnome3
, gsettings-desktop-schemas
, gtk3
+, xorg
, libcanberra-gtk3
, libgtop
, libstartup_notification
@@ -12,17 +13,16 @@
, pkgconfig
, substituteAll
, wrapGAppsHook
-, zenity }:
+, zenity
+}:
-let
+stdenv.mkDerivation rec {
pname = "metacity";
- version = "3.36.1";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.38.0";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "08xkq5i6czvms0ygbj7ywzl70q1l0z44nfh6b43q8rmjwa9pdw0i";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1";
};
patches = [
@@ -40,6 +40,8 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
+ xorg.libXres
+ xorg.libXpresent
glib
gsettings-desktop-schemas
gtk3
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 18ee7bdd844..21ffef71ca4 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -25,7 +25,7 @@
, python3
, vala
, polkit
-, libhandy
+, libhandy_0
, wrapGAppsHook
}:
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
gtk3
json-glib
libgee
- libhandy
+ libhandy_0 # doesn't support libhandy-1 yet
libsoup
libxml2
packagekit
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 16e8c7e66c1..913fa58e287 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -62,6 +62,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch";
sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf";
})
+
+ # fix build with vala 0.48.9
+ (fetchpatch {
+ url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch";
+ sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE=";
+ })
];
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 31ed7f3672a..73de43594bd 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -32,6 +32,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-tLTwXA2miHqYqCUbIiBjb2nQB+uN/WzuE4F9m3fVCbM=";
};
+ patches = [
+ # Port to Libhandy-1
+ (fetchpatch {
+ url = "https://github.com/elementary/onboarding/commit/8af6b7d9216f8cbf725f708b36ef4d4f6c400c78.patch";
+ sha256 = "cnSCSSFEQlNd9Ncw5VCJ32stZ8D4vhl3f+derAk/Cas=";
+ excludes = [
+ ".github/workflows/main.yml"
+ ];
+ })
+ ];
+
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 94d91329e3d..27e6215b787 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pantheon
, substituteAll
@@ -82,6 +83,12 @@ stdenv.mkDerivation rec {
];
patches = [
+ # Port to Libhandy-1
+ (fetchpatch {
+ url = "https://github.com/elementary/applications-menu/commit/8eb2430e8513e9d37f875c5c9b8b15a968c27127.patch";
+ sha256 = "8Uw9mUw7U5nrAwUDGVpAwoRqb9ah503wQCr9kPbBJIo=";
+ })
+
(substituteAll {
src = ./fix-paths.patch;
bc = "${bc}/bin/bc";
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 3b4cd1a5a79..1964d74cf3a 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -123,8 +123,8 @@ in rec {
};
vala_0_48 = generic {
- version = "0.48.7";
- sha256 = "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8";
+ version = "0.48.9";
+ sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw";
};
vala = vala_0_48;
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index b33c45adb41..e514b8b5c31 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchurl, gtk3
-, pkgconfig, gnome3, dbus, xvfb_run }:
-let
- version = "5.1.1";
+{ stdenv
+, fetchurl
+, gtk3
+, pkgconfig
+, gobject-introspection
+, gnome3
+, dbus
+, xvfb_run
+}:
+
+stdenv.mkDerivation rec {
pname = "amtk";
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
+ version = "5.2.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr";
+ sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
};
nativeBuildInputs = [
pkgconfig
dbus
+ gobject-introspection
];
buildInputs = [
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 6a1ca6d24d3..04f8c266131 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "at-spi2-atk";
- version = "2.34.2";
+ version = "2.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh";
+ sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 2c959434f01..ba77020ec70 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "at-spi2-core";
- version = "2.36.1";
+ version = "2.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0m3crrdbc9vdn9dr4lssdwrjmm8z5wxs2qhhnbkh1w5vkn87nhcp";
+ sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 08b3b96784a..f2a69e87d85 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -7,11 +7,11 @@ let
pname = "cogl";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.22.6";
+ version = "1.22.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd";
+ sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
};
patches = [
@@ -29,12 +29,6 @@ in stdenv.mkDerivation rec {
url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056";
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
})
-
- # Fix build with libglvnd headers (these headers used to be provided by mesa)
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
- sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
- })
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix
index 444b1430dd5..c9c1b9be922 100644
--- a/pkgs/development/libraries/dconf/default.nix
+++ b/pkgs/development/libraries/dconf/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
-, fetchpatch
, meson
, ninja
, python3
@@ -19,24 +18,15 @@
stdenv.mkDerivation rec {
pname = "dconf";
- version = "0.36.0";
+ version = "0.38.0";
outputs = [ "out" "lib" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
+ sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
};
- patches = [
- # Fix bash-completion installation
- # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch";
- sha256 = "0kdapiw3zq041jhzsx90kk08vqfgzr6vy2k541iav984d0m0zcnf";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index e9df0ef4016..6181cb45e19 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -16,7 +16,6 @@
, nss
, dbus
, libgee
-, telepathy-glib
, evolution-data-server
, libsecret
, db
@@ -26,6 +25,8 @@
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
+, telepathy-glib
+, telepathySupport ? false
}:
# TODO: enable more folks backends
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Ddocs=true"
+ "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}"
];
nativeBuildInputs = [
@@ -69,8 +71,7 @@ stdenv.mkDerivation rec {
nspr
nss
readline
- telepathy-glib
- ];
+ ] ++ stdenv.lib.optional telepathySupport telepathy-glib;
propagatedBuildInputs = [
glib
@@ -109,6 +110,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Projects/Folks";
license = licenses.lgpl2Plus;
maintainers = teams.gnome.members;
- platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
+ platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
};
}
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 1cad5c0deb9..0630a6aed95 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -8,7 +8,7 @@
, gtk3
, atk
, gobject-introspection
-, spidermonkey_68
+, spidermonkey_78
, pango
, cairo
, readline
@@ -29,11 +29,11 @@ let
];
in stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.64.4";
+ version = "1.66.0";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53";
+ sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k";
};
outputs = [ "out" "dev" "installedTests" ];
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
gobject-introspection
cairo
readline
- spidermonkey_68
+ spidermonkey_78
dbus # for dbus-run-session
];
@@ -88,22 +88,22 @@ in stdenv.mkDerivation rec {
# in the GIR files. When running tests, the library is not yet installed,
# though, so we need to replace the absolute path with a local one during build.
# We are using a symlink that will be overridden during installation.
- mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests
+ mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
- ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so
- ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so
- ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so
+ ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
+ ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
+ ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
'';
postInstall = ''
- # TODO: make the glib setup hook handle this
+ # TODO: make the glib setup hook handle moving the schemas in other outputs.
installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}"
mkdir -p "$installedTestsSchemaDatadir"
mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir"
'';
postFixup = ''
- wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
+ wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
--prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
--prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
'';
diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch
index f9b1515b68e..09cd8eaff43 100644
--- a/pkgs/development/libraries/gjs/installed-tests-path.patch
+++ b/pkgs/development/libraries/gjs/installed-tests-path.patch
@@ -1,22 +1,22 @@
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
-index 7e842025..1e5029e0 100644
+index 04c7910f..9647908c 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,7 +1,7 @@
### Installed tests ############################################################
--installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
+-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
-+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests'
++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
# Simple shell script tests #
diff --git a/meson.build b/meson.build
-index 084d5396..e5d73fcd 100644
+index 9ab29475..42ffe07f 100644
--- a/meson.build
+++ b/meson.build
-@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp',
+@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
install_dir: get_option('datadir') / api_name / 'lsan')
if get_option('installed_tests')
@@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644
meson.add_install_script('build/compile-gschemas.py', schemadir)
endif
diff --git a/meson_options.txt b/meson_options.txt
-index 66f66024..008687cb 100644
+index 825ba77a..21f0323c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 59bf8485971..fc85b50e07f 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
- version = "2.64.3";
+ version = "2.66.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0s518l4bwvdvcp51lbjqcw8g0vq18bznpf5hq2zi6a054jqhcylk";
+ sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
};
patches = [
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 88848deec41..f3ff51459c1 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
- version = "2.64.5";
+ version = "2.66.1";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw";
+ sha256 = "0q7g70j6vjvcw4xf6bbfkm4j6mradcabdcdcy4gs5hxwkzkgysd2";
};
patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 7b254b922bc..b8369db59fb 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
- version = "3.36.0";
+ version = "3.37.90";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
- sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd";
+ sha256 = "05ahib6bjbfyj2gbqjijzg9i7x1q0r67hyph0fbrgnnadlpk2cv8";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 03b0d1767d9..9bac8bc71a1 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "gobject-introspection";
- version = "1.64.1";
+ version = "1.66.0";
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
# by pygobject3 (and maybe others), but it's only searched in $out
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0";
+ sha256 = "0q00llz0p7qik19a9fxq4bf6mqqqivkv77fqhcgqygvwxhxflrix";
};
patches = [
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
bison
gtk-doc
docbook-xsl-nons
- docbook_xml_dtd_43 # FIXME: remove in next release
docbook_xml_dtd_45
python3
setupHook # move .gir files
@@ -91,6 +90,12 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isAarch64;
+ # During configurePhase, two python scripts are generated and need this. See
+ # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692
+ postConfigure = ''
+ patchShebangs tools/*
+ '';
+
preCheck = ''
# Our gobject-introspection patches make the shared library paths absolute
# in the GIR files. When running tests, the library is not yet installed,
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 3dced2d6211..9073a501c09 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
- version = "0.3.11";
+ version = "0.3.12";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx";
+ sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
};
patches = [
diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index 12f069891e8..858e8d81fd4 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -4,7 +4,7 @@
let
pname = "grilo";
- version = "0.3.12"; # if you change minor, also change ./setup-hook.sh
+ version = "0.3.13"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv";
+ sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
};
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index 6a94944e9f1..1032f15196c 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -1,22 +1,41 @@
-{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection
+{ stdenv
+, fetchurl
+, pkgconfig
+, glib
+, gobject-introspection
, meson
, ninja
, python3
# just for passthru
-, gnome3 }:
+, gnome3
+}:
stdenv.mkDerivation rec {
pname = "gsettings-desktop-schemas";
- version = "3.36.1";
+ version = "3.38.0";
src = fetchurl {
- url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; };
- };
+ nativeBuildInputs = [
+ glib
+ meson
+ ninja
+ pkgconfig
+ python3
+ ];
+
+ buildInputs = [
+ glib
+ gobject-introspection
+ ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/post-install.py
+ patchShebangs build-aux/meson/post-install.py
+ '';
# meson installs the schemas to share/glib-2.0/schemas
# We add the override file there too so it will be compiled and later moved by
@@ -32,16 +51,15 @@ stdenv.mkDerivation rec {
EOF
'';
- postPatch = ''
- chmod +x build-aux/meson/post-install.py
- patchShebangs build-aux/meson/post-install.py
- '';
-
- buildInputs = [ glib gobject-introspection ];
-
- nativeBuildInputs = [ pkgconfig python3 meson ninja glib ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
meta = with stdenv.lib; {
+ description = "Collection of GSettings schemas for settings shared by various components of a desktop";
+ license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
};
}
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 17e98b8e409..582244f4f49 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -2,7 +2,7 @@
let
pname = "gspell";
- version = "1.8.3";
+ version = "1.8.4";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras";
+ sha256 = "1d23pl9956dkpy52pbndp0vrba0y030msh1issdl84z82skickfg";
};
propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index bf78d15d39c..2cae9546b74 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -25,6 +25,7 @@
, epoxy
, json-glib
, libxkbcommon
+, libxml2
, gmp
, gnome3
, gsettings-desktop-schemas
@@ -48,7 +49,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
- version = "3.24.21";
+ version = "3.24.23";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
- sha256 = "0llgq2adzn9p3bfq9rv2dhscmvzs35jp3glrfvy3vs1mrpknmsmf";
+ sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx";
};
patches = [
@@ -71,8 +72,8 @@ stdenv.mkDerivation rec {
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
- # Fix path handling in pkg-config
- # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793
+ # Fix path handling in pkg-config. MR for the gtk-3-24 branch:
+ # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0";
@@ -97,11 +98,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
postPatch = ''
- # TODO: Remove in 3.24.21
- # https://gitlab.gnome.org/GNOME/gtk/issues/2669
- echo "${stdenv.shell}" > check-version.py
- chmod +x check-version.py
-
files=(
build-aux/meson/post-install.py
demos/gtk-demo/geninclude.py
@@ -130,6 +126,8 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_43
docbook_xsl
gtk-doc
+ # For xmllint
+ libxml2
];
buildInputs = [
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index d882d3b1a6c..d32a0eebf13 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
-, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
stdenv.mkDerivation rec {
pname = "gtksourceview";
@@ -42,13 +42,6 @@ stdenv.mkDerivation rec {
make check
'';
- passthru = {
- updateScript = gnome3.updateScript {
- packageName = "gtksourceview";
- attrPath = "gtksourceview3";
- };
- };
-
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 565b7f782d5..2041e83fb0c 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gtksourceview";
- version = "4.6.1";
+ version = "4.8.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0x7q9lwgrc4kkciy7vgwd80v2ji7plyqiqbvkvx2yqarmfkqgx33";
+ sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 204c9d8dd74..a2e15769145 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,20 +1,26 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
-, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
+, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
, glib, systemd, libusb1, vala, hwdata
}:
+
+let
+ pythonEnv = python3.withPackages(ps: with ps; [
+ setuptools
+ ]);
+in
stdenv.mkDerivation rec {
pname = "gusb";
- version = "0.3.3";
+ version = "0.3.5";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
- sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr";
+ sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv";
};
nativeBuildInputs = [
- meson ninja pkgconfig gettext
+ meson ninja pkgconfig gettext pythonEnv
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
gobject-introspection vala
];
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index cff6569be50..f79ffa579c8 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "gvfs";
- version = "1.44.1";
+ version = "1.46.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh";
+ sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2";
};
postPatch = ''
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index b641a547302..61f357689c4 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
stdenv.mkDerivation rec {
pname = "jsonrpc-glib";
- version = "3.34.0";
+ version = "3.38.0";
outputs = [ "out" "dev" "devdoc" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0j05x4xv2cp3cbmp30m68z8g4rdw7b030ip4wszyfj9ya15v5kni";
+ sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI=";
};
mesonFlags = [
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 5351b2c9fcb..6c430682251 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "libdazzle";
- version = "3.36.0";
+ version = "3.38.0";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2";
+ sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
};
nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 162b5d23395..50eac405706 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libgdata";
- version = "0.17.12";
+ version = "0.17.13";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0";
+ sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga";
};
patches = [
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 439dd3827ec..c7c3064acb8 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libgudev";
- version = "233";
+ version = "234";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q";
+ sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
};
nativeBuildInputs = [ pkgconfig gobject-introspection ];
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
new file mode 100644
index 00000000000..2923f2da25d
--- /dev/null
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, gtk3, gnome3, glade
+, dbus, xvfb_run, libxml2
+, hicolor-icon-theme
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libhandy";
+ version = "0.0.13";
+
+ outputs = [ "out" "dev" "devdoc" "glade" ];
+ outputBin = "dev";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
+ };
+
+ patches = [
+ # Fix build with Glade 3.36.0
+ # https://source.puri.sm/Librem5/libhandy/merge_requests/451
+ (fetchpatch {
+ url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
+ sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
+ excludes = [ "glade/glade-hdy-header-bar.c" ];
+ })
+ ];
+
+ nativeBuildInputs = [
+ meson ninja pkgconfig gobject-introspection vala libxml2
+ gtk-doc docbook_xsl docbook_xml_dtd_43
+ ];
+ buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
+ checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
+
+ mesonFlags = [
+ "-Dgtk_doc=true"
+ "-Dglade_catalog=enabled"
+ "-Dintrospection=enabled"
+ ];
+
+ PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
+ PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
+
+ doCheck = true;
+
+ checkPhase = ''
+ NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A library full of GTK widgets for mobile phones";
+ homepage = "https://source.puri.sm/Librem5/libhandy";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 2923f2da25d..835eaeac2bf 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -1,66 +1,89 @@
-{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, gtk3, gnome3, glade
-, dbus, xvfb_run, libxml2
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, vala
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, gtk3
+, gnome3
+, glade
+, dbus
+, xvfb_run
+, libxml2
+, gdk-pixbuf
+, librsvg
, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
pname = "libhandy";
- version = "0.0.13";
+ version = "1.0.0";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
- src = fetchFromGitLab {
- domain = "source.puri.sm";
- owner = "Librem5";
- repo = pname;
- rev = "v${version}";
- sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk=";
};
- patches = [
- # Fix build with Glade 3.36.0
- # https://source.puri.sm/Librem5/libhandy/merge_requests/451
- (fetchpatch {
- url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
- sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
- excludes = [ "glade/glade-hdy-header-bar.c" ];
- })
+ nativeBuildInputs = [
+ docbook_xml_dtd_43
+ docbook_xsl
+ gobject-introspection
+ gtk-doc
+ libxml2
+ meson
+ ninja
+ pkgconfig
+ vala
];
- nativeBuildInputs = [
- meson ninja pkgconfig gobject-introspection vala libxml2
- gtk-doc docbook_xsl docbook_xml_dtd_43
+ buildInputs = [
+ gdk-pixbuf
+ glade
+ gtk3
+ libxml2
+ ];
+
+ checkInputs = [
+ dbus
+ hicolor-icon-theme
+ xvfb_run
];
- buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
- checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
mesonFlags = [
"-Dgtk_doc=true"
- "-Dglade_catalog=enabled"
- "-Dintrospection=enabled"
];
+ # Uses define_variable in pkgconfig, but we still need it to use the glade output
PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
- doCheck = true;
+ # Bail out! dbind-FATAL-WARNING:
+ # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown:
+ # The name org.a11y.Bus was not provided by any .service files
+ doCheck = false;
checkPhase = ''
NO_AT_BRIDGE=1 \
- XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
+ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share"
+ GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
'';
meta = with stdenv.lib; {
- description = "A library full of GTK widgets for mobile phones";
- homepage = "https://source.puri.sm/Librem5/libhandy";
+ changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
+ description = "Building blocks for modern adaptive GNOME apps";
+ homepage = "https://gitlab.gnome.org/GNOME/libhandy";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix
index eb3cbf4bfef..83ee19075de 100644
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/pkgs/development/libraries/libmanette/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "libmanette";
- version = "0.2.4";
+ version = "0.2.5";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g";
+ sha256 = "gAbghIDAy9T3SewVWCfRAER88jkD+tgkCnxMMhqgmis=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 6c2276a08cc..1d360b45052 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libpeas";
- version = "1.26.0";
+ version = "1.28.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9";
+ sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
};
nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index fb61b50346d..59e56f20703 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -4,14 +4,14 @@
let
pname = "librsvg";
- version = "2.48.8";
+ version = "2.50.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l";
+ sha256 = "s/rbokDwm5yYmKsgy3MRRnJD5gfPj5KLfF+EJHTuPfQ=";
};
outputs = [ "out" "dev" "installedTests" ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a497661725b..d316df15643 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
+{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, sysprof
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
, libpsl, python3, brotli }:
stdenv.mkDerivation rec {
pname = "libsoup";
- version = "2.70.0";
+ version = "2.72.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l";
+ sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p";
};
postPatch = ''
@@ -17,7 +17,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- buildInputs = [ python3 sqlite libpsl brotli ];
+ buildInputs = [
+ python3
+ sqlite
+ libpsl
+ brotli
+ ] ++ lib.optionals stdenv.isLinux [
+ sysprof
+ ];
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
propagatedBuildInputs = [ glib libxml2 ];
@@ -27,6 +34,8 @@ stdenv.mkDerivation rec {
"-Dvapi=enabled"
"-Dgnome=${if gnomeSupport then "true" else "false"}"
"-Dntlm=disabled"
+ ] ++ lib.optionals (!stdenv.isLinux) [
+ "-Dsysprof=disabled"
];
doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
@@ -41,7 +50,7 @@ stdenv.mkDerivation rec {
meta = {
description = "HTTP client/server library for GNOME";
homepage = "https://wiki.gnome.org/Projects/libsoup";
- license = stdenv.lib.licenses.gpl2;
+ license = stdenv.lib.licenses.lgpl2Plus;
inherit (glib.meta) maintainers platforms;
};
}
diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index 1dbfe0647f4..eaedc2c0ac3 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf
}:
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
- alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2
+ alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2
];
mesonFlags = [
diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index 008f0f5b424..77cf9fd0247 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -1,28 +1,41 @@
-{ stdenv, fetchurl
-, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
-let
- version = "4.4.0";
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, amtk
+, gnome3
+, gobject-introspection
+, gtk3
+, gtksourceview4
+, icu
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
pname = "tepl";
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
+ version = "5.0.0";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6";
+ sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";
};
nativeBuildInputs = [
- pkgconfig
+ meson
+ ninja
+ gobject-introspection
+ pkg-config
];
buildInputs = [
- libxml2
+ icu
];
propagatedBuildInputs = [
amtk
gtksourceview4
- libuchardet
gtk3
];
@@ -38,8 +51,8 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Projects/Tepl";
description = "Text editor product line";
- maintainers = [ maintainers.manveru ];
- license = licenses.lgpl21Plus;
+ maintainers = teams.gnome.members ++ [ maintainers.manveru ];
+ license = licenses.lgpl3Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index f93721bdfc1..73598470eed 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -1,7 +1,10 @@
{ stdenv
, fetchurl
, substituteAll
-, intltool
+, asciidoc
+, docbook-xsl-nons
+, docbook_xml_dtd_45
+, gettext
, itstool
, libxslt
, gexiv2
@@ -15,7 +18,6 @@
, dbus
, evolution-data-server
, exempi
-, flac
, giflib
, glib
, gnome3
@@ -35,9 +37,10 @@
, libsoup
, libtiff
, libuuid
-, libvorbis
, libxml2
+, networkmanager
, poppler
+, systemd
, taglib
, upower
, totem-pl-parser
@@ -45,15 +48,18 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
- version = "2.3.3";
+ version = "3.0.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl";
+ sha256 = "0hj0ixrladm7sxcmi0hr6d7wdlg9zcq0cyk22prg9pn54dy1lj5v";
};
nativeBuildInputs = [
- intltool
+ asciidoc
+ docbook-xsl-nons
+ docbook_xml_dtd_45
+ gettext
itstool
libxslt
meson
@@ -69,7 +75,6 @@ stdenv.mkDerivation rec {
dbus
evolution-data-server
exempi
- flac
giflib
glib
gexiv2
@@ -92,9 +97,10 @@ stdenv.mkDerivation rec {
libsoup
libtiff
libuuid
- libvorbis
libxml2
+ networkmanager
poppler
+ systemd
taglib
upower
];
@@ -102,19 +108,12 @@ stdenv.mkDerivation rec {
mesonFlags = [
# TODO: tests do not like our sandbox
"-Dfunctional_tests=false"
- "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
- "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
- inherit tracker;
- })
- # https://bugzilla.gnome.org/show_bug.cgi?id=795576
- (fetchurl {
- url = "https://bugzilla.gnome.org/attachment.cgi?id=371427";
- sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
+ inherit asciidoc;
})
];
diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch
index ce44416055c..8661648eacd 100644
--- a/pkgs/development/libraries/tracker-miners/fix-paths.patch
+++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch
@@ -1,11 +1,13 @@
---- a/src/libtracker-miners-common/tracker-domain-ontology.c
-+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
-@@ -323,7 +323,7 @@
- goto end;
- }
- } else {
-- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
-+ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies",
- DEFAULT_RULE, NULL);
-
- if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index 0b8a64863..a09db59f0 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages
+ command: [xsltproc,
+ '--output', '@OUTPUT@',
+ '--stringparam', 'man.authors.section.enabled', '0',
+- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+ input: xml,
+ output: manpage,
+ install: true,
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index fb111829c7e..8073188ceb9 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -4,12 +4,11 @@
, meson
, ninja
, pkgconfig
+, asciidoc
, gobject-introspection
, python3
, gtk-doc
-, docbook_xsl
-, docbook_xml_dtd_412
-, docbook_xml_dtd_43
+, docbook-xsl-nons
, docbook_xml_dtd_45
, libxml2
, glib
@@ -21,7 +20,6 @@
, gnome3
, icu
, libuuid
-, networkmanager
, libsoup
, json-glib
, systemd
@@ -31,19 +29,19 @@
stdenv.mkDerivation rec {
pname = "tracker";
- version = "2.3.4";
+ version = "3.0.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap";
+ sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
- gdbus = "${glib.bin}/bin/gdbus";
+ inherit asciidoc;
})
];
@@ -52,14 +50,13 @@ stdenv.mkDerivation rec {
ninja
vala
pkgconfig
+ asciidoc
gettext
libxslt
wrapGAppsHook
gobject-introspection
gtk-doc
- docbook_xsl
- docbook_xml_dtd_412
- docbook_xml_dtd_43
+ docbook-xsl-nons
docbook_xml_dtd_45
python3 # for data-generators
systemd # used for checks to install systemd user service
@@ -71,7 +68,6 @@ stdenv.mkDerivation rec {
libxml2
sqlite
icu
- networkmanager
libsoup
libuuid
json-glib
@@ -83,8 +79,6 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
- # "-Dfunctional_tests=true"
"-Ddocs=true"
];
@@ -106,9 +100,17 @@ stdenv.mkDerivation rec {
# though, so we need to replace the absolute path with a local one during build.
# We are using a symlink that will be overridden during installation.
mkdir -p $out/lib
- ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0
- ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0
- ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
+ ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0
+ '';
+
+ checkPhase = ''
+ runHook preCheck
+
+ dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+
+ runHook postCheck
'';
postCheck = ''
@@ -116,10 +118,6 @@ stdenv.mkDerivation rec {
rm -r $out/lib
'';
- postInstall = ''
- glib-compile-schemas "$out/share/glib-2.0/schemas"
- '';
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch
index f5c13c3fcda..5e4d8657f7b 100644
--- a/pkgs/development/libraries/tracker/fix-paths.patch
+++ b/pkgs/development/libraries/tracker/fix-paths.patch
@@ -1,12 +1,13 @@
---- a/src/tracker-store/tracker-store.desktop.in
-+++ b/src/tracker-store/tracker-store.desktop.in
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Tracker Store
- Comment=Metadata database store and lookup manager
--Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
-+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
- Terminal=false
- Type=Application
- Categories=Utility;
- X-GNOME-Autostart-enabled=true
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index f90c757cf..40d9c939d 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -32,7 +32,7 @@ foreach m : manpages
+ command: [xsltproc,
+ '--output', '@OUTPUT@',
+ '--stringparam', 'man.authors.section.enabled', '0',
+- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+ input: xml,
+ output: manpage,
+ install: true,
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 811921df3e7..014b2615d5b 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "vte";
- version = "0.60.2";
+ version = "0.62.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m";
+ sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
};
passthru = {
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index d60e56763a1..814a1f22592 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -41,34 +41,33 @@
, enableGeoLocation ? true
, geoclue2
, sqlite
-, enableGtk2Plugins ? false
-, gtk2 ? null
, enableGLES ? true
, gst-plugins-base
, gst-plugins-bad
, woff2
, bubblewrap
, libseccomp
+, systemd
, xdg-dbus-proxy
, substituteAll
, glib
}:
assert enableGeoLocation -> geoclue2 != null;
-assert enableGtk2Plugins -> gtk2 != null;
-assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.28.4";
+ version = "2.30.1";
outputs = [ "out" "dev" ];
+ separateDebugInfo = stdenv.isLinux;
+
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0r4lkk21pny2g4mmsw0ds14m5hhjys1l47gvy59dfgihr7l546c2";
+ sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p";
};
patches = optionals stdenv.isLinux [
@@ -140,10 +139,10 @@ stdenv.mkDerivation rec {
] ++ optionals stdenv.isLinux [
bubblewrap
libseccomp
+ systemd
wayland
xdg-dbus-proxy
- ] ++ optional enableGeoLocation geoclue2
- ++ optional enableGtk2Plugins gtk2;
+ ] ++ optional enableGeoLocation geoclue2;
propagatedBuildInputs = [
gtk3
@@ -167,8 +166,7 @@ stdenv.mkDerivation rec {
"-DENABLE_X11_TARGET=OFF"
"-DUSE_ACCELERATE=0"
"-DUSE_SYSTEM_MALLOC=ON"
- ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
- ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
+ ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
postPatch = ''
patchShebangs .
@@ -178,7 +176,7 @@ stdenv.mkDerivation rec {
description = "Web content rendering engine, GTK port";
homepage = "https://webkitgtk.org/";
license = licenses.bsd2;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = teams.gnome.members;
};
}
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 98c94cfecca..95f09f59504 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -11,13 +11,11 @@
, libtool
, gettext
, dbus
-, telepathy-glib
, gtk3
, json-glib
, librdf_raptor2
-, dbus-glib
, pythonSupport ? true
-, python2Packages
+, python3
}:
stdenv.mkDerivation rec {
@@ -50,23 +48,21 @@ stdenv.mkDerivation rec {
gettext
gobject-introspection
vala
- python2Packages.python
+ python3
];
buildInputs = [
glib
sqlite
dbus
- telepathy-glib
- dbus-glib
gtk3
json-glib
librdf_raptor2
- python2Packages.rdflib
+ python3.pkgs.rdflib
];
configureFlags = [
- "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services"
+ "--disable-telepathy"
];
enableParallelBuilding = true;
@@ -80,14 +76,14 @@ stdenv.mkDerivation rec {
'';
postFixup = stdenv.lib.optionalString pythonSupport ''
- moveToOutput lib/${python2Packages.python.libPrefix} "$py"
+ moveToOutput lib/${python3.libPrefix} "$py"
'';
meta = with stdenv.lib; {
description = "A service which logs the users’s activities and events";
homepage = "https://zeitgeist.freedesktop.org/";
maintainers = with maintainers; [ lethalman worldofpeace ];
- license = licenses.gpl2;
+ license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix
index 7714ef046b7..19e345b3c2f 100644
--- a/pkgs/development/misc/yelp-tools/default.nix
+++ b/pkgs/development/misc/yelp-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yelp-tools";
- version = "3.32.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
+ sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
};
passthru = {
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index 5d1fd9ef0be..aadf53e9925 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
-, ncurses, pygobject3 }:
+, ncurses, pygobject3, isPy3k }:
buildPythonPackage rec {
pname = "dbus-python";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
# It seems not to retain the dependency anyway.
++ lib.optional (! python ? modules) ncurses;
- doCheck = true;
+ doCheck = isPy3k;
checkInputs = [ dbus.out pygobject3 ];
meta = {
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 74b9f7dfdeb..232e44d0999 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyatspi";
- version = "2.36.0";
+ version = "2.38.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji";
+ sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 9e38d640397..6e34e7f9100 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -3,21 +3,19 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
buildPythonPackage rec {
pname = "pygobject";
- version = "3.36.1";
+ version = "3.38.0";
+
+ disabled = ! isPy3k;
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
+ sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
};
outputs = [ "out" "dev" ];
- mesonFlags = [
- "-Dpython=python${if isPy3k then "3" else "2" }"
- ];
-
nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
buildInputs = [ glib gobject-introspection ]
++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index c93ee954cea..d7779540f97 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -14,7 +14,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "gtk-doc";
- version = "1.32";
+ version = "1.33.0";
format = "other";
@@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
- rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
- sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk";
+ rev = version;
+ sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0=";
};
patches = [
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index ce731309882..8fe19b5e31a 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -2,7 +2,6 @@
, lib
, desktop-file-utils
, fetchurl
-, fetchpatch
, gettext
, glib
, gtk3
@@ -21,24 +20,15 @@
stdenv.mkDerivation rec {
pname = "sysprof";
- version = "3.36.0";
+ version = "3.38.0";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "024i0gzqnm79rpr4gqxdvcj6gvf82xdlcp2p1k9ikcppmi6xnw46";
+ sha256 = "1kj1yb7sfd874jm0666cnf5lc0c83gxhsdqhjic6ykppqa6p5kcb";
};
- patches = [
- # Fix 32-bit builds
- # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/24
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/sysprof/commit/5dea152c7728f5a37370ad8a229115833e36b4f6.patch";
- sha256 = "0c76s7r329pbdlmgvm3grn89iylrxv5wg87craqp937nwk3wb80g";
- })
- ];
-
nativeBuildInputs = [
desktop-file-utils
gettext
diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix
index 199f1626c89..378bc935e22 100644
--- a/pkgs/development/tools/vala-lint/default.nix
+++ b/pkgs/development/tools/vala-lint/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "vala-lint-unstable";
- version = "2019-10-11";
+ version = "2020-08-18";
src = fetchFromGitHub {
owner = "vala-lang";
repo = "vala-lint";
- rev = "a077bbec30dea128616a23583ce3f8364ff2ef11";
- sha256 = "0w0rmaj4v42wc4vq2lfjnj6airag5ahv6522xkw3j1nmccxq3s72";
+ rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9";
+ sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM=";
};
nativeBuildInputs = [
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index ff5fb6e5ee7..23c5e3f9dc8 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -55,6 +55,7 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/kozec/sc-controller";
# donations: https://www.patreon.com/kozec
+ broken = true;
description = "User-mode driver and GUI for Steam Controller and other controllers";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix
index dd58671824d..2a55015be10 100644
--- a/pkgs/tools/audio/volctl/default.nix
+++ b/pkgs/tools/audio/volctl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, python3, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "volctl";
version = "0.6.3";
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
libpulseaudio
];
- pythonPath = with pythonPackages; [
+ pythonPath = with python3.pkgs; [
pygobject3
];
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index f5b12a6cf37..c02275ef5b8 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -62,6 +62,13 @@ in stdenv.mkDerivation rec {
# Meson does not support using different directories during build and
# for installation like Autotools did with flags passed to make install.
./fix-install-paths.patch
+
+ # Fix build
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch";
+ sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk=";
+ })
];
buildInputs = [
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 0eb0f7b401e..92888a8de2a 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
+{ stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "onioncircuits";
version = "0.5";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ intltool ];
buildInputs = [ intltool gtk3 gobject-introspection ];
- propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ];
+ propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ];
postFixup = ''
wrapProgram "$out/bin/onioncircuits" \
diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix
index 5f217e69ea5..f091d867503 100644
--- a/pkgs/tools/text/gtranslator/default.nix
+++ b/pkgs/tools/text/gtranslator/default.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gtranslator";
- version = "3.36.0";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1lxd2nkji4jk8g2xmyc1a1r3ww710ddk91zh9psmx8xlb4xivaid";
+ sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU=";
};
nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb860a674a6..741f08dadc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5190,6 +5190,9 @@ in
libhandy = callPackage ../development/libraries/libhandy { };
+ # Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
+ libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
+
libgumath = callPackage ../development/libraries/libgumath { };
libinsane = callPackage ../development/libraries/libinsane { };
@@ -20912,7 +20915,6 @@ in
xrdp = callPackage ../applications/networking/remote/xrdp { };
freerdp = callPackage ../applications/networking/remote/freerdp {
- inherit libpulseaudio;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
};
@@ -25873,6 +25875,8 @@ in
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
};
+ gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };
+
gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
hsetroot = callPackage ../tools/X11/hsetroot { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b590398e20..b97cc137e86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7778,7 +7778,7 @@ in {
zeep = callPackage ../development/python-modules/zeep { };
- zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py;
+ zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;
zerobin = callPackage ../development/python-modules/zerobin { };