Commit graph

959 commits

Author SHA1 Message Date
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Frederik Rietdijk
be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
Kolby Crouch
08a897676b retroarch: 1.7.8.4 -> 1.8.1 2019-11-16 11:31:38 +01:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Lucas Franceschino
0ac7bb6328 ppsspp: use qt5's mkDerivation 2019-11-13 18:52:31 -05:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
adisbladis
7668f680da
libretro: Dont use libGLU_combined 2019-11-09 10:34:52 +00:00
adisbladis
5e433b48dc
retroarch: Don't use libGLU_combined 2019-11-09 10:34:49 +00:00
ash lea
9f2d73ae48 dolphinEmuMaster: 5.0-10879 -> 5.0-11109 2019-11-06 22:27:42 -08:00
Matthew Bauer
5ae0b8fd9e
Merge pull request #72566 from kolbycrouch/master
retroarch: update cores
2019-11-04 10:41:13 -05:00
gnidorah
f73694a64a mess: drop
MAME and MESS are now combined as one distribution as of the 0.162 release and offered as a MAME binary (MESS is included in the build).
2019-11-03 20:02:16 +03:00
gnidorah
d296e58f6d mame: init at 0.215 2019-11-03 20:02:11 +03:00
Kolby Crouch
eb4dd1794d retroarch: update cores 2019-11-02 06:16:10 -05:00
Alexey Shmalko
b3675878af
Merge pull request #71981 from Lassulus/vbam
vbam: 2.1.3 -> 2.1.4
2019-10-26 15:17:18 +03:00
lassulus
b34046859f vbam: 2.1.3 -> 2.1.4 2019-10-26 13:17:17 +02:00
Guillaume Bouchard
4a2475c924 epsxe: fix link with openssl (#71920)
* epsxe: fix link with openssl

Epsxe is hardcoded to build with openssl-1.0 (using libcrypto.so.1.0.0),
but current nixpkgs contains openssl-1.1, which provides
libcrypto.so.1.1.

This patchs just uses the previous version of the library.

* epsxe: use autoPatchelfHook instead of manual rpath overriding

This simplifies the file AND generates failures at build time if a
needed dynamic library is not found during build time.
2019-10-25 19:51:37 +02:00
Marek Mahut
b02ae8e22c
Merge pull request #71041 from nyanloutre/fs_uae_3_0_0
fs-uae: 2.8.4 -> 3.0.0
2019-10-16 21:58:02 +02:00
Renaud
75ebc76ea8
Merge pull request #69624 from r-ryantm/auto-update/libdsk
libdsk: 1.5.10 -> 1.5.12
2019-10-12 23:23:24 +02:00
nyanloutre
75f52e12f0
fs-uae: 2.8.4 -> 3.0.0 2019-10-12 18:34:11 +02:00
marius851000
2718c41712 faudio, wine, vkd3d: add faudio 19.10 and vkd3d 1.1 to wine
fixes https://github.com/NixOS/nixpkgs/pull/68952
2019-10-12 14:57:28 +02:00
Herwig Hochleitner
39b7c7e688 wine: unstable 4.16 -> 4.17
also mono 4.9.2 -> 4.9.3
2019-10-12 14:57:28 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
2019-10-08 17:14:26 +02:00
R. RyanTM
11c93653c7 mgba: 0.7.2 -> 0.7.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/mgba/versions
2019-10-07 10:05:12 -07:00
Linus Heckemann
91ceb6b997 treewide: fix dead anonscm.debian.org links 2019-10-04 12:42:21 +02:00
Linus Heckemann
c6be8bfc10 desmume: copy debian patches
Obtained from
http://deb.debian.org/debian/pool/main/d/desmume/desmume_0.9.11-3.diff.gz
since desmume never moved to salsa.debian.org (previously on
anonscm.debian.org as a subversion repo)
2019-10-04 12:03:09 +02:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
R. RyanTM
50a34183ea libdsk: 1.5.10 -> 1.5.12
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-09-26 19:03:25 -07:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Bjørn Forsman
bf7a1d6afe retroarch: 1.7.5 -> 1.7.8.4
Fixes missing GUI elements.
2019-09-26 08:11:32 +02:00
Tadeo Kondrak
82428b32b9
wine{Unstable,Staging}: 4.14 -> 4.16 2019-09-14 03:05:51 -06:00
Tadeo Kondrak
e3da137708
winetricks: 20190615 -> 20190912 2019-09-14 03:05:47 -06:00
Aaron Andersen
4ece8498dc dolphinEmu: fix broken build 2019-09-09 22:48:32 -04:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
worldofpeace
fa29f98bb5
Merge pull request #67368 from tadeokondrak/wine-4.0.2
wine{,-mono,-unstable,-staging}: update
2019-08-27 15:05:07 -04:00
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