Skip to content

refactor(deps): replace git2 with gix to eliminate OpenSSL dependency #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loispostula wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(deps): replace git2 with gix to eliminate OpenSSL dependency #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,341 changes: 1,159 additions & 182 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
name = "cargo-fslabscli"
publish = ["fsl"]
repository = "https://github.com/fslabs/fslabsci"
version = "2.35.0"
version = "2.36.0"

[package.metadata.fslabs.publish.binary]
name = "FSLABS Cli tool"
Expand Down Expand Up @@ -96,10 +96,18 @@ version = "1.0.100"
features = ["derive", "env"]
version = "4.5.51"

[dependencies.git2]
[dependencies.gix]
version = "0.79.0"
default-features = false
version = "0.20.2"
features = ["vendored-openssl", "https", "ssh"]
features = [
"blocking-network-client",
"revision",
"blob-diff",
"status",
"index",
"credentials",
"worktree-mutation",
]

[dependencies.humanize-duration]
features = ["chrono"]
Expand Down
36 changes: 18 additions & 18 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 19 additions & 17 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@
pkgsCross = generateCross rustTarget;
depsBuildBuild = [ pkgsCross.libiconv ];
};
"x86_64-windows" =
let
pkgsCross = pkgs.pkgsCross.mingwW64;
in
{
inherit pkgsCross;
rustTarget = "x86_64-pc-windows-gnu";
depsBuildBuild = [
pkgsCross.stdenv.cc
pkgsCross.windows.pthreads
];
};
# "x86_64-windows" =
# let
# pkgsCross = pkgs.pkgsCross.mingwW64;
# in
# {
# inherit pkgsCross;
# rustTarget = "x86_64-pc-windows-gnu";
# depsBuildBuild = [
# pkgsCross.stdenv.cc
# pkgsCross.windows.pthreads
# ];
# };
};

generateCommonArgs = craneLib': {
Expand All @@ -79,6 +79,8 @@
pkgs.git
pkgs.installShellFiles # Shell Completions
pkgs.rustPlatform.bindgenHook
] ++ lib.optionals isDarwin [
pkgs.libiconv
];
buildInputs = [
pkgs.stdenv.cc
Expand Down Expand Up @@ -136,7 +138,6 @@
commonArgs = (generateCommonArgs craneLibCross) // {
depsBuildBuild = depsBuildBuild ++ [
pkgsCross.buildPackages.perl
pkgsCross.buildPackages.openssl
];
inherit TARGET_CC;

Expand All @@ -152,9 +153,6 @@

CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
LD = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
OPENSSL_STATIC = "1";
OPENSSL_NO_VENDOR = "0";
PKG_CONFIG_ALL_STATIC = "1";
};
cargoArtifacts = craneLibCross.buildDepsOnly (commonArgs // { });

Expand Down Expand Up @@ -191,7 +189,10 @@
) arch2targets;
in
lib.attrsets.mapAttrs' (
arch: _: lib.nameValuePair (packageName + "-" + arch) (mkCrossRustPackage arch packageName)
arch: _: lib.nameValuePair (packageName + "-" + arch) (
if arch == system then mkRustPackage packageName
else mkCrossRustPackage arch packageName
)
) filteredTargets;
in
{
Expand Down Expand Up @@ -237,6 +238,7 @@
fenixPkgs.rust-analyzer
];
languages = {
c.enable = false;
rust = {
enable = true;
toolchainPackage =
Expand Down
Loading