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

Merge master into staging-next

parents a7607a0d 6a8176d2

nixos/modules/services/network-filesystems/kubo.nix

+6 −8
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ in 
      autoMigrate = lib.mkOption {

        type = lib.types.bool;

        default = true;

        description = "Whether Kubo should try to run the fs-repo-migration at startup.";

        description = "Whether Kubo should try to migrate its filesystem repository automatically.";

      };



      enableGC = lib.mkOption {
@@ -330,8 +330,8 @@ in 
    environment.variables.IPFS_PATH = fakeKuboRepo;



    # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes

    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000;

    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000;

    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;

    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;



    programs.fuse = lib.mkIf cfg.autoMount {

      userAllowOther = true;
@@ -344,9 +344,6 @@ in 
        createHome = false;

        uid = config.ids.uids.ipfs;

        description = "IPFS daemon user";

        packages = [

          pkgs.kubo-migrator

        ];

      };

    };
@@ -377,6 +374,7 @@ in 
      path = [

        "/run/wrappers"

        cfg.package

        pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...'

      ];

      environment.IPFS_PATH = cfg.dataDir;
@@ -388,7 +386,7 @@ in 
          rm -vf "$IPFS_PATH/api"

      ''

      + lib.optionalString cfg.autoMigrate ''

        '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y

        '${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade

      ''

      + ''

        fi
@@ -412,7 +410,7 @@ in 
      serviceConfig = {

        ExecStart = [

          ""

          "${cfg.package}/bin/ipfs daemon ${kuboFlags}"

          "${lib.getExe cfg.package} daemon ${kuboFlags}"

        ];

        User = cfg.user;

        Group = cfg.group;

nixos/modules/services/networking/searx.nix

+22 −8
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ let 


  cfg = config.services.searx;



  settingsFile = pkgs.writeText "settings.yml" (builtins.toJSON cfg.settings);

  settingsFile = pkgs.writeText "settings.yml" (

    builtins.toJSON (builtins.removeAttrs cfg.settings [ "redis" ])

  );



  faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;

  limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
@@ -79,12 +81,22 @@ in 
      };



      settings = mkOption {

        type = types.submodule {

          freeformType = settingType;

          imports = [

            (mkRenamedOptionModule [ "redis" ] [ "valkey" ])

          ];

        type = types.submodule (

          { config, ... }:

          {

            options = {

              valkey = lib.mkOption {

                internal = true;

                default = { };

              };

            };

            config.valkey = lib.mkIf (config ? redis) (

              lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis

            );



            freeformType = settingType;

          }

        );

        default = { };

        example = literalExpression ''

          {
@@ -287,7 +299,9 @@ in 
              ]

            )) "s"

          }://${cfg.domain}/";

          valkey.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}";

          valkey = lib.mkIf cfg.redisCreateLocally {

            url = "unix://${config.services.redis.servers.searx.unixSocket}";

          };

        };

      };

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ 
    "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="

  },

  "auth0_auth0": {

    "hash": "sha256-59GW5hWNTWc1OyoEuHLSRRw5HFYfTV+Tp6vB5Jj5Gtw=",

    "hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=",

    "homepage": "https://registry.terraform.io/providers/auth0/auth0",

    "owner": "auth0",

    "repo": "terraform-provider-auth0",

    "rev": "v1.32.0",

    "rev": "v1.33.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-z0YJIZ3PSZany4acKYOIP575qg8iaBJcDhlhzr+RptU="

    "vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c="

  },

  "aviatrixsystems_aviatrix": {

    "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",

pkgs/by-name/_1/_1password-gui/sources.json

+10 −10
Original line number Diff line number Diff line 
{

  "stable": {

    "linux": {

      "version": "8.11.14",

      "version": "8.11.16",

      "sources": {

        "x86_64": {

          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",

          "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="

          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",

          "hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="

        },

        "aarch64": {

          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",

          "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="

          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",

          "hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="

        }

      }

    },

    "darwin": {

      "version": "8.11.14",

      "version": "8.11.16",

      "sources": {

        "x86_64": {

          "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",

          "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="

          "url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",

          "hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="

        },

        "aarch64": {

          "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",

          "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="

          "url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",

          "hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="

        }

      }

    }

pkgs/by-name/bl/blur-effect/package.nix

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  pkg-config,

  cmake,

  gdk-pixbuf,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec { 
    sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";

  };



  patches = [

    # Pull cmake-4 fix:

    #   https://github.com/sonald/blur-effect/pull/7

    (fetchpatch {

      name = "cmake-4.patch";

      url = "https://github.com/sonald/blur-effect/commit/76322ad8bd0e653726a6791eb8ebcc829cbb1b38.patch?full_index=1";

      hash = "sha256-f0PBhfdrcLCZBzYx+j8+qIG9boW3S4CSyz+bS9vFKRc=";

    })

  ];



  nativeBuildInputs = [

    pkg-config

    cmake