From 20aa41fb816ec8faa90c3eab8076d591068305df Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 Jan 2024 22:47:20 +0300 Subject: [PATCH 1/7] yuzu: drop vulkan-headers override We have a new enough one by default now --- pkgs/applications/emulators/yuzu/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 116f12b2a963..6852da378650 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -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="; - }; - }); }; } From 4c9da6057faa4d47ad86833fe854b81a76787ccb Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 Jan 2024 22:36:57 +0300 Subject: [PATCH 2/7] yuzu-ea: fix update script Somehow, nix-prefetch-git crashes when ran without --quiet and with stderr redirected --- pkgs/applications/emulators/yuzu/early-access/update.sh | 6 +----- pkgs/applications/emulators/yuzu/update.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/early-access/update.sh b/pkgs/applications/emulators/yuzu/early-access/update.sh index 0e98185bbf9a..f7ea2ca34a41 100755 --- a/pkgs/applications/emulators/yuzu/early-access/update.sh +++ b/pkgs/applications/emulators/yuzu/early-access/update.sh @@ -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 <sources.nix < ${newVersion}" ./sources.nix -fi diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index 4bb96b2105b4..25ea10fc9aa0 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -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 "$@" From ae559567f5ed86aa522d1601446ec56de759ebb1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 27 Jan 2024 17:47:31 +0300 Subject: [PATCH 3/7] yuzu: redo timezone handling --- pkgs/applications/emulators/yuzu/mainline.nix | 3 ++- pkgs/applications/emulators/yuzu/nx_tzdb.nix | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/mainline.nix b/pkgs/applications/emulators/yuzu/mainline.nix index 3daed1c7c8c0..beb08d30e8ad 100644 --- a/pkgs/applications/emulators/yuzu/mainline.nix +++ b/pkgs/applications/emulators/yuzu/mainline.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , wrapQtAppsHook , alsa-lib @@ -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 diff --git a/pkgs/applications/emulators/yuzu/nx_tzdb.nix b/pkgs/applications/emulators/yuzu/nx_tzdb.nix index faca41e24737..de847e2b0c78 100644 --- a/pkgs/applications/emulators/yuzu/nx_tzdb.nix +++ b/pkgs/applications/emulators/yuzu/nx_tzdb.nix @@ -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 { From e6bd8c605bee93f1d518e05576fad3e0d0c0f066 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jan 2024 15:40:03 +0300 Subject: [PATCH 4/7] yuzuPackages.early-access: better name for intermediate drv --- pkgs/applications/emulators/yuzu/early-access/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/emulators/yuzu/early-access/default.nix b/pkgs/applications/emulators/yuzu/early-access/default.nix index 842f7c107975..f2ad5197d0bb 100644 --- a/pkgs/applications/emulators/yuzu/early-access/default.nix +++ b/pkgs/applications/emulators/yuzu/early-access/default.nix @@ -23,6 +23,7 @@ let ''; rehydratedSrc = fetchgit { + name = "yuzu-ea-rehydrated"; url = gitSrc; fetchSubmodules = true; hash = sources.fullHash; From cfa9cb74724b231c015675f8bf7cc97c3182dd5f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jan 2024 17:01:04 +0300 Subject: [PATCH 5/7] yuzuPackages.compat-list: unstable-2024-01-21 -> unstable-2024-01-27 --- pkgs/applications/emulators/yuzu/compat-list.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/compat-list.nix b/pkgs/applications/emulators/yuzu/compat-list.nix index d549a17a9064..e95d2099e2d1 100644 --- a/pkgs/applications/emulators/yuzu/compat-list.nix +++ b/pkgs/applications/emulators/yuzu/compat-list.nix @@ -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 = '' From c9b9c1d89bd9a84e6c60cd0a956085c0d7335056 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jan 2024 18:02:12 +0300 Subject: [PATCH 6/7] yuzuPackages.mainline: 1689 -> 1696 Changelog: https://yuzu-emu.org/entry --- pkgs/applications/emulators/yuzu/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/mainline.nix b/pkgs/applications/emulators/yuzu/mainline.nix index beb08d30e8ad..62df80750bd6 100644 --- a/pkgs/applications/emulators/yuzu/mainline.nix +++ b/pkgs/applications/emulators/yuzu/mainline.nix @@ -48,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; }; From bdb00cdb4d4c37d3953134ea15e09c8a5b76854d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jan 2024 17:07:54 +0300 Subject: [PATCH 7/7] yuzuPackages.early-access: 4079 -> 4093 Changelog: https://yuzu-emu.org/entry --- pkgs/applications/emulators/yuzu/early-access/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/early-access/sources.nix b/pkgs/applications/emulators/yuzu/early-access/sources.nix index 94f20f5e948c..ee7cc6edb500 100644 --- a/pkgs/applications/emulators/yuzu/early-access/sources.nix +++ b/pkgs/applications/emulators/yuzu/early-access/sources.nix @@ -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"; }