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

Merge master into haskell-updates

parents a43b0c2c 28c94a90

lib/meta.nix

+3 −2
Original line number Diff line number Diff line
@@ -92,12 +92,13 @@ rec { 


     A package is available on a platform if both



       1. One of `meta.platforms` pattern matches the given platform.

       1. One of `meta.platforms` pattern matches the given

          platform, or `meta.platforms` is not present.



       2. None of `meta.badPlatforms` pattern matches the given platform.

  */

  availableOn = platform: pkg:

    lib.any (platformMatch platform) pkg.meta.platforms &&

    ((!pkg?meta.platforms) || lib.any (platformMatch platform) pkg.meta.platforms) &&

    lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []);



  /* Get the corresponding attribute in lib.licenses

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16259,4 +16259,10 @@ 
    github = "ziguana";

    githubId = 45833444;

  };

  detegr = {

    name = "Antti Keränen";

    email = "detegr@rbx.email";

    github = "Detegr";

    githubId = 724433;

  };

}

nixos/modules/services/web-apps/changedetection-io.nix

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ in 
          };

        })

      ];

      podman.defaultNetwork.dnsname.enable = true;

      podman.defaultNetwork.settings.dns_enabled = true;

    };

  };

}

nixos/modules/system/boot/kernel.nix

+5 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ in 
          {

            name = "foo";

            patch = ./foo.patch;

            structuredExtraConfig.FOO = lib.kernel.yes;

            extraStructuredConfig.FOO = lib.kernel.yes;

            features.foo = true;

          }

        ]
@@ -96,16 +96,17 @@ in 
                                        # (required, but can be null if only config changes

                                        # are needed)



          structuredExtraConfig = {     # attrset of extra configuration parameters

          extraStructuredConfig = {     # attrset of extra configuration parameters

            FOO = lib.kernel.yes;       # (without the CONFIG_ prefix, optional)

          };                            # values should generally be lib.kernel.yes or lib.kernel.no

          };                            # values should generally be lib.kernel.yes,

                                        # lib.kernel.no or lib.kernel.module



          features = {                  # attrset of extra "features" the kernel is considered to have

            foo = true;                 # (may be checked by other NixOS modules, optional)

          };



          extraConfig = "CONFIG_FOO y"; # extra configuration options in string form

                                        # (deprecated, use structuredExtraConfig instead, optional)

                                        # (deprecated, use extraStructuredConfig instead, optional)

        }

        ```

nixos/tests/gitlab.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ let 


  aliceUsername = "alice";

  aliceUserId = "2";

  alicePassword = "alicepassword";

  alicePassword = "R5twyCgU0uXC71wT9BBTCqLs6HFZ7h3L";

  aliceProjectId = "2";

  aliceProjectName = "test-alice";



  bobUsername = "bob";

  bobUserId = "3";

  bobPassword = "bobpassword";

  bobPassword = "XwkkBbl2SiIwabQzgcoaTbhsotijEEtF";

  bobProjectId = "3";

in {

  name = "gitlab";