From 9dbf57715a305dc5e00e93dcc329f9d419c7195f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 16 Feb 2012 12:22:05 +0000 Subject: [PATCH] liquidwar: update (builds with libpng-1.5) I removed update-upstream-info magick because it didn't work for new version. svn path=/nixpkgs/trunk/; revision=32324 --- pkgs/games/liquidwar/default.nix | 9 ++++++--- pkgs/games/liquidwar/src-for-default.nix | 9 --------- pkgs/games/liquidwar/src-info-for-default.nix | 8 -------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 pkgs/games/liquidwar/src-for-default.nix delete mode 100644 pkgs/games/liquidwar/src-info-for-default.nix diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 86a45282087d..085c990f1a0b 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 e375a73ce241..000000000000 --- 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 30a77d17509b..000000000000 --- 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)"; -}