diff options
author | rushmorem <rushmore@webenchanter.com> | 2016-07-07 15:41:20 +0200 |
---|---|---|
committer | rushmorem <rushmore@webenchanter.com> | 2016-07-14 04:36:58 +0200 |
commit | ea15a54ef2a7e9391708f3d5e76d1378f2341bc3 (patch) | |
tree | 59646372de50ee987a458bfacfe7a7f9c7af7ad2 /pkgs/applications/networking/cluster/habitat | |
parent | 48cf70c03e45bea5638d8b3959dfe6a009981b6d (diff) |
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
Diffstat (limited to 'pkgs/applications/networking/cluster/habitat')
-rw-r--r-- | pkgs/applications/networking/cluster/habitat/chroot-env.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/habitat/default.nix | 6 |
2 files changed, 12 insertions, 3 deletions
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 0000000000000..388477f96e85b --- /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 d806329e4eec0..da82dac001916 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 ]; |