Unverified Commit bd9cd90d authored by Alyssa Ross's avatar Alyssa Ross
Browse files

edgedb: use OpenSSL from Nixpkgs

parent 335bd898

pkgs/tools/networking/edgedb/default.nix

+18 −9
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
  makeBinaryWrapper,

  pkg-config,

  curl,

  openssl,

  Security,

  CoreServices,

  libiconv,

  xz,

  perl,

  substituteAll,

  # for passthru.tests:

  edgedb,
@@ -19,26 +19,27 @@ 
}:

rustPlatform.buildRustPackage rec {

  pname = "edgedb";

  version = "5.3.0";

  version = "5.2.3";



  src = fetchFromGitHub {

    owner = "edgedb";

    repo = "edgedb-cli";

    rev = "refs/tags/v${version}";

    hash = "sha256-oG3KxORNppQDa84CXjSxM9Z9GDLby+irUbEncyjoJU4=";

    rev = "v${version}";

    hash = "sha256-WlXX1ACSZZNV0VBCoZjC1wLDF0qjIdjNJ4rQu6fBGfM=";

    fetchSubmodules = true;

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "edgedb-derive-0.5.2" = "sha256-9vmaMOoZ5VmbJ0/eN0XdE5hrID/BK4IkLnIwucgRr2w=";

      "edgeql-parser-0.1.0" = "sha256-WUNiUgfuzbr+zNYgJivalUK5kPSvkVcgp4Zq3pmoa/w=";

      "edgedb-derive-0.5.1" = "sha256-ATldvarkp/W5bz55qoMtfTMcueWklyKnrJUHvLKlWh0=";

      "edgeql-parser-0.1.0" = "sha256-KPi2M2UEN+p3V/fcmKtb3K9XTLC4vJ5H+yG8ZfD7RBs=";

      "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY=";

      "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc=";

      "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA=";

      "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc=";

      "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";

      "scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y=";

      "test-cert-gen-0.10.0-pre" = "sha256-Hyk4/iw6/SgEI70vPCNNbE9+nQ0pOAM158hncyUbvp8=";

      "test-utils-0.1.0" = "sha256-FoF/U89Q9E2Dlmpoh+cfDcScmhcsSNut+rE7BECJSJI=";

      "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE=";

    };
@@ -47,11 +48,15 @@ rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [

    makeBinaryWrapper

    pkg-config

    perl

  ];



  buildInputs =

    [ curl ]

    [

      curl

    ]

    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

      openssl

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      CoreServices

      Security
@@ -69,6 +74,10 @@ rustPlatform.buildRustPackage rec { 
    })

  ];



  env = {

    OPENSSL_NO_VENDOR = true;

  };



  doCheck = false;



  passthru.tests.version = testers.testVersion {