Unverified Commit b642a42c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #231579 from figsoda/rucredstash

rucredstash: update Cargo.lock to unpin openssl
parents c3cfb476 04134522
Loading
Loading
Loading
Loading
+1682 −0

File added.

Preview size limit exceeded, changes collapsed.

+8 −1
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ rustPlatform.buildRustPackage rec {
    sha256 = "1jwsj2y890nxpgmlfbr9hms2raspp5h89ykzsh014mf7lb3yxzwg";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
  };

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ]
    ++ lib.optional stdenv.isDarwin Security;
@@ -19,7 +23,10 @@ rustPlatform.buildRustPackage rec {
  # presence of certain AWS infrastructure
  doCheck = false;

  cargoSha256 = "0qnfrwpdvjksc97iiwn1r6fyqaqn0q3ckbdzswf9flvwshqzb6ih";
  # update Cargo.lock to work with openssl 3
  postPatch = ''
    ln -sf ${./Cargo.lock} Cargo.lock
  '';

  meta = with lib; {
    description = "Rust port for credstash. Manages credentials securely in AWS cloud";
+0 −1
Original line number Diff line number Diff line
@@ -33677,7 +33677,6 @@ with pkgs;
  rucredstash = callPackage ../tools/security/rucredstash {
    inherit (darwin.apple_sdk.frameworks) Security;
    openssl = openssl_1_1;
  };
  runc = callPackage ../applications/virtualization/runc { };