From 2be24442bb12d9e44f5f20f651117cb9fc140e46 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Jun 2024 11:13:18 +0200 Subject: [PATCH] nautilus: Move from gnome scope to top-level --- doc/languages-frameworks/gnome.section.md | 2 +- maintainers/scripts/update.nix | 2 +- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- pkgs/applications/networking/dropbox/cli.nix | 4 ++-- .../gnome/core => by-name/na}/nautilus/extension_dir.patch | 0 .../gnome/core => by-name/na}/nautilus/fix-paths.patch | 0 .../nautilus/default.nix => by-name/na/nautilus/package.nix} | 1 - pkgs/by-name/pa/papers/package.nix | 4 ++-- pkgs/desktops/gnome/default.nix | 3 +-- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 4 ++-- pkgs/tools/filesystems/eiciel/default.nix | 4 ++-- pkgs/tools/misc/nautilus-open-any-terminal/default.nix | 3 ++- 12 files changed, 14 insertions(+), 15 deletions(-) rename pkgs/{desktops/gnome/core => by-name/na}/nautilus/extension_dir.patch (100%) rename pkgs/{desktops/gnome/core => by-name/na}/nautilus/fix-paths.patch (100%) rename pkgs/{desktops/gnome/core/nautilus/default.nix => by-name/na/nautilus/package.nix} (98%) diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 743327770891..b4999aec8746 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -143,7 +143,7 @@ You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` ## Updating GNOME packages {#ssec-gnome-updating} -Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. +Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. ## Frequently encountered issues {#ssec-gnome-common-issues} diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 3aff32caf581..6ff8596e678e 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -158,7 +158,7 @@ let to run all update scripts for all packages that lists \`garbas\` as a maintainer and have \`updateScript\` defined, or: - % nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus + % nix-shell maintainers/scripts/update.nix --argstr package nautilus to run update script for specific package, or diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index fe50d930b5af..034af79a546b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -415,7 +415,7 @@ in gnome-system-monitor gnome-weather pkgs.loupe - nautilus + pkgs.nautilus pkgs.gnome-connections simple-scan pkgs.snapshot diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index a922d70cd68f..f66f0262242b 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -6,7 +6,7 @@ , python3 , dropbox , gtk4 -, gnome +, nautilus , gdk-pixbuf , gobject-introspection }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk4 - gnome.nautilus + nautilus ]; configureFlags = [ diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/by-name/na/nautilus/extension_dir.patch similarity index 100% rename from pkgs/desktops/gnome/core/nautilus/extension_dir.patch rename to pkgs/by-name/na/nautilus/extension_dir.patch diff --git a/pkgs/desktops/gnome/core/nautilus/fix-paths.patch b/pkgs/by-name/na/nautilus/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/nautilus/fix-paths.patch rename to pkgs/by-name/na/nautilus/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/by-name/na/nautilus/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/nautilus/default.nix rename to pkgs/by-name/na/nautilus/package.nix index f8d650b4648a..d556e66741b4 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "nautilus"; - attrPath = "gnome.nautilus"; }; }; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dcdb5e6b19f7..c0de8348e838 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -13,7 +13,7 @@ , shared-mime-info , itstool , poppler -, gnome +, nautilus , darwin , djvulibre , libspectre @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportNautilus [ - gnome.nautilus + nautilus ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a2fa78173942..ee4707541cd3 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -96,8 +96,6 @@ lib.makeScope pkgs.newScope (self: with self; { # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided mutter43 = callPackage ./core/mutter/43 { }; - nautilus = callPackage ./core/nautilus { }; - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = true; }; @@ -259,6 +257,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. + nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. #### Removals anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 52b038ccda91..ca96a3831325 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,7 +3,7 @@ , easyeffects , gjs , glib -, gnome +, nautilus , gobject-introspection , gsound , hddtemp @@ -107,7 +107,7 @@ super: lib.trivial.pipe super [ util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; - nautilus_gsettings_path = "${glib.getSchemaPath gnome.nautilus}"; + nautilus_gsettings_path = "${glib.getSchemaPath nautilus}"; }) ]; })) diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index a3f7378c205c..ac87be61a444 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -2,10 +2,10 @@ , fetchFromGitHub , stdenv , acl -, gnome , glibmm_2_68 , gtkmm4 , meson +, nautilus , ninja , pkg-config , itstool @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { acl glibmm_2_68 gtkmm4 - gnome.nautilus + nautilus ]; mesonFlags = [ diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 45716202878f..f541c7be95b8 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , glib , gnome +, nautilus , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -37,7 +38,7 @@ python3.pkgs.buildPythonPackage rec { buildInputs = [ dbus dconf - gnome.nautilus + nautilus gnome.nautilus-python gsettings-desktop-schemas gtk3