diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 9fc92e91018cc..7b85ac88e52d2 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -43,6 +43,10 @@ let defaultSessionName = config.services.displayManager.defaultSession; setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { }; + + greeterEnvFile = pkgs.writeText "gdm-greeter-env" '' + DCONF_PROFILE=gdm + ''; in { @@ -102,6 +106,12 @@ in [ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ] [ "services" "displayManager" "gdm" "autoLogin" "delay" ] ) + (lib.mkRemovedOptionModule [ + "services" + "displayManager" + "gdm" + "wayland" + ] "Disabling this option is no longer supported with GNOME 50.") ]; meta = { @@ -127,14 +137,6 @@ in ''; }; - wayland = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Allow GDM to run on Wayland instead of Xserver. - ''; - }; - autoSuspend = lib.mkOption { default = true; description = '' @@ -244,15 +246,27 @@ in }; systemd.tmpfiles.rules = [ - "d /run/gdm/.config 0711 gdm gdm" + # GDM creates /run/gdm as root:root. The greeter user needs to + # write to subdirectories (.config, .cache, .local) so we create + # them here with correct ownership. All paths in the chain must + # be owned by the same user to avoid systemd-tmpfiles "unsafe + # path transition" errors. + "d /run/gdm/.config 0700 gdm-greeter gdm" + "d /run/gdm/.config/environment.d 0700 gdm-greeter gdm" + "f /run/gdm/.config/environment.d/10-dconf.conf 0644 gdm-greeter gdm - DCONF_PROFILE=gdm" ] + ++ lib.concatMap (i: [ + "d /run/gdm-${toString i}/.config 0700 gdm-greeter-${toString i} gdm" + "d /run/gdm-${toString i}/.config/environment.d 0700 gdm-greeter-${toString i} gdm" + "f /run/gdm-${toString i}/.config/environment.d/10-dconf.conf 0644 gdm-greeter-${toString i} gdm - DCONF_PROFILE=gdm" + ]) [ 1 2 3 4 ] ++ lib.optionals config.services.pulseaudio.enable [ - "d /run/gdm/.config/pulse 0711 gdm gdm" + "d /run/gdm/.config/pulse 0711 gdm-greeter gdm" "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" ] ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [ # Create stamp file for gnome-initial-setup to prevent it starting in GDM. - "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes" + "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm-greeter gdm - yes" ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions @@ -321,8 +335,14 @@ in systemd.user.services.dbus.wantedBy = [ "default.target" ]; - programs.dconf.profiles.gdm.databases = - lib.optionals (!cfg.autoSuspend) [ + programs.dconf.profiles.gdm.databases = [ + { + settings."org/gnome/desktop/session" = { + session-name = "gnome-login"; + }; + } + ] + ++ lib.optionals (!cfg.autoSuspend) [ { settings."org/gnome/settings-daemon/plugins/power" = { sleep-inactive-ac-type = "nothing"; @@ -347,7 +367,6 @@ in # presented and there's a little delay. services.displayManager.gdm.settings = { daemon = lib.mkMerge [ - { WaylandEnable = cfg.wayland; } # nested if else didn't work (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) { TimedLoginEnable = true; @@ -381,6 +400,7 @@ in session required pam_succeed_if.so audit quiet_success user ingroup gdm session required pam_env.so conffile=/etc/pam/environment readenv=0 + session required pam_env.so envfile=${greeterEnvFile} readenv=0 session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 66003daa09d95..d3047abd39a6d 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -23,10 +23,9 @@ # Configure GDM services.xserver.enable = true; - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = true; debug = true; - wayland = true; }; services.displayManager.autoLogin = { enable = true; @@ -38,7 +37,7 @@ services.desktopManager.gnome.debug = true; systemd.user.services = { - "org.gnome.Shell@wayland" = { + "org.gnome.Shell@" = { serviceConfig = { ExecStart = [ # Clear the list before overriding it. diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 0bb2e7061133a..41dfdf43f79cc 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -9,8 +9,6 @@ { imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.displayManager.gdm = { enable = true; debug = true; @@ -25,7 +23,7 @@ services.desktopManager.gnome.debug = true; systemd.user.services = { - "org.gnome.Shell@wayland" = { + "org.gnome.Shell@" = { serviceConfig = { ExecStart = [ # Clear the list before overriding it. diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 8eafd16263338..6cef710f91f06 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution"; - version = "3.58.3"; + version = "3.60.0"; outputs = [ "out" @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor finalAttrs.version}/evolution-${finalAttrs.version}.tar.xz"; - hash = "sha256-XQG3mlvr3y06mHG2E1CTnPJQH26gPCQVQ/dEqShtTXk="; + hash = "sha256-D+10ikSTOnoROP5gJ5ZqvDZsbDLrWkHjDrYbjlQ5teU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix index 493e04ccefb93..494925b08e6d9 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 = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz"; - hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc="; + hash = "sha256-TJJ/v+7BxQOAG6UQwslOAFTILFIs97oNO+XU1B/PXIY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 3d9035b013bd0..40d65bc2599b3 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 (finalAttrs: { pname = "adwaita-icon-theme"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major finalAttrs.version}/adwaita-icon-theme-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw="; + hash = "sha256-+sbgQB/KcUeAVhoIG49+J8O8HbNOvaTaF1CB8msk1GA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 9d352c0b3fe92..e9fb97aa8522c 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "at-spi2-core"; - version = "2.58.3"; + version = "2.60.0"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz"; - hash = "sha256-sPq+psl0LtqMnGdfm4wdG6u6HagtoD6hEDcQIzcXwbA="; + hash = "sha256-gOUMGpfY/WYKP62wLKNYdt+IHCZtPWEI/FtMETYUy5k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index 683551b45e0cb..775e5260484f7 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "baobab"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/baobab/${lib.versions.major finalAttrs.version}/baobab-${finalAttrs.version}.tar.xz"; - hash = "sha256-YkPJIAK+fpH13s0klhL6zipKEtN0Kv2IsIapS4dd/+A="; + hash = "sha256-VzyE8V9fljpEBQD29DQSySisIzX2tp3LWPGh/lIBAks="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index b588dcb95dcdc..8482a5a965f42 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -12,17 +12,18 @@ testers, wrapGAppsNoGuiHook, xvfb-run, + gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.18.0"; + version = "0.20.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo="; + hash = "sha256-dA+FQTRmTz6rl5ToZJ8CXY1Zd7Em7VwvF3U3Qoyvu80="; }; postPatch = '' @@ -67,17 +68,22 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + # regression test that `blueprint-compiler` can be used in a standalone + # context outside of nix builds, and doesn't rely on the setup hooks of + # its propagated inputs for basic functionality. + # see https://github.com/NixOS/nixpkgs/pull/400415 + standalone = runCommand "blueprint-compiler-test-standalone" { } '' + ${lib.getExe finalAttrs.finalPackage} --help && touch $out + ''; + }; + updateScript = gnome.updateScript { + packageName = "blueprint-compiler"; }; - # regression test that `blueprint-compiler` can be used in a standalone - # context outside of nix builds, and doesn't rely on the setup hooks of - # its propagated inputs for basic functionality. - # see https://github.com/NixOS/nixpkgs/pull/400415 - standalone = runCommand "blueprint-compiler-test-standalone" { } '' - ${lib.getExe finalAttrs.finalPackage} --help && touch $out - ''; }; meta = { @@ -89,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: { benediktbroich ranfdev ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix index 8c998b3a34300..fff74a33add88 100644 --- a/pkgs/by-name/ca/cambalache/package.nix +++ b/pkgs/by-name/ca/cambalache/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cambalache"; - version = "0.99.3"; + version = "1.0"; pyproject = false; # Did not fetch submodule since it is only for tests we don't run. @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { owner = "jpu"; repo = "cambalache"; tag = finalAttrs.version; - hash = "sha256-1X7fXYSIXoj8qhQLIfz2gMrCnNBZ7OJCeMykBSpnYD4="; + hash = "sha256-V1xiw6oGOlmLR1JOy82REIdoOTGfzXYMBJAAtjDJtfM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/casilda/package.nix b/pkgs/by-name/ca/casilda/package.nix index 9eb66096be3e1..33b222230f9ff 100644 --- a/pkgs/by-name/ca/casilda/package.nix +++ b/pkgs/by-name/ca/casilda/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "casilda"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "jpu"; repo = "casilda"; tag = finalAttrs.version; - hash = "sha256-JaWHKKNYeeW7QKB6DpGrXowvufeBZUnc9pP0ZAAo3gU="; + hash = "sha256-3xJ0FC+/pQYakvdPMOrUNkI7kIq/FRdJIEYlOnWp0nE="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix index c1b6f1130fff7..71f73a4b61a69 100644 --- a/pkgs/by-name/d-/d-spy/package.nix +++ b/pkgs/by-name/d-/d-spy/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "d-spy"; - version = "49.2"; + version = "50.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz"; - hash = "sha256-uBT/J9goqrzacvLGLxtB1iA190PQb9mn48XJhsSHmmk="; + hash = "sha256-G93IbYos9ntPZS3EYczYNTES8Ih1NCADfHX1RU3qrRA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index eed14f08bc980..47aa9f7a77c63 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, gettext, @@ -34,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "eog"; - version = "49.1"; + version = "50.0"; outputs = [ "out" @@ -44,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/eog/${lib.versions.major finalAttrs.version}/eog-${finalAttrs.version}.tar.xz"; - hash = "sha256-+t0S4UupzSvmmJ37zvQAAWRbY0QM7tjgSGewdYewZtw="; + hash = "sha256-XAIm0Qz6E1aa3iIY8DzmL3m43Fwoji4LEj0u9Rq9ywc="; }; patches = [ @@ -52,12 +51,6 @@ stdenv.mkDerivation (finalAttrs: { # We patch gobject-introspection to hardcode absolute paths but # our Meson patch will only pass the info when install_dir is absolute as well. ./fix-gir-lib-path.patch - - # Switch to girepository-2.0 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch"; - hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index 75feb5f66ed5a..25a87a9b3013a 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "49.2"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-s7o9aCE+h/gfFzPoVQDDe4K1k4+QCeT+iZlJY9X7K44="; + hash = "sha256-OhA4+BzKqSvsorI7g3BK8CVFP7+YVep2WJEjxD05Vp4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index 595537e2b7c2b..3b3bfc32294f7 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -138,6 +138,8 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "evince"; + # 49.alpha bumps API and breaks sushi. + freeze = true; }; }; 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 1b804fc8348a6..9a45269b21f93 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 c31f3ef..9ebb5f2 100644 +index 12fc59c..3fc80a5 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1944,7 +1944,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index c31f3ef..9ebb5f2 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client, +@@ -2012,7 +2023,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 c31f3ef..9ebb5f2 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact) +@@ -2048,8 +2070,20 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -130,7 +130,7 @@ index 9d986d2..d63902a 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 2a95a75..950f430 100644 +index 60ff97f..8535dec 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) @@ -154,10 +154,10 @@ index 2a95a75..950f430 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 9f8646a..079aba9 100644 +index b16756f..f3d2d6b 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1338,7 +1338,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1433,7 +1433,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -178,7 +178,7 @@ 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 6318854..6b7a88c 100644 +index 2e2dd0b..b5f99ab 100644 --- a/src/calendar/backends/file/e-cal-backend-file.c +++ b/src/calendar/backends/file/e-cal-backend-file.c @@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, @@ -244,7 +244,7 @@ index 92d68e2..d1e1fa4 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 371f9bb..b0a661e 100644 +index 866afd1..e57d877 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void) @@ -267,7 +267,7 @@ index 371f9bb..b0a661e 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2652,7 +2663,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2617,7 +2628,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -290,10 +290,10 @@ index 371f9bb..b0a661e 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index 03b5129..3f4256a 100644 +index a830f89..b9abaa2 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void) +@@ -1638,7 +1638,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -314,7 +314,7 @@ index 03b5129..3f4256a 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index c5ac40f..fb8ae19 100644 +index 94f0769..8de758b 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void) @@ -363,10 +363,10 @@ index 2c0b6ef..b354332 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 c3c2d7d..e1370db 100644 +index e605049..9961fea 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5671,7 +5671,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; @@ -507,7 +507,7 @@ index 3738359..f9ce2d9 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index db775f9..fb524db 100644 +index c999d4d..e9cf7c5 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service, @@ -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 bd9822d..3e021dd 100644 +index bcc2df7..42489da 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1751,7 +1751,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -556,10 +556,10 @@ index bd9822d..3e021dd 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 980ceb1..02d9551 100644 +index 302aacf..ed4a7fa 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -2132,7 +2132,19 @@ static void +@@ -2133,7 +2133,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); @@ -628,27 +628,3 @@ index d531cb9..c96f1d5 100644 switch (g_settings_get_int (settings, "proxy-type")) { case 1: -diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c -index 1c0a113..6b41423 100644 ---- a/src/services/evolution-source-registry/evolution-source-registry.c -+++ b/src/services/evolution-source-registry/evolution-source-registry.c -@@ -181,7 +181,18 @@ main (gint argc, - - reload: - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ } - - if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { - g_settings_set_boolean (settings, "migrated", TRUE); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 7fa55c62c4657..09c72223fabdf 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 (finalAttrs: { pname = "evolution-data-server"; - version = "3.58.3"; + version = "3.60.0"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-2hNtEZDZ6LCUmUUvYFjiTu5rd/RBqMdp90pSRRvzefE="; + hash = "sha256-4E44Pg4osk2Rs9Nz9v+4el1GujhFx5mcQSzHgTrfbBg="; }; patches = [ diff --git a/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch b/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch new file mode 100644 index 0000000000000..30abd12e520d0 --- /dev/null +++ b/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch @@ -0,0 +1,15 @@ +diff --git a/docs/meson.build b/docs/meson.build +index 67c664513033dd8f892870836efaebcab3960af3..83a011f3852b240539fe0d41356ef74fe07a7887 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -39,6 +39,10 @@ if eds_backend_enabled + docs_common_valadoc_flags += ['-D', 'HAS_EDS_3_41'] + endif + ++ if eds_dep.version().version_compare('>=3.59.1') ++ docs_common_valadoc_flags += ['-D', 'HAS_EDS_3_60'] ++ endif ++ + valadoc_targets += { + 'name': 'folks-eds', + 'source_files': eds_backendlib_sources, diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix index 25e649f267533..61d3db04472fa 100644 --- a/pkgs/by-name/fo/folks/package.nix +++ b/pkgs/by-name/fo/folks/package.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IfROK9q7Huf45Bu5ltEKx9rzXHjEmBd9sMAPWAogqRQ="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/81 + ./fix-docs-build-with-eds-3.59.patch + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index 2de3f651a3271..b9ca234e77e3e 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,16 +1,18 @@ -diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index ad2e65cf7..61fb78db8 100644 ---- a/daemon/gdm-local-display-factory.c -+++ b/daemon/gdm-local-display-factory.c -@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration { - { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" }, - #endif - #ifdef ENABLE_X11_SUPPORT -- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, -+ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" }, - #endif - { NULL, NULL, NULL }, - }; +diff --git a/common/gdm-common.c b/common/gdm-common.c +index edf702ec5..3a75af430 100644 +--- a/common/gdm-common.c ++++ b/common/gdm-common.c +@@ -994,8 +994,8 @@ const char * const + gdm_find_x_server (void) + { + const char * const x_servers[] = { +- "/usr/bin/Xorg", +- "/usr/bin/X", ++ "@xorgserver@/bin/Xorg", ++ "@xorgserver@/bin/X", + }; + const char *override = NULL; + diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 457dcf88d..a71b89ba8 100644 --- a/daemon/gdm-manager.c diff --git a/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch index 58481f0730fae..bb76aa19aa1a4 100644 --- a/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch +++ b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch @@ -1,40 +1,33 @@ diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c -index 88fe96f..b1b140a 100644 +index ed01fbe52..de3a6e647 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c -@@ -664,18 +664,34 @@ spawn_session (State *state, - state->session_command, - NULL); - } else { -+ char const *session_wrapper; -+ char *eff_session_command; - int ret; - char **argv; +@@ -670,12 +670,27 @@ spawn_session (State *state, + g_subprocess_launcher_setenv (launcher, "WINDOWPATH", vt, TRUE); + } -- ret = g_shell_parse_argv (state->session_command, -+ session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER"); -+ if (session_wrapper != NULL) { -+ char *quoted_wrapper = g_shell_quote(session_wrapper); -+ eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL); -+ g_free(quoted_wrapper); -+ } else { -+ eff_session_command = state->session_command; -+ } ++ char const *session_wrapper; ++ char *eff_session_command; ++ session_wrapper = g_getenv ("GDM_X_SESSION_WRAPPER"); ++ if (session_wrapper != NULL) { ++ char *quoted_wrapper = g_shell_quote (session_wrapper); ++ eff_session_command = g_strjoin (" ", quoted_wrapper, state->session_command, NULL); ++ g_free (quoted_wrapper); ++ } else { ++ eff_session_command = state->session_command; ++ } + -+ ret = g_shell_parse_argv (eff_session_command, - NULL, - &argv, - &error); + subprocess = g_subprocess_launcher_spawn (launcher, + &error, + GDMCONFDIR "/Xsession", +- state->session_command, ++ eff_session_command, + NULL); -+ if (session_wrapper != NULL) { -+ g_free(eff_session_command); -+ } ++ if (session_wrapper != NULL) { ++ g_free (eff_session_command); ++ } + - if (!ret) { - g_debug ("could not parse session arguments: %s", error->message); - goto out; - } -+ - subprocess = g_subprocess_launcher_spawnv (launcher, - (const char * const *) argv, - &error); + if (subprocess == NULL) { + g_debug ("could not start session: %s", error->message); + goto out; diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 72a3fe6d97e42..a84f733c33454 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -25,6 +25,7 @@ audit, gobject-introspection, plymouth, + polkit, coreutils, xorg-server, dbus, @@ -43,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "49.2"; + version = "50.0"; outputs = [ "out" @@ -52,14 +53,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-mBNjH59fD4YOoUpDeGbmDvx77TAjt8O3Zcxd4d5ZegY="; + hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8="; }; mesonFlags = [ "-Dgdm-xsession=true" # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 "-Dinitial-vt=1" - "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "--sysconfdir=/etc" @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { libselinux pam plymouth + polkit systemd ]; @@ -133,11 +134,6 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # Upstream checks some common paths to find an `X` binary. We already know it. - echo #!/bin/sh > build-aux/find-x-server.sh - echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh - patchShebangs build-aux/find-x-server.sh - # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7 # The gdm-auth-config tool is probably not too useful for NixOS, but we still want the dconf profile # installed (mostly just because .passthru.tests can make use of it). diff --git a/pkgs/by-name/gd/gdm/reset-environment.patch b/pkgs/by-name/gd/gdm/reset-environment.patch index 61defd9c4bc20..33a1f8125b5d7 100644 --- a/pkgs/by-name/gd/gdm/reset-environment.patch +++ b/pkgs/by-name/gd/gdm/reset-environment.patch @@ -1,20 +1,24 @@ +diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c +index 3ca2d1496..cb9e96101 100644 --- a/daemon/gdm-wayland-session.c +++ b/daemon/gdm-wayland-session.c -@@ -285,6 +285,7 @@ spawn_session (State *state, +@@ -287,6 +287,7 @@ spawn_session (State *state, + "XAUTHORITY", "WAYLAND_DISPLAY", "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", + "__NIXOS_SET_ENVIRONMENT_DONE", NULL }; - - g_debug ("Running wayland session"); + /* The environment variables listed below are those we have set (or + * received from our own execution environment) only as a fallback to +diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c +index ed01fbe52..06efac2df 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c -@@ -610,6 +610,7 @@ spawn_session (State *state, +@@ -603,6 +603,7 @@ spawn_session (State *state, + "XAUTHORITY", "WAYLAND_DISPLAY", "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", + "__NIXOS_SET_ENVIRONMENT_DONE", NULL }; - - g_debug ("Running X session"); + /* The environment variables listed below are those we have set (or + * received from our own execution environment) only as a fallback to diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix index f7b602a3351bc..2e7334fc42c63 100644 --- a/pkgs/by-name/ge/gexiv2/package.nix +++ b/pkgs/by-name/ge/gexiv2/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/by-name/ge/gexiv2_0_16/package.nix b/pkgs/by-name/ge/gexiv2_0_16/package.nix new file mode 100644 index 0000000000000..0a6a356fa808a --- /dev/null +++ b/pkgs/by-name/ge/gexiv2_0_16/package.nix @@ -0,0 +1,86 @@ +{ + stdenv, + lib, + fetchurl, + meson, + mesonEmulatorHook, + ninja, + pkg-config, + exiv2, + glib, + gobject-introspection, + vala, + gi-docgen, + python3, +}: + +stdenv.mkDerivation rec { + pname = "gexiv2"; + version = "0.16.0"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gexiv2/${lib.versions.majorMinor version}/gexiv2-${version}.tar.xz"; + sha256 = "2W+JXyRTn5ZvV3srskia6E+CMpcKjQwGTkoAdHSne7s="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + glib + ]; + + propagatedBuildInputs = [ + exiv2 + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dtests=true" + ]; + + doCheck = true; + + preCheck = + let + libName = if stdenv.hostPlatform.isDarwin then "libgexiv2-0.16.4.dylib" else "libgexiv2-0.16.so.4"; + in + '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/${libName} $out/lib/${libName} + export GI_TYPELIB_PATH=$PWD/gexiv2 + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = { + homepage = "https://gitlab.gnome.org/GNOME/gexiv2"; + description = "GObject wrapper around the Exiv2 photo metadata library"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.gnome ]; + }; +} diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 2dcfbe771e775..9a1e8de811c50 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.3"; + version = "50.0"; 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-y8hEJ7Kt6pQDUCoSXzZrnyiIE/cugb9rGRVGBvFZ3Tk="; + hash = "sha256-gyXKSx+nU3XPiVHmL4Z/pqhCgiwt1aRqmHc2CBizAhI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch index d597f99b02d81..9b5a2e088aecd 100644 --- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch +++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch @@ -1,12 +1,10 @@ -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 -@@ -34,7 +34,6 @@ jasmine_tests = [ +@@ -37,7 +37,6 @@ jasmine_tests = [ + 'GObjectInterface', + 'GObjectValue', 'GTypeClass', - 'Importer', - 'Importer2', - 'Introspection', - 'Lang', - 'LegacyByteArray', - 'LegacyClass', + 'Namespace', + 'ParamSpec', + 'Print', diff --git a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch index b4f4be0f16aad..7b0f3c7dfab03 100644 --- a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch +++ b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch @@ -1,10 +1,8 @@ -diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js -index b94aa7c8..8f79fe71 100644 --- a/installed-tests/js/testGIMarshalling.js +++ b/installed-tests/js/testGIMarshalling.js -@@ -2931,7 +2931,7 @@ describe('Filename tests', function () { +@@ -3013,7 +3013,7 @@ describe('Filename tests', function () { }); - + it('various types of path existing', function () { - const paths = ['foo-2', 'öäü-3']; + const paths = ['foo-2']; diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch index 99e82c9be3dc2..0d17eb44f6840 100644 --- a/pkgs/by-name/gj/gjs/fix-paths.patch +++ b/pkgs/by-name/gj/gjs/fix-paths.patch @@ -1,12 +1,10 @@ -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 @@ -6,7 +6,7 @@ if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then gjs="$TOP_BUILDDIR/gjs-console" else -- gjs=gjs-console +- gjs="gjs-console" + gjs=@gjsConsole@ fi diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch index 403a9c372d4ed..99dcbcfde95b4 100644 --- a/pkgs/by-name/gj/gjs/installed-tests-path.patch +++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch @@ -1,5 +1,3 @@ -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index 98475f7d..942d9eca 100644 --- a/installed-tests/js/meson.build +++ b/installed-tests/js/meson.build @@ -10,7 +10,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources', @@ -20,7 +18,7 @@ index 98475f7d..942d9eca 100644 } configure_file(configuration: test_description_subst, input: '../minijasmine.test.in', -@@ -122,7 +122,7 @@ foreach test : dbus_tests +@@ -122,7 +122,7 @@ endif dbus_test_description_subst = { 'name': 'testGDBus.js', @@ -29,7 +27,7 @@ index 98475f7d..942d9eca 100644 } configure_file( configuration: dbus_test_description_subst, -@@ -159,7 +159,7 @@ foreach test : modules_tests +@@ -166,7 +166,7 @@ foreach test : modules_tests esm_test_description_subst = { 'name': 'test@0@.js'.format(test), @@ -37,9 +35,7 @@ index 98475f7d..942d9eca 100644 + 'installed_tests_execdir': installed_tests_execdir, } configure_file(configuration: esm_test_description_subst, - input: '../minijasmine-module.test.in', -diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 7a7c48ab..52508c2c 100644 + input: '../minijasmine-legacy-importer.test.in', --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -34,7 +34,7 @@ foreach test : simple_tests @@ -51,7 +47,7 @@ index 7a7c48ab..52508c2c 100644 } configure_file(configuration: test_description_subst, input: 'script.test.in', output: 'test@0@.sh.test'.format(test), -@@ -123,7 +123,7 @@ foreach test : debugger_tests +@@ -88,7 +88,7 @@ foreach test : debugger_tests test_description_subst = { 'name': '@0@.debugger'.format(test), @@ -60,19 +56,15 @@ index 7a7c48ab..52508c2c 100644 } configure_file(configuration: test_description_subst, input: 'debugger.test.in', -diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in -index debefc4c..96a91b88 100644 ---- a/installed-tests/script.test.in -+++ b/installed-tests/script.test.in -@@ -3,5 +3,5 @@ +@@ -122,7 +122,7 @@ foreach test : module_debugger_tests - [Test] - Type=session --Exec=sh @prefix@/@installed_tests_execdir@/scripts/@name@ -+Exec=sh @installed_tests_execdir@/scripts/@name@ - Output=TAP -diff --git a/meson.build b/meson.build -index bbfe8bc8..e6f87dc3 100644 + test_description_subst = { + 'name': '@0@.debugger'.format(filename), +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file(configuration: test_description_subst, + input: 'debugger.test.in', --- a/meson.build +++ b/meson.build @@ -25,8 +25,8 @@ datadir = get_option('datadir') @@ -86,7 +78,7 @@ index bbfe8bc8..e6f87dc3 100644 ### Check for conflicting build options ######################################## -@@ -577,9 +577,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind +@@ -605,9 +605,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind install_data('installed-tests/extra/lsan.supp', install_dir: gjsjsdir / 'lsan') if get_option('installed_tests') @@ -98,8 +90,6 @@ index bbfe8bc8..e6f87dc3 100644 endif ### Generate pkg-config file ################################################### -diff --git a/meson_options.txt b/meson_options.txt -index fe425efd..29325756 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,3 +24,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index a4e0581a7a9f8..30b62ac129a9d 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -8,7 +8,6 @@ pkg-config, gnome, gtk3, - gtk4, atk, gobject-introspection, spidermonkey_140, @@ -31,7 +30,8 @@ let testDeps = [ gtk3 - gtk4 + # FIXME: Gtk4Warnings fails + # gtk4 atk pango.out gdk-pixbuf @@ -41,7 +41,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.86.0"; + version = "1.88.0"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k="; + hash = "sha256-MKC58zF+jmCxiW2ykDxw6LDNM9+VPDKHVYA6dRkdxFM="; }; patches = [ diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 44b9c0f87d1bd..9502b428c2a16 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.86.3"; + version = "2.88.0"; outputs = [ "bin" @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-syEdjTS5313KBXh+8K1dfKdd7JmLlw4aqwAB0imXfGU="; + hash = "sha256-NUYlHMuzdE1LxOtINUVA4fYgCEZXK6to46K3srZN/Qc="; }; patches = diff --git a/pkgs/by-name/gl/glibmm_2_68/package.nix b/pkgs/by-name/gl/glibmm_2_68/package.nix index 69744a348c83b..0500dca513a45 100644 --- a/pkgs/by-name/gl/glibmm_2_68/package.nix +++ b/pkgs/by-name/gl/glibmm_2_68/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "glibmm"; - version = "2.86.0"; + version = "2.88.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor finalAttrs.version}/glibmm-${finalAttrs.version}.tar.xz"; - hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY="; + hash = "sha256-plSdo6bEPeg7hxfa5UE8V6YNkvbsxiRhXGEtC7CtD+I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index da9072f1b8b7e..d8154407e6d99 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 (finalAttrs: { pname = "gnome-backgrounds"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major finalAttrs.version}/gnome-backgrounds-${finalAttrs.version}.tar.xz"; - hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU="; + hash = "sha256-Gs26estPNMcyH+vGJzRENE/VX9WTYR1EbecIYBg7Urg="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index 81b07fc583e04..48df56993ca50 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 (finalAttrs: { pname = "gnome-boxes"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major finalAttrs.version}/gnome-boxes-${finalAttrs.version}.tar.xz"; - hash = "sha256-VUeIAd3Qg4IL0yMZKoN04E879CoOcSYy0F5olVMORMo="; + hash = "sha256-/Wpd4Y0QkJRsqZ8fWjSqPhXcgYP2pyIm6NFQShNnLWc="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index ac949d15e6603..e0d73bc14464d 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "49.1"; + version = "50.0"; outputs = [ "out" @@ -52,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-O55HmDiPlZ4QMsas5KX7e05Yi2M5/OTCLsJqvoafiis="; + hash = "sha256-RtVP0T9PS9tu7X0AS0mdC22adqb6/GitFsOJlT/ZL0Y="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 67500d02803a1..9c118a8476a9b 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-calculator"; - version = "49.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major finalAttrs.version}/gnome-calculator-${finalAttrs.version}.tar.xz"; - hash = "sha256-3fTNLt2hNcQcivaPnAzc2dmpFjy59/jijKLI6B/Ydlc="; + hash = "sha256-gFPWiRVl6IKHS2XB21HFvzEABet4i4usNUY5B0M1CpA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index c3f2f04b7c1a9..9f76e9a89df20 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -12,6 +12,7 @@ gettext, libxml2, gnome, + fribidi, gtk4, evolution-data-server-gtk4, libical, @@ -24,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-calendar"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major finalAttrs.version}/gnome-calendar-${finalAttrs.version}.tar.xz"; - hash = "sha256-DBEVqylNUyxMGfVs4Neu5T+OoysUMCCd0dntpHqD0sI="; + hash = "sha256-S3XfBxpS2Y+zXmR9AYAwEp0k2QB3kNAkV3RsmGF66rA="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + fribidi gtk4 evolution-data-server-gtk4 libical diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index f6d444760b694..bd5822f9767cc 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 (finalAttrs: { pname = "gnome-characters"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major finalAttrs.version}/gnome-characters-${finalAttrs.version}.tar.xz"; - hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw="; + hash = "sha256-QHBzTdY5swlL5Ge7BVpUYbL8MBzfyf7dy0po9HbtWq0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index c05c18d87fdcc..303e17806ce09 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 (finalAttrs: { pname = "gnome-chess"; - version = "49.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major finalAttrs.version}/gnome-chess-${finalAttrs.version}.tar.xz"; - hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA="; + hash = "sha256-otvnxhO0ZykUF0fii7DLhhTlfeFW07ndpqzosBRqW/w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix index ed0b223c66ddd..bb49f1bc8bd19 100644 --- a/pkgs/by-name/gn/gnome-clocks/package.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -20,21 +20,24 @@ gdk-pixbuf, geoclue2, gst_all_1, + icu, libgweather, libadwaita, + vorbis-tools, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; - hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo="; + hash = "sha256-vxZ/f0T08vtCTUcWZSybofKeFuSQceJqG7gz+NznlMY="; }; nativeBuildInputs = [ vala + vorbis-tools meson ninja pkg-config @@ -53,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop geocode-glib_2 geoclue2 + icu libgweather libadwaita ] diff --git a/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch deleted file mode 100644 index 96688c8d80867..0000000000000 --- a/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0417f60c7e760e1ebc6acd3dc23818b38c3929e7 Mon Sep 17 00:00:00 2001 -From: Weijia Wang -Date: Mon, 7 Aug 2023 21:51:30 +0200 -Subject: [PATCH] Fix build with Exiv2 0.28 - ---- - src/gcm-helper-exiv.cpp | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp -index 7ec69948..23c8b320 100644 ---- a/src/gcm-helper-exiv.cpp -+++ b/src/gcm-helper-exiv.cpp -@@ -22,6 +22,10 @@ - #include - #include - -+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 28) -+#define HAVE_EXIV2_0_28 -+#endif -+ - #if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27) - #define HAVE_EXIV2_ERROR_CODE - #include -@@ -33,7 +37,11 @@ - int - main (int argc, char* const argv[]) - { -+#ifdef HAVE_EXIV2_0_28 -+ Exiv2::Image::UniquePtr image; -+#else - Exiv2::Image::AutoPtr image; -+#endif - Exiv2::ExifData exifData; - std::string filename; - std::string make; -@@ -57,7 +65,9 @@ main (int argc, char* const argv[]) - if (argc == 2) - filename = argv[1]; - if (filename.empty()) --#ifdef HAVE_EXIV2_ERROR_CODE -+#ifdef HAVE_EXIV2_0_28 -+ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "No filename specified"); -+#elif defined(HAVE_EXIV2_ERROR_CODE) - throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); - #else - throw Exiv2::Error(1, "No filename specified"); -@@ -70,7 +80,9 @@ main (int argc, char* const argv[]) - if (exifData.empty()) { - std::string error(argv[1]); - error += ": No Exif data found in the file"; --#ifdef HAVE_EXIV2_ERROR_CODE -+#ifdef HAVE_EXIV2_0_28 -+ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); -+#elif defined(HAVE_EXIV2_ERROR_CODE) - throw Exiv2::Error(Exiv2::kerErrorMessage, error); - #else - throw Exiv2::Error(1, error); -@@ -89,7 +101,11 @@ main (int argc, char* const argv[]) - std::cout << model << "\n"; - std::cout << make << "\n"; - std::cout << serial << "\n"; -+#ifdef HAVE_EXIV2_0_28 -+ } catch (Exiv2::Error& e) { -+#else - } catch (Exiv2::AnyError& e) { -+#endif - std::cout << "Failed to load: " << e << "\n"; - retval = -1; - } --- -2.39.2 (Apple Git-143) - diff --git a/pkgs/by-name/gn/gnome-color-manager/package.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix index e47c1758c4264..dba4765edd71d 100644 --- a/pkgs/by-name/gn/gnome-color-manager/package.nix +++ b/pkgs/by-name/gn/gnome-color-manager/package.nix @@ -11,27 +11,19 @@ gnome, glib, gtk3, - libexif, - libtiff, colord, - colord-gtk, - libcanberra-gtk3, lcms2, - vte, - exiv2, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-color-manager"; - version = "3.32.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor finalAttrs.version}/gnome-color-manager-${finalAttrs.version}.tar.xz"; - hash = "sha256-fDwXj6rPy/EdVt4izSZZRqfViqEOPNlowpOOL79Q/e4="; + hash = "sha256-OQTUKrtOpWbfC4gOgr8Ln4Y4bGkvFbMYRppMe+M6iH8="; }; - patches = [ ./0001-Fix-build-with-Exiv2-0.28.patch ]; - nativeBuildInputs = [ meson ninja @@ -45,14 +37,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk3 - libexif - libtiff colord - colord-gtk - libcanberra-gtk3 lcms2 - vte - exiv2 ]; strictDeps = true; @@ -60,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-color-manager"; - freeze = true; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 5f9586ae53a5c..998e93f592fe8 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-connections"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz"; - hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54="; + hash = "sha256-Vnv2NcbTA66Ex083yE35+4/Pal6d/0UuFBTGcXRNldA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index 5f6825b5bef36..695bac3a631c0 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-console"; - version = "49.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major finalAttrs.version}/gnome-console-${finalAttrs.version}.tar.xz"; - hash = "sha256-J7As6OiQ/49TyoXbeGsa41kD8LYyeBLwIk3AtUsQiNs="; + hash = "sha256-5JUCB/BUfmpsDxjuv89uGhBGHqsPL64KrlErEETHrG4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index ab06d7c8de208..774afd839e5dc 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -23,6 +23,8 @@ meson, ninja, libadwaita, + libglycin, + libglycin-gtk4, gsettings-desktop-schemas, gst_all_1, pipewire, @@ -30,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-contacts"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major finalAttrs.version}/gnome-contacts-${finalAttrs.version}.tar.xz"; - hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8="; + hash = "sha256-KjvqNDFxviRPErfCGkDKOOmpLeqYkDk69eisE5vA2rM="; }; nativeBuildInputs = [ @@ -63,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas folks libadwaita + libglycin + libglycin-gtk4 libxml2 gnome-online-accounts qrencode diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 95ba382789e33..777f14d95198d 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -68,6 +68,7 @@ upower, wayland-scanner, libepoxy, + gmobile, gnome-user-share, gnome-remote-desktop, wrapGAppsHook4, @@ -76,11 +77,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "49.5"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-wlPcn2awFets6E+PFXWkZ97tCs2fV1AecFIMpJSqxDA="; + hash = "sha256-IOjVsTufOQWBAEyrNLdDcsD/Shb5wRv/2T2DhvvN7rM="; }; patches = [ @@ -116,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking gcr_4 + gmobile gnome-bluetooth gnome-desktop gnome-online-accounts diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 33429df089699..979cee9c9aee9 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -14,15 +14,16 @@ wrapGAppsHook4, gnome, harfbuzz, + desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-font-viewer"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major finalAttrs.version}/gnome-font-viewer-${finalAttrs.version}.tar.xz"; - hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ="; + hash = "sha256-lWSwiMWxUMVOKjp7xwFN7sbuVRJh6YSI+JGx8bjca4A="; }; doCheck = true; @@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 libxml2 glib + desktop-file-utils ]; buildInputs = [ @@ -45,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: { fribidi ]; - # Do not run meson-postinstall.sh - preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; - - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - }; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index 35979bc9c015d..7a982e044d492 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 = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg="; + hash = "sha256-LalrdqNDRGilV/5IG4z+YGJi81N7AKTCDUqiOaROluE="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index 223cfa31ad283..7d7a4f727aff0 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-keyring"; - version = "48.0"; + version = "50.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major finalAttrs.version}/gnome-keyring-${finalAttrs.version}.tar.xz"; - hash = "sha256-8gUYySDp6j+cm4tEvoxQ2Nf+7NDdViSWD3e9LKT7650="; + hash = "sha256-y9cgYsU8lwK8LEczmRrV8FHKaCiCswkFooKbzxqOzHw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix index 3dce3e45e6d8a..a98e96fc6e926 100644 --- a/pkgs/by-name/gn/gnome-logs/package.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-logs"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major finalAttrs.version}/gnome-logs-${finalAttrs.version}.tar.xz"; - hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU="; + hash = "sha256-tGbGZgFVUhuoE1M5xt8ICg4HGkb5kRuZFysh+eLf2Ag="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-manuals/package.nix b/pkgs/by-name/gn/gnome-manuals/package.nix index a325c0c8a503f..52a8f74c2ca15 100644 --- a/pkgs/by-name/gn/gnome-manuals/package.nix +++ b/pkgs/by-name/gn/gnome-manuals/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-manuals"; - version = "49.0"; + version = "50.1"; src = fetchurl { url = "mirror://gnome/sources/manuals/${lib.versions.major finalAttrs.version}/manuals-${finalAttrs.version}.tar.xz"; - hash = "sha256-7WRGxMLSnCuQYrKoynJxzbrPx4z9tP3NDzvEjYyefwg="; + hash = "sha256-foRBdV0N5xdCjIAORa4GyF7JZK9GrFO53GW0G8OjLHQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 2dec463685f32..9e3456043be0d 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + blueprint-compiler, meson, ninja, gettext, @@ -30,16 +31,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "49.4"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-hvqvWNQNauDy9fN8nA3TEsPuKqTlElsfSjHv5Kn4BLA="; + hash = "sha256-CmbgGr0s8Eink7D4OrKkFWAGB18n4bKJb9gohpTRNm4="; }; doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ + blueprint-compiler gettext meson ninja diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix index 09a1a69250675..12117b860d921 100644 --- a/pkgs/by-name/gn/gnome-mines/package.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-mines"; - version = "49.0.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz"; - hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ="; + hash = "sha256-nTpEEi0Er3h8ZKhp75DdVOp1AOW0i+RXxtZNmydz+58="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index c46d0ea2178a7..8938be27fcf22 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.4.2"; + version = "4.5.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-FuBgKHBkamZTh2y8Ye4j92NAwmsSyeicfDASCEUEQVU="; + hash = "sha256-hLrSgl05uL9wHvZEqrFrLcfnK7Q+P4cC0j7slhPSljc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index d0565a2e6477b..af9ebb7610303 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.56.4"; + version = "3.58.0"; 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-KoMeratF44quM+ginDyUTfoVId6cMUDTYCqSd8qhYbM="; + hash = "sha256-NE1N/5FJoa3EU5QXGT4ezML3bvQKwk4QTM9YByvlWZk="; }; mesonFlags = [ diff --git a/pkgs/by-name/gn/gnome-power-manager/package.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix index c3d4b5d66d6e4..c5936900dd003 100644 --- a/pkgs/by-name/gn/gnome-power-manager/package.nix +++ b/pkgs/by-name/gn/gnome-power-manager/package.nix @@ -4,31 +4,31 @@ gettext, fetchurl, pkg-config, - gtk3, + gtk4, glib, meson, ninja, upower, python3, desktop-file-utils, - wrapGAppsHook3, + wrapGAppsHook4, gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-power-manager"; - version = "43.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major finalAttrs.version}/gnome-power-manager-${finalAttrs.version}.tar.xz"; - hash = "sha256-faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; + hash = "sha256-vyQ9Y4n4v6cclYU07SZpspllxH9Vw8vkmDspbQ+Z5dc="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook3 + wrapGAppsHook4 gettext # needed by meson_post_install.sh @@ -38,11 +38,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk3 + gtk4 glib upower ]; + postPatch = '' + substituteInPlace meson_post_install.sh \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-power-manager"; }; }; diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 2e8de6eac7b94..2817c157be974 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -13,6 +13,7 @@ libei, libepoxy, libdrm, + libkrb5, libva, vulkan-loader, shaderc, @@ -34,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-remote-desktop"; - version = "49.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major finalAttrs.version}/gnome-remote-desktop-${finalAttrs.version}.tar.xz"; - hash = "sha256-c9ROHnR04WIVgP9WEs3+HZxIr8+rRUjOkh1cpuLZFq0="; + hash = "sha256-dwNRr9R6v/6TpIjUDv9rMj2ahn/eebOKPosYYAx05fQ="; }; nativeBuildInputs = [ @@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { libei libepoxy libdrm + libkrb5 libva vulkan-loader nv-codec-headers-11 diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 6afb449c1f7cc..6e66718a9791e 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -9,8 +9,8 @@ gtk4, itstool, libadwaita, - librsvg, - libxml2, + libglycin, + libglycin-gtk4, gst_all_1, meson, ninja, @@ -24,17 +24,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-robots"; - version = "41.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz"; - hash = "sha256-kSHC+DaBIEP+7yumYc1dD9SOPWMZxDlBuf3RWLmw65E="; + hash = "sha256-YX5XTBX5Bhi4JJPJk51xdZatLOH/HeCq1cnDl2Yz03k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gnome-robots-${finalAttrs.version}"; - hash = "sha256-1h9+XPmkapzdYsI6qtPPHtlwEEmyIzaAogLiYvIHJak="; + hash = "sha256-T3o4zlRLQzrLexSDI9A98bubehYFwJY1zBVUUNmrc9o="; }; nativeBuildInputs = [ @@ -54,8 +54,8 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - librsvg - libxml2 + libglycin + libglycin-gtk4 # Sound playback, not checked at build time. gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 4a8c6410c0bb1..35f35b3e72d38 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 (finalAttrs: { pname = "gnome-session-ctl"; - version = "49.0"; + version = "50.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "gnome-session-ctl"; - rev = finalAttrs.version; - hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y="; + tag = finalAttrs.version; + hash = "sha256-XKOWn6Yuyf5QXuvDfFEWL/ElfcL0s9mHsyuBwdIenLM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index bcb2f7e15e565..f1f41e7ea312e 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -8,33 +8,26 @@ pkg-config, gnome, gobject-introspection, - adwaita-icon-theme, glib, - gtk4, gsettings-desktop-schemas, gnome-desktop, gnome-settings-daemon, gnome-shell, dbus, - json-glib, - libice, xmlto, docbook_xsl, docbook_xml_dtd_45, - python3, libxslt, gettext, systemd, - xtrans, - libepoxy, gnome-session-ctl, - wrapGAppsHook4, + wrapGAppsNoGuiHook, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "49.2"; + version = "50.0"; outputs = [ "out" @@ -43,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-/NtPRdamDYTp7K4eN0C6tuVbqwy0ng+zgoDps486hIU="; + hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY="; }; patches = [ @@ -61,29 +54,19 @@ stdenv.mkDerivation (finalAttrs: { libxslt docbook_xsl docbook_xml_dtd_45 - python3 dbus # for DTD - wrapGAppsHook4 + wrapGAppsNoGuiHook ]; buildInputs = [ glib - gtk4 - libice gnome-desktop - json-glib - xtrans - adwaita-icon-theme gnome-settings-daemon gsettings-desktop-schemas systemd - libepoxy ]; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - # Use our provided `gnome-session-ctl` original="@libexecdir@/gnome-session-ctl" replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" @@ -99,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir $sessions moveToOutput share/wayland-sessions "$sessions" - moveToOutput share/xsessions "$sessions" # Our provided one is being used rm -rf $out/libexec/gnome-session-ctl diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index d7930ca5a4c0e..84f50c36530f2 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-KplX/E+Rw7kSe0lIQXm+9IUSDZwcII5E1E5qdG5swcE="; + hash = "sha256-2CtQM2yYou1xPpcWw3ISW7Mb38La6dlbqu9Ndp1hT7Y="; }; patches = [ @@ -57,15 +57,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./fix-paths.patch { inherit tzdata; }) - - # Fix crash when switching to hands-free mode on a bluetooth headset - (fetchpatch { - name = "fix-bluetooth-handsfree-crash.patch"; - url = "https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/merge_requests/31.patch"; - hash = "sha256-jFbItlXT05nnp825R/HvsWDFxAMzL4z36CsxhQ2sEIY="; - stripLen = 1; - extraPrefix = "subprojects/gvc/"; - }) ]; depsBuildBuild = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 5116646b71027..731249101d7ca 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 = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI="; + hash = "sha256-u4sMpPJ++1+WLK9epJ2LfKe1qefkSzUB/J3eL94nwGc="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 751fae4d6336b..5149f3a905201 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "49.4"; + version = "50.0"; outputs = [ "out" @@ -83,7 +83,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-nW8MovAUDBFPEU9nB0E2EfYU+x6mwxeo0fzEDDxZWwg="; + hash = "sha256-hZUvvUkpz+YTuHayI34NE0ZLDCeIuKmGf7UcJgJVsOM="; }; patches = [ 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 b3a55bcc291ec..6efdff420d04f 100644 --- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch +++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch @@ -1,9 +1,9 @@ --- a/subprojects/libshew/src/meson.build +++ b/subprojects/libshew/src/meson.build -@@ -13,7 +13,7 @@ shew_sources = [ +@@ -15,7 +15,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, - dependencies: [gtk_dep, x11_dep], + dependencies: [gtk_dep], - install_dir: pkglibdir, + install_dir: get_option('prefix') / pkglibdir, install: true, diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index cb7c19d24754e..e0be399355949 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 = "49.3"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-9kbbLxK89Ag3K2tJrpEJn85S0OrHYs6iMRqMik3/nQA="; + hash = "sha256-NRXiAV8jW2q7ejQoBgCKyx8YTCnZxM7TWB+O1MHxwkE="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 3752746aec3b1..061727b45dcc6 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 (finalAttrs: { pname = "gnome-sudoku"; - version = "49.4"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major finalAttrs.version}/gnome-sudoku-${finalAttrs.version}.tar.xz"; - hash = "sha256-nIzQZ6RSOHiq/zBHovvYb4izGYQkPw1CorHk8+ZFH1A="; + hash = "sha256-Ul/t/yh8g+P6c8WkdOGknw0Li1iOPesIyjQXcMeBQl0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch index 967ef5e155421..9f1fb926cced5 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch @@ -1,7 +1,7 @@ -diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp +diff --git a/src/actions/gsm_pkexec.cpp b/src/actions/gsm_pkexec.cpp index 5e1edf2f..717d7bf1 100644 ---- a/src/gsm_pkexec.cpp -+++ b/src/gsm_pkexec.cpp +--- a/src/actions/gsm_pkexec.cpp ++++ b/src/actions/gsm_pkexec.cpp @@ -36,5 +36,6 @@ gsm_pkexec_create_root_password_dialog (const char *command) gboolean procman_has_pkexec (void) diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index e088992f463bc..ee47dd2582390 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-kVtqMhraEuunv1eMIMn+XkH1XVMoR8vRJLvdquwR1w8="; + hash = "sha256-pBOKp1S0WExG3pH60daF4nsSvCRX3nYYY7a+AthMSGI="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix index 24f5b55a610b1..cd095dddf795d 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 = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8="; + hash = "sha256-JUKsskhQCC4Mz2qhevllHbcdIvDiM/2/XtDP/i5FvAY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 34f23c65f39c6..5416d13952da4 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.58.1"; + version = "3.60.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; - hash = "sha256-HfuutVpxz8NqIaoe5KDUWcP96Ls9ZbCfvKaVx/3fvro="; + hash = "sha256-uNrz8IVFFyxNKIVzP3IDYasDSepmm5kkXu1K0W7T3ig="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 7a25118f6a5df..ffafb849bb033 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-8ESPJHu1l5pQxgIixExFEYgK1HTiVJV2Xl7SJG5U27E="; + hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix index 2b31cd8e8375a..f71335a95c12f 100644 --- a/pkgs/by-name/gn/gnome-tour/package.nix +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-tour"; - version = "49.0"; + version = "50.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz"; - hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM="; + hash = "sha256-1BHZlQU59KNdlXFkZ9jr+i9vPCq/5noP3qu8eXbnlik="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index e9fb9039747ea..246b3cd0420cd 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-docs"; - version = "49.4"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz"; - hash = "sha256-BkRI6t1cHxW8j+tQQYpjRxFO+BXcjRXQCiDcX0iuioA="; + hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index ba30db8e9b917..9c50e95c95775 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-weather"; - version = "49.0"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz"; - hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8="; + hash = "sha256-V951eGBfkfmrQAVRznc423UFvIj0KjPHDOenAWf9tRM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 84d8c641770e6..13fe4dd98f14c 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gom"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gom/${lib.versions.majorMinor finalAttrs.version}/gom-${finalAttrs.version}.tar.xz"; - sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ="; + sha256 = "TXpeJoaYyOfkBgPjbp46K3YTOTHOG2N8ETYwFJG1TMM="; }; patches = [ diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix index 758c2489138cf..5d60295a6a836 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 = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${lib.versions.major version}/gsettings-desktop-schemas-${version}.tar.xz"; - hash = "sha256-d3p/g9XlqAdrm/gJyyQQGxsbqcIwI148PejhOWjtDmM="; + hash = "sha256-NY8HyyU3J2UOEygF3zxp97+QRIBAvOFxtvbyyxucN+8="; }; strictDeps = true; diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix index 40088454689e7..505be3820a9b5 100644 --- a/pkgs/by-name/gs/gspell/package.nix +++ b/pkgs/by-name/gs/gspell/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.14.2"; + version = "1.14.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gspell/${lib.versions.majorMinor version}/gspell-${version}.tar.xz"; - sha256 = "TsflrMyQEygbrNa7wAAGvnM4GLgbo/4zLB6HbH4eFHc="; + sha256 = "6LOcZ1VvdUlTYpUvgcokG1o8F8dZYLd/yT+nAsYSpaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix index 42c2c20f9762f..56105152fafbf 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-08-15"; + version = "0-unstable-2026-02-24"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gtk-frdp"; - rev = "b59dc88624511311576dca607d3cb9317569de34"; - hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s="; + rev = "5351db944c9df7bac071be8dc7398aed23fc57ca"; + hash = "sha256-wcjdV9+kJD7kpZVcWxTImK+xex0SIlydsrfX6mr+asE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix index 98e575145d7dc..3c3ffc066dbb9 100644 --- a/pkgs/by-name/gt/gtk3/package.nix +++ b/pkgs/by-name/gt/gtk3/package.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.51"; + version = "3.24.52"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-ABOHfGvSPC2+Qq18cKBT0ORJvmZzZXTjeGfEnF+QWk8="; + hash = "sha256-gJMfpHKne5oWT2dA48C0RPrGdwBUYy01p/+dZ55ee58="; }; patches = [ diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 1c4f88ccb9f5d..30965a97a0fb1 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -36,7 +36,6 @@ libxkbcommon, libpng, libtiff, - librsvg, libjpeg, libxml2, gnome, @@ -77,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.20.3"; + version = "4.22.1"; outputs = [ "out" @@ -93,15 +92,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-KHPykDCIpmxxFz6i7YX/riZqZrlyw6SEK7svbxh+wVM="; + hash = "sha256-zXtanEESfab7MhxahCrXPGLmmW+c4/GWDKUJ9lWdVfw="; }; - # TODO: make it unconditional on rebuild, drop on version >= 4.20.4 - patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3b7ed49f26700c65fa9c6f41cf40d4fd5f921756.diff"; - hash = "sha256-P6cE7fnR5W+H0EWQWJ3hYSu4MwMygPIfS6e0IiXlQv8="; - }); - depsBuildBuild = [ pkg-config ]; @@ -118,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { sassc gi-docgen libxml2 # for xmllint + shared-mime-info ] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook @@ -134,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libpng libtiff - librsvg libjpeg (libepoxy.override { inherit x11Support; }) isocodes diff --git a/pkgs/by-name/gt/gtkmm4/package.nix b/pkgs/by-name/gt/gtkmm4/package.nix index dde0fe3485ba9..ba33d17e7c1c4 100644 --- a/pkgs/by-name/gt/gtkmm4/package.nix +++ b/pkgs/by-name/gt/gtkmm4/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtkmm"; - version = "4.20.0"; + version = "4.22.0"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor finalAttrs.version}/gtkmm-${finalAttrs.version}.tar.xz"; - hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM="; + hash = "sha256-LoohtLByX2IOM6ruDNND7RIbUzJ1tjKJZhmxyJ6W3mc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix index 26dbc341a0a95..17311a3989b3c 100644 --- a/pkgs/by-name/gu/gucharmap/package.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gucharmap"; - version = "17.0.1"; + version = "17.0.2"; outputs = [ "out" @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gucharmap"; rev = finalAttrs.version; - hash = "sha256-86+D+WYIezo7ZXaKTWybinP9Q10Auy63+3VlescymC0="; + hash = "sha256-LjXn8cFLqVZmLub0FRscyjg93u6g1EXsv3w0L4iiyqE="; }; strictDeps = true; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index 071c97ad080ee..cc87126e8e352 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -39,21 +39,18 @@ libnfs, openssh, libsecret, - libgdata, libmsgraph, python3, gsettings-desktop-schemas, - googleSupport ? false, # dependency on vulnerable libsoup versions }: -assert googleSupport -> gnomeSupport; stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.58.4"; + version = "1.60.0"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-5xJL7HJOJlrQ7gC6on2NUVzx3dzxAmOL5nueJZybBA0="; + hash = "sha256-ZIJz8GnpLH48ATuSFI6CyQHwgETis7FMbPvVImn2tkY="; }; patches = [ @@ -109,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: { gnome-online-accounts libsecret libmsgraph - ] - ++ lib.optionals googleSupport [ - libgdata ]; mesonFlags = [ @@ -136,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dkeyring=false" "-Donedrive=false" ] - ++ lib.optionals (!googleSupport) [ - "-Dgoogle=false" - ] ++ lib.optionals (avahi == null) [ "-Ddnssd=false" ] diff --git a/pkgs/by-name/gw/gweather-locations/package.nix b/pkgs/by-name/gw/gweather-locations/package.nix new file mode 100644 index 0000000000000..ee67a152bfe6d --- /dev/null +++ b/pkgs/by-name/gw/gweather-locations/package.nix @@ -0,0 +1,60 @@ +{ + stdenvNoCC, + lib, + fetchurl, + makeWrapper, + gettext, + meson, + ninja, + python3, + buildPackages, + gnome, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gweather-locations"; + version = "2025.1"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gweather-locations/${lib.versions.major finalAttrs.version}/gweather-locations-${finalAttrs.version}.tar.xz"; + hash = "sha256-VgnuBM9qxMx3IfMkG9jWn/6/DxtgIQ+t2IyGmkuITYc="; + }; + + strictDeps = true; + + depsBuildBuild = [ + makeWrapper + ]; + + nativeBuildInputs = [ + gettext + meson + ninja + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) + ]; + + postPatch = '' + patchShebangs --build build-aux/gen_locations_variant.py + wrapProgram $PWD/build-aux/gen_locations_variant.py \ + --prefix GI_TYPELIB_PATH : ${lib.getLib buildPackages.glib}/lib/girepository-1.0 + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gweather-locations"; + }; + }; + + meta = { + description = "GWeather locations database"; + homepage = "https://gitlab.gnome.org/GNOME/gweather-locations"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.gnome ]; + }; +}) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 8f17183cb39a0..0d1ed0da7e85e 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.8.4"; + version = "1.9.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-Dj1QJatjnK7Rb+SZLiRO0eHERzqmoq01n8fUE7SVWMI="; + hash = "sha256-JAKP8CjLCKGZvHoB26ih/J3xAru4wiVf/ObG0L8r4pY="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index aac7ef64c3b64..ad6f4543be9b6 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -11,11 +11,12 @@ glib, liburing, gnome, + python3, }: stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "1.0.0"; + version = "1.1.0"; outputs = [ "out" @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10="; + hash = "sha256-qeBMir7gHJp88RSMW3qma6N37+avbYOAHU/RqlUhmqo="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala + python3 ]; buildInputs = [ @@ -48,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + # test-dbus tries to access /etc/machine-id + postPatch = '' + substituteInPlace "testsuite/meson.build" --replace-fail \ + "'test-dbus': {'extra-sources': dbus_foo, 'disable': not have_gdbus_codegen}," \ + "'test-dbus': {'extra-sources': dbus_foo, 'disable': true}," + ''; + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" diff --git a/pkgs/by-name/li/libfoundry/package.nix b/pkgs/by-name/li/libfoundry/package.nix index 2b7f769773b44..81cab3fc6ec7e 100644 --- a/pkgs/by-name/li/libfoundry/package.nix +++ b/pkgs/by-name/li/libfoundry/package.nix @@ -13,9 +13,12 @@ gtk4, gtksourceview5, json-glib, + libadwaita, libdex, libgit2, + libpanel, libpeas2, + libsecret, libsoup_3, libspelling, libssh2, @@ -25,6 +28,7 @@ meson, ninja, pkg-config, + readline, template-glib, vte-gtk4, webkitgtk_6_0, @@ -34,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfoundry${lib.optionalString withGtk "-gtk"}"; - version = "1.0.1"; + version = "1.1.1"; outputs = [ "out" @@ -44,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/foundry/${lib.versions.majorMinor finalAttrs.version}/foundry-${finalAttrs.version}.tar.xz"; - hash = "sha256-wHaJBv6zTdWBmeKFRHOeohe714g+WPJPEjIphryJkzk="; + hash = "sha256-RtsNZENsMTYRyv37TKDVzsK5e+fXpfG+fujQFQ1PJcg="; }; patches = [ @@ -64,12 +68,16 @@ stdenv.mkDerivation (finalAttrs: { editorconfig-core-c flatpak gom + libadwaita libgit2 + libpanel + libsecret libsoup_3 libssh2 libsysprof-capture libxml2 libyaml + readline template-glib ] ++ lib.optionals withGtk [ diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index bc1b85315bd22..a7c2b7901ec17 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ - "glycin-gtk4-1" + "glycin-gtk4-2" ]; }; }) diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 1e95b6ef3adea..b2eeab914a7f5 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -31,7 +31,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "2.0.8"; + version = "2.1.1"; outputs = [ "out" @@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-a5rvT2Jr+Wnf0EtWO4PVIScaMMPW32pqhGP9VUkIkd8="; + hash = "sha256-jo6S4xKxTSxfOgR73FMFrcuZMe8BUM90v1JqN0Hm+zI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-k3eHWdEUPjKuWqNaEAYjAQKvYFgCnZ+5laYujqgGrpQ="; + hash = "sha256-BaIQs2be/W/dQFbO9KthJUWVE2vCT6H594geYJqzIzc="; }; nativeBuildInputs = [ @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ - "glycin-1" + "glycin-2" ]; }; }) diff --git a/pkgs/by-name/li/libgnome-games-support_2_0/package.nix b/pkgs/by-name/li/libgnome-games-support_2_0/package.nix deleted file mode 100644 index d2d1dc4b509a7..0000000000000 --- a/pkgs/by-name/li/libgnome-games-support_2_0/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - pkg-config, - glib, - gobject-introspection, - gtk4, - libgee, - gettext, - vala, - gnome, - libintl, - meson, - ninja, -}: - -stdenv.mkDerivation rec { - pname = "libgnome-games-support"; - version = "2.0.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "grvHTwj5i4M6m2REuEeeG9hN7QoHQl0Fe0XzjoeD5b0="; - }; - - nativeBuildInputs = [ - gettext - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - libintl - ]; - - propagatedBuildInputs = [ - # Required by libgnome-games-support-2.pc - glib - gtk4 - libgee - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libgnome-games-support"; - attrPath = "${pname}_2_0"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support"; - license = lib.licenses.lgpl3Plus; - teams = [ lib.teams.gnome ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix index aba8c805fbe74..09b1c6a920351 100644 --- a/pkgs/by-name/li/libgweather/package.nix +++ b/pkgs/by-name/li/libgweather/package.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, fetchurl, - makeWrapper, meson, ninja, pkg-config, @@ -11,10 +10,10 @@ json-glib, glib, gettext, + gweather-locations, libsoup_3, gi-docgen, gobject-introspection, - python3, tzdata, geocode-glib_2, vala, @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.4.4"; + version = "4.6.0"; outputs = [ "out" @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libgweather/${lib.versions.majorMinor version}/libgweather-${version}.tar.xz"; - hash = "sha256-cBdnd1PN99H9w1Xkv82x66g2l5Oo3yTSQUJ6k5y/QoM="; + hash = "sha256-f10OjJaF7y/0bC86V8rkjXvzVAstg5IfiJ7yjmqHZ4g="; }; patches = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { ]; depsBuildBuild = [ - makeWrapper pkg-config ]; @@ -57,7 +55,6 @@ stdenv.mkDerivation rec { pkg-config gettext glib - (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gi-docgen @@ -67,6 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib + gweather-locations libsoup_3 libxml2 json-glib @@ -82,10 +80,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs --build build-aux/meson/gen_locations_variant.py - wrapProgram $PWD/build-aux/meson/gen_locations_variant.py \ - --prefix GI_TYPELIB_PATH : ${lib.getLib buildPackages.glib}/lib/girepository-1.0 \ - # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) # it should be a build-time dep for build # TODO: send upstream diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index f34f7d0f140df..bb80c5dc4b6a2 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.3"; + version = "1.10.4"; 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-QqAbr4uURA8ZTqg0KyRL1pkt+wJMoxYMlHf/SY7DorY="; + hash = "sha256-WTiIp2kfCviqpuGTyeFK+oaoEMDC8nUVxtgT8Yczsc0="; }; strictDeps = true; diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix index 014d6110c64a9..333015e1927ca 100644 --- a/pkgs/by-name/li/librsvg/package.nix +++ b/pkgs/by-name/li/librsvg/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.61.4"; + version = "2.62.1"; outputs = [ "out" @@ -62,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-/KDqKNHyj5XIQH0lefRwLawIXnx1hkTayotA0eByygw="; + hash = "sha256-tByoQgYkL93YJqK/djSNfN9SwQUMv6BguGboGiUhRcM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-ASmibD7l97kV3u+3V9TNex+qa975JdQXRQIHdsJF+Ds="; + hash = "sha256-Px7H2Z4ShCCuZNskuKj427lE9dvIc6xRo8R1S4fK+ZQ="; dontConfigure = true; }; diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 42ba6c2c504cd..727bd18f55498 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, gi-docgen, meson, ninja, @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.5.3"; + version = "1.6.0"; outputs = [ "out" @@ -35,19 +34,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-NfATslORhW4bXD1ECaXEpkDGzLX1KW/5gux77Tn1bUw="; + hash = "sha256-Zgl+4Fw8xN+9wSTfybiFCF9ca6LxsuZC0EdZh/kiKTk="; }; - patches = [ - (fetchpatch { - # Required for cross-compiled libshumate to get $dev/share/vala/vapi/shumate-1.0.{deps,vapi} - # https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/263 - url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/8a8a5013ed69f443b84500b4f745079025863a32.patch"; - name = "meson-use-find_program-instead-of-dependency-for-vapigen"; - hash = "sha256-nYLUMLcghnWU/hlCWOHMmFIUdDa7UkX4TP7C4ftZVJM="; - }) - ]; - depsBuildBuild = [ # required to find native gi-docgen when cross compiling pkg-config diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix index 077faeca75659..6a78861696b2a 100644 --- a/pkgs/by-name/li/lightsoff/package.nix +++ b/pkgs/by-name/li/lightsoff/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "lightsoff"; - version = "48.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/lightsoff-${version}.tar.xz"; - hash = "sha256-LsmVAXE9vNE8WlZaLhGMxMwrUCg2s4enc2z7pAqLOYk="; + hash = "sha256-uqDBdDHoXu7eXmSfUxYvcLTrHnx6bxak7KowJ7ZTFXg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index ce66abd31727d..98fd119547099 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -8,7 +8,7 @@ gettext, itstool, libxslt, - gexiv2, + gexiv2_0_16, tinysparql, meson, mesonEmulatorHook, @@ -27,11 +27,8 @@ icu, json-glib, libcue, - libexif, libgsf, - libgudev, libgxps, - libiptcdata, libjpeg, libosinfo, libpng, @@ -40,6 +37,7 @@ libuuid, libwebp, libxml2, + libzip, poppler, systemd, taglib, @@ -50,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.10.2"; + version = "3.11.0"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-tN2JyF12YXEButTsmjNnj2MexQMumIDrQj3OUuh4ooU="; + hash = "sha256-xndHYai59KBvaBLxyAeL7i6TfWXjdsPSM4t4mT5fRmY="; }; patches = [ @@ -87,17 +85,14 @@ stdenv.mkDerivation (finalAttrs: { exempi ffmpeg giflib - gexiv2 + gexiv2_0_16 totem-pl-parser tinysparql icu json-glib libcue - libexif libgsf - libgudev libgxps - libiptcdata libjpeg libosinfo libpng @@ -105,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { libuuid libwebp libxml2 + libzip poppler taglib ] diff --git a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch index a38e37fa222a0..38e6b40a7d011 100644 --- a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch +++ b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch @@ -1,15 +1,15 @@ diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c -index f26791d73..f03e8ddb9 100644 +index a3f390585..3629107e7 100644 --- a/src/common/tracker-landlock.c +++ b/src/common/tracker-landlock.c -@@ -185,6 +185,10 @@ gboolean - tracker_landlock_init (const gchar * const *indexed_folders) - { - TrackerLandlockRule stock_rules[] = { +@@ -192,6 +192,10 @@ tracker_landlock_init (const gchar *executable_name, + (LANDLOCK_ACCESS_FS_EXECUTE | + LANDLOCK_ACCESS_FS_READ_FILE | + LANDLOCK_ACCESS_FS_READ_DIR) }, + { "/nix/store", -+ (LANDLOCK_ACCESS_FS_EXECUTE | -+ LANDLOCK_ACCESS_FS_READ_FILE | -+ LANDLOCK_ACCESS_FS_READ_DIR) }, - /* Allow access to the executable itself */ - { LIBEXECDIR "/localsearch-extractor-3", - LANDLOCK_ACCESS_FS_READ_FILE | ++ (LANDLOCK_ACCESS_FS_EXECUTE | ++ LANDLOCK_ACCESS_FS_READ_FILE | ++ LANDLOCK_ACCESS_FS_READ_DIR) }, + #if INTPTR_MAX == INT64_MAX + { "/usr/lib64", + (LANDLOCK_ACCESS_FS_EXECUTE | diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index d441f1708c7f7..de3dc4b2e64be 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "49.2"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-WFPnXM66f6K+oBvic80vCjBhlB573+OgCLIzFxBnFCw="; + hash = "sha256-euT7rl4ZMWqmQMVvgNxaeRRIpi3Y8P8G4ppYutgTqZQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "loupe-deps-${finalAttrs.version}"; - hash = "sha256-9jEz6hcdFUv5Daeh/0co1hHt49bE9kFAbFvnyiEaGJg="; + hash = "sha256-I4z5qjX10AUuwk+JdX/1ZU0uCAVPQj8HkEc+n9aMczE="; }; postPatch = '' diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 4ed4d51a81d7d..7204fb5fac863 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "49.4"; + version = "50.0"; outputs = [ "out" @@ -82,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-wWZuxQVhUwviXLiNk5wrzCrzTwHGO4sWuCuJLuM9eFU="; + hash = "sha256-mHBZUCOpqv3kvcEfeopsR10TgupWs2nHYje97q1yFls="; }; mesonFlags = [ @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru = { - libmutter_api_version = "17"; # bumped each dev cycle + libmutter_api_version = "18"; # 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 0a14b1c36fa78..57e750b7ddf78 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -8,6 +8,7 @@ gi-docgen, docbook-xsl-nons, gettext, + blueprint-compiler, desktop-file-utils, wayland-scanner, wrapGAppsHook4, @@ -22,13 +23,15 @@ shared-mime-info, libnotify, libexif, + libglycin, + libglycin-gtk4, libjxl, libseccomp, librsvg, webp-pixbuf-loader, tinysparql, localsearch, - gexiv2, + gexiv2_0_16, libselinux, libcloudproviders, gdk-pixbuf, @@ -41,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "49.4"; + version = "50.0"; outputs = [ "out" @@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-FHbZRZpjyF8OvBjyN7MtErAIrXhgAjdkJJGXJfUOdqg="; + hash = "sha256-qVluu0T+EYq20HyQm7ODbWzh7tGNkVIMWoBYldFjM8w="; }; patches = [ @@ -60,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils gettext gobject-introspection @@ -73,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gexiv2 + gexiv2_0_16 glib-networking icu gnome-desktop @@ -94,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: { tinysparql localsearch gnome-autoar + libglycin + libglycin-gtk4 ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 8cb8d9406307f..1268f032d576b 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py -index dbaca2e48..80f2640d4 100644 +index 218c7bf22..4474f26cd 100644 --- a/src/orca/ax_utilities_application.py +++ b/src/orca/ax_utilities_application.py -@@ -188,7 +188,7 @@ class AXUtilitiesApplication: +@@ -180,7 +180,7 @@ class AXUtilitiesApplication: pid = AXUtilitiesApplication.get_process_id(app) try: @@ -12,10 +12,10 @@ index dbaca2e48..80f2640d4 100644 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 b4abce719..cff5a78a6 100644 +index 5c607f3cd..18ddcd920 100644 --- a/src/orca/debugging_tools_manager.py +++ b/src/orca/debugging_tools_manager.py -@@ -243,7 +243,7 @@ class DebuggingToolsManager: +@@ -169,7 +169,7 @@ class DebuggingToolsManager: else: name = AXObject.get_name(app) or "[DEAD]" try: @@ -25,10 +25,10 @@ index b4abce719..cff5a78a6 100644 cmdline = f"EXCEPTION: {error}" else: diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 3fc845dc3..a82947911 100755 +index 86a1413ca..f272c431d 100755 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool: +@@ -211,7 +211,7 @@ def in_graphical_desktop() -> bool: def other_orcas() -> list[int]: """Returns the pid of any other instances of Orca owned by this user.""" @@ -38,33 +38,33 @@ index 3fc845dc3..a82947911 100755 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 098b0a033..e7b040d82 100644 +index d1d95f5b9..e57993521 100644 --- a/src/orca/orca_modifier_manager.py +++ b/src/orca/orca_modifier_manager.py -@@ -236,7 +236,7 @@ class OrcaModifierManager: - return +@@ -289,7 +289,7 @@ class OrcaModifierManager: - self.unset_orca_modifiers(reason) -- with subprocess.Popen(["xkbcomp", display, "-"], -+ with subprocess.Popen(["@xkbcomp@", display, "-"], - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p: - self._original_xmodmap, _ = p.communicate() - self._create_orca_xmodmap() -@@ -274,7 +274,7 @@ class OrcaModifierManager: - return + self._restore_original_xkbcomp() + with subprocess.Popen( +- ["xkbcomp", display, "-"], ++ ["@xkbcomp@", display, "-"], + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, + ) as p: +@@ -338,7 +338,7 @@ class OrcaModifierManager: self._caps_lock_cleared = False -- with subprocess.Popen(["xkbcomp", "-w0", "-", display], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], - stdin=subprocess.PIPE, stdout=None, stderr=None) as p: - p.communicate(self._original_xmodmap) + with subprocess.Popen( +- ["xkbcomp", "-w0", "-", display], ++ ["@xkbcomp@", "-w0", "-", display], + stdin=subprocess.PIPE, + stdout=None, + stderr=None, +@@ -449,7 +449,7 @@ class OrcaModifierManager: + debug.print_message(debug.LEVEL_INFO, msg, True) -@@ -349,7 +349,7 @@ class OrcaModifierManager: - debug.print_message(debug.LEVEL_INFO, msg, True) - - -- with subprocess.Popen(["xkbcomp", "-w0", "-", display], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], - stdin=subprocess.PIPE, stdout=None, stderr=None) as p: - p.communicate(bytes('\n'.join(lines), 'UTF-8')) - else: + with subprocess.Popen( +- ["xkbcomp", "-w0", "-", display], ++ ["@xkbcomp@", "-w0", "-", display], + stdin=subprocess.PIPE, + stdout=None, + stderr=None, diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 4ea7b108e4b74..18678af68599d 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "orca"; - version = "49.5"; + version = "50.0.9"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major finalAttrs.version}/orca-${finalAttrs.version}.tar.xz"; - hash = "sha256-U99BVYMZ6XwehK1gSYmVegK10P9TFBkZDwWH6mslYDQ="; + hash = "sha256-DF3Q65ceRpTjvWCsnedttYfMMRuoAv2nOA6vHc5qCcs="; }; patches = [ diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix index 964396c840705..e05febccd593d 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.57.0"; + version = "1.57.1"; 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-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec="; + hash = "sha256-5l1tEXCA3Drut9i0s7UY9zg6oubPziMRfGI81iR2TC8="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index 008a1dee33437..c1a16e0395430 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "49.4"; + version = "50.0"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-XjBTXnNCHc0xQkCrsg4leToFOlzWWG6tCMNQx7jm+HE="; + hash = "sha256-MBsg60a8ZNbKcuo3F10o2orqT4YT5HG5TDGF5cTRvAU="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pname version ; - hash = "sha256-aOVPknBqBV7AWO9LxvWRjiL2H2UQHAcpGpKY5YeoQrc="; + hash = "sha256-6Fd6V0Ksl8jqoM1znyYI0Mve2QQU+JBf3yn2C2Bcda8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index d58330cf8ca72..5a472cfb0c5e8 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -5,12 +5,10 @@ pkg-config, gtk4, libadwaita, - libgee, pango, gnome, gdk-pixbuf, librsvg, - gsound, libmanette, blueprint-compiler, wrapGAppsHook4, @@ -18,15 +16,17 @@ ninja, vala, desktop-file-utils, + libsndfile, + openal, }: stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "49.2.3"; + version = "50.0.1"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; - hash = "sha256-+ecxK/oPg1pOC/U181ax6VNxlIQ+Xe/1YR9z3C3b85k="; + hash = "sha256-bn+Hgif5h82RnTwc5w6n08eUz34UDG76zu5wPROLQ3U="; }; nativeBuildInputs = [ @@ -42,12 +42,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita - libgee pango gdk-pixbuf librsvg libmanette - gsound + # for libgnome-games-support + sound feature + libsndfile + openal ]; passthru = { diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix index dbae3916a973b..f0c4d30bbed32 100644 --- a/pkgs/by-name/rh/rhythmbox/package.nix +++ b/pkgs/by-name/rh/rhythmbox/package.nix @@ -46,12 +46,6 @@ stdenv.mkDerivation rec { sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE="; }; - postPatch = '' - # We backported girepository-2.0 support to libpeas 1.36 - substituteInPlace meson.build \ - --replace-fail "and libpeas.version() > '1.36'" "" - ''; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 280b2e58a8cc0..d44b9a041d0af 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -19,12 +19,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "showtime"; - version = "49.1"; + version = "50.0"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/showtime/${lib.versions.major finalAttrs.version}/showtime-${finalAttrs.version}.tar.xz"; - hash = "sha256-iu+7DiAJx6HNRKuAGwbKN19+loPwKaBS64b7Qzp4U5M="; + hash = "sha256-Q5nJ+n9h5ZhCQuJ5rNFRm+7CRrmKZ21EpLKrlOnuywE="; }; strictDeps = true; diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 449fe3e4e350c..3453c0fca4ebc 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -3,6 +3,7 @@ lib, fetchurl, libglycin, + libglycin-gtk4, glycin-loaders, cargo, desktop-file-utils, @@ -25,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "49.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-NVj2+ODTiylQtrrZue7COCSb7f7c5w+1iijK1pRebOk="; + hash = "sha256-7J2vmIPrkDMJEbtR5rae7YydvdVDjoZK3JDuVaX+nu0="; }; cargoVendorDir = "vendor"; @@ -37,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cargo desktop-file-utils - libglycin.patchVendorHook meson ninja pkg-config @@ -48,7 +48,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib + libglycin libglycin.setupHook + libglycin-gtk4 glycin-loaders gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -65,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/meson.build --replace-fail \ - "'src' / rust_target / meson.project_name()" \ - "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" + "'cp', cargo_target / rust_target / meson.project_name()" \ + "'cp', cargo_target / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" ''; preFixup = '' diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 7fbd1f4d407d5..6bb8f31e72ed0 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sushi"; - version = "46.0"; + version = "50.rc.1"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major finalAttrs.version}/sushi-${finalAttrs.version}.tar.xz"; - hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY="; + hash = "sha256-l6efnH4IsLF2Am7Ux6BDXwYSxMENoz1H4rr6ucYpImM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swell-foop/package.nix b/pkgs/by-name/sw/swell-foop/package.nix index 5d5d8cc70f1ef..72cdc99b94291 100644 --- a/pkgs/by-name/sw/swell-foop/package.nix +++ b/pkgs/by-name/sw/swell-foop/package.nix @@ -10,7 +10,6 @@ gtk4, libadwaita, libgee, - libgnome-games-support_2_0, pango, gnome, desktop-file-utils, @@ -23,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "swell-foop"; - version = "48.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/swell-foop/${lib.versions.major finalAttrs.version}/swell-foop-${finalAttrs.version}.tar.xz"; - hash = "sha256-W5Ywh4/nAa7nUe1G/3ZcK82fgVpOVYJnajwmsxGCAxs="; + hash = "sha256-lrJDAj4NSmb5hrwpaLDwuGYY4VpV+X6D/mqwCefngus="; }; nativeBuildInputs = [ @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita libgee - libgnome-games-support_2_0 pango ]; diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index ca2f390596564..a664b37b754e9 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "template-glib"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-QNANwiPc8ut/LsQi997FpnNzoMoRAavKD0nGLwUMsxI="; + hash = "sha256-5TPsL2wkzG32asVayCT63RtKX0M6EcvzprJYFcDPz9U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 88d9f88f13f34..ef5ebcaae69e3 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.10.1"; + version = "3.11.0"; outputs = [ "out" @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-Wn8+eJ22ZxpVDtYoDtT2CmC+p3No2pK+aNx9jX4jAmU="; + hash = "sha256-AR51ilPzERKoxFcA/WA5rlVhfw2scBGdnt2vwDz2j+U="; }; strictDeps = true; diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index fba620e727d1f..42800a3d7646a 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.82.3"; + version = "0.84.0"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-bcYnj2/uMNB9GgPiujM1sepOjSlWzrWdhhlDEV2TCoU="; + hash = "sha256-BBTjFYODaut4eNol9nxRX36IeZF+zDfJLia4Po2Pw+M="; }; patches = [ @@ -61,12 +61,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) - - # https://gitlab.gnome.org/GNOME/vte/-/merge_requests/11 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7.patch"; - hash = "sha256-JdLDild5j7marvR5n2heW9YD00+bwzJIoxDlzO5r/6w="; - }) ]; nativeBuildInputs = [ 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 e7ecf7ff71686..95c538036275e 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 = "49.0"; + version = "50.0"; 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-QB2vzfjLkR8JwI0oE/d03YZBJ6v8qT/0yvH8TJtexNI="; + hash = "sha256-zu7y+2izSz9mo97wozKiKnCvJyZB+2xQBlt6L949V1k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 756ad90cd0b6b..b121ed663d6c3 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.2.1"; + version = "4.2.2"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-Wp/Y2DFvkMsuGlqPDUEeufyvhZV6ginqPoA+gQBKHr0="; + hash = "sha256-AZGGqZYJbvT8NW4hV3tWc/W6o6KayOPWCLdTNxwYAY0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index ce0e59f1d52f0..4e63c082a5adf 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.18.0"; + version = "5.20.0"; 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-BRp4/jj3kzKAR+W81thVxkJcC0gMINlDIXnjVnQsasA="; + hash = "sha256-44vNI/UrhurfD+TYveaY46jKECMiuLTPGlGsKUpEjBs="; }; patches = [ diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 7da2a96338ca7..d1f4334747983 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -7,6 +7,7 @@ meson, ninja, libevdev, + lua5_4, mtdev, udev, wacomSupport ? stdenv.hostPlatform.isLinux, @@ -53,7 +54,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.29.2"; + version = "1.31.0"; outputs = [ "bin" @@ -66,13 +67,9 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-oxDGUbZebxAmBd2j51qV9Jn8SXBjUX2NPRgkxbDz7Dk="; + hash = "sha256-sDe8BxR3E5CQj/RjuFWW2XSWb8tu98dtDuBSpACYkvY="; }; - patches = [ - ./udev-absolute-path.patch - ]; - nativeBuildInputs = [ pkg-config meson @@ -87,6 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevdev + lua5_4 mtdev (python3.withPackages ( pp: with pp; [ diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch deleted file mode 100644 index 5c85b8639486e..0000000000000 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -100,7 +100,7 @@ - args : model_quirks) - - udev_rules_config = configuration_data() --udev_rules_config.set('UDEV_TEST_PATH', '') -+udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/') - configure_file(input : 'udev/80-libinput-device-groups.rules.in', - output : '80-libinput-device-groups.rules', - install : true, diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 90912e673a0ce..fa54acb89b079 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch, replaceVars, meson, ninja, @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.36.0"; + version = "1.38.1"; outputs = [ "out" @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libpeas/${lib.versions.majorMinor version}/libpeas-${version}.tar.xz"; - sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w="; + sha256 = "sha256-6C/TKK3KwaujS2QTa9/Lus8rMliovE5fSApyUCphGuk="; }; patches = [ @@ -40,18 +39,6 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; }) - - # girepository: port libpeas ABI to girepository - # https://gitlab.gnome.org/GNOME/libpeas/-/issues/58 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/73e25b6059d2fdc090a3feb8341ff902c3ec0d16.patch"; - hash = "sha256-xNp/DbLV2mdMiUALdEWE4ssyD3krWmzmJIwgStsNShM="; - }) - # build: handle depending on development releases of GLib - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/4613accc2e22395bb77bdf612fcdf90bf65f230f.patch"; - hash = "sha256-VGPLDswH3St/SzS19iHr5dA/ywzDsXhd7FMUg4rII9U="; - }) ]; depsBuildBuild = [ diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index ecdaa3e02e9a1..556b27aef02bc 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.54.5"; + version = "3.56.1"; outputs = [ "out" @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/pygobject-${version}.tar.gz"; - hash = "sha256-tmVvY0j1JFYGzxXqSMOEx/BRVsderSBsGyRsgKIvtYU="; + hash = "sha256-LsHMjFXH/+67l+WKm7p6oedGEfEXNigIRoVEaASoiBo="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 75770fa1b6e28..6a7b9633aa0ac 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 = "49.0"; + version = "50.0"; 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-/wQTljd4XIQZSIYgh6QyO5gWgNlCKWQJMhtXT8soKHg="; + hash = "sha256-qs5E6Q6Q9sNLsvvsjMtHuPgRAwgJeNZXWSh4Q8Mp1To="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d7c4e3a9a411..ae209504897e1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1045,6 +1045,7 @@ mapAliases { libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27 libGDSII = libgdsii; # Added 2026-02-08 libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27 + libgnome-games-support_2_0 = throw "'libgnome-games-support_2_0' has been removed. Upstream has converted this library to a copylib and no more releases will happen"; # Added 2026-03-27 libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27 libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27 libHX = libhx; # Added 2026-02-08