public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
This commit is contained in:
Vladimír Čunát
2015-01-31 19:34:57 +01:00
parent 5dab625862 b50cabf2d4
commit dbae4f109f
564 changed files with 41839 additions and 27779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/tibia/default.nix
+3 -3
View File
@@ -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;