Unverified Commit e56a730f authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents ceac998a bcf4d905

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 


- All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.



- `spacefm` was removed because it appeared to be unmaintained upstream.



- `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.



## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -29326,7 +29326,7 @@ 
    keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ];

  };

  yechielw = {

    name = "yechielw";

    name = "Yechiel Worenklein";

    email = "yechielworen@gmail.com";

    github = "yechielw";

    githubId = 41305372;

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ 
  ./programs/slock.nix

  ./programs/sniffnet.nix

  ./programs/soundmodem.nix

  ./programs/spacefm.nix

  ./programs/ssh.nix

  ./programs/starship.nix

  ./programs/steam.nix

nixos/modules/programs/spacefm.nix

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
# Global configuration for spacefm.



{

  config,

  lib,

  pkgs,

  ...

}:



let

  cfg = config.programs.spacefm;



in

{

  ###### interface



  options = {



    programs.spacefm = {



      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Whether to install SpaceFM and create {file}`/etc/spacefm/spacefm.conf`.

        '';

      };



      settings = lib.mkOption {

        type = lib.types.attrs;

        default = {

          tmp_dir = "/tmp";

          terminal_su = "${pkgs.sudo}/bin/sudo";

        };

        defaultText = lib.literalExpression ''

          {

            tmp_dir = "/tmp";

            terminal_su = "''${pkgs.sudo}/bin/sudo";

          }

        '';

        description = ''

          The system-wide spacefm configuration.

          Parameters to be written to {file}`/etc/spacefm/spacefm.conf`.

          Refer to the [relevant entry](https://ignorantguru.github.io/spacefm/spacefm-manual-en.html#programfiles-etc) in the SpaceFM manual.

        '';

      };



    };

  };



  ###### implementation



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ pkgs.spaceFM ];



    environment.etc."spacefm/spacefm.conf".text = lib.concatStrings (

      lib.mapAttrsToList (n: v: "${n}=${toString v}\n") cfg.settings

    );

  };

}

nixos/modules/rename.nix

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ in 
    (mkRemovedOptionModule [ "virtualisation" "multipass" ] ''

      virtualisation.multipass has been removed since it was unmaintained in nixpkgs

    '')

    (mkRemovedOptionModule [ "programs" "spacefm" ] ''

      spacefm has been removed since it was unmaintained upstream.

    '')

    # Do NOT add any option renames here, see top of the file

  ];

}