Unverified Commit 15fcb26b authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #283822 from K900/fresh-fruit 

Yuzu updates for 2024-01-28
parents 499b9a5d bdb00cdb

pkgs/applications/emulators/yuzu/compat-list.nix

+3 −3
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, unstableGitUpdater }:

stdenv.mkDerivation {

  pname = "yuzu-compatibility-list";

  version = "unstable-2024-01-21";

  version = "unstable-2024-01-27";



  src = fetchFromGitHub {

    owner = "flathub";

    repo = "org.yuzu_emu.yuzu";

    rev = "a3dd360e8b6e8c0c93d40f00416534c8b4bcd59a";

    hash = "sha256-nXh5cJTS1zCa6GoH+AoisTIohsRruycqosxpmFAsaSw=";

    rev = "c01bdbbfda3e2558930fcced63b6d02b646f881b";

    hash = "sha256-TDmzBxeJq4gJvU88hJaXN7U3PYOqI1OrkenlH1GJo8g=";

  };



  buildCommand = ''

pkgs/applications/emulators/yuzu/default.nix

+1 −11
Original line number Diff line number Diff line 
{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope, vulkan-headers, fetchFromGitHub }:

{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope }:



makeScopeWithSplicing' {

  otherSplices = generateSplicesForMkScope "yuzuPackages";
@@ -8,15 +8,5 @@ makeScopeWithSplicing' { 


    mainline = self.callPackage ./mainline.nix {};

    early-access = self.callPackage ./early-access {};



    vulkan-headers = vulkan-headers.overrideAttrs(old: rec {

      version = "1.3.274";

      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "Vulkan-Headers";

        rev = "v${version}";

        hash = "sha256-SsS5VlEnhjOSu8MlIVC0d2r2EAf8QsNJPEAXNtbDOJ4=";

      };

    });

  };

}

pkgs/applications/emulators/yuzu/early-access/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ let 
  '';



  rehydratedSrc = fetchgit {

    name = "yuzu-ea-rehydrated";

    url = gitSrc;

    fetchSubmodules = true;

    hash = sources.fullHash;

pkgs/applications/emulators/yuzu/early-access/sources.nix

+4 −4
Original line number Diff line number Diff line 
# Generated by ./update.sh - do not update manually!

# Last updated: 2024-01-22

# Last updated: 2024-01-28

{

  version = "4079";

  distHash = "sha256:12cwzgdnpla9m24cla1596p773zpdgmi0zlyvdypmdx0qzwgwkpp";

  fullHash = "sha256:1zp2nz9blsim2xmwb3pah38nrdysa3yrlqgb051n8b8qp6fp5979";

  version = "4093";

  distHash = "sha256:0f6ffs0qvq516vcc6w132p9lg888cy6id9cgkdmzc6039aymdgki";

  fullHash = "sha256:1scn06anfjvy4ysxmv8qq7p5dzkfqyxbm6h6lpywy3nkpyx1cz15";

}

pkgs/applications/emulators/yuzu/early-access/update.sh

+1 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ log "Unpacking dist..." 
tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1



log "Rehydrating..."

eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')"

eaFullHash="$(nix-prefetch-git --fetch-submodules --quiet "$eaDistUnpacked" | jq -r '.sha256')"



cat >sources.nix <<EOF

# Generated by ./update.sh - do not update manually!
@@ -42,7 +42,3 @@ cat >sources.nix <<EOF 
  fullHash = "sha256:$eaFullHash";

}

EOF
 


if [ "${COMMIT:-0}" == "1" ]; then

    git commit -m "yuzu-ea: ${oldVersion} -> ${newVersion}" ./sources.nix

fi