svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32325

pkgs/games/liquidwar/default.nix

@@ -1,6 +1,5 @@
 a :  
 let 
-  s = import ./src-for-default.nix;
   buildInputs = with a; [
     xproto libX11 gmp guile
     mesa libjpeg libpng
@@ -12,9 +11,13 @@ let
   ];
 in
 rec {
-  src = a.fetchUrlFromSrcInfo s;
+  name = "liquidwar6-0.0.13beta";
+
+  src = a.fetchurl {
+    url = "http://ftp.gnu.org/gnu/liquidwar6/${name}.tar.gz";
+    sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2";
+  };
 
-  inherit (s) name;
   inherit buildInputs;
   configureFlags = [];
 

pkgs/games/liquidwar/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="0.0.11beta";
-   name="liquidwar-0.0.11beta";
-   hash="1zahxxmnx74xc3d2vk119r25d794vblmz22j1z5ajnnvc42dqc4f";
-   url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
-   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.11beta/liquidwar6-0.0.11beta.tar.gz";
-  
-  
-}

pkgs/games/liquidwar/src-info-for-default.nix

@@ -1,8 +0,0 @@
-{
-  downloadPage = "http://download.savannah.gnu.org/releases/liquidwar6/";
-  choiceCommand = '' tail -1 | sed -r -e 's@(.*)/@http://download.savannah.gnu.org/releases/liquidwar6/\1/liquidwar6-\1.tar.gz@' '';
-  sourceRegexp = ".*";
-  baseName = "liquidwar";
-  versionExtractorSedScript = ''s/.*-([-0-9a-z.]+)[.]tar[.]gz/\1/'';
-  versionReferenceCreator = "$(replaceAllVersionOccurences)";
-}