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

Merge staging-next into staging

parents b497d787 37d39300
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ with lib.maintainers;
    # Edits to this list should only be done by an already existing member.
    members = [
      DutchGerman
      friedow
    ];
  };

+14 −1
Original line number Diff line number Diff line
@@ -148,8 +148,21 @@ in
    settings = lib.mkOption {
      type = format.type;
      default = { };
      example = {
        bootstrap = {
          initdb = [
            "encoding=UTF-8"
            "data-checksums"
          ];
        };
        postgresql = {
          parameters = {
            unix_socket_directories = "/tmp";
          };
        };
      };
      description = ''
        The primary patroni configuration. See the [documentation](https://patroni.readthedocs.io/en/latest/SETTINGS.html)
        The primary patroni configuration. See the [documentation](https://patroni.readthedocs.io/en/latest/yaml_configuration.html)
        for possible values.
        Secrets should be passed in by using the `environmentFiles` option.
      '';
+3 −3
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
  core = "ppsspp";
  version = "0-unstable-2025-08-30";
  version = "0-unstable-2025-09-10";

  src = fetchFromGitHub {
    owner = "hrydgard";
    repo = "ppsspp";
    rev = "b9a3e939711e007cce6af5930603122c0df91f20";
    hash = "sha256-eEJeH7tfuIVrlkqGwsoe6RkY7tOEIyUbHSM8xGyZL4o=";
    rev = "a240cb24070700fbf73a1522338ebd60011a0daf";
    hash = "sha256-A4tqLVmW6Y4boQRf80N0upFS+s6P+TQRXB/i8rg/I4g=";
    fetchSubmodules = true;
  };

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ let
    }:
    buildGoModule rec {
      pname = stname;
      version = "2.0.6";
      version = "2.0.8";

      src = fetchFromGitHub {
        owner = "syncthing";
        repo = "syncthing";
        tag = "v${version}";
        hash = "sha256-BHrZJSNuq4PZI6fgbTCfo2hXUmXW/C0TvWzZRkoiaFU=";
        hash = "sha256-QkCLFztzaH9MvgP6HWUr5Z8yIrKlY6/t2VaZwai/H8Q=";
      };

      vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs=";
+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ stdenv.mkDerivation rec {
    hash = "sha256-2qc4kLb/WmUJuJGonIyS7pgCfyt8yXdcpDAKU0RMY58=";
  };

  outputs = [
    "out"
    "dev"
  ];

  nativeBuildInputs = [
    perl
    automake
Loading