Unverified Commit 8e214b0f authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents b13c0022 0c0c466c

doc/languages-frameworks/android.section.md

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Alternatively, you can pass composeAndroidPackages to the `withSdk` passthrough: 
}

```



These will export `ANDROID_SDK_ROOT` and `ANDROID_NDK_ROOT` to the SDK and NDK directories

These will export `ANDROID_HOME` and `ANDROID_NDK_ROOT` to the SDK and NDK directories

in the specified Android build environment.



## Deploying an Android SDK installation with plugins {#deploying-an-android-sdk-installation-with-plugins}

nixos/modules/services/misc/servarr/sonarr.nix

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ in 
      // lib.optionalAttrs (cfg.dataDir == "/var/lib/sonarr/.config/NzbDrone") {

        StateDirectory = "sonarr";

      };

      unitConfig.RequiresMountsFor = [ cfg.dataDir ];

    };



    networking.firewall = lib.mkIf cfg.openFirewall {

pkgs/applications/editors/android-studio/common.nix

+9 −8
Original line number Diff line number Diff line
@@ -253,21 +253,22 @@ let 
        startScript =

          let

            hasAndroidSdk = androidSdk != null;

            androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk";

            androidHome = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk";

          in

          ''

            #!${runtimeShell}

            ${lib.optionalString hasAndroidSdk ''

              echo "=== nixpkgs Android Studio wrapper" >&2



              # Default ANDROID_SDK_ROOT to the packaged one, if not provided.

              ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}"

              # Default ANDROID_HOME to the packaged one, if not provided.

              ANDROID_HOME="''${ANDROID_HOME-${androidHome}}"



              if [ -d "$ANDROID_HOME" ]; then

                export ANDROID_HOME

                echo "  - ANDROID_HOME=$ANDROID_HOME" >&2



              if [ -d "$ANDROID_SDK_ROOT" ]; then

                export ANDROID_SDK_ROOT

                # Legacy compatibility.

                export ANDROID_HOME="$ANDROID_SDK_ROOT"

                echo "  - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2

                export ANDROID_SDK_ROOT="$ANDROID_HOME"



                # See if we can export ANDROID_NDK_ROOT too.

                ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle"
@@ -282,8 +283,8 @@ let 
                  unset ANDROID_NDK_ROOT

                fi

              else

                unset ANDROID_SDK_ROOT

                unset ANDROID_HOME

                unset ANDROID_SDK_ROOT

              fi

            ''}

            exec ${lib.getExe fhsEnv} ${lib.getExe androidStudio} "$@"

pkgs/applications/emulators/libretro/cores/beetle-saturn.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "mednafen-saturn";

  version = "0-unstable-2026-01-12";

  version = "0-unstable-2026-04-20";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "beetle-saturn-libretro";

    rev = "b4df47a9f0f30d09eb95b07a4435d0f435a2e95d";

    hash = "sha256-IIjJdw7u/AaqnKCp6LXc4U0GehwrvEukTC54odCFYkU=";

    rev = "02503506566bed8f0d68c9267a1c6c57400870f2";

    hash = "sha256-mssOkL2y7NRaoKXwIbllP0GUnrAR5/zHIAs4x9Q7UnM=";

  };



  makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "mednafen-supergrafx";

  version = "0-unstable-2026-03-31";

  version = "0-unstable-2026-04-20";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "beetle-supergrafx-libretro";

    rev = "3442f442b112ccf869791600661438804f1dfc51";

    hash = "sha256-5MJ9IxIL2PX0vxZTSCcAHjxacK5BQZ+Dj5tSxiW+2x8=";

    rev = "3c6fcd3deded54ebecd69408f108407ac03d11b5";

    hash = "sha256-VO8Bn67n3D9fxbbTxwbf9iKLDueIi98zIso1qMQcrMI=";

  };



  makefile = "Makefile";