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

Merge master into staging-next

parents da37a0f3 e0188a42

pkgs/by-name/bo/boxbuddy/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "boxbuddy";

  version = "2.1.4";

  version = "2.1.5";



  src = fetchFromGitHub {

    owner = "Dvlv";

    repo = "BoxBuddyRS";

    rev = version;

    hash = "sha256-954jMFWSIDDqtMitgc8456SMcQLzi6LhLbVvOC45fxQ=";

    hash = "sha256-XMLgUYOv2ObHqYxqPch5i0Q1/BvfDuC1Lti5FYAVmnk=";

  };



  cargoHash = "sha256-08d0mPSGYySxw2uq16MNOu2Y39kjqyfZ8rJ2yTOL3/w=";

  cargoHash = "sha256-zbhdGpF3TonGlvRXCWF00PhIc0k1ZO2xIMXuwYD90mY=";



  # The software assumes it is installed either in flatpak or in the home directory

  # so the xdg data path needs to be patched here

pkgs/by-name/mi/microsoft-identity-broker/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
}:

stdenv.mkDerivation rec {

  pname = "microsoft-identity-broker";

  version = "1.7.0";

  version = "2.0.0";



  src = fetchurl {

    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb";

    hash = "sha256-81hKYQKbSimAScO6L13GdweFfzoVpeQzKuV8GJ6kZ1U=";

    hash = "sha256-HJ5Q462ziYd+JB1paj0f0OENSJLHqNcX59Fxe+/5RYE=";

  };



  nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ];

pkgs/by-name/ry/ryujinx/package.nix

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


buildDotnetModule rec {

  pname = "ryujinx";

  version = "1.1.1239"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

  version = "1.1.1242"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml



  src = fetchFromGitHub {

    owner = "Ryujinx";

    repo = "Ryujinx";

    rev = "d26ef2eec309a7a7b30b103c245044d1cdc08add";

    sha256 = "0kdhxkgnnzhvmwlnzb5d0xx2f240y5h0vc1fhwiqk2cvwly5nd6y";

    rev = "c94a73ec60f3f75b36179cbc93d046701ed96253";

    sha256 = "0wksc3c63insll1jl0w6pa7vfgvkc50dzkwip676q3j8749fpzql";

  };



  dotnet-sdk = dotnetCorePackages.sdk_8_0;

pkgs/development/coq-modules/HoTT/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ mkCoqDerivation { 
  owner = "HoTT";

  inherit version;

  defaultVersion = with lib.versions; lib.switch coq.coq-version [

    { case = range "8.14" "8.18"; out = coq.coq-version; }

    { case = range "8.14" "8.19"; out = coq.coq-version; }

  ] null;

  releaseRev = v: "V${v}";

  release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0=";
@@ -14,6 +14,7 @@ mkCoqDerivation { 
  release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY=";

  release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8=";

  release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc=";

  release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ=";



  # versions of HoTT for Coq 8.17 and onwards will use dune

  # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null;

pkgs/development/coq-modules/dpdgraph/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ mkCoqDerivation { 
  repo = "coq-dpdgraph";

  inherit version;

  defaultVersion = lib.switch coq.coq-version [

    { case = "8.19"; out = "1.0+8.19"; }

    { case = "8.18"; out = "1.0+8.18"; }

    { case = "8.17"; out = "1.0+8.17"; }

    { case = "8.16"; out = "1.0+8.16"; }
@@ -22,6 +23,7 @@ mkCoqDerivation { 
    { case = "8.7";  out = "0.6.2"; }

  ] null;



  release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";

  release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI=";

  release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4=";

  release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0=";