summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-06-12 12:59:15 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-06-12 12:59:15 +0400
commit8dca1caeb9a726d4a323241fc84c9bc292bcde21 (patch)
treefa8c685a9c7ddc0967a6ed3e04136a66932fb667 /pkgs/applications
parent8007f32712aa8b3cb5ef1367dc93ce3c4aab6f89 (diff)
parent58cbfedc5d0237831280c9752ea1b77c73c46b2b (diff)
downloadnixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar.gz
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar.bz2
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar.lz
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar.xz
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.tar.zst
nixlib-8dca1caeb9a726d4a323241fc84c9bc292bcde21.zip
Merge pull request #2479 from urv/master
upgraded calibre & scummvm and added haskel-monad-parallel nix expression
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c2d8e7979e45..6c25a67147af 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.31.0";
+  name = "calibre-1.35.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1fl42y8ppw8s51v66dqsrg1ib28yi6z5779r9wfvdbl9v1clilfc";
+    sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi";
   };
 
   inherit python;