Unverified Commit 9eb52cbc authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

Merge pull request #309768 from 0x50F1A/master 

edgedb: 4.1.1 -> 5.1.0
parents 5eb651d3 0f0c2eb3

pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch

+4 −4
Original line number Diff line number Diff line 
diff --git a/src/portable/install.rs b/src/portable/install.rs

index dc0d932..5394fc1 100644

index 15944e4..f873349 100644

--- a/src/portable/install.rs

+++ b/src/portable/install.rs

@@ -133,8 +133,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path)

@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {

     for entry in arch.entries()? {

         let mut entry = entry?;

         let path = entry.path()?;
@@ -11,7 +11,7 @@ index dc0d932..5394fc1 100644 
+            path_iter.next(); // discards first folder

+            path_iter.as_path().starts_with("bin")

+        };

         if let Some(path) = build_path(&target_dir, &*path)? {

         if let Some(path) = build_path(&target_dir, &path)? {

-            entry.unpack(path)?;

+            entry.unpack(&path)?;

+            if is_inside_bin {
@@ -20,7 +20,7 @@ index dc0d932..5394fc1 100644 
         }

     }

     bar.finish_and_clear();

@@ -203,3 +211,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {

@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {

 

     Ok(info)

 }

pkgs/tools/networking/edgedb/Cargo.lock

+1111 −814

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/networking/edgedb/default.nix

+48 −28
Original line number Diff line number Diff line 
{ stdenv

, lib

, patchelf

, fetchFromGitHub

, rustPlatform

, makeBinaryWrapper

, pkg-config

, curl

, Security

, CoreServices

, libiconv

, xz

, perl

, substituteAll

{

  stdenv,

  lib,

  patchelf,

  fetchFromGitHub,

  rustPlatform,

  makeBinaryWrapper,

  pkg-config,

  curl,

  Security,

  CoreServices,

  libiconv,

  xz,

  perl,

  substituteAll,

  # for passthru.tests:

, edgedb

, testers

  edgedb,

  testers,

}:



rustPlatform.buildRustPackage rec {

  pname = "edgedb";

  version = "4.1.1";

  version = "5.1.0";



  src = fetchFromGitHub {

    owner = "edgedb";

    repo = "edgedb-cli";

    rev = "v${version}";

    hash = "sha256-PHtjm3xlGwkDskH3A9/QQrmzt2Xi+sqnQAQV6WG7a6M=";

    hash = "sha256-znxAtfSeepLQqkPsEzQBp3INZym5BLap6m29C/9z+h8=";

    fetchSubmodules = true;

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "edgedb-derive-0.5.1" = "sha256-1tbWg3bLab3xlVQxb4G+kpXriO+zQpnrwAESy5Tqsu4=";

      "edgeql-parser-0.1.0" = "sha256-c5xBuW47xXgy8VLR/P7DvVhLBd0rvI6P9w82IPPsTwo=";

      "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=";

      "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=";

    };

  };



  nativeBuildInputs = [ makeBinaryWrapper pkg-config perl ];

  nativeBuildInputs = [

    makeBinaryWrapper

    pkg-config

    perl

  ];



  buildInputs = [

    curl

  ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ];

  buildInputs =

    [ curl ]

    ++ lib.optionals stdenv.isDarwin [

      CoreServices

      Security

      libiconv

      xz

    ];



  checkFeatures = [ ];
@@ -67,8 +80,15 @@ rustPlatform.buildRustPackage rec { 
  meta = with lib; {

    description = "EdgeDB cli";

    homepage = "https://www.edgedb.com/docs/cli/index";

    license = with licenses; [ asl20 /* or */ mit ];

    maintainers = with maintainers; [ ahirner kirillrdy ];

    license = with licenses; [

      asl20

      # or

      mit

    ];

    maintainers = with maintainers; [

      ahirner

      kirillrdy

    ];

    mainProgram = "edgedb";

  };

}