Merge remote-tracking branch 'upstream/master' into staging

2020-04-13 22:17:15 -04:00
parent cff16451b1 40000ebb4b
commit c8a6ea5161
58 changed files with 1094 additions and 271 deletions
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -7,7 +7,7 @@ with stdenv;

 let
  majorVersion = "0";
-  minorVersion = "219";
+  minorVersion = "220";

  desktopItem = makeDesktopItem {
    name = "MAME";
@@ -26,7 +26,7 @@ in mkDerivation {
    owner = "mamedev";
    repo = "mame";
    rev = "mame${majorVersion}${minorVersion}";
-    sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr";
+    sha256 = "0ddmq3lagk7f1wkgybckcci4sigcqn1gzafggnnqjzq2q8viww0c";
  };

  hardeningDisable = [ "fortify" ];