hydra-cli: fix build, unpin openssl

This commit is contained in:
figsoda 2023-05-12 15:35:48 -04:00
parent 9eff6f4469
commit bb4091b880
3 changed files with 2020 additions and 8 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,11 @@
{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }:
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "hydra-cli";
@ -10,20 +17,32 @@ rustPlatform.buildRustPackage rec {
rev = "v${version}";
sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03";
};
cargoSha256 = "16446ppkvc6l8087x5m5kyy5gk4f7inyj7rzrfysriw4fvqxjsf3";
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# build fails due to outdated socket2 dependency
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "A client for the Hydra CI";
homepage = "https://github.com/nlewo/hydra-cli";
license = with licenses; [ mit ];
maintainers = with maintainers; [ gilligan lewo ];
};
}

View File

@ -20933,9 +20933,7 @@ with pkgs;
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_13; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli {
openssl = openssl_1_1;
};
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };