diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0fea2aa3149430f..d27634f9b4ba158 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -173,6 +173,8 @@ - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). +- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). + - `services.cgit` now runs as the cgit user by default instead of root. This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index ec4e13169fa38b9..7e66a32c7db20d3 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -83,7 +83,7 @@ in configPackages = mkOption { type = types.listOf types.package; default = [ ]; - example = lib.literalExpression "[ pkgs.gnome.gnome-session ]"; + example = lib.literalExpression "[ pkgs.gnome-session ]"; description = '' List of packages that provide XDG desktop portal configuration, usually in the form of `share/xdg-desktop-portal/$desktop-portals.conf`. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index 1de5ba113875a1d..81d59f55db7cc55 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -25,7 +25,7 @@ sleep-inactive-battery-type='nothing' ''; - extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ]; + extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ]; enable = true; }; diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 30b35f6690921e0..21e7c3b587134d8 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -32,15 +32,15 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.user.targets."gnome-session-x11-services".wants = [ diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 9943f138dc60c3c..6641bc9ff43be7b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set. extraGSettingsOverridePackages = [ pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell + pkgs.gnome-shell # for org.gnome.shell ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 678ba1b12307d0c..e07700469dfb529 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -108,7 +108,7 @@ in favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] ''' ''; - description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; + description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally."; }; extraGSettingsOverrides = mkOption { @@ -123,7 +123,7 @@ in description = "List of packages for which gsettings are overridden."; }; - debug = mkEnableOption "gnome-session debug messages"; + debug = mkEnableOption "pkgs.gnome-session debug messages"; flashback = { enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; @@ -162,11 +162,11 @@ in }; panelModulePackages = mkOption { - default = [ pkgs.gnome.gnome-applets ]; - defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; + default = [ pkgs.gnome-applets ]; + defaultText = literalExpression "[ pkgs.gnome-applets ]"; type = types.listOf types.package; description = '' - Packages containing modules that should be made available to `gnome-panel` (usually for applets). + Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets). If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`. ''; @@ -196,7 +196,7 @@ in services.gnome.core-shell.enable = true; services.gnome.core-utilities.enable = mkDefault true; - services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; + services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ]; environment.extraInit = '' ${lib.concatMapStrings (p: '' @@ -228,7 +228,7 @@ in assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique."); map (wm: - pkgs.gnome.gnome-flashback.mkSessionForWm { + pkgs.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand; } ) flashbackWms; @@ -237,20 +237,20 @@ in enableGnomeKeyring = true; }; - systemd.packages = with pkgs.gnome; [ - gnome-flashback - ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; + systemd.packages = [ + pkgs.gnome-flashback + ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms; - environment.systemPackages = with pkgs.gnome; [ - gnome-flashback - (gnome-panel-with-modules.override { + environment.systemPackages = [ + pkgs.gnome-flashback + (pkgs.gnome-panel-with-modules.override { panelModulePackages = cfg.flashback.panelModulePackages; }) ] # For /share/applications/${wmName}.desktop - ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) - # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session - ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); + ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) + # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session + ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); }) (lib.mkIf serviceCfg.core-os-services.enable { @@ -287,7 +287,7 @@ in buildPortalsInGnome = false; }) ]; - xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ]; + xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ]; networking.networkmanager.enable = mkDefault true; @@ -309,7 +309,7 @@ in services.xserver.desktopManager.gnome.sessionPath = let mandatoryPackages = [ - pkgs.gnome.gnome-shell + pkgs.gnome-shell ]; optionalPackages = [ pkgs.gnome-shell-extensions @@ -329,15 +329,15 @@ in services.gvfs.enable = true; services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true)); - systemd.packages = with pkgs.gnome; [ - gnome-session - gnome-shell + systemd.packages = [ + pkgs.gnome-session + pkgs.gnome-shell ]; - services.udev.packages = with pkgs.gnome; [ + services.udev.packages = [ # Force enable KMS modifiers for devices that require them. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 - mutter + # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443 + pkgs.mutter ]; services.avahi.enable = mkDefault true; @@ -368,16 +368,16 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst environment.systemPackages = let - mandatoryPackages = with pkgs.gnome; [ - gnome-shell + mandatoryPackages = [ + pkgs.gnome-shell ]; - optionalPackages = with pkgs.gnome; [ + optionalPackages = [ pkgs.adwaita-icon-theme nixos-background-info pkgs.gnome-backgrounds - gnome-bluetooth + pkgs.gnome-bluetooth pkgs.gnome-color-manager - gnome-control-center + pkgs.gnome-control-center pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index a401af9b7e18cd6..55d5c2cb292dddd 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -177,7 +177,7 @@ in pkgs.pantheon.mutter ]; systemd.packages = with pkgs; [ - gnome.gnome-session + gnome-session pantheon.gala pantheon.gnome-settings-daemon pantheon.elementary-session-settings diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index c4987f1b63223a7..c454b110776b8d9 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -153,7 +153,7 @@ in XDG_DATA_DIRS = lib.makeSearchPath "share" [ gdm # for gnome-login.session config.services.displayManager.sessionData.desktops - pkgs.gnome.gnome-control-center # for accessibility icon + pkgs.gnome-control-center # for accessibility icon pkgs.adwaita-icon-theme pkgs.hicolor-icon-theme # empty icon theme as a base ]; @@ -181,7 +181,11 @@ in ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; + systemd.packages = with pkgs.gnome; [ + gdm + pkgs.gnome-session + pkgs.gnome-shell + ]; environment.systemPackages = [ pkgs.adwaita-icon-theme ]; # We dont use the upstream gdm service @@ -232,7 +236,7 @@ in EnvironmentFile = "-/etc/locale.conf"; }; - systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; + systemd.services.display-manager.path = [ pkgs.gnome-session ]; # Allow choosing an user account services.accounts-daemon.enable = true; diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 332cf44b0ed4fd4..109fdf6b0846c6b 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -45,7 +45,7 @@ import ./make-test-python.nix ( # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index c8ffb459edece03..45538ef4eab4078 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 98d61c7ea1723d9..9a296b93682c4e2 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 2c31efe542919fc..494d287364c2ba9 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook3 , libinput , gobject-introspection -, gnome +, mutter , gnome-desktop , glib , gtk3 @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 gnome-desktop # For keybindings settings schemas - gnome.mutter + mutter json-glib wayland finalAttrs.wlroots diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 69c3fdbfbca0c97..1c82fa7d8612eba 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook3, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome.gnome-settings-daemon + gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 047e2dfda596b00..0f0996a0dd5d128 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -17,8 +17,11 @@ , evince , glib , gtk4 -, gnome +, gnome-bluetooth +, gnome-control-center , gnome-desktop +, gnome-session +, gnome-shell , gcr , pam , systemd @@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit gmobile - gnome.gnome-bluetooth - gnome.gnome-control-center + gnome-bluetooth + gnome-control-center gnome-desktop - gnome.gnome-session + gnome-session gtk4 pam systemd @@ -109,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" - --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}" + --set GNOME_SESSION "${gnome-session}/bin/gnome-session" ) ''; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c31b3c80b8d4ca1..2e6d72b91071b29 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome, mate +, gtk3, gnome-panel, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 5fd52f72485e361..f47dca9aaad48b6 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -8,7 +8,7 @@ gobject-introspection, gjs, glib-networking, - gnome, + gnome-bluetooth, gtk-layer-shell, libpulseaudio, libsoup_3, @@ -50,7 +50,7 @@ buildNpmPackage rec { buildInputs = [ gjs glib-networking - gnome.gnome-bluetooth + gnome-bluetooth gtk-layer-shell libpulseaudio libsoup_3 diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 0914bec39610a66..0ee7f52286249f1 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -7,7 +7,7 @@ cmake, dbus, glib, - gnome, + gnome-settings-daemon, gsettings-desktop-schemas, gtest, intltool, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash. # is there a better way to give it access to DE-specific schemas as needed? # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413 - gnome.gnome-settings-daemon + gnome-settings-daemon mate.mate-settings-daemon ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 3efe7787db6f5d4..ca114fb1f6ff644 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -21,9 +21,11 @@ glib-networking, glibc, gnome, + gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, gnome-remote-desktop, + gnome-settings-daemon, gnome-user-share, gsettings-desktop-schemas, gsound, @@ -46,6 +48,7 @@ libxslt, meson, modemmanager, + mutter, networkmanager, networkmanagerapplet, ninja, @@ -116,11 +119,11 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop adwaita-icon-theme cheese - gnome.gnome-bluetooth_1_0 + gnome-bluetooth_1_0 gnome-remote-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome-user-share - gnome.mutter + mutter gsettings-desktop-schemas gsound gtk3 @@ -174,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${gnome.mutter}/share" + --prefix XDG_DATA_DIRS : "${mutter}/share" ) ''; diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index e75704944f7ab9f..74d9d2c35a94f29 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -7,8 +7,8 @@ budgie-screensaver, docbook-xsl-nons, glib, - gnome, gnome-desktop, + gnome-settings-daemon, graphene, gst_all_1, gtk-doc, @@ -26,6 +26,7 @@ magpie, mesa, meson, + mutter, ninja, nix-update-script, nixosTests, @@ -79,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { budgie-screensaver glib gnome-desktop - gnome.gnome-settings-daemon - gnome.mutter + gnome-settings-daemon + mutter zenity graphene gst_all_1.gstreamer diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix index f45a033a8732332..02bd605ee3cfba5 100644 --- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix +++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix @@ -5,7 +5,7 @@ budgie-desktop-view, glib, gsettings-desktop-schemas, - gnome, + mutter, nixos-artwork, nixos-background-light ? nixos-artwork.wallpapers.nineish, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray, @@ -59,7 +59,7 @@ let budgie-desktop budgie-desktop-view gsettings-desktop-schemas - gnome.mutter + mutter ] ++ extraGSettingsOverridePackages; in diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 0dfd4dc608245e0..407902d824e70b5 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -6,12 +6,12 @@ meson, ninja, pkg-config, - gnome, adwaita-icon-theme, glib, gtk3, gsettings-desktop-schemas, gnome-desktop, + gnome-settings-daemon, dbus, json-glib, libICE, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib xorg.xtrans adwaita-icon-theme - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/libexec/budgie-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" ''; separateDebugInfo = true; diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/by-name/gn/gnome-2048/package.nix similarity index 79% rename from pkgs/desktops/gnome/games/gnome-2048/default.nix rename to pkgs/by-name/gn/gnome-2048/package.nix index fc04ee0b8f1e7ea..88e373497bbe0a8 100644 --- a/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ b/pkgs/by-name/gn/gnome-2048/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, wrapGAppsHook3 -, meson -, vala -, pkg-config -, ninja -, itstool -, clutter-gtk -, libgee -, libgnome-games-support -, gnome -, gtk3 +{ + lib, + stdenv, + fetchurl, + fetchpatch, + wrapGAppsHook3, + meson, + vala, + pkg-config, + ninja, + itstool, + clutter-gtk, + libgee, + libgnome-games-support, + gnome, + gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-twenty-forty-eight"; version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz"; sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; }; @@ -63,4 +64,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/by-name/gn/gnome-applets/package.nix similarity index 69% rename from pkgs/desktops/gnome/misc/gnome-applets/default.nix rename to pkgs/by-name/gn/gnome-applets/package.nix index 0270045dad7dfcb..65edba55cb087d6 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -1,32 +1,34 @@ -{ lib, stdenv -, fetchurl -, gettext -, itstool -, libxml2 -, pkg-config -, gnome-panel -, gtk3 -, glib -, libwnck -, libgtop -, libnotify -, upower -, wirelesstools -, linuxPackages -, adwaita-icon-theme -, libgweather -, gucharmap -, tracker -, polkit -, gnome +{ + lib, + stdenv, + fetchurl, + gettext, + itstool, + libxml2, + pkg-config, + gnome-panel, + gtk3, + glib, + libwnck, + libgtop, + libnotify, + upower, + wirelesstools, + linuxPackages, + adwaita-icon-theme, + libgweather, + gucharmap, + tracker, + polkit, + gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-applets"; version = "3.52.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; }; @@ -64,8 +66,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-applets"; versionPolicy = "odd-unstable"; }; }; @@ -78,4 +79,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix similarity index 69% rename from pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix rename to pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix index 6c63a486eef764f..e72398326bf9bfd 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix @@ -1,38 +1,44 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, gnome -, adwaita-icon-theme -, meson -, ninja -, pkg-config -, gtk3 -, gettext -, glib -, udev -, itstool -, libxml2 -, wrapGAppsHook3 -, libnotify -, libcanberra-gtk3 -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -, gsettings-desktop-schemas +{ + stdenv, + lib, + fetchurl, + fetchpatch, + gnome, + adwaita-icon-theme, + meson, + ninja, + pkg-config, + gtk3, + gettext, + glib, + udev, + itstool, + libxml2, + wrapGAppsHook3, + libnotify, + libcanberra-gtk3, + gobject-introspection, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + python3, + gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-bluetooth"; version = "3.34.5"; # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk="; }; @@ -82,8 +88,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.gnome-bluetooth_1_0"; + packageName = "gnome-bluetooth"; + attrPath = "gnome-bluetooth_1_0"; freeze = true; }; }; @@ -96,4 +102,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix similarity index 92% rename from pkgs/desktops/gnome/core/gnome-bluetooth/default.nix rename to pkgs/by-name/gn/gnome-bluetooth/package.nix index 9e4944221c150a9..fe50b0958dec5c7 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -26,7 +26,7 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-bluetooth"; version = "46.1"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; }; @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-bluetooth"; - attrPath = "gnome.gnome-bluetooth"; }; }; @@ -86,4 +85,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/by-name/gn/gnome-control-center/package.nix similarity index 70% rename from pkgs/desktops/gnome/core/gnome-control-center/default.nix rename to pkgs/by-name/gn/gnome-control-center/package.nix index 59f8b2b8e746bbf..d5b1dd84c925291 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -1,74 +1,75 @@ -{ fetchurl -, lib -, stdenv -, substituteAll -, accountsservice -, adwaita-icon-theme -, colord -, colord-gtk4 -, cups -, dbus -, docbook-xsl-nons -, fontconfig -, gdk-pixbuf -, gettext -, glib -, glib-networking -, gcr_4 -, glibc -, gnome-bluetooth -, gnome-color-manager -, gnome-desktop -, gnome-online-accounts -, gnome-settings-daemon -, gnome-tecla -, gnome -, gsettings-desktop-schemas -, gsound -, gst_all_1 -, gtk4 -, ibus -, json-glib -, libgtop -, libgudev -, libadwaita -, libkrb5 -, libjxl -, libpulseaudio -, libpwquality -, librsvg -, webp-pixbuf-loader -, libsecret -, libsoup_3 -, libwacom -, libXi -, libxml2 -, libxslt -, meson -, modemmanager -, mutter -, networkmanager -, networkmanagerapplet -, libnma-gtk4 -, ninja -, pkg-config -, polkit -, python3 -, samba -, setxkbmap -, shadow -, shared-mime-info -, sound-theme-freedesktop -, tracker -, tracker-miners -, tzdata -, udisks2 -, upower -, libepoxy -, gnome-user-share -, gnome-remote-desktop -, wrapGAppsHook4 -, xorgserver +{ + fetchurl, + lib, + stdenv, + substituteAll, + accountsservice, + adwaita-icon-theme, + colord, + colord-gtk4, + cups, + dbus, + docbook-xsl-nons, + fontconfig, + gdk-pixbuf, + gettext, + glib, + glib-networking, + gcr_4, + glibc, + gnome-bluetooth, + gnome-color-manager, + gnome-desktop, + gnome-online-accounts, + gnome-settings-daemon, + gnome-tecla, + gnome, + gsettings-desktop-schemas, + gsound, + gst_all_1, + gtk4, + ibus, + json-glib, + libgtop, + libgudev, + libadwaita, + libkrb5, + libjxl, + libpulseaudio, + libpwquality, + librsvg, + webp-pixbuf-loader, + libsecret, + libsoup_3, + libwacom, + libXi, + libxml2, + libxslt, + meson, + modemmanager, + mutter, + networkmanager, + networkmanagerapplet, + libnma-gtk4, + ninja, + pkg-config, + polkit, + python3, + samba, + setxkbmap, + shadow, + shared-mime-info, + sound-theme-freedesktop, + tracker, + tracker-miners, + tzdata, + udisks2, + upower, + libepoxy, + gnome-user-share, + gnome-remote-desktop, + wrapGAppsHook4, + xorgserver, }: stdenv.mkDerivation (finalAttrs: { @@ -147,11 +148,10 @@ stdenv.mkDerivation (finalAttrs: { tracker-miners # for search locations dialog udisks2 upower - ] ++ (with gst_all_1; [ # For animations in Mouse panel. - gst-plugins-base - gst-plugins-good - ]); + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; nativeCheckInputs = [ dbus @@ -177,13 +177,15 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Pull in WebP and JXL support for gnome-backgrounds. # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - libjxl - librsvg - webp-pixbuf-loader - ]; - }}" + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libjxl + librsvg + webp-pixbuf-loader + ]; + } + }" ''; preFixup = '' @@ -205,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-control-center"; - attrPath = "gnome.gnome-control-center"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-control-center/paths.patch rename to pkgs/by-name/gn/gnome-control-center/paths.patch diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index dd65e5727623d5f..f93a877bc0188be 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, gnome-settings-daemon , adwaita-icon-theme , libxml2 , gsettings-desktop-schemas @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { udisks2 adwaita-icon-theme systemd - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas ]; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix new file mode 100644 index 000000000000000..cfd2913d356bad4 --- /dev/null +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -0,0 +1,222 @@ +{ + stdenv, + lib, + autoreconfHook, + fetchurl, + gettext, + glib, + gnome-bluetooth, + gnome-desktop, + gnome-panel, + gnome-session, + gnome, + gsettings-desktop-schemas, + gtk3, + ibus, + libcanberra-gtk3, + libpulseaudio, + libxkbfile, + libxml2, + pkg-config, + polkit, + gdm, + systemd, + upower, + pam, + wrapGAppsHook3, + writeTextFile, + xkeyboard_config, + xorg, + nixosTests, + runCommand, + buildEnv, +}: + +let + # From data/sessions/Makefile.am + requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel"; + requiredComponentsGsd = [ + "org.gnome.SettingsDaemon.A11ySettings" + "org.gnome.SettingsDaemon.Color" + "org.gnome.SettingsDaemon.Datetime" + "org.gnome.SettingsDaemon.Housekeeping" + "org.gnome.SettingsDaemon.Keyboard" + "org.gnome.SettingsDaemon.MediaKeys" + "org.gnome.SettingsDaemon.Power" + "org.gnome.SettingsDaemon.PrintNotifications" + "org.gnome.SettingsDaemon.Rfkill" + "org.gnome.SettingsDaemon.ScreensaverProxy" + "org.gnome.SettingsDaemon.Sharing" + "org.gnome.SettingsDaemon.Smartcard" + "org.gnome.SettingsDaemon.Sound" + "org.gnome.SettingsDaemon.UsbProtection" + "org.gnome.SettingsDaemon.Wacom" + "org.gnome.SettingsDaemon.XSettings" + ]; + requiredComponents = + wmName: enableGnomePanel: + "RequiredComponents=${ + lib.concatStringsSep ";" ( + [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd + ) + };"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-flashback"; + version = "3.52.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; + hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; + }; + + # make .desktop Execs absolute + postPatch = '' + patch -p0 <