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

Merge master into staging-next

parents 2470d968 eb0e6df0

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -9887,12 +9887,6 @@ 
    githubId = 310981;

    name = "Joel Burget";

  };

  joelkoen = {

    email = "mail@joelkoen.com";

    github = "joelkoen";

    githubId = 122502655;

    name = "Joel Koen";

  };

  joelmo = {

    email = "joel.moberg@gmail.com";

    github = "joelmo";

nixos/modules/services/security/kanidm.nix

+429 −306

File changed.

Preview size limit exceeded, changes collapsed.

nixos/tests/kanidm-provisioning.nix

+7 −1
Original line number Diff line number Diff line
@@ -158,7 +158,11 @@ import ./make-test-python.nix ( 
              groups.service1-admin = { };

              systems.oauth2.service1 = {

                displayName = "Service One (changed)";

                originUrl = "https://changed-one.example.com/";

                # multiple origin urls

                originUrl = [

                  "https://changed-one.example.com/"

                  "https://changed-one.example.org/"

                ];

                originLanding = "https://changed-one.example.com/landing-changed";

                basicSecretFile = pkgs.writeText "bs-service1" "changed-very-strong-secret-for-service1";

                scopeMaps.service1-access = [
@@ -405,6 +409,7 @@ import ./make-test-python.nix ( 
            assert_contains(out, "name: service1")

            assert_contains(out, "displayname: Service One (changed)")

            assert_contains(out, "oauth2_rs_origin: https://changed-one.example.com/")

            assert_contains(out, "oauth2_rs_origin: https://changed-one.example.org/")

            assert_contains(out, "oauth2_rs_origin_landing: https://changed-one.example.com/landing")

            assert_matches(out, 'oauth2_rs_scope_map: service1-access.*{"email", "openid"}')

            assert_matches(out, 'oauth2_rs_sup_scope_map: service1-admin.*{"adminchanged"}')
@@ -460,6 +465,7 @@ import ./make-test-python.nix ( 
            assert_contains(out, "name: service1")

            assert_contains(out, "displayname: Service One (changed)")

            assert_contains(out, "oauth2_rs_origin: https://changed-one.example.com/")

            assert_lacks(out, "oauth2_rs_origin: https://changed-one.example.org/")

            assert_contains(out, "oauth2_rs_origin_landing: https://changed-one.example.com/landing")

            assert_lacks(out, "oauth2_rs_scope_map")

            assert_lacks(out, "oauth2_rs_sup_scope_map")

pkgs/applications/blockchains/trezor-suite/default.nix

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/azuredatastudio/default.nix

+9 −4

File changed.

Preview size limit exceeded, changes collapsed.