From ea15a54ef2a7e9391708f3d5e76d1378f2341bc3 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 7 Jul 2016 15:41:20 +0200
Subject: [PATCH] habitat: add an option to run in an FHS chroot

`hab studio enter` as well as other `hab` commands that make use
of the studio assume an FHS system when creating a chroot.

See https://github.com/habitat-sh/habitat/issues/994
---
 .../networking/cluster/habitat/chroot-env.nix            | 9 +++++++++
 pkgs/applications/networking/cluster/habitat/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                          | 1 +
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/habitat/chroot-env.nix

diff --git a/pkgs/applications/networking/cluster/habitat/chroot-env.nix b/pkgs/applications/networking/cluster/habitat/chroot-env.nix
new file mode 100644
index 000000000000..388477f96e85
--- /dev/null
+++ b/pkgs/applications/networking/cluster/habitat/chroot-env.nix
@@ -0,0 +1,9 @@
+# TODO: Drop once https://github.com/habitat-sh/habitat/issues/994
+#       is resolved.
+{ habitat, libsodium, libarchive, openssl, buildFHSUserEnv }:
+
+buildFHSUserEnv {
+    name = "hab";
+    targetPkgs = pkgs: [ habitat libsodium libarchive openssl ];
+    runScript = "bash";
+}
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index d806329e4eec..da82dac00191 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -5,18 +5,18 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "habitat-${version}";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
     rev = version;
-    sha256 = "0pacxcc86w4zdakyd6qbz2rqx30rkv1j5aca1fqa1hf1jqg44vg0";
+    sha256 = "1h9wv2v4hcv79jkkjf8j96lzxni9d51755zfflfr5s3ayaip7rzj";
   };
 
   sourceRoot = "habitat-${version}-src/components/hab";
 
-  depsSha256 = "0bm9f6w7ircji4d1c1fgysna93w0lf8ws7gfkqq80zx92x3lz5z5";
+  depsSha256 = "1612jaw3zdrgrb56r755bb18l8szdmf1wi7p9lpv3d2gklqcb7l1";
 
   buildInputs = [ libsodium libarchive openssl ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6e795740f29..405ffabef406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,6 +1940,7 @@ in
   haveged = callPackage ../tools/security/haveged { };
 
   habitat = callPackage ../applications/networking/cluster/habitat { };
+  habitat-sh = callPackage ../applications/networking/cluster/habitat/chroot-env.nix { };
 
   hardlink = callPackage ../tools/system/hardlink { };