diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a1af41f0d0541..ef8a4be975b0c 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -70,6 +70,8 @@ - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). +- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`. + - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 10d197d5fe784..d4fec082680c3 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -92,7 +92,15 @@ async def attr_instantiation_worker( ) -> tuple[Path, str]: async with semaphore: eprint(f"Instantiating {attr_path}…") - return (await nix_instantiate(attr_path), attr_path) + try: + return (await nix_instantiate(attr_path), attr_path) + except Exception as e: + # Failure should normally terminate the script but + # looks like Python is buggy so we need to do it ourselves. + eprint(f"Failed to instantiate {attr_path}") + if e.stderr: + eprint(e.stderr.decode("utf-8")) + sys.exit(1) async def requisites_worker( @@ -296,7 +304,7 @@ async def commit_changes( # Git can only handle a single index operation at a time async with merge_lock: await check_subprocess_output("git", "add", *change["files"], cwd=worktree) - commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change) + commit_message = "{attrPath}: {oldVersion} → {newVersion}".format(**change) if "commitMessage" in change: commit_message = change["commitMessage"] elif "commitBody" in change: diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index f7c639b627a02..75ac3bae4be37 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -9,7 +9,7 @@ let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. - . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh + . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh ''; in diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e8cd0f7e7c940..b9bc216ef7f29 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -560,6 +560,7 @@ ./services/desktops/gnome/gnome-online-miners.nix ./services/desktops/gnome/gnome-remote-desktop.nix ./services/desktops/gnome/gnome-settings-daemon.nix + ./services/desktops/gnome/gnome-software.nix ./services/desktops/gnome/gnome-user-share.nix ./services/desktops/gnome/localsearch.nix ./services/desktops/gnome/rygel.nix diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 3fe205498bfe6..8f6420ab1f921 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -20,6 +20,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; systemd.services.display-manager = lib.mkIf config.services.displayManager.enable { path = [ cfg.package ]; }; diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 39ae0d93451c5..46732b3829620 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -444,38 +444,31 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst (lib.mkIf serviceCfg.core-apps.enable { - environment.systemPackages = utils.removePackagesByName ( - [ - pkgs.baobab - pkgs.decibels - pkgs.epiphany - pkgs.gnome-text-editor - pkgs.gnome-calculator - pkgs.gnome-calendar - pkgs.gnome-characters - pkgs.gnome-clocks - pkgs.gnome-console - pkgs.gnome-contacts - pkgs.gnome-font-viewer - pkgs.gnome-logs - pkgs.gnome-maps - pkgs.gnome-music - pkgs.gnome-system-monitor - pkgs.gnome-weather - pkgs.loupe - pkgs.nautilus - pkgs.gnome-connections - pkgs.simple-scan - pkgs.snapshot - pkgs.totem - pkgs.yelp - ] - ++ lib.optionals config.services.flatpak.enable [ - # Since PackageKit Nix support is not there yet, - # only install gnome-software if flatpak is enabled. - pkgs.gnome-software - ] - ) config.environment.gnome.excludePackages; + environment.systemPackages = utils.removePackagesByName [ + pkgs.baobab + pkgs.decibels + pkgs.epiphany + pkgs.gnome-text-editor + pkgs.gnome-calculator + pkgs.gnome-calendar + pkgs.gnome-characters + pkgs.gnome-clocks + pkgs.gnome-console + pkgs.gnome-contacts + pkgs.gnome-font-viewer + pkgs.gnome-logs + pkgs.gnome-maps + pkgs.gnome-music + pkgs.gnome-system-monitor + pkgs.gnome-weather + pkgs.loupe + pkgs.nautilus + pkgs.gnome-connections + pkgs.simple-scan + pkgs.snapshot + pkgs.totem + pkgs.yelp + ] config.environment.gnome.excludePackages; # Enable default program modules # Since some of these have a corresponding package, we only @@ -488,6 +481,12 @@ in programs.seahorse.enable = notExcluded pkgs.seahorse; services.gnome.sushi.enable = notExcluded pkgs.sushi; + # Since PackageKit Nix support is not there yet, + # only install gnome-software if flatpak is enabled. + services.gnome.gnome-software.enable = lib.mkIf config.services.flatpak.enable ( + notExcluded pkgs.gnome-software + ); + # VTE shell integration for gnome-console programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index e0241f02b9699..f12113251d6af 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -78,8 +78,10 @@ in systemd.user.targets."gnome-session".wants = [ "gnome-initial-setup-copy-worker.service" + ]; + + systemd.user.targets."graphical-session-pre".wants = [ "gnome-initial-setup-first-login.service" - "gnome-welcome-tour.service" ]; systemd.user.targets."gnome-session@gnome-initial-setup".wants = [ @@ -89,6 +91,11 @@ in programs.dconf.profiles.gnome-initial-setup.databases = [ "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults" ]; + + users = { + # TODO: switch to using provided gnome-initial-setup sysusers.d + groups.gnome-initial-setup = { }; + }; }; } diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix new file mode 100644 index 0000000000000..ced2549a9e212 --- /dev/null +++ b/nixos/modules/services/desktops/gnome/gnome-software.nix @@ -0,0 +1,28 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + meta = { + maintainers = lib.teams.gnome.members; + }; + + options = { + services.gnome.gnome-software = { + enable = lib.mkEnableOption "GNOME Software, package manager for GNOME"; + }; + }; + + config = lib.mkIf config.services.gnome.gnome-software.enable { + environment.systemPackages = [ + pkgs.gnome-software + ]; + + systemd.packages = [ + pkgs.gnome-software + ]; + }; +} diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index bdf1822c48162..2d130abd2a341 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -348,15 +348,15 @@ in # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { gdm-launch-environment.text = '' - auth required pam_succeed_if.so audit quiet_success user = gdm + auth required pam_succeed_if.so audit quiet_success user ingroup gdm auth optional pam_permit.so - account required pam_succeed_if.so audit quiet_success user = gdm + account required pam_succeed_if.so audit quiet_success user ingroup gdm account sufficient pam_unix.so password required pam_deny.so - session required pam_succeed_if.so audit quiet_success user = gdm + session required pam_succeed_if.so audit quiet_success user ingroup gdm session required pam_env.so conffile=/etc/pam/environment readenv=0 session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index a6c40f6a9ab40..fccaf8927f882 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -42,13 +42,7 @@ in '' with subtest("Wait for login"): - # wait_for_x() checks graphical-session.target, which is expected to be - # inactive on Budgie before Budgie manages user session with systemd. - # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16 - # - # Previously this was unconditionally touched by xsessionWrapper but was - # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP). - # machine.wait_for_x() + machine.wait_for_x() machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"') machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") @@ -57,8 +51,9 @@ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Budgie session components actually start"): - for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]: + machine.wait_until_succeeds(f"pgrep {i}") + machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view") # We don't check xwininfo for budgie-wm. # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754 machine.wait_for_window("budgie-daemon") @@ -66,7 +61,7 @@ with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ" - machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'") + machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'") machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'") # From the nixos/budgie module machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'") diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 6df6e621995e2..7ab5b20cada52 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -40,7 +40,7 @@ '' with subtest("Login to GNOME Flashback with GDM"): machine.wait_for_x() - machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') + machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"') # Wait for alice to be logged in" machine.wait_for_unit("default.target", "${user.name}") machine.wait_for_file("${xauthority}") diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 855d0f48f80c0..f68cb3c706df3 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -54,7 +54,7 @@ machine.wait_for_x() machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") - machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') + machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"') with subtest("Check that logging in has given the user ownership of devices"): machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 6213da291bd80..8d47ad48b5937 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.56.2"; + version = "3.57.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys="; + hash = "sha256-OY+r52ym2qkAT5I8KfGpdGldHcTvcpPfefefsXNOIrk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix index b47d77a853343..1512f1b9ba5fb 100644 --- a/pkgs/by-name/ad/adwaita-fonts/package.nix +++ b/pkgs/by-name/ad/adwaita-fonts/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adwaita-fonts"; - version = "48.2"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz"; - hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A="; + hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter"; homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.ofl; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.qxrein ]; teams = [ lib.teams.gnome ]; diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index c4fe4a7e27aea..6567edaa5ba4b 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; - hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ="; + hash = "sha256-brZ8IqXmAYYcwGfMBQWhvfOSm6W3Rl9Az25N2R2eTR0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 461d2002ddf77..89a99a63ce765 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -12,6 +12,7 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, gsettings-desktop-schemas, makeWrapper, + python3, dbus, glib, dconf, @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.56.2"; + version = "2.57.2"; outputs = [ "out" @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs="; + hash = "sha256-o4aSqsF09zt3SsYLp5XAwMYLpW1BNLag7APmSBZ0xgo="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ninja pkg-config makeWrapper + python3 ] ++ lib.optionals withIntrospection [ gobject-introspection diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index b638f9246ba0a..72e426f90db83 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -70,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-control-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; + hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk="; }; patches = [ diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 71957c7f352a2..78ab0acaa191b 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, accountsservice, alsa-lib, budgie-screensaver, @@ -19,10 +18,12 @@ libcanberra-gtk3, libgee, libGL, + libgudev, libnotify, libpeas, libpulseaudio, libuuid, + libwacom, libwnck, magpie, libgbm, @@ -35,6 +36,7 @@ polkit, sassc, testers, + udev, upower, vala, validatePkgConfig, @@ -45,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.2"; + version = "10.9.3"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo="; + hash = "sha256-hiDEsDV/meYMORZ4aSPD7UP28SQVcv6cM7N89fOZeT8="; }; outputs = [ @@ -63,27 +65,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./plugins.patch - - # Adapt to libxfce4windowing v4.19.8 - # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch"; - hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE="; - }) - - # Resolve vala 0.56.18 compact class inheritance removal - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch"; - hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws="; - }) - - # Add override for overlay-key to prevent crash with mutter-common v48-rc - # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch"; - hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0="; - }) ]; nativeBuildInputs = [ @@ -115,14 +96,17 @@ stdenv.mkDerivation (finalAttrs: { libcanberra-gtk3 libgee libGL + libgudev libnotify libpulseaudio libuuid + libwacom libwnck magpie libgbm polkit sassc + udev upower xfce.libxfce4windowing ]; @@ -132,6 +116,12 @@ stdenv.mkDerivation (finalAttrs: { libpeas ]; + mesonFlags = [ + # FIXME: The meson option name is confusing + # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/739#discussion_r2359421711 + "-Dbsd-libexecdir=${gnome-settings-daemon}/libexec" + ]; + passthru = { providedSessions = [ "budgie-desktop" ]; diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix index 0e10ba9b654e0..c4a8073685f60 100644 --- a/pkgs/by-name/ca/cambalache/package.nix +++ b/pkgs/by-name/ca/cambalache/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.94.1"; + version = "0.97.7"; pyproject = false; # Did not fetch submodule since it is only for tests we don't run. @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = "cambalache"; tag = version; - hash = "sha256-dX9YiBCBG/ALWX0W1CjvdUlOCQ6UulnQCiYUscRMKWk="; + hash = "sha256-AV4HvRw4OSvJ+D3oN1X9ewllEyjGQ4uWIBcgY/niO1c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 49eb2b4f121ce..067c231fff0e9 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, desktop-file-utils, meson, ninja, @@ -23,20 +22,14 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "45.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; - hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; + hash = "sha256-IvI9WgT0+/3gq3nWlhrprFURX+ttoXgl/4y0tr0rbnU="; }; patches = [ - # Fix crash with GSETTINGS_SCHEMA_DIR env var. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch"; - hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ="; - }) - # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR # environment variable, to match what we patched GLib to do. ./schema-override-variable.patch diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index 2f5cbe602e998..c8267e7d9f2e7 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + blueprint-compiler, meson, ninja, gettext, @@ -25,6 +26,7 @@ gcr_4, isocodes, desktop-file-utils, + docutils, nettle, gdk-pixbuf, gst_all_1, @@ -37,15 +39,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "48.5"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ="; + hash = "sha256-TnUAK4bqFGaYEBvIYgTIrSivMZ5jOKwV4m/1wznx5JQ="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils + docutils # for rst2man gettext itstool meson diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 62eae627efd75..27111ebdde55b 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 5e65ec8..2cae29d 100644 +index c31f3ef..9ebb5f2 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index 5e65ec8..2cae29d 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client, +@@ -1994,7 +2005,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 5e65ec8..2cae29d 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact) +@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index a9b68e3..6a13b1b 100644 +index 9d986d2..d63902a 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c -@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry, +@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry, return FALSE; } @@ -89,7 +89,7 @@ index a9b68e3..6a13b1b 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book, +@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book, g_return_val_if_fail (E_IS_BOOK (book), FALSE); g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -109,7 +109,7 @@ index a9b68e3..6a13b1b 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact) +@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact) g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -130,10 +130,10 @@ index a9b68e3..6a13b1b 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 752f83f..eaa3dad 100644 +index 2a95a75..950f430 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void) +@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -178,10 +178,10 @@ index 9f8646a..079aba9 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c -index 2525856..7ecc1a8 100644 +index 6318854..6b7a88c 100644 --- a/src/calendar/backends/file/e-cal-backend-file.c +++ b/src/calendar/backends/file/e-cal-backend-file.c -@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, +@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, if (is_declined) { GSettings *settings; @@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 026ae80..e3003c2 100644 +index 92d68e2..d1e1fa4 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -244,10 +244,10 @@ index 026ae80..e3003c2 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 84ccbb0..9010429 100644 +index df89788..4a1ebd0 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void) +@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -267,7 +267,7 @@ index 84ccbb0..9010429 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -290,10 +290,10 @@ index 84ccbb0..9010429 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index d00fbd5..0f67653 100644 +index 03b5129..3f4256a 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void) +@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -314,10 +314,10 @@ index d00fbd5..0f67653 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 4594ab1..e71ce05 100644 +index c5ac40f..fb8ae19 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void) +@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -338,10 +338,10 @@ index 4594ab1..e71ce05 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index 0c1c7dd..4188934 100644 +index 2c0b6ef..b354332 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c -@@ -361,7 +361,19 @@ void +@@ -363,7 +363,19 @@ void _camel_utils_initialize (void) { G_LOCK (mi_user_headers); @@ -363,10 +363,10 @@ index 0c1c7dd..4188934 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 8cf56f0..f4355d5 100644 +index d567e04..6b929b7 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644 g_clear_object (&settings); diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index 188f276..939f89b 100644 +index e9cb145..8fc30d5 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c -@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object) +@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object) /* Chain up to parent's method. */ G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); @@ -531,10 +531,10 @@ index db775f9..fb524db 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 1539f8b..77cf123 100644 +index bd9822d..3e021dd 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index b47a374..e812fbe 100644 +index 02dcd6e..5dfa7ac 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1985,7 +1985,19 @@ static void +@@ -2132,7 +2132,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 3a29f92c0c2a8..4c6c0061bb715 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.56.2"; + version = "3.57.3"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw="; + hash = "sha256-FkMu42rxildzbAfT/uwhi7peVUSk3EN/yhHiMQhsjLc="; }; patches = [ diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 9737a14c701d2..5614864fee193 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -15,6 +15,7 @@ gtksourceview5, lcms2, libadwaita, + libglycin, gst_all_1, desktop-file-utils, appstream-glib, @@ -56,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { # We should eventually use a cargo vendor patch hook instead preConfigure = '' pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index 93763ce5ff094..bd4e92e4aadb1 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,7 +1,8 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c +index 513b9733d..0c1c8007f 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { +@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration { const char *session_type; } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT @@ -15,10 +16,10 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto { NULL, NULL, NULL }, }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index fc5aef6ac..c61e0046b 100644 +index 9568e963f..b1bc8800a 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -151,7 +151,7 @@ plymouth_is_running (void) +@@ -154,7 +154,7 @@ plymouth_is_running (void) GError *error; error = NULL; @@ -27,7 +28,7 @@ index fc5aef6ac..c61e0046b 100644 NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void) +@@ -172,7 +172,7 @@ plymouth_prepare_for_transition (void) GError *error; error = NULL; @@ -36,7 +37,7 @@ index fc5aef6ac..c61e0046b 100644 NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void) +@@ -187,7 +187,7 @@ plymouth_quit_with_transition (void) GError *error; error = NULL; @@ -45,7 +46,7 @@ index fc5aef6ac..c61e0046b 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void) +@@ -203,7 +203,7 @@ plymouth_quit_without_transition (void) GError *error; error = NULL; @@ -54,30 +55,32 @@ index fc5aef6ac..c61e0046b 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index a4c4b2dcf..67416b204 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self, - */ - if (run_launcher) { - if (is_x11) { -- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } else { -- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } - } else { -- program = g_strdup_printf ("dbus-run-session -- %s", -+ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s", - self->selected_program); - } - } +diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c +index d0404d2c1..e916c2723 100644 +--- a/daemon/gdm-wayland-session.c ++++ b/daemon/gdm-wayland-session.c +@@ -136,7 +136,7 @@ spawn_bus (State *state, + + bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO); + +- g_ptr_array_add (arguments, "dbus-daemon"); ++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon"); + + g_ptr_array_add (arguments, "--print-address"); + g_ptr_array_add (arguments, bus_address_fd_string); +diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c +index a998d1555..4fe50a2d0 100644 +--- a/daemon/gdm-x-session.c ++++ b/daemon/gdm-x-session.c +@@ -463,7 +463,7 @@ spawn_bus (State *state, + + bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO); + +- g_ptr_array_add (arguments, "dbus-daemon"); ++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon"); + + g_ptr_array_add (arguments, "--print-address"); + g_ptr_array_add (arguments, bus_address_fd_string); diff --git a/data/gdm.service.in b/data/gdm.service.in index 17e8a8de8..afc709778 100644 --- a/data/gdm.service.in diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 9145153e384a3..f0dac1b799446 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8="; + hash = "sha256-vQdduV2RbiXRhk/n0RSY8YpSiiMYDU4jotXwukRgyBY="; }; mesonFlags = [ diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index a92b7a771e5bc..e1aeacd674dc8 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "48.0"; + version = "48.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg="; + hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index b1e6d687cd78c..1ff554f2f4a50 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2025.3"; + version = "2025.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg="; + hash = "sha256-Zshl1Fn+vfteQHiojfBhg2IMPpH3JtHcYI2I7jYFUm4="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch index 1c438dd6b4019..d597f99b02d81 100644 --- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch +++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch @@ -2,7 +2,7 @@ diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build index 07759690..43c87c59 100644 --- a/installed-tests/js/meson.build +++ b/installed-tests/js/meson.build -@@ -123,7 +123,6 @@ jasmine_tests = [ +@@ -34,7 +34,6 @@ jasmine_tests = [ 'GTypeClass', 'Importer', 'Importer2', diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch index 5ca5372ea9470..99e82c9be3dc2 100644 --- a/pkgs/by-name/gj/gjs/fix-paths.patch +++ b/pkgs/by-name/gj/gjs/fix-paths.patch @@ -2,7 +2,7 @@ diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh index 0d118490..54c5507e 100755 --- a/installed-tests/debugger-test.sh +++ b/installed-tests/debugger-test.sh -@@ -3,7 +3,7 @@ +@@ -6,7 +6,7 @@ if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then gjs="$TOP_BUILDDIR/gjs-console" else diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch index aa1510f5807b1..403a9c372d4ed 100644 --- a/pkgs/by-name/gj/gjs/installed-tests-path.patch +++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch @@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644 ], include_directories: top_include, install: get_option('installed_tests'), install_dir: installed_tests_execdir) -@@ -82,7 +82,7 @@ foreach test : jasmine_tests +@@ -90,7 +90,7 @@ foreach test : jasmine_tests test_description_subst = { 'name': 'test@0@.js'.format(test), @@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644 } configure_file(configuration: test_description_subst, input: '../minijasmine.test.in', -@@ -125,7 +125,7 @@ foreach test : dbus_tests +@@ -122,7 +122,7 @@ foreach test : dbus_tests - dbus_test_description_subst = { - 'name': 'test@0@.js'.format(test), -- 'installed_tests_execdir': prefix / installed_tests_execdir, -+ 'installed_tests_execdir': installed_tests_execdir, - } - configure_file( - configuration: dbus_test_description_subst, -@@ -163,7 +163,7 @@ foreach test : modules_tests + dbus_test_description_subst = { + 'name': 'testGDBus.js', +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file( + configuration: dbus_test_description_subst, +@@ -159,7 +159,7 @@ foreach test : modules_tests esm_test_description_subst = { 'name': 'test@0@.js'.format(test), @@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build index 7a7c48ab..52508c2c 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build -@@ -30,7 +30,7 @@ foreach test : simple_tests +@@ -34,7 +34,7 @@ foreach test : simple_tests test_description_subst = { 'name': 'test@0@.sh'.format(test), @@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644 } configure_file(configuration: test_description_subst, input: 'script.test.in', output: 'test@0@.sh.test'.format(test), -@@ -85,7 +85,7 @@ foreach test : debugger_tests +@@ -123,7 +123,7 @@ foreach test : debugger_tests test_description_subst = { 'name': '@0@.debugger'.format(test), diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 691575c5a93c3..5fce2da6f296d 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch, lib, stdenv, meson, @@ -11,7 +12,7 @@ gtk4, atk, gobject-introspection, - spidermonkey_128, + spidermonkey_140, pango, cairo, readline, @@ -41,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.84.2"; + version = "1.85.90"; outputs = [ "out" @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY="; + hash = "sha256-tFVADxNLEs3MtPO92yPMZOqxlY0cn0hLsKQlk/t4MmU="; }; patches = [ @@ -64,6 +65,20 @@ stdenv.mkDerivation (finalAttrs: { # Disable introspection test in installed tests # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1) ./disable-introspection-test.patch + + # Fix gjs:JS / Package test + # https://gitlab.gnome.org/GNOME/gjs/-/issues/711 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/054f78c756b631c347c6f64ab5b7349331f5f420.patch"; + hash = "sha256-gnOD+WU+JTzetnyGyGJKQZbaLX22yZuBhCmhJd2Hha8="; + }) + + # Fix gjs:Scripts / Gtk4Warnings test + # https://gitlab.gnome.org/GNOME/gjs/-/issues/712 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/48b00ae16d97ae213dbaef6dee8ffd56e1667a64.patch"; + hash = "sha256-u7P/dV9mtx3AldrnbDhGGMVQ61GmD54TXFhS4FRh4yc="; + }) ]; nativeBuildInputs = [ @@ -84,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { cairo readline libsysprof-capture - spidermonkey_128 + spidermonkey_140 ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 763bb75f69560..91ef5d200fc9b 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.84.3"; + version = "2.86.0"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-qk+HwyJb9XyoXzIIiPdISQGheTTKNwI8O9hDWnLbhj4="; + hash = "sha256-tXOZctc3z7DW/R5/Fj3+ZQ4uA3QLs7jUCOTR+upYDW0="; }; patches = diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index a3588b6628a90..eff817762f033 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -25,22 +25,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.2.3"; + version = "2.0.rc"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw="; + hash = "sha256-mkREIVtD1b2YUyW0CK4lC0S4Arb/SeGvCCXXAAi5Zz8="; }; - patches = [ - # Fix paths in glycin library. - # Not actually needed for this package since we are only building loaders - # and this patch is relevant just to apps that use the loaders - # but apply it here to ensure the patch continues to apply. - finalAttrs.passthru.glycinPathsPatch - ]; - - cargoVendorDir = "vendor"; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "glycin-loaders-deps-${finalAttrs.version}"; + hash = "sha256-omxOAZggqBzMKKg6NP8BnjnGwqIkn0fbOI3Vfwa+j1A="; + dontConfigure = true; + }; nativeBuildInputs = [ cargo @@ -66,14 +63,16 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dglycin-loaders=true" + "-Dglycin-thumbnailer=false" "-Dlibglycin=false" + "-Dlibglycin-gtk4=false" "-Dvapi=false" ]; strictDeps = true; postPatch = '' - substituteInPlace loaders/meson.build \ + substituteInPlace glycin-loaders/meson.build \ --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader," ''; @@ -84,10 +83,6 @@ stdenv.mkDerivation (finalAttrs: { attrPath = "glycin-loaders"; packageName = "glycin"; }; - - glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { - bwrap = "${bubblewrap}/bin/bwrap"; - }; }; meta = with lib; { diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 849131c3ee53b..46aff72db6c65 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "48.2.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk="; + hash = "sha256-UkrZIO0U1sQs9h7LcyLg+RMoMMy5+F0jgGjzntIewaA="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index a5bc86e04ea07..1ab7e42b5733c 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "48.0"; + version = "49.rc.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; - hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0="; + hash = "sha256-/cqOCR8CtSC+R7Y7kVhFV/GCWWb2jjnqTqsl6FxET8U="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index d8b3287f780aa..0aff4c67bf56c 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -24,6 +24,7 @@ libspelling, libsysprof-capture, libxml2, + libyaml, meson, ninja, ostree, @@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "48.2"; + version = "49.rc"; outputs = [ "out" @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM="; + hash = "sha256-sCw6Y5wRcvnAR1qZE8STqEvqmowcW44krHa5pfQKYa8="; }; patches = [ @@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { libspelling libsysprof-capture libxml2 + libyaml ostree pcre2 python3 diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index f0e5454cd4dcc..2c9a96e7199df 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -2,6 +2,7 @@ stdenv, lib, appstream, + blueprint-compiler, meson, ninja, vala, @@ -26,15 +27,16 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI="; + hash = "sha256-C6zLYVCfc/Kp+MiUUNzywyAdcvXWjWk77lGZRdgeo4A="; }; nativeBuildInputs = [ appstream + blueprint-compiler meson ninja pkg-config diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index b457a6c1b67de..c071e94830cce 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + blueprint-compiler, meson, ninja, pkg-config, @@ -22,14 +23,15 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; - hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI="; + hash = "sha256-gOLNpazuDytcfiFmY0+1nv5zTtmD375cU/AbEIiAHzI="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index 73d26f0c44cc6..e1ed636137919 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE="; + hash = "sha256-hPOWE1KkI0DlZ4oQig8D6Fs7YQRA5dVCL8WNucKPwEM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index 9c0fb5f950bd5..d23311b609688 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "48.0"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; - hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8="; + hash = "sha256-QDST8Bbpkn1/nFR3O7ydCpNB8+751DF7Re3AqwoiyI8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 7213e140b8945..9e120fd0e6828 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -17,16 +17,18 @@ libxml2, gtk-vnc, gtk-frdp, + spice-gtk, + spice-protocol, gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-connections"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz"; - hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A="; + hash = "sha256-Y+lApq2dV+K/vIJo0IHglrKWajGrzhAS86+S8HcrJwM="; }; nativeBuildInputs = [ @@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { libsecret libxml2 gtk-frdp + spice-gtk + spice-protocol ]; passthru = { diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index ead44457a72e2..54c1887035a98 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + appstream, gettext, gnome, libgtop, @@ -20,14 +21,15 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "48.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk="; + hash = "sha256-+TP+13m/fP2HPZ93NfZwSdXyEhWlRGiMGuO+ULGQZsk="; }; nativeBuildInputs = [ + appstream desktop-file-utils gettext meson diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index 6addc8e84af30..2e5347038a749 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -3,6 +3,7 @@ stdenv, gettext, fetchurl, + blueprint-compiler, evolution-data-server-gtk4, pkg-config, libxslt, @@ -29,14 +30,15 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "48.0"; + version = "49.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; - hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU="; + hash = "sha256-miIJ8lAH3GpJ2IbcFkCJhgjynaWY1SOgC0zfjbP5dNY="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 2d57107162770..b5687fad96ac0 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -5,6 +5,7 @@ replaceVars, accountsservice, adwaita-icon-theme, + blueprint-compiler, colord, colord-gtk4, cups, @@ -42,7 +43,6 @@ libsecret, libsoup_3, libwacom, - libXi, libxml2, libxslt, meson, @@ -75,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "48.4"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-KiDu5uBcjTrdru+lJNzh7p+Ip32Djj/R7e88DC5GetI="; + hash = "sha256-DL9Y5KD9UVdB83b0NHFd52R9mz2QrwhvksOrt4liIkI="; }; patches = [ @@ -91,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + blueprint-compiler docbook-xsl-nons gettext libxslt @@ -138,7 +139,6 @@ stdenv.mkDerivation (finalAttrs: { libsecret libsoup_3 libwacom - libXi libxml2 modemmanager mutter # schemas for the keybindings diff --git a/pkgs/by-name/gn/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch index 41dd5979aa4bc..87d8f737ba438 100644 --- a/pkgs/by-name/gn/gnome-control-center/paths.patch +++ b/pkgs/by-name/gn/gnome-control-center/paths.patch @@ -1,17 +1,8 @@ diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index f6c84e3d2..cd897f8f5 100644 +index dac0e51..71af3e2 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -614,7 +614,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *self) - - /* run with modal set */ - argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); -+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); - g_ptr_array_add (argv, g_strdup ("--device")); - g_ptr_array_add (argv, g_strdup (cd_device_get_id (self->current_device))); - g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -989,7 +989,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile) +@@ -973,7 +973,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); @@ -20,7 +11,7 @@ index f6c84e3d2..cd897f8f5 100644 g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1221,15 +1221,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device) +@@ -1141,15 +1141,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *self, CdProfile *profile, CdDevice *device) { @@ -38,7 +29,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h -index feef16580..4b88ef7b1 100644 +index feef165..4b88ef7 100644 --- a/panels/system/datetime/tz.h +++ b/panels/system/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,10 +46,10 @@ index feef16580..4b88ef7b1 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index ec5a905a5..689fdbebe 100644 +index f1cae8d..faee22a 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) +@@ -384,7 +384,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) GPid child_pid; builder = g_strv_builder_new (); @@ -68,7 +59,7 @@ index ec5a905a5..689fdbebe 100644 if (self->is_new_connection) { g_autofree gchar *type_str = NULL; diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 166670224..36f720d36 100644 +index d0b0206..8276af0 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c @@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) @@ -90,7 +81,7 @@ index 166670224..36f720d36 100644 } diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index a31a606e3..ed5133d29 100644 +index a31a606..ed5133d 100644 --- a/panels/printers/pp-host.c +++ b/panels/printers/pp-host.c @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, @@ -103,7 +94,7 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c -index edbc99830..1e1d90141 100644 +index fb9efc6..452486a 100644 --- a/panels/system/users/run-passwd.c +++ b/panels/system/users/run-passwd.c @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) @@ -116,10 +107,10 @@ index edbc99830..1e1d90141 100644 envp = g_get_environ (); diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c -index 5b7bc1f02..13ffe6ca8 100644 +index 16dc79e..f543e7b 100644 --- a/panels/system/users/user-utils.c +++ b/panels/system/users/user-utils.c -@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, +@@ -217,7 +217,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. */ @@ -129,7 +120,7 @@ index 5b7bc1f02..13ffe6ca8 100644 argv[2] = data->username; argv[3] = "--"; diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c -index 9cb92007a..84d2f0fa3 100644 +index 9cb9200..84d2f0f 100644 --- a/tests/datetime/test-endianess.c +++ b/tests/datetime/test-endianess.c @@ -26,7 +26,7 @@ test_endianess (void) diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 567f272183f13..722d0e70886f0 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-desktop"; - version = "44.3"; + version = "44.4"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40="; + sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 067bc0f82fdf4..fa5d039135187 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; - hash = "sha256-cyYkIxtiT/XHrAOoznG+Ejk9qlNVHRFVCyDXsKOocqc="; + hash = "sha256-G5UajKOMXX4UHb5kL2NRikmaJgmoEIcq4QV1m9RUCdA="; }; doCheck = true; diff --git a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch index f3cd9f6f04273..f429b4830144e 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch +++ b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch @@ -25,15 +25,6 @@ index 196abf6..613d0e5 100644 g_spawn_command_line_async (commandline, NULL); g_free (commandline); -@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass) - g_param_spec_string ("showing-extra", "", "", "", - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - -- signals[CHANGED] = -+ signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST, diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h index a2376f8..5cb7bc9 100644 --- a/gnome-initial-setup/pages/timezone/tz.h diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index bc0f06ce9ef84..2da96c9dd740f 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "48.1"; + version = "49.beta.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-s9q/fnm2Zf8SJB+9umFUiVE9iGIkdZmGr49IZXWSMV4="; + hash = "sha256-XfzEnnXQHV243xLRV7c8IE5ppsJ+agDjtUxyzD9lMmc="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix index 0e17038371b90..871de9db73c03 100644 --- a/pkgs/by-name/gn/gnome-keysign/package.nix +++ b/pkgs/by-name/gn/gnome-keysign/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitLab, + fetchpatch, python3, wrapGAppsHook3, gobject-introspection, @@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss="; }; + patches = [ + # Remove broken future dependency + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keysign/-/commit/ea197254baf70a499a371678369eda85aff7a4c5.patch"; + hash = "sha256-Msd0NzNAkoAAxZ/WNiM3xV382lnx+xT6gyQiNGDEMM8="; + }) + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -43,7 +52,6 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dbus-python - future gpgme magic-wormhole pygobject3 diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix index 61f978fcfcd76..0decabbe7d355 100644 --- a/pkgs/by-name/gn/gnome-logs/package.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "45.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz"; - hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI="; + hash = "sha256-FgqCL/N2Wgl6xFsbRSyGZajMJFQF1CH5/xZMk2q3hV4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index ddc8b0315e7f7..6fb601fa5638a 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-mahjongg"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz"; - hash = "sha256-3Ujg+BrKNL6tpGxdIhsyWRuO2B6dNhw6JY359rIiLIQ="; + hash = "sha256-Cv9a/PLHefyp51aXs7A4GWUdlCXLBsM6LMuMkurF5uA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-manuals/package.nix b/pkgs/by-name/gn/gnome-manuals/package.nix new file mode 100644 index 0000000000000..a2d24078c944a --- /dev/null +++ b/pkgs/by-name/gn/gnome-manuals/package.nix @@ -0,0 +1,70 @@ +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gnome, + gtk4, + wrapGAppsHook4, + glib, + gobject-introspection, + gi-docgen, + libadwaita, + libdex, + gom, + flatpak, + libfoundry, + libpanel, + webkitgtk_6_0, + desktop-file-utils, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-manuals"; + version = "49.0"; + + src = fetchurl { + url = "mirror://gnome/sources/manuals/${lib.versions.major finalAttrs.version}/manuals-${finalAttrs.version}.tar.xz"; + hash = "sha256-7WRGxMLSnCuQYrKoynJxzbrPx4z9tP3NDzvEjYyefwg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + desktop-file-utils + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libdex + gom + flatpak + libfoundry + libpanel + webkitgtk_6_0 + ]; + + strictDeps = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "manuals"; + }; + }; + + meta = { + description = "Tool for browsing documentation"; + mainProgram = "manuals"; + homepage = "https://apps.gnome.org/Manuals/"; + changelog = "https://gitlab.gnome.org/GNOME/manuals/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = lib.licenses.gpl3Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index a4cf70cbdf19b..10da5d27fb00f 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "48.6"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-OtqaMVUXWlGdQV8Ll9D+129PS+uLYCEqAXaXoyy+gaY="; + hash = "sha256-J9sX7hVDZkGdrXhUVjMptZNaDFhaPuRyZXdnjkN1qHM="; }; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix index 4ffe501953827..061b71374b7b5 100644 --- a/pkgs/by-name/gn/gnome-mines/package.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -14,18 +14,17 @@ gettext, itstool, libxml2, - libgnome-games-support_2_0, libgee, desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-mines"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz"; - hash = "sha256-70stLd477GFBV+3eTZGJzGr+aSlSot1VsocOLmLtgQQ="; + hash = "sha256-mPDYj+F1MyIgEATYYRnHVZXZO6mcNYLDgoO5rw+CdKg="; }; nativeBuildInputs = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita - libgnome-games-support_2_0 librsvg libgee ]; diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 50cb9d4058a72..89921c9ee44dc 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "48.1"; + version = "49.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4="; + hash = "sha256-Zy77vtztuK8rTrDPpUxIzNmyhldbq9ull03kBT3A/Sc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index b82651f754629..4b03ef123bf7f 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -14,7 +14,6 @@ libxml2, libadwaita, libgee, - libgnome-games-support_2_0, meson, ninja, desktop-file-utils, @@ -22,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.2.2"; + version = "4.4.rc2"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-Pkofm68cV7joNd7fCGnjJy5lNKHdacTib64QxCAKrwA="; + hash = "sha256-WPPpaRsSZAiR/ORYtl1GpEXaLrhcctwTeXLDKviPg7Q="; }; nativeBuildInputs = [ @@ -47,16 +46,8 @@ stdenv.mkDerivation (finalAttrs: { librsvg libadwaita libgee - libgnome-games-support_2_0 ]; - # The "we can link with libadwaita?" valac.links() check fails otherwise. - # Command line: `valac testfile.vala --pkg=libadwaita-1 --Xcc=-w --Xcc=-DVALA_STRICT_C` -> 1 - # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers' - # from incompatible pointer type [-Wincompatible-pointer-types] - # 50 | adw_about_dialog_set_developers (ad, s); - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-nibbles"; }; }; diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 8b40938372840..647806b0c82a9 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.54.5"; + version = "3.55.2"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-6PEntTIpWimRLRwAc0kx35r/pOv8RK0N5cKWw9J9LJU="; + hash = "sha256-kdAkhWw4AEwrL+b9rVoBh+aoBv8+HtIAILk0Dg1ICu8="; }; mesonFlags = [ diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix deleted file mode 100644 index b2e7461a3b6d6..0000000000000 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - fetchpatch, - meson, - ninja, - pkg-config, - desktop-file-utils, - gettext, - itstool, - python3, - wrapGAppsHook3, - gtk3, - glib, - libsoup_2_4, - gnome-online-accounts, - librest, - json-glib, - gnome-autoar, - gspell, - libcanberra, - nix-update-script, -}: - -stdenv.mkDerivation rec { - pname = "gnome-recipes"; - version = "2.0.4"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "recipes"; - rev = version; - fetchSubmodules = true; - sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw="; - }; - - patches = [ - # gcc-14 build failure fix - (fetchpatch { - name = "gcc-14.patch"; - url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch"; - hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - desktop-file-utils - gettext - itstool - python3 - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - glib - libsoup_2_4 - gnome-online-accounts - librest - json-glib - gnome-autoar - gspell - libcanberra - ]; - - postPatch = '' - chmod +x src/list_to_c.py - patchShebangs src/list_to_c.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Recipe management application for GNOME"; - mainProgram = "gnome-recipes"; - homepage = "https://gitlab.gnome.org/GNOME/recipes"; - teams = [ teams.gnome ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 7c2c8b80db4f7..8e3482e4158b7 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI="; + hash = "sha256-4CXGbr1Ju5VJFDbzexcg48bLMfl8VFaWaoWxPo4GxyY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 5aecef4ce1612..47282b471728d 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "47.0.1"; + version = "49.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "gnome-session-ctl"; rev = version; - hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ="; + hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch deleted file mode 100644 index 22f06ddfd2e80..0000000000000 --- a/pkgs/by-name/gn/gnome-session/fix-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index b4b1f8fa..99d52cba 100755 ---- a/gnome-session/gnome-session.in -+++ b/gnome-session/gnome-session.in -@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && - [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && - [ -n "$SHELL" ]; then - if [ "$1" != '-l' ]; then -- exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'" -+ # Make sure the shell actually sets up the environment. -+ unset __NIXOS_SET_ENVIRONMENT_DONE -+ exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'" - else - shift - fi - fi - --SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) -+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) - REGION=${SETTING#\'} - REGION=${REGION%\'} - -diff --git a/gnome-session/main.c b/gnome-session/main.c -index a460a849..9d07898f 100644 ---- a/gnome-session/main.c -+++ b/gnome-session/main.c -@@ -215,7 +215,7 @@ require_dbus_session (int argc, - } - new_argv[i + 2] = NULL; - -- if (!execvp ("dbus-launch", new_argv)) { -+ if (!execvp ("@dbusLaunch@", new_argv)) { - g_set_error (error, - G_SPAWN_ERROR, - G_SPAWN_ERROR_FAILED, diff --git a/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch new file mode 100644 index 0000000000000..50101ca681c17 --- /dev/null +++ b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch @@ -0,0 +1,14 @@ +diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c +index 511166d6..8bac2912 100644 +--- a/gnome-session/leader-main.c ++++ b/gnome-session/leader-main.c +@@ -92,6 +92,9 @@ maybe_reexec_with_login_shell (GStrv argv) + + g_debug ("Relaunching with login shell %s (%s)", login_shell, shell); + ++ /* Make sure the shell actually sets up the environment */ ++ g_unsetenv ("__NIXOS_SET_ENVIRONMENT_DONE"); ++ + /* First, we construct the command executed by the login shell */ + builder = g_strv_builder_new (); + g_strv_builder_add (builder, "exec"); diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index d60b3ca2d110c..4823b4cc4b8b1 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -7,9 +7,10 @@ ninja, pkg-config, gnome, + gobject-introspection, adwaita-icon-theme, glib, - gtk3, + gtk4, gsettings-desktop-schemas, gnome-desktop, gnome-settings-daemon, @@ -19,22 +20,21 @@ libICE, xmlto, docbook_xsl, - docbook_xml_dtd_412, + docbook_xml_dtd_45, python3, libxslt, gettext, - makeWrapper, systemd, xorg, libepoxy, - bash, gnome-session-ctl, + wrapGAppsHook4, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc="; + hash = "sha256-xr7cRcosGWvLsSV5rgazg2o+7U2E4DxSIEN2Qc5f+Ic="; }; patches = [ - (replaceVars ./fix-paths.patch { - gsettings = "${glib.bin}/bin/gsettings"; - dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - bash = "${bash}/bin/bash"; - }) + # https://github.com/NixOS/nixpkgs/pull/48517 + ./nixos_set_environment_done.patch ]; nativeBuildInputs = [ + gobject-introspection.setupHook meson ninja pkg-config gettext - makeWrapper xmlto libxslt docbook_xsl - docbook_xml_dtd_412 + docbook_xml_dtd_45 python3 dbus # for DTD + wrapGAppsHook4 ]; buildInputs = [ glib - gtk3 + gtk4 libICE gnome-desktop json-glib @@ -107,15 +105,11 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/libexec/gnome-session-ctl ''; - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \ + gappsWrapperArgs+=( + --suffix XDG_DATA_DIRS : "${gnome-shell}/share" --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" + ) ''; separateDebugInfo = true; @@ -126,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: { }; providedSessions = [ "gnome" - "gnome-xorg" ]; }; diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 11d273c814928..cdafffe56fb2e 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4="; + hash = "sha256-p/eJy5lZZfamZBKrUTkGTuRblwHTpCNQ/i5amP9oPAI="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index d190a459755f0..5ce8845c6d01f 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "48.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ="; + hash = "sha256-5FYi5PgASfK1wS++DWvF1YrTIH7W0QVdJBp/qtYpAB0="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index caba99c112608..4f4d59f75a553 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -57,10 +57,13 @@ gnome-autoar, gnome-tecla, bash-completion, + lcms2, libgbm, libGL, libXi, libX11, + libxkbcommon, + libsoup_3, libxml2, }: @@ -69,7 +72,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "48.4"; + version = "49.rc"; outputs = [ "out" @@ -78,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-QOLtdLRTZ/DKOPv6oKtHCGjSNZHQPcQNCr1v930jtwc="; + hash = "sha256-Hv8ooNfiUECI8ISa/zHxwMhw2WJwA56G5W13+OEHrkE="; }; patches = [ @@ -152,10 +155,13 @@ stdenv.mkDerivation (finalAttrs: { ibus gnome-desktop gnome-settings-daemon + lcms2 # required by mutter-clutter libgbm libGL # for egl, required by mutter-clutter libXi # required by libmutter libX11 + libxkbcommon + libsoup_3 libxml2 # recording @@ -185,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ src/data-to-c.py \ - meson/generate-app-list.py + build-aux/generate-app-list.py # We can generate it ourselves. rm -f man/gnome-shell.1 diff --git a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch index 6d888725b5d2e..b3a55bcc291ec 100644 --- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch +++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch @@ -1,5 +1,5 @@ ---- a/subprojects/shew/src/meson.build -+++ b/subprojects/shew/src/meson.build +--- a/subprojects/libshew/src/meson.build ++++ b/subprojects/libshew/src/meson.build @@ -13,7 +13,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index a82d9f541d8e3..fcc05a6db6f71 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "48.4"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-nNEwvGLNCLY6Ii6yZmG8xxfnXVjuGzwYgMTRt2zNJjs="; + hash = "sha256-8dCgESrFUhKMR6etrMXhf0/KgEFmfgY4yVgjwKKFOLM="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index d2fa96c74b526..b3614dede9952 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M="; + hash = "sha256-geldehr6Fdc4Bc6wgeSgnC4Qn993B2+Di8gamziMXus="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index fa8aae787c36c..6c916060a0146 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -5,7 +5,6 @@ fetchurl, pkg-config, gtkmm4, - libxml2, bash, catch2_3, gtk4, @@ -26,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg="; + hash = "sha256-1bYnt/NM+OSCCmx9rKWtIy3HxOQMLBU/KHa0NWO75zA="; }; patches = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita glib - libxml2 gtkmm4 libgtop gdk-pixbuf @@ -64,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: { systemd ]; + mesonFlags = [ + # :(.text.startup+0x56): undefined reference to `GsmApplication::get()' + "-Db_lto=false" + ]; + doCheck = true; passthru = { diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix index e08ec43dd48fe..b4276de4ff800 100644 --- a/pkgs/by-name/gn/gnome-tecla/package.nix +++ b/pkgs/by-name/gn/gnome-tecla/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecla"; - version = "48.0.2"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE="; + hash = "sha256-XRLIDoZUnVDwmRgSdZ9PU/QgiNDq60KN0RSA5grl12o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 753f4b247b07e..064ffc44ec946 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -12,7 +12,6 @@ wrapGAppsHook4, ninja, gnome, - cairo, icu, itstool, libadwaita, @@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "48.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro="; + hash = "sha256-WpKly7oFXBLj2pV/FxIjvmibaoDnglcBSEc582Q0tDE="; }; nativeBuildInputs = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cairo icu glib gsettings-desktop-schemas diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 7bdf8bcf9f2a9..fc9b15f063aa3 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "46.1"; + version = "49.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A="; + hash = "sha256-NON85In7878A8EIlO2wDW1/K5ZyVuOVSuKBgT+TpKfQ="; }; nativeBuildInputs = [ @@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-tweaks"; }; }; diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index aecb98b3d246c..28cda25d84068 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -17,15 +17,16 @@ geoclue2, python3, gsettings-desktop-schemas, + typescript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-weather"; - version = "48.0"; + version = "49.rc"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz"; - hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U="; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz"; + hash = "sha256-gFwVmU12o1ap5+95AgCNnM2vNsqmpxD5PwuQWLHlgaw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { python3 gobject-introspection gjs + typescript ]; buildInputs = [ @@ -62,7 +64,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { packageName = "gnome-weather"; }; + updateScript = gnome.updateScript { + packageName = "gnome-weather"; + }; }; meta = with lib; { @@ -73,4 +77,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 465f8aa0933e0..68bd96cde8cf8 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.5.3"; + version = "0.5.4"; outputs = [ "out" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz"; - sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc="; + sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U="; }; patches = [ diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix index cb40b950a43e7..8a434e4d7fa9f 100644 --- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix +++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M="; + hash = "sha256-YTbBW/NtbW+6Dd78Wx3G0HlERKPh9FE0zvlnVgxmIq0="; }; strictDeps = true; diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix index 9196214e4616e..1a4c228b398d5 100644 --- a/pkgs/by-name/gt/gtk-frdp/package.nix +++ b/pkgs/by-name/gt/gtk-frdp/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "gtk-frdp"; - version = "0-unstable-2025-03-14"; + version = "0-unstable-2025-08-15"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gtk-frdp"; - rev = "a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3"; - hash = "sha256-oi4Iwi9/elfUDKK0IhoNgtS8ORIzVUBagqBVdNRxGjI="; + rev = "b59dc88624511311576dca607d3cb9317569de34"; + hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 8153e16a1583e..f5e6634d700d5 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.7.5"; + version = "1.8.rc"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-KlaRwOWHvzm+VwMygiEh8wqJfEwwA+x7o9T72Qpqnmo="; + hash = "sha256-wpxPYEkuRh2DaEw6tCAnQLXAwFEQ/TbJZYq15Egt9NM="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index a37ccdd952641..433c828b51827 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libchamplain"; + attrPath = "libchamplain_libsoup3"; versionPolicy = "odd-unstable"; }; }; @@ -88,7 +89,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - teams = [ + teams = lib.optionals withLibsoup3 [ teams.gnome teams.pantheon ]; diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index 34078fc48c3c2..f9901e8b3ae39 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.10.1"; + version = "1.0.0"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-dHLogJDbKyKDB1Be3rpEg+hyaBNAywQErmSsPaW+0KY="; + hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfoundry/package.nix b/pkgs/by-name/li/libfoundry/package.nix new file mode 100644 index 0000000000000..28d0e7c1a088e --- /dev/null +++ b/pkgs/by-name/li/libfoundry/package.nix @@ -0,0 +1,116 @@ +{ + stdenv, + lib, + fetchurl, + gi-docgen, + wrapGAppsNoGuiHook, + glib, + gnome, + gobject-introspection, + gom, + gtk4, + webkitgtk_6_0, + libspelling, + gtksourceview5, + json-glib, + libxml2, + libyaml, + libgit2, + libssh2, + flatpak, + libsoup_3, + editorconfig-core-c, + template-glib, + libdex, + libpeas2, + libsysprof-capture, + meson, + ninja, + pkg-config, + shared-mime-info, + vte-gtk4, + cmark, + withGtk ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfoundry${lib.optionalString withGtk "-gtk"}"; + version = "1.0.0"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/foundry/${lib.versions.majorMinor finalAttrs.version}/foundry-${finalAttrs.version}.tar.xz"; + hash = "sha256-WmEsxLqFXBe6jR/rxfgHLpCtavoDZoQ/1SVfGwxz+Xs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + gi-docgen + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + gom + libxml2 + libyaml + libgit2 + libssh2 + flatpak + libsoup_3 + editorconfig-core-c + template-glib + libsysprof-capture + ] + ++ lib.optionals withGtk [ + vte-gtk4 + cmark + gtk4 + webkitgtk_6_0 + libspelling + gtksourceview5 + ]; + + propagatedBuildInputs = [ + glib + libdex + libpeas2 + json-glib + ]; + + strictDeps = true; + + mesonFlags = [ + (lib.mesonBool "gtk" withGtk) + (lib.mesonBool "docs" true) + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "foundry"; + attrPath = "libfoundry"; + }; + }; + + meta = { + description = "Command line tool and library that can be used to build developer tools"; + mainProgram = "foundry"; + homepage = "https://gitlab.gnome.org/GNOME/foundry"; + changelog = "https://gitlab.gnome.org/GNOME/foundry/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = lib.licenses.lgpl21Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch new file mode 100644 index 0000000000000..35b22f06fa367 --- /dev/null +++ b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs +index 90cd5f6..17a6469 100644 +--- a/vendor/glycin/src/sandbox.rs ++++ b/vendor/glycin/src/sandbox.rs +@@ -251,7 +251,7 @@ impl Sandbox { + } + + async fn bwrap_command(&self, seccomp_memfd: &Memfd) -> Result { +- let mut command = Command::new("bwrap"); ++ let mut command = Command::new("@bwrap@"); + + command.args([ + "--unshare-all", diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-paths.patch similarity index 100% rename from pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch rename to pkgs/by-name/li/libglycin/fix-glycin-paths.patch diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 220d59e878a17..6c24e87a2f8e4 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -7,14 +7,18 @@ pkg-config, rustc, cargo, + python3, rustPlatform, vala, gi-docgen, + gobject-introspection, + fontconfig, libseccomp, lcms2, gtk4, - gobject-introspection, gnome, + replaceVars, + bubblewrap, common-updater-scripts, _experimental-update-script-combinators, buildPackages, @@ -24,14 +28,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "1.2.3"; + version = "2.0.rc"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-O7Z7kzC0BU7FAF1UZC6LbXVIXPDertsAUNYwHAjkzPI="; + hash = "sha256-eFWHYDWaC8kMYeJZZcoUYyF/TvEqY2iVyjvfMVSRQvA="; }; nativeBuildInputs = [ @@ -40,24 +44,26 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc cargo + python3 rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ vala gi-docgen + gobject-introspection ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-g2tsQ6q+sUxn3itu3IgZ5EGtDorPzhaO5B1hlEW5xzs="; + hash = "sha256-i7vuLpAzDp9mPTb3XwiZq70T744m/VVp5he7Cgf1leY="; }; buildInputs = [ + fontconfig libseccomp lcms2 gtk4 - ] - ++ lib.optionals withIntrospection [ gobject-introspection ]; + ]; propagatedBuildInputs = [ libseccomp @@ -66,12 +72,20 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "glycin-loaders" false) + (lib.mesonBool "glycin-thumbnailer" false) (lib.mesonBool "libglycin" true) (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "vapi" withIntrospection) (lib.mesonBool "capi_docs" withIntrospection) ]; + postPatch = '' + patch -p2 < ${finalAttrs.passthru.glycin3PathsPatch} + + patchShebangs \ + build-aux/crates-version.py + ''; + passthru = { updateScript = let @@ -100,6 +114,14 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + + glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; + + glycin3PathsPatch = replaceVars ./fix-glycin-3-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; }; meta = { @@ -111,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus ]; maintainers = with lib.maintainers; [ normalcea ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ "glycin-1" diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index b577910323a38..c06f04a2136a5 100644 --- a/pkgs/by-name/li/libpanel/package.nix +++ b/pkgs/by-name/li/libpanel/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpanel"; - version = "1.10.0"; + version = "1.10.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz"; - hash = "sha256-V4zlEieP8rte7rtVCZOSxSU3pavZvQYpVn8QJTKziyU="; + hash = "sha256-k2u+lt+zg1VkghIP3dRTOlLS9JMDMoy2lIYWBkkkRes="; }; strictDeps = true; diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix index 3fd49e8885d42..dda3030443f79 100644 --- a/pkgs/by-name/li/librsvg/package.nix +++ b/pkgs/by-name/li/librsvg/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.60.0"; + version = "2.61.0"; outputs = [ "out" @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-C2/8zfbnCvyYdogvXSzp/88scTy6rxrZAXDap1Lh7sM="; + hash = "sha256-29DbQKEXmjgvu4zJMIN2cblz1yK6EGo97iqtD9hY4sQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-DMkYsskjw6ARQsaHDRautT0oy8VqW/BJBfBVErxUe88="; + hash = "sha256-ApQM+3I4uToAsKrqkLwFTg39igqibTRhQnmFjA98xVc="; dontConfigure = true; }; diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 6e9cbb678d062..c97f72876422b 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.4.0"; + version = "1.5.beta"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA="; + hash = "sha256-xub0mAP1CKDJQatwz8VRjcroN9acjNW0LKO6Dj4r/2Q="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 361545417bf89..1f8be3c8bcb6f 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.9.0"; + version = "3.10.rc"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-1C9AjcP7KP5U9amrv18d7PWBjbnC6exRwJRkvf0MFLk="; + hash = "sha256-EeihW7QeFzynGqL0lHnKUIwmleWmB/BA1AMvjbyNaFU="; }; patches = [ diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index cf5a039ba4656..4fa09136796e4 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -15,6 +15,7 @@ libadwaita, libgweather, libseccomp, + libglycin, glycin-loaders, gnome, common-updater-scripts, @@ -24,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-EHE9PpZ4nQd659M4lFKl9sOX3fQ6UMBxy/4tEnJZcN4="; + hash = "sha256-7HSVdZH8tA9cTL9IoZJWLgMCw0OuHusF0DsmDYKIJdQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "loupe-deps-${finalAttrs.version}"; - hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg="; + hash = "sha256-IywuPEFyLOwjIwK/P/z7Z6yami8nq7usLE1W23ElIjU="; }; postPatch = '' @@ -66,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead - pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + pushd ../$(stripHash $cargoDeps)/glycin-3.* + patch -p3 < ${libglycin.passthru.glycin3PathsPatch} popd ''; diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index f1406de7b9ccc..63441282bb52b 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -13,26 +13,18 @@ libstartup_notification, libxml2, pkg-config, - replaceVars, wrapGAppsHook3, - zenity, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "metacity"; - version = "3.56.0"; + version = "3.57.1"; src = fetchurl { - url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz"; - hash = "sha256-dVSZcQSyb/DnmgKzeiuhib3058zVQibw+vSxpZAGyQE="; + url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor finalAttrs.version}/metacity-${finalAttrs.version}.tar.xz"; + hash = "sha256-EpOibk3t/UvyALW7eIZzAIl5rjrG0wU/fbSBuHrMfN4="; }; - patches = [ - (replaceVars ./fix-paths.patch { - inherit zenity; - }) - ]; - nativeBuildInputs = [ gettext libxml2 @@ -44,13 +36,13 @@ stdenv.mkDerivation rec { xorg.libXres xorg.libXpresent xorg.libXdamage + xorg.libX11 glib gsettings-desktop-schemas gtk3 libcanberra-gtk3 libgtop libstartup_notification - zenity ]; enableParallelBuilding = true; @@ -67,9 +59,9 @@ stdenv.mkDerivation rec { meta = { description = "Window manager used in Gnome Flashback"; homepage = "https://gitlab.gnome.org/GNOME/metacity"; - changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 840ed7f1d55e9..5436852d452c4 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -19,7 +19,6 @@ libadwaita, libxcvt, libGL, - libICE, libX11, libXcomposite, libXcursor, @@ -27,8 +26,6 @@ libXext, libXfixes, libXi, - libXtst, - libxkbfile, xkeyboard_config, libxkbcommon, libxcb, @@ -39,9 +36,11 @@ libdrm, libgbm, libei, + libepoxy, libdisplay-info, gsettings-desktop-schemas, glib, + libglycin, atk, gtk4, fribidi, @@ -72,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "48.4"; + version = "49.rc"; outputs = [ "out" @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-EYnPfmPMh8/dHzqG6PFNl8M9ap2iVPI+gWVVSbbFDZM="; + hash = "sha256-nwBnr8bHV2kwNloLpW1zb6rVsqbejsmQiby2vPYpIVA="; }; mesonFlags = [ @@ -131,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { cairo egl-wayland glib + libglycin gnome-desktop gnome-settings-daemon gsettings-desktop-schemas @@ -139,8 +139,10 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz libcanberra libdrm + libadwaita libgbm libei + libepoxy libdisplay-info libGL libgudev @@ -159,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols # X11 client gtk4 - libICE libX11 libXcomposite libXcursor @@ -167,8 +168,6 @@ stdenv.mkDerivation (finalAttrs: { libXext libXfixes libXi - libXtst - libxkbfile xkeyboard_config libxkbcommon libxcb @@ -206,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru = { - libmutter_api_version = "16"; # bumped each dev cycle + libmutter_api_version = "17"; # bumped each dev cycle libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}"; tests = { diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 0fad8a9d816d5..fa08be3c841a3 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -18,6 +18,7 @@ adwaita-icon-theme, gnome-autoar, glib-networking, + icu, shared-mime-info, libnotify, libexif, @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "48.3"; + version = "49.rc"; outputs = [ "out" @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-IaKuoAUWDbCDx6HU0sCYm4RcxyLATvnrtgElp+xbOT0="; + hash = "sha256-hN7XI8Z4l/qBskma1aKH03/OFiQd73+PcgkEcGP62Kw="; }; patches = [ @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gexiv2 glib-networking + icu gnome-desktop adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 49b5cc34ac890..49142eed47d96 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -1,18 +1,18 @@ diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py -index 60c172f78..e8dadf76d 100644 +index dbaca2e48..80f2640d4 100644 --- a/src/orca/ax_utilities_application.py +++ b/src/orca/ax_utilities_application.py -@@ -189,7 +189,7 @@ class AXUtilitiesApplication: +@@ -188,7 +188,7 @@ class AXUtilitiesApplication: pid = AXUtilitiesApplication.get_process_id(app) try: - state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State") + state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State") state = state.split()[1] - except Exception as error: + except (GLib.GError, IndexError) as error: tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"] diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py -index 740f1a690..85f74d2dc 100644 +index b4abce719..cff5a78a6 100644 --- a/src/orca/debugging_tools_manager.py +++ b/src/orca/debugging_tools_manager.py @@ -243,7 +243,7 @@ class DebuggingToolsManager: @@ -21,22 +21,22 @@ index 740f1a690..85f74d2dc 100644 try: - cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") + cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") - except Exception as error: + except subprocess.SubprocessError as error: cmdline = f"EXCEPTION: {error}" else: diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 6cb4c7772..903b344f0 100755 +index 3fc845dc3..a82947911 100755 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -186,7 +186,7 @@ def inGraphicalDesktop(): - def otherOrcas(): +@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool: + def other_orcas() -> list[int]: """Returns the pid of any other instances of Orca owned by this user.""" -- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() +- with subprocess.Popen(f"pgrep -u {os.getuid()} -x orca", ++ with subprocess.Popen(f"@pgrep@ -u {os.getuid()} -x orca", + shell=True, + stdout=subprocess.PIPE) as proc: + pids = proc.stdout.read() if proc.stdout else b"" diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py index 3407be009..452297a3f 100644 --- a/src/orca/orca_modifier_manager.py diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 34a51734082a9..850e9e846637d 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "48.6"; + version = "49.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-7cUDRODf1yR2tcFLOqclyiaHGOpt2JvE7ib0ULM51pY="; + hash = "sha256-uS+iewqn7yqZYRo6SWLfIXToV/3MKrH8mHTHX3BSPw8="; }; patches = [ @@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonPath = with python3.pkgs; [ + dasbus pygobject3 dbus-python pyxdg diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix index a24383b6d805b..42227dd4fc387 100644 --- a/pkgs/by-name/pa/pango/package.nix +++ b/pkgs/by-name/pa/pango/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.56.3"; + version = "1.57.0"; outputs = [ "bin" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz"; - hash = "sha256-JgYlK8Jc2NJOG39+ksOicrN6zWc0NHtztHpIKDS6JJE="; + hash = "sha256-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 0efef1f7a502f..04952a4435423 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -3,71 +3,68 @@ lib, fetchurl, pkg-config, - gtk3, + gtk4, + libadwaita, + libgee, + pango, gnome, - adwaita-icon-theme, gdk-pixbuf, librsvg, gsound, libmanette, - gettext, itstool, - libxml2, - clutter, - clutter-gtk, - wrapGAppsHook3, + blueprint-compiler, + wrapGAppsHook4, meson, ninja, - python3, vala, desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "40.2"; + version = "49.rc"; src = fetchurl { - url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz"; - hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; + url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; + hash = "sha256-Mr71UXopmxkapqwi0XMDJZBhN15MYyadMpwOVt7bEP4="; }; nativeBuildInputs = [ meson ninja - python3 vala desktop-file-utils pkg-config - adwaita-icon-theme - libxml2 itstool - gettext - wrapGAppsHook3 + blueprint-compiler + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 + libadwaita + libgee + pango gdk-pixbuf librsvg libmanette gsound - clutter - libxml2 - clutter-gtk ]; passthru = { - updateScript = gnome.updateScript { packageName = "quadrapassel"; }; + updateScript = gnome.updateScript { + packageName = "quadrapassel"; + }; }; meta = { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; - changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index cc5f6b7c69b31..0678773dacd5a 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -8,6 +8,7 @@ desktop-file-utils, fetchFromGitea, glib, + libglycin, glycin-loaders, gst_all_1, gtk4, @@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; preFixup = '' diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index ee3bb60d93105..efabb63ef3eb6 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -11,7 +11,7 @@ libxml2, libxslt, gobject-introspection, - wrapGAppsHook3, + wrapGAppsHook4, wrapGAppsNoGuiHook, python3, gdk-pixbuf, @@ -25,7 +25,7 @@ libsoup_3, libX11, withGtk ? true, - gtk3, + gtk4, libmediaart, pipewire, sqlite, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "0.44.2"; + version = "45.rc"; # TODO: split out lib outputs = [ @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchurl { - url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-eW7uSUzfYNwr+CsAuPmaFLocfPQNKUSBf/DBqmBz1aA="; + url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; + hash = "sha256-9quoTAm+RdiGcR/5I5tQ4k6T+ulI+nWScD0pfbNDzus="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt # for xsltproc gobject-introspection - (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook) + (if withGtk then wrapGAppsHook4 else wrapGAppsNoGuiHook) python3 ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { tinysparql shared-mime-info ] - ++ lib.optionals withGtk [ gtk3 ] + ++ lib.optionals withGtk [ gtk4 ] ++ (with gst_all_1; [ gstreamer gst-editing-services diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index da3d143821fde..c5cde96f74e96 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "48.1"; + version = "49.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "simple-scan"; tag = version; - hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g="; + hash = "sha256-CZNbw6Ve91bhF5ItsJYOhyUy4CsimXrTLIQBRDhnzFU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 0bd79455bc32e..3a2643c423dcb 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -17,6 +17,8 @@ gtk4, libadwaita, libcamera, + libglycin, + lcms2, libseccomp, pipewire, gnome, @@ -24,16 +26,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "48.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-OTF2hZogt9I138MDAxuiDGhkQRBpiNyRHdkbe21m4f0="; + hash = "sha256-S7ivkP/sn/MmIS8ElqA336J3/v6fj5sPAWYpQQ3hK0M="; }; patches = [ # Fix paths in glycin library - glycin-loaders.passthru.glycinPathsPatch + libglycin.passthru.glycin3PathsPatch ]; nativeBuildInputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita libcamera # for the gstreamer plugin + lcms2 libseccomp pipewire # for device provider ]; diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index e4a1a4034d25e..78181dd9347a2 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -13,13 +13,13 @@ gettext, gnome, gtk-doc, - docbook_xsl, + docbook-xsl-nons, docbook_xml_dtd_43, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "template-glib"; - version = "3.36.3"; + version = "3.37.1"; outputs = [ "out" @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor version}/template-glib-${version}.tar.xz"; - hash = "sha256-1SizWyz5Dgfa5Q4l4S+62w6wSPV/1RUc+fbpjM4d8g4="; + url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz"; + hash = "sha256-16xEMdWUe6KSCGx+R7iK6Kzb7A+PjTiyvbiIoL3MBhw="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { vala glib gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { teams = [ teams.gnome ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 627fca114f06d..ce0a71a23fe9e 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch2, gettext, meson, mesonEmulatorHook, @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.9.2"; + version = "3.10.rc"; outputs = [ "out" @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-FM4DkCQTXhgQIrzOSxqtLgA3fdnH2BK5g5HM/HVtrY4="; + hash = "sha256-VCGT9Zs2A0G2KqFTw8JCy2cRSWJd8I3wC3oXum9dXVk="; }; strictDeps = true; @@ -112,14 +111,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - patches = [ - (fetchpatch2 { - name = "make-dbus-dep-optional.patch"; - url = "https://gitlab.gnome.org/GNOME/tinysparql/-/commit/31b5a793cd40cdce032e0f7d7c3ef7841c6e3691.patch?full_index=1"; - hash = "sha256-YoWJEa2bFIjZdPW9pJ3iHTxi0dvveYDjKaDokcIvnj8="; - }) - ]; - postPatch = '' patchShebangs \ utils/data-generators/cc/generate diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 476b3748ae345..527cc103b9380 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -23,9 +23,11 @@ pango, pcre2, cairo, + fmt_11, fribidi, lz4, icu, + simdutf, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, fast-float, @@ -35,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.80.3"; + version = "0.81.90"; outputs = [ "out" @@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk="; + hash = "sha256-kLJhqwJZf+6UH3GmV+v50OMDqsN3tIXERNhUQ1oJEyE="; }; patches = [ @@ -57,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + + # Fix compilation with gcc 14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/e297ba0507d0e7863edd411dfc5264bbc490e4f6.patch"; + hash = "sha256-uTaeb7bLUBefgF5Uxl7Qxlcp5Uj7pqW8XiR/5rsjuTI="; + }) ]; nativeBuildInputs = [ @@ -75,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + fmt_11 fribidi gnutls pango # duplicated with propagatedBuildInputs to support gtkVersion == null @@ -82,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 icu fast-float + simdutf ] ++ lib.optionals systemdSupport [ systemd diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 9fa4feeef447f..1a28e7908b34e 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-zRWsouE2TaMI6zeWu4rkpXfmDKT+EgBrMVIyz9GciGE="; + hash = "sha256-JgB422chatw3I3g2lvrtq6hxkVgdgLT0BfYkrwFqTa4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index 4004318a7ce1a..e4176f416da0c 100644 --- a/pkgs/by-name/ye/yelp-xsl/package.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp-xsl"; - version = "42.4"; + version = "49.beta"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz"; - hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E="; + hash = "sha256-yhvk5jrMXx15oVFCeHn7DAALLKHTJygU4LJPe8B9mT0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index ca376a4359f5a..4e87d6b382fc7 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -2,20 +2,21 @@ stdenv, lib, fetchurl, + desktop-file-utils, gettext, itstool, meson, ninja, pkg-config, - wrapGAppsHook3, + wrapGAppsHook4, bzip2, glib, - gtk3, - libhandy, + gtk4, + libadwaita, libxml2, libxslt, sqlite, - webkitgtk_4_1, + webkitgtk_6_0, xz, yelp-xsl, gnome, @@ -23,31 +24,32 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp"; - version = "42.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz"; - hash = "sha256-JszEImeanmp6OqCD2Q/Ns0f18jAL4+AUMaMNDN0qiaM="; + hash = "sha256-C0j4gV1tYn4oR0hooW4SLEqNjoi8IP++yEJ2bFqQYsg="; }; nativeBuildInputs = [ + desktop-file-utils gettext itstool meson ninja pkg-config - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ bzip2 glib - gtk3 - libhandy + gtk4 + libadwaita libxml2 libxslt sqlite - webkitgtk_4_1 + webkitgtk_6_0 xz yelp-xsl ]; diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 72ee2d4932257..251da2da8fe1b 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.1.90"; + version = "4.1.99"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-vzZ5xiBf9I3OvR4d/zo6SmoLOlPhy8OwmKnsC2K9cjY="; + hash = "sha256-b+KqMTxx6R/6VbEdvseQTzGkAwPgo/YBaCD/be4ynuI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 5660f553f2895..81041136d6620 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fontconfig"; - version = "2.16.2"; + version = "2.17.1"; outputs = [ "bin" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # ref: https://github.com/NixOS/nixpkgs/pull/401037#discussion_r2055430206 src = fetchurl { url = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${finalAttrs.version}/fontconfig-${finalAttrs.version}.tar.xz"; - hash = "sha256-FluP0qEZhkyHRksjOYbEobwJ77CcZd4cpAzB6F/7d+I="; + hash = "sha256-n1yuk/T//B+8Ba6ZzfxwjNYN/WYS/8BRKCcCXAJvpUE="; }; nativeBuildInputs = [ @@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am # Test causes error without patch shebangs. - patchShebangs doc/check-whitespace-in-args.py + patchShebangs doc/check-whitespace-in-args.py \ + doc/check-missing-doc.py ''; configureFlags = [ diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d1bebbdbbb3c2..3dab817d4b352 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.42.12"; + version = "2.43.5"; outputs = [ "out" @@ -44,14 +44,12 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c="; + hash = "sha256-pyPsJChCf4V7hyffu+nat3FCoT+20MR/lSIiUa42/xU="; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - - ./static-deps.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -90,6 +88,8 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgio_sniffing=false" + "-Dandroid=disabled" + "-Dglycin=disabled" (lib.mesonBool "gtk_doc" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "others" true) diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch deleted file mode 100644 index da52e432b4e77..0000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 31 Jan 2024 15:33:02 +0100 -Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep - -This should match the dependencies passed to the library() call that -creates gdkpixbuf. Otherwise, linking the gdkpixbuf_bin executables -will fail if -Ddefault_library=static, because static libraries don't -carry dependency information themselves. ---- -Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161 - - gdk-pixbuf/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index a11926eee..450484d68 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -269,7 +269,7 @@ endif - gdkpixbuf_dep = declare_dependency( - link_with: gdkpixbuf, - include_directories: root_inc, -- dependencies: gdk_pixbuf_deps, -+ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], - sources: [ gdkpixbuf_enum_h, built_girs ], - ) - meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) --- -GitLab - diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index be8ea25ae8acc..94f5bb1d32a9e 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.84.0"; + version = "2.85.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Vu5fUcis/Ar99GlZMW5MhVTLUO0ra8XOOJ2XnLtkJQk="; + hash = "sha256-B3EwZxEpn79i5Tx1LVPtWBY1EnFnpsx5rgXyuEIdKdc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 1df6fa14c39d1..818c68effaa00 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; - teams = [ teams.gnome ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index e37a40923d1a3..276a3f8193f7d 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.49"; + version = "3.24.50"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-XqUsaijw5ezy6aPC+suzDQQLc4cfzV8zzRMX6QGKFG4="; + hash = "sha256-OZEYpWmTFGIhZaEbdp6ptu1o4De21G1Xz89IUd7AdSk="; }; patches = [ diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index a9217ba92d149..eadb3936ed2d2 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -28,6 +28,7 @@ libxkbcommon, libpng, libtiff, + librsvg, libjpeg, libxml2, gnome, @@ -68,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.18.6"; + version = "4.20.0"; outputs = [ "out" @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po="; + hash = "sha256-eeUeYvfwz/MpBFabDOvJYpfQ6/r6begXIHPGnOA5Gpg="; }; depsBuildBuild = [ @@ -119,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libpng libtiff + librsvg libjpeg (libepoxy.override { inherit x11Support; }) isocodes diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 3ddf4bc885026..0b606cae756d3 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.18.0"; + version = "4.19.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-LuMcFUefxNjpWLA8i1+7yOF7wSLCovVESXtOBWGeM+w="; + hash = "sha256-K0Q9378M8oxL7ORHpbumICjEnfRcyxs/Q4o6PgvKMao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 433dca535864a..9cd5ccca89cc6 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.16.0"; + version = "5.17.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; - hash = "sha256-qzXUIBAvPosFXdO4ZC06SCCfiIGJ5iVND/tLan6MNWY="; + hash = "sha256-dA3pr74iuzHb2FMrizMeeVPOY5YcCuEtEvrkLVAQFgc="; }; patches = [ diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 5ea842c86ce1f..c34508bf80806 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -15,7 +15,7 @@ glib, lua5_1, python3, - spidermonkey_128, + spidermonkey_140, gnome, }: @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.7"; + version = "2.1.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-HpqdaXYdIQnv9bfBHYyWtIZ8z6yiuSHt7UlAEZJ2nsk="; + hash = "sha256-DcWB9P4pdU+xFK3G9GoEIyAMER4IweWtCHGeVcQY3pc="; }; patches = [ @@ -65,12 +65,12 @@ stdenv.mkDerivation rec { luaEnv python3 python3.pkgs.pygobject3 - spidermonkey_128 + spidermonkey_140 ]; propagatedBuildInputs = [ # Required by libpeas-2.pc - gobject-introspection + glib ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 761ec600e2463..14aec96e5e5cc 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { description = "HTTP client/server library for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; - inherit (glib.meta) maintainers platforms teams; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libsoup-2.4" "libsoup-gnome-2.4" diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 1b3d449a3d200..d6b5719a6d8fc 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sysprof"; - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz"; - hash = "sha256-Gw8DgPLzBwi6h4KTIaBv7h2zbfqHeXu/B/CnrPRJjRg="; + hash = "sha256-Y4ZkKMR7rSOlCTowWq85bFpPgqDtSz5RWPZYCalx1JA="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 839044f332d39..0178afb13f56a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1012,6 +1012,7 @@ mapAliases { gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 + gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06 gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18 gnome-settings-daemon43 = throw "'gnome-settings-daemon43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22 gnu-cobol = gnucobol; # Added 2024-09-17