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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/servers/serfdom/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-01 11:25:41 +02:00
parent 89f8af55f1 ce623950ad
commit 06fc1ec34d
244 changed files with 5400 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/opentyrian/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "https://opentyrian.googlecode.com/hg/";
tag = "13ef8ce47362";
rev = "13ef8ce47362";
md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0";
};