nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-software: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-08-11 18:33:56 +02:00
parent 4f1ded697a
commit 967bb64c16
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -395,7 +395,6 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst
(lib.mkIf serviceCfg.core-utilities.enable {
environment.systemPackages =
with pkgs.gnome;
utils.removePackagesByName
([
pkgs.baobab
@ -423,7 +422,7 @@ in
] ++ lib.optionals config.services.flatpak.enable [
# Since PackageKit Nix support is not there yet,
# only install gnome-software if flatpak is enabled.
gnome-software
pkgs.gnome-software
])
config.environment.gnome.excludePackages;

0
pkgs/desktops/gnome/core/gnome-software/fix-paths.patch → pkgs/by-name/gn/gnome-software/fix-paths.patch
View File

5
pkgs/desktops/gnome/core/gnome-software/default.nix → pkgs/by-name/gn/gnome-software/package.nix
View File

@ -108,10 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-software";
attrPath = "gnome.gnome-software";
};
updateScript = gnome.updateScript { packageName = "gnome-software"; };
};
meta = with lib; {

3
pkgs/desktops/gnome/default.nix
View File

@ -47,8 +47,6 @@ in
# Using 43 to match Mutter used in Pantheon
gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { };
gnome-software = callPackage ./core/gnome-software { };
gvfs = pkgs.gvfs.override { gnomeSupport = true; };
mutter = callPackage ./core/mutter { };
@ -179,6 +177,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-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
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.