Merge pull request #65009 from aanderse/libargon2

libargon2: 20171227 -> 20190702
This commit is contained in:
Aaron Andersen 2019-07-18 12:25:55 -04:00 committed by GitHub
commit 06005e862e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libargon2-${version}"; pname = "libargon2";
version = "20171227"; version = "20190702";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "P-H-C"; owner = "P-H-C";
repo = "phc-winner-argon2"; repo = "phc-winner-argon2";
rev = "${version}"; rev = version;
sha256 = "0sc9zca1anqk41017vjpas4kxi4cbn0zvicv8vj8p2sb2gy94bh8"; sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
}; };
installPhase = '' installPhase = ''
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace @HOST_MULTIARCH@ "" \ --replace @HOST_MULTIARCH@ "" \
--replace 'prefix=/usr' "prefix=$out" --replace 'prefix=/usr' "prefix=$out"
make install PREFIX=$out make install PREFIX=$out LIBRARY_REL=lib
ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
runHook postInstall runHook postInstall
''; '';
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC
recommends using Argon2 rather than legacy algorithms. recommends using Argon2 rather than legacy algorithms.
''; '';
homepage = https://www.argon2.com/; homepage = "https://www.argon2.com/";
license = with licenses; [ asl20 cc0 ]; license = with licenses; [ asl20 cc0 ];
maintainers = with maintainers; [ taeer olynch ]; maintainers = with maintainers; [ taeer olynch ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;