svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32330

5 files changed, 10 insertions, 24 deletions

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 7609f3abda5..dc82a1a000a 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,4 +1,4 @@
-{ cabal, binary, ConfigFile, gtk, mtl, random, zlib }:
+{ cabal, binary, ConfigFile, filepath, gtk, mtl, random, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary ConfigFile gtk mtl random zlib ];
+  buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];
   meta = {
     homepage = "http://github.com/kosmikus/LambdaHack";
     description = "A roguelike game engine in early and very active development";
diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix
index dbf7ecae425..92c7a17d7d9 100644
--- a/pkgs/games/MazesOfMonad/default.nix
+++ b/pkgs/games/MazesOfMonad/default.nix
@@ -1,4 +1,4 @@
-{ cabal, HUnit, mtl, random, regexPosix, time }:
+{ cabal, filepath, HUnit, mtl, random, regexPosix, time }:
 
 cabal.mkDerivation (self: {
   pname = "MazesOfMonad";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ HUnit mtl random regexPosix time ];
+  buildDepends = [ filepath HUnit mtl random regexPosix time ];
   meta = {
     description = "Console-based Role Playing Game";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 86a45282087..085c990f1a0 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/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 = [];
 
diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix
deleted file mode 100644
index e375a73ce24..00000000000
--- a/pkgs/games/liquidwar/src-for-default.nix
+++ /dev/null
@@ -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";
-  
-  
-}
diff --git a/pkgs/games/liquidwar/src-info-for-default.nix b/pkgs/games/liquidwar/src-info-for-default.nix
deleted file mode 100644
index 30a77d17509..00000000000
--- a/pkgs/games/liquidwar/src-info-for-default.nix
+++ /dev/null
@@ -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)";
-}