Merge branch 'cb1cat' of git://github.com/thoughtpolice/nixpkgs

cb0cat is now cb1cat
This commit is contained in:
Shea Levy 2014-03-29 22:16:14 -04:00
commit 0553bdd148
3 changed files with 25 additions and 25 deletions

View file

@ -1,24 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cb0cat-${version}";
version = "20131216153906";
src = fetchurl {
url = "https://www.cblnk.com/cb0cat/dist/${name}.tgz";
sha256 = "182767nxfyiis7ac8bn5v8rxb9vlly8n5w42pz1dd0751xwdlp82";
};
installPhase = ''
mkdir -p $out/bin
mv cb0cat $out/bin
'';
meta = {
description = "cryptographic tool based on the CBEAMr0 sponge function";
homepage = "https://www.cblnk.com";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cb1cat-${version}";
version = "20140328100000";
src = fetchurl {
url = "https://www.cblnk.com/cb1cat/dist/${name}.tgz";
sha256 = "0fbly4fg2qsb4kx9wgv357bsa3mmmy8xmy0yszw80k50ixphjswv";
};
installPhase = ''
mkdir -p $out/bin
mv cb1cat $out/bin
'';
meta = {
description = "cryptographic tool based on the CBEAMr1 sponge function";
homepage = "https://www.cblnk.com/cb1cat/";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

View file

@ -426,7 +426,7 @@ let
aescrypt = callPackage ../tools/misc/aescrypt { };
cb0cat = callPackage ../tools/security/cb0cat { };
cb1cat = callPackage ../tools/security/cb1cat { };
ahcpd = callPackage ../tools/networking/ahcpd { };