Commit 0717a4da authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 0b14a718 9baaaec6

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ ad815aebfbfe1415ff6436521d545029c803c3fb 
# nixos/nvidia: apply nixfmt-rfc-style (#313440)

fbdcdde04a7caa007e825a8b822c75fab9adb2d6



# treewide: reformat files which need reformatting after (#341407)

e0464e47880a69896f0fb1810f00e0de469f770a



# step-cli: format package.nix with nixfmt (#331629)

fc7a83f8b62e90de5679e993d4d49ca014ea013d

.github/workflows/codeowners.yml

+4 −5
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ on: 
env:

  # TODO: Once confirmed that this works by seeing that the action would request

  # reviews from the same people (or refuse for wrong base branches),

  # move all entries from CODEOWNERS to OWNERS and change this value here

  # OWNERS_FILE: .github/OWNERS

  # move all entries from CODEOWNERS to OWNERS, remove these two lines and uncomment the ones below

  OWNERS_FILE: .github/CODEOWNERS

  # Also remove this

  DRY_MODE: 1

  # OWNERS_FILE: .github/OWNERS

  # # Don't do anything on draft PRs

  # DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}



jobs:

  # Check that code owners is valid
@@ -84,5 +85,3 @@ jobs: 
      run: result/bin/request-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"

      env:

        GH_TOKEN: ${{ steps.app-token.outputs.token }}
 
        # Don't do anything on draft PRs

        DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}

CONTRIBUTING.md

+2 −2
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ Names of files and directories should be in lowercase, with dashes between words 


  ```nix

  {

    buildInputs = lib.optional stdenv.isDarwin iconv;

    buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv;

  }

  ```
@@ -645,7 +645,7 @@ Names of files and directories should be in lowercase, with dashes between words 


  ```nix

  {

    buildInputs = if stdenv.isDarwin then [ iconv ] else null;

    buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null;

  }

  ```

doc/languages-frameworks/beam.section.md

+2 −2
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ let 
    nodePackages.prettier

  ];



  inputs = basePackages ++ lib.optionals stdenv.isLinux [ inotify-tools ]

    ++ lib.optionals stdenv.isDarwin

  inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin

    (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]);



  # define shell startup command

doc/languages-frameworks/emscripten.section.md

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update 
    echo "================= /testing zlib using node ================="

  '';



  postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''

  postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''

    substituteInPlace configure \

      --replace-fail '/usr/bin/libtool' 'ar' \

      --replace-fail 'AR="libtool"' 'AR="ar"' \