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

Merge staging-next into staging

parents 5d3a8e62 5f097392

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

+4 −4
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ let 
    sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss=";

  };

  betaVersion = {

    version = "2025.2.3.7"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 2"

    sha256Hash = "sha256-d5BcAUkYV7O25wyoifiZxfUsANPxLa/QkuT9u1qqfP8=";

    version = "2025.2.3.8"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 3"

    sha256Hash = "sha256-KHvWVIxNzwdgl9kdqXD5Cpvz58r8pWs2VRyPV3VrJH0=";

  };

  latestVersion = {

    version = "2025.3.1.2"; # "Android Studio Panda 1 | 2025.3.1 Canary 2"

    sha256Hash = "sha256-kgYPwMF/CypkCq4w/y+HnraNdPNHf53198x35S0i7OA=";

    version = "2025.3.1.4"; # "Android Studio Panda 1 | 2025.3.1 Canary 4"

    sha256Hash = "sha256-5ymB/HKSmi32AWV39+HYmfY11frkNxf2dq8Ld4f9qfA=";

  };

in

{

pkgs/by-name/ai/airwindows/package.nix

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

stdenv.mkDerivation {

  pname = "airwindows";

  version = "0-unstable-2025-12-07";

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



  src = fetchFromGitHub {

    owner = "airwindows";

    repo = "airwindows";

    rev = "bfff4df7e63a3f6fde744e890849b21895c94e78";

    hash = "sha256-Ss91Ld2bNYD4HiO7Mgth5fwg3OVBYvZBaDQstBvvVKU=";

    rev = "53a648baed26d12df3351b3301ea9cc741a35648";

    hash = "sha256-GN6AuqrHfFItFe8s1xU3LpltnTKEhasrvyI+3H9z7rU=";

  };



  # we patch helpers because honestly im spooked out by where those variables

pkgs/by-name/er/ersatztv/nuget-deps.json

+0 −5
Original line number Diff line number Diff line
@@ -309,11 +309,6 @@ 
    "version": "5.0.0",

    "hash": "sha256-THQ8Z7DAoMDEqAS7feAmAt82NvU7H90Y+jYwC7NwL+0="

  },

  {

    "pname": "Microsoft.AspNetCore.App.Internal.Assets",

    "version": "10.0.2",

    "hash": "sha256-nh+JRXHTI01RUDFeEw4yep4iMxci5R7zKyRX2Tkd/mc="

  },

  {

    "pname": "Microsoft.AspNetCore.Authentication.JwtBearer",

    "version": "10.0.1",

pkgs/by-name/fo/focus-stack/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "focus-stack";

  version = "1.4";

  version = "1.5";



  src = fetchFromGitHub {

    owner = "PetteriAimonen";

    repo = "focus-stack";

    rev = version;

    hash = "sha256-SoECgBMjWI+n7H6p3hf8J5E9UCLHGiiz5WAsEEioJsU=";

    hash = "sha256-hIaK8hjeuu6w/8nh9DHOffqZufQdqB1/VQRezCPQIPk=";

  };



  nativeBuildInputs = [

pkgs/by-name/ja/jarowinkler-cpp/package.nix

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  catch2_3,

}:



stdenv.mkDerivation rec {

  pname = "jarowinkler-cpp";

  version = "1.0.2";



  src = fetchFromGitHub {

    owner = "maxbachmann";

    repo = "jarowinkler-cpp";

    rev = "v${version}";

    hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw=";

  };



  nativeBuildInputs = [

    cmake

  ];



  cmakeFlags = lib.optionals doCheck [

    "-DJARO_WINKLER_BUILD_TESTING=ON"

  ];



  nativeCheckInputs = [

    catch2_3

  ];



  doCheck = true;



  meta = {

    description = "Fast Jaro and Jaro-Winkler distance";

    homepage = "https://github.com/maxbachmann/jarowinkler-cpp";

    changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ dotlambda ];

    platforms = lib.platforms.unix;

  };

}