diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
| commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
| tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/misc/emulators | |
| parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
| parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
| download | nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index d6b3b6a98706..8a3f7796aef4 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -232,10 +232,11 @@ in with stdenv.lib.licenses; mame = (mkLibRetroCore { core = "mame"; + version = "2018-03-02"; src = fetchRetro { repo = "mame"; - rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; - sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; + rev = "893f1ac2231b348b63209fd5b2545f770458ae8f"; + sha256 = "1j9p82q9jhf5lf4w392zd09bq0j4iw1afhznymg0v60jv592h3gz"; }; description = "Port of MAME to libretro"; license = gpl2Plus; |