mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Vladimír Čunát
commit
b856c0f8f4
|
|
@ -20,6 +20,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.
|
||||
|
||||
- GNOME has been upgraded to version 44. Please see the [release notes](https://release.gnome.org/44/) for details.
|
||||
|
||||
- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.
|
||||
|
||||
- `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.
|
||||
|
|
@ -223,7 +225,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc).
|
||||
|
||||
- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates.
|
||||
- Pantheon now defaults to Mutter 43 and GNOME settings daemon 43, all Pantheon packages are now tracking elementary OS 7 updates.
|
||||
|
||||
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.xserver.displayManager.defaultSession = "gnome-xorg";
|
||||
programs.gnome-terminal.enable = true;
|
||||
|
||||
systemd.user.services = {
|
||||
"org.gnome.Shell@x11" = {
|
||||
|
|
@ -61,10 +60,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
# False when startup is done
|
||||
startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp";
|
||||
|
||||
# Start gnome-terminal
|
||||
gnomeTerminalCommand = su "gnome-terminal";
|
||||
# Start Console
|
||||
launchConsole = su "${bus} gapplication launch org.gnome.Console";
|
||||
|
||||
# Hopefully gnome-terminal's wm class
|
||||
# Hopefully Console's wm class
|
||||
wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class";
|
||||
in ''
|
||||
with subtest("Login to GNOME Xorg with GDM"):
|
||||
|
|
@ -82,13 +81,17 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
"${startingUp} | grep -q 'true,..false'"
|
||||
)
|
||||
|
||||
with subtest("Open Gnome Terminal"):
|
||||
with subtest("Open Console"):
|
||||
# Close the Activities view so that Shell can correctly track the focused window.
|
||||
machine.send_key("esc")
|
||||
|
||||
machine.succeed(
|
||||
"${gnomeTerminalCommand}"
|
||||
"${launchConsole}"
|
||||
)
|
||||
# correct output should be (true, '"Gnome-terminal"')
|
||||
# correct output should be (true, '"kgx"')
|
||||
# For some reason, this deviates from Wayland.
|
||||
machine.wait_until_succeeds(
|
||||
"${wmClass} | grep -q 'true,...Gnome-terminal'"
|
||||
"${wmClass} | grep -q 'true,...kgx'"
|
||||
)
|
||||
machine.sleep(20)
|
||||
machine.screenshot("screen")
|
||||
|
|
|
|||
|
|
@ -22,14 +22,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
programs.gnome-terminal.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.makeAutostartItem {
|
||||
name = "org.gnome.Terminal";
|
||||
package = pkgs.gnome.gnome-terminal;
|
||||
})
|
||||
];
|
||||
|
||||
systemd.user.services = {
|
||||
"org.gnome.Shell@wayland" = {
|
||||
|
|
@ -64,10 +56,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
# False when startup is done
|
||||
startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp";
|
||||
|
||||
# Start gnome-terminal
|
||||
gnomeTerminalCommand = su "${bus} gnome-terminal";
|
||||
# Start Console
|
||||
launchConsole = su "${bus} gapplication launch org.gnome.Console";
|
||||
|
||||
# Hopefully gnome-terminal's wm class
|
||||
# Hopefully Console's wm class
|
||||
wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class";
|
||||
in ''
|
||||
with subtest("Login to GNOME with GDM"):
|
||||
|
|
@ -86,10 +78,16 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
"${startingUp} | grep -q 'true,..false'"
|
||||
)
|
||||
|
||||
with subtest("Open Gnome Terminal"):
|
||||
# correct output should be (true, '"gnome-terminal-server"')
|
||||
with subtest("Open Console"):
|
||||
# Close the Activities view so that Shell can correctly track the focused window.
|
||||
machine.send_key("esc")
|
||||
|
||||
machine.succeed(
|
||||
"${launchConsole}"
|
||||
)
|
||||
# correct output should be (true, '"org.gnome.Console"')
|
||||
machine.wait_until_succeeds(
|
||||
"${wmClass} | grep -q 'gnome-terminal-server'"
|
||||
"${wmClass} | grep -q 'true,...org.gnome.Console'"
|
||||
)
|
||||
machine.sleep(20)
|
||||
machine.screenshot("screen")
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, desktop-file-utils
|
||||
, editorconfig-core-c
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, flatpak
|
||||
, gnome
|
||||
, libgit2-glib
|
||||
|
|
@ -18,6 +17,7 @@
|
|||
, json-glib
|
||||
, jsonrpc-glib
|
||||
, libadwaita
|
||||
, libdex
|
||||
, libpanel
|
||||
, libpeas
|
||||
, libportal-gtk4
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
, template-glib
|
||||
, vala
|
||||
, vte-gtk4
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
, wrapGAppsHook4
|
||||
, dbus
|
||||
, xvfb-run
|
||||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-builder";
|
||||
version = "43.6";
|
||||
version = "44.1";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k=";
|
||||
sha256 = "+Tmn+VtLbh0EvY20vpygtnsqp2W4bGP03yP9s6ftzz4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
jsonrpc-glib
|
||||
libadwaita
|
||||
libdex
|
||||
libpanel
|
||||
libxml2
|
||||
ostree
|
||||
|
|
@ -101,7 +102,7 @@ stdenv.mkDerivation rec {
|
|||
sysprof
|
||||
template-glib
|
||||
vala
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -35,27 +35,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-photos";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE=";
|
||||
sha256 = "544hA5fTxigJxs1VIdpuzLShHd6lvyr4YypH9Npcgp4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./installed-tests-path.patch
|
||||
|
||||
# Support babel 0.1.100
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/64c6f733a44bac5b7f08445a686c000681f93f5f.patch";
|
||||
hash = "sha256-iB5qCcDEH8pEX42ypEGJ9QMJWE8VXirv5JfdC1jP218=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch";
|
||||
hash = "sha256-iz6gSu5rUBZ3Ki5GSRVuLcwX0LRQvJT17XmXQ7WJSmI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
|
|
@ -7,7 +8,7 @@
|
|||
, gtk4
|
||||
, libadwaita
|
||||
, libnotify
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -29,6 +30,18 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.com/valos/Komikku/-/merge_requests/208
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/valos/Komikku/-/commit/c9a09817acd767a7cb4ceea9b212fffd798eae61.patch";
|
||||
hash = "sha256-McjQApLY7OKbdelrTeh3aRw90B6T9V5FtLL5Y62BmGA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/valos/Komikku/-/commit/bda93631420f6a69a50be0068f259d60b9558930.patch";
|
||||
hash = "sha256-Xu+IaQKf0I99a2uh97j8xSlGYSJHuNPMy/zZtWRxLaM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -45,7 +58,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
gtk4
|
||||
libadwaita
|
||||
libnotify
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch2
|
||||
, docbook-xsl-nons
|
||||
, docutils
|
||||
, gi-docgen
|
||||
|
|
@ -43,6 +44,13 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://source.puri.sm/Librem5/feedbackd/-/merge_requests/109.patch";
|
||||
hash = "sha256-z3Ud6P2GHYOaGA2vJDD3Sz47+M8p0VcYZ5gbYcGydMk=";
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,21 +1,64 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, check
|
||||
, dbus
|
||||
, xvfb-run
|
||||
, glib
|
||||
, gtk
|
||||
, gettext
|
||||
, libiconv
|
||||
, json-glib
|
||||
, libintl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "girara";
|
||||
version = "0.3.7";
|
||||
version = "0.3.9";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc=";
|
||||
hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ];
|
||||
buildInputs = [ libintl libiconv json_c ];
|
||||
propagatedBuildInputs = [ glib gtk ];
|
||||
nativeCheckInputs = [ xvfb-run ];
|
||||
patches = [
|
||||
# Fix memory management bug revealed by GLib 2.76.
|
||||
# https://git.pwmt.org/pwmt/girara/-/issues/17
|
||||
(fetchpatch2 {
|
||||
url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch";
|
||||
hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
check
|
||||
dbus
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libintl
|
||||
libiconv
|
||||
json-glib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gtk
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA=";
|
||||
sha256 = "e8WX7AvBtnQgC2L995XUuulkemNxfXVN9hWHzCUFAs4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
, blueprint-compiler
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
gsettings-desktop-schemas
|
||||
gtk4
|
||||
libadwaita
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-libav
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, callPackage
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
|
@ -71,13 +70,6 @@ let
|
|||
cxxStandard = "20";
|
||||
};
|
||||
};
|
||||
glibmm = glibmm_2_68.overrideAttrs (_: {
|
||||
version = "2.76.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz";
|
||||
sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI=";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
|
|
@ -148,7 +140,7 @@ stdenv.mkDerivation rec {
|
|||
range-v3
|
||||
tl-expected
|
||||
hunspell
|
||||
glibmm
|
||||
glibmm_2_68
|
||||
webkitgtk_4_1
|
||||
jemalloc
|
||||
rnnoise
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.46.4";
|
||||
version = "3.48.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0=";
|
||||
sha256 = "LYRygZWJ6S78zk8tw70STpPTedMwCXj2mpZTxZKmDvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,22 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi
|
||||
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
|
||||
, boost, libxslt, goffice, wrapGAppsHook, gnome
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, fribidi
|
||||
, libpng
|
||||
, popt
|
||||
, libgsf
|
||||
, enchant
|
||||
, wv
|
||||
, librsvg
|
||||
, bzip2
|
||||
, libjpeg
|
||||
, perl
|
||||
, boost
|
||||
, libxslt
|
||||
, goffice
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,15 +28,30 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 librsvg bzip2 fribidi libpng popt
|
||||
libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme
|
||||
gtk3
|
||||
librsvg
|
||||
bzip2
|
||||
fribidi
|
||||
libpng
|
||||
popt
|
||||
libgsf
|
||||
enchant
|
||||
wv
|
||||
libjpeg
|
||||
perl
|
||||
boost
|
||||
libxslt
|
||||
goffice
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Word processing program, similar to Microsoft Word";
|
||||
homepage = "https://www.abisource.com/";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
, libsecret
|
||||
, libadwaita
|
||||
, gtksourceview5
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
libsecret
|
||||
libadwaita
|
||||
gtksourceview5
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-console";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4=";
|
||||
sha256 = "0cGv1eyNK9+Eo9sCmwSiQy7Me80kLCp0X+mYakKJiEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pitivi";
|
||||
version = "2022.06";
|
||||
version = "2023.03";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg=";
|
||||
sha256 = "PX1OFEeavqMPvF613BKgxwErxqW2huw6mQxo8YpBS/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NgcWDv/W+R4lqHmLV977IJndcLj+5Ofi8g8mN6woyu4=";
|
||||
sha256 = "z2zX65xBSd2Tlm9x+huQevyPZR7MOvVOEIW89K0hsb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pUuUPv5CAQqcEuTc2ts3e/NslMOAB3i4Uww6g0QJ3Mc=";
|
||||
sha256 = "WKpHz9vtEoCjwTGVHBokWWEpQEoLDTR6Pb//tv9oOXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
, libsoup_3
|
||||
, libosinfo
|
||||
, systemd
|
||||
, tracker
|
||||
, tracker-miners
|
||||
, vala
|
||||
, libcap
|
||||
, yajl
|
||||
|
|
@ -38,7 +36,6 @@
|
|||
, libarchive
|
||||
, acl
|
||||
, libgudev
|
||||
, libsecret
|
||||
, libcap_ng
|
||||
, numactl
|
||||
, libapparmor
|
||||
|
|
@ -51,11 +48,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "43.3";
|
||||
version = "44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "7tu69YDZuC20vmV7k7zuXzioe3hScPxJVcC/OGIs7ZM=";
|
||||
sha256 = "OJcGDWlvf6LZEudywnYdvlNDOrXxnr+kvE6Jc4X6ulM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -105,7 +102,6 @@ stdenv.mkDerivation rec {
|
|||
libhandy
|
||||
libosinfo
|
||||
librsvg
|
||||
libsecret
|
||||
libsoup_3
|
||||
libusb1
|
||||
libvirt
|
||||
|
|
@ -115,8 +111,6 @@ stdenv.mkDerivation rec {
|
|||
spice-gtk
|
||||
spice-protocol
|
||||
systemd
|
||||
tracker
|
||||
tracker-miners
|
||||
vte
|
||||
webkitgtk_4_1
|
||||
yajl
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "r6X8ZuL2kVU8x9UX2yNjz/LWLNG130VeX09xMxOdIfI=";
|
||||
sha256 = "lqzXTL9FZSk0UVzDRHo7iV6TP4YyTKkkNvZ93WPDqAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -11,7 +10,6 @@
|
|||
, gtk4
|
||||
, pango
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, gjs
|
||||
|
|
@ -23,27 +21,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-characters";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sj4V2VCXizY8gaRyYe4aO0fbPGaX7haf8hPuplcqeEE=";
|
||||
sha256 = "BbFcAozBkK75LmCS/YT6jV8kSODpB2RGo1ZvOggf9Qs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3e28a6ad668e2239b14f2e05bc477ec1bfb210ba.patch";
|
||||
sha256 = "sha256-2N4eewknhOXBABs6BPA5/YuqZMT8dyXW857iamrrtuA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
desktop-file-utils
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
|
@ -60,11 +50,6 @@ stdenv.mkDerivation rec {
|
|||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-clocks";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sHQ7cNAIgKo7zcx/fzTIwihiV7XIFzfU+YG8jE9PmB0=";
|
||||
sha256 = "F9epc2XLjxoCOh1491AfM1Mhf6dXfXOv59DKHjtPODg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, vala
|
||||
, gettext
|
||||
, itstool
|
||||
, python3
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
|
|
@ -23,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-hdrYL5PAsvYJ/o7H7N7scGAKVWEq/A4/AndMJaC7MJ8=";
|
||||
hash = "sha256-NMemu/7Jqaz6nC0tukslFDHNcYdPjwVcX/JvJvQkQZk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
|
|||
vala
|
||||
gettext
|
||||
itstool
|
||||
python3
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
glib # glib-compile-resources
|
||||
|
|
@ -54,11 +52,6 @@ stdenv.mkDerivation rec {
|
|||
gtk-frdp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
|
@ -28,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "43.4";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8=";
|
||||
sha256 = "sha256-YAPrc92f0mm0qRvtm/A+6askDFEk7tq/KL4io/77pZU=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -66,14 +65,6 @@ stdenv.mkDerivation rec {
|
|||
libsoup_3
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "timeTest.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/bec3d2f26de1b3a8c8b7e603f6d6a46c853426fa.diff";
|
||||
sha256 = "sha256-7/ogIDG0piZOPaCPX4nUA3jHI7RGTd2KMZsp8z0XLcc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# The .service file isn't wrapped with the correct environment
|
||||
# so misses GIR files when started. By re-pointing from the gjs
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@
|
|||
, itstool
|
||||
, gnome
|
||||
, gst_all_1
|
||||
, libsoup
|
||||
, libsoup_3
|
||||
, libadwaita
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "42.1";
|
||||
version = "44.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "x3R/pqhrVrGK1v+VD/kB5Z7n+sEcaLKmcnr4bq7tgnA=";
|
||||
sha256 = "m9GqyVcuYkcgJKaVDYOubyhr4zzZx3fz1E+hbQOPHVE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
grilo
|
||||
grilo-plugins
|
||||
libnotify
|
||||
libsoup
|
||||
libsoup_3
|
||||
libadwaita
|
||||
gsettings-desktop-schemas
|
||||
tracker
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, wrapGAppsHook4
|
||||
, ninja
|
||||
, gnome
|
||||
, cairo
|
||||
, enchant
|
||||
, icu
|
||||
, itstool
|
||||
|
|
@ -24,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "43.2";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-MwRcehI/qife5+ubqabybxsXGMWg52M30Hmg1MkA4UY=";
|
||||
sha256 = "sha256-9nvDeAc0/6gV/MTF2qe1VdJORZ+B6itUjmqFwWEqMco=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
enchant
|
||||
icu
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-weather";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "LxERf3VVK/G7ngHwHPs8L82mo/aQcP/gUZoHYVMrjyY=";
|
||||
sha256 = "aw04rHhQQWmd9iiSbjXbe1/6CG7g1pNMIioZxrmSO68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adwaita-icon-theme";
|
||||
version = "43";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "LjrHfTKmqlVUFV3zfo8KDdVPxaZf1yHojVBflw2jLsY=";
|
||||
sha256 = "SInFYBu/7NJdgLo0IgnQqTbc9pHuVr1uykzeNh8aZkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, glib
|
||||
|
|
@ -19,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "baobab";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "UsaGQRj1aX9aVzaILc2ifbIuciC8SSg43uzGmSRs2yY=";
|
||||
sha256 = "hFtju5Ej10VoyBJsVxu8dCc0g/+SAXmizx7du++hv8A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
# Prevents “error: Package `libadwaita-1' not found in specified Vala API
|
||||
|
|
@ -52,12 +50,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
# https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40
|
||||
substituteInPlace build-aux/post-install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eog";
|
||||
version = "43.2";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-nc/c5VhakOK7HPV+N3yx6xLUG9m8ubus31BrwbE1Tvk=";
|
||||
sha256 = "sha256-QdhfqwXEMImNv9hH5I4fW0k13Dy87lRudZqQftpnEFQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,18 +4,16 @@
|
|||
, ninja
|
||||
, gettext
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, icu
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gnome
|
||||
, libportal-gtk3
|
||||
, libportal-gtk4
|
||||
, libxml2
|
||||
, libxslt
|
||||
, itstool
|
||||
, webkitgtk_4_1
|
||||
, webkitgtk_6_0
|
||||
, libsoup_3
|
||||
, glib-networking
|
||||
, libsecret
|
||||
|
|
@ -23,55 +21,42 @@
|
|||
, libarchive
|
||||
, p11-kit
|
||||
, sqlite
|
||||
, gcr
|
||||
, gcr_4
|
||||
, isocodes
|
||||
, desktop-file-utils
|
||||
, nettle
|
||||
, gdk-pixbuf
|
||||
, gst_all_1
|
||||
, json-glib
|
||||
, libdazzle
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, buildPackages
|
||||
, withPantheon ? false
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "43.1";
|
||||
version = "44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6G6tJ8uZgoFRUGZN478g+vN193uAZbArMRgMZba767Q=";
|
||||
sha256 = "u60o/HJzqGa5teXdVoa9BIQww/C+7UwIJgtNCN2P+Fs=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Pantheon specific patches for epiphany
|
||||
# https://github.com/elementary/browser
|
||||
#
|
||||
# Patch to unlink nav buttons
|
||||
# https://github.com/elementary/browser/pull/18
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch";
|
||||
sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
itstool
|
||||
libxslt
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
buildPackages.glib
|
||||
buildPackages.gtk3
|
||||
buildPackages.gtk4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gcr
|
||||
gcr_4
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
|
|
@ -82,13 +67,12 @@ stdenv.mkDerivation rec {
|
|||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
gtk4
|
||||
icu
|
||||
isocodes
|
||||
json-glib
|
||||
libdazzle
|
||||
libhandy
|
||||
libportal-gtk3
|
||||
libadwaita
|
||||
libportal-gtk4
|
||||
libarchive
|
||||
libsecret
|
||||
libsoup_3
|
||||
|
|
@ -96,12 +80,16 @@ stdenv.mkDerivation rec {
|
|||
nettle
|
||||
p11-kit
|
||||
sqlite
|
||||
webkitgtk_4_1
|
||||
webkitgtk_6_0
|
||||
] ++ lib.optionals withPantheon [
|
||||
pantheon.granite7
|
||||
];
|
||||
|
||||
# Tests need an X display
|
||||
mesonFlags = [
|
||||
"-Dunit_tests=disabled"
|
||||
] ++ lib.optionals withPantheon [
|
||||
"-Dgranite=enabled"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, gettext
|
||||
, libxml2
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk3
|
||||
, pango
|
||||
|
|
@ -42,17 +43,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "43.1";
|
||||
version = "44.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "bXXKYrc7+7YA9xigmBA9xrgT+QULlZS+kp4ptFidIzU=";
|
||||
sha256 = "Fa/TuxX/s4/sqzTCM1CVCtJwqwOoW5TjM9ndfuanQxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gobject-introspection
|
||||
gi-docgen
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
, openldap
|
||||
, enableOAuth2 ? stdenv.isLinux
|
||||
, webkitgtk_4_1
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
, libaccounts-glib
|
||||
, json-glib
|
||||
, glib
|
||||
|
|
@ -50,13 +50,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.46.4";
|
||||
version = "3.48.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pZslQUXFn6zXx7U4LbeNxfDtH2pum4/n1edZWfk8DMg=";
|
||||
sha256 = "DyX3MzHt9TkJvkD0ErKoaTknAydRdhYwPzIt4VcIPDU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals withGtk4 [
|
||||
gtk4
|
||||
] ++ lib.optionals (withGtk4 && enableOAuth2) [
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
|
||||
index 7888e69..27215e4 100644
|
||||
index bd479d8..bd049b3 100644
|
||||
--- a/src/addressbook/libebook/e-book-client.c
|
||||
+++ b/src/addressbook/libebook/e-book-client.c
|
||||
@@ -1983,7 +1983,18 @@ e_book_client_get_self (ESourceRegistry *registry,
|
||||
@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry,
|
||||
|
||||
*out_client = book_client;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ index 7888e69..27215e4 100644
|
|||
uid = g_settings_get_string (settings, SELF_UID_KEY);
|
||||
g_object_unref (settings);
|
||||
|
||||
@@ -2051,7 +2062,18 @@ e_book_client_set_self (EBookClient *client,
|
||||
@@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client,
|
||||
g_return_val_if_fail (
|
||||
e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ index 7888e69..27215e4 100644
|
|||
g_settings_set_string (
|
||||
settings, SELF_UID_KEY,
|
||||
e_contact_get_const (contact, E_CONTACT_UID));
|
||||
@@ -2087,8 +2109,18 @@ e_book_client_is_self (EContact *contact)
|
||||
@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact)
|
||||
* unfortunately the API doesn't allow that.
|
||||
*/
|
||||
g_mutex_lock (&mutex);
|
||||
|
|
@ -64,7 +64,7 @@ index 7888e69..27215e4 100644
|
|||
g_mutex_unlock (&mutex);
|
||||
|
||||
diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c
|
||||
index 8dfff6d..fb4434b 100644
|
||||
index e85a56b..59d3fe2 100644
|
||||
--- a/src/addressbook/libebook/e-book.c
|
||||
+++ b/src/addressbook/libebook/e-book.c
|
||||
@@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry,
|
||||
|
|
@ -128,10 +128,10 @@ index 8dfff6d..fb4434b 100644
|
|||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
index d3f130e..bc820e9 100644
|
||||
index 127dcd1..5fa62f6 100644
|
||||
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
@@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void)
|
||||
@@ -136,7 +136,18 @@ ebmb_is_power_saver_enabled (void)
|
||||
GSettings *settings;
|
||||
gboolean enabled = FALSE;
|
||||
|
||||
|
|
@ -176,10 +176,10 @@ index 42f3457..b4926af 100644
|
|||
cbc->priv->update_alarms_id = 0;
|
||||
cbc->priv->alarm_enabled = FALSE;
|
||||
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
|
||||
index 52095a4..184b657 100644
|
||||
index 5087de1..5c24b87 100644
|
||||
--- a/src/calendar/libecal/e-reminder-watcher.c
|
||||
+++ b/src/calendar/libecal/e-reminder-watcher.c
|
||||
@@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
|
||||
@@ -2578,7 +2578,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
|
||||
|
||||
watcher->priv = e_reminder_watcher_get_instance_private (watcher);
|
||||
watcher->priv->cancellable = g_cancellable_new ();
|
||||
|
|
@ -298,10 +298,10 @@ index e61160c..b6553a4 100644
|
|||
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
|
||||
G_UNLOCK (mi_user_headers);
|
||||
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
index 28755e2..da8c40c 100644
|
||||
index 95918a0..a7fc669 100644
|
||||
--- a/src/camel/providers/imapx/camel-imapx-server.c
|
||||
+++ b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
@@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)
|
||||
@@ -5591,7 +5591,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)
|
||||
if (!skip_old_flags_update) {
|
||||
GSettings *eds_settings;
|
||||
|
||||
|
|
@ -322,10 +322,10 @@ index 28755e2..da8c40c 100644
|
|||
if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) {
|
||||
GPowerProfileMonitor *power_monitor;
|
||||
diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c
|
||||
index f535ad6..918975d 100644
|
||||
index effaf06..1b2a003 100644
|
||||
--- a/src/camel/providers/smtp/camel-smtp-transport.c
|
||||
+++ b/src/camel/providers/smtp/camel-smtp-transport.c
|
||||
@@ -1458,7 +1458,18 @@ smtp_helo (CamelSmtpTransport *transport,
|
||||
@@ -1462,7 +1462,18 @@ smtp_helo (CamelSmtpTransport *transport,
|
||||
transport->authtypes = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -370,7 +370,7 @@ index 188f276..939f89b 100644
|
|||
settings, "network-monitor-gio-name",
|
||||
object, "gio-name",
|
||||
diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c
|
||||
index f215388..501222e 100644
|
||||
index ec08afe..7b31227 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-google.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-google.c
|
||||
@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service,
|
||||
|
|
@ -394,7 +394,7 @@ index f215388..501222e 100644
|
|||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c
|
||||
index 9cff0d0..4c9a203 100644
|
||||
index 7633e93..2328048 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-outlook.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-outlook.c
|
||||
@@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service,
|
||||
|
|
@ -418,7 +418,7 @@ index 9cff0d0..4c9a203 100644
|
|||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
index 8e4ee81..cc94026 100644
|
||||
index 3bb1071..199e822 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
@@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service,
|
||||
|
|
@ -442,7 +442,7 @@ index 8e4ee81..cc94026 100644
|
|||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
|
||||
index b0c2410..ca915e0 100644
|
||||
index 7eca355..795d822 100644
|
||||
--- a/src/libedataserver/e-oauth2-service.c
|
||||
+++ b/src/libedataserver/e-oauth2-service.c
|
||||
@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, rsync
|
||||
, pkg-config
|
||||
, glib
|
||||
|
|
@ -44,13 +43,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdm";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "lNcNbtffWfp/3k/QL+0RaFk6itzhD87hE8FI1Ss5IpQ=";
|
||||
sha256 = "ziCwoiHb+M3gBktQH9jzj3ODkVKFfEU1M36wnMUvf2w=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
rsync
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
@ -126,8 +124,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
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 ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-backgrounds";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "jkWcrTinV0aDpV5ed2kOZYxvn+ruycuCA5qyW6K8oF0=";
|
||||
sha256 = "SoOTs4cTXypqQkoaDDrJTgdCtiuCNaCSPJKfUeBL4E4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calculator";
|
||||
version = "43.0.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "AsEt7Tz1BT0XU32V7GlYf0uRmJnXcm7O7NtLR/+xyQ8=";
|
||||
sha256 = "FOdjMp+IMJp+FSeA1XNhtUMQDjI5BrNOBlX9wxW3EEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, libportal-gtk4
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, qrencode
|
||||
, wrapGAppsHook4
|
||||
, folks
|
||||
, libxml2
|
||||
|
|
@ -26,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-contacts";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ug3IjJAce4/n4SoBOhQlz+2R8vhAhIWitJ+SxnWZACA=";
|
||||
sha256 = "fdEWO8HwavY4La5AFcQ0Q+4sEpKBKPyZ/USSktDee+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
|
|||
libadwaita
|
||||
libxml2
|
||||
gnome-online-accounts
|
||||
qrencode
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "43.4.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4=";
|
||||
sha256 = "sha256-vb+rTPI9BXNAltsfn2+sfu0/y52jK/Sx8m7ToE5avGY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-disk-utility";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-evypgFprkttpM91+/OxK+DhsAbvB+HHi2uTe9+GSosU=";
|
||||
sha256 = "sha256-AgMQl4ls2zfYcXpYI/k+NyPU385/3EACyd/LFrfno+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-font-viewer";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "gca/+wbVMyNG4A6uyuwb3P1hfFHf2VvNBY1sdsdt0rk=";
|
||||
sha256 = "oVEd8wsijMLvEXXdnSuTQ46pEuJZE0BLJjzz1Fe7n5c=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
, networkmanager
|
||||
, pango
|
||||
, polkit
|
||||
, webkitgtk_5_0
|
||||
, webkitgtk_6_0
|
||||
, systemd
|
||||
, libadwaita
|
||||
, libnma-gtk4
|
||||
|
|
@ -38,11 +38,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "43.2";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "I9eWOlTUlZRQTQ6s2FCWyvtfhvHnSljgQGdbbnmK5pg=";
|
||||
sha256 = "WTz8bcj4KphnG5TANbl9vojvVucIeAsq0dIyTk0Eu/8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
|
|||
networkmanager
|
||||
pango
|
||||
polkit
|
||||
webkitgtk_5_0
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "43.3";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-EdRR0f3kTxgJ6/Ya/0vqX570/cAjWaiWR/bp59RUKaw=";
|
||||
hash = "sha256-9+UIjBj9sIaQrgNL92oa6tWafc0Xsm4ffJl1SAUQoP0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
# Also bump ./ctl.nix when bumping major version.
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "sessions" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "P7mUlQE4XIwUYY548XjZUt+YrYyRCA9MXhVoxzk64fI=";
|
||||
sha256 = "zPgpqWUmE16en5F1JlFdNqUJK9+jFvNzfdjFpSTb8sY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -37,17 +37,17 @@
|
|||
, python3
|
||||
, tzdata
|
||||
, nss
|
||||
, gcr
|
||||
, gcr_4
|
||||
, gnome-session-ctl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "42.2";
|
||||
version = "43.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";
|
||||
sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -61,13 +61,6 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
inherit tzdata;
|
||||
})
|
||||
|
||||
# Use geocode-glib_2 dependency
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/03739474621e579e10b72577960ff94b4001e7ff.patch";
|
||||
sha256 = "W4uD4ChNPZSsmQfmfmmXFA2Sm1RDkV7MqG8DmT4qeCY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -106,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
systemd
|
||||
libgudev
|
||||
libwacom
|
||||
gcr
|
||||
gcr_4
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -119,7 +112,7 @@ stdenv.mkDerivation rec {
|
|||
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
postPatch = ''
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
|
||||
chmod +x $f
|
||||
patchShebangs $f
|
||||
done
|
||||
|
|
@ -42,11 +42,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A=";
|
||||
sha256 = "tBetocE0KozymDfs8t7Jvc23VCNbGhYbZDXD0R8hCZk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
|
||||
index d7d10fd2..5619d6ad 100644
|
||||
--- a/plugins/power/gsd-backlight.c
|
||||
+++ b/plugins/power/gsd-backlight.c
|
||||
@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
|
||||
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
|
||||
&error,
|
||||
"pkexec",
|
||||
- LIBEXECDIR "/gsd-backlight-helper",
|
||||
+ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper",
|
||||
g_udev_device_get_sysfs_path (backlight->udev_device),
|
||||
data->value_str, NULL);
|
||||
} else {
|
||||
diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
index f16300f8..79d6bd17 100644
|
||||
--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
@@ -25,7 +25,7 @@
|
||||
<allow_inactive>no</allow_inactive>
|
||||
<allow_active>yes</allow_active>
|
||||
</defaults>
|
||||
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
|
||||
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper</annotate>
|
||||
</action>
|
||||
|
||||
</policyconfig>
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "rd4EvZRqExE1V+TDTIkLvpB3UFpqPwdV8XvqHG5KLRc=";
|
||||
sha256 = "jDRecvMaHjf1UGPgsVmXMBsBGU7WmHcv2HrrUMuxAas=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -40,23 +40,23 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
preFixup = ''
|
||||
# The meson build doesn't compile the schemas.
|
||||
# Fixup adapted from export-zips.sh in the source.
|
||||
# Since we do not install the schemas to central location,
|
||||
# let’s link them to where extensions installed
|
||||
# through the extension portal would look for them.
|
||||
# Adapted from export-zips.sh in the source.
|
||||
|
||||
extensiondir=$out/share/gnome-shell/extensions
|
||||
schemadir=${glib.makeSchemaPath "$out" "$name"}
|
||||
|
||||
glib-compile-schemas $schemadir
|
||||
|
||||
for f in $extensiondir/*; do
|
||||
name=`basename ''${f%%@*}`
|
||||
uuid=$name@gnome-shell-extensions.gcampax.github.com
|
||||
name=$(basename "''${f%%@*}")
|
||||
schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
|
||||
schemas_compiled=$schemadir/gschemas.compiled
|
||||
|
||||
if [ -f $schema ]; then
|
||||
mkdir $f/schemas
|
||||
ln -s $schema $f/schemas;
|
||||
glib-compile-schemas $f/schemas
|
||||
if [[ -f $schema ]]; then
|
||||
mkdir "$f/schemas"
|
||||
ln -s "$schema" "$f/schemas"
|
||||
ln -s "$schemas_compiled" "$f/schemas"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
, gdm
|
||||
, upower
|
||||
, ibus
|
||||
, libnma
|
||||
, libnma-gtk4
|
||||
, libgnomekbd
|
||||
, gnome-desktop
|
||||
, gsettings-desktop-schemas
|
||||
|
|
@ -67,13 +67,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "43.3";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Sf+NBfVfpPHCLwXQOFhSzrQpprY4DBuoRh5ipG1MBx4=";
|
||||
sha256 = "MxCtwd1OIQmY1Z84cbwx9+BJFUKNnO2IwqZrKwXWwAo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -104,6 +104,14 @@ stdenv.mkDerivation rec {
|
|||
url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
|
||||
sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw=";
|
||||
})
|
||||
|
||||
# Logout/reboot/poweroff timeout leaves the session in a broken state
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
|
||||
# Should be part of 44.1
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/5766d4111ac065b37417bedcc1b998ab6bee5514.patch";
|
||||
sha256 = "d9oEzRnVbaFeCaBFhfLnW/Z8FzyQ7J8L7eAQe91133k=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -164,7 +172,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# not declared at build time, but typelib is needed at runtime
|
||||
libgweather
|
||||
libnma
|
||||
libnma-gtk4
|
||||
|
||||
# for gnome-extension tool
|
||||
bash-completion
|
||||
|
|
@ -177,6 +185,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Dtests=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -185,6 +194,13 @@ stdenv.mkDerivation rec {
|
|||
# We can generate it ourselves.
|
||||
rm -f man/gnome-shell.1
|
||||
rm data/theme/gnome-shell.css
|
||||
|
||||
# Build fails with -Dgtk_doc=true
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486
|
||||
# element include: XInclude error : could not load xxx, and no fallback was found
|
||||
substituteInPlace docs/reference/shell/shell-docs.sgml \
|
||||
--replace '<xi:include href="xml/shell-embedded-window.xml"/>' ' ' \
|
||||
--replace '<xi:include href="xml/shell-gtk-embed.xml"/>' ' '
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "43.4";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6d8GDrq1n0lpfV7yYw7DbeYEVBadwZGvYNNINyCq2z4=";
|
||||
sha256 = "YZcZ+VKeC7Ha0w+tu3gNex2ZlAptsfcd9RvHNzQYMK8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-system-monitor";
|
||||
version = "42.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw=";
|
||||
sha256 = "wrq37dupKCfEyN5EKT5+PITJ5QdvMZhYh/+Jac7EXm4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp
|
||||
index 868969ba..51eb93b5 100644
|
||||
index 5e1edf2f..717d7bf1 100644
|
||||
--- a/src/gsm_pkexec.cpp
|
||||
+++ b/src/gsm_pkexec.cpp
|
||||
@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command)
|
||||
@@ -36,5 +36,6 @@ gsm_pkexec_create_root_password_dialog (const char *command)
|
||||
gboolean
|
||||
procman_has_pkexec(void)
|
||||
procman_has_pkexec (void)
|
||||
{
|
||||
- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
+ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS)
|
||||
+ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
- return g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
+ return g_file_test ("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS)
|
||||
+ || g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, libxml2
|
||||
, gnome
|
||||
, nix-update-script
|
||||
, gitUpdater
|
||||
, nautilus
|
||||
, glib
|
||||
, gtk4
|
||||
|
|
@ -30,25 +29,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.47.0";
|
||||
version = "3.48.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-terminal";
|
||||
rev = version;
|
||||
sha256 = "sha256-CriI1DtDBeujaz0HtXCyzoGxnas7NmD6EMQ+gLph3E4=";
|
||||
sha256 = "sha256-Co0RnDprY1eJhXdOzs43nniXzpaFtBpnr13StMDw4+8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix Nautilus extension build.
|
||||
# https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/614ea99b16fb09e10341fc6ccf5e115ac3f93caf.patch";
|
||||
sha256 = "K7JHPfXywF3QSjSjyUnNZ11/ed+QXHQ47i135QBMIR8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -87,11 +77,14 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs \
|
||||
data/icons/meson_updateiconcache.py \
|
||||
data/meson_desktopfile.py \
|
||||
data/meson_metainfofile.py \
|
||||
src/meson_compileschemas.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = gitUpdater {
|
||||
odd-unstable = true;
|
||||
};
|
||||
|
||||
tests = {
|
||||
test = nixosTests.terminal-emulators.gnome-terminal;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, gdk-pixbuf
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
, gnome
|
||||
, libadwaita
|
||||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-tour";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-E1HkGWJ/vXx3GTKm7xrYDAvy5oKMSUigYgaJhN2zzIg=";
|
||||
hash = "sha256-Bt52d90cWQ0OozoDLJzPTDfGK8ViFbgjyHnkLuYwwrY=";
|
||||
};
|
||||
|
||||
cargoVendorDir = "vendor";
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
{ fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, runCommand
|
||||
, lib
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, cairo
|
||||
, colord
|
||||
, lcms2
|
||||
, pango
|
||||
, json-glib
|
||||
, libstartup_notification
|
||||
, zenity
|
||||
, libcanberra
|
||||
, ninja
|
||||
, xvfb-run
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
, xorgserver
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gi-docgen
|
||||
, sysprof
|
||||
, libsysprof-capture
|
||||
, desktop-file-utils
|
||||
|
|
@ -47,15 +48,15 @@
|
|||
, wayland-protocols
|
||||
}:
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "42.7";
|
||||
version = "43.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM=";
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -66,10 +67,13 @@ let self = stdenv.mkDerivation rec {
|
|||
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||
})
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit zenity;
|
||||
})
|
||||
# GLib 2.76 switches from using its own slice allocator to using the system malloc instead.
|
||||
# This makes dragging window between workspace in multitasking view crashes Pantheon's Gala.
|
||||
# Inspiration https://github.com/mate-desktop/mate-desktop/pull/538
|
||||
# Backtrace https://github.com/elementary/gala/issues/1580
|
||||
# Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495
|
||||
# The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up.
|
||||
./glib-2-76-gala-crash.patch
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -81,6 +85,7 @@ let self = stdenv.mkDerivation rec {
|
|||
# This should be auto detected, but it looks like it manages a false
|
||||
# positive.
|
||||
"-Dxwayland_initfd=disabled"
|
||||
"-Ddocs=true"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -102,6 +107,7 @@ let self = stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
gi-docgen
|
||||
xorgserver
|
||||
];
|
||||
|
||||
|
|
@ -123,6 +129,8 @@ let self = stdenv.mkDerivation rec {
|
|||
libxkbcommon
|
||||
libxkbfile
|
||||
libXdamage
|
||||
colord
|
||||
lcms2
|
||||
pango
|
||||
pipewire
|
||||
sysprof # for D-Bus interfaces
|
||||
|
|
@ -140,16 +148,24 @@ let self = stdenv.mkDerivation rec {
|
|||
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
# TODO: Move this into a directory devhelp can find.
|
||||
moveToOutput "share/mutter-11/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
# Install udev files into our own tree.
|
||||
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${self}/lib/mutter-10";
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-11";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
if [[ ! -d ${self.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${self.libdir}” is not one."
|
||||
if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
|
||||
exit 1
|
||||
fi
|
||||
touch $out
|
||||
|
|
@ -164,5 +180,4 @@ let self = stdenv.mkDerivation rec {
|
|||
maintainers = teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in self
|
||||
})
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
|
||||
index d34c8f59f..8835a6a33 100644
|
||||
--- a/clutter/clutter/clutter-actor.c
|
||||
+++ b/clutter/clutter/clutter-actor.c
|
||||
@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
ClutterEventPhase phase)
|
||||
{
|
||||
ClutterActorPrivate *priv;
|
||||
- const GList *actions, *l;
|
||||
+ const GList *actions, *l, *next;
|
||||
gboolean retval = CLUTTER_EVENT_PROPAGATE;
|
||||
|
||||
priv = self->priv;
|
||||
@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
|
||||
actions = _clutter_meta_group_peek_metas (priv->actions);
|
||||
|
||||
- for (l = actions; l; l = l->next)
|
||||
+ for (l = actions; l; l = next)
|
||||
{
|
||||
ClutterAction *action = l->data;
|
||||
+ next = l->next;
|
||||
ClutterEventPhase action_phase;
|
||||
|
||||
action_phase = clutter_action_get_phase (action);
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ fetchurl
|
||||
, runCommand
|
||||
, lib
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, gnome
|
||||
|
|
@ -16,28 +15,44 @@
|
|||
, libcanberra
|
||||
, ninja
|
||||
, xvfb-run
|
||||
, xkeyboard_config
|
||||
, libxcvt
|
||||
, libxkbfile
|
||||
, libICE
|
||||
, libX11
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libxkbcommon
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libXtst
|
||||
, libxkbfile
|
||||
, xkeyboard_config
|
||||
, libxkbcommon
|
||||
, libXrender
|
||||
, libxcb
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXau
|
||||
, libinput
|
||||
, libdrm
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, gtk3
|
||||
, atk
|
||||
, gtk4
|
||||
, fribidi
|
||||
, harfbuzz
|
||||
, gnome-desktop
|
||||
, pipewire
|
||||
, libgudev
|
||||
, libwacom
|
||||
, libSM
|
||||
, xwayland
|
||||
, mesa
|
||||
, meson
|
||||
, gnome-settings-daemon
|
||||
, xorgserver
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gi-docgen
|
||||
, sysprof
|
||||
, libsysprof-capture
|
||||
|
|
@ -50,34 +65,19 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.3";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "Z75IINmycMnDxl44lHvwUtLC/xiunnBCHUklnvrACn0=";
|
||||
sha256 = "chSwfhNYnvfB31U8ftEaAnmOQ62mwiiRP056Zm7vusQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with separate sysprof.
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
|
||||
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||
})
|
||||
|
||||
# Fix focus regression.
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2848
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/12ce58dba4f96f6a948c1d166646d263253e3ee0.patch";
|
||||
sha256 = "CGu11aLFs8VEt8NiIkih+cXZzU82oxY6Ko9QRKOkM98=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Degl_device=true"
|
||||
"-Dinstalled_tests=false" # TODO: enable these
|
||||
"-Dtests=false"
|
||||
"-Dwayland_eglstream=true"
|
||||
"-Dprofiler=true"
|
||||
"-Dxwayland_path=${xwayland}/bin/Xwayland"
|
||||
|
|
@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
propagatedBuildInputs = [
|
||||
# required for pkg-config to detect mutter-clutter
|
||||
json-glib
|
||||
libXtst
|
||||
libcap_ng
|
||||
graphene
|
||||
];
|
||||
|
|
@ -105,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
xvfb-run
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
gi-docgen
|
||||
xorgserver
|
||||
];
|
||||
|
|
@ -118,25 +117,44 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gnome-settings-daemon
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
atk
|
||||
fribidi
|
||||
harfbuzz
|
||||
libcanberra
|
||||
libdrm
|
||||
libgudev
|
||||
libinput
|
||||
libstartup_notification
|
||||
libwacom
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
libXdamage
|
||||
libSM
|
||||
colord
|
||||
lcms2
|
||||
pango
|
||||
pipewire
|
||||
sysprof # for D-Bus interfaces
|
||||
libsysprof-capture
|
||||
xkeyboard_config
|
||||
xwayland
|
||||
wayland-protocols
|
||||
] ++ [
|
||||
# X11 client
|
||||
gtk4
|
||||
libICE
|
||||
libX11
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXtst
|
||||
libxkbfile
|
||||
xkeyboard_config
|
||||
libxkbcommon
|
||||
libXrender
|
||||
libxcb
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXau
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -150,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
# TODO: Move this into a directory devhelp can find.
|
||||
moveToOutput "share/mutter-11/doc" "$devdoc"
|
||||
moveToOutput "share/mutter-12/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
# Install udev files into our own tree.
|
||||
|
|
@ -159,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
separateDebugInfo = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-11";
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-12";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "43.2";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "qGqap6RVURsCnOSaHYtGWcPDVbXYHXNgu00N5jev7eA=";
|
||||
sha256 = "V7meu44rnBUS04HlMJYYjAh7M0ENbFLYeie9YO52rH8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rygel";
|
||||
version = "0.42.1";
|
||||
version = "0.42.2";
|
||||
|
||||
# TODO: split out lib
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0=";
|
||||
sha256 = "FYHjkw9dOv4XSHLJawoc014UJ5VCUffnMs5iZlOBioc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "42.5";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-BfXfpOniBu+p1ATJhh3XxEIJF5PnNMQXGXOZFyUOQFA=";
|
||||
sha256 = "sha256-Obhw/Ub0R/dH6uzC3yYEnvdzGFCZ8OE8Z1ZWJk3ZjpU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,26 +6,22 @@
|
|||
, pkg-config
|
||||
, libxml2
|
||||
, gnome
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gettext
|
||||
, libX11
|
||||
, libadwaita
|
||||
, itstool
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zenity";
|
||||
version = "3.44.0";
|
||||
version = "3.91.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U=";
|
||||
sha256 = "N2GeCYAwgXj9vPaDItmaB7MzbBwLuY7ysyycsQkCI5k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-icon-install.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -33,12 +29,12 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
itstool
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libX11
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
@ -51,6 +47,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Tool to display dialogs from the commandline and shell scripts";
|
||||
homepage = "https://wiki.gnome.org/Projects/Zenity";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 339b3cff..aca65efd 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -9,5 +9,6 @@ install_data(
|
||||
'zenity-text.png',
|
||||
'zenity-scale.png',
|
||||
'zenity-entry.png',
|
||||
- 'zenity-notification.png']
|
||||
+ 'zenity-notification.png'],
|
||||
+ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps',
|
||||
)
|
||||
|
|
@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
|
||||
|
||||
# Using 42 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { };
|
||||
# Using 43 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { };
|
||||
|
||||
gnome-software = callPackage ./core/gnome-software { };
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
mutter = callPackage ./core/mutter { };
|
||||
|
||||
# Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
|
||||
mutter42 = callPackage ./core/mutter/42 { };
|
||||
mutter43 = callPackage ./core/mutter/43 { };
|
||||
|
||||
nautilus = callPackage ./core/nautilus { };
|
||||
|
||||
|
|
@ -272,5 +272,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26
|
||||
|
||||
mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
|
||||
mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23
|
||||
gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
|
||||
gnome-settings-daemon42 = throw "The ‘gnome.gnome-settings-daemon42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,43 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, meson, ninja, pkg-config, wrapGAppsHook, python3
|
||||
, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, python3
|
||||
, gettext
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, libgnome-games-support
|
||||
, gdk-pixbuf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atomix";
|
||||
version = "3.34.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz";
|
||||
sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
|
||||
url = "mirror://gnome/sources/atomix/${lib.versions.major finalAttrs.version}/atomix-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "yISTF2iNh9pzTJBjA1YxBSAH8qh5m2xsyRUmWIC1X7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchains like gcc-10:
|
||||
# https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/2
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b.patch";
|
||||
sha256 = "0nrwl6kb1als9mxd5s0la45z63xwshqlnxqjaax32w8yrl6kz7l8";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ];
|
||||
buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ];
|
||||
|
||||
# When building with clang ceil() is not inlined:
|
||||
# ld: src/libatomix.a.p/canvas_helper.c.o: undefined reference to symbol 'ceil@@GLIBC_2.2.5'
|
||||
# https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/3
|
||||
NIX_LDFLAGS = "-lm";
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
libgnome-games-support
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
|
|
@ -36,8 +46,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "atomix";
|
||||
attrPath = "gnome.atomix";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -48,4 +58,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-chess";
|
||||
version = "43.1";
|
||||
version = "43.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "c08JLZX8YECe6so0J7WkjLm1mdoRmVEZ2FuqmWU+ApI=";
|
||||
sha256 = "NIUI+PbnRRwHNE/6egmpkM8dKIO8z1M0CdvgKSaNSfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sudoku";
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8=";
|
||||
sha256 = "ZRjZIzpG1+E4Bax4dme6RwGUjZ7UGke4h5f826Q7j7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hitori";
|
||||
version = "3.38.4";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "iZPMkfuSN4jjieA+wqp4dtFcErrZIEz2Wy/6DtOSL30=";
|
||||
url = "mirror://gnome/sources/hitori/${lib.versions.major finalAttrs.version}/hitori-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "QicL1PlSXRgNMVG9ckUzXcXPJIqYTgL2j/kw2nmeWDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "hitori";
|
||||
attrPath = "gnome.hitori";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Apps/Hitori";
|
||||
description = "GTK application to generate and let you play games of Hitori";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-autoar";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog=";
|
||||
sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
, gtk3
|
||||
, itstool
|
||||
, libgweather
|
||||
, libsoup
|
||||
, libwnck
|
||||
, libxml2
|
||||
, pkg-config
|
||||
|
|
@ -25,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-panel";
|
||||
version = "3.46.0";
|
||||
version = "3.47.1";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-zsehG3DFJLXo121Nfk2DXuYHq9outC9N92GeYusGrrE=";
|
||||
hash = "sha256-2PbixllmjHffgsPdlboE/O+MQMIo4sImBfmhepFh7IM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -77,7 +76,6 @@ stdenv.mkDerivation rec {
|
|||
gnome-menus
|
||||
gtk3
|
||||
libgweather
|
||||
libsoup
|
||||
libwnck
|
||||
polkit
|
||||
systemd
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, clutter
|
||||
, gjs
|
||||
, glib
|
||||
, gobject-introspection
|
||||
|
|
@ -21,14 +19,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "43.1";
|
||||
version = "44.0";
|
||||
pname = "gpaste";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keruspe";
|
||||
repo = "GPaste";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE=";
|
||||
sha256 = "sha256-mYbyu3IIF6pQz1oEqEWLe7jdR99M3LxiMiRR9x7qFh8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -58,7 +55,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
clutter # required by mutter-clutter
|
||||
gjs
|
||||
glib
|
||||
gtk3
|
||||
|
|
@ -70,7 +66,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgcr3=false" # Build with gcr4
|
||||
"-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings"
|
||||
"-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services"
|
||||
"-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user"
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
maintainers = lib.teams.pantheon.members;
|
||||
|
||||
mutter = pkgs.gnome.mutter42;
|
||||
mutter = pkgs.gnome.mutter43;
|
||||
|
||||
# Using 42 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42;
|
||||
# Using 43 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43;
|
||||
|
||||
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
|
||||
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ in rec {
|
|||
};
|
||||
|
||||
vala_0_56 = generic {
|
||||
version = "0.56.4";
|
||||
sha256 = "hixB2ThUPtPY2GyCGaYQh3lxk97+6NoMUMr0mZPGa2o=";
|
||||
version = "0.56.6";
|
||||
sha256 = "BQ6EHL/iuOfQ+zUMlQa9dVe+HNhqkMiWdl8aCaGHABM=";
|
||||
};
|
||||
|
||||
vala = vala_0_56;
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "at-spi2-core";
|
||||
version = "2.46.0";
|
||||
version = "2.48.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "qgyGx596jWe65JpbelqwhDDGCM/+bjO/R6cvQasDw9A=";
|
||||
sha256 = "kFpbbxeQto7oA7/6n1+rTOtZH7T64LL4xhLFTx1OijA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ stdenv.mkDerivation rec {
|
|||
"--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
|
||||
];
|
||||
|
||||
# Compilation fails after a change in glib where
|
||||
# g_string_free now returns a value
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -28,23 +27,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folks";
|
||||
version = "0.15.5";
|
||||
version = "0.15.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY=";
|
||||
sha256 = "yGZjDFU/Kc6b4cemAmfLQICmvM9LjVUdxMfmI02EAkg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not check for unneeded GTK dependency.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch";
|
||||
sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
gobject-introspection
|
||||
|
|
@ -117,7 +108,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A library that aggregates people from multiple sources to create metacontacts";
|
||||
homepage = "https://wiki.gnome.org/Projects/Folks";
|
||||
license = licenses.lgpl2Plus;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcr";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
outputs = [ "out" "bin" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "xFhVkk8O57q0Pi3Ti/r9KsgVxumGQ0HAFh4XEXPc7Hw=";
|
||||
sha256 = "nOqtKShLqRm5IW4oiMGOxnJAwsk7OkhWvFSIu8Hzo4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gegl";
|
||||
version = "0.4.42";
|
||||
version = "0.4.44";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "q6g6DLqmxW7cKeoi8ugXKVClO5bapRWSCD1ZIivd4C0=";
|
||||
sha256 = "CkzbQWNeQGoISc0NPwPK99l8q4qhPShwfVMtAInVYSY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gjs";
|
||||
version = "1.74.2";
|
||||
version = "1.76.0";
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pAb9ahZSz2bcqyKAYr0Wp19bM3gkjfu74BayEnRKMLY=";
|
||||
sha256 = "sha256-pj8VaWSxNgU+q1HqATEU59fBk7dRjSjAQLawLDyTOm0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib-networking";
|
||||
version = "2.74.0";
|
||||
version = "2.76.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "HxharvCUEj+OJdj6VWYbP9cQIBY6AXSts1o3aFzaYTs=";
|
||||
sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -56,11 +56,11 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glib";
|
||||
version = "2.74.5";
|
||||
version = "2.76.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "zrqDpZmc6zGkxPyZISB8uf//0qsdbsA8Fi0/YIpcFMg=";
|
||||
sha256 = "Q9wPahJpWPW0VBNsQ5jqtCAknBYXGnaXhEhuJfL9oZ8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -68,27 +68,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
./quark_init_on_demand.patch
|
||||
./gobject_init_on_demand.patch
|
||||
|
||||
# Fix error about missing sentinel in glib/tests/cxx.cpp
|
||||
# These two commits are part of already merged glib MRs 3033 and 3031:
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3033
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066.patch";
|
||||
sha256 = "OfD5zO/7JIgOMLc0FAgHV9smWugFJuVPHCn9jTsMQJg=";
|
||||
})
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3031
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4.patch";
|
||||
sha256 = "v28Yk+R0kN9ssIcvJudRZ4vi30rzQEE8Lsd1kWp5hbM=";
|
||||
})
|
||||
] ++ [
|
||||
./glib-appinfo-watch.patch
|
||||
./schema-override-variable.patch
|
||||
|
||||
# Add support for the GNOME’s default terminal emulator.
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/issues/2618
|
||||
./gnome-console-support.patch
|
||||
# Do the same for Pantheon’s terminal emulator.
|
||||
# Add support for Pantheon’s terminal emulator.
|
||||
./elementary-terminal-support.patch
|
||||
|
||||
# GLib contains many binaries used for different purposes;
|
||||
|
|
@ -195,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patchShebangs glib/gen-unicode-tables.pl
|
||||
patchShebangs glib/tests/gen-casefold-txt.py
|
||||
patchShebangs glib/tests/gen-casemap-txt.py
|
||||
patchShebangs tools/gen-visibility-macros.py
|
||||
|
||||
# Needs machine-id, comment the test
|
||||
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
|
||||
|
|
|
|||
|
|
@ -1,16 +1,12 @@
|
|||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
|
||||
index a441bfec9..6bcd3e690 100644
|
||||
index 30fcb2937..a6a7163a7 100644
|
||||
--- a/gio/gdesktopappinfo.c
|
||||
+++ b/gio/gdesktopappinfo.c
|
||||
@@ -2678,6 +2678,11 @@ prepend_terminal_to_vector (int *argc,
|
||||
if (check != NULL)
|
||||
pass_cmd_as_single_arg = TRUE;
|
||||
}
|
||||
+ if (check == NULL) {
|
||||
+ check = g_find_program_in_path ("io.elementary.terminal");
|
||||
+ if (check != NULL)
|
||||
+ pass_cmd_as_single_arg = TRUE;
|
||||
+ }
|
||||
if (check == NULL)
|
||||
check = g_find_program_in_path ("tilix");
|
||||
if (check == NULL)
|
||||
@@ -2704,6 +2704,7 @@ prepend_terminal_to_vector (int *argc,
|
||||
{ "gnome-terminal", "--" },
|
||||
{ "mate-terminal", "-x" },
|
||||
{ "xfce4-terminal", "-x" },
|
||||
+ { "io.elementary.terminal", "-x" },
|
||||
{ "tilix", "-e" },
|
||||
{ "konsole", "-e" },
|
||||
{ "nxterm", "-e" },
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
|
||||
index 60d6debb2..a441bfec9 100644
|
||||
--- a/gio/gdesktopappinfo.c
|
||||
+++ b/gio/gdesktopappinfo.c
|
||||
@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
|
||||
int i, j;
|
||||
char **term_argv = NULL;
|
||||
int term_argc = 0;
|
||||
+ gboolean pass_cmd_as_single_arg = FALSE;
|
||||
char *check;
|
||||
char **the_argv;
|
||||
|
||||
@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
|
||||
}
|
||||
else
|
||||
{
|
||||
+ if (check == NULL) {
|
||||
+ check = g_find_program_in_path ("kgx");
|
||||
+ if (check != NULL)
|
||||
+ pass_cmd_as_single_arg = TRUE;
|
||||
+ }
|
||||
if (check == NULL)
|
||||
check = g_find_program_in_path ("tilix");
|
||||
if (check == NULL)
|
||||
@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
|
||||
}
|
||||
}
|
||||
|
||||
- real_argc = term_argc + *argc;
|
||||
+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
|
||||
real_argv = g_new (char *, real_argc + 1);
|
||||
|
||||
for (i = 0; i < term_argc; i++)
|
||||
real_argv[i] = term_argv[i];
|
||||
|
||||
- for (j = 0; j < *argc; j++, i++)
|
||||
- real_argv[i] = (char *)the_argv[j];
|
||||
+ if (pass_cmd_as_single_arg) {
|
||||
+ char **quoted_argv = g_new (char *, *argc + 1);
|
||||
+
|
||||
+ for (j = 0; j < *argc; j++) {
|
||||
+ quoted_argv[j] = g_shell_quote (the_argv[j]);
|
||||
+ g_free (the_argv[j]);
|
||||
+ }
|
||||
+ quoted_argv[j] = NULL;
|
||||
+
|
||||
+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
|
||||
+ g_strfreev (quoted_argv);
|
||||
+ } else {
|
||||
+ for (j = 0; j < *argc; j++, i++)
|
||||
+ real_argv[i] = (char *)the_argv[j];
|
||||
+ }
|
||||
|
||||
real_argv[i] = NULL;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
|
||||
index f0a256898..9c8497cd0 100644
|
||||
index 65faae9b2..4297513d4 100644
|
||||
--- a/gio/gdbus-2.0/codegen/meson.build
|
||||
+++ b/gio/gdbus-2.0/codegen/meson.build
|
||||
@@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
|
||||
@@ -20,7 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
|
||||
# Install gdbus-codegen executable
|
||||
gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
|
||||
output : 'gdbus-codegen',
|
||||
|
|
@ -12,10 +12,10 @@ index f0a256898..9c8497cd0 100644
|
|||
configuration : gdbus_codegen_conf
|
||||
)
|
||||
diff --git a/gio/meson.build b/gio/meson.build
|
||||
index fdd2528df..cf359c7d7 100644
|
||||
index 462606f3b..a3047fca1 100644
|
||||
--- a/gio/meson.build
|
||||
+++ b/gio/meson.build
|
||||
@@ -859,14 +859,15 @@ pkg.generate(libgio,
|
||||
@@ -880,14 +880,15 @@ pkg.generate(libgio,
|
||||
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
|
||||
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
|
||||
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
|
|
@ -36,7 +36,7 @@ index fdd2528df..cf359c7d7 100644
|
|||
'gsettings=' + join_paths('${bindir}', 'gsettings')],
|
||||
version : glib_version,
|
||||
install_dir : glib_pkgconfigreldir,
|
||||
@@ -968,6 +969,7 @@ executable('gio', gio_tool_sources,
|
||||
@@ -989,6 +990,7 @@ executable('gio', gio_tool_sources,
|
||||
|
||||
executable('gresource', 'gresource-tool.c',
|
||||
install : true,
|
||||
|
|
@ -44,7 +44,7 @@ index fdd2528df..cf359c7d7 100644
|
|||
install_tag : 'bin',
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
@@ -975,7 +977,7 @@ executable('gresource', 'gresource-tool.c',
|
||||
@@ -996,7 +998,7 @@ executable('gresource', 'gresource-tool.c',
|
||||
|
||||
gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
|
||||
install : true,
|
||||
|
|
@ -53,7 +53,7 @@ index fdd2528df..cf359c7d7 100644
|
|||
install_tag : 'bin',
|
||||
c_args : gio_c_args,
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
@@ -985,7 +987,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
|
||||
@@ -1006,7 +1008,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
|
||||
glib_compile_schemas = executable('glib-compile-schemas',
|
||||
['glib-compile-schemas.c'],
|
||||
install : true,
|
||||
|
|
@ -62,7 +62,7 @@ index fdd2528df..cf359c7d7 100644
|
|||
install_tag : 'bin',
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
@@ -994,6 +996,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
|
||||
@@ -1015,6 +1017,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
|
||||
glib_compile_resources = executable('glib-compile-resources',
|
||||
[gconstructor_as_data_h, 'glib-compile-resources.c'],
|
||||
install : true,
|
||||
|
|
@ -71,10 +71,10 @@ index fdd2528df..cf359c7d7 100644
|
|||
c_args : gio_c_args,
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
diff --git a/glib/meson.build b/glib/meson.build
|
||||
index 1e6dc36be..6b5de6c86 100644
|
||||
index da76fc005..8e2ef990c 100644
|
||||
--- a/glib/meson.build
|
||||
+++ b/glib/meson.build
|
||||
@@ -396,9 +396,10 @@ pkg.generate(libglib,
|
||||
@@ -441,9 +441,10 @@ pkg.generate(libglib,
|
||||
subdirs : ['glib-2.0'],
|
||||
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
|
||||
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
|
|
@ -88,7 +88,7 @@ index 1e6dc36be..6b5de6c86 100644
|
|||
version : glib_version,
|
||||
install_dir : glib_pkgconfigreldir,
|
||||
filebase : 'glib-2.0',
|
||||
@@ -435,6 +436,7 @@ if host_system == 'windows'
|
||||
@@ -480,6 +481,7 @@ if host_system == 'windows'
|
||||
else
|
||||
gtester = executable('gtester', 'gtester.c',
|
||||
install : true,
|
||||
|
|
@ -96,7 +96,7 @@ index 1e6dc36be..6b5de6c86 100644
|
|||
install_tag : 'bin-devel',
|
||||
c_args : ['-UG_DISABLE_ASSERT'],
|
||||
include_directories : configinc,
|
||||
@@ -447,7 +449,7 @@ report_conf.set('PYTHON', python_name)
|
||||
@@ -492,7 +494,7 @@ report_conf.set('PYTHON', python_name)
|
||||
configure_file(
|
||||
input: 'gtester-report.in',
|
||||
output: 'gtester-report',
|
||||
|
|
@ -106,10 +106,10 @@ index 1e6dc36be..6b5de6c86 100644
|
|||
configuration: report_conf,
|
||||
install_mode: 'rwxr-xr-x'
|
||||
diff --git a/gobject/meson.build b/gobject/meson.build
|
||||
index a994eb591..36b36b925 100644
|
||||
index 2129aaf8a..da8462428 100644
|
||||
--- a/gobject/meson.build
|
||||
+++ b/gobject/meson.build
|
||||
@@ -79,7 +79,7 @@ foreach tool: python_tools
|
||||
@@ -94,7 +94,7 @@ foreach tool: python_tools
|
||||
input : tool + '.in',
|
||||
output : tool,
|
||||
configuration : python_tools_conf,
|
||||
|
|
@ -118,32 +118,32 @@ index a994eb591..36b36b925 100644
|
|||
install_tag : 'bin-devel',
|
||||
)
|
||||
|
||||
@@ -155,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
|
||||
@@ -172,6 +172,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
|
||||
|
||||
executable('gobject-query', 'gobject-query.c',
|
||||
gobject_query = executable('gobject-query', 'gobject-query.c',
|
||||
install : true,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
dependencies : [libglib_dep, libgobject_dep])
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f13cbfdd5..f218db581 100644
|
||||
index 517d5757c..198cc1b3c 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -3,6 +3,11 @@ option('runtime_libdir',
|
||||
value : '',
|
||||
description : 'install runtime libraries relative to libdir')
|
||||
@@ -4,6 +4,11 @@ option('runtime_libdir',
|
||||
description : 'install runtime libraries relative to libdir',
|
||||
deprecated: true)
|
||||
|
||||
+option('devbindir',
|
||||
+ type : 'string',
|
||||
+ value : '',
|
||||
+ description : 'bindir for development tools')
|
||||
+
|
||||
option('iconv',
|
||||
type : 'combo',
|
||||
choices : ['auto', 'libc', 'external'],
|
||||
option('charsetalias_dir',
|
||||
type : 'string',
|
||||
value : '',
|
||||
diff --git a/tools/meson.build b/tools/meson.build
|
||||
index 0542fb89b..bfb10cd80 100644
|
||||
index 2d4192e46..d7e710d6f 100644
|
||||
--- a/tools/meson.build
|
||||
+++ b/tools/meson.build
|
||||
@@ -8,7 +8,7 @@ if have_sh
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glibmm";
|
||||
version = "2.74.0";
|
||||
version = "2.76.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-K0cmlsuseduOQFckEY7JRSGcW5sYr2PcjPt/HYmw8fo=";
|
||||
sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glibmm";
|
||||
version = "2.66.5";
|
||||
version = "2.66.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ezhGYt1uw7hsBXAzHTKvBdsr2Zp5FgK3Z7SgslZuwUk=";
|
||||
sha256 = "sha256-U1h0JZgYHlNR17+NoHK/k+bdXxeNJ2QNTkYryPFOFS8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "43.2";
|
||||
version = "44.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-oLmrINKKY99s5+keq7Xjr4ZjC/UitaiZfASXG9VR1zA=";
|
||||
sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -32,17 +32,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.46.0";
|
||||
version = "3.48.0";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-online-accounts";
|
||||
rev = version;
|
||||
sha256 = "sha256-qVd55fmhY05zJ871OWc3hd1eWjYbYJuxlE/T2i3VCUA=";
|
||||
sha256 = "sha256-USl0Qay9pSgbbp3n/L8eBaRQwaBYledht5j+afmo++o=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gobject-introspection";
|
||||
version = "1.74.0";
|
||||
version = "1.76.1";
|
||||
|
||||
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
|
||||
# by pygobject3 (and maybe others), but it's only searched in $out
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "NHs6cZ5oukxp/y1X7iaJIz6owH/EkiBeVzOGd55C1lM=";
|
||||
sha256 = "GWF4v2Q0VQHc3E2EabNqpv6ASJNU7+cct8uKuCo3OL8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, libsoup_3
|
||||
, gnome
|
||||
, libxml2
|
||||
, lua5_3
|
||||
, lua5_4
|
||||
, liboauth
|
||||
, libgdata
|
||||
, libmediaart
|
||||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grilo-plugins";
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "hRjD2VT5MJXZVWJKBEzhanNFUy+BHSmdv6HhFM/rqzM=";
|
||||
sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
grilo
|
||||
libxml2
|
||||
# libgdata
|
||||
lua5_3
|
||||
lua5_4
|
||||
liboauth
|
||||
sqlite
|
||||
gnome-online-accounts
|
||||
|
|
|
|||
|
|
@ -7,18 +7,17 @@
|
|||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
# just for passthru
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsettings-desktop-schemas";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "XVVoKCqzi5V1nUJUAfdHblb4y/JimIVYdDn0O9C4S74=";
|
||||
sha256 = "6y3kXK2QWZSEnmQqYjret11BshsGJtQNKge46igf7A4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -28,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
@ -37,11 +35,6 @@ stdenv.mkDerivation rec {
|
|||
(lib.mesonBool "introspection" withIntrospection)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/post-install.py
|
||||
patchShebangs build-aux/meson/post-install.py
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-frdp";
|
||||
version = "unstable-2022-04-11";
|
||||
version = "unstable-2023-03-03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "d7f408fb23adc01db14c708b35b74a317418de4b";
|
||||
sha256 = "EyReJX3f7G5+EEB/gbLTnrxdltedbzm7Bg02hCb+XO0=";
|
||||
rev = "3f991a22c025cad3016a7aa55988e51884964050";
|
||||
sha256 = "jzum4/iU1oSr5t/IrSOLFyZcj38VIL7ooIbfoJZhk+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater {
|
||||
branch = "gtk-frdp-0-1";
|
||||
};
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtk+3";
|
||||
version = "3.24.36";
|
||||
version = "3.24.37";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
|
||||
outputBin = "dev";
|
||||
|
|
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) version;
|
||||
in fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
|
||||
sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE=";
|
||||
sha256 = "sha256-Z0XwtMBTeUFR/Q8OJHSwd8zP9fg+ndG/PTn+n+X7f1c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk4";
|
||||
version = "4.8.3";
|
||||
version = "4.10.1";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
|
||||
sha256 = "s2L5aNCFtNPZNA1NOMcGN33tnVN05pSitrfmKS48unQ=";
|
||||
sha256 = "6PysBLx3FbnaZnyRGl7o8mLiANHWpQrfI2RcqM/NAxE=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkmm";
|
||||
version = "4.8.0";
|
||||
version = "4.10.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "yCeG1G4rBzRrY5fKfxkp2VL0ki+lyds97ghJi5oTbPU=";
|
||||
sha256 = "4bEJdxVX7MU8upFagLbt6Cf/29AEnGL9+L1/p5r8xus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -25,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtksourceview";
|
||||
version = "5.6.2";
|
||||
version = "5.8.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc=";
|
||||
sha256 = "EQ3Uwg3vIYhvv3dymP4O+Mwq1gI7jzbHQkQRpBSBiTM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -41,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
|
||||
# Since this is not generally true with Nix, let’s add $out/share unconditionally.
|
||||
./4.x-nix_share_path.patch
|
||||
|
||||
# Add Nix syntax highlighting.
|
||||
# https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/303
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/2cc7fd079f9fc8b593c727c68a2c783c82299562.patch";
|
||||
sha256 = "bTYWjEDpdbnUxcYNKl2YtSLfYlMfcbQSSYQjhixOGS8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -86,13 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295
|
||||
# build: drop unnecessary vapigen check
|
||||
substituteInPlace meson.build \
|
||||
--replace "if generate_vapi" "if false"
|
||||
'';
|
||||
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvfs";
|
||||
version = "1.50.3";
|
||||
version = "1.50.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0=";
|
||||
sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonrpc-glib";
|
||||
version = "3.42.0";
|
||||
version = "3.44.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "IhmJpXyoKhJGfcQngizXZRsMrQOBQMkxAnvxB0IIJ2s=";
|
||||
sha256 = "aUBqAlDQzFF1QIyufsqAwMa/rvxK4YMLNUwEM7zVzgY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libadwaita";
|
||||
version = "1.2.3";
|
||||
version = "1.3.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = version;
|
||||
hash = "sha256-m69TpXCs6QpVrN+6auig71ik+HvVprHi0OnlyDwTL7U=";
|
||||
hash = "sha256-RIJtlSBZX4+rMOGQaFn31CCEKkWtPjtzO4fcX+iApvs=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue