nautilus: Move from gnome scope to top-level

This commit is contained in:
Jan Tojnar 2024-06-13 11:13:18 +02:00
parent e124f51ee1
commit 2be24442bb
12 changed files with 14 additions and 15 deletions

View File

@ -143,7 +143,7 @@ You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs`
## Updating GNOME packages {#ssec-gnome-updating} ## 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 packages `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 packages `NEWS` file to see what changed.
## Frequently encountered issues {#ssec-gnome-common-issues} ## Frequently encountered issues {#ssec-gnome-common-issues}

View File

@ -158,7 +158,7 @@ let
to run all update scripts for all packages that lists \`garbas\` as a maintainer to run all update scripts for all packages that lists \`garbas\` as a maintainer
and have \`updateScript\` defined, or: 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 to run update script for specific package, or

View File

@ -415,7 +415,7 @@ in
gnome-system-monitor gnome-system-monitor
gnome-weather gnome-weather
pkgs.loupe pkgs.loupe
nautilus pkgs.nautilus
pkgs.gnome-connections pkgs.gnome-connections
simple-scan simple-scan
pkgs.snapshot pkgs.snapshot

View File

@ -6,7 +6,7 @@
, python3 , python3
, dropbox , dropbox
, gtk4 , gtk4
, gnome , nautilus
, gdk-pixbuf , gdk-pixbuf
, gobject-introspection , gobject-introspection
}: }:
@ -51,7 +51,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python3 python3
gtk4 gtk4
gnome.nautilus nautilus
]; ];
configureFlags = [ configureFlags = [

View File

@ -120,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "nautilus"; packageName = "nautilus";
attrPath = "gnome.nautilus";
}; };
}; };

View File

@ -13,7 +13,7 @@
, shared-mime-info , shared-mime-info
, itstool , itstool
, poppler , poppler
, gnome , nautilus
, darwin , darwin
, djvulibre , djvulibre
, libspectre , libspectre
@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals supportXPS [ ] ++ lib.optionals supportXPS [
libgxps libgxps
] ++ lib.optionals supportNautilus [ ] ++ lib.optionals supportNautilus [
gnome.nautilus nautilus
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Foundation
]; ];

View File

@ -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 # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
mutter43 = callPackage ./core/mutter/43 { }; mutter43 = callPackage ./core/mutter/43 { };
nautilus = callPackage ./core/nautilus { };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
withGnome = true; 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-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. 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 #### Removals
anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16

View File

@ -3,7 +3,7 @@
, easyeffects , easyeffects
, gjs , gjs
, glib , glib
, gnome , nautilus
, gobject-introspection , gobject-introspection
, gsound , gsound
, hddtemp , hddtemp
@ -107,7 +107,7 @@ super: lib.trivial.pipe super [
util_linux = util-linux; util_linux = util-linux;
xdg_utils = xdg-utils; xdg_utils = xdg-utils;
src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch;
nautilus_gsettings_path = "${glib.getSchemaPath gnome.nautilus}"; nautilus_gsettings_path = "${glib.getSchemaPath nautilus}";
}) })
]; ];
})) }))

View File

@ -2,10 +2,10 @@
, fetchFromGitHub , fetchFromGitHub
, stdenv , stdenv
, acl , acl
, gnome
, glibmm_2_68 , glibmm_2_68
, gtkmm4 , gtkmm4
, meson , meson
, nautilus
, ninja , ninja
, pkg-config , pkg-config
, itstool , itstool
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
acl acl
glibmm_2_68 glibmm_2_68
gtkmm4 gtkmm4
gnome.nautilus nautilus
]; ];
mesonFlags = [ mesonFlags = [

View File

@ -5,6 +5,7 @@
, fetchFromGitHub , fetchFromGitHub
, glib , glib
, gnome , gnome
, nautilus
, gobject-introspection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
@ -37,7 +38,7 @@ python3.pkgs.buildPythonPackage rec {
buildInputs = [ buildInputs = [
dbus dbus
dconf dconf
gnome.nautilus nautilus
gnome.nautilus-python gnome.nautilus-python
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3