cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

wine: tweak update script to allow gecko versions to diverge

Browse source 
The versions for gecko should be updated to a new version for unstable/staging
only
This commit is contained in:
Stefan Frijters 2023-04-23 13:19:08 +02:00 committed by Martino Fontana
parent 6afc04d14f
commit 206d984884
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/emulators/wine/sources.nix
View file

@ -56,7 +56,6 @@ in rec {
${updateScriptPreamble} ${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%%.*} major=''${UPDATE_NIX_OLD_VERSION%%.*}
latest_stable=$(get_latest_wine_version "$major.0") latest_stable=$(get_latest_wine_version "$major.0")
latest_gecko=$(get_latest_lib_version wine-gecko)
# Can't use autobump on stable because we don't want the path # Can't use autobump on stable because we don't want the path
# <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>. # <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>.
@ -64,9 +63,6 @@ in rec {
set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")"
fi fi
autobump stable.gecko32 "$latest_gecko"
autobump stable.gecko64 "$latest_gecko"
do_update do_update
''); '');
}; };
@ -76,8 +72,21 @@ in rec {
version = "8.5"; version = "8.5";
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc="; hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc=";
inherit (stable) gecko32 gecko64 patches; inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
version = "2.47.3";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE=";
};
gecko64 = fetchurl rec {
version = "2.47.3";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU=";
};
## see http://wiki.winehq.org/Mono
mono = fetchurl rec { mono = fetchurl rec {
version = "7.4.0"; version = "7.4.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
@ -88,6 +97,7 @@ in rec {
${updateScriptPreamble} ${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%%.*} major=''${UPDATE_NIX_OLD_VERSION%%.*}
latest_unstable=$(get_latest_wine_version "$major.x") latest_unstable=$(get_latest_wine_version "$major.x")
latest_gecko=$(get_latest_lib_version wine-gecko)
latest_mono=$(get_latest_lib_version wine-mono) latest_mono=$(get_latest_lib_version wine-mono)
update_staging() { update_staging() {
@ -96,6 +106,8 @@ in rec {
} }
autobump unstable "$latest_unstable" "" update_staging autobump unstable "$latest_unstable" "" update_staging
autobump unstable.gecko32 "$latest_gecko"
autobump unstable.gecko64 "$latest_gecko"
autobump unstable.mono "$latest_mono" autobump unstable.mono "$latest_mono"
do_update do_update