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/tools/security/meo/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchhg {
url = http://oss.stamfest.net/hg/meo;
tag = "b48e5f16cff8";
rev = "b48e5f16cff8";
sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq";
};