Unverified Commit a86d1125 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 13bff293 5ee6b516

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14494,6 +14494,12 @@ 
    github = "pbsds";

    githubId = 140964;

  };

  pca006132 = {

    name = "pca006132";

    email = "john.lck40@gmail.com";

    github = "pca006132";

    githubId = 12198657;

  };

  pcarrier = {

    email = "pc@rrier.ca";

    github = "pcarrier";

pkgs/applications/audio/sonic-pi/default.nix

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


stdenv.mkDerivation rec {

  pname = "sonic-pi";

  version = "4.4.0";

  version = "4.5.0";



  src = fetchFromGitHub {

    owner = "sonic-pi-net";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-rXMCaI9zvWIXmT7ZqIArsvZmEkEEbs+5jYDYsSGeCXc=";

    hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0=";

  };



  mixFodDeps = beamPackages.fetchMixDeps {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec { 
    pname = "mix-deps-${pname}";

    mixEnv = "test";

    src = "${src}/app/server/beam/tau";

    hash = "sha256-YbYe+hljnoWFgV72OQ2YaUcnhucEtVb+TCLcMYzqUWU=";

    hash = "sha256-7wqFI3f0CRVrXK2IUguqHNANwKMmTak/Xh9nr624TXc=";

  };



  strictDeps = true;

pkgs/applications/graphics/djv/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ stdenv.mkDerivation rec { 
  patches = [

    # Pull fix ending upstream inclusion for gcc-12+ support:

    #   https://github.com/darbyjohnston/DJV/pull/477

    (fetchpatch {

      name = "gcc-13-cstdint-include.patch";

      url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch";

      hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk=";

    })

    (fetchpatch {

      name = "gcc-11-limits.patch";

      url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";

pkgs/applications/graphics/vengi-tools/default.nix

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


stdenv.mkDerivation rec {

  pname = "vengi-tools";

  version = "0.0.27";

  version = "0.0.28";



  src = fetchFromGitHub {

    owner = "mgerhardy";

    repo = "vengi";

    rev = "v${version}";

    hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI=";

    hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/qdirstat/default.nix

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


let

  pname = "qdirstat";

  version = "1.8.1";

  version = "1.9";



  src = fetchFromGitHub {

    owner = "shundhammer";

    repo = pname;

    rev = version;

    sha256 = "sha256-yWv41iWtdTdlFuvLHKCbwmnSXq7Z5pIJq28GMDltdxM=";

    sha256 = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";

  };

in