Commit Graph

969 Commits

Author SHA1 Message Date
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Tadeo Kondrak
58d383a5dc
wine{,-mono,-unstable,-staging}: update
wine: 4.0.1 -> 4.0.2
wine-mono: 4.9.0 -> 4.9.2
wine-unstable: 4.12.1 -> 4.14
wine-staging: 4.12.1 -> 4.14
2019-08-23 14:25:12 -06:00
ash lea
fe9e1854cc dolphinEmuMaster: update to latest upstream 2019-08-23 02:41:36 -07:00
ash lea
44b0d3ff6b dolphinEmuMaster: add ashkitten as maintainer 2019-08-23 02:41:36 -07:00
ash lea
acbe898c8b dolphinEmuMaster: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
32f332fded dolphinEmu: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
bd8f12024b dolphinEmuMaster: use wrapQtAppsHook 2019-08-23 02:41:36 -07:00
ash lea
4a7992d2b8 dolphinEmu: fix build 2019-08-23 02:41:36 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
marius851000
f2068d3aa4 dolphinEmuMaster: update to the latest upstream version 2019-08-04 18:10:11 -07:00
Frederik Rietdijk
6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
K. Bruneau
7c4d08421e winetricks: 20190310 -> 20190615 (#64706) 2019-08-01 10:47:16 -04:00
Frederik Rietdijk
cb3ce5d26d Merge master into staging-next 2019-07-28 12:11:37 +02:00
Michael Raskin
11ed5eba74
Merge pull request #65368 from ikervagyok/wine412
wine-{unstable,staging}: 4.9 -> 4.12.1
2019-07-28 07:10:59 +00:00
Frederik Rietdijk
0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
Averell Dalton
9332773e51 wine: disable zbar in gst-plugins-bad 2019-07-23 16:30:56 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Lengyel Balazs
a031a1f4b8 wine: 4.9 -> 4.12.1 2019-07-21 20:47:52 +02:00
Lengyel Balazs
8a83fb70d0 wine-mono: 4.8.3 -> 4.9.0 2019-07-21 20:47:01 +02:00
Graham Christensen
3f4ed94173
Merge pull request #64731 from risicle/ris-dosbox-0.74-3
dosbox: 0.74-2 -> 0.74-3, fixing CVE-2019-7165, CVE-2019-12594
2019-07-18 17:35:51 -04:00
Frederik Rietdijk
a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Michael Raskin
4a68d3bb79
Merge pull request #63817 from ambrop72/wine-wrapper-fix
wine: Set WINELOADER in wrapper, wrap also wine64.
2019-07-15 10:40:15 +00:00
Robert Scott
428e215313 dosbox: 0.74-2 -> 0.74-3
fixes CVE-2019-7165, CVE-2019-12594
2019-07-14 12:39:15 +01:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Daiderd Jordan
956c197ee6
dolphin-emu: remove cf-private 2019-07-03 22:20:11 +02:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Ambroz Bizjak
96c957f92c wine: Set WINELOADER in wrapper, wrap also wine64.
Fixes #63170. Note that this brings back wrapping of wine64 which was removed in #28486 because the underlying issue is now fixed.
2019-06-27 14:38:57 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Michael Raskin
63379e8e86
Merge pull request #63044 from JohnAZoidberg/wine-fonts
winePackages.fonts: init at 4.0
2019-06-17 19:39:52 +00:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alexander V. Nikolaev
2b4ac8d003 wine: 4.8 -> 4.9, 4.0 -> 4.0.1 2019-06-15 18:32:50 +02:00
Daniel Schaefer
3303bc1fd7 wine: Use proper license attribute 2019-06-12 23:36:10 +02:00
Daniel Schaefer
66fffe99d8 winePackages.fonts: init at 4.0
"Wine's fonts should be a natural candidate for their own subpackage"
https://wiki.winehq.org/Packaging

They are a replacement for some Microsoft fonts not available in other
replacement packages.
2019-06-12 23:33:18 +02:00
Matthew Bauer
290737edf0
Merge pull request #57103 from natemonster321/master
pcsx2: add -DXDG_STD build flag
2019-06-10 21:20:57 -04:00
Renaud
ec57ea39a6
Merge pull request #62477 from r-ryantm/auto-update/mgba
mgba: 0.7.1 -> 0.7.2
2019-06-10 15:55:11 +02:00
Vladimír Čunát
e596a33dc0
uae: fixup build
Fixes #62341.  I'm not sure why the problem happened,
but the solution seems fairly simple and risk-free.
2019-06-09 12:24:19 +02:00
Nikolay Amiantov
dff950155e rpcs3: 0.0.5-6980-81e5f3b7f -> 0.0.6-8187-790962425
Clean whitespaces.
2019-06-04 01:36:27 +03:00
Nikolay Amiantov
bb0fc95a89 citra: 2018-06-09 -> 2019-05-25 2019-06-04 01:36:27 +03:00
R. RyanTM
3d4482ff8e mgba: 0.7.1 -> 0.7.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mgba/versions
2019-06-01 23:20:50 -07:00
Bignaux Ronan
6e175d1371 xcpc: move libsdk and lesstiff as optional 2019-05-24 02:17:26 +02:00
Robin Gloster
6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull
treewide: Remove usage of isNull
2019-05-18 09:36:24 +00:00
Renaud
d9df60fb71
Merge pull request #60819 from r-ryantm/auto-update/vhba
linuxPackages.vhba: 20190302 -> 20190410
2019-05-15 14:38:09 +02:00
nyanloutre
f2affe0344 wine-{unstable,staging}: 4.7 -> 4.8 2019-05-14 10:22:49 +02:00
R. RyanTM
804105e6b7 vbam: 2.1.2 -> 2.1.3 (#60821)
* vbam: 2.1.2 -> 2.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visualboyadvance-m/versions

* vbam: refactor build inputs
2019-05-03 10:16:32 +02:00
R. RyanTM
c2708f9e96 linuxPackages.vhba: 20190302 -> 20190410
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vhba/versions
2019-05-02 16:48:13 -07:00
Florian Klink
ecf59492c7
caprice32: unstable-2018-03-05 -> 4.5.0 (#60663)
caprice32: unstable-2018-03-05 -> 4.5.0
2019-05-01 22:59:27 +02:00
Bignaux Ronan
24b83b0af9 caprice32: unstable-2018-03-05 -> 4.5.0 2019-05-01 21:20:47 +02:00
Daniel Schaefer
786f02f7a4 treewide: Remove usage of isNull
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
nyanloutre
3dc4e55ffc
wine-mono: 4.8.2 -> 4.8.3 2019-04-27 14:54:20 +02:00
nyanloutre
b1ae0ef297
wine{unstable,staging}: 4.6 -> 4.7 2019-04-27 14:53:51 +02:00
Chris Rendle-Short
86b5fb78dd dosbox: add XDG icon
Add an XDG icon for dosbox. The official icon is in .ico format, which
is not compatible with the freedesktop.org spec, so graphicsmagick is
included as a build time dependency and used to convert it to a PNG.
2019-04-21 22:04:10 +10:00
R. RyanTM
a73d69c912 vbam: 2.1.1 -> 2.1.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visualboyadvance-m/versions
2019-04-18 19:43:49 +02:00
nyanloutre
676a77a5e5 wine-mono: 4.8.0 -> 4.8.2 2019-04-18 09:27:10 +02:00
nyanloutre
e2adc64175 wine{unstable,staging}: 4.5 -> 4.6 2019-04-18 09:27:10 +02:00
ash lea
1e8606946f dolphinEmuMaster: 2019-02-16 -> 5.0-9976
changed versioning scheme to match dolphin's own. this also allows us to
include the describe string without deriving it from the git repository
during build.
2019-04-17 17:35:40 -07:00
Dmitry Kalinkin
04ff9941b6
Merge pull request #58506 from nyanloutre/wine-update
Update wine{unstable,staging,mono,winetricks}
2019-04-15 22:02:06 -04:00
Matthew Bauer
f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
Dmitry Kalinkin
59c81160e7
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
2019-04-13 12:04:32 -04:00
Matthew Bauer
a79a8f29bc waf: use wafConfigureFlags for waf flags
This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.
2019-04-09 23:44:37 -04:00
Herwig Hochleitner
79d653be55 cdemu: update to 3.2 release
closes https://github.com/NixOS/nixpkgs/pull/58911
2019-04-05 15:48:34 +02:00
R. RyanTM
794e864a07 linuxPackages.vhba: 20170610 -> 20190302
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vhba/versions
2019-04-05 15:48:34 +02:00
Tadeo Kondrak
b4850a9371
wine{unstable,staging}: 4.4 -> 4.5
Co-Authored-By: nyanloutre <paul@nyanlout.re>
2019-04-03 11:17:42 +02:00
Maximilian Bosch
27ad1d515b
Merge pull request #58188 from r-ryantm/auto-update/hatari
hatari: 2.1.0 -> 2.2.1
2019-03-29 11:38:39 +01:00
nyanloutre
e5a68c5314
winetricks: 20181203 -> 20190310 2019-03-28 22:46:21 +01:00
nyanloutre
da1b3e7bb9
wine{unstable,staging}: 4.2 -> 4.4 2019-03-28 22:46:02 +01:00
nyanloutre
c06ec8b3ac
wine-mono: 4.7.5 -> 4.8.0 2019-03-28 22:45:28 +01:00
R. RyanTM
257076158d libdsk: 1.5.9 -> 1.5.10 (#57274)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdsk/versions
2019-03-27 23:12:20 +01:00
R. RyanTM
9e281d5eed vbam: 2.1.0 -> 2.1.1 (#57499)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visualboyadvance-m/versions
2019-03-27 15:52:51 +01:00
R. RyanTM
8156bc47ca hatari: 2.1.0 -> 2.2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hatari/versions
2019-03-23 14:54:37 -07:00
CrazedProgrammer
11919c3a3a ccemux: 1.1.0 -> 1.1.1 2019-03-20 21:31:37 +01:00
R. RyanTM
132bb0bbe3 mgba: 0.7.0 -> 0.7.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mgba/versions
2019-03-10 17:17:10 -07:00
Nathan
636f156b91 pcsx2: add -DXDG_STD build flag 2019-03-08 22:55:58 -05:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Vladimír Čunát
71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Cray Elliott
4cfb4ec5f4 dolphinEmuMaster: 2018-12-25 -> 2019-02-16 2019-02-21 01:27:28 -08:00
Cray Elliott
c210206b7a mgba: 0.6.3 -> 0.7.0 2019-02-21 00:56:52 -08:00
Matthew Bauer
b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Frederik Rietdijk
815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Lengyel Balazs
4310dfc90a
wine{Unstable,Staging}: 4.1 -> 4.2 2019-02-17 13:34:55 -07:00
Jan Tojnar
606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Tadeo Kondrak
c9d5c86237
wine-{unstable,staging}: 4.0 -> 4.1 2019-02-12 18:53:17 -07:00
Tadeo Kondrak
4e8b3319a2
wine: 3.0.4 -> 4.0 2019-01-23 18:10:00 -07:00
Tadeo Kondrak
87e5893cec
wine-mono: 4.7.3 -> 4.7.5 2019-01-23 18:09:08 -07:00
Tadeo Kondrak
1838df987f
wine{unstable,staging}: 4.0-rc5 -> 4.0 2019-01-23 18:07:33 -07:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
R. RyanTM
df3ebbea60 libdsk: 1.5.8 -> 1.5.9 (#52849)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdsk/versions
2019-01-13 22:39:03 +01:00
Ivan Kozik
2f80d662a8 wine{Unstable,Staging}: 4.0-rc2 -> 4.0-rc5 2019-01-07 21:43:41 +00:00
Tadeo Kondrak
0d99389a6d wine: add perl to buildInputs to fix winemaker 2019-01-05 18:40:59 +01:00
ash lea
ace58271af dolphinEmuMaster: 2018-09-24 -> 2018-12-25 (#52917) 2018-12-29 20:34:53 +01:00
Samuel Dionne-Riel
3c38cc8058
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
2018-12-20 21:06:52 -05:00
Lengyel Balazs
a960696f71 wineStable: 3.0.3 -> 3.0.4 2018-12-19 16:55:08 -05:00
Lengyel Balazs
80a1d934b8 winetricks: 20180815 -> 20181203 2018-12-19 16:55:08 -05:00
Matthew Bauer
df90fdf62b
Merge pull request #51301 from timor/libretro-dolphin-dep-fix
libretro.dolphin: add missing dependencies to fix build
2018-12-19 12:05:03 -06:00
Matthew Bauer
762c3d730f
Merge pull request #52011 from r-ryantm/auto-update/snes9x-gtk
snes9x-gtk: 1.56.2 -> 1.57
2018-12-19 11:00:02 -06:00