From 74732ec29895236e587386f690d2ebb1722e0f96 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 4 Aug 2018 17:35:19 +0300
Subject: [PATCH 1/3] b2sum: init at 20160619

---
 pkgs/tools/security/b2sum/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/security/b2sum/default.nix

diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
new file mode 100644
index 00000000000..9c14ad974b6
--- /dev/null
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, openmp }:
+
+stdenv.mkDerivation rec {
+  version = "20160619";
+  name = "b2sum-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/BLAKE2/BLAKE2/archive/${version}.tar.gz";
+    sha256 = "0csnlp6kwlyla5s4r6bsrx2jgcwrm9qzisnvfdhmqsz5r8y87b6b";
+  };
+  postUnpack = "sourceRoot=$sourceRoot/b2sum";
+
+  buildInputs = [ openmp ];
+
+  makeFlags = stdenv.lib.optional (isNull openmp) "NO_OPENMP=1";
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "The b2sum utility is similar to the md5sum or shasum utilities but for BLAKE2";
+    homepage = "https://blake2.net";
+    license = with licenses; [ asl20 cc0 openssl ];
+    maintainers = with maintainers; [ kirelagin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90576e34da0..35542e052e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1579,6 +1579,10 @@ with pkgs;
 
   asynk = callPackage ../tools/networking/asynk { };
 
+  b2sum = callPackage ../tools/security/b2sum {
+    inherit (llvmPackages) openmp;
+  };
+
   bacula = callPackage ../tools/backup/bacula { };
 
   bareos = callPackage ../tools/backup/bareos { };

From 121c264c7b14b954c0c53bb04e946e8046f83bcf Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 4 Aug 2018 18:54:22 +0300
Subject: [PATCH 2/3] b2sum: Update to master

---
 pkgs/tools/security/b2sum/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 9c14ad974b6..97495b8cde5 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, openmp }:
+{ stdenv, fetchurl, openmp ? null }:
 
 stdenv.mkDerivation rec {
-  version = "20160619";
+  version = "unstable-2018-06-11";
+  rev = "320c325437539ae91091ce62efec1913cd8093c2";
   name = "b2sum-${version}";
 
   src = fetchurl {
-    url = "https://github.com/BLAKE2/BLAKE2/archive/${version}.tar.gz";
-    sha256 = "0csnlp6kwlyla5s4r6bsrx2jgcwrm9qzisnvfdhmqsz5r8y87b6b";
+    url = "https://github.com/BLAKE2/BLAKE2/archive/${rev}.tar.gz";
+    sha256 = "19f07dwli9ymlc87ikn84j4h5fv57afwj9ni7s0jkaym5l0q6nqw";
   };
   postUnpack = "sourceRoot=$sourceRoot/b2sum";
 

From dbdbdaf1c68a0595c16f63a5baa048bfd87d90e7 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Mon, 6 Aug 2018 14:47:29 +0300
Subject: [PATCH 3/3] b2sum: use fetchzip, clean up

---
 pkgs/tools/security/b2sum/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 97495b8cde5..1679b7fddd0 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, openmp ? null }:
+{ stdenv, fetchzip, openmp ? null }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "unstable-2018-06-11";
-  rev = "320c325437539ae91091ce62efec1913cd8093c2";
   name = "b2sum-${version}";
+  version = "unstable-2018-06-11";
 
-  src = fetchurl {
-    url = "https://github.com/BLAKE2/BLAKE2/archive/${rev}.tar.gz";
-    sha256 = "19f07dwli9ymlc87ikn84j4h5fv57afwj9ni7s0jkaym5l0q6nqw";
+  src = fetchzip {
+    url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz";
+    sha256 = "0agmc515avdpr64bsgv87wby2idm0d3wbndxzkhdfjgzhgv0rb8k";
   };
-  postUnpack = "sourceRoot=$sourceRoot/b2sum";
+
+  sourceRoot = "source/b2sum";
 
   buildInputs = [ openmp ];
 
-  makeFlags = stdenv.lib.optional (isNull openmp) "NO_OPENMP=1";
+  buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ];
   installFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "The b2sum utility is similar to the md5sum or shasum utilities but for BLAKE2";
     homepage = "https://blake2.net";
     license = with licenses; [ asl20 cc0 openssl ];