Unverified Commit eea46ac5 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 38a728ee 09f18b89

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16331,6 +16331,12 @@ 
    githubId = 29493551;

    name = "Josh Peters";

  };

  petertriho = {

    email = "mail@petertriho.com";

    github = "petertriho";

    githubId = 7420227;

    name = "Peter Tri Ho";

  };

  peterwilli = {

    email = "peter@codebuffet.co";

    github = "peterwilli";

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

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


- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.



- `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: <https://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v5.2>. Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`).



- `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.

  The module was updated to accommodate for breaking changes.

  Breaking changes to the module API were minimised as much as possible,

nixos/modules/programs/wayland/waybar.nix

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ in 
{

  options.programs.waybar = {

    enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors";

    package = lib.mkPackageOption pkgs "waybar" { };

    package =

      lib.mkPackageOption pkgs "waybar" { }

      // lib.mkOption {

        apply = pkg: pkg.override { systemdSupport = true; };

      };

  };



  config = lib.mkIf cfg.enable {

nixos/modules/services/blockchain/ethereum/geth.nix

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ let 
      };



      network = lib.mkOption {

        type = lib.types.nullOr (lib.types.enum [ "goerli" "rinkeby" "yolov2" "ropsten" ]);

        type = lib.types.nullOr (lib.types.enum [ "goerli" "holesky" "rinkeby" "yolov2" "ropsten" ]);

        default = null;

        description = "The network to connect to. Mainnet (null) is the default ethereum network.";

      };

nixos/modules/services/databases/postgresql.md

+4 −3
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ For an upgrade, a script like this can be used to simplify the process: 
      newPostgres = pkgs.postgresql_13.withPackages (pp: [

        # pp.plv8

      ]);

      cfg = config.services.postgresql;

    in pkgs.writeScriptBin "upgrade-pg-cluster" ''

      set -eux

      # XXX it's perhaps advisable to stop all services that depend on postgresql
@@ -205,12 +206,12 @@ For an upgrade, a script like this can be used to simplify the process: 


      export NEWBIN="${newPostgres}/bin"



      export OLDDATA="${config.services.postgresql.dataDir}"

      export OLDBIN="${config.services.postgresql.package}/bin"

      export OLDDATA="${cfg.dataDir}"

      export OLDBIN="${cfg.package}/bin"



      install -d -m 0700 -o postgres -g postgres "$NEWDATA"

      cd "$NEWDATA"

      sudo -u postgres $NEWBIN/initdb -D "$NEWDATA"

      sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${builtins.concatStringsSep " " cfg.initdbArgs}



      sudo -u postgres $NEWBIN/pg_upgrade \

        --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \