diff options
author | Yaya <mak@nyantec.com> | 2023-05-23 11:34:00 +0000 |
---|---|---|
committer | Yureka <yuka@yuka.dev> | 2023-05-31 22:14:25 +0200 |
commit | 6fed71cab2f4d74863970377d3289487c9a19ec0 (patch) | |
tree | 1c089c729a005c9e232c67cb84563b4befd39817 /pkgs/applications/version-management/gitlab/gitaly/default.nix | |
parent | ae74238d4d65b1d01881e8407237a0a3d82d3441 (diff) | |
download | nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar.gz nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar.bz2 nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar.lz nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar.xz nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.tar.zst nixpkgs-6fed71cab2f4d74863970377d3289487c9a19ec0.zip |
gitaly: Remove ruby dependencies
Ruby dependencies in gitaly have been removed in the 16.0.0 release. [1] See GitLab Epic &2862 [2] for more info. [1]: https://gitlab.com/gitlab-org/gitaly/-/commit/689556e70a14e189579e9a0c8daebaa2a25ce5f3 [2]: https://gitlab.com/groups/gitlab-org/-/epics/2862
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitaly/default.nix')
-rw-r--r-- | pkgs/applications/version-management/gitlab/gitaly/default.nix | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 655604ee72c..53c88a1f9c8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkg-config +{ lib +, fetchFromGitLab +, fetchFromGitHub +, buildGoModule +, pkg-config + # libgit2 + dependencies -, libgit2, openssl, zlib, pcre, http-parser }: +, libgit2 +, http-parser +, openssl +, pcre +, zlib +}: let - rubyEnv = bundlerEnv rec { - name = "gitaly-env"; - inherit ruby; - copyGemFiles = true; - gemdir = ./.; - }; - version = "15.11.6"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -32,7 +34,7 @@ let tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -46,10 +48,6 @@ in buildGoModule ({ pname = "gitaly"; - passthru = { - inherit rubyEnv; - }; - subPackages = [ "cmd/gitaly" "cmd/gitaly-backup" ]; preConfigure = '' @@ -57,12 +55,7 @@ buildGoModule ({ cp -r ${auxBins}/bin/* _build/bin ''; - postInstall = '' - mkdir -p $ruby - cp -rv $src/ruby/{bin,lib} $ruby - ''; - - outputs = [ "out" "ruby" ]; + outputs = [ "out" ]; meta = with lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; |