From 8c8017a36740af25049641191085625ab94086e5 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 22 Apr 2021 08:56:01 +0200
Subject: [PATCH 1/2] vault: 1.6.3 -> 1.6.4

Fixes CVE-2021-27668 and CVE-2021-27400.

Changelog:
https://github.com/hashicorp/vault/blob/b41bb14cf6d6d2e0c6acc89c32deada52f744cd2/CHANGELOG.md#164
---
 pkgs/tools/security/vault/default.nix   |  4 ++--
 pkgs/tools/security/vault/vault-bin.nix | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index acbcca89d91f..a79d993619ae 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "vault";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9";
+    sha256 = "1vpwjn900l55cbljvscp8nb81d23ff6hlbd7h3bbsni6zvh05avg";
   };
 
   goPackagePath = "github.com/hashicorp/vault";
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 29a9726fce86..2cf6586a1acc 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,26 +1,26 @@
 { stdenv, fetchurl, unzip }:
 
 let
-  version = "1.6.3";
+  version = "1.6.4";
 
   sources = let
     base = "https://releases.hashicorp.com/vault/${version}";
   in {
     x86_64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_amd64.zip";
-      sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4";
+      sha256 = "0zywsnhip22lxsqz56xkvbprbhdd9ffmxd21m23j27q02i37kf7c";
     };
     i686-linux = fetchurl {
       url = "${base}/vault_${version}_linux_386.zip";
-      sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my";
+      sha256 = "1dxzaxgp1hdrhsqk02cvlh1np4qxznr94rmdr8np8f0r92hy5n20";
     };
     x86_64-darwin = fetchurl {
       url = "${base}/vault_${version}_darwin_amd64.zip";
-      sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j";
+      sha256 = "13wjrv3xb55ap0yn0pkayryfbm5a49q46hb15ywz1l8f1qdqmns0";
     };
     aarch64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_arm64.zip";
-      sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i";
+      sha256 = "079lwfgv60in5p5l5s4r942jbszlcbfv2y2yn5jsgfj7v0wh0hfr";
     };
   };
 

From 84098bc4105a6339bb61cd3a8085408f448d4e37 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 18 Dec 2020 21:59:51 +0100
Subject: [PATCH 2/2] nixosTests.vault: increase memorySize to 512

(cherry picked from commit 1eabc4cff1bc5e3d7ce536e266ddd6223352965d)
---
 nixos/tests/vault.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index ac8cf0703da5..20cc8f4c6922 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     environment.systemPackages = [ pkgs.vault ];
     environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
     services.vault.enable = true;
+    virtualisation.memorySize = 512;
   };
 
   testScript =