Commit Graph

382 Commits

Author SHA1 Message Date
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer
c491a99362 treewide: remove callPackage_i686
This has been replaced with pkgsi686Linux.callPackage
2018-07-05 14:04:52 -04:00
Lengyel Balázs
b845a8129f wine: stable 3.0.1 -> 3.0.2, unstable: 3.9 -> 3.11 2018-06-26 17:03:56 +02:00
Lengyel Balázs
2aebd62cfc winetricks: 20180217 -> 20180513 2018-05-28 18:09:34 +02:00
Lengyel Balázs
609f718cab wine: Stable: 3.0 -> 3.0.1; Unstable, Staging 3.7 -> 3.9 2018-05-28 13:31:13 +02:00
John Ericson
5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 17:48:37 -04:00
Moritz Angermann
0828bc5b1f wine: Enable on macOS 2018-05-18 17:15:42 -04:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Jörg Thalheim
2326fd2d53
Merge pull request #39404 from dwe11er/wine-vulkan
wine: add vulkanSupport option
2018-05-07 16:25:50 +01:00
Joachim F
7a39cb90a1
Merge pull request #39685 from ikervagyok/wine37
wine-{Unstable,Staging}: 3.5 -> 3.7
2018-05-06 09:47:46 +00:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Lengyel Balazs
87b51a1e67 wine-{Unstable,Staging}: 3.5 -> 3.7 2018-04-29 22:22:19 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Marcin Falkiewicz
0fad5f7a84 wine: add Vulkan support 2018-04-24 14:47:12 +02:00
Matthew Justin Bauer
064d4bfee1
Merge pull request #38476 from coreyoconnor/wine-3.5
wine-unstable: 3.4 -> 3.5 (and staging likewise)
2018-04-14 23:26:54 -05:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Corey O'Connor
cbcb9eb909 wine: 3.4 -> 3.5 (and staging likewise) 2018-04-05 08:57:50 -07:00
Lengyel Balazs
7e97675fa1 wine: 3.4 -> 3.5 2018-04-01 22:12:14 +02:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Jan Malakhovski
c7cf808ff8 libva: make libva-full the default
It seems that all uses of `libva` it in nixpkgs except `mesa` and itself actually
either will gain from using `libva-full` instead of `libva-minimal` by default
or simply won't care.
2018-03-26 14:02:06 +03:00
Nikolay Amiantov
6bf1421f13 treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Jörg Thalheim
90cfaf1ab3
Merge pull request #37743 from ikervagyok/wine
wine: Unstable 3.3 -> 3.4 & reenable wineStaging
2018-03-26 10:10:28 +01:00
Lengyel Balázs
f8f067d627 wine: Unstable 3.3 -> 3.4 & reenable wineStaging 2018-03-24 22:26:51 +01:00
Albert Safin
ba960ac383 wine: disable bindnow hardening 2018-03-23 18:11:57 +02:00
Corey O'Connor
7f112e37d1 wine: correct install order for WoW wine build.
Per the wiki at https://wiki.winehq.org/Building_Wine#Shared_WoW64

"if you do choose to install your WoW64 build, you should run make
install in the 32-bit build tree first, then in the 64-bit one."

This is required, for instance, for the resulting "wineserver"
executable to be the 64 bit variant not 32 bit. Which is expected by the
binary loader for WoW64.

This odd dependency is vaguely mentioned on the packaging wiki page:

* https://wiki.winehq.org/Packaging#Binaries
2018-03-14 21:10:12 -07:00
volth
34f12184cd treewide: s/saneBackends/sane-backends/g 2018-03-13 00:47:10 +00:00
Vladimír Čunát
71f899c2c3
Merge #34461: mesa -> libGL* rename
This will just bit rot otherwise.  Almost nothing gets rebuilt.
2018-03-05 14:59:40 +01:00
Herwig Hochleitner
039428d3b2 wine: 3.0 -> 3.3 2018-03-05 14:06:43 +01:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
wisut hantanong
317da085aa winetricks: 20171222 -> 20180217 2018-02-23 14:41:52 +07:00
Herwig Hochleitner
4e8cd90b67 wineStaging: remove evaluation warning
cc @peti @7c6f434c
2018-01-26 17:21:58 +01:00
Herwig Hochleitner
4fec62d01d wineUnstable: 2.21 -> 3.0
wineStaging redirects to wineUnstable, for now
2018-01-25 23:43:54 +01:00
Herwig Hochleitner
6cc8541ef5 winetricks: 20171018 -> 20171222 2018-01-22 02:16:42 +01:00
Lengyel Balazs
287415ad52 wine-stable: 2.0.3 -> 3.0 2018-01-18 17:24:34 -08:00
Herwig Hochleitner
5fdf1b972a wine: update stable and unstable
2.0.2 -> 2.0.3
2.19 -> 2.20

additional comments for the update procedure
2017-12-30 14:58:50 +01:00
Herwig Hochleitner
ea4320d348 wine: remove wrapper for wine64
fix #28486
2017-12-30 14:58:47 +01:00
Cray Elliott
2e29a1e4b3 wineUnstable: 2.19 -> 2.21 2017-11-26 07:36:21 -08:00
c0bw3b
525380b472 treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00:00
Cray Elliott
83d7fe0f0d wineUnstable: 2.18 -> 2.19
staging and winetricks updated as well
2017-10-23 23:24:15 -07:00
Herwig Hochleitner
30b3b5d85f announce myself as a maintainer
added maintainer entries for `cdemu` (which i've created), as well as
`wine` and `chromium` (which I regularly contribute to)
2017-10-14 11:11:49 +02:00
Alexander V. Nikolaev
8c34112be9 wineUnstable: 2.17 -> 2.18
Staging updated as well
2017-10-05 15:08:01 +03:00
Alexander V. Nikolaev
0317d5d083 wine: replace samba3 with samba4
Unbreak security assertion via samba3 which no more supported.
2017-10-05 15:07:53 +03:00
Cray Elliott
5522cd5cb1 wineUnstable: 2.16 -> 2.17
per usual, staging has been updated as well!
2017-09-21 22:57:27 -07:00
Cray Elliott
c892f77e37 wineUnstable: 2.15 -> 2.16
bump staging as well
2017-09-08 13:29:45 -07:00
Cray Elliott
f03964ff7c winetricks: 20170614 -> 20170823 2017-09-05 23:29:31 -07:00
Cray Elliott
ecea06ab2e wine-mono: 4.7.0 -> 4.7.1 2017-08-28 18:02:05 -07:00
Cray Elliott
2639bcee5d wineUnstable: 2.14 -> 2.15 2017-08-24 13:52:29 -07:00
Alexander V. Nikolaev
ed0af35697 wineUnstable: 2.13 -> 2.14
Staging updated as well
2017-08-13 14:51:47 -07:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Cray Elliott
d82fa7f915 wineUnstable: 2.12 -> 2.13 2017-07-26 15:36:49 -07:00
Cray Elliott
faad06df6b wine: 2.0.1 -> 2.0.2 2017-07-20 13:52:43 -07:00
Cray Elliott
ccf7b4b57e wine-mono: 4.6.4 -> 4.7.0 2017-07-18 12:10:29 -07:00
Cray Elliott
f91c591ea2 wineUnstable, wineStaging: 2.11 -> 2.12 2017-07-13 14:44:18 -07:00
Cray Elliott
3365fdea04 wineUnstable: 2.10 -> 2.11
2.11 was picked instead of 2.12 since staging hasn't caught up yet,
 also updates staging
2017-07-09 21:23:05 -07:00
0xABAB
784240de3e wine: add missing dependency libcap on Linux 2017-07-09 10:40:53 +02:00
Cray Elliott
71e495e10f winetricks: 20170327 -> 20170614 2017-06-27 02:00:49 -07:00
Cray Elliott
922d706e81 wineStaging: 2.7 -> 2.10
wineUnstable: 2.7 -> 2.10
2017-06-20 11:23:37 -07:00
Nikolay Amiantov
e7530e6a5a wine: reorganize packages
Move most of wine configurations to winePackages which is not built on Hydra.
Leave two top-level packages:

wine: stable release with an "office" configuration;
wineStaging: staging release with a "full" configuration.
2017-06-04 00:57:45 +03:00
Nikolay Amiantov
46a2da8766 wine: use gstreamer-1.0 2017-05-24 02:27:05 +03:00
Nikolay Amiantov
2d1e5e87db wine: fix libva support 2017-05-24 02:27:01 +03:00
Nikolay Amiantov
bf230536e0 wineStaging: fix patching in nix-shell 2017-05-24 02:26:57 +03:00
Nikolay Amiantov
95f321480f wine: add udev support 2017-05-24 02:26:53 +03:00
Alexander V. Nikolaev
f3c19651db winetricks: 20170316 -> 20170327 2017-05-09 01:34:09 +03:00
Alexander V. Nikolaev
1ce951e79a wineUnstable: 2.6 -> 2.7
Update staging as well
2017-05-09 01:33:53 +03:00
aszlig
f84b8178aa
wine-staging: Fix SHA256 hash
In c6b3c66277, the unstable version has
been bumped to 2.6.

Unfortunately the staging source is re-using the version attribute from
the unstable source and thus has been bumped as well.

I have built wineStaging on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
2017-04-23 20:37:53 +02:00
Frederik Rietdijk
c6b3c66277 wineUnstable: 2.5 -> 2.6 2017-04-21 21:38:54 +02:00
Frederik Rietdijk
d16a4512d0 wine: 2.0 -> 2.0.1 2017-04-21 21:38:54 +02:00
Alexander V. Nikolaev
3ec56d8da2 wineUnstable: 2.4 -> 2.5 2017-04-10 18:37:28 +03:00
Herwig Hochleitner
a634f0b12c wine: 2.3 -> 2.4
winetricks: 20170207 -> 20170316
2017-03-22 01:14:07 +01:00
Herwig Hochleitner
e9a1fc72e0 wine: 2.2 -> 2.3 2017-03-22 01:09:07 +01:00
Herwig Hochleitner
7069b8938d wine: 2.1 -> 2.2 2017-03-22 01:09:03 +01:00
Alexander V. Nikolaev
9ed445a0f7 wineUnstable: 2.0 -> 2.1 2017-02-12 11:23:48 +02:00
Herwig Hochleitner
ae33b4673d wine: 1.8.6 -> 2.0 2017-02-09 16:20:49 +01:00
Nikolay Amiantov
10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
Vladimír Čunát
d442a0ffc0
wine*: fixup build by using older flex 2017-01-06 16:25:37 +01:00
Herwig Hochleitner
cd9edbb15b wine: 1.8.4 -> 1.8.6
wine: 2.0-rc2 -> 2.0-rc3
winetricks: 20160724 -> 20170101
2017-01-02 13:20:19 +01:00
Alexander V. Nikolaev
76b5f2c249 wineUnstable: 1.9.23 -> 2.0-rc2
Update staging as well
2016-12-22 16:06:18 +02:00
Alexander V. Nikolaev
edcfa0f3fa wine-unstable: 1.9.22 -> 1.9.23 2016-11-18 13:16:02 +02:00
Alexander V. Nikolaev
d89c3acced wineUnstable: 1.9.20 -> 1.9.22
Also update staging as well
2016-11-04 06:04:15 +02:00
Michael Raskin
92675bb6e5 wineUnstable, wineStaging: 1.9.18 -> 1.9.20 2016-10-03 13:54:18 +02:00
Herwig Hochleitner
9a10569480 wine: 1.8.3 -> 1.8.4; 1.9.16 -> 1.9.18
- update mono and gecko versions
- update winetricks
- replace sourceforge download urls
2016-09-13 17:33:24 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Michael Raskin
d1bf595cc5 wine: 1.8.3 -> 1.8.4; wineUnstable: 1.9.16 -> 1.9.18 2016-09-12 13:08:51 +02:00
Ram Kromberg
ee1cc78333 Revert "wine: use gcc49 for 64-bit builds"
This reverts commit 24835df322.
2016-08-27 12:27:42 +03:00
Alexander V. Nikolaev
b81cf59bd7 wine: 1.9.14 -> 1.9.16
Update wineUnstable and wineStaging
2016-08-14 10:22:05 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Alexander V. Nikolaev
dc5293d80b wine: 1.9.13 -> 1.9.14 (#16862)
* Update wineUnstable: 1.9.13 -> 1.9.14
* Update staging: 1.9.13 -> 1.9.14
* Add myself as co-maintainer, because I am do regular updates.
2016-07-11 17:57:16 +02:00
Alexander V. Nikolaev
962e365444 wineStable: 1.8.2 -> 1.8.3 2016-07-01 14:30:54 +03:00
Alexander V. Nikolaev
8f53cfbd59 wine: 1.9.11 -> 1.9.13 2016-06-27 01:09:56 +03:00
Nikolay Amiantov
8399068b80 winetricks: 20160219 -> 20160622 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
5ee7f081e3 wine: fix gstreamer support 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
9e8592d6b9 wine: set default features in all-packages
I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
2016-06-23 14:01:09 +03:00
Nikolay Amiantov
5bff6fef55 wine: restore old features 2016-06-23 13:28:55 +03:00
Herwig Hochleitner
8c0f03ae9d wine: 1.9.10 -> 1.9.11 2016-05-30 04:05:55 +02:00
Herwig Hochleitner
1c215828d5 wine: make features configurable 2016-05-29 10:45:16 +02:00
Herwig Hochleitner
98d720d72c wine: 1.8.1 -> 1.8.2 2016-05-29 10:45:12 +02:00
Herwig Hochleitner
edb5a8c632 wine: 1.9.9 -> 1.9.10 2016-05-29 10:45:08 +02:00
Herwig Hochleitner
0f3ff1401d wine-staging: move libtxc_dxtn to buildInputs
this adds it to RPATH, via LDFLAGS (see base.nix)
2016-05-29 10:44:42 +02:00
Herwig Hochleitner
4416644eb3 wine-unstable: 1.9.7 -> 1.9.9 2016-05-29 10:44:42 +02:00
Herwig Hochleitner
33c6a9d1e7 wine: add optional dependencies 2016-05-29 10:44:42 +02:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Ambroz Bizjak
d7eadb19fb wine: Disable stripping to avoid breaking fakedlls. 2016-04-17 20:59:46 +02:00
Alexander V. Nikolaev
9751cd456a wine: Fix RPATH for multiple-outputs 2016-04-17 18:51:34 +03:00
Nikolay Amiantov
24835df322 wine: use gcc49 for 64-bit builds 2016-04-12 20:55:28 +03:00
Nikolay Amiantov
71e7f0cad4 wine: use only native-arch native dependencies 2016-04-12 18:52:05 +03:00
Nikolay Amiantov
ff7f297ea2 wine: add more dependencies (notably, mpg123 and openal) 2016-04-12 18:44:04 +03:00
Nikolay Amiantov
b109f33d64 wine: fix outputs and pulseaudio support 2016-04-12 18:44:04 +03:00
Alexander V. Nikolaev
25d2a6a1b2 wineUnstable: 1.9.4 -> 1.9.7
Also update wineStaging as well
2016-04-12 18:44:04 +03:00
Herwig Hochleitner
53b9ac0d13 wine-unstable: 1.9.3 -> 1.9.4
winetricks: 20160109 -> 20160219
gecko: 2.40 -> 2.44
2016-02-22 23:41:12 +01:00
Adam Russell
b63c566d14 wine unstable: 1.9.2 -> 1.9.3 2016-02-09 18:19:28 -06:00
Herwig Hochleitner
6abe531aaf wine stable: 1.8 -> 1.8.1 2016-02-04 14:25:38 +01:00
Herwig Hochleitner
4ce954d02e wine: consolidate source packages
In order to update wine packages more easily, the source derivations are
collected into a single sources.nix, so hashes can be updated like
`nix-prefetch-url pkgs/misc/emulators/wine/sources.nix -A stable`
2016-02-04 14:25:34 +01:00
Adam Russell
9468f2c925 wine unstable: 1.9.1 -> 1.9.2 (close #12730) 2016-02-02 05:56:13 +01:00
Herwig Hochleitner
9e2bb09ea0 wine[-stable,tricks]: version updates
wine-unstable, wine-staging: 1.9.0    -> 1.9.1
winetricks:                  20151116 -> 20160109
2016-01-21 23:57:52 +01:00
Nikolay Amiantov
506b491edd Merge pull request #12140 from bendlas/update-wine
wine unstable/staging: 1.8 -> 1.9.0
2016-01-08 01:46:38 +03:00
Herwig Hochleitner
7d3bac6bcc wine unstable/staging: 1.8 -> 1.9.0 2016-01-04 19:04:12 +01:00
Lengyel Balázs
e675b2d92d wineStaging: remove explicit dependency on libpulseaudio
pulseaudio is now configured via `pulseaudioSupport` and available for wineStable too
2015-12-26 00:56:16 +01:00
Lengyel Balázs
0ca96aa43c wine: add initial pulseaudio support 2015-12-25 00:40:26 +01:00
Herwig Hochleitner
8519b89f76 wine unstable, staging: 1.8-rc4 -> 1.8 2015-12-22 14:51:18 +01:00
Herwig Hochleitner
7a0dd2c82c wine stable: 1.6.2 -> 1.8
restructure versions file for clarity and brevity
2015-12-19 23:29:13 +01:00
Herwig Hochleitner
3b9619e804 wine: 1.8-rc3 -> 1.8-rc4 2015-12-19 18:09:40 +01:00
Herwig Hochleitner
be80ba2c96 wine unstable: 1.8-rc2 -> 1.8-rc3 2015-12-07 22:22:56 +01:00
Herwig Hochleitner
ddbd0dfcae wine(tricks): update packages
wine 1.7.55 -> 1.8-rc2
winetricks 20151110 -> 20151116
2015-12-01 11:58:17 +01:00
Herwig Hochleitner
ec73ef4c2f wine: 1.7.53 -> 1.7.55 2015-11-18 09:33:57 +01:00
Herwig Hochleitner
2145c99ae3 wine: fix infinite recursion in wine-staging build 2015-11-15 16:03:54 +03:00
Herwig Hochleitner
accc98ca7f wine: 1.7.52 -> 1.7.53 2015-11-15 16:03:54 +03:00
Nikolay Amiantov
fc620ae093 winetricks: 20150706 -> 20151110 2015-11-12 03:41:51 +03:00
Rinaldus
4c626f44d9 wine-{unstable,staging}: update 1.7.48 -> 1.7.52
Close #10238.
2015-10-15 12:01:16 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Eelco Dolstra
60a0bb7f66 Make "nix-env -i wine" work again
Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
2015-08-25 13:07:16 +02:00
Herwig Hochleitner
440dde6950 wine: cleanup and comment build script 2015-08-06 00:27:32 +02:00
Herwig Hochleitner
e15a4b0ee2 wine: 1.7.47 -> 1.7.48 2015-08-06 00:21:31 +02:00
Nathaniel Baxter
196fcdf80f wine: unstable and staging update: 1.7.46 -> 1.7.47
Close #8913.
2015-07-30 13:48:58 +02:00
Nathaniel Baxter
148f7e6624 winetricks: update 20150416 -> 20150706 2015-07-30 13:48:58 +02:00
Michael Raskin
2e462069a8 Wine: unstable, staging: update 1.7.43 -> 1.7.46; remove updater scripts because with the new layout they don't work anyway 2015-07-05 00:32:54 +03:00
William A. Kennington III
be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
Herwig Hochleitner
2f53355ff6 winetricks: 20150316 -> 20150416 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
b4c2351806 wine: unstable 1.7.42 -> 1.7.43 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
ef9cfd3dda wine: enable 64bit build for wineStaging 2015-05-18 21:01:54 +02:00
Herwig Hochleitner
ae6d2796bc wine: add 64 bit build and nixpkgs configuration
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Michael Raskin
90453cc5ca Update Wine staging to match Wine unstable 2015-05-10 13:36:48 +03:00
Michael Raskin
ede1211cbc Update Wine unstable 2015-05-10 13:36:47 +03:00
Nikolay Amiantov
f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03:00
Michael Raskin
99b5486db6 Update Wine 2015-04-05 20:27:25 +03:00
Nikolay Amiantov
602ff46403 winetricks: update 2015-03-29 13:05:28 +03:00
Michael Raskin
d77a4f17f9 update wine 2015-03-21 21:29:39 +03:00