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

Merge master into staging-next

parents 78fc07ec 19943b31

nixos/tests/all-tests.nix

+2 −1
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ in { 
  fluentd = handleTest ./fluentd.nix {};

  fluidd = handleTest ./fluidd.nix {};

  fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};

  forgejo = handleTest ./gitea.nix { giteaPackage = pkgs.forgejo; };

  freenet = handleTest ./freenet.nix {};

  freeswitch = handleTest ./freeswitch.nix {};

  freshrss-sqlite = handleTest ./freshrss-sqlite.nix {};
@@ -241,7 +242,7 @@ in { 
  geth = handleTest ./geth.nix {};

  ghostunnel = handleTest ./ghostunnel.nix {};

  gitdaemon = handleTest ./gitdaemon.nix {};

  gitea = handleTest ./gitea.nix {};

  gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };

  gitlab = handleTest ./gitlab.nix {};

  gitolite = handleTest ./gitolite.nix {};

  gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};

nixos/tests/gitea.nix

+5 −3
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem,

  config ? {},

  giteaPackage,

  pkgs ? import ../.. { inherit system config; }

}:
@@ -9,8 +10,8 @@ with pkgs.lib; 
let

  supportedDbTypes = [ "mysql" "postgres" "sqlite3" ];

  makeGiteaTest = type: nameValuePair type (makeTest {

    name = "gitea-${type}";

    meta.maintainers = with maintainers; [ aanderse kolaente ma27 ];

    name = "${giteaPackage.pname}-${type}";

    meta.maintainers = with maintainers; [ aanderse indeednotjames kolaente ma27 ];



    nodes = {

      server = { config, pkgs, ... }: {
@@ -18,9 +19,10 @@ let 
        services.gitea = {

          enable = true;

          database = { inherit type; };

          package = giteaPackage;

          settings.service.DISABLE_REGISTRATION = true;

        };

        environment.systemPackages = [ pkgs.gitea pkgs.jq ];

        environment.systemPackages = [ giteaPackage pkgs.jq ];

        services.openssh.enable = true;

      };

      client1 = { config, pkgs, ... }: {

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

+413 −393

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/cluster/argocd-autopilot/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "argocd-autopilot";

  version = "0.4.11";

  version = "0.4.12";



  src = fetchFromGitHub {

    owner = "argoproj-labs";

    repo = "argocd-autopilot";

    rev = "v${version}";

    sha256 = "sha256-0y7WP6v1DrAyK9p9cVME9RpNH1ZY0NNMtjHhmPT68kQ=";

    sha256 = "sha256-YYUOW3QWJx+XdrZTaPEGs5TJH2lVUJGPcPYYehR3V0M=";

  };



  vendorHash = "sha256-KkklEcxk6pNbxSkomh3LqlK8jgpGC/pZMBkJgXMUi8E=";

  vendorHash = "sha256-p8Q+oQFbkulcDFdHUoQ1qdO1zsi7XmU/IjnScZogz2g=";



  proxyVendor = true;

pkgs/applications/networking/cluster/fluxcd/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:



let

  version = "0.40.0";

  sha256 = "0wgl3l0zbznsycm5xxnc30w6zf44aj1p6i7ab83ppyz8xnjca24f";

  manifestsSha256 = "0r1sba1lxws7rqj6kz9nd7g4d7bvigj0cmbivddipgc2l4l1wwzw";

  version = "0.40.1";

  sha256 = "074iiskgmvk6ys4arxs7kvgkklfvcnrarqw3f6hbida6qnrv5b61";

  manifestsSha256 = "02rvy55q77n1ikw8i0xx6c8r6sxqj6vhp4rks9zy9z84k82mqsj7";



  manifests = fetchzip {

    url =
@@ -23,7 +23,7 @@ in buildGoModule rec { 
    inherit sha256;

  };



  vendorSha256 = "sha256-AmAGeJyc7ajDicQEHP9268+H3YpKU8ej6g8zwh+zvTo=";

  vendorSha256 = "sha256-/TsCtiZTbWzyAo3IzUkM58Oj97Lo1ztDe9M/CDMF0ao=";



  postUnpack = ''

    cp -r ${manifests} source/cmd/flux/manifests