Commit 980dd8b4 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents b8ff22dc 1eff2edc

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -731,6 +731,12 @@ 
    githubId = 79667753;

    keys = [ { fingerprint = "B0D7 2955 235F 6AB5 ACFA  1619 8C7F F5BB 1ADE F191"; } ];

  };

  ailsa-sun = {

    name = "Ailsa Sun";

    email = "jjshenw@gmail.com";

    github = "ailsa-sun";

    githubId = 135079815;

  };

  aimpizza = {

    email = "rickomo.us@gmail.com";

    name = "Rick Omonsky";

pkgs/applications/graphics/pineapple-pictures/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "pineapple-pictures";

  version = "0.8.1";

  version = "0.8.2.1";



  src = fetchFromGitHub {

    owner = "BLumia";

    repo = "pineapple-pictures";

    rev = finalAttrs.version;

    hash = "sha256-7X0A3tjdr8hnnovkbgIOLx5h/eWy0gkM8SEB2/bpwkQ=";

    hash = "sha256-24VDmB0eR8h0JGqpsdN0HkRRIHLw9DIT2sM4rCvPwhE=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/blender/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -108,13 +108,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "blender";

  version = "4.2.2";

  version = "4.2.3";



  srcs = [

    (fetchzip {

      name = "source";

      url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";

      hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU=";

      hash = "sha256-58wgduTHGfuYohaPjNuAnLFrpXOosEYOk5gJvbxTlQk=";

    })

    (fetchgit {

      name = "assets";

pkgs/applications/networking/cluster/linkerd/edge.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


(callPackage ./generic.nix { }) {

  channel = "edge";

  version = "24.9.3";

  sha256 = "1vm6f8abain3zjs3jymr62p7lk475av38pljczgb13fgnn2w6qii";

  vendorHash = "sha256-w7TchPXGQQSWcCVf4BMvh5U8qnkctgJAl0sHL6ml/8Y=";

  version = "24.10.3";

  sha256 = "1xsimk3kjniy59sw56q52cmnpg1vb1l1zbaj6nrj44pl57vkp9cp";

  vendorHash = "sha256-JVXhZjUdU1CrWzrh7INhAd3kRP/tcdsYzlre9SB9gOQ=";

}

pkgs/by-name/as/astro-language-server/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "astro-language-server";

  version = "2.15.3";

  version = "2.15.4";



  src = fetchFromGitHub {

    owner = "withastro";

    repo = "language-tools";

    rev = "@astrojs/language-server@${finalAttrs.version}";

    hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo=";

    hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";

  };



  pnpmDeps = pnpm.fetchDeps {
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { 
      pnpmWorkspaces

      prePnpmInstall

      ;

    hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA=";

    hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";

  };



  nativeBuildInputs = [