Commit 58bf5606 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

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

parent b37f158f

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

+8 −8
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ in 
          assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique.");

          map

            (wm:

              pkgs.gnome.gnome-flashback.mkSessionForWm {

              pkgs.gnome-flashback.mkSessionForWm {

                inherit (wm) wmName wmLabel wmCommand;

              }

            ) flashbackWms;
@@ -237,20 +237,20 @@ in 
        enableGnomeKeyring = true;

      };



      systemd.packages = with pkgs.gnome; [

        gnome-flashback

      ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms;

      systemd.packages = [

        pkgs.gnome-flashback

      ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;



      environment.systemPackages = with pkgs.gnome; [

        gnome-flashback

      environment.systemPackages = [

        pkgs.gnome-flashback

        (pkgs.gnome-panel-with-modules.override {

          panelModulePackages = cfg.flashback.panelModulePackages;

        })

      ]

      # For /share/applications/${wmName}.desktop

      ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)

      ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)

      # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session

      ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);

      ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);

    })



    (lib.mkIf serviceCfg.core-os-services.enable {

pkgs/desktops/gnome/misc/gnome-flashback/default.nix→pkgs/by-name/gn/gnome-flashback/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-flashback";

      attrPath = "gnome.gnome-flashback";

      versionPolicy = "odd-unstable";

    };

pkgs/by-name/gn/gnome-panel/wrapper.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  buildEnv,

  gnome,

  gnome-panel,

  gnome-flashback,

  xorg,

  glib,

  wrapGAppsHook3,
@@ -11,8 +12,6 @@ 
}:



let

  inherit (gnome) gnome-flashback;



  # We always want to find the built-in panel applets.

  selectedPanelModulePackages = [

    gnome-panel

pkgs/desktops/gnome/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ in 


  nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };



#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/



  gnome-flashback = callPackage ./misc/gnome-flashback { };



}) // lib.optionalAttrs config.allowAliases {

#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.

  libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
@@ -96,6 +92,7 @@ in 
  gnome-control-center = lib.warn "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly." pkgs.gnome-control-center; # Added on 2024-08-28.

  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-flashback = lib.warn "The ‘gnome.gnome-flashback’ was moved to top-level. Please use ‘pkgs.gnome-flashback’ directly." pkgs.gnome-flashback; # Added on 2024-08-31.

  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-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11.

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