public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2479 from urv/master

Browse Source 
upgraded calibre & scummvm and added haskel-monad-parallel nix expression
This commit is contained in:
Michael Raskin 2014-06-12 12:59:15 +04:00
commit 8dca1caeb9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/calibre/default.nix
View File

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-1.31.0"; name = "calibre-1.35.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz"; url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "1fl42y8ppw8s51v66dqsrg1ib28yi6z5779r9wfvdbl9v1clilfc"; sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi";
}; };
inherit python; inherit python;

8
pkgs/games/scummvm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "scummvm-1.2.1"; name = "scummvm-1.6.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/scummvm/scummvm-1.2.1.tar.bz2; url = "mirror://sourceforge/scummvm/${name}.tar.bz2";
sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8"; sha256 = "1i3ywpq8csi58gdibdn51329vlj800l2laaw0lw18fcgdbd60q1r";
}; };
buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];