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

Merge master into staging-next

parents 13b86b9a c8f9f47b

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -7749,6 +7749,13 @@ 
    githubId = 3422442;

    name = "Ruben Maher";

  };

  er0k = {

    email = "er0k@er0k.net";

    github = "er0k";

    githubId = 916239;

    name = "er0k";

    keys = [ { fingerprint = "60DE 4570 2E31 81A2 AF87  F075 B005 BA3C 8EE8 108D"; } ];

  };

  eraserhd = {

    email = "jason.m.felice@gmail.com";

    github = "eraserhd";

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

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ let 
      inherit tiling_wm;

    };

  stableVersion = {

    version = "2025.1.4.8"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4"

    sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM=";

    version = "2025.2.1.7"; # "Android Studio Otter | 2025.2.1"

    sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE=";

  };

  betaVersion = {

    version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1"

pkgs/applications/emulators/wine/sources.nix

+3 −3
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "10.17";

    version = "10.18";

    url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";

    hash = "sha256-u/jn3jLOqf4wU2HUr4XjBJIlTEvwIDnuJtrHpmcBtOY=";

    hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs=";



    patches = [

      # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec { 
    # see https://gitlab.winehq.org/wine/wine-staging

    staging = fetchFromGitLab {

      inherit version;

      hash = "sha256-fTEzj3o7A9H9jIh3yhw8SCfNsnVeJ6pyL3jERqhVbr8=";

      hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM=";

      domain = "gitlab.winehq.org";

      owner = "wine";

      repo = "wine-staging";

pkgs/applications/misc/inochi2d/generic.nix

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ buildDubPackage ( 
      # We get around this by manually pre-fetching the submodule and copying it into the right place

      cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui"



      # bump cmake minimum version to a version supported by cmake 4

      substituteInPlace "$cimgui_dir/deps/cimgui/CMakeLists.txt" \

          --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"



      # Disable the original cmake fetcher script

      substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \

          --replace-fail "PullSubmodules(" "# PullSubmodules(" \

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3
Original line number Diff line number Diff line
@@ -1129,13 +1129,13 @@ 
    "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="

  },

  "rootlyhq_rootly": {

    "hash": "sha256-215PagKhONN483SGvYsLWQfKnSWmUKL1vCM4mr2xuGo=",

    "hash": "sha256-8UlBt9gmQflO5sB++U4Ih40+6p+U6N8PE1npQYg9D8U=",

    "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",

    "owner": "rootlyhq",

    "repo": "terraform-provider-rootly",

    "rev": "v4.3.5",

    "rev": "v4.3.7",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-MNddgnKFdrOCfpj84McqW/8lmU/t36x2Whsl9xkmrhM="

    "vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="

  },

  "rundeck_rundeck": {

    "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",