From c64257b8e5d36bb71e4e773b9373e35b9b9b0e1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Dec 2014 03:31:03 +0100 Subject: Fix user-facing typos (mainly in descriptions) --- pkgs/misc/emulators/stella/default.nix | 2 +- pkgs/misc/emulators/uae/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index d26b5281efa5..198226c759a5 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { the GNU General Public License (GPL). Stella was originally developed for Linux by Bradford W. Mott, and is currently maintained by Stephen Anthony. - As of its 3.5 release, Stella is officialy donationware. + As of its 3.5 release, Stella is officially donationware. ''; homepage = http://stella.sourceforge.net/; license = licenses.gpl2; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 0fa5a08d2dc8..85fc6df9520f 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk alsaLib SDL ]; meta = { - description = "Ultimate/Unix/Unusuable Amiga Emulator"; + description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.amigaemulator.org; maintainers = [ stdenv.lib.maintainers.sander ]; -- cgit 1.4.1 From c9d963c4e64fed7c13e91df86c31927ed0d48877 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 3 Jan 2015 19:44:34 -0800 Subject: time for the monthly dolphinEmuMaster bump --- pkgs/misc/emulators/dolphin-emu/master.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 1bb23911c86d..83452b714b8c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20141201"; + name = "dolphin-emu-20150103"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "54f1e3a3c148d36e694d8bb08d282225bdcb3440"; - sha256 = "1i0ps3ayga6m4v0jyflv2x6rr3cjrym0laafjdslggqkk04b2vjp"; + rev = "03f716e651128a2da01f6afdd26545fafdd49971"; + sha256 = "01dq5552wpfn7dvfvdxxzfxn1z08abqwpm4gf33c081bhhbsyny6"; fetchSubmodules = false; }; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. -- cgit 1.4.1 From 5a92c9f0a17d7689a9e1e7938a40efee59e148ea Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 3 Jan 2015 23:00:29 -0800 Subject: remove extraneous platform from dolphinEmuMaster --- pkgs/misc/emulators/dolphin-emu/master.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 83452b714b8c..a114810fe00f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. -- cgit 1.4.1 From 291d507d9863e5d7e2556cb948ee04fe2fb8422c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Dec 2014 14:58:09 -0200 Subject: FS-UAE (version 2.4.1): New Package FS-UAE is a new, cycle-accurate, customizable Amiga Emulator. --- pkgs/misc/emulators/fs-uae/default.nix | 35 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/misc/emulators/fs-uae/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix new file mode 100644 index 000000000000..545691fa4d03 --- /dev/null +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig +, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "fs-uae-${version}"; + version = "2.4.1"; + + src = fetchurl { + urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ]; + sha256 = "05gvnrkl1aclq1a6z57k6rmdnsg2ghyjcscwq0w5dhc5vcalv6f0"; + }; + + buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ]; + + phases = "unpackPhase buildPhase installPhase"; + + # Strange: the docs recommend SDL2, but it does compile only with SDL1 + buildPhase = "make sdl=1"; + installPhase = "make install prefix=$out"; + + meta = { + description = "An accurate, customizable Amiga Emulator"; + longDescription = '' + FS-UAE integrates the most accurate Amiga emulation code available + from WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000 + and A4000 models, but you can tweak the hardware configuration and + create customized Amigas. + ''; + license = licenses.gpl2Plus; + homepage = http://fs-uae.net; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34b877150a7e..4edcf54a64ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12707,6 +12707,8 @@ let uae = callPackage ../misc/emulators/uae { }; + fsuae = callPackage ../misc/emulators/fs-uae { }; + putty = callPackage ../applications/networking/remote/putty { }; retroarchBare = callPackage ../misc/emulators/retroarch { }; -- cgit 1.4.1 From 56fe81a2e6d0e55c09b5edd1348cd53befacc3a9 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Fri, 9 Jan 2015 13:37:44 +0100 Subject: seafile: update client, ccnet, libsearpc and shared --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- pkgs/development/libraries/libsearpc/default.nix | 4 ++-- pkgs/misc/seafile-shared/default.nix | 8 ++++---- pkgs/tools/networking/ccnet/default.nix | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index e9036ba92614..63bec355f223 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.0.4"; + version = "4.0.6"; name = "seafile-client-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2"; + sha256 = "0hx8zjmgj4ki2p5fkdyz32fy8db60p6rvi3my9l59j7fslv71k1z"; }; buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index d33ca9a15edd..0410f64edec1 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { version = "1.2.2"; - seafileVersion = "3.0.4"; + seafileVersion = "3.0-latest"; name = "libsearpc-${version}"; src = fetchurl { url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; - sha256 = "0s5bqqajxfzyw4km6nhhx39nyq20gv0fxlf2v6ifipvnyk14850k"; + sha256 = "1kdq6chn3qhvr616sw91gf9kjfgbv9snl2srqisw0zddw1qkfcan"; }; patches = [ ./libsearpc.pc.patch ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index d6c08e99a51f..a00c0b5365a1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}: +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "4.0.6"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0"; + sha256 = "1vs1ckxkh0kg1wjklpwdz87d5z60r80q27xv1s6yl7ir65s6zq0i"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; - propagatedBuildInputs = [ ccnet ]; + propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index a967e8b27351..556ef8d0274c 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { version = "1.4.2"; - seafileVersion = "3.0.4"; + seafileVersion = "4.0.6"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; - sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q"; + sha256 = "06srvyphrfx7g18vk899850q0aw8cxx34cj96mjzc3sqm0bkzqsh"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; -- cgit 1.4.1 From 41f0b9e8512b9037d49c6d7fdf6aca74b240fae2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 11 Jan 2015 16:34:50 +0300 Subject: Wine unstable: 1.7.33 -> 1.7.34 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index fa421dce6039..edeb2bdb9908 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.cc.gcc != null; let - version = "1.7.33"; + version = "1.7.34"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; + sha256 = "02rk686l0kpbnvplmwl0c7xqy2ymnxcxh38dknm35chg8ljknnjd"; }; gecko = fetchurl { -- cgit 1.4.1