diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-04 09:10:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-04 09:15:27 +0200 |
| commit | e1206a21290c4bd4aa3c2ac76bd7a850ab990344 (patch) | |
| tree | f80b0a8594b5adca0ce53e1b1032ad9bbb89079f /pkgs/misc/emulators | |
| parent | deb78151a9438fb202842d9dbe348365cfd767e0 (diff) | |
| parent | 9f93642b79ad4f6ac95300522dd690dac02f0066 (diff) | |
| download | nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.gz nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.bz2 nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.lz nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.xz nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.tar.zst nixlib-e1206a21290c4bd4aa3c2ac76bd7a850ab990344.zip | |
Merge master into staging-next
This brings thousands of rebuilds. Hydra nixpkgs: ?compare=1597944
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/emu2/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/misc/emulators/stella/default.nix | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix new file mode 100644 index 000000000000..fb13b602b6a6 --- /dev/null +++ b/pkgs/misc/emulators/emu2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "emu2"; + version = "unstable-2020-06-04"; + + src = fetchFromGitHub { + owner = "dmsc"; + repo = "emu2"; + rev = "f9599d347aab07d9281400ec8b214aabd187fbcd"; + sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/dmsc/emu2/"; + description = "A simple text-mode x86 + DOS emulator"; + platforms = platforms.linux; + maintainers = with maintainers; [ dramaturg ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 591b2daaf15b..4c657fc30bba 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; + sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p"; }; nativeBuildInputs = [ pkgconfig ]; |