dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

habitat: add an option to run in an FHS chroot

Browse Source 
`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
This commit is contained in:
rushmorem 2016-07-07 15:41:20 +02:00
parent 48cf70c03e
commit ea15a54ef2
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/cluster/habitat/chroot-env.nix Normal file
View File

@ -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";
}

6
pkgs/applications/networking/cluster/habitat/default.nix
View File

@ -5,18 +5,18 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "habitat-${version}"; name = "habitat-${version}";
version = "0.7.0"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "habitat-sh"; owner = "habitat-sh";
repo = "habitat"; repo = "habitat";
rev = version; rev = version;
sha256 = "0pacxcc86w4zdakyd6qbz2rqx30rkv1j5aca1fqa1hf1jqg44vg0"; sha256 = "1h9wv2v4hcv79jkkjf8j96lzxni9d51755zfflfr5s3ayaip7rzj";
}; };
sourceRoot = "habitat-${version}-src/components/hab"; sourceRoot = "habitat-${version}-src/components/hab";
depsSha256 = "0bm9f6w7ircji4d1c1fgysna93w0lf8ws7gfkqq80zx92x3lz5z5"; depsSha256 = "1612jaw3zdrgrb56r755bb18l8szdmf1wi7p9lpv3d2gklqcb7l1";
buildInputs = [ libsodium libarchive openssl ]; buildInputs = [ libsodium libarchive openssl ];

1
pkgs/top-level/all-packages.nix
View File

@ -1940,6 +1940,7 @@ in
haveged = callPackage ../tools/security/haveged { }; haveged = callPackage ../tools/security/haveged { };
habitat = callPackage ../applications/networking/cluster/habitat { }; habitat = callPackage ../applications/networking/cluster/habitat { };
habitat-sh = callPackage ../applications/networking/cluster/habitat/chroot-env.nix { };
hardlink = callPackage ../tools/system/hardlink { }; hardlink = callPackage ../tools/system/hardlink { };