summary refs log tree commit diff
path: root/pkgs/tools/security/meo
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-01 11:25:41 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-01 11:25:41 +0200
commit06fc1ec34dbae8bba4673475e64a8241026089f6 (patch)
tree3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/tools/security/meo
parent89f8af55f11b01e68cbfc6d10537413140261721 (diff)
parentce623950ada9e1ef721760f05b9e3a14604fd764 (diff)
downloadnixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst
nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.zip
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/tools/security/meo')
-rw-r--r--pkgs/tools/security/meo/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix
index 820919d1a2e..2dfdf466c28 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   
   src = fetchhg {
     url = http://oss.stamfest.net/hg/meo;
-    tag = "b48e5f16cff8";
+    rev = "b48e5f16cff8";
     sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq";
   };