diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-10-13 15:16:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 15:16:00 +0000 |
| commit | 60593ff3304a0bcf43e36b71b9d1f1fa6951dff0 (patch) | |
| tree | 1fc62c232b51b60f1ef0db38065770589b48c208 | |
| parent | 605eb4098fc0bbc2619ff3308e978cb16e8c3819 (diff) | |
| parent | a1b4859d1b560ec1b61bad16db4f6bf0e7a3f0d2 (diff) | |
| download | nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar.gz nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar.bz2 nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar.lz nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar.xz nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.tar.zst nixlib-60593ff3304a0bcf43e36b71b9d1f1fa6951dff0.zip | |
Merge pull request #46738 from ikervagyok/wine
wine: 3.0.2 -> 3.0.3, 3.17 -> 3.18
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 5 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5ffdc4375373..ad110817fea1 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: -let version = "1.1.82.0"; in +let version = "1.1.85"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index d56a485c1529..f87f8eab9849 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,7 +1,6 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, - # flex 2.6.3 causes: undefined reference to `yywrap' - pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison, + pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, buildScript ? null, configureFlags ? [] }: @@ -14,7 +13,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { inherit name src configureFlags; nativeBuildInputs = [ - pkgconfig fontforge makeWrapper flex_2_6_1 bison + pkgconfig fontforge makeWrapper flex bison ]; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index b1af27807316..78e4faf433c1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "3.0.2"; + version = "3.0.3"; url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; - sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya"; + sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.17"; + version = "3.18"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac"; + sha256 = "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w"; + sha256 = "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |