Unverified Commit caa41052 authored by codgician's avatar codgician Committed by GitHub
Browse files

Merge branch 'master' into waagent-module

parents d07d8a55 d88cb592

.github/workflows/eval-lib-tests.yml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
name: "Building Nixpkgs lib-tests"



permissions:

  contents: read



on:

  pull_request_target:

    paths:

      - 'lib/**'

jobs:

  get-merge-commit:

    uses: ./.github/workflows/get-merge-commit.yml



  nixpkgs-lib-tests:

    name: nixpkgs-lib-tests

    runs-on: ubuntu-latest

    needs: get-merge-commit

    steps:

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

        if: needs.get-merge-commit.outputs.mergedSha

        with:

          # pull_request_target checks out the base branch by default

          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

      - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

        with:

          # explicitly enable sandbox

          extra_nix_config: sandbox = true

      - name: Building Nixpkgs lib-tests

        run: |

          nix-build --arg pkgs "(import ./ci/. {}).pkgs" ./lib/tests/release.nix

.mergify.yml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
queue_rules:

  # This rule is for https://docs.mergify.com/commands/queue/

  # and can be triggered with: @mergifyio queue

  - name: default

    merge_conditions:

      # all github action checks in this list are required to merge a pull request

      - check-success=Attributes

      - check-success=Check

      - check-success=Outpaths (aarch64-darwin)

      - check-success=Outpaths (aarch64-linux)

      - check-success=Outpaths (x86_64-darwin)

      - check-success=Outpaths (x86_64-linux)

      - check-success=Process

      - check-success=Request

      - check-success=Tag

      - check-success=editorconfig-check

      - check-success=label-pr

      - check-success=nix-files-parseable-check

      - check-success=nixfmt-check

      - check-success=nixpkgs-vet

    # queue up to 5 pull requests at a time

    batch_size: 5

ci/OWNERS

+3 −2
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza 
# Python-related code and docs

/doc/languages-frameworks/python.section.md   @mweinelt @natsukium

/maintainers/scripts/update-python-libraries  @mweinelt @natsukium

/pkgs/by-name/up/update-python-libraries      @mweinelt @natsukium

/pkgs/development/interpreters/python         @mweinelt @natsukium

/pkgs/top-level/python-packages.nix                     @natsukium

/pkgs/top-level/release-python.nix                      @natsukium
@@ -206,8 +207,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza 


# Browsers

/pkgs/applications/networking/browsers/firefox @mweinelt

/pkgs/applications/networking/browsers/chromium @emilylange

/nixos/tests/chromium.nix @emilylange

/pkgs/applications/networking/browsers/chromium @emilylange @networkException

/nixos/tests/chromium.nix @emilylange @networkException



# Certificate Authorities

pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt

maintainers/maintainer-list.nix

+21 −1
Original line number Diff line number Diff line
@@ -4668,6 +4668,13 @@ 
    name = "Carl Richard Theodor Schneider";

    keys = [ { fingerprint = "2017 E152 BB81 5C16 955C  E612 45BC C1E2 709B 1788"; } ];

  };

  cryo = {

    email = "cryo@disroot.org";

    github = "cry0ice";

    githubId = 176274027;

    name = "Cryo";

    keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591  F97F 4B12 E34A 25A9 AB35"; } ];

  };

  Cryolitia = {

    name = "Cryolitia PukNgae";

    email = "Cryolitia@gmail.com";
@@ -4800,6 +4807,12 @@ 
    github = "d4ilyrun";

    githubId = 34611103;

  };

  d4rk = {

    name = "Anoop Menon";

    email = "d4rk@blackvoltage.org";

    github = "d4rk";

    githubId = 22163;

  };

  d4rkstar = {

    name = "Bruno Salzano";

    email = "d4rkstar@gmail.com";
@@ -18091,6 +18104,13 @@ 
    githubId = 4579165;

    name = "Danny Bautista";

  };

  pyrotelekinetic = {

    name = "Clover";

    email = "carter@isons.org";

    github = "pyrotelekinetic";

    githubId = 29682759;

    keys = [ { fingerprint = "5963 78DB 25AA 608D 2743  D466 5D6A D9AE 71B3 F983"; } ];

  };

  pyrox0 = {

    name = "Pyrox";

    email = "pyrox@pyrox.dev";
@@ -22782,7 +22802,7 @@ 
    githubId = 332418;

  };

  tsandrini = {

    email = "tomas.sandrini@seznam.cz";

    email = "t@tsandrini.sh";

    name = "Tomáš Sandrini";

    github = "tsandrini";

    githubId = 21975189;

maintainers/scripts/update-python-libraries

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git

exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
 
exec python3 pkgs/by-name/up/update-python-libraries/update-python-libraries.py $@