aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix119
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix76
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix69
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix4
10 files changed, 252 insertions, 129 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch
new file mode 100644
index 000000000000..abd8772cf31e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
index 0326e38aba76..6390b03efa31 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,46 +1,113 @@
-{ 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";
};
+ patches = [
+ # Longer timeout for client test.
+ ./Bump-client-test-timeout-to-300s.patch
+ ];
+
nativeBuildInputs = [
- desktop-file-utils gettext itstool libxml2 meson ninja
- pkgconfig vala wrapGAppsHook python3 appstream-glib
+ appstream-glib
+ desktop-file-utils
+ gettext
gobject-introspection
+ itstool
+ libxml2
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
];
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
+ 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 = [ xvfb_run dbus ];
+ 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)
];
- 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";
- })
- ];
-
# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
# https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
postPatch = ''
@@ -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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index a33376618c2c..cc9e0a29d8fd 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/infra/libkookie/nixpkgs/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.38.0";
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 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc";
};
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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index cde21551a8a3..93b8fc2251b3 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/infra/libkookie/nixpkgs/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.38.0";
# 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 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m";
};
# 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
+ 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
+ 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} "$@"
- '';
+ 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}" ];
- };
+ 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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 037c7812105c..518d8e198343 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/infra/libkookie/nixpkgs/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.38.0";
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-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU=";
};
# make .desktop Exec absolute
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 0271992b6407..a042ce134a94 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,42 +1,69 @@
-{ stdenv, meson, ninja, gettext, fetchurl
-, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
-, itstool, libxml2, python3Packages, libhandy
-, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
+{ lib
+, meson
+, ninja
+, fetchurl
+, gdk-pixbuf
+, gettext
+, glib
+, gnome3
+, gobject-introspection
+, gsettings-desktop-schemas
+, gtk3
+, itstool
+, libhandy_0
+, libnotify
+, libsoup
+, libxml2
+, pkg-config
+, python3Packages
+, wrapGAppsHook }:
-let
+python3Packages.buildPythonApplication rec {
pname = "gnome-tweaks";
version = "3.34.0";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ format = "other";
+ strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0";
};
nativeBuildInputs = [
- meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
+ gettext
+ gobject-introspection
+ itstool
+ libxml2
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
];
+
buildInputs = [
- gtk3 glib gsettings-desktop-schemas
- gdk-pixbuf gnome3.adwaita-icon-theme
- libnotify gnome3.gnome-shell python3Packages.pygobject3
- libsoup gnome3.gnome-settings-daemon gnome3.nautilus
- gnome3.mutter gnome3.gnome-desktop gobject-introspection
- gnome3.nautilus libhandy
+ gdk-pixbuf
+ glib
+ gnome3.gnome-desktop
+ gnome3.gnome-settings-daemon
+ gnome3.gnome-shell
# Makes it possible to select user themes through the `user-theme` extension
gnome3.gnome-shell-extensions
+ gnome3.mutter
+ gsettings-desktop-schemas
+ gtk3
+ libhandy_0
+ libnotify
+ libsoup
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ pygobject3
];
postPatch = ''
patchShebangs meson-postinstall.py
'';
- preFixup = ''
- gappsWrapperArgs+=(
- --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH")
- '';
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -44,7 +71,7 @@ in stdenv.mkDerivation rec {
};
};
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool";
description = "A tool to customize advanced GNOME 3 options";
maintainers = teams.gnome.members;
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 59b87c3367f5..0071d2415c14 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -17,14 +17,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.36.3";
+ version = "3.38.3";
pname = "gpaste";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
- sha256 = "1p1p2ng095lkly5fp9120b23wlvkj1xf4fhivzsd72css0szy7mi";
+ sha256 = "10ag0mrr4r40414nyarghpgjawvf331asxgq47dqjfxr5w7bz6wc";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 1f9afefd2e48..fb472ffff1db 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix
index e62c6fe7fee3..04008f4c84bb 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index b9489526dd71..4676155c3c1c 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-pomodoro";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-pomodoro";
rev = version;
- sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn";
+ sha256 = "0990m8ydryd77kv25nfqli1n209i0h5dkjg9gkyww8bfrjhw47mc";
};
nativeBuildInputs = [