Commit d75f3b45 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents a1906140 1dcdb7dc

.github/labeler.yml

+2 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ 
  - any:

      - changed-files:

          - any-glob-to-any-file:

              - nixos/modules/services/cluster/k3s/**/*

              - nixos/modules/services/cluster/rancher/default.nix

              - nixos/modules/services/cluster/rancher/k3s.nix

              - nixos/tests/k3s/**/*

              - pkgs/applications/networking/cluster/k3s/**/*

nixos/doc/manual/release-notes/rl-2511.section.md

+7 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ 
- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.

  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.



- `etcd` package was upgraded to 3.6, see [migration notes](https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/) for incompatibilities and upgrade procedure.



- `services.parsoid` and the `nodePackages.parsoid` package have been removed, as the JavaScript-based version this module uses is not compatible with modern MediaWiki versions.



- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
@@ -330,6 +332,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). 


- `firezone` has changed how the `Everyone` group behaves. Service Accounts are no longer considered part of `Everyone`.



- The `file-roller` module has been removed due to not being required for function, file roller itself has also been removed from the `services.desktopManager.gnome` module as it's not part of GNOME core applications.



- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.



- Direct use of `pkgs.formats.systemd` has been deprecated, and should now be instantiated with `pkgs.formats.systemd { }` similarly to other items in `pkgs.formats`.
@@ -474,6 +478,9 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). 


- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`.



- `services.k3s` now shares most of its code with `services.rke2`. The merge resulted in both modules providing more options, with `services.rke2` receiving the most improvements.

  Existing configurations for either module should not be affected.



- The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).

  With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.

nixos/modules/module-list.nix

+1 −3
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ 
  ./programs/extra-container.nix

  ./programs/fcast-receiver.nix

  ./programs/feedbackd.nix

  ./programs/file-roller.nix

  ./programs/firefox.nix

  ./programs/firejail.nix

  ./programs/fish.nix
@@ -475,7 +474,6 @@ 
  ./services/cluster/corosync/default.nix

  ./services/cluster/druid/default.nix

  ./services/cluster/hadoop/default.nix

  ./services/cluster/k3s/default.nix

  ./services/cluster/kubernetes/addon-manager.nix

  ./services/cluster/kubernetes/addons/dns.nix

  ./services/cluster/kubernetes/apiserver.nix
@@ -488,7 +486,7 @@ 
  ./services/cluster/kubernetes/scheduler.nix

  ./services/cluster/pacemaker/default.nix

  ./services/cluster/patroni/default.nix

  ./services/cluster/rke2/default.nix

  ./services/cluster/rancher/default.nix

  ./services/cluster/spark/default.nix

  ./services/cluster/temporal/default.nix

  ./services/computing/boinc/client.nix

nixos/modules/programs/file-roller.nix

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
# File Roller.



{

  config,

  pkgs,

  lib,

  ...

}:



let

  cfg = config.programs.file-roller;



in

{



  ###### interface



  options = {



    programs.file-roller = {



      enable = lib.mkEnableOption "File Roller, an archive manager for GNOME";



      package = lib.mkPackageOption pkgs "file-roller" { };



    };



  };



  ###### implementation



  config = lib.mkIf cfg.enable {



    environment.systemPackages = [ cfg.package ];



    services.dbus.packages = [ cfg.package ];



  };



}

nixos/modules/rename.nix

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ in 
      "programs"

      "goldwarden"

    ] "'goldwarden' has been removed from nixpkgs.")

    (mkRemovedOptionModule [

      "programs"

      "file-roller"

    ] "Not required for the package to function anymore, use `pkgs.file-roller` instead.")

    (mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] ''

      pantheon-tweaks is no longer a switchboard plugin but an independent app,

      adding the package to environment.systemPackages is sufficient.