about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2024-06-22 14:08:32 +0200
committerJan Tojnar <jtojnar@gmail.com>2024-07-01 08:26:46 +0200
commit545822250cb564c9360f7d86dc851fe153e18a45 (patch)
treed3ebd51e5a99ab82d815ff7c75a82933e9334dd8 /pkgs
parent0fc6f66f88f16f9401d64d5a16a09ed35fb34d1a (diff)
rygel: Move from gnome scope to top-level
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch (renamed from pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch)0
-rw-r--r--pkgs/by-name/ry/rygel/package.nix (renamed from pkgs/desktops/gnome/core/rygel/default.nix)1
-rw-r--r--pkgs/desktops/gnome/default.nix3
3 files changed, 1 insertions, 3 deletions
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
index 5204e3518aba7..5204e3518aba7 100644
--- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/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
index 7c93bc8668e4d..66d2a5ffae8c4 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 800c2478033a8..fa9f4e7bcf42c 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.