summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2009-04-30 14:01:25 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2009-04-30 14:01:25 +0000
commit7445bc765c8a41965bfbe7eb532c119f5607c101 (patch)
treef4125ee51f0ab57b374edab203fcb356315aca54 /pkgs
parentb176d8541c981dfabd241c4b969d7bafe27aaa06 (diff)
downloadnixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar.gz
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar.bz2
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar.lz
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar.xz
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.tar.zst
nixpkgs-7445bc765c8a41965bfbe7eb532c119f5607c101.zip
update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/python/2.5/default.nix6
-rw-r--r--pkgs/games/scummvm/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index a9e63557524..dd06e633a71 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -35,11 +35,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "python-2.5.2";
+  name = "python-2.5.4";
   
   src = fetchurl {
-    url = http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2;
-    sha256 = "0gh8bvs56vdv8qmlfmiwyczjpldj0y3zbzd0zyhyjfd0c8m0xy7j";
+    url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2;
+    sha256 = "0401g346ixng1im6gp11rgkfhx3v05qrpn5qjfx26mgy5dm8k3dw";
   };
 
   patches = [
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 9a1eeb275c7..d508ce61a6d 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, zlib, mpeg2dec}:
 
 stdenv.mkDerivation {
-  name = "scummvm-0.13.0";
+  name = "scummvm-0.13.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/scummvm/scummvm-0.13.0.tar.bz2;
-    sha256 = "0b82gpm596zggnm9d3gzji4xa12w1gbzariqi9hvk8mifpz6fliy";
+    url = mirror://sourceforge/scummvm/scummvm-0.13.1.tar.bz2;
+    sha256 = "1nd089673w775xs6hk9z780l18a008z0srli3cf16aq2a8rh1s23";
   };
   
   buildInputs = [SDL zlib mpeg2dec];