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

Merge master into staging-next

parents ba7ae43f 72338f39

pkgs/applications/editors/jetbrains/bin/versions.json

+208 −208

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/jetbrains/plugins/plugins.json

+677 −685

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/emulators/libretro/cores/snes9x.nix

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

mkLibretroCore {

  core = "snes9x";

  version = "0-unstable-2025-09-24";

  version = "0-unstable-2025-10-11";



  src = fetchFromGitHub {

    owner = "snes9xgit";

    repo = "snes9x";

    rev = "94115094ead4da7342bd638bb4cc293ae7d297c0";

    hash = "sha256-tXSQursZcV/gsLlydVRD1KUR8t2zztfby7cDno1xtHc=";

    rev = "cdffce2e32bfc0305fd5489831d09b5e730bed9b";

    hash = "sha256-uTUhE6yvzgGxik1TMxcOI4K55xKTZNl7PmwYVxBsQZY=";

  };



  makefile = "Makefile";

pkgs/by-name/br/brave/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -3,24 +3,24 @@ 


let

  pname = "brave";

  version = "1.83.112";

  version = "1.83.118";



  allArchives = {

    aarch64-linux = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";

      hash = "sha256-IqPxbt3nCIrrqr3yVS0gDdiYsQ2OXVm3dabY8AH7IK0=";

      hash = "sha256-daHMBEGYJBLYu2HP2oY1wYLhVC61DNT6EFlK/PBzqcw=";

    };

    x86_64-linux = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

      hash = "sha256-Q0V5V9JYGAgKAV3L43fy5I8ojIcxyU7C5OnqvatlkPE=";

      hash = "sha256-KjcRXDxXAkhgAXgALzCN828+ovp2HURKL+VWT2DIMVI=";

    };

    aarch64-darwin = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";

      hash = "sha256-bHePzMfb/FcCkH2aWqi8669mYcfTT/908ZasxOhFDHk=";

      hash = "sha256-EnCEuLqYdV3gSwvcT19FUtRbPm79TdjUzL39sKpPTd8=";

    };

    x86_64-darwin = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";

      hash = "sha256-DNtEb7stYQ5uG+L7pdXXQZp/6dtx9eUlLgM0MpNLJac=";

      hash = "sha256-brj0EvOwX0i82ndPHBS9mqfliq/YnXyxGeiz4nA1qNw=";

    };

  };

pkgs/by-name/br/brlaser/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ stdenv.mkDerivation rec { 
  ];



  cmakeFlags = [

    # NOTE: this can be removed once version 6.2.8 is released

    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"

    "-DCUPS_SERVER_BIN=lib/cups"

    "-DCUPS_DATA_DIR=share/cups"

  ];