From 4a68f9de50daa83df99cf9f01a20fd9b9562e48e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 7 Apr 2020 11:29:32 -0300 Subject: [PATCH 1/3] stella: 4.1.1 -> 6.1.1 --- pkgs/misc/emulators/stella/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index c2d98cda060..707b3392170 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, SDL2 }: +{ stdenv, fetchFromGitHub, pkgconfig, SDL2 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "4.6.1"; + version = "6.1.1"; - src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; - sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; + src = fetchFromGitHub { + owner = "stella-emu"; + repo = "stella"; + rev = version; + sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; }; nativeBuildInputs = [ pkgconfig ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { maintained by Stephen Anthony. As of its 3.5 release, Stella is officially donationware. ''; - homepage = http://stella.sourceforge.net/; + homepage = "http://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From 1bfdc132e2cca6c8787714436cd43a75c230b292 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 8 Apr 2020 15:49:46 -0300 Subject: [PATCH 2/3] Update default.nix --- pkgs/misc/emulators/stella/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 707b3392170..8cc79ea0938 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2 ]; + + enableParallelBuild = true; meta = { description = "An open-source Atari 2600 VCS emulator"; From 52a2005e7c58ac408a6c065fc71bde0e5fa623c6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 9 Apr 2020 08:44:30 -0300 Subject: [PATCH 3/3] Update pkgs/misc/emulators/stella/default.nix Co-Authored-By: Christoph Neidahl --- pkgs/misc/emulators/stella/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 8cc79ea0938..72dc48c1f4d 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2 ]; - enableParallelBuild = true; + enableParallelBuilding = true; meta = { description = "An open-source Atari 2600 VCS emulator";