diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-10 08:53:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-10 08:53:51 +0100 |
commit | 45f58142e0c460d5919da156beb5309a74b9f3a7 (patch) | |
tree | 794cf921fc63528c98bffa95d3e3b4705cabb17d | |
parent | 45c33c7c436ecbdfbee5a34b4e89ff929a2609da (diff) | |
parent | b6d0c1eb18e2d7704989029b77ce3e6074a72b35 (diff) | |
download | nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar.gz nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar.bz2 nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar.lz nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar.xz nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.tar.zst nixlib-45f58142e0c460d5919da156beb5309a74b9f3a7.zip |
Merge pull request #27264 from Radvendii/argon
libargon2: init at 20161029
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/libargon2/default.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 44 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6e88e0d4299f..6cfa493353f2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -410,6 +410,7 @@ okasu = "Okasu <oka.sux@gmail.com>"; olcai = "Erik Timan <dev@timan.info>"; olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>"; + olynch = "Owen Lynch <owen@olynch.me>"; orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>"; orbitz = "Malcolm Matalka <mmatalka@gmail.com>"; orivej = "Orivej Desh <orivej@gmx.fr>"; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix new file mode 100644 index 000000000000..79cbf09317cf --- /dev/null +++ b/pkgs/development/libraries/libargon2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libargon2-${version}"; + version = "20161029"; + + src = fetchFromGitHub { + owner = "P-H-C"; + repo = "phc-winner-argon2"; + rev = "${version}"; + sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5"; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pkgconfig + substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \ + --replace @UPSTREAM_VER@ "${version}" \ + --replace @HOST_MULTIARCH@ "" \ + --replace 'prefix=/usr' "prefix=$out" + + make install PREFIX=$out + ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; + longDescription = '' + A password-hashing function created by by Alex Biryukov, Daniel Dinu, and + Dmitry Khovratovich. Argon2 was declared the winner of the Password + Hashing Competition (PHC). There were 24 submissions and 9 finalists. + Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC + recommends using Argon2 rather than legacy algorithms. + ''; + homepage = https://www.argon2.com/; + license = with licenses; [ asl20 cc0 ]; + maintainers = with maintainers; [ taeer olynch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9d3bb92c0a1..6e802a2f2c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11893,6 +11893,8 @@ with pkgs; libaio = callPackage ../os-specific/linux/libaio { }; + libargon2 = callPackage ../development/libraries/libargon2 { }; + libatasmart = callPackage ../os-specific/linux/libatasmart { }; libcgroup = callPackage ../os-specific/linux/libcgroup { }; |