Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bbb299c8e41e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 972748bc311b
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Apr 7, 2020

  1. Copy the full SHA
    4a68f9d View commit details

Commits on Apr 8, 2020

  1. Update default.nix

    AndersonTorres authored Apr 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    1bfdc13 View commit details

Commits on Apr 9, 2020

  1. Update pkgs/misc/emulators/stella/default.nix

    Co-Authored-By: Christoph Neidahl <christoph.neidahl@gmail.com>
    AndersonTorres and OPNA2608 authored Apr 9, 2020
    Copy the full SHA
    52a2005 View commit details
  2. Merge pull request #84611 from AndersonTorres/update-stella

    stella: 4.1.1 -> 6.1.1
    aanderse authored Apr 9, 2020
    Copy the full SHA
    972748b View commit details
Showing with 10 additions and 6 deletions.
  1. +10 −6 pkgs/misc/emulators/stella/default.nix
16 changes: 10 additions & 6 deletions pkgs/misc/emulators/stella/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
{ 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 ];
buildInputs = [ SDL2 ];

enableParallelBuilding = true;

meta = {
description = "An open-source Atari 2600 VCS emulator";
@@ -23,7 +27,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;