From 7e2587561d75e70eb91368beb77f3436cb846727 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 09:34:40 +0200 Subject: uqm: Switch to using fetchurl for uqm3donix. As we now have a tagged first release, it really doesn't make sense to introduce additional dependencies by using fetchgit. Signed-off-by: aszlig --- pkgs/games/uqm/3dovideo.nix | 9 ++++----- pkgs/games/uqm/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 361d1d50b829..c52cc5ed879c 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, writeText, fetchgit, haskellPackages }: +{ stdenv, requireFile, writeText, fetchurl, haskellPackages }: with stdenv.lib; @@ -19,10 +19,9 @@ let pname = "uqm3donix"; version = "0.1.0.0"; - src = fetchgit { - url = "git://github.com/aszlig/uqm3donix.git"; - rev = "c4e43b0d2eeb15e4caa93b0ddcf6b886d1cdaf8f"; - sha256 = "15vkgqsnwqn758nb3b55gbk5fw49lakax344sj9gvkpn8vxjn10y"; + src = fetchurl { + url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz"; + sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb"; }; isLibrary = false; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 1f82c75f9cf0..657d3f5b3e2e 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -2,15 +2,15 @@ , pkgconfig, mesa , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip , use3DOVideos ? false, requireFile ? null, writeText ? null -, fetchgit ? null, haskellPackages ? null +, haskellPackages ? null }: assert use3DOVideos -> requireFile != null && writeText != null - && fetchgit != null && haskellPackages != null; + && haskellPackages != null; let videos = import ./3dovideo.nix { - inherit stdenv requireFile writeText fetchgit haskellPackages; + inherit stdenv requireFile writeText fetchurl haskellPackages; }; in stdenv.mkDerivation rec { name = "uqm-${version}"; -- cgit 1.4.1