dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #283822 from K900/fresh-fruit

Browse Source 
Yuzu updates for 2024-01-28
This commit is contained in:
K900 2024-01-28 20:48:59 +03:00 committed by GitHub
commit 15fcb26b3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/emulators/yuzu/compat-list.nix
View File

@ -1,13 +1,13 @@
{ 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 = ''

12
pkgs/applications/emulators/yuzu/default.nix
View File

@ -1,4 +1,4 @@
{ 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=";
};
});
};
}

1
pkgs/applications/emulators/yuzu/early-access/default.nix
View File

@ -23,6 +23,7 @@ let
'';
rehydratedSrc = fetchgit {
name = "yuzu-ea-rehydrated";
url = gitSrc;
fetchSubmodules = true;
hash = sources.fullHash;

8
pkgs/applications/emulators/yuzu/early-access/sources.nix
View File

@ -1,7 +1,7 @@
# 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";
}

6
pkgs/applications/emulators/yuzu/early-access/update.sh
View File

@ -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

7
pkgs/applications/emulators/yuzu/mainline.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, wrapQtAppsHook
, alsa-lib
@ -47,13 +48,13 @@
}:
stdenv.mkDerivation(finalAttrs: {
pname = "yuzu";
version = "1689";
version = "1696";
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${finalAttrs.version}";
hash = "sha256-5ITGFWS0OJLXyNoAleZrJob2jz1He1LEOvQzjIlMmPQ=";
hash = "sha256-9xIhOA8hA7rsjtO0sgg1ucqghSzaOtkuTAHyQvmT+y4=";
fetchSubmodules = true;
};
@ -154,7 +155,7 @@ stdenv.mkDerivation(finalAttrs: {
# provide pre-downloaded tz data
mkdir -p build/externals/nx_tzdb
ln -sf ${nx_tzdb} build/externals/nx_tzdb/${nx_tzdb.version}.zip
ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
'';
# This must be done after cmake finishes as it overwrites the file

6
pkgs/applications/emulators/yuzu/nx_tzdb.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gitUpdater }:
{ stdenv, fetchurl, unzip, gitUpdater }:
stdenv.mkDerivation rec {
pname = "nx_tzdb";
version = "221202";
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c=";
};
dontUnpack = true;
nativeBuildInputs = [ unzip ];
buildCommand = ''
cp $src $out
unzip $src -d $out
'';
passthru.updateScript = gitUpdater {

2
pkgs/applications/emulators/yuzu/update.sh
View File

@ -4,4 +4,4 @@
nix-update -u yuzuPackages.nx_tzdb "$@"
nix-update -u yuzuPackages.compat-list "$@"
nix-update -u yuzuPackages.mainline "$@"
nix-update -u yuzuPackages.early-access "$@"
nix-update -u yuzuPackages.early-access --override-filename pkgs/applications/emulators/yuzu/early-access/sources.nix "$@"