diff options
author | rushmorem <rushmore@webenchanter.com> | 2017-02-19 04:23:58 +0200 |
---|---|---|
committer | rushmorem <rushmore@webenchanter.com> | 2017-08-29 16:19:50 +0200 |
commit | 91062dc8627d5e27996951b5bf8cae9dd9ea75db (patch) | |
tree | 245269fbbfb6020f2e1119fd194cd034c71abed8 /pkgs/applications/networking/cluster/habitat | |
parent | f9192394ba80c70e50cab0d23a637b6c02e3dfa3 (diff) | |
download | nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar.gz nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar.bz2 nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar.lz nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar.xz nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.tar.zst nixlib-91062dc8627d5e27996951b5bf8cae9dd9ea75db.zip |
habitat: 0.8.0 -> 0.30.2
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 | 17 |
2 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/networking/cluster/habitat/chroot-env.nix b/pkgs/applications/networking/cluster/habitat/chroot-env.nix deleted file mode 100644 index 7d6b3749904b..000000000000 --- a/pkgs/applications/networking/cluster/habitat/chroot-env.nix +++ /dev/null @@ -1,9 +0,0 @@ -# TODO: Drop once https://github.com/habitat-sh/habitat/issues/994 -# is resolved. -{ habitat, libsodium, libarchive, openssl, buildFHSUserEnv }: - -buildFHSUserEnv { - name = "habitat-sh"; - 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 da82dac00191..605312611404 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -5,23 +5,30 @@ with rustPlatform; buildRustPackage rec { name = "habitat-${version}"; - version = "0.8.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - sha256 = "1h9wv2v4hcv79jkkjf8j96lzxni9d51755zfflfr5s3ayaip7rzj"; + sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; }; - sourceRoot = "habitat-${version}-src/components/hab"; - - depsSha256 = "1612jaw3zdrgrb56r755bb18l8szdmf1wi7p9lpv3d2gklqcb7l1"; + depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py"; buildInputs = [ libsodium libarchive openssl ]; nativeBuildInputs = [ pkgconfig ]; + cargoBuildFlags = ["--package hab"]; + + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test --package hab + runHook postCheck + ''; + meta = with lib; { description = "An application automation framework"; homepage = https://www.habitat.sh; |