yuzu-{ea,mainline}: {2841,1092} -> {2901,1131}
This also changes the update script for EA to fetch the two latest releases, filter for tags matching /^EA-[0-9]*/ and pick the latest one. This is required because recently the auto-updater (tag: continuous) is the latest release, which would have been picked by the update script. It also updates the free icons patch, which is needed due to yuzu changing how they track licenses of files to REUSE. The comment is updated to reflect the workflow that is needed to create the patch, because pineapple does not include files beginning with a dot in its source.
This commit is contained in:
parent
541a3ca27c
commit
8cb3340ffe
@ -15,13 +15,13 @@ let
|
||||
in {
|
||||
mainline = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-mainline";
|
||||
version = "1092";
|
||||
version = "1131";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "1avcq924q0r8pfv1s0a88iyii7yixcxpb3yhlj0xg9zqnwp9r23y";
|
||||
sha256 = "0lh8s59hrysfjz69yr0f44s3l4aaznmclq0xfnyblsk0cw9ripf6";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -30,13 +30,13 @@ in {
|
||||
|
||||
early-access = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-ea";
|
||||
version = "2841";
|
||||
version = "2901";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pineappleEA";
|
||||
repo = "pineapple-src";
|
||||
rev = "EA-${version}";
|
||||
sha256 = "16lrq9drv0x7gs1siq37m4zmh6d2g3vhnw9qcqajr9p0vmlpnh6l";
|
||||
sha256 = "0jymm9sdsnayjaffmcbpjck4k2yslx8zid2vsm4jfdaajr244q2z";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -47,8 +47,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Replace icons licensed under CC BY-ND 3.0 with free ones to allow
|
||||
# for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104
|
||||
# The patch hosted on GitHub has the binary information stripped, so
|
||||
# it has been regenerated with "git format-patch --text --full-index --binary"
|
||||
# The patch hosted on GitHub has the binary information in git format, which
|
||||
# can’t be applied with patch(1), so it has been regenerated with
|
||||
# "git format-patch --text --full-index --binary".
|
||||
# Because pineapple strips all files beginning with a dot, the patch needs to
|
||||
# be edited manually afterwards to remove all changes to those.
|
||||
patches = [ ./yuzu-free-icons.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -53,7 +53,7 @@ updateEarlyAccess() {
|
||||
OLD_EA_HASH="$(getLocalHash "yuzu-ea")"
|
||||
|
||||
NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
|
||||
"https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2 | cut -d" " -f1)"
|
||||
"https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)"
|
||||
|
||||
if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then
|
||||
echo "yuzu-ea is already up to date!"
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user