Commit 6fed71ca authored by Yaya's avatar Yaya Committed by Yureka
Browse files

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
parent ae74238d

nixos/modules/services/misc/gitlab.nix

+0 −7
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ let 
  toml = pkgs.formats.toml {};

  yaml = pkgs.formats.yaml {};



  ruby = cfg.packages.gitlab.ruby;



  postgresqlPackage = if config.services.postgresql.enable then

                        config.services.postgresql.package

                      else
@@ -47,9 +45,6 @@ let 
    [git]

    bin_path = "${pkgs.git}/bin/git"



    [gitaly-ruby]

    dir = "${cfg.packages.gitaly.ruby}"



    [gitlab-shell]

    dir = "${cfg.packages.gitlab-shell}"
@@ -1464,8 +1459,6 @@ in { 
        openssh

        procps  # See https://gitlab.com/gitlab-org/gitaly/issues/1562

        git

        cfg.packages.gitaly.rubyEnv

        cfg.packages.gitaly.rubyEnv.wrappedRuby

        gzip

        bzip2

      ];

pkgs/applications/version-management/gitlab/gitaly/Gemfile

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
source 'https://rubygems.org'



gem 'rugged', '~> 1.5.1'

gem 'gitlab-markup', '~> 1.8.0'

gem 'activesupport', '~> 6.1.7.2'

gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem

gem 'sentry-raven', '~> 3.1', require: false

gem 'rbtrace', require: false



# The Gitaly Gem contains the Protobuf and gRPC definitions required by the

# Ruby sidecar.

gem 'gitaly', '~> 15.5.0'



# Labkit provides observability functionality

gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'



# Detects the open source license the repository includes

# This version needs to be in sync with GitLab CE/EE

gem 'licensee', '~> 9.15'



gem 'google-protobuf', '~> 3.22.3'

gem 'nokogiri', '~> 1.14'



# Rails is currently blocked on the upgrade to the new major version for Redis,

# so we don't upgrade either until the issue is resolved. This is an indirect

# dependency and can thus be removed when the version constraint is gone.

gem 'redis', '~> 4.8.0'



group :development, :test do

  gem 'rubocop', '~> 1.38', require: false

  gem 'rspec', '~> 3.12.0', require: false

  gem 'rspec-parameterized', require: false

  gem 'factory_bot', require: false

  gem 'pry', '~> 0.13.1', require: false

end



# Gems required in omnibus-gitlab pipeline

group :development, :test, :omnibus do

  # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is

  # resolved. For details, check discussion in

  # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881

  gem 'gitlab-license_finder', require: false

end

pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock

deleted100644 → 0
+0 −207
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    actionpack (6.1.7.2)

      actionview (= 6.1.7.2)

      activesupport (= 6.1.7.2)

      rack (~> 2.0, >= 2.0.9)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.2.0)

    actionview (6.1.7.2)

      activesupport (= 6.1.7.2)

      builder (~> 3.1)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.1, >= 1.2.0)

    activesupport (6.1.7.2)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      tzinfo (~> 2.0)

      zeitwerk (~> 2.3)

    addressable (2.8.0)

      public_suffix (>= 2.0.2, < 5.0)

    ast (2.4.2)

    binding_of_caller (1.0.0)

      debug_inspector (>= 0.0.1)

    builder (3.2.4)

    coderay (1.1.2)

    concurrent-ruby (1.2.0)

    crass (1.0.6)

    debug_inspector (1.1.0)

    diff-lcs (1.3)

    dotenv (2.7.6)

    erubi (1.12.0)

    factory_bot (6.2.1)

      activesupport (>= 5.0.0)

    faraday (1.0.1)

      multipart-post (>= 1.2, < 3)

    ffi (1.15.5)

    gitaly (15.5.0)

      grpc (~> 1.0)

    gitlab-labkit (0.31.1)

      actionpack (>= 5.0.0, < 8.0.0)

      activesupport (>= 5.0.0, < 8.0.0)

      grpc (>= 1.37)

      jaeger-client (~> 1.1.0)

      opentracing (~> 0.4)

      pg_query (~> 2.1)

      redis (> 3.0.0, < 6.0.0)

    gitlab-license_finder (6.14.2.1)

      bundler

      rubyzip (>= 1, < 3)

      thor (~> 1.0)

      tomlrb (>= 1.3, < 2.1)

      with_env (= 1.1.0)

      xml-simple (~> 1.1.5)

    gitlab-markup (1.8.1)

    google-protobuf (3.22.3)

    googleapis-common-protos-types (1.4.0)

      google-protobuf (~> 3.14)

    grpc (1.42.0)

      google-protobuf (~> 3.18)

      googleapis-common-protos-types (~> 1.0)

    i18n (1.12.0)

      concurrent-ruby (~> 1.0)

    jaeger-client (1.1.0)

      opentracing (~> 0.3)

      thrift

    json (2.6.3)

    licensee (9.15.2)

      dotenv (~> 2.0)

      octokit (~> 4.20)

      reverse_markdown (~> 1.0)

      rugged (>= 0.24, < 2.0)

      thor (>= 0.19, < 2.0)

    loofah (2.19.1)

      crass (~> 1.0.2)

      nokogiri (>= 1.5.9)

    method_source (1.0.0)

    mini_portile2 (2.8.1)

    minitest (5.17.0)

    msgpack (1.3.3)

    multipart-post (2.1.1)

    nokogiri (1.14.1)

      mini_portile2 (~> 2.8.0)

      racc (~> 1.4)

    octokit (4.20.0)

      faraday (>= 0.9)

      sawyer (~> 0.8.0, >= 0.5.3)

    opentracing (0.5.0)

    optimist (3.0.1)

    parallel (1.22.1)

    parser (3.2.0.0)

      ast (~> 2.4.1)

    pg_query (2.2.1)

      google-protobuf (>= 3.19.2)

    proc_to_ast (0.1.0)

      coderay

      parser

      unparser

    pry (0.13.1)

      coderay (~> 1.1)

      method_source (~> 1.0)

    public_suffix (4.0.7)

    racc (1.6.2)

    rack (2.2.6.3)

    rack-test (2.0.2)

      rack (>= 1.3)

    rails-dom-testing (2.0.3)

      activesupport (>= 4.2.0)

      nokogiri (>= 1.6)

    rails-html-sanitizer (1.5.0)

      loofah (~> 2.19, >= 2.19.1)

    rainbow (3.1.1)

    rbtrace (0.4.14)

      ffi (>= 1.0.6)

      msgpack (>= 0.4.3)

      optimist (>= 3.0.0)

    redis (4.8.0)

    regexp_parser (2.6.2)

    reverse_markdown (1.4.0)

      nokogiri

    rexml (3.2.5)

    rspec (3.12.0)

      rspec-core (~> 3.12.0)

      rspec-expectations (~> 3.12.0)

      rspec-mocks (~> 3.12.0)

    rspec-core (3.12.0)

      rspec-support (~> 3.12.0)

    rspec-expectations (3.12.2)

      diff-lcs (>= 1.2.0, < 2.0)

      rspec-support (~> 3.12.0)

    rspec-mocks (3.12.3)

      diff-lcs (>= 1.2.0, < 2.0)

      rspec-support (~> 3.12.0)

    rspec-parameterized (1.0.0)

      rspec-parameterized-core (< 2)

      rspec-parameterized-table_syntax (< 2)

    rspec-parameterized-core (1.0.0)

      parser

      proc_to_ast

      rspec (>= 2.13, < 4)

      unparser

    rspec-parameterized-table_syntax (1.0.0)

      binding_of_caller

      rspec-parameterized-core (< 2)

    rspec-support (3.12.0)

    rubocop (1.44.0)

      json (~> 2.3)

      parallel (~> 1.10)

      parser (>= 3.2.0.0)

      rainbow (>= 2.2.2, < 4.0)

      regexp_parser (>= 1.8, < 3.0)

      rexml (>= 3.2.5, < 4.0)

      rubocop-ast (>= 1.24.1, < 2.0)

      ruby-progressbar (~> 1.7)

      unicode-display_width (>= 2.4.0, < 3.0)

    rubocop-ast (1.24.1)

      parser (>= 3.1.1.0)

    ruby-progressbar (1.11.0)

    rubyzip (2.3.2)

    rugged (1.5.1)

    sawyer (0.8.2)

      addressable (>= 2.3.5)

      faraday (> 0.8, < 2.0)

    sentry-raven (3.1.2)

      faraday (>= 1.0)

    thor (1.1.0)

    thrift (0.18.1)

    tomlrb (2.0.1)

    tzinfo (2.0.5)

      concurrent-ruby (~> 1.0)

    unicode-display_width (2.4.2)

    unparser (0.6.7)

      diff-lcs (~> 1.3)

      parser (>= 3.2.0)

    with_env (1.1.0)

    xml-simple (1.1.9)

      rexml

    zeitwerk (2.6.6)



PLATFORMS

  ruby



DEPENDENCIES

  activesupport (~> 6.1.7.2)

  factory_bot

  gitaly (~> 15.5.0)

  gitlab-labkit (~> 0.31, >= 0.31.1)

  gitlab-license_finder

  gitlab-markup (~> 1.8.0)

  google-protobuf (~> 3.22.3)

  grpc (~> 1.42.0)

  licensee (~> 9.15)

  nokogiri (~> 1.14)

  pry (~> 0.13.1)

  rbtrace

  redis (~> 4.8.0)

  rspec (~> 3.12.0)

  rspec-parameterized

  rubocop (~> 1.38)

  rugged (~> 1.5.1)

  sentry-raven (~> 3.1)



BUNDLED WITH

   2.4.11

pkgs/applications/version-management/gitlab/gitaly/default.nix

+14 −21
Original line number Diff line number Diff line 
{ 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";

pkgs/applications/version-management/gitlab/gitaly/gemset.nix

deleted100644 → 0
+0 −827

File deleted.

Preview size limit exceeded, changes collapsed.