diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/games | |
parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
download | nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/dwarf-therapist/default.nix | 18 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/games/planetaryannihilation/default.nix | 0 | ||||
-rw-r--r-- | pkgs/games/tibia/default.nix | 6 |
4 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 015ca2fca9d2..4e34453a1e8a 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,17 +4,17 @@ let baseVersion = "40"; - patchVersion = "23"; + patchVersion = "24"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "c6ec52520c44ba09d0d14c1688d2e9d70354fd01"; - sha256 = "0pp602ykyrq4rhyrf3pyy9vplxlkl256lw8bcfmgh0mqzzap9wq9"; + rev = "39742d64d2886fb594d79e7cc4b98fb917f26811"; + sha256 = "19vwx6kpv1sf93bx5v8x47f7x2cgxsqk82v6j1a72sa3q7m5cpc7"; }; df = fetchurl { url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "12gjb19scdgsz7zgk9s01qjxqrvh7z0xr68svwgxxqn4wf8kppcl"; + sha256 = "0d4jrs45qj89vq9mjg7fxxhis7zivvb0vzjpmkk274b778kccdys"; }; }; diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 9ecfe3c0acdd..6d7eaf307367 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -1,15 +1,16 @@ -{ stdenv, coreutils, fetchurl, qt4, dwarf_fortress, bash, makeWrapper }: +{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }: let - version = "30.1.0"; + version = "30.2.0pre"; df = dwarf_fortress; in stdenv.mkDerivation rec { name = "dwarf-therapist-${version}"; - src = fetchurl { - url = "https://github.com/splintermind/Dwarf-Therapist/archive/v${version}.tar.gz"; - sha256 = "1x9dkis6b3f8iqcfrc2cj9mcgkwf0rzhxhq2lgy4xdr2n0yjkyv7"; + src = fetchgit { + url = "https://github.com/splintermind/Dwarf-Therapist.git"; + rev = "65bb15a29d616d788c20a3344058b7277e4fadba"; + sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2"; }; # Needed for hashing @@ -19,12 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; configurePhase = '' - substituteInPlace dwarftherapist.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share \ - --replace "INSTALLS += doc" "" - - qmake INSTALL_PREFIX=$out + qmake PREFIX=$out ''; postInstall = '' diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bbf12065cc71..bbf12065cc71 100755..100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 1eb60fc3b564..b13db40d789b 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.71"; + name = "tibia-10.74"; src = fetchurl { - url = http://static.tibia.com/download/tibia1071.tgz; - sha256 = "183949xfvbbxbhj4i85ybcfv7h9j1f4va4c61wjzbhyjf55vj69a"; + url = http://static.tibia.com/download/tibia1074.tgz; + sha256 = "1q8bg33xial0bkagaf4iwn2sny1hglc1fhdxwjbiwrw0jg9w644x"; }; shell = stdenv.shell; |