diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/emulators.scm | |
parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/emulators.scm')
-rw-r--r-- | gnu/packages/emulators.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index cf48b20675..5b1d3788ad 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -538,7 +538,7 @@ The following systems are supported: (define-public mgba (package (name "mgba") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) @@ -547,7 +547,7 @@ The following systems are supported: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rwlfjdr0rzbq4kaplvwsgyb8xq6nrzxss2c8xrgw9hqw3ymx4s3")) + (base32 "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. @@ -1385,7 +1385,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.225") + (version "0.226") (source (origin (method git-fetch) @@ -1394,7 +1394,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "1n61v1yqmc69399khcm8gdabqaz8rwwj822m8vm5mbyxnw92icqg")) + (base32 "1yfns42rk1l0qprj5ksj9fqsgqpa23xnzxf29r4434p4n18bb77v")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. |