Unverified Commit 973697f9 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231524 from figsoda/hydra-cli 

hydra-cli: fix build, unpin openssl
parents 72338c5f bb4091b8

pkgs/development/tools/misc/hydra-cli/Cargo.lock

0 → 100644
+1995 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/development/tools/misc/hydra-cli/default.nix

+24 −5
Original line number Diff line number Diff line 
{ 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 ];

  };



}

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -20930,9 +20930,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 { };