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

Merge master into staging-next

parents 644ecf0f 9a09eea9
Loading
Loading
Loading
Loading
+19 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@
    name = "Alex Chapman";
  };
  alexfmpe = {
    email = "alexandre.fmp.esteves@gmail.com";
    email = "alexfmpe@proton.me";
    github = "alexfmpe";
    githubId = 2335822;
    name = "Alexandre Esteves";
@@ -2154,6 +2154,12 @@
    githubId = 58516559;
    name = "Alexander Rezvov";
  };
  argos_nothing = {
    email = "argosnothing@gmail.com";
    github = "argosnothing";
    githubId = 225423001;
    name = "Argos Nothing";
  };
  argrat = {
    email = "n.bertazzo@protonmail.com";
    github = "brtz-cs";
@@ -15234,6 +15240,12 @@
    githubId = 78693624;
    name = "llakala";
  };
  llehouerou = {
    email = "laurent@lehouerou.net";
    github = "llehouerou";
    githubId = 3669155;
    name = "Laurent Le Houerou";
  };
  lluchs = {
    email = "lukas.werling@gmail.com";
    github = "lluchs";
@@ -22971,6 +22983,12 @@
    matrix = "@emma:rory.gay"; # preferred
    name = "Rory&";
  };
  rosebeats = {
    name = "Sophie Doiron";
    email = "sophie.d21401@gmail.com";
    github = "rosebeats";
    githubId = 39890784;
  };
  rosehobgoblin = {
    name = "J. L. Bowden";
    github = "rosehobgoblin";
+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@

buildNpmPackage rec {
  pname = "basedpyright";
  version = "1.37.4";
  version = "1.38.0";

  src = fetchFromGitHub {
    owner = "detachhead";
    repo = "basedpyright";
    tag = "v${version}";
    hash = "sha256-BTqsymgthJH1gIakSrDBx3Hxthm48kLPc85IjreX1vA=";
    hash = "sha256-bLlo4+GbsrrTeZIVI9awPQE5XQdXQI4MShclR1M46VI=";
  };

  npmDepsHash = "sha256-aZ9kfkW+S6Hjt59Z4Fc5joghs7OQ32354IYevFuKNeo=";
+3 −3
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "biome";
  version = "2.3.14";
  version = "2.3.15";

  src = fetchFromGitHub {
    owner = "biomejs";
    repo = "biome";
    rev = "@biomejs/biome@${finalAttrs.version}";
    hash = "sha256-MNxIdarZMEZx4pWd+pB/7i+Pd3k8yekgW73ZrolYCGc=";
    hash = "sha256-HRiQohI6bnV+U9c+XILOWmjGb1tQDJd3CBFNGzJuJ/4=";
  };

  cargoHash = "sha256-i8GMK4xwFreHtVvnuZdeGAAyQTMwb5y9LU5/2usWc18=";
  cargoHash = "sha256-l1eew5KmT0tpVSLmWquodoYlMavQYbyxmZxl6IRnC48=";

  nativeBuildInputs = [ pkg-config ];

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

let
  pname = "brave";
  version = "1.86.148";
  version = "1.87.186";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
      hash = "sha256-86VeBM2kKbuQ+/FAq24X4DdkAUOFzlGg52cAosMExzo=";
      hash = "sha256-MyTYIna4cT9cH/meKyCg97v8g6bYpGK7x8q/ibHNDOE=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
      hash = "sha256-VLJLU9hgKX7MwhxdFLyaPTmOb6+AEsJze40EePVd+Ug=";
      hash = "sha256-d07fttXvvrDPdVCEOAZpwkLrya4elfN/jBFNf+YFtkA=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
      hash = "sha256-fYHd1TMN8kWzhchcCLxgU1M3frxCkvE7uITIdiopSU4=";
      hash = "sha256-MI3MesRZv3hpXvyayj3dFtC70Z9tneeaeQbv4BneSO8=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
      hash = "sha256-a37FTE/qi37d+pGrtkZWVqKaMXzLyIO/ppV4k9hz0uE=";
      hash = "sha256-c03bQ3gZzkA+QfDcGBmljUoaWfxz+0c4lm8ifqhPtxg=";
    };
  };

+2 −2
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "cinnamon-session";
  version = "6.6.2";
  version = "6.6.3";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon-session";
    tag = finalAttrs.version;
    hash = "sha256-5Cbx0SNBcTovRvxwPSqR4SM/FBLXrfkS5RZGXeU1ULY=";
    hash = "sha256-fmeLywpM4QhgyiX68E+4vosUK2WKGVJ1Cx8pYdOnb+k=";
  };

  buildInputs = [
Loading