Merge pull request #31376 from c0bw3b/pkg/libtom

libtom{crypt,math}: update to 1.18.0 and 1.0.1 resp.
This commit is contained in:
Renaud 2017-11-11 18:11:14 +01:00 committed by GitHub
commit 3b647d7bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 23 deletions

View File

@ -1,27 +1,34 @@
{stdenv, fetchurl, libtool}: { stdenv, fetchurl, libtool }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libtomcrypt-1.17"; name = "libtomcrypt-${version}";
version = "1.18.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/libtom/libtomcrypt/releases/download/1.17/crypt-1.17.tar.bz2"; url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz";
sha256 = "e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116"; sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs";
}; };
buildInputs = [libtool]; nativeBuildInputs = [ libtool ];
postPatch = ''
substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"
'';
preBuild = '' preBuild = ''
makeFlagsArray=(LIBPATH=$out/lib INCPATH=$out/include \ makeFlagsArray=(PREFIX=$out \
DATAPATH=$out/share/doc/libtomcrypt/pdf \
INSTALL_GROUP=$(id -g) \ INSTALL_GROUP=$(id -g) \
INSTALL_USER=$(id -u)) INSTALL_USER=$(id -u))
''; '';
makefile = "makefile.shared"; makefile = "makefile.shared";
meta = { enableParallelBuilding = true;
homepage = http://libtom.org/?page=features&newsitems=5&whatfile=crypt;
meta = with stdenv.lib; {
homepage = http://www.libtom.net/LibTomCrypt/;
description = "A fairly comprehensive, modular and portable cryptographic toolkit"; description = "A fairly comprehensive, modular and portable cryptographic toolkit";
platforms = stdenv.lib.platforms.linux; license = with licenses; [ publicDomain wtfpl ];
platforms = platforms.linux;
}; };
} }

View File

@ -1,27 +1,35 @@
{stdenv, fetchurl, libtool}: { stdenv, fetchurl, libtool }:
stdenv.mkDerivation rec {
name = "libtommath-${version}";
version = "1.0.1";
stdenv.mkDerivation {
name = "libtommath-1.0";
src = fetchurl { src = fetchurl {
url = https://github.com/libtom/libtommath/releases/download/v1.0/ltm-1.0.tar.xz; url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz";
sha256 = "0v5mpd8zqjfs2hr900w1mxifz23xylyjdqyx1i1wl7q9xvwpsflr"; sha256 = "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7";
}; };
buildInputs = [libtool]; nativeBuildInputs = [ libtool ];
postPatch = ''
substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"
substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m"
'';
preBuild = '' preBuild = ''
makeFlagsArray=(LIBPATH=$out/lib INCPATH=$out/include \ makeFlagsArray=(PREFIX=$out \
DATAPATH=$out/share/doc/libtommath/pdf \
INSTALL_GROUP=$(id -g) \ INSTALL_GROUP=$(id -g) \
INSTALL_USER=$(id -u)) INSTALL_USER=$(id -u))
''; '';
makefile = "makefile.shared"; makefile = "makefile.shared";
meta = { enableParallelBuilding = true;
homepage = http://math.libtomcrypt.com/;
meta = with stdenv.lib; {
homepage = http://www.libtom.net/LibTomMath/;
description = "A library for integer-based number-theoretic applications"; description = "A library for integer-based number-theoretic applications";
platforms = stdenv.lib.platforms.unix; license = with licenses; [ publicDomain wtfpl ];
platforms = platforms.unix;
}; };
} }