From 30b3caaa5e6113d79f29c61f58a4e7c89dfe5c66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:47 +0200 Subject: [PATCH] gnome-sound-recorder: Move from gnome scope to top-level --- .../gn/gnome-sound-recorder/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-sound-recorder/default.nix => by-name/gn/gnome-sound-recorder/package.nix} (91%) diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix similarity index 91% rename from pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix rename to pkgs/by-name/gn/gnome-sound-recorder/package.nix index 31aeadec7968..846624fe6280 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -62,10 +62,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-sound-recorder"; - attrPath = "gnome.gnome-sound-recorder"; - }; + updateScript = gnome.updateScript { packageName = "gnome-sound-recorder"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1d34ff900e0a..d8271d979c8f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; - gnome-weather = callPackage ./apps/gnome-weather { }; polari = callPackage ./apps/polari { }; @@ -192,6 +190,7 @@ in gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22.