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

Merge master into staging-next

parents 0737c221 1a268c42

.github/workflows/basic-eval.yml

+5 −0
Original line number Diff line number Diff line
@@ -16,5 +16,10 @@ jobs: 
    steps:

    - uses: actions/checkout@v3

    - uses: cachix/install-nix-action@v16

    - uses: cachix/cachix-action@v10

      with:

        # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

        name: nixpkgs-ci

        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

    # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset

    - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin"  ]'

.github/workflows/manual-nixos.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ jobs: 
          extra_nix_config: sandbox = true

      - uses: cachix/cachix-action@v10

        with:

          # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.

          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

          name: nixpkgs-ci

          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

      - name: Building NixOS manual

.github/workflows/manual-nixpkgs.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ jobs: 
          extra_nix_config: sandbox = true

      - uses: cachix/cachix-action@v10

        with:

          # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.

          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

          name: nixpkgs-ci

          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

      - name: Building Nixpkgs manual

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -1688,6 +1688,12 @@ 
    githubId = 355401;

    name = "Brian Hicks";

  };

  brianmcgee = {

    name = "Brian McGee";

    email = "brian@41north.dev";

    github = "brianmcgee";

    githubId = 1173648;

  };

  Br1ght0ne = {

    email = "brightone@protonmail.com";

    github = "Br1ght0ne";

nixos/modules/services/monitoring/prometheus/exporters.nix

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ let 
    "blackbox"

    "buildkite-agent"

    "collectd"

    "dmarc"

    "dnsmasq"

    "domain"

    "dovecot"