Sandro
77efb5b850
Merge pull request #121471 from Kho-Dialga/master
2021-05-23 18:51:13 +02:00
Sandro
c5265c01a9
Merge pull request #123842 from lunik1/libretro-ppsspp-ffmpeg4
...
libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4
2021-05-23 17:36:34 +02:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Sandro
5cf7cfccf0
Merge pull request #123624 from ben0x539/wtf
2021-05-22 17:42:46 +02:00
lunik1
a5a5088eae
libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4
2021-05-20 22:51:05 +01:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Robert Schütz
da5310f82e
retroarchBare: use ffmpeg instead of ffmpeg_3 ( #123514 )
2021-05-19 21:57:35 +02:00
Benjamin Herr
76a63de3dc
kodi-retroarch-advanced-launchers: take lib arg
...
This package was changed to refer to `lib` instead of `stdenv.lib`, but
`lib` was not actually in scope. I don't know what this package is about
or how evaluation got to that point, but this is clearly more correct.
2021-05-18 21:15:08 -07:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next
2021-05-19 00:55:36 +00:00
Stéphan Kochen
47a1b5e57f
yapesdl: fix darwin build
2021-05-18 18:39:15 +02:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Kho-Dialga
51ba5aa590
proton-caller 2.2.3
...
fixed
Changed license to gpl3Only and removed stdenv
Removed doCheck = true in proton-caller
Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com>
version fixed
fixed maintainers on proton-caller
2021-05-18 08:24:08 -06:00
Sandro
530c9fcbc7
Merge pull request #122975 from eduardosm/ruffle
...
ruffle: nightly-2021-04-02 -> nightly-2021-05-14
2021-05-17 19:03:09 +02:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Ben Siraphob
c5a669d3f7
treewide: remove unzip where not needed
2021-05-16 19:29:28 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
Guillaume Girol
f1852527a9
Merge pull request #122915 from polygon/caprice32
...
caprice32: Add <string> include
2021-05-16 08:54:22 +00:00
Eduardo Sánchez Muñoz
96002e32bf
ruffle: nightly-2021-04-02 -> nightly-2021-05-14
2021-05-14 12:44:38 +02:00
zowoq
004f8cd986
Merge staging-next into staging
2021-05-14 16:32:43 +10:00
Anderson Torres
5d4a430472
Merge pull request #122140 from vs49688/rpcs3
...
rpcs3: 0.0.12 -> 0.0.16
2021-05-14 00:19:10 -03:00
polygon
7b1fad07a5
caprice32: Add <string> include
2021-05-14 01:06:34 +02:00
Alyssa Ross
917b4fc6d9
snes9x-gtk: don't manually enableParallelBuilding
...
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Zane van Iperen
f4b90cf6d0
rpcs3: 0.0.12-12199-b8477a470 -> 0.0.16-12235-a4f4b81e6
...
Additionally:
* Use system libcurl, so the patch downloader can work
* Use system zlib
* Use system libusb
* Add note about using system WolfSSL
* Enable SDL2, so the FAudio backend can work
* Change license to gpl2Only, as per [1]
[1]: https://github.com/RPCS3/rpcs3/issues/10255#issuecomment-835512840
2021-05-11 13:26:45 +10:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging
2021-05-08 20:59:05 +02:00
J. Neto
1887bf47dd
vbam: fix build with SDL 2.0.14
2021-05-08 10:18:17 -07:00
Jan Tojnar
468cb5980b
gnome: rename from gnome3
...
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok
85f96822a0
treewide: fix cargoSha256/cargoHash
...
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.
This change updates cargoSha256/cargoHash tree-wide.
Fixes #121994 .
2021-05-08 00:36:37 -07:00
AndersonTorres
5495d6d2b2
ppsspp: ffmpeg_3 -> ffmpeg
...
And refactor.
2021-04-30 17:39:09 -03:00
AndersonTorres
41c71047c0
mgba: ffmpeg_3 -> ffmpeg
...
And refactor.
2021-04-30 17:39:09 -03:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
...
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
Sandro
75a24a5bc9
Merge pull request #121170 from samuelgrf/add-mainProgram-to-packages
2021-04-30 01:20:37 +02:00
Samuel Gräfenstein
1e77642558
wine*: add meta.mainProgram
...
Fix running wine builds from `wineWowPackages` via `nix run`,
this change makes it execute `bin/wine` instead of the non-existent
`bin/wine-wow`.
2021-04-29 17:42:11 +02:00
Samuel Gräfenstein
c63a83acf5
pcsx2: add meta.mainProgram
2021-04-29 14:59:30 +02:00
Emery Hemingway
5c5ec0bff6
maiko: init at 2021-04-14
2021-04-28 09:52:13 +02:00
Sandro
ecff9e8dc7
Merge pull request #120618 from OPNA2608/init/punes/21.05
...
punes: init at unstable-2021-04-25
2021-04-27 14:57:07 +02:00
OPNA2608
1fd6bf6a01
punes: init at unstable-2021-04-25
2021-04-26 17:14:57 +02:00
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
...
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Martin Weinelt
b7e08de1e9
Merge pull request #119181 from SFrijters/wine-6.6
2021-04-24 17:59:07 +02:00
Stefan Frijters
efa5a31633
wine{Unstable,Staging}: 6.6 -> 6.7
2021-04-24 09:59:40 +02:00
github-actions[bot]
99c7bab106
Merge master into staging-next
2021-04-21 00:15:20 +00:00
lunik1
4954e63a17
libretro: add thepowdertoy core
2021-04-20 18:22:04 +01:00
github-actions[bot]
f620e30ca4
Merge master into staging-next
2021-04-17 00:15:03 +00:00
oxalica
5bea018a9c
ryujinx: 1.0.6807 -> 1.0.6835
2021-04-15 19:44:39 +08:00
Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
Stefan Frijters
5cf6870d1f
wine{Unstable,Staging}: 6.5 -> 6.6
2021-04-11 20:50:53 +02:00
AndersonTorres
cc3060f5e8
yapesdl: init at 0.70.2
2021-04-09 15:31:22 -03:00
Gabriel Ebner
7b0b03a0ad
pcsxr: add missing libXxf86vm dependency
2021-04-09 09:26:12 +02:00
Eduardo Sánchez Muñoz
540c9ac015
dolphinEmuMaster: 5.0-13603 -> 5.0-14002
2021-04-08 18:18:42 +02:00
Sandro
de9aaa3d51
Merge pull request #117995 from IvarWithoutBones/bump/switch-emu
2021-04-05 17:13:23 +02:00
