Commit 71750a5e authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome-disk-utility: Move from gnome scope to top-level

parent 075a8fe3

nixos/modules/programs/gnome-disks.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 


  config = lib.mkIf config.programs.gnome-disks.enable {



    environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];

    environment.systemPackages = [ pkgs.gnome-disk-utility ];



    services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];

    services.dbus.packages = [ pkgs.gnome-disk-utility ];



  };

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ in 
    })



    (mkIf serviceCfg.apps.enable {

      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);

      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);

      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);

      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);

nixos/modules/services/x11/desktop-managers/gnome.nix

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ in 
      programs.evince.enable = notExcluded pkgs.evince;

      programs.file-roller.enable = notExcluded pkgs.file-roller;

      programs.geary.enable = notExcluded pkgs.geary;

      programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;

      programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;

      programs.seahorse.enable = notExcluded pkgs.seahorse;

      services.gnome.sushi.enable = notExcluded pkgs.sushi;

pkgs/desktops/gnome/core/gnome-disk-utility/default.nix→pkgs/by-name/gn/gnome-disk-utility/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec { 
  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-disk-utility";

      attrPath = "gnome.gnome-disk-utility";

    };

  };

pkgs/desktops/gnome/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ in 


  gnome-control-center = callPackage ./core/gnome-control-center { };



  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };



  gnome-keyring = callPackage ./core/gnome-keyring { };



  gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
@@ -201,6 +199,7 @@ in 
  gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.

  gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.

  gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.

  gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.

  gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.

  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-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.