diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix index c980b239d521..7ce7e079b6af 100644 --- a/nixos/modules/services/desktops/gnome/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -23,12 +23,12 @@ ###### implementation config = lib.mkIf config.services.gnome.rygel.enable { - environment.systemPackages = [ pkgs.gnome.rygel ]; + environment.systemPackages = [ pkgs.rygel ]; - services.dbus.packages = [ pkgs.gnome.rygel ]; + services.dbus.packages = [ pkgs.rygel ]; - systemd.packages = [ pkgs.gnome.rygel ]; + systemd.packages = [ pkgs.rygel ]; - environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${pkgs.rygel}/etc/rygel.conf"; }; } diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch rename to pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/by-name/ry/rygel/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/rygel/default.nix rename to pkgs/by-name/ry/rygel/package.nix index 7c93bc8668e4..66d2a5ffae8c 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "rygel"; - attrPath = "gnome.rygel"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 800c2478033a..fa9f4e7bcf42 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -112,8 +112,6 @@ in nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; - rygel = callPackage ./core/rygel { }; - sushi = callPackage ./core/sushi { }; totem = callPackage ./core/totem { }; @@ -247,6 +245,7 @@ in 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. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. + rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22.