Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 45c33c7c436e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45f58142e0c4
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jul 10, 2017

  1. maintainers: added olynch

    Radvendii authored and Mic92 committed Jul 10, 2017
    Copy the full SHA
    06e701a View commit details
  2. libargon2: init at 20161029

    Radvendii authored and Mic92 committed Jul 10, 2017
    Copy the full SHA
    5160ae5 View commit details
  3. Copy the full SHA
    b6d0c1e View commit details
  4. Merge pull request #27264 from Radvendii/argon

    libargon2: init at 20161029
    Mic92 authored Jul 10, 2017
    Copy the full SHA
    45f5814 View commit details
Showing with 44 additions and 0 deletions.
  1. +1 −0 lib/maintainers.nix
  2. +41 −0 pkgs/development/libraries/libargon2/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
Original file line number Diff line number Diff line change
@@ -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>";
41 changes: 41 additions & 0 deletions pkgs/development/libraries/libargon2/default.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -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 { };