JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5061fe0c2c
nixpkgs/pkgs/misc/emulators
History
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
..
atari800 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
atari++ treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
attract-mode treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
blastem treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
bsod treewide: http -> https sources (#42676) 2018-06-28 20:43:35 +02:00
caprice32 caprice32: unstable-2018-03-05 -> 4.5.0 2019-05-01 21:20:47 +02:00
ccemux treewide: name -> pname 2019-08-17 10:54:38 +00:00
cdemu treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
citra treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
darcnes treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
desmume treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
dlx treewide: http -> https sources (#42676) 2018-06-28 20:43:35 +02:00
dolphin-emu Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
dosbox dosbox: 0.74-2 -> 0.74-3 2019-07-14 12:39:15 +01:00
emulationstation treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
epsxe treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fakenes
fceux treewide: use scons setup hook 2018-11-13 19:14:10 -06:00
firebird-emu treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
fs-uae treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gens-gs gensgs: update src link 2018-08-21 20:51:41 +03:00
gxemul treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hatari hatari: 2.1.0 -> 2.2.1 2019-03-23 14:54:37 -07:00
higan treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
kega-fusion treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
libdsk treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
mednafen treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
mednaffe treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
mess treewide: update homepages to https where available 2019-04-15 10:10:05 -04:00
mgba treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
mupen64plus treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
nestopia treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
openmsx treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
pcsx2 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
pcsxr treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
ppsspp treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
qmc2 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
retroarch treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
retrofe treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
rpcs3 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
snes9x-gtk treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
stella treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
termtekst termtekst: init -> 1.0 (#43045) 2018-07-06 21:55:18 +02:00
uae uae: fixup build 2019-06-09 12:24:19 +02:00
vbam treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
vice treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
wine winetricks: 20190310 -> 20190615 (#64706) 2019-08-01 10:47:16 -04:00
wxmupen64plus waf: use wafConfigureFlags for waf flags 2019-04-09 23:44:37 -04:00
xcpc xcpc: move libsdk and lesstiff as optional 2019-05-24 02:17:26 +02:00
yabause treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
zsnes