diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-03-18 15:11:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-18 15:11:03 +0000 |
commit | 053ad4e0db7241ae6a02394d62750fdc5d64aa9f (patch) | |
tree | bceea7d74c3595097d78933e46e2241179170d50 | |
parent | ec7db16647bf1956d65646a6ae18e3fb294b67bf (diff) | |
parent | b7ef71665d1677854cfeeded99d19ea65a4ef71d (diff) | |
download | nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar.gz nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar.bz2 nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar.lz nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar.xz nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.tar.zst nixlib-053ad4e0db7241ae6a02394d62750fdc5d64aa9f.zip |
Merge pull request #82213 from bhipple/fix/habitat
habitat: 0.30.2 -> 0.90.6
-rw-r--r-- | pkgs/applications/networking/cluster/habitat/default.nix | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 31184bd68ff5..f2f3925fbe4d 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,27 +1,23 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig -, libsodium, libarchive, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig +, libsodium, libarchive, openssl, zeromq }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "0.30.2"; + # Newer versions required protobuf, which requires some finesse to get to + # compile with the vendored protobuf crate. + version = "0.90.6"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; + sha256 = "0rwi0lkmhlq4i8fba3s9nd9ajhz2dqxzkgfp5i8y0rvbfmhmfd6b"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0"; - - buildInputs = [ libsodium libarchive openssl ]; + cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsodium libarchive openssl zeromq ]; cargoBuildFlags = ["--package hab"]; @@ -32,12 +28,11 @@ buildRustPackage rec { runHook postCheck ''; - meta = with lib; { + meta = with stdenv.lib; { description = "An application automation framework"; - homepage = https://www.habitat.sh; + homepage = "https://www.habitat.sh"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = true; # mark temporary as broken due git dependencies + maintainers = with maintainers; [ rushmorem ]; + platforms = [ "x86_64-linux" ]; }; } |